feat: 优化引入、lint & format

web/src/common/logicEngine/ruleConf.ts

@@ -1,4 +1,4 @@
-// 静态数据
+// test：静态数据，实际业务里无用
 export const ruleConf = [
   {
     conditions: [

web/src/common/typeEnum.ts

@@ -7,7 +7,7 @@ export enum QUESTION_TYPE {
   BINARY_CHOICE = 'binary-choice',
   RADIO_STAR = 'radio-star',
   RADIO_NPS = 'radio-nps',
-  VOTE = 'vote',
+  VOTE = 'vote'
 }
 
 // 题目类型标签映射对象
@@ -23,16 +23,10 @@ export const typeTagLabels: Record<QUESTION_TYPE, string> = {
 }
 
 // 输入类题型
-export const INPUT = [
+export const INPUT = [QUESTION_TYPE.TEXT, QUESTION_TYPE.TEXTAREA]
-  QUESTION_TYPE.TEXT,
-  QUESTION_TYPE.TEXTAREA
-]
 
 // 选择类题型分类
-export const NORMAL_CHOICES =  [
+export const NORMAL_CHOICES = [QUESTION_TYPE.RADIO, QUESTION_TYPE.CHECKBOX]
-  QUESTION_TYPE.RADIO,
-  QUESTION_TYPE.CHECKBOX
-]
 
 // 选择类题型分类
 export const CHOICES = [
@@ -43,8 +37,4 @@ export const CHOICES =  [
 ]
 
 // 评分题题型分类
-export const RATES = [
+export const RATES = [QUESTION_TYPE.RADIO_STAR, QUESTION_TYPE.RADIO_NPS]
-  QUESTION_TYPE.RADIO_STAR,
-  QUESTION_TYPE.RADIO_NPS
-]
-

web/src/management/components/LeftMenu.vue

@@ -58,7 +58,9 @@ const tabArr = [
   }
 ]
 const tabs = ref([])
-watch(() => store.state.cooperPermissions, (newVal) => {
+watch(
+  () => store.state.cooperPermissions,
+  (newVal) => {
     tabs.value = []
     // 如果有问卷管理权限，则加入问卷编辑和投放菜单
     if (newVal.includes(SurveyPermissions.SurveyManage)) {
@@ -69,7 +71,9 @@ watch(() => store.state.cooperPermissions, (newVal) => {
     if (newVal.includes(SurveyPermissions.DataManage)) {
       tabs.value.push(tabArr[2])
     }
-}, { immediate: true })
+  },
+  { immediate: true }
+)
 </script>
 <style lang="scss" scoped>
 .nav {

web/src/management/router/index.ts

@@ -1,4 +1,9 @@
-import { createRouter, createWebHistory, type RouteLocationNormalized, type NavigationGuardNext } from 'vue-router'
+import {
+  createRouter,
+  createWebHistory,
+  type RouteLocationNormalized,
+  type NavigationGuardNext
+} from 'vue-router'
 import type { RouteRecordRaw } from 'vue-router'
 import { useStore, type Store } from 'vuex'
 import { SurveyPermissions } from '@/management/utils/types/workSpace'
@@ -161,33 +166,43 @@ router.beforeEach(async (to, from, next) => {
   const userStore = useUserStore()
   // 初始化用户信息
   if (!userStore?.initialized) {
-    await userStore.init();
+    await userStore.init()
   }
   // 更新页面标题
   if (to.meta.title) {
-    document.title = to.meta.title as string;
+    document.title = to.meta.title as string
   }
 
   if (to.meta.needLogin) {
-    await handleLoginGuard(to, from, next, store);
+    await handleLoginGuard(to, from, next, store)
   } else {
-    next();
+    next()
   }
-});
+})
 
-async function handleLoginGuard(to: RouteLocationNormalized, from: RouteLocationNormalized, next: NavigationGuardNext, store: Store<any>) {
+async function handleLoginGuard(
-  const userStore = useUserStore();
+  to: RouteLocationNormalized,
+  from: RouteLocationNormalized,
+  next: NavigationGuardNext,
+  store: Store<any>
+) {
+  const userStore = useUserStore()
   if (userStore?.hasLogined) {
-    await handlePermissionsGuard(to, from, next, store);
+    await handlePermissionsGuard(to, from, next, store)
   } else {
     next({
       name: 'login',
-      query: { redirect: encodeURIComponent(to.path) },
+      query: { redirect: encodeURIComponent(to.path) }
-    });
+    })
   }
 }
 
-async function handlePermissionsGuard(to: RouteLocationNormalized, from: RouteLocationNormalized, next: NavigationGuardNext, store: Store<any>) {
+async function handlePermissionsGuard(
+  to: RouteLocationNormalized,
+  from: RouteLocationNormalized,
+  next: NavigationGuardNext,
+  store: Store<any>
+) {
   const currSurveyId = to?.params?.id || ''
   const prevSurveyId = from?.params?.id || ''
   // 如果跳转页面不存在surveyId 或者不需要页面权限，则直接跳转
@@ -198,21 +213,19 @@ async function handlePermissionsGuard(to: RouteLocationNormalized, from: RouteLo
     if (currSurveyId !== prevSurveyId) {
       await store.dispatch('fetchCooperPermissions', currSurveyId)
       if (hasRequiredPermissions(to.meta.permissions as string[], store.state.cooperPermissions)) {
-        next();
+        next()
       } else {
-        ElMessage.warning('您没有该问卷的相关协作权限');
+        ElMessage.warning('您没有该问卷的相关协作权限')
-        next({ name: 'survey' });
+        next({ name: 'survey' })
       }
     } else {
-      next();
+      next()
     }
   }
 }
 
 function hasRequiredPermissions(requiredPermissions: string[], userPermissions: string[]) {
-  return requiredPermissions.some(permission => userPermissions.includes(permission));
+  return requiredPermissions.some((permission) => userPermissions.includes(permission))
 }
 
-
-
 export default router

web/src/management/store/index.js

@@ -12,7 +12,7 @@ export default createStore({
   mutations,
   actions,
   modules: {
-    edit,
+    edit
     // user,
     // list
   }

web/src/management/stores/edit.ts

@@ -1,9 +1,11 @@
-import { defineStore } from 'pinia'
 import { type Ref, ref, reactive, toRef, computed } from 'vue'
-import { getSurveyById } from '@/management/api/survey'
+import { defineStore } from 'pinia'
 import { merge as _merge, cloneDeep as _cloneDeep, set as _set } from 'lodash-es'
+
+import { getSurveyById } from '@/management/api/survey'
 import { getNewField } from '@/management/utils'
 import submitFormConfig from '@/management/config/setterConfig/submitConfig'
+
 import questionLoader from '@/materials/questions/questionLoader'
 
 const innerMetaConfig = {
@@ -78,8 +80,6 @@ function useInitializeSchema(surveyId: Ref<string>) {
     schema.submitConf = _merge({}, schema.submitConf, codeData.submitConf)
     schema.questionDataList = codeData.questionDataList || []
     schema.logicConf = codeData.logicConf
-
-    console.log(metaData, codeData)
   }
 
   async function getSchemaFromRemote() {
@@ -205,6 +205,17 @@ function useCurrentEdit({
     return key
   })
 
+  const currentEditMeta = computed(() => {
+    if (currentEditOne.value === null) {
+      return null
+    } else if (innerMetaConfig[currentEditOne.value as keyof typeof innerMetaConfig]) {
+      return innerMetaConfig[currentEditOne.value as keyof typeof innerMetaConfig]
+    } else {
+      const questionType = questionDataList.value?.[currentEditOne.value]?.type
+      return questionLoader.getMeta(questionType)
+    }
+  })
+
   const moduleConfig = computed(() => {
     if (currentEditOne.value === null) {
       return null
@@ -231,17 +242,6 @@ function useCurrentEdit({
     return currentEditMeta.value?.formConfig || []
   })
 
-  const currentEditMeta = computed(() => {
-    if (currentEditOne.value === null) {
-      return null
-    } else if (innerMetaConfig[currentEditOne.value as keyof typeof innerMetaConfig]) {
-      return innerMetaConfig[currentEditOne.value as keyof typeof innerMetaConfig]
-    } else {
-      const questionType = questionDataList.value?.[currentEditOne.value]?.type
-      return questionLoader.getMeta(questionType)
-    }
-  })
-
   function setCurrentEditOne(data: any) {
     currentEditOne.value = data
   }
@@ -267,6 +267,7 @@ export const useEditStore = defineStore('edit', () => {
   const schemaUpdateTime = ref(Date.now())
   const { schema, initSchema, getSchemaFromRemote } = useInitializeSchema(surveyId)
   const questionDataList = toRef(schema, 'questionDataList')
+
   function setQuestionDataList(data: any) {
     schema.questionDataList = data
   }

web/src/management/stores/surveyList.ts

@@ -1,12 +1,13 @@
+import { ref, computed } from 'vue'
+import { defineStore } from 'pinia'
+
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
-import { defineStore } from 'pinia'
 
 import { CODE_MAP } from '@/management/api/base'
 import { getSurveyList as getSurveyListReq } from '@/management/api/survey'
 
 import { useWorkSpaceStore } from './workSpace'
-import { ref, computed } from 'vue'
 
 function useSearchSurvey() {
   const searchVal = ref('')

web/src/management/stores/user.js

@@ -1,7 +1,5 @@
-// Pinia Store
-import { defineStore } from 'pinia'
 import { ref } from 'vue'
-
+import { defineStore } from 'pinia'
 
 const USER_INFO_KEY = 'surveyUserInfo'
 export const useUserStore = defineStore('user', () => {

web/src/management/stores/workSpace.ts

@@ -1,5 +1,6 @@
-import { defineStore } from 'pinia'
 import { ref } from 'vue'
+import { defineStore } from 'pinia'
+
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
 
@@ -11,6 +12,7 @@ import {
   getSpaceList as getSpaceListReq,
   getSpaceDetail as getSpaceDetailReq
 } from '@/management/api/space'
+
 import { SpaceType } from '@/management/utils/types/workSpace'
 import {
   type SpaceDetail,

web/src/management/utils/index.js

@@ -41,9 +41,9 @@ export const getQuestionByType = (type, fields) => {
   let newQuestion = defaultQuestionConfig
   if (attrs) {
     let questionSchema = {}
-    attrs.forEach(element => {
+    attrs.forEach((element) => {
       questionSchema[element.name] = element.defaultValue
-    });
+    })
     newQuestion = questionSchema
   } else {
     newQuestion = defaultQuestionConfig
@@ -51,7 +51,8 @@ export const getQuestionByType = (type, fields) => {
   }
 
   newQuestion.field = getNewField(fields) // 动态生成题目id
-  if('options ' in newQuestion) {  // 动态更新选项的hash-id
+  if ('options' in newQuestion) {
+    // 动态更新选项的hash-id
     const hashList = []
     for (const option of newQuestion.options) {
       const hash = generateHash(hashList)

web/src/management/utils/types/workSpace.ts

@@ -34,7 +34,7 @@ export interface SpaceDetail {
 
 export type SpaceItem = Required<Omit<SpaceDetail, 'members'>> & {
   createDate: string
-  curStatus: { date: number, status: string }
+  curStatus: { date: number; status: string }
   memberTotal: number
   currentUserRole: string
   owner: string

web/src/materials/questions/QuestionContainerB/index.jsx

@@ -111,20 +111,10 @@ export default defineComponent({
               editConfigure={questionMeta?.editConfigure}
               onChange={this.onChange}
             >
-              <dynamicComponent
+              <dynamicComponent readonly {...props} onBlur={this.onBlur} onFocus={this.onFocus} />
-                readonly
-                {...props}
-                onBlur={this.onBlur}
-                onFocus={this.onFocus}
-              />
             </EditOptions>
           ) : (
-            <dynamicComponent
+            <dynamicComponent readonly {...props} onBlur={this.onBlur} onFocus={this.onFocus} />
-              readonly
-              {...props}
-              onBlur={this.onBlur}
-              onFocus={this.onFocus}
-            />
           )}
         </div>
       </div>

web/src/materials/questions/widgets/BinaryChoiceModule/meta.js

@@ -53,25 +53,25 @@ const meta = {
       description: '这是用于描述选项',
       defaultValue: [
         {
-          "text": "对",
+          text: '对',
-          "imageUrl": "",
+          imageUrl: '',
-          "others": false,
+          others: false,
-          "mustOthers": false,
+          mustOthers: false,
-          "othersKey": "",
+          othersKey: '',
-          "placeholderDesc": "",
+          placeholderDesc: '',
-          "hash": "115019"
+          hash: ''
         },
         {
-          "text": "错",
+          text: '错',
-          "imageUrl": "",
+          imageUrl: '',
-          "others": false,
+          others: false,
-          "mustOthers": false,
+          mustOthers: false,
-          "othersKey": "",
+          othersKey: '',
-          "placeholderDesc": "",
+          placeholderDesc: '',
-          "hash": "115020"
+          hash: ''
         }
       ]
-    },
+    }
   ],
   formConfig: [basicConfig],
   editConfigure: {

web/src/materials/questions/widgets/CheckboxModule/meta.js

@@ -53,22 +53,22 @@ const meta = {
       description: '这是用于描述选项',
       defaultValue: [
         {
-          "text": "选项1",
+          text: '选项1',
-          "imageUrl": "",
+          imageUrl: '',
-          "others": false,
+          others: false,
-          "mustOthers": false,
+          mustOthers: false,
-          "othersKey": "",
+          othersKey: '',
-          "placeholderDesc": "",
+          placeholderDesc: '',
-          "hash": "115019"
+          hash: ''
         },
         {
-          "text": "选项2",
+          text: '选项2',
-          "imageUrl": "",
+          imageUrl: '',
-          "others": false,
+          others: false,
-          "mustOthers": false,
+          mustOthers: false,
-          "othersKey": "",
+          othersKey: '',
-          "placeholderDesc": "",
+          placeholderDesc: '',
-          "hash": "115020"
+          hash: ''
         }
       ]
     },

web/src/materials/questions/widgets/RadioModule/meta.js

@@ -53,29 +53,27 @@ const meta = {
       description: '这是用于描述选项',
       defaultValue: [
         {
-          "text": "选项1",
+          text: '选项1',
-          "imageUrl": "",
+          imageUrl: '',
-          "others": false,
+          others: false,
-          "mustOthers": false,
+          mustOthers: false,
-          "othersKey": "",
+          othersKey: '',
-          "placeholderDesc": "",
+          placeholderDesc: '',
-          "hash": "115019"
+          hash: ''
         },
         {
-          "text": "选项2",
+          text: '选项2',
-          "imageUrl": "",
+          imageUrl: '',
-          "others": false,
+          others: false,
-          "mustOthers": false,
+          mustOthers: false,
-          "othersKey": "",
+          othersKey: '',
-          "placeholderDesc": "",
+          placeholderDesc: '',
-          "hash": "115020"
+          hash: ''
         }
       ]
-    },
+    }
-  ],
-  formConfig: [
-    basicConfig,
   ],
+  formConfig: [basicConfig],
   editConfigure: {
     optionEdit: {
       show: true

web/src/materials/questions/widgets/StarModule/meta.js

@@ -63,14 +63,14 @@ const meta = {
       name: 'starStyle',
       propType: String,
       description: '',
-      defaultValue: 'star',
+      defaultValue: 'star'
     },
     {
       name: 'rangeConfig',
       propType: Object,
       description: '这是用于描述评分高级设置',
       defaultValue: {}
-    },
+    }
   ],
   formConfig: [
     basicConfig,

web/src/materials/questions/widgets/VoteModule/meta.js

@@ -53,22 +53,22 @@ const meta = {
       description: '这是用于描述选项',
       defaultValue: [
         {
-          "text": "选项1",
+          text: '选项1',
-          "imageUrl": "",
+          imageUrl: '',
-          "others": false,
+          others: false,
-          "mustOthers": false,
+          mustOthers: false,
-          "othersKey": "",
+          othersKey: '',
-          "placeholderDesc": "",
+          placeholderDesc: '',
-          "hash": "115019"
+          hash: ''
         },
         {
-          "text": "选项2",
+          text: '选项2',
-          "imageUrl": "",
+          imageUrl: '',
-          "others": false,
+          others: false,
-          "mustOthers": false,
+          mustOthers: false,
-          "othersKey": "",
+          othersKey: '',
-          "placeholderDesc": "",
+          placeholderDesc: '',
-          "hash": "115020"
+          hash: ''
         }
       ]
     },

web/src/render/components/QuestionWrapper.vue

@@ -57,8 +57,10 @@ const questionConfig = computed(() => {
     moduleConfig.othersValue = unref(othersValue)
   }
   if (
-    RATES.includes(type) && rest?.rangeConfig && 
+    RATES.includes(type) &&
-    Object.keys(rest?.rangeConfig).filter((index) => rest?.rangeConfig[index].isShowInput).length > 0
+    rest?.rangeConfig &&
+    Object.keys(rest?.rangeConfig).filter((index) => rest?.rangeConfig[index].isShowInput).length >
+      0
   ) {
     let { rangeConfig, othersValue } = useShowInput(field)
     moduleConfig.rangeConfig = unref(rangeConfig)

web/src/render/main.js

@@ -5,7 +5,6 @@ import router from './router'
 import store from './store'
 import { createPinia } from 'pinia'
 
-
 const app = createApp(App)
 const pinia = createPinia()
 
@@ -17,5 +16,4 @@ app.use(store)
 app.use(pinia)
 app.use(router)
 
-
 app.mount('#app')

web/src/render/pages/EmptyPage.vue

@@ -7,9 +7,7 @@
   </div>
 </template>
 
-<script setup>
+<script setup></script>
-
-</script>
 
 <style scoped>
 .container {

web/src/render/pages/IndexPage.vue

@@ -18,15 +18,8 @@ const surveyStore = useSurveyStore()
 const loadData = (res: any, surveyPath: string) => {
   if (res.code === 200) {
     const data = res.data
-    const {
+    const { bannerConf, baseConf, bottomConf, dataConf, skinConf, submitConf, logicConf } =
-      bannerConf,
+      data.code
-      baseConf,
-      bottomConf,
-      dataConf,
-      skinConf,
-      submitConf,
-      logicConf
-    } = data.code
     const questionData = {
       bannerConf,
       baseConf,
@@ -62,7 +55,7 @@ const getDetail = async (surveyPath: string) => {
     } else {
       const res: any = await getPublishedSurveyInfo({ surveyPath })
       loadData(res, surveyPath)
-      surveyStore.getEncryptInfo();
+      surveyStore.getEncryptInfo()
     }
   } catch (error: any) {
     console.log(error)

web/src/render/pages/RenderPage.vue

@@ -73,7 +73,7 @@ const validate = (cbk: (v: boolean) => void) => {
 
 const normalizationRequestBody = () => {
   const enterTime = surveyStore.enterTime
-  const encryptInfo = surveyStore.encryptInfo as any;
+  const encryptInfo = surveyStore.encryptInfo as any
   const formValues = store.state.formValues
 
   const result: any = {

web/src/render/store/actions.js

@@ -19,12 +19,9 @@ const VOTE_INFO_KEY = 'voteinfo'
 import router from '../router'
 export default {
   // 初始化
-  init(
+  init({ commit, dispatch }, { bannerConf, baseConf, bottomConf, dataConf, skinConf, submitConf }) {
-    { commit, dispatch },
-    { bannerConf, baseConf, bottomConf, dataConf, skinConf, submitConf }
-  ) {
     const surveyStore = useSurveyStore()
-    surveyStore.setEnterTime();
+    surveyStore.setEnterTime()
     const { begTime, endTime, answerBegTime, answerEndTime } = baseConf
     const { msgContent } = submitConf
     const now = Date.now()

web/src/render/stores/survey.js

@@ -1,6 +1,6 @@
-// 问卷相关的Pinia Store
-import { defineStore } from 'pinia'
 import { ref } from 'vue'
+import { defineStore } from 'pinia'
+
 import { isMobile as isInMobile } from '@/render/utils/index'
 import { getEncryptInfo as getEncryptInfoApi } from '@/render/api/survey'
 
@@ -13,7 +13,7 @@ const CODE_MAP = {
   NO_AUTH: 403
 }
 export const useSurveyStore = defineStore('survey', () => {
-  const surveyPath = ref('');
+  const surveyPath = ref('')
   const isMobile = ref(isInMobile())
   const enterTime = ref(0)
   const encryptInfo = ref(null)