From cdd26073afd1f34f8cdfcb2c54ecc27673ea4971 Mon Sep 17 00:00:00 2001
From: dayou <853094838@qq.com>
Date: Fri, 28 Jun 2024 18:46:24 +0800
Subject: [PATCH 01/13] =?UTF-8?q?feat:=20user=E6=A8=A1=E5=9D=97=E7=9A=84pi?=
 =?UTF-8?q?nia=E8=BF=81=E7=A7=BB=20(#315)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json                              |  1 +
 web/src/management/api/base.js                |  7 +--
 web/src/management/main.js                    |  3 ++
 .../pages/list/components/MemberSelect.vue    |  6 +--
 web/src/management/pages/list/index.vue       |  7 +--
 web/src/management/pages/login/LoginPage.vue  |  6 +--
 web/src/management/router/index.ts            | 11 ++--
 web/src/management/store/index.js             |  4 +-
 web/src/management/stores/user.js             | 51 +++++++++++++++++++
 web/src/render/main.js                        |  7 ++-
 web/src/render/pages/IndexPage.vue            |  1 -
 web/src/render/pages/RenderPage.vue           |  2 +-
 web/src/render/store/actions.js               |  1 -
 13 files changed, 85 insertions(+), 22 deletions(-)
 create mode 100644 web/src/management/stores/user.js

diff --git a/web/package.json b/web/package.json
index 114191e1..ad7c09f6 100644
--- a/web/package.json
+++ b/web/package.json
@@ -27,6 +27,7 @@
     "moment": "^2.29.4",
     "nanoid": "^5.0.7",
     "node-forge": "^1.3.1",
+    "pinia": "^2.1.7",
     "qrcode": "^1.5.3",
     "vue": "^3.4.15",
     "vue-router": "^4.2.5",
diff --git a/web/src/management/api/base.js b/web/src/management/api/base.js
index 45687330..1268f8bc 100644
--- a/web/src/management/api/base.js
+++ b/web/src/management/api/base.js
@@ -1,7 +1,7 @@
 import axios from 'axios'
-import store from '@/management/store/index'
 import router from '@/management/router/index'
 import { get as _get } from 'lodash-es'
+import { useUserStore } from '../stores/user'
 
 export const CODE_MAP = {
   SUCCESS: 200,
@@ -36,8 +36,9 @@ instance.interceptors.response.use(
 )
 
 instance.interceptors.request.use((config) => {
-  const hasLogined = _get(store, 'state.user.hasLogined')
-  const token = _get(store, 'state.user.userInfo.token')
+  const userStore = useUserStore()
+  const hasLogined = _get(userStore, 'hasLogined')
+  const token = _get(userStore, 'userInfo.token')
   if (hasLogined && token) {
     if (!config.headers) {
       config.headers = {}
diff --git a/web/src/management/main.js b/web/src/management/main.js
index 56af3ac3..081784ef 100644
--- a/web/src/management/main.js
+++ b/web/src/management/main.js
@@ -1,14 +1,17 @@
 import { createApp } from 'vue'
 import store from './store'
+import { createPinia } from 'pinia'
 import plainText from './directive/plainText'
 import safeHtml from './directive/safeHtml'
 
 import App from './App.vue'
 import router from './router'
 
+const pinia = createPinia()
 const app = createApp(App)
 
 app.use(store)
+app.use(pinia)
 app.use(router)
 
 app.use(plainText)
diff --git a/web/src/management/pages/list/components/MemberSelect.vue b/web/src/management/pages/list/components/MemberSelect.vue
index e36437cd..9bb83ad2 100644
--- a/web/src/management/pages/list/components/MemberSelect.vue
+++ b/web/src/management/pages/list/components/MemberSelect.vue
@@ -23,7 +23,6 @@
 
 <script lang="ts" setup>
 import { ref } from 'vue'
-import { useStore } from 'vuex'
 import MemberList from './MemberList.vue'
 import { getUserList } from '@/management/api/space'
 import {
@@ -33,8 +32,9 @@ import {
   roleLabels
 } from '@/management/utils/types/workSpace'
 import { CODE_MAP } from '@/management/api/base'
+import { useUserStore } from '@/management/stores/user'
 
-const store = useStore()
+const userStore = useUserStore()
 const props = withDefaults(
   defineProps<{
     members?: IMember[]
@@ -65,7 +65,7 @@ const remoteMethod = async (query: string) => {
     if (res.code === CODE_MAP.SUCCESS) {
       selectOptions.value = res.data.map((item: any) => {
         // 不可以选中自己
-        const currentUser = item.username === store.state.user.userInfo.username
+        const currentUser = item.username === userStore.userInfo.username
         return {
           value: item.userId,
           label: item.username,
diff --git a/web/src/management/pages/list/index.vue b/web/src/management/pages/list/index.vue
index 3a86203a..4b2cc0ee 100644
--- a/web/src/management/pages/list/index.vue
+++ b/web/src/management/pages/list/index.vue
@@ -67,11 +67,12 @@ import SpaceList from './components/SpaceList.vue'
 import SliderBar from './components/SliderBar.vue'
 import SpaceModify from './components/SpaceModify.vue'
 import { SpaceType } from '@/management/utils/types/workSpace'
-
+import { useUserStore } from '@/management/stores/user'
 const store = useStore()
+const userStore = useUserStore()
 const router = useRouter()
 const userInfo = computed(() => {
-  return store.state.user.userInfo
+  return userStore.userInfo
 })
 const loading = ref(false)
 const surveyList = computed(() => {
@@ -152,7 +153,7 @@ const onCreate = () => {
   router.push('/create')
 }
 const handleLogout = () => {
-  store.dispatch('user/logout')
+  userStore.logout()
   router.replace({ name: 'login' })
 }
 </script>
diff --git a/web/src/management/pages/login/LoginPage.vue b/web/src/management/pages/login/LoginPage.vue
index d502cf84..6564c9bf 100644
--- a/web/src/management/pages/login/LoginPage.vue
+++ b/web/src/management/pages/login/LoginPage.vue
@@ -57,7 +57,6 @@
 
 <script setup lang="ts">
 import { onMounted, ref, reactive } from 'vue'
-import { useStore } from 'vuex'
 import { useRoute, useRouter } from 'vue-router'
 
 import { ElMessage } from 'element-plus'
@@ -66,8 +65,8 @@ import 'element-plus/theme-chalk/src/message.scss'
 import { login, register } from '@/management/api/auth'
 import { refreshCaptcha as refreshCaptchaApi } from '@/management/api/captcha'
 import { CODE_MAP } from '@/management/api/base'
+import { useUserStore } from '@/management/stores/user'
 
-const store = useStore()
 const route = useRoute()
 const router = useRouter()
 
@@ -150,7 +149,8 @@ const submitForm = (type: 'login' | 'register') => {
           ElMessage.error(res.errmsg)
           throw new Error('登录/注册失败' + res.errmsg)
         }
-        store.dispatch('user/login', {
+        const userStore = useUserStore()
+        userStore.login({
           username: res.data.username,
           token: res.data.token
         })
diff --git a/web/src/management/router/index.ts b/web/src/management/router/index.ts
index 3bf8c32f..f1e82aff 100644
--- a/web/src/management/router/index.ts
+++ b/web/src/management/router/index.ts
@@ -5,6 +5,7 @@ import { SurveyPermissions } from '@/management/utils/types/workSpace'
 import { analysisTypeMap } from '@/management/config/analysisConfig'
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
+import { useUserStore } from '@/management/stores/user'
 
 const routes: RouteRecordRaw[] = [
   {
@@ -156,10 +157,11 @@ const router = createRouter({
 })
 
 router.beforeEach(async (to, from, next) => {
-  const store = useStore();
+  const store = useStore()
+  const userStore = useUserStore()
   // 初始化用户信息
-  if (!store.state.user?.initialized) {
-    await store.dispatch('user/init');
+  if (!userStore?.initialized) {
+    await userStore.init();
   }
   // 更新页面标题
   if (to.meta.title) {
@@ -174,7 +176,8 @@ router.beforeEach(async (to, from, next) => {
 });
 
 async function handleLoginGuard(to: RouteLocationNormalized, from: RouteLocationNormalized, next: NavigationGuardNext, store: Store<any>) {
-  if (store.state.user?.hasLogined) {
+  const userStore = useUserStore();
+  if (userStore?.hasLogined) {
     await handlePermissionsGuard(to, from, next, store);
   } else {
     next({
diff --git a/web/src/management/store/index.js b/web/src/management/store/index.js
index c0ca999b..f297afed 100644
--- a/web/src/management/store/index.js
+++ b/web/src/management/store/index.js
@@ -1,6 +1,6 @@
 import { createStore } from 'vuex'
 import edit from './edit'
-import user from './user'
+// import user from './user'
 import list from './list'
 import actions from './actions'
 import mutations from './mutations'
@@ -13,7 +13,7 @@ export default createStore({
   actions,
   modules: {
     edit,
-    user,
+    // user,
     list
   }
 })
diff --git a/web/src/management/stores/user.js b/web/src/management/stores/user.js
new file mode 100644
index 00000000..ddb963de
--- /dev/null
+++ b/web/src/management/stores/user.js
@@ -0,0 +1,51 @@
+// Pinia Store
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
+
+const USER_INFO_KEY = 'surveyUserInfo'
+export const useUserStore = defineStore('user', () => {
+  const userInfo = ref({
+    username: '',
+    token: ''
+  })
+  const hasLogined = ref(false)
+  const loginTime = ref(null)
+  const initialized = ref(false)
+
+  const init = () => {
+    const localData = localStorage.getItem(USER_INFO_KEY)
+    if (localData) {
+      try {
+        const { userInfo: info, loginTime } = JSON.parse(localData)
+        if (Date.now() - loginTime > 7 * 3600000) {
+          localStorage.removeItem(USER_INFO_KEY)
+        } else {
+          login(info)
+        }
+      } catch (error) {
+        console.log(error)
+      }
+    }
+    initialized.value = true
+  }
+  const login = (data) => {
+    userInfo.value = data
+    hasLogined.value = true
+    loginTime.value = Date.now()
+    localStorage.setItem(
+      USER_INFO_KEY,
+      JSON.stringify({
+        userInfo: data,
+        loginTime: loginTime
+      })
+    )
+  }
+  const logout = () =>  {
+    userInfo.value = null
+    hasLogined.value = false
+    localStorage.removeItem(USER_INFO_KEY)
+  }
+
+  return { userInfo, hasLogined, loginTime, initialized, init, login, logout }
+})
\ No newline at end of file
diff --git a/web/src/render/main.js b/web/src/render/main.js
index e8cc2762..b7c1c9bc 100644
--- a/web/src/render/main.js
+++ b/web/src/render/main.js
@@ -3,14 +3,19 @@ import App from './App.vue'
 import EventBus from './utils/eventbus'
 import router from './router'
 import store from './store'
+import { createPinia } from 'pinia'
+
 
 const app = createApp(App)
+const pinia = createPinia()
 
 const $bus = new EventBus()
 app.provide('$bus', $bus)
 // 挂载到this上
 app.config.globalProperties.$bus = $bus
-app.use(router)
 app.use(store)
+app.use(pinia)
+app.use(router)
+
 
 app.mount('#app')
diff --git a/web/src/render/pages/IndexPage.vue b/web/src/render/pages/IndexPage.vue
index 338f03a5..132df03f 100644
--- a/web/src/render/pages/IndexPage.vue
+++ b/web/src/render/pages/IndexPage.vue
@@ -11,7 +11,6 @@ import useCommandComponent from '../hooks/useCommandComponent'
 
 import AlertDialog from '../components/AlertDialog.vue'
 import { initRuleEngine } from '@/render/hooks/useRuleEngine.js'
-
 const store = useStore()
 const route = useRoute()
 const loadData = (res: any, surveyPath: string) => {
diff --git a/web/src/render/pages/RenderPage.vue b/web/src/render/pages/RenderPage.vue
index a43e0715..cdc25463 100644
--- a/web/src/render/pages/RenderPage.vue
+++ b/web/src/render/pages/RenderPage.vue
@@ -80,7 +80,7 @@ const normalizationRequestBody = () => {
     difTime: Date.now() - enterTime,
     clientTime: Date.now()
   }
-
+  
   if (encryptInfo?.encryptType) {
     result.encryptType = encryptInfo?.encryptType
     result.data = encrypt[result.encryptType as 'rsa']({
diff --git a/web/src/render/store/actions.js b/web/src/render/store/actions.js
index 2c3a93f4..c6a5122d 100644
--- a/web/src/render/store/actions.js
+++ b/web/src/render/store/actions.js
@@ -58,7 +58,6 @@ export default {
     }
     router.push({ name: 'renderPage' })
 
-
     // 根据初始的schema生成questionData, questionSeq, rules, formValues, 这四个字段
     const { questionData, questionSeq, rules, formValues } = adapter.generateData({
       bannerConf,

From 5b96ad7c69d94f959c053d27edeb641738de78c3 Mon Sep 17 00:00:00 2001
From: dayou <853094838@qq.com>
Date: Fri, 28 Jun 2024 19:05:07 +0800
Subject: [PATCH 02/13] =?UTF-8?q?feat:=20=20rener=20stores=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=8D=A0=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/render/stores/survey.js | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 web/src/render/stores/survey.js

diff --git a/web/src/render/stores/survey.js b/web/src/render/stores/survey.js
new file mode 100644
index 00000000..4d79f31d
--- /dev/null
+++ b/web/src/render/stores/survey.js
@@ -0,0 +1 @@
+// 问卷相关的Pinia Store
\ No newline at end of file

From 33f18742dd72b560f239210ac975b8070a3dbe1e Mon Sep 17 00:00:00 2001
From: ysansan <hippeauxie@gmail.com>
Date: Mon, 8 Jul 2024 21:54:59 +0800
Subject: [PATCH 03/13] =?UTF-8?q?feat:=20list=E6=A8=A1=E5=9D=97=E7=9A=84pi?=
 =?UTF-8?q?nia=E8=BF=81=E7=A7=BB=20(#323)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: list模块的pinia迁移

* fix: type check error

* fix: reserSelectValueMap， reserButtonValueMap 命名修正，addSpace和updateSpace 参数类型约束

---------

Co-authored-by: Ysansan <ysansan98@outlook.com>
---
 .../pages/create/components/CreateForm.vue    |  10 +-
 .../pages/list/components/BaseList.vue        |  45 ++---
 .../pages/list/components/MemberList.vue      |   6 +-
 .../pages/list/components/SpaceList.vue       |  25 ++-
 .../pages/list/components/SpaceModify.vue     |  48 ++---
 web/src/management/pages/list/index.vue       |  63 +++----
 web/src/management/store/index.js             |   4 +-
 web/src/management/stores/surveyList.ts       | 167 ++++++++++++++++++
 web/src/management/stores/teamSpace.ts        | 139 +++++++++++++++
 web/src/management/utils/types/workSpace.ts   |  21 ++-
 10 files changed, 425 insertions(+), 103 deletions(-)
 create mode 100644 web/src/management/stores/surveyList.ts
 create mode 100644 web/src/management/stores/teamSpace.ts

diff --git a/web/src/management/pages/create/components/CreateForm.vue b/web/src/management/pages/create/components/CreateForm.vue
index ae07eac5..614a122d 100644
--- a/web/src/management/pages/create/components/CreateForm.vue
+++ b/web/src/management/pages/create/components/CreateForm.vue
@@ -38,13 +38,11 @@
 <script setup lang="ts">
 import { ref, reactive, computed, toRefs } from 'vue'
 import { useRouter } from 'vue-router'
-import { useStore } from 'vuex'
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
-
 import { createSurvey } from '@/management/api/survey'
-
 import { SURVEY_TYPE_LIST } from '../types'
+import { useTeamSpaceStore } from '@/management/stores/teamSpace'
 
 interface Props {
   selectType?: string
@@ -54,6 +52,7 @@ const props = withDefaults(defineProps<Props>(), {
   selectType: 'normal'
 })
 
+const teamSpaceStore = useTeamSpaceStore()
 const ruleForm = ref<any>(null)
 
 const state = reactive({
@@ -79,7 +78,6 @@ const checkForm = (fn: Function) => {
 }
 
 const router = useRouter()
-const store = useStore()
 const submit = () => {
   if (!state.canSubmit) {
     return
@@ -94,8 +92,8 @@ const submit = () => {
       surveyType: selectType,
       ...state.form
     }
-    if (store.state.list.workSpaceId) {
-      payload.workspaceId = store.state.list.workSpaceId
+    if (teamSpaceStore.workSpaceId) {
+      payload.workspaceId = teamSpaceStore.workSpaceId
     }
     const res: any = await createSurvey(payload)
     if (res?.code === 200 && res?.data?.id) {
diff --git a/web/src/management/pages/list/components/BaseList.vue b/web/src/management/pages/list/components/BaseList.vue
index fa1ff189..ecc88eb5 100644
--- a/web/src/management/pages/list/components/BaseList.vue
+++ b/web/src/management/pages/list/components/BaseList.vue
@@ -105,9 +105,9 @@
 
 <script setup>
 import { ref, computed, unref } from 'vue'
-import { useStore } from 'vuex'
 import { useRouter } from 'vue-router'
 import { get, map } from 'lodash-es'
+import { storeToRefs } from 'pinia'
 
 import { ElMessage, ElMessageBox } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
@@ -123,6 +123,8 @@ import EmptyIndex from '@/management/components/EmptyIndex.vue'
 import { CODE_MAP } from '@/management/api/base'
 import { QOP_MAP } from '@/management/utils/constant.ts'
 import { deleteSurvey } from '@/management/api/survey'
+import { useTeamSpaceStore } from '@/management/stores/teamSpace'
+import { useSurveyListStore } from '@/management/stores/surveyList'
 import ModifyDialog from './ModifyDialog.vue'
 import TagModule from './TagModule.vue'
 import StateModule from './StateModule.vue'
@@ -141,7 +143,9 @@ import {
   buttonOptionsDict
 } from '@/management/config/listConfig'
 
-const store = useStore()
+const surveyListStore = useSurveyListStore()
+const teamSpaceStore = useTeamSpaceStore()
+const { workSpaceId } = storeToRefs(teamSpaceStore)
 const router = useRouter()
 const props = defineProps({
   loading: {
@@ -162,17 +166,9 @@ const fields = ['type', 'title', 'remark', 'owner', 'state', 'createDate', 'upda
 const showModify = ref(false)
 const modifyType = ref('')
 const questionInfo = ref({})
-
 const currentPage = ref(1)
-const searchVal = computed(() => {
-  return store.state.list.searchVal
-})
-const selectValueMap = computed(() => {
-  return store.state.list.selectValueMap
-})
-const buttonValueMap = computed(() => {
-  return store.state.list.buttonValueMap
-})
+const { searchVal, selectValueMap, buttonValueMap } = storeToRefs(surveyListStore)
+
 const currentComponent = computed(() => {
   return (componentName) => {
     switch (componentName) {
@@ -247,9 +243,6 @@ const order = computed(() => {
     }, [])
   return JSON.stringify(formatOrder)
 })
-const workSpaceId = computed(() => {
-  return store.state.list.workSpaceId
-})
 
 const onReflush = async () => {
   const filterString = JSON.stringify(
@@ -298,7 +291,7 @@ const getToolConfig = (row) => {
       label: '协作'
     }
   ]
-  if (!store.state.list.workSpaceId) {
+  if (!workSpaceId.value) {
     if (!row.isCollaborated) {
       // 创建人显示协作按钮
       funcList = funcList.concat(permissionsBtn)
@@ -430,19 +423,18 @@ const onRowClick = (row) => {
   })
 }
 const onSearchText = (e) => {
-  store.commit('list/setSearchVal', e)
+  searchVal.value = e
   currentPage.value = 1
   onReflush()
 }
 const onSelectChange = (selectKey, selectValue) => {
-  store.commit('list/changeSelectValueMap', { key: selectKey, value: selectValue })
-  // selectValueMap.value[selectKey] = selectValue
+  surveyListStore.changeSelectValueMap(selectKey, selectValue)
   currentPage.value = 1
   onReflush()
 }
 const onButtonChange = (effectKey, effectValue) => {
-  store.commit('list/reserButtonValueMap')
-  store.commit('list/changeButtonValueMap', { key: effectKey, value: effectValue })
+  surveyListStore.reserButtonValueMap()
+  surveyListStore.changeButtonValueMap(effectKey, effectValue)
   onReflush()
 }
 
@@ -464,16 +456,20 @@ const onCooperClose = () => {
     justify-content: space-between;
     align-items: center;
     margin-bottom: 20px;
+
     .select {
       display: flex;
     }
+
     .search {
       display: flex;
     }
   }
+
   .list-wrapper {
     padding: 10px 20px;
     background: #fff;
+
     .list-table {
       min-height: 620px;
     }
@@ -481,11 +477,13 @@ const onCooperClose = () => {
 
   .list-pagination {
     margin-top: 20px;
+
     :deep(.el-pagination) {
       display: flex;
       justify-content: flex-end;
     }
   }
+
   :deep(.el-table__header) {
     .tableview-header .el-table__cell {
       .cell {
@@ -495,21 +493,26 @@ const onCooperClose = () => {
       }
     }
   }
+
   :deep(.tableview-row) {
     .tableview-cell {
       padding: 5px 0;
+
       &.link {
         cursor: pointer;
       }
+
       .cell .cell-span {
         font-size: 14px;
       }
     }
   }
 }
+
 .el-select-dropdown__wrap {
   background: #eee;
 }
+
 .el-select-dropdown__item.hover {
   background: #fff;
 }
diff --git a/web/src/management/pages/list/components/MemberList.vue b/web/src/management/pages/list/components/MemberList.vue
index dedb06be..1832198c 100644
--- a/web/src/management/pages/list/components/MemberList.vue
+++ b/web/src/management/pages/list/components/MemberList.vue
@@ -16,11 +16,11 @@
 </template>
 <script lang="ts" setup>
 import { computed } from 'vue'
-import { useStore } from 'vuex'
 import { type IMember, type ListItem } from '@/management/utils/types/workSpace'
 import OperationSelect from './OperationSelect.vue'
+import { useTeamSpaceStore } from '@/management/stores/teamSpace'
 
-const store = useStore()
+const teamSpaceStore = useTeamSpaceStore()
 const props = withDefaults(
   defineProps<{
     members: IMember[]
@@ -43,7 +43,7 @@ const list = computed({
   }
 })
 const currentUserId = computed(() => {
-  return store.state.list.spaceDetail?.currentUserId
+  return teamSpaceStore.spaceDetail?.currentUserId
 })
 const handleRemove = (index: number) => {
   list.value.splice(index, 1)
diff --git a/web/src/management/pages/list/components/SpaceList.vue b/web/src/management/pages/list/components/SpaceList.vue
index a9237e96..07d8c987 100644
--- a/web/src/management/pages/list/components/SpaceList.vue
+++ b/web/src/management/pages/list/components/SpaceList.vue
@@ -71,17 +71,17 @@
 </template>
 <script lang="ts" setup>
 import { ref, computed } from 'vue'
-import { useStore } from 'vuex'
 import { ElMessageBox } from 'element-plus'
 import 'element-plus/theme-chalk/src/message-box.scss'
 import { get, map } from 'lodash-es'
 import { spaceListConfig } from '@/management/config/listConfig'
 import SpaceModify from './SpaceModify.vue'
 import { UserRole } from '@/management/utils/types/workSpace'
+import { useTeamSpaceStore } from '@/management/stores/teamSpace'
 
 const showSpaceModify = ref(false)
 const modifyType = ref('edit')
-const store = useStore()
+const teamSpaceStore = useTeamSpaceStore()
 const fields = ['name', 'surveyTotal', 'memberTotal', 'owner', 'createDate']
 const fieldList = computed(() => {
   return map(fields, (f) => {
@@ -89,17 +89,17 @@ const fieldList = computed(() => {
   })
 })
 const dataList = computed(() => {
-  return store.state.list.teamSpaceList
+  return teamSpaceStore.teamSpaceList
 })
 const isAdmin = (id: string) => {
   return (
-    store.state.list.teamSpaceList.find((item: any) => item._id === id)?.currentUserRole ===
+    teamSpaceStore.teamSpaceList.find((item: any) => item._id === id)?.currentUserRole ===
     UserRole.Admin
   )
 }
 
 const handleModify = async (id: string) => {
-  await store.dispatch('list/getSpaceDetail', id)
+  await teamSpaceStore.getSpaceDetail(id)
   modifyType.value = 'edit'
   showSpaceModify.value = true
 }
@@ -115,15 +115,17 @@ const handleDelete = (id: string) => {
     }
   )
     .then(async () => {
-      await store.dispatch('list/deleteSpace', id)
-      await store.dispatch('list/getSpaceList')
+      await teamSpaceStore.deleteSpace(id)
+      await teamSpaceStore.getSpaceList()
     })
     .catch(() => {})
 }
+
 const onCloseModify = () => {
   showSpaceModify.value = false
-  store.dispatch('list/getSpaceList')
+  teamSpaceStore.getSpaceList()
 }
+
 // const handleCurrentChange = (current) => {
 //   this.currentPage = current
 //   this.init()
@@ -133,6 +135,7 @@ const onCloseModify = () => {
 .list-wrap {
   padding: 20px;
   background: #fff;
+
   .list-table {
     :deep(.el-table__header) {
       .tableview-header .el-table__cell {
@@ -143,22 +146,28 @@ const onCloseModify = () => {
         }
       }
     }
+
     :deep(.tableview-row) {
       .tableview-cell {
         padding: 5px 0;
+
         &.link {
           cursor: pointer;
         }
+
         .cell .cell-span {
           font-size: 14px;
         }
       }
     }
+
     .tool-root {
       display: flex;
+
       &:first-child {
         margin-left: -10px;
       }
+
       .tool-root-btn-text {
         font-weight: normal !important;
       }
diff --git a/web/src/management/pages/list/components/SpaceModify.vue b/web/src/management/pages/list/components/SpaceModify.vue
index 668fd038..f32465b4 100644
--- a/web/src/management/pages/list/components/SpaceModify.vue
+++ b/web/src/management/pages/list/components/SpaceModify.vue
@@ -1,21 +1,7 @@
 <template>
-  <el-dialog
-    class="base-dialog-root"
-    :model-value="visible"
-    width="40%"
-    :title="formTitle"
-    @close="onClose"
-  >
-    <el-form
-      class="base-form-root"
-      ref="ruleForm"
-      :model="formModel"
-      :rules="rules"
-      label-position="top"
-      size="large"
-      @submit.prevent
-      :disabled="formDisabled"
-    >
+  <el-dialog class="base-dialog-root" :model-value="visible" width="40%" :title="formTitle" @close="onClose">
+    <el-form class="base-form-root" ref="ruleForm" :model="formModel" :rules="rules" label-position="top" size="large"
+      @submit.prevent :disabled="formDisabled">
       <el-form-item label="团队空间名称" prop="name">
         <el-input v-model="formModel.name" />
       </el-form-item>
@@ -23,11 +9,7 @@
         <el-input v-model="formModel.description" />
       </el-form-item>
       <el-form-item label="添加成员" prop="members">
-        <MemberSelect
-          :members="formModel.members"
-          @select="handleMemberSelect"
-          @change="handleMembersChange"
-        />
+        <MemberSelect :members="formModel.members" @select="handleMemberSelect" @change="handleMembersChange" />
       </el-form-item>
     </el-form>
 
@@ -44,15 +26,15 @@
 
 <script lang="ts" setup>
 import { computed, ref, shallowRef, onMounted } from 'vue'
-import { useStore } from 'vuex'
 import { pick as _pick } from 'lodash-es'
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
 import { QOP_MAP } from '@/management/utils/constant'
 import MemberSelect from './MemberSelect.vue'
 import { type IMember, type IWorkspace, UserRole } from '@/management/utils/types/workSpace'
+import { useTeamSpaceStore } from '@/management/stores/teamSpace'
 
-const store = useStore()
+const teamSpaceStore = useTeamSpaceStore()
 const emit = defineEmits(['on-close-codify', 'onFocus', 'change', 'blur'])
 const props = defineProps({
   type: String,
@@ -64,7 +46,8 @@ const ruleForm = shallowRef<any>(null)
 const formTitle = computed(() => {
   return props.type === QOP_MAP.ADD ? '创建团队空间' : '管理团队空间'
 })
-const formModel = ref<IWorkspace>({
+const formModel = ref<Required<IWorkspace>>({
+  _id: '',
   name: '',
   description: '',
   members: [] as IMember[]
@@ -86,28 +69,29 @@ const rules = {
   ]
 }
 const spaceDetail = computed(() => {
-  return store.state.list.spaceDetail
+  return teamSpaceStore.spaceDetail
 })
 const formDisabled = computed(() => {
   return spaceDetail.value?._id
-    ? store.state.list.teamSpaceList.find((item: any) => item._id === spaceDetail.value._id)
-        .currentUserRole !== UserRole.Admin
+    ? teamSpaceStore.teamSpaceList.find((item: any) => item._id === spaceDetail.value?._id)
+        ?.currentUserRole !== UserRole.Admin
     : false
 })
 
 onMounted(() => {
   if (props.type === QOP_MAP.EDIT) {
-    formModel.value = _pick(spaceDetail.value, ['_id', 'name', 'description', 'members'])
+    formModel.value = _pick(spaceDetail.value as any, ['_id', 'name', 'description', 'members'])
   }
 })
 const onClose = () => {
   formModel.value = {
+    _id: '',
     name: '',
     description: '',
     members: [] as IMember[]
   }
   // 清空空间详情
-  store.commit('list/setSpaceDetail', null)
+  teamSpaceStore.setSpaceDetail(null)
   emit('on-close-codify')
 }
 
@@ -142,10 +126,10 @@ const handleMembersChange = (val: IMember[]) => {
   formModel.value.members = val
 }
 const handleUpdate = async () => {
-  await store.dispatch('list/updateSpace', formModel.value)
+  await teamSpaceStore.updateSpace(formModel.value)
 }
 const handleAdd = async () => {
-  await store.dispatch('list/addSpace', formModel.value)
+  await teamSpaceStore.addSpace(formModel.value)
 }
 </script>
 
diff --git a/web/src/management/pages/list/index.vue b/web/src/management/pages/list/index.vue
index 4b2cc0ee..33b4a069 100644
--- a/web/src/management/pages/list/index.vue
+++ b/web/src/management/pages/list/index.vue
@@ -60,60 +60,52 @@
 
 <script setup lang="ts">
 import { ref, computed, onMounted } from 'vue'
-import { useStore } from 'vuex'
 import { useRouter } from 'vue-router'
+import { storeToRefs } from 'pinia'
 import BaseList from './components/BaseList.vue'
 import SpaceList from './components/SpaceList.vue'
 import SliderBar from './components/SliderBar.vue'
 import SpaceModify from './components/SpaceModify.vue'
 import { SpaceType } from '@/management/utils/types/workSpace'
 import { useUserStore } from '@/management/stores/user'
-const store = useStore()
+import { useTeamSpaceStore } from '@/management/stores/teamSpace'
+import { useSurveyListStore } from '@/management/stores/surveyList'
+
 const userStore = useUserStore()
+const teamSpaceStore = useTeamSpaceStore()
+const surveyListStore = useSurveyListStore()
+
+const { surveyList, surveyTotal } = storeToRefs(surveyListStore)
+const { spaceMenus, workSpaceId, spaceType } = storeToRefs(teamSpaceStore)
 const router = useRouter()
 const userInfo = computed(() => {
   return userStore.userInfo
 })
-const loading = ref(false)
-const surveyList = computed(() => {
-  return store.state.list.surveyList
-})
-const surveyTotal = computed(() => {
-  return store.state.list.surveyTotal
-})
-const activeIndex = ref('1')
 
-const spaceMenus = computed(() => {
-  return store.state.list.spaceMenus
-})
-const workSpaceId = computed(() => {
-  return store.state.list.workSpaceId
-})
-const spaceType = computed(() => {
-  return store.state.list.spaceType
-})
+const loading = ref(false)
+const activeIndex = ref('1')
 const handleSpaceSelect = (id: any) => {
   if (id === SpaceType.Personal) {
     // 点击个人空间菜单
-    if (store.state.list.spaceType === SpaceType.Personal) {
+    if (teamSpaceStore.spaceType === SpaceType.Personal) {
       return
     }
-    store.commit('list/changeSpaceType', SpaceType.Personal)
-    store.commit('list/changeWorkSpace', '')
+    teamSpaceStore.changeSpaceType(SpaceType.Personal)
+    teamSpaceStore.changeWorkSpace('')
   } else if (id === SpaceType.Group) {
     // 点击团队空间组菜单
-    if (store.state.list.spaceType === SpaceType.Group) {
+    if (teamSpaceStore.spaceType === SpaceType.Group) {
       return
     }
-    store.commit('list/changeSpaceType', SpaceType.Group)
-    store.commit('list/changeWorkSpace', '')
+    teamSpaceStore.changeSpaceType(SpaceType.Group)
+    teamSpaceStore.changeWorkSpace('')
   } else if (!Object.values(SpaceType).includes(id)) {
     // 点击具体团队空间
-    if (store.state.list.workSpaceId === id) {
+    if (teamSpaceStore.workSpaceId === id) {
       return
     }
-    store.commit('list/changeSpaceType', SpaceType.Teamwork)
-    store.commit('list/changeWorkSpace', id)
+    teamSpaceStore.changeSpaceType(SpaceType.Teamwork)
+    teamSpaceStore.changeWorkSpace(id)
   }
 
   fetchSurveyList()
@@ -123,7 +115,7 @@ onMounted(() => {
   fetchSurveyList()
 })
 const fetchSpaceList = () => {
-  store.dispatch('list/getSpaceList')
+  teamSpaceStore.getSpaceList()
 }
 const fetchSurveyList = async (params?: any) => {
   if (!params) {
@@ -136,7 +128,7 @@ const fetchSurveyList = async (params?: any) => {
     params.workspaceId = workSpaceId.value
   }
   loading.value = true
-  await store.dispatch('list/getSurveyList', params)
+  await surveyListStore.getSurveyList(params)
   loading.value = false
 }
 const modifyType = ref('add')
@@ -172,27 +164,33 @@ const handleLogout = () => {
     justify-content: space-between;
     align-items: center;
     box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.04);
+
     .left {
       display: flex;
       align-items: center;
       width: calc(100% - 200px);
+
       .logo-img {
         width: 90px;
         height: fit-content;
         padding-right: 20px;
       }
+
       .el-menu {
         width: 100%;
         height: 56px;
         border: none !important;
+
         :deep(.el-menu-item, .is-active) {
           border: none !important;
         }
       }
     }
+
     .login-info {
       display: flex;
       align-items: center;
+
       .login-info-img {
         margin-left: 10px;
         height: 30px;
@@ -209,10 +207,12 @@ const handleLogout = () => {
       color: #faa600;
     }
   }
+
   .content-wrap {
     position: relative;
     height: calc(100% - 56px);
   }
+
   .list-content {
     position: relative;
     height: 100%;
@@ -227,6 +227,7 @@ const handleLogout = () => {
       justify-content: space-between;
       align-items: center;
       margin-bottom: 24px;
+
       .operation {
         flex: 0 1 auto;
         display: flex;
@@ -239,9 +240,11 @@ const handleLogout = () => {
       .create-btn {
         background: #4a4c5b;
       }
+
       .space-btn {
         background: $primary-color;
       }
+
       .btn {
         width: 132px;
         height: 32px;
diff --git a/web/src/management/store/index.js b/web/src/management/store/index.js
index f297afed..7d8eb427 100644
--- a/web/src/management/store/index.js
+++ b/web/src/management/store/index.js
@@ -1,7 +1,7 @@
 import { createStore } from 'vuex'
 import edit from './edit'
 // import user from './user'
-import list from './list'
+// import list from './list'
 import actions from './actions'
 import mutations from './mutations'
 import state from './state'
@@ -14,6 +14,6 @@ export default createStore({
   modules: {
     edit,
     // user,
-    list
+    // list
   }
 })
diff --git a/web/src/management/stores/surveyList.ts b/web/src/management/stores/surveyList.ts
new file mode 100644
index 00000000..35d5d19e
--- /dev/null
+++ b/web/src/management/stores/surveyList.ts
@@ -0,0 +1,167 @@
+import { CODE_MAP } from '@/management/api/base'
+import { ElMessage } from 'element-plus'
+import 'element-plus/theme-chalk/src/message.scss'
+import { getSurveyList as getSurveyListReq } from '@/management/api/survey'
+import { defineStore } from 'pinia'
+import { useTeamSpaceStore } from './teamSpace'
+import { ref, computed } from 'vue'
+
+export const useSurveyListStore = defineStore('surveyList', () => {
+  const surveyList = ref([])
+  const surveyTotal = ref(0)
+
+  const {
+    searchVal,
+    selectValueMap,
+    buttonValueMap,
+    listFilter,
+    listOrder,
+    resetSearch,
+    resetSelectValueMap,
+    resetButtonValueMap,
+    changeSelectValueMap,
+    changeButtonValueMap
+  } = useSearchSurvey()
+
+  const teamSpaceStore = useTeamSpaceStore()
+  async function getSurveyList(payload: { curPage?: number; pageSize?: number }) {
+    const filterString = JSON.stringify(
+      listFilter.value.filter((item) => {
+        return item.condition[0].value
+      })
+    )
+    const orderString = JSON.stringify(listOrder.value)
+    try {
+      const params = {
+        curPage: payload?.curPage || 1,
+        pageSize: payload?.pageSize || 10, // 默认一页10条
+        filter: filterString,
+        order: orderString,
+        workspaceId: teamSpaceStore.workSpaceId
+      }
+
+      const res: any = await getSurveyListReq(params)
+      if (res.code === CODE_MAP.SUCCESS) {
+        surveyList.value = res.data.data
+        surveyTotal.value = res.data.count
+      } else {
+        ElMessage.error(res.errmsg)
+      }
+    } catch (error) {
+      ElMessage.error('getSurveyList status' + error)
+    }
+  }
+
+  return {
+    surveyList,
+    surveyTotal,
+    searchVal,
+    selectValueMap,
+    buttonValueMap,
+    listFliter: listFilter,
+    listOrder,
+    resetSearch,
+    getSurveyList,
+    resetSelectValueMap,
+    resetButtonValueMap,
+    changeSelectValueMap,
+    changeButtonValueMap
+  }
+})
+
+function useSearchSurvey() {
+  const searchVal = ref('')
+  const selectValueMap = ref<Record<string, any>>({
+    surveyType: '',
+    'curStatus.status': ''
+  })
+
+  const buttonValueMap = ref<Record<string, any>>({
+    'curStatus.date': '',
+    createDate: -1
+  })
+
+  const listFilter = computed(() => {
+    return [
+      {
+        comparator: '',
+        condition: [
+          {
+            field: 'title',
+            value: searchVal.value,
+            comparator: '$regex'
+          }
+        ]
+      },
+      {
+        comparator: '',
+        condition: [
+          {
+            field: 'curStatus.status',
+            value: selectValueMap.value['curStatus.status']
+          }
+        ]
+      },
+      {
+        comparator: '',
+        condition: [
+          {
+            field: 'surveyType',
+            value: selectValueMap.value.surveyType
+          }
+        ]
+      }
+    ]
+  })
+
+  const listOrder = computed(() => {
+    return Object.entries(buttonValueMap.value)
+      .filter(([, effectValue]) => effectValue)
+      .reduce((prev: { field: string, value: string | number }[], item) => {
+        const [effectKey, effectValue] = item
+        prev.push({ field: effectKey, value: effectValue })
+        return prev
+      }, [])
+  })
+
+  function resetSelectValueMap() {
+    selectValueMap.value = {
+      surveyType: '',
+      'curStatus.status': ''
+    }
+  }
+
+  function resetButtonValueMap() {
+    buttonValueMap.value = {
+      'curStatus.date': '',
+      createDate: -1
+    }
+  }
+
+  function changeSelectValueMap(key: string, value: string | number) {
+    selectValueMap.value[key] = value
+  }
+
+  function changeButtonValueMap(key: string, value: string | number) {
+    buttonValueMap.value[key] = value
+  }
+
+  function resetSearch() {
+    searchVal.value = ''
+    resetSelectValueMap()
+    resetButtonValueMap()
+  }
+
+  return {
+    searchVal,
+    selectValueMap,
+    buttonValueMap,
+    listFilter,
+    listOrder,
+    resetSearch,
+    resetSelectValueMap,
+    resetButtonValueMap,
+    changeSelectValueMap,
+    changeButtonValueMap
+  }
+}
diff --git a/web/src/management/stores/teamSpace.ts b/web/src/management/stores/teamSpace.ts
new file mode 100644
index 00000000..d0902c7a
--- /dev/null
+++ b/web/src/management/stores/teamSpace.ts
@@ -0,0 +1,139 @@
+import {
+  createSpace,
+  updateSpace as updateSpaceReq,
+  deleteSpace as deleteSpaceReq,
+  getSpaceList as getSpaceListReq,
+  getSpaceDetail as getSpaceDetailReq
+} from '@/management/api/space'
+import { CODE_MAP } from '@/management/api/base'
+import { SpaceType } from '@/management/utils/types/workSpace'
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { useSurveyListStore } from './surveyList'
+import { type SpaceDetail, type SpaceItem, type IWorkspace } from '@/management/utils/types/workSpace'
+
+
+export const useTeamSpaceStore = defineStore('teamSpace', () => {
+  // list空间
+  const spaceMenus = ref([
+    {
+      icon: 'icon-wodekongjian',
+      name: '我的空间',
+      id: SpaceType.Personal
+    },
+    {
+      icon: 'icon-tuanduikongjian',
+      name: '团队空间',
+      id: SpaceType.Group,
+      children: []
+    }
+  ])
+  const spaceType = ref(SpaceType.Personal)
+  const workSpaceId = ref('')
+  const spaceDetail = ref<SpaceDetail | null>(null)
+  const teamSpaceList = ref<SpaceItem[]>([])
+
+  const surveyListStore = useSurveyListStore()
+
+  async function getSpaceList() {
+    try {
+      const res: any = await getSpaceListReq()
+
+      if (res.code === CODE_MAP.SUCCESS) {
+        const { list } = res.data
+        const teamSpace = list.map((item: SpaceDetail) => {
+          return {
+            id: item._id,
+            name: item.name
+          }
+        })
+        teamSpaceList.value = list
+        spaceMenus.value[1].children = teamSpace
+      } else {
+        ElMessage.error('getSpaceList' + res.errmsg)
+      }
+    } catch (err) {
+      ElMessage.error('getSpaceList' + err)
+    }
+  }
+
+  async function getSpaceDetail(id: string) {
+    try {
+      const _id = id || workSpaceId.value
+      const res: any = await getSpaceDetailReq(_id)
+      if (res.code === CODE_MAP.SUCCESS) {
+        spaceDetail.value = res.data
+      } else {
+        ElMessage.error('getSpaceList' + res.errmsg)
+      }
+    } catch (err) {
+      ElMessage.error('getSpaceList' + err)
+    }
+  }
+
+  function changeSpaceType(id: SpaceType) {
+    spaceType.value = id
+  }
+
+  function changeWorkSpace(id: string) {
+    workSpaceId.value = id
+    surveyListStore.resetSearch()
+  }
+
+  async function deleteSpace(id: string) {
+    try {
+      const res: any = await deleteSpaceReq(id)
+
+      if (res.code === CODE_MAP.SUCCESS) {
+        ElMessage.success('删除成功')
+      } else {
+        ElMessage.error(res.errmsg)
+      }
+    } catch (err: any) {
+      ElMessage.error(err)
+    }
+  }
+
+  async function updateSpace(params: Required<IWorkspace>) {
+    const { _id: workspaceId, name, description, members } = params
+    const res: any = await updateSpaceReq({ workspaceId, name, description, members })
+
+    if (res?.code === CODE_MAP.SUCCESS) {
+      ElMessage.success('更新成功')
+    } else {
+      ElMessage.error(res?.errmsg)
+    }
+  }
+
+  async function addSpace(params: IWorkspace) {
+    const { name, description, members } = params
+    const res: any = await createSpace({ name, description, members })
+
+    if (res.code === CODE_MAP.SUCCESS) {
+      ElMessage.success('添加成功')
+    } else {
+      ElMessage.error('createSpace  code err' + res.errmsg)
+    }
+  }
+
+  function setSpaceDetail(data: null | SpaceDetail) {
+    spaceDetail.value = data
+  }
+
+  return {
+    spaceMenus,
+    spaceType,
+    workSpaceId,
+    spaceDetail,
+    teamSpaceList,
+    getSpaceList,
+    getSpaceDetail,
+    changeSpaceType,
+    changeWorkSpace,
+    addSpace,
+    deleteSpace,
+    updateSpace,
+    setSpaceDetail
+  }
+})
diff --git a/web/src/management/utils/types/workSpace.ts b/web/src/management/utils/types/workSpace.ts
index e6ca90d7..00be8b4e 100644
--- a/web/src/management/utils/types/workSpace.ts
+++ b/web/src/management/utils/types/workSpace.ts
@@ -11,11 +11,12 @@ export interface MenuItem {
 }
 
 export type IWorkspace = {
-  id?: string
+  _id?: string
   name: string
   description: string
   members: IMember[]
 }
+
 export type IMember = {
   userId: string
   username: string
@@ -23,6 +24,24 @@ export type IMember = {
   _id?: string
 }
 
+export interface SpaceDetail {
+  _id?: string
+  name: string
+  currentUserId?: string
+  description: string
+  members: IMember[]
+}
+
+export type SpaceItem = Required<Omit<SpaceDetail, 'members'>> & {
+  createDate: string
+  curStatus: { date: number, status: string }
+  memberTotal: number
+  currentUserRole: string
+  owner: string
+  ownerId: string
+  surveyTotal: number
+}
+
 export enum SpaceType {
   Personal = 'personal',
   Group = 'group',

From 64a1caf0dddac3c238e519d9ee2ca8bdf18f9d92 Mon Sep 17 00:00:00 2001
From: sudoooooo <zjbbabybaby@gmail.com>
Date: Tue, 9 Jul 2024 11:36:18 +0800
Subject: [PATCH 04/13] =?UTF-8?q?feat:=20list=E6=A8=A1=E5=9D=97=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/create/components/CreateForm.vue    |   8 +-
 .../pages/list/components/BaseList.vue        |   8 +-
 .../pages/list/components/MemberList.vue      |   6 +-
 .../pages/list/components/SpaceList.vue       |  16 +--
 .../pages/list/components/SpaceModify.vue     |  40 ++++--
 web/src/management/pages/list/index.vue       |  26 ++--
 web/src/management/store/list/index.js        |  28 ++--
 web/src/management/stores/surveyList.ts       | 136 +++++++++---------
 .../stores/{teamSpace.ts => workSpace.ts}     |  30 ++--
 9 files changed, 162 insertions(+), 136 deletions(-)
 rename web/src/management/stores/{teamSpace.ts => workSpace.ts} (88%)

diff --git a/web/src/management/pages/create/components/CreateForm.vue b/web/src/management/pages/create/components/CreateForm.vue
index 614a122d..43b0c628 100644
--- a/web/src/management/pages/create/components/CreateForm.vue
+++ b/web/src/management/pages/create/components/CreateForm.vue
@@ -42,7 +42,7 @@ import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
 import { createSurvey } from '@/management/api/survey'
 import { SURVEY_TYPE_LIST } from '../types'
-import { useTeamSpaceStore } from '@/management/stores/teamSpace'
+import { useWorkSpaceStore } from '@/management/stores/workSpace'
 
 interface Props {
   selectType?: string
@@ -52,7 +52,7 @@ const props = withDefaults(defineProps<Props>(), {
   selectType: 'normal'
 })
 
-const teamSpaceStore = useTeamSpaceStore()
+const workSpaceStore = useWorkSpaceStore()
 const ruleForm = ref<any>(null)
 
 const state = reactive({
@@ -92,8 +92,8 @@ const submit = () => {
       surveyType: selectType,
       ...state.form
     }
-    if (teamSpaceStore.workSpaceId) {
-      payload.workspaceId = teamSpaceStore.workSpaceId
+    if (workSpaceStore.workSpaceId) {
+      payload.workspaceId = workSpaceStore.workSpaceId
     }
     const res: any = await createSurvey(payload)
     if (res?.code === 200 && res?.data?.id) {
diff --git a/web/src/management/pages/list/components/BaseList.vue b/web/src/management/pages/list/components/BaseList.vue
index ecc88eb5..5c96911a 100644
--- a/web/src/management/pages/list/components/BaseList.vue
+++ b/web/src/management/pages/list/components/BaseList.vue
@@ -123,7 +123,7 @@ import EmptyIndex from '@/management/components/EmptyIndex.vue'
 import { CODE_MAP } from '@/management/api/base'
 import { QOP_MAP } from '@/management/utils/constant.ts'
 import { deleteSurvey } from '@/management/api/survey'
-import { useTeamSpaceStore } from '@/management/stores/teamSpace'
+import { useWorkSpaceStore } from '@/management/stores/workSpace'
 import { useSurveyListStore } from '@/management/stores/surveyList'
 import ModifyDialog from './ModifyDialog.vue'
 import TagModule from './TagModule.vue'
@@ -144,8 +144,8 @@ import {
 } from '@/management/config/listConfig'
 
 const surveyListStore = useSurveyListStore()
-const teamSpaceStore = useTeamSpaceStore()
-const { workSpaceId } = storeToRefs(teamSpaceStore)
+const workSpaceStore = useWorkSpaceStore()
+const { workSpaceId } = storeToRefs(workSpaceStore)
 const router = useRouter()
 const props = defineProps({
   loading: {
@@ -433,7 +433,7 @@ const onSelectChange = (selectKey, selectValue) => {
   onReflush()
 }
 const onButtonChange = (effectKey, effectValue) => {
-  surveyListStore.reserButtonValueMap()
+  surveyListStore.resetButtonValueMap()
   surveyListStore.changeButtonValueMap(effectKey, effectValue)
   onReflush()
 }
diff --git a/web/src/management/pages/list/components/MemberList.vue b/web/src/management/pages/list/components/MemberList.vue
index 1832198c..2a5afa3c 100644
--- a/web/src/management/pages/list/components/MemberList.vue
+++ b/web/src/management/pages/list/components/MemberList.vue
@@ -18,9 +18,9 @@
 import { computed } from 'vue'
 import { type IMember, type ListItem } from '@/management/utils/types/workSpace'
 import OperationSelect from './OperationSelect.vue'
-import { useTeamSpaceStore } from '@/management/stores/teamSpace'
+import { useWorkSpaceStore } from '@/management/stores/workSpace'
 
-const teamSpaceStore = useTeamSpaceStore()
+const workSpaceStore = useWorkSpaceStore()
 const props = withDefaults(
   defineProps<{
     members: IMember[]
@@ -43,7 +43,7 @@ const list = computed({
   }
 })
 const currentUserId = computed(() => {
-  return teamSpaceStore.spaceDetail?.currentUserId
+  return workSpaceStore.spaceDetail?.currentUserId
 })
 const handleRemove = (index: number) => {
   list.value.splice(index, 1)
diff --git a/web/src/management/pages/list/components/SpaceList.vue b/web/src/management/pages/list/components/SpaceList.vue
index 07d8c987..4765ba0e 100644
--- a/web/src/management/pages/list/components/SpaceList.vue
+++ b/web/src/management/pages/list/components/SpaceList.vue
@@ -77,11 +77,11 @@ import { get, map } from 'lodash-es'
 import { spaceListConfig } from '@/management/config/listConfig'
 import SpaceModify from './SpaceModify.vue'
 import { UserRole } from '@/management/utils/types/workSpace'
-import { useTeamSpaceStore } from '@/management/stores/teamSpace'
+import { useWorkSpaceStore } from '@/management/stores/workSpace'
 
 const showSpaceModify = ref(false)
 const modifyType = ref('edit')
-const teamSpaceStore = useTeamSpaceStore()
+const workSpaceStore = useWorkSpaceStore()
 const fields = ['name', 'surveyTotal', 'memberTotal', 'owner', 'createDate']
 const fieldList = computed(() => {
   return map(fields, (f) => {
@@ -89,17 +89,17 @@ const fieldList = computed(() => {
   })
 })
 const dataList = computed(() => {
-  return teamSpaceStore.teamSpaceList
+  return workSpaceStore.workSpaceList
 })
 const isAdmin = (id: string) => {
   return (
-    teamSpaceStore.teamSpaceList.find((item: any) => item._id === id)?.currentUserRole ===
+    workSpaceStore.workSpaceList.find((item: any) => item._id === id)?.currentUserRole ===
     UserRole.Admin
   )
 }
 
 const handleModify = async (id: string) => {
-  await teamSpaceStore.getSpaceDetail(id)
+  await workSpaceStore.getSpaceDetail(id)
   modifyType.value = 'edit'
   showSpaceModify.value = true
 }
@@ -115,15 +115,15 @@ const handleDelete = (id: string) => {
     }
   )
     .then(async () => {
-      await teamSpaceStore.deleteSpace(id)
-      await teamSpaceStore.getSpaceList()
+      await workSpaceStore.deleteSpace(id)
+      await workSpaceStore.getSpaceList()
     })
     .catch(() => {})
 }
 
 const onCloseModify = () => {
   showSpaceModify.value = false
-  teamSpaceStore.getSpaceList()
+  workSpaceStore.getSpaceList()
 }
 
 // const handleCurrentChange = (current) => {
diff --git a/web/src/management/pages/list/components/SpaceModify.vue b/web/src/management/pages/list/components/SpaceModify.vue
index f32465b4..69997646 100644
--- a/web/src/management/pages/list/components/SpaceModify.vue
+++ b/web/src/management/pages/list/components/SpaceModify.vue
@@ -1,7 +1,21 @@
 <template>
-  <el-dialog class="base-dialog-root" :model-value="visible" width="40%" :title="formTitle" @close="onClose">
-    <el-form class="base-form-root" ref="ruleForm" :model="formModel" :rules="rules" label-position="top" size="large"
-      @submit.prevent :disabled="formDisabled">
+  <el-dialog
+    class="base-dialog-root"
+    :model-value="visible"
+    width="40%"
+    :title="formTitle"
+    @close="onClose"
+  >
+    <el-form
+      class="base-form-root"
+      ref="ruleForm"
+      :model="formModel"
+      :rules="rules"
+      label-position="top"
+      size="large"
+      @submit.prevent
+      :disabled="formDisabled"
+    >
       <el-form-item label="团队空间名称" prop="name">
         <el-input v-model="formModel.name" />
       </el-form-item>
@@ -9,7 +23,11 @@
         <el-input v-model="formModel.description" />
       </el-form-item>
       <el-form-item label="添加成员" prop="members">
-        <MemberSelect :members="formModel.members" @select="handleMemberSelect" @change="handleMembersChange" />
+        <MemberSelect
+          :members="formModel.members"
+          @select="handleMemberSelect"
+          @change="handleMembersChange"
+        />
       </el-form-item>
     </el-form>
 
@@ -32,9 +50,9 @@ import 'element-plus/theme-chalk/src/message.scss'
 import { QOP_MAP } from '@/management/utils/constant'
 import MemberSelect from './MemberSelect.vue'
 import { type IMember, type IWorkspace, UserRole } from '@/management/utils/types/workSpace'
-import { useTeamSpaceStore } from '@/management/stores/teamSpace'
+import { useWorkSpaceStore } from '@/management/stores/workSpace'
 
-const teamSpaceStore = useTeamSpaceStore()
+const workSpaceStore = useWorkSpaceStore()
 const emit = defineEmits(['on-close-codify', 'onFocus', 'change', 'blur'])
 const props = defineProps({
   type: String,
@@ -69,11 +87,11 @@ const rules = {
   ]
 }
 const spaceDetail = computed(() => {
-  return teamSpaceStore.spaceDetail
+  return workSpaceStore.spaceDetail
 })
 const formDisabled = computed(() => {
   return spaceDetail.value?._id
-    ? teamSpaceStore.teamSpaceList.find((item: any) => item._id === spaceDetail.value?._id)
+    ? workSpaceStore.workSpaceList.find((item: any) => item._id === spaceDetail.value?._id)
         ?.currentUserRole !== UserRole.Admin
     : false
 })
@@ -91,7 +109,7 @@ const onClose = () => {
     members: [] as IMember[]
   }
   // 清空空间详情
-  teamSpaceStore.setSpaceDetail(null)
+  workSpaceStore.setSpaceDetail(null)
   emit('on-close-codify')
 }
 
@@ -126,10 +144,10 @@ const handleMembersChange = (val: IMember[]) => {
   formModel.value.members = val
 }
 const handleUpdate = async () => {
-  await teamSpaceStore.updateSpace(formModel.value)
+  await workSpaceStore.updateSpace(formModel.value)
 }
 const handleAdd = async () => {
-  await teamSpaceStore.addSpace(formModel.value)
+  await workSpaceStore.addSpace(formModel.value)
 }
 </script>
 
diff --git a/web/src/management/pages/list/index.vue b/web/src/management/pages/list/index.vue
index 33b4a069..87c1d658 100644
--- a/web/src/management/pages/list/index.vue
+++ b/web/src/management/pages/list/index.vue
@@ -68,15 +68,15 @@ import SliderBar from './components/SliderBar.vue'
 import SpaceModify from './components/SpaceModify.vue'
 import { SpaceType } from '@/management/utils/types/workSpace'
 import { useUserStore } from '@/management/stores/user'
-import { useTeamSpaceStore } from '@/management/stores/teamSpace'
+import { useWorkSpaceStore } from '@/management/stores/workSpace'
 import { useSurveyListStore } from '@/management/stores/surveyList'
 
 const userStore = useUserStore()
-const teamSpaceStore = useTeamSpaceStore()
+const workSpaceStore = useWorkSpaceStore()
 const surveyListStore = useSurveyListStore()
 
 const { surveyList, surveyTotal } = storeToRefs(surveyListStore)
-const { spaceMenus, workSpaceId, spaceType } = storeToRefs(teamSpaceStore)
+const { spaceMenus, workSpaceId, spaceType } = storeToRefs(workSpaceStore)
 const router = useRouter()
 const userInfo = computed(() => {
   return userStore.userInfo
@@ -87,25 +87,25 @@ const activeIndex = ref('1')
 const handleSpaceSelect = (id: any) => {
   if (id === SpaceType.Personal) {
     // 点击个人空间菜单
-    if (teamSpaceStore.spaceType === SpaceType.Personal) {
+    if (workSpaceStore.spaceType === SpaceType.Personal) {
       return
     }
-    teamSpaceStore.changeSpaceType(SpaceType.Personal)
-    teamSpaceStore.changeWorkSpace('')
+    workSpaceStore.changeSpaceType(SpaceType.Personal)
+    workSpaceStore.changeWorkSpace('')
   } else if (id === SpaceType.Group) {
     // 点击团队空间组菜单
-    if (teamSpaceStore.spaceType === SpaceType.Group) {
+    if (workSpaceStore.spaceType === SpaceType.Group) {
       return
     }
-    teamSpaceStore.changeSpaceType(SpaceType.Group)
-    teamSpaceStore.changeWorkSpace('')
+    workSpaceStore.changeSpaceType(SpaceType.Group)
+    workSpaceStore.changeWorkSpace('')
   } else if (!Object.values(SpaceType).includes(id)) {
     // 点击具体团队空间
-    if (teamSpaceStore.workSpaceId === id) {
+    if (workSpaceStore.workSpaceId === id) {
       return
     }
-    teamSpaceStore.changeSpaceType(SpaceType.Teamwork)
-    teamSpaceStore.changeWorkSpace(id)
+    workSpaceStore.changeSpaceType(SpaceType.Teamwork)
+    workSpaceStore.changeWorkSpace(id)
   }
 
   fetchSurveyList()
@@ -115,7 +115,7 @@ onMounted(() => {
   fetchSurveyList()
 })
 const fetchSpaceList = () => {
-  teamSpaceStore.getSpaceList()
+  workSpaceStore.getSpaceList()
 }
 const fetchSurveyList = async (params?: any) => {
   if (!params) {
diff --git a/web/src/management/store/list/index.js b/web/src/management/store/list/index.js
index e347bebd..7561bcbe 100644
--- a/web/src/management/store/list/index.js
+++ b/web/src/management/store/list/index.js
@@ -37,7 +37,7 @@ export default {
     spaceType: SpaceType.Personal,
     workSpaceId: '',
     spaceDetail: null,
-    teamSpaceList: [],
+    workSpaceList: [],
     // 列表管理
     surveyList: [],
     surveyTotal: 0,
@@ -52,7 +52,7 @@ export default {
     }
   },
   getters: {
-    listFliter(state) {
+    listFilter(state) {
       return [
         {
           comparator: '',
@@ -96,25 +96,25 @@ export default {
     }
   },
   mutations: {
-    updateSpaceMenus(state, teamSpace) {
+    updateSpaceMenus(state, workSpace) {
       // 更新空间列表下的团队空间
-      set(state, 'spaceMenus[1].children', teamSpace)
+      set(state, 'spaceMenus[1].children', workSpace)
     },
     changeSpaceType(state, spaceType) {
       state.spaceType = spaceType
     },
     changeWorkSpace(state, workSpaceId) {
       // 切换空间清除筛选条件
-      this.commit('list/reserSelectValueMap')
-      this.commit('list/reserButtonValueMap')
+      this.commit('list/resetSelectValueMap')
+      this.commit('list/resetButtonValueMap')
       this.commit('list/setSearchVal', '')
       state.workSpaceId = workSpaceId
     },
     setSpaceDetail(state, data) {
       state.spaceDetail = data
     },
-    setTeamSpaceList(state, data) {
-      state.teamSpaceList = data
+    setWorkSpaceList(state, data) {
+      state.workSpaceList = data
     },
     setSurveyList(state, list) {
       state.surveyList = list
@@ -125,7 +125,7 @@ export default {
     setSearchVal(state, data) {
       state.searchVal = data
     },
-    reserSelectValueMap(state) {
+    resetSelectValueMap(state) {
       state.selectValueMap = {
         surveyType: '',
         'curStatus.status': ''
@@ -134,7 +134,7 @@ export default {
     changeSelectValueMap(state, { key, value }) {
       state.selectValueMap[key] = value
     },
-    reserButtonValueMap(state) {
+    resetButtonValueMap(state) {
       state.buttonValueMap = {
         'curStatus.date': '',
         createDate: -1
@@ -151,14 +151,14 @@ export default {
 
         if (res.code === CODE_MAP.SUCCESS) {
           const { list } = res.data
-          const teamSpace = list.map((item) => {
+          const workSpace = list.map((item) => {
             return {
               id: item._id,
               name: item.name
             }
           })
-          commit('setTeamSpaceList', list)
-          commit('updateSpaceMenus', teamSpace)
+          commit('setWorkSpaceList', list)
+          commit('updateSpaceMenus', workSpace)
         } else {
           ElMessage.error('getSpaceList' + res.errmsg)
         }
@@ -221,7 +221,7 @@ export default {
     },
     async getSurveyList({ state, getters, commit }, payload) {
       const filterString = JSON.stringify(
-        getters.listFliter.filter((item) => {
+        getters.listFilter.filter((item) => {
           return item.condition[0].value
         })
       )
diff --git a/web/src/management/stores/surveyList.ts b/web/src/management/stores/surveyList.ts
index 35d5d19e..017834b3 100644
--- a/web/src/management/stores/surveyList.ts
+++ b/web/src/management/stores/surveyList.ts
@@ -1,74 +1,13 @@
-import { CODE_MAP } from '@/management/api/base'
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
-import { getSurveyList as getSurveyListReq } from '@/management/api/survey'
 import { defineStore } from 'pinia'
-import { useTeamSpaceStore } from './teamSpace'
+
+import { CODE_MAP } from '@/management/api/base'
+import { getSurveyList as getSurveyListReq } from '@/management/api/survey'
+
+import { useWorkSpaceStore } from './workSpace'
 import { ref, computed } from 'vue'
 
-export const useSurveyListStore = defineStore('surveyList', () => {
-  const surveyList = ref([])
-  const surveyTotal = ref(0)
-
-  const {
-    searchVal,
-    selectValueMap,
-    buttonValueMap,
-    listFilter,
-    listOrder,
-    resetSearch,
-    resetSelectValueMap,
-    resetButtonValueMap,
-    changeSelectValueMap,
-    changeButtonValueMap
-  } = useSearchSurvey()
-
-  const teamSpaceStore = useTeamSpaceStore()
-  async function getSurveyList(payload: { curPage?: number; pageSize?: number }) {
-    const filterString = JSON.stringify(
-      listFilter.value.filter((item) => {
-        return item.condition[0].value
-      })
-    )
-    const orderString = JSON.stringify(listOrder.value)
-    try {
-      const params = {
-        curPage: payload?.curPage || 1,
-        pageSize: payload?.pageSize || 10, // 默认一页10条
-        filter: filterString,
-        order: orderString,
-        workspaceId: teamSpaceStore.workSpaceId
-      }
-
-      const res: any = await getSurveyListReq(params)
-      if (res.code === CODE_MAP.SUCCESS) {
-        surveyList.value = res.data.data
-        surveyTotal.value = res.data.count
-      } else {
-        ElMessage.error(res.errmsg)
-      }
-    } catch (error) {
-      ElMessage.error('getSurveyList status' + error)
-    }
-  }
-
-  return {
-    surveyList,
-    surveyTotal,
-    searchVal,
-    selectValueMap,
-    buttonValueMap,
-    listFliter: listFilter,
-    listOrder,
-    resetSearch,
-    getSurveyList,
-    resetSelectValueMap,
-    resetButtonValueMap,
-    changeSelectValueMap,
-    changeButtonValueMap
-  }
-})
-
 function useSearchSurvey() {
   const searchVal = ref('')
   const selectValueMap = ref<Record<string, any>>({
@@ -117,7 +56,7 @@ function useSearchSurvey() {
   const listOrder = computed(() => {
     return Object.entries(buttonValueMap.value)
       .filter(([, effectValue]) => effectValue)
-      .reduce((prev: { field: string, value: string | number }[], item) => {
+      .reduce((prev: { field: string; value: string | number }[], item) => {
         const [effectKey, effectValue] = item
         prev.push({ field: effectKey, value: effectValue })
         return prev
@@ -165,3 +104,66 @@ function useSearchSurvey() {
     changeButtonValueMap
   }
 }
+
+export const useSurveyListStore = defineStore('surveyList', () => {
+  const surveyList = ref([])
+  const surveyTotal = ref(0)
+
+  const {
+    searchVal,
+    selectValueMap,
+    buttonValueMap,
+    listFilter,
+    listOrder,
+    resetSearch,
+    resetSelectValueMap,
+    resetButtonValueMap,
+    changeSelectValueMap,
+    changeButtonValueMap
+  } = useSearchSurvey()
+
+  const workSpaceStore = useWorkSpaceStore()
+  async function getSurveyList(payload: { curPage?: number; pageSize?: number }) {
+    const filterString = JSON.stringify(
+      listFilter.value.filter((item) => {
+        return item.condition[0].value
+      })
+    )
+    const orderString = JSON.stringify(listOrder.value)
+    try {
+      const params = {
+        curPage: payload?.curPage || 1,
+        pageSize: payload?.pageSize || 10, // 默认一页10条
+        filter: filterString,
+        order: orderString,
+        workspaceId: workSpaceStore.workSpaceId
+      }
+
+      const res: any = await getSurveyListReq(params)
+      if (res.code === CODE_MAP.SUCCESS) {
+        surveyList.value = res.data.data
+        surveyTotal.value = res.data.count
+      } else {
+        ElMessage.error(res.errmsg)
+      }
+    } catch (error) {
+      ElMessage.error('getSurveyList status' + error)
+    }
+  }
+
+  return {
+    surveyList,
+    surveyTotal,
+    searchVal,
+    selectValueMap,
+    buttonValueMap,
+    listFilter: listFilter,
+    listOrder,
+    resetSearch,
+    getSurveyList,
+    resetSelectValueMap,
+    resetButtonValueMap,
+    changeSelectValueMap,
+    changeButtonValueMap
+  }
+})
diff --git a/web/src/management/stores/teamSpace.ts b/web/src/management/stores/workSpace.ts
similarity index 88%
rename from web/src/management/stores/teamSpace.ts
rename to web/src/management/stores/workSpace.ts
index d0902c7a..80e09a34 100644
--- a/web/src/management/stores/teamSpace.ts
+++ b/web/src/management/stores/workSpace.ts
@@ -1,3 +1,9 @@
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import 'element-plus/theme-chalk/src/message.scss'
+
+import { CODE_MAP } from '@/management/api/base'
 import {
   createSpace,
   updateSpace as updateSpaceReq,
@@ -5,16 +11,16 @@ import {
   getSpaceList as getSpaceListReq,
   getSpaceDetail as getSpaceDetailReq
 } from '@/management/api/space'
-import { CODE_MAP } from '@/management/api/base'
 import { SpaceType } from '@/management/utils/types/workSpace'
-import { defineStore } from 'pinia'
-import { ref } from 'vue'
-import { ElMessage } from 'element-plus'
+import {
+  type SpaceDetail,
+  type SpaceItem,
+  type IWorkspace
+} from '@/management/utils/types/workSpace'
+
 import { useSurveyListStore } from './surveyList'
-import { type SpaceDetail, type SpaceItem, type IWorkspace } from '@/management/utils/types/workSpace'
 
-
-export const useTeamSpaceStore = defineStore('teamSpace', () => {
+export const useWorkSpaceStore = defineStore('workSpace', () => {
   // list空间
   const spaceMenus = ref([
     {
@@ -32,7 +38,7 @@ export const useTeamSpaceStore = defineStore('teamSpace', () => {
   const spaceType = ref(SpaceType.Personal)
   const workSpaceId = ref('')
   const spaceDetail = ref<SpaceDetail | null>(null)
-  const teamSpaceList = ref<SpaceItem[]>([])
+  const workSpaceList = ref<SpaceItem[]>([])
 
   const surveyListStore = useSurveyListStore()
 
@@ -42,14 +48,14 @@ export const useTeamSpaceStore = defineStore('teamSpace', () => {
 
       if (res.code === CODE_MAP.SUCCESS) {
         const { list } = res.data
-        const teamSpace = list.map((item: SpaceDetail) => {
+        const workSpace = list.map((item: SpaceDetail) => {
           return {
             id: item._id,
             name: item.name
           }
         })
-        teamSpaceList.value = list
-        spaceMenus.value[1].children = teamSpace
+        workSpaceList.value = list
+        spaceMenus.value[1].children = workSpace
       } else {
         ElMessage.error('getSpaceList' + res.errmsg)
       }
@@ -126,7 +132,7 @@ export const useTeamSpaceStore = defineStore('teamSpace', () => {
     spaceType,
     workSpaceId,
     spaceDetail,
-    teamSpaceList,
+    workSpaceList,
     getSpaceList,
     getSpaceDetail,
     changeSpaceType,

From 1a15faad4289e832627fb41cfc2afb02c3f31a3d Mon Sep 17 00:00:00 2001
From: Jiangchunfu <mrj_kevin@163.com>
Date: Wed, 10 Jul 2024 14:05:41 +0800
Subject: [PATCH 05/13] =?UTF-8?q?feat:=20edit=20vuex=E8=BF=81=E7=A7=BBpini?=
 =?UTF-8?q?a=20(#325)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* build: dev reload optimized

* feat: edit store change pinia

* feat: store中状态修改增加方法

* feat: js改为ts

---------

Co-authored-by: jiangchunfu <jiangchunfu@kaike.la>
---
 web/src/management/hooks/useQuestionInfo.js   |  12 +-
 web/src/management/hooks/useResizeObserver.js |   2 +-
 .../analysis/components/StatisticsItem.vue    |   2 +-
 .../pages/edit/components/MaterialGroup.vue   |   8 +-
 .../pages/edit/components/ModuleNavbar.vue    |   7 +-
 web/src/management/pages/edit/index.vue       |  11 +-
 .../modules/contentModule/HistoryPanel.vue    |  15 +-
 .../modules/contentModule/PublishPanel.vue    |  11 +-
 .../edit/modules/contentModule/SavePanel.vue  |  13 +-
 .../modules/questionModule/PreviewPanel.vue   |  38 +-
 .../modules/questionModule/SetterPanel.vue    |  18 +-
 .../components/QuestionCatalog.vue            |  24 +-
 .../questionModule/components/TypeList.vue    |  20 +-
 .../modules/settingModule/SettingPanel.vue    |  11 +-
 .../settingModule/result/CatalogPanel.vue     |  12 +-
 .../settingModule/result/PreviewPanel.vue     |  15 +-
 .../settingModule/result/SetterPanel.vue      |  18 +-
 .../settingModule/skin/CatalogPanel.vue       |   5 +-
 .../settingModule/skin/PreviewPanel.vue       |  18 +-
 .../settingModule/skin/SetterPanel.vue        |  10 +-
 .../pages/edit/pages/edit/LogicEditPage.vue   |  10 +-
 .../management/pages/publish/PublishPage.vue  |  15 +-
 web/src/management/stores/edit.ts             | 343 ++++++++++++++++++
 web/vite.config.ts                            |   8 +-
 24 files changed, 494 insertions(+), 152 deletions(-)
 create mode 100644 web/src/management/stores/edit.ts

diff --git a/web/src/management/hooks/useQuestionInfo.js b/web/src/management/hooks/useQuestionInfo.js
index f8f66e3f..19049008 100644
--- a/web/src/management/hooks/useQuestionInfo.js
+++ b/web/src/management/hooks/useQuestionInfo.js
@@ -1,17 +1,19 @@
 import { computed } from 'vue'
-import store from '@/management/store'
+import { storeToRefs } from 'pinia'
+import { useEditStore } from '@/management/stores/edit'
 import { cleanRichText } from '@/common/xss'
 export const useQuestionInfo = (field) => {
+  const editStore = useEditStore()
+  const { questionDataList } = storeToRefs(editStore)
+
   const getQuestionTitle = computed(() => {
-    const questionDataList = store.state.edit.schema.questionDataList
     return () => {
-      return questionDataList.find((item) => item.field === field)?.title
+      return questionDataList.value.find((item) => item.field === field)?.title
     }
   })
   const getOptionTitle = computed(() => {
-    const questionDataList = store.state.edit.schema.questionDataList
     return (value) => {
-      const options = questionDataList.find((item) => item.field === field)?.options || []
+      const options = questionDataList.value.find((item) => item.field === field)?.options || []
       if (value instanceof Array) {
         return options
           .filter((item) => value.includes(item.hash))
diff --git a/web/src/management/hooks/useResizeObserver.js b/web/src/management/hooks/useResizeObserver.js
index 486962f2..cbf400ea 100644
--- a/web/src/management/hooks/useResizeObserver.js
+++ b/web/src/management/hooks/useResizeObserver.js
@@ -1,5 +1,5 @@
 // 引入防抖函数
-import _debounce from 'lodash/debounce'
+import { debounce as _debounce } from 'lodash-es'
 /**
  * @description: 监听元素尺寸变化
  * @param {*} el 元素dom
diff --git a/web/src/management/pages/analysis/components/StatisticsItem.vue b/web/src/management/pages/analysis/components/StatisticsItem.vue
index 7cd95b1e..9d43ce2d 100644
--- a/web/src/management/pages/analysis/components/StatisticsItem.vue
+++ b/web/src/management/pages/analysis/components/StatisticsItem.vue
@@ -34,7 +34,7 @@
 
 <script setup>
 import { reactive, toRefs, computed, watch, onMounted, onUnmounted, ref } from 'vue'
-import _cloneDeep from 'lodash/cloneDeep'
+import { cloneDeep as _cloneDeep } from 'lodash-es'
 import {
   separateItemListHead,
   summaryType,
diff --git a/web/src/management/pages/edit/components/MaterialGroup.vue b/web/src/management/pages/edit/components/MaterialGroup.vue
index f59932ab..83aaf152 100644
--- a/web/src/management/pages/edit/components/MaterialGroup.vue
+++ b/web/src/management/pages/edit/components/MaterialGroup.vue
@@ -34,7 +34,7 @@
 
 <script>
 import { computed, defineComponent, ref, getCurrentInstance } from 'vue'
-import { useStore } from 'vuex'
+import { useEditStore } from '@/management/stores/edit'
 import QuestionContainerB from '@/materials/questions/QuestionContainerB'
 import QuestionWrapper from '@/management/pages/edit/components/QuestionWrapper.vue'
 import draggable from 'vuedraggable'
@@ -61,13 +61,13 @@ export default defineComponent({
   },
   emits: ['change', 'select', 'changeSeq'],
   setup(props, { emit }) {
-    const store = useStore()
+    const editStore = useEditStore()
     const renderData = computed({
       get() {
         return filterQuestionPreviewData(props.questionDataList)
       },
-      set(questionDataList) {
-        store.commit('edit/setQuestionDataList', questionDataList)
+      set(value) {
+        editStore.setQuestionDataList(value)
       }
     })
     const handleSelect = (index) => {
diff --git a/web/src/management/pages/edit/components/ModuleNavbar.vue b/web/src/management/pages/edit/components/ModuleNavbar.vue
index 0965cddf..7f1178b5 100644
--- a/web/src/management/pages/edit/components/ModuleNavbar.vue
+++ b/web/src/management/pages/edit/components/ModuleNavbar.vue
@@ -17,8 +17,7 @@
 </template>
 <script setup lang="ts">
 import { computed } from 'vue'
-import { useStore } from 'vuex'
-import { get as _get } from 'lodash-es'
+import { useEditStore } from '@/management/stores/edit'
 
 import BackPanel from '../modules/generalModule/BackPanel.vue'
 import TitlePanel from '../modules/generalModule/TitlePanel.vue'
@@ -28,8 +27,8 @@ import PreviewPanel from '../modules/contentModule/PreviewPanel.vue'
 import SavePanel from '../modules/contentModule/SavePanel.vue'
 import PublishPanel from '../modules/contentModule/PublishPanel.vue'
 
-const store = useStore()
-const title = computed(() => _get(store.state, 'edit.schema.metaData.title'))
+const editStore = useEditStore()
+const title = computed(() => (editStore.schema?.metaData as any)?.title || '')
 </script>
 <style lang="scss" scoped>
 .nav {
diff --git a/web/src/management/pages/edit/index.vue b/web/src/management/pages/edit/index.vue
index b1657e23..97e41b7e 100644
--- a/web/src/management/pages/edit/index.vue
+++ b/web/src/management/pages/edit/index.vue
@@ -15,7 +15,7 @@
 </template>
 <script setup lang="ts">
 import { onMounted } from 'vue'
-import { useStore } from 'vuex'
+import { useEditStore } from '@/management/stores/edit'
 import { useRouter, useRoute } from 'vue-router'
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
@@ -26,16 +26,17 @@ import Navbar from './components/ModuleNavbar.vue'
 
 import { initShowLogicEngine } from '@/management/hooks/useShowLogicEngine'
 
-const store = useStore()
+const editStore = useEditStore()
+const { schema, init, setSurveyId } = editStore
 const router = useRouter()
 const route = useRoute()
 
 onMounted(async () => {
-  store.commit('edit/setSurveyId', route.params.id)
+  setSurveyId(route.params.id as string)
 
   try {
-    await store.dispatch('edit/init')
-    await initShowLogicEngine(store.state.edit.schema.logicConf.showLogicConf || {})
+    await init()
+    await initShowLogicEngine(schema.logicConf.showLogicConf || {})
   } catch (err: any) {
     ElMessage.error(err.message)
 
diff --git a/web/src/management/pages/edit/modules/contentModule/HistoryPanel.vue b/web/src/management/pages/edit/modules/contentModule/HistoryPanel.vue
index 094921e7..b7cea2eb 100644
--- a/web/src/management/pages/edit/modules/contentModule/HistoryPanel.vue
+++ b/web/src/management/pages/edit/modules/contentModule/HistoryPanel.vue
@@ -25,9 +25,9 @@
   </el-popover>
 </template>
 <script setup lang="ts">
-import { ref, computed, watch } from 'vue'
-import { useStore } from 'vuex'
-import { get as _get } from 'lodash-es'
+import { ref, watch } from 'vue'
+import { storeToRefs } from 'pinia'
+import { useEditStore } from '@/management/stores/edit'
 import moment from 'moment'
 import 'moment/locale/zh-cn'
 moment.locale('zh-cn')
@@ -44,21 +44,21 @@ const publishList = ref<Array<any>>([])
 const currentTab = ref<'daily' | 'publish'>('daily')
 const visible = ref<boolean>(false)
 
-const store = useStore()
+const editStore = useEditStore()
+const { surveyId, schemaUpdateTime } = storeToRefs(editStore)
 
 const queryHistories = async () => {
   if (dirtyMonitor.value) {
     loading.value = true
     dirtyMonitor.value = false
 
-    const surveyId = _get(store.state, 'edit.surveyId')
     const [dHis, pHis] = await Promise.all([
       getSurveyHistory({
-        surveyId,
+        surveyId: surveyId.value,
         historyType: 'dailyHis'
       }),
       getSurveyHistory({
-        surveyId,
+        surveyId: surveyId.value,
         historyType: 'publishHis'
       })
     ]).finally(() => {
@@ -81,7 +81,6 @@ const handlePopoverShow = async () => {
 }
 const loading = ref<boolean>(false)
 const dirtyMonitor = ref<boolean>(true)
-const schemaUpdateTime = computed(() => _get(store.state, 'edit.schemaUpdateTime'))
 
 watch(
   schemaUpdateTime,
diff --git a/web/src/management/pages/edit/modules/contentModule/PublishPanel.vue b/web/src/management/pages/edit/modules/contentModule/PublishPanel.vue
index 622698d5..9cf8baf8 100644
--- a/web/src/management/pages/edit/modules/contentModule/PublishPanel.vue
+++ b/web/src/management/pages/edit/modules/contentModule/PublishPanel.vue
@@ -5,7 +5,7 @@
 </template>
 <script setup lang="ts">
 import { ref } from 'vue'
-import { useStore } from 'vuex'
+import { useEditStore } from '@/management/stores/edit'
 import { useRouter } from 'vue-router'
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
@@ -15,7 +15,8 @@ import { showLogicEngine } from '@/management/hooks/useShowLogicEngine'
 import buildData from './buildData'
 
 const isPublishing = ref<boolean>(false)
-const store = useStore()
+const editStore = useEditStore()
+const { schema, changeSchema, getSchemaFromRemote } = editStore
 const router = useRouter()
 
 const updateLogicConf = () => {
@@ -27,7 +28,7 @@ const updateLogicConf = () => {
     showLogicEngine.value.validateSchema()
     const showLogicConf = showLogicEngine.value.toJson()
     // 更新逻辑配置
-    store.dispatch('edit/changeSchema', { key: 'logicConf', value: { showLogicConf } })
+    changeSchema({ key: 'logicConf', value: { showLogicConf } })
   }
 }
 
@@ -46,7 +47,7 @@ const handlePublish = async () => {
     return
   }
 
-  const saveData = buildData(store.state.edit.schema)
+  const saveData = buildData(schema)
   if (!saveData.surveyId) {
     isPublishing.value = false
     ElMessage.error('未获取到问卷id')
@@ -64,7 +65,7 @@ const handlePublish = async () => {
     const publishRes: any = await publishSurvey({ surveyId: saveData.surveyId })
     if (publishRes.code === 200) {
       ElMessage.success('发布成功')
-      store.dispatch('edit/getSchemaFromRemote')
+      getSchemaFromRemote()
       router.push({ name: 'publish' })
     } else {
       ElMessage.error(`发布失败 ${publishRes.errmsg}`)
diff --git a/web/src/management/pages/edit/modules/contentModule/SavePanel.vue b/web/src/management/pages/edit/modules/contentModule/SavePanel.vue
index a3f2f3cd..7534d5dd 100644
--- a/web/src/management/pages/edit/modules/contentModule/SavePanel.vue
+++ b/web/src/management/pages/edit/modules/contentModule/SavePanel.vue
@@ -15,8 +15,8 @@
 </template>
 <script setup lang="ts">
 import { ref, computed, nextTick, watch } from 'vue'
-import { useStore } from 'vuex'
-import { get as _get } from 'lodash-es'
+import { storeToRefs } from 'pinia'
+import { useEditStore } from '@/management/stores/edit'
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
 
@@ -36,10 +36,12 @@ const saveText = computed(
     })[autoSaveStatus.value]
 )
 
-const store = useStore()
+const editStore = useEditStore()
+const { schemaUpdateTime } = storeToRefs(editStore)
+const { schema, changeSchema } = editStore
 
 const saveData = async () => {
-  const saveData = buildData(store.state.edit.schema)
+  const saveData = buildData(schema)
 
   if (!saveData.surveyId) {
     ElMessage.error('未获取到问卷id')
@@ -59,7 +61,7 @@ const updateLogicConf = () => {
     showLogicEngine.value.validateSchema()
     const showLogicConf = showLogicEngine.value.toJson()
     // 更新逻辑配置
-    store.dispatch('edit/changeSchema', { key: 'logicConf', value: { showLogicConf } })
+    changeSchema({ key: 'logicConf', value: { showLogicConf } })
   }
 }
 
@@ -128,7 +130,6 @@ const handleSave = async () => {
   }
 }
 
-const schemaUpdateTime = computed(() => _get(store.state, 'edit.schemaUpdateTime'))
 watch(schemaUpdateTime, () => {
   triggerAutoSave()
 })
diff --git a/web/src/management/pages/edit/modules/questionModule/PreviewPanel.vue b/web/src/management/pages/edit/modules/questionModule/PreviewPanel.vue
index ea59380a..d9640982 100644
--- a/web/src/management/pages/edit/modules/questionModule/PreviewPanel.vue
+++ b/web/src/management/pages/edit/modules/questionModule/PreviewPanel.vue
@@ -6,13 +6,13 @@
           :bannerConf="bannerConf"
           :readonly="false"
           :is-selected="currentEditOne === 'mainTitle'"
-          @select="onSelectEditOne('mainTitle')"
+          @select="setCurrentEditOne('mainTitle')"
           @change="handleChange"
         />
         <MaterialGroup
           :current-edit-one="parseInt(currentEditOne)"
           :questionDataList="questionDataList"
-          @select="onSelectEditOne"
+          @select="setCurrentEditOne"
           @change="handleChange"
           @changeSeq="onQuestionOperation"
           ref="materialGroup"
@@ -22,7 +22,7 @@
           :readonly="false"
           :skin-conf="skinConf"
           :is-selected="currentEditOne === 'submit'"
-          @select="onSelectEditOne('submit')"
+          @select="setCurrentEditOne('submit')"
         />
       </div>
     </div>
@@ -30,24 +30,23 @@
 </template>
 
 <script setup>
-import { computed, ref, watch } from 'vue'
+import { computed, ref, watch, toRefs } from 'vue'
 import communalLoader from '@materials/communals/communalLoader.js'
 import MaterialGroup from '@/management/pages/edit/components/MaterialGroup.vue'
-import { useStore } from 'vuex'
+import { storeToRefs } from 'pinia'
+import { useEditStore } from '@/management/stores/edit'
 
 const MainTitle = communalLoader.loadComponent('MainTitle')
 const SubmitButton = communalLoader.loadComponent('SubmitButton')
 
-const store = useStore()
+const editStore = useEditStore()
+const { questionDataList, currentEditOne, currentEditKey } = storeToRefs(editStore)
+const { schema, changeSchema, moveQuestion, copyQuestion, deleteQuestion, setCurrentEditOne } =
+  editStore
 const mainOperation = ref(null)
 const materialGroup = ref(null)
 
-const bannerConf = computed(() => store.state.edit.schema.bannerConf)
-const submitConf = computed(() => store.state.edit.schema.submitConf)
-const skinConf = computed(() => store.state.edit.schema.skinConf)
-const questionDataList = computed(() => store.state.edit.schema.questionDataList)
-const currentEditOne = computed(() => store.state.edit.currentEditOne)
-const currentEditKey = computed(() => store.getters['edit/currentEditKey'])
+const { bannerConf, submitConf, skinConf } = toRefs(schema)
 const autoScrollData = computed(() => {
   return {
     currentEditOne: currentEditOne.value,
@@ -55,44 +54,39 @@ const autoScrollData = computed(() => {
   }
 })
 
-const onSelectEditOne = async (currentEditOne) => {
-  store.commit('edit/setCurrentEditOne', currentEditOne)
-}
-
 const handleChange = (data) => {
   if (currentEditOne.value === null) {
     return
   }
   const { key, value } = data
   const resultKey = `${currentEditKey.value}.${key}`
-  store.dispatch('edit/changeSchema', { key: resultKey, value })
+  changeSchema({ key: resultKey, value })
 }
 
 const onMainClick = (e) => {
   if (e.target === mainOperation.value) {
-    store.commit('edit/setCurrentEditOne', null)
+    setCurrentEditOne(null)
   }
 }
 
 const onQuestionOperation = (data) => {
   switch (data.type) {
     case 'move':
-      store.dispatch('edit/moveQuestion', {
+      moveQuestion({
         index: data.index,
         range: data.range
       })
       break
     case 'delete':
-      store.dispatch('edit/deleteQuestion', { index: data.index })
+      deleteQuestion({ index: data.index })
       break
     case 'copy':
-      store.dispatch('edit/copyQuestion', { index: data.index })
+      copyQuestion({ index: data.index })
       break
     default:
       break
   }
 }
-
 watch(
   skinConf,
   (newVal) => {
diff --git a/web/src/management/pages/edit/modules/questionModule/SetterPanel.vue b/web/src/management/pages/edit/modules/questionModule/SetterPanel.vue
index fec4d9a0..1d478bd5 100644
--- a/web/src/management/pages/edit/modules/questionModule/SetterPanel.vue
+++ b/web/src/management/pages/edit/modules/questionModule/SetterPanel.vue
@@ -17,23 +17,19 @@
   </div>
 </template>
 <script setup lang="ts">
-import { computed } from 'vue'
-import { useStore } from 'vuex'
+import { storeToRefs } from 'pinia'
+import { useEditStore } from '@/management/stores/edit'
 
 import SetterField from '@/management/pages/edit/components/SetterField.vue'
 
-const store = useStore()
-
-const currentEditOne = computed(() => store.state?.edit?.currentEditOne)
-const formConfigList = computed(() => store.getters['edit/formConfigList'])
-const moduleConfig = computed(() => store.getters['edit/moduleConfig'])
-const currentEditKey = computed(() => store.getters['edit/currentEditKey'])
-const currentEditMeta = computed(() => store.getters['edit/currentEditMeta'])
-
+const editStore = useEditStore()
+const { currentEditOne, currentEditKey, currentEditMeta, formConfigList, moduleConfig } =
+  storeToRefs(editStore)
+const { changeSchema } = editStore
 const handleFormChange = (data: any) => {
   const { key, value } = data
   const resultKey = `${currentEditKey.value}.${key}`
-  store.dispatch('edit/changeSchema', { key: resultKey, value })
+  changeSchema({ key: resultKey, value })
 }
 </script>
 <style lang="scss" scoped>
diff --git a/web/src/management/pages/edit/modules/questionModule/components/QuestionCatalog.vue b/web/src/management/pages/edit/modules/questionModule/components/QuestionCatalog.vue
index cff08a4e..3d4ac3dc 100644
--- a/web/src/management/pages/edit/modules/questionModule/components/QuestionCatalog.vue
+++ b/web/src/management/pages/edit/modules/questionModule/components/QuestionCatalog.vue
@@ -12,7 +12,7 @@
           :title="element.title"
           :indexNumber="element.indexNumber"
           :showIndex="element.showIndex"
-          @select="handleSelect(index)"
+          @select="setCurrentEditOne(index)"
         />
       </template>
     </draggable>
@@ -20,34 +20,30 @@
 </template>
 <script setup lang="ts">
 import { computed } from 'vue'
-import { useStore } from 'vuex'
+import { storeToRefs } from 'pinia'
+import { useEditStore } from '@/management/stores/edit'
 import draggable from 'vuedraggable'
 
 import CatalogItem from './CatalogItem.vue'
 import { filterQuestionPreviewData } from '@/management/utils/index'
 
-const store = useStore()
+const editStore = useEditStore()
+const { questionDataList, currentEditOne } = storeToRefs(editStore)
+const { moveQuestion, setCurrentEditOne } = editStore
 const renderData = computed(() => {
-  const questions = store.state.edit.schema.questionDataList
-  return filterQuestionPreviewData(questions) || []
+  return filterQuestionPreviewData(questionDataList.value) || []
 })
 
 const handleDragEnd = ({ newIndex, oldIndex }: any) => {
-  const currentActivityKey = store.state.edit.currentEditOne
-
-  if (currentActivityKey === oldIndex) {
-    handleSelect(newIndex)
+  if (currentEditOne.value === oldIndex) {
+    setCurrentEditOne(newIndex)
   }
 
-  store.dispatch('edit/moveQuestion', {
+  moveQuestion({
     index: oldIndex,
     range: newIndex - oldIndex
   })
 }
-
-const handleSelect = (idx: number) => {
-  store.commit('edit/setCurrentEditOne', idx)
-}
 </script>
 <style lang="scss" scoped>
 .question-catalog-wrapper {
diff --git a/web/src/management/pages/edit/modules/questionModule/components/TypeList.vue b/web/src/management/pages/edit/modules/questionModule/components/TypeList.vue
index b19077ab..81d038f6 100644
--- a/web/src/management/pages/edit/modules/questionModule/components/TypeList.vue
+++ b/web/src/management/pages/edit/modules/questionModule/components/TypeList.vue
@@ -45,20 +45,24 @@ import { DND_GROUP } from '@/management/config/dnd'
 
 import questionMenuConfig, { questionTypeList } from '@/management/config/questionMenuConfig'
 import { getQuestionByType } from '@/management/utils/index'
-import { useStore } from 'vuex'
-import { get as _get, isNumber as _isNumber } from 'lodash-es'
+import { storeToRefs } from 'pinia'
+import { useEditStore } from '@/management/stores/edit'
+import { isNumber as _isNumber } from 'lodash-es'
 import { computed, ref } from 'vue'
 import { QUESTION_TYPE } from '@/common/typeEnum.ts'
-const store = useStore()
+
+const editStore = useEditStore()
+const { questionDataList, currentEditOne } = storeToRefs(editStore)
+const { addQuestion, setCurrentEditOne } = editStore
 
 const activeNames = ref([0, 1])
 const previewImg = ref('')
 const isShowPreviewImage = ref(false)
 const previewTop = ref(0)
-const questionDataList = computed(() => _get(store, 'state.edit.schema.questionDataList'))
 const newQuestionIndex = computed(() => {
-  const currentEditOne = _get(store, 'state.edit.currentEditOne')
-  const index = _isNumber(currentEditOne) ? currentEditOne + 1 : questionDataList.value.length
+  const index = _isNumber(currentEditOne.value)
+    ? currentEditOne.value + 1
+    : questionDataList.value.length
   return index
 })
 
@@ -78,8 +82,8 @@ const getNewQuestion = ({ type }) => {
 
 const onQuestionType = ({ type }) => {
   const newQuestion = getNewQuestion({ type })
-  store.dispatch('edit/addQuestion', { question: newQuestion, index: newQuestionIndex.value })
-  store.commit('edit/setCurrentEditOne', newQuestionIndex.value)
+  addQuestion({ question: newQuestion, index: newQuestionIndex.value })
+  setCurrentEditOne(newQuestionIndex.value)
 }
 
 const showPreview = ({ snapshot }, id) => {
diff --git a/web/src/management/pages/edit/modules/settingModule/SettingPanel.vue b/web/src/management/pages/edit/modules/settingModule/SettingPanel.vue
index 176dbaee..827f49a7 100644
--- a/web/src/management/pages/edit/modules/settingModule/SettingPanel.vue
+++ b/web/src/management/pages/edit/modules/settingModule/SettingPanel.vue
@@ -38,7 +38,7 @@
 </template>
 <script setup lang="ts">
 import { computed, ref, onMounted, shallowRef } from 'vue'
-import { useStore } from 'vuex'
+import { useEditStore } from '@/management/stores/edit'
 import { cloneDeep as _cloneDeep, isArray as _isArray, get as _get } from 'lodash-es'
 
 import baseConfig from './config/baseConfig'
@@ -61,12 +61,12 @@ const setterList = computed(() => {
       if (_isArray(formKey)) {
         formValue = []
         for (const key of formKey) {
-          const val = _get(store.state.edit.schema, key, formItem.value)
+          const val = _get(schema, key, formItem.value)
           formValue.push(val)
           dataConfig[key] = val
         }
       } else {
-        formValue = _get(store.state.edit.schema, formKey, formItem.value)
+        formValue = _get(schema, formKey, formItem.value)
         dataConfig[formKey] = formValue
       }
       formItem.value = formValue
@@ -78,9 +78,10 @@ const setterList = computed(() => {
   })
 })
 
-const store = useStore()
+const editStore = useEditStore()
+const { schema, changeSchema } = editStore
 const handleFormChange = (data: any) => {
-  store.dispatch('edit/changeSchema', {
+  changeSchema({
     key: data.key,
     value: data.value
   })
diff --git a/web/src/management/pages/edit/modules/settingModule/result/CatalogPanel.vue b/web/src/management/pages/edit/modules/settingModule/result/CatalogPanel.vue
index 4873709b..202bdf5d 100644
--- a/web/src/management/pages/edit/modules/settingModule/result/CatalogPanel.vue
+++ b/web/src/management/pages/edit/modules/settingModule/result/CatalogPanel.vue
@@ -17,10 +17,12 @@
   </div>
 </template>
 <script setup lang="ts">
-import { useStore } from 'vuex'
+import { useEditStore } from '@/management/stores/edit'
 import { EDIT_STATUS_MAP } from '../enum'
+import { storeToRefs } from 'pinia'
 
-const store = useStore()
+const editStore = useEditStore()
+const { currentEditStatus } = storeToRefs(editStore)
 const statusList = [
   {
     type: EDIT_STATUS_MAP.SUCCESS,
@@ -35,10 +37,8 @@ const statusList = [
 ]
 
 const handleChangePreview = (data: any) => {
-  const currentStatus = store.state?.edit?.currentEditStatus
-
-  if (currentStatus && currentStatus !== data.type) {
-    store.commit('edit/changeStatusPreview', data)
+  if (currentEditStatus.value !== data.type) {
+    editStore.changeCurrentEditStatus(data.type)
   }
 }
 </script>
diff --git a/web/src/management/pages/edit/modules/settingModule/result/PreviewPanel.vue b/web/src/management/pages/edit/modules/settingModule/result/PreviewPanel.vue
index e1d35a93..2cd77879 100644
--- a/web/src/management/pages/edit/modules/settingModule/result/PreviewPanel.vue
+++ b/web/src/management/pages/edit/modules/settingModule/result/PreviewPanel.vue
@@ -12,9 +12,9 @@
   </div>
 </template>
 <script setup lang="ts">
-import { computed } from 'vue'
-import { useStore } from 'vuex'
-import { get as _get } from 'lodash-es'
+import { toRef } from 'vue'
+import { storeToRefs } from 'pinia'
+import { useEditStore } from '@/management/stores/edit'
 
 import SuccessContent from '../components/SuccessContent.vue'
 import OverTime from '../components/OverTime.vue'
@@ -25,11 +25,10 @@ const components = {
   [EDIT_STATUS_MAP.OVERTIME]: OverTime
 }
 
-const store = useStore()
-const currentEditStatus = computed(() => store.state?.edit?.currentEditStatus)
-const moduleConfig = computed(() => {
-  return _get(store.state, 'edit.schema.submitConf')
-})
+const editStore = useEditStore()
+const { currentEditStatus } = storeToRefs(editStore)
+const { schema } = editStore
+const moduleConfig = toRef(schema, 'submitConf')
 </script>
 <style lang="scss" scoped>
 .result-config-preview {
diff --git a/web/src/management/pages/edit/modules/settingModule/result/SetterPanel.vue b/web/src/management/pages/edit/modules/settingModule/result/SetterPanel.vue
index 28c74093..6df1d0ae 100644
--- a/web/src/management/pages/edit/modules/settingModule/result/SetterPanel.vue
+++ b/web/src/management/pages/edit/modules/settingModule/result/SetterPanel.vue
@@ -23,8 +23,9 @@
   </div>
 </template>
 <script setup lang="ts">
-import { computed, ref, shallowRef } from 'vue'
-import { useStore } from 'vuex'
+import { computed, ref, shallowRef, toRef } from 'vue'
+import { storeToRefs } from 'pinia'
+import { useEditStore } from '@/management/stores/edit'
 import { get as _get } from 'lodash-es'
 
 import FormItem from '@/materials/setters/widgets/FormItem.vue'
@@ -36,15 +37,16 @@ const textMap = {
   OverTime: '问卷过期页面配置'
 }
 
-const store = useStore()
+const editStore = useEditStore()
+const { currentEditStatus } = storeToRefs(editStore)
+const { schema, changeSchema } = editStore
 
 const components = shallowRef<any>({})
 const registerTypes = ref<any>({})
-const moduleConfig = computed(() => _get(store.state, 'edit.schema.submitConf'))
-const currentEditText = computed(() => (textMap as any)[store.state.edit.currentEditStatus])
+const moduleConfig = toRef(schema, 'submitConf')
+const currentEditText = computed(() => (textMap as any)[currentEditStatus.value])
 const formFields = computed(() => {
-  const currentStatus = store.state.edit.currentEditStatus
-  const formList = (statusConfig as any)[currentStatus] || []
+  const formList = (statusConfig as any)[currentEditStatus.value] || []
   const list = formList.map((item: any) => {
     const value = _get(moduleConfig.value, item.key, item.value)
 
@@ -57,7 +59,7 @@ const formFields = computed(() => {
 })
 
 const handleFormChange = ({ key, value }: any) => {
-  store.dispatch('edit/changeSchema', {
+  changeSchema({
     key: `submitConf.${key}`,
     value
   })
diff --git a/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue b/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue
index 7f663cd6..0314c3fb 100644
--- a/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue
+++ b/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue
@@ -28,10 +28,13 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue'
 import { useStore } from 'vuex'
+import { useEditStore } from '@/management/stores/edit'
 
 import skinPresets from '@/management/config/skinPresets.js'
 
 const store = useStore()
+const editStore = useEditStore()
+const { changeThemePreset } = editStore
 const groupName = ref<string>('temp')
 const bannerList = computed(() => store?.state?.bannerList || [])
 const groupList = computed(() =>
@@ -81,7 +84,7 @@ const changePreset = (banner: any) => {
     presets = Object.assign(presets, (skinPresets as any)[name])
   }
 
-  store.dispatch('edit/changeThemePreset', presets)
+  changeThemePreset(presets)
 }
 </script>
 <style lang="scss" scoped>
diff --git a/web/src/management/pages/edit/modules/settingModule/skin/PreviewPanel.vue b/web/src/management/pages/edit/modules/settingModule/skin/PreviewPanel.vue
index 1f8b6718..84a4e7cd 100644
--- a/web/src/management/pages/edit/modules/settingModule/skin/PreviewPanel.vue
+++ b/web/src/management/pages/edit/modules/settingModule/skin/PreviewPanel.vue
@@ -24,9 +24,10 @@
   </div>
 </template>
 <script>
-import { computed, defineComponent } from 'vue'
+import { defineComponent, toRefs } from 'vue'
 import MaterialGroup from '@/management/pages/edit/components/MaterialGroup.vue'
-import { useStore } from 'vuex'
+import { storeToRefs } from 'pinia'
+import { useEditStore } from '@/management/stores/edit'
 import communalLoader from '@materials/communals/communalLoader.js'
 
 const HeaderContent = () => communalLoader.loadComponent('HeaderContent')
@@ -43,15 +44,10 @@ export default defineComponent({
     LogoIcon: LogoIcon()
   },
   setup() {
-    const store = useStore()
-
-    const bannerConf = computed(() => store.state.edit.schema.bannerConf)
-    const submitConf = computed(() => store.state.edit.schema.submitConf)
-    const bottomConf = computed(() => store.state.edit.schema.bottomConf)
-    const skinConf = computed(() => store.state.edit.schema.skinConf)
-    const questionDataList = computed(() => store.state.edit.schema.questionDataList)
-    const currentEditOne = computed(() => store.state.edit.currentEditOne)
-    const currentEditKey = computed(() => store.getters['edit/currentEditKey'])
+    const editStore = useEditStore()
+    const { questionDataList, currentEditOne, currentEditKey } = storeToRefs(editStore)
+    const { schema } = editStore
+    const { bannerConf, submitConf, skinConf, bottomConf } = toRefs(schema)
 
     return {
       bannerConf,
diff --git a/web/src/management/pages/edit/modules/settingModule/skin/SetterPanel.vue b/web/src/management/pages/edit/modules/settingModule/skin/SetterPanel.vue
index 2a6be08d..16af87cc 100644
--- a/web/src/management/pages/edit/modules/settingModule/skin/SetterPanel.vue
+++ b/web/src/management/pages/edit/modules/settingModule/skin/SetterPanel.vue
@@ -24,23 +24,23 @@
   </div>
 </template>
 <script setup lang="ts">
-import { computed, ref } from 'vue'
-import { useStore } from 'vuex'
+import { ref } from 'vue'
+import { useEditStore } from '@/management/stores/edit'
 import { get as _get } from 'lodash-es'
 
 import skinConfig from '@/management/config/setterConfig/skinConfig'
 import SetterField from '@/management/pages/edit/components/SetterField.vue'
 
-const store = useStore()
+const editStore = useEditStore()
+const { schema, changeSchema } = editStore
 const collapse = ref<string>('')
-const schema = computed(() => _get(store.state, 'edit.schema'))
 
 const handleFormChange = (data: any, collapse: string) => {
   const { key, value } = data
   const currentEditKey = `${collapse}`
   const resultKey = `${currentEditKey}.${key}`
 
-  store.dispatch('edit/changeSchema', { key: resultKey, value })
+  changeSchema({ key: resultKey, value })
 }
 </script>
 <style lang="scss" scoped>
diff --git a/web/src/management/pages/edit/pages/edit/LogicEditPage.vue b/web/src/management/pages/edit/pages/edit/LogicEditPage.vue
index 8d2d63f8..93892858 100644
--- a/web/src/management/pages/edit/pages/edit/LogicEditPage.vue
+++ b/web/src/management/pages/edit/pages/edit/LogicEditPage.vue
@@ -5,17 +5,15 @@
 </template>
 <script setup lang="ts">
 import { computed, provide } from 'vue'
-import { useStore } from 'vuex'
+import { storeToRefs } from 'pinia'
+import { useEditStore } from '@/management/stores/edit'
 import { cloneDeep } from 'lodash-es'
 
 import RulePanel from '../../modules/logicModule/RulePanel.vue'
 import { filterQuestionPreviewData } from '@/management/utils/index'
 
-const store = useStore()
-
-const questionDataList = computed(() => {
-  return store.state.edit.schema.questionDataList
-})
+const editStore = useEditStore()
+const { questionDataList } = storeToRefs(editStore)
 
 const renderData = computed(() => {
   return filterQuestionPreviewData(cloneDeep(questionDataList.value))
diff --git a/web/src/management/pages/publish/PublishPage.vue b/web/src/management/pages/publish/PublishPage.vue
index 8fdb054b..7aa5cb16 100644
--- a/web/src/management/pages/publish/PublishPage.vue
+++ b/web/src/management/pages/publish/PublishPage.vue
@@ -25,8 +25,8 @@
   </div>
 </template>
 <script setup lang="ts">
-import { computed, onMounted } from 'vue'
-import { useStore } from 'vuex'
+import { computed, onMounted, toRef } from 'vue'
+import { useEditStore } from '@/management/stores/edit'
 import { useRoute, useRouter } from 'vue-router'
 import { get as _get } from 'lodash-es'
 
@@ -44,14 +44,15 @@ const defaultConfig = {
   img: '/imgs/icons/unpublished.webp'
 }
 
-const store = useStore()
-const metaData = computed(() => _get(store.state, 'edit.schema.metaData'))
+const editStore = useEditStore()
+const { schema, init, setSurveyId } = editStore
+const metaData = toRef(schema, 'metaData')
 const curStatus = computed(() => _get(metaData.value, 'curStatus.status', 'new'))
 const mainChannel = computed(() => {
   let fullUrl = ''
 
   if (metaData.value) {
-    fullUrl = `${location.origin}/render/${metaData.value.surveyPath}?t=${Date.now()}`
+    fullUrl = `${location.origin}/render/${(metaData.value as any).surveyPath}?t=${Date.now()}`
   }
 
   return { fullUrl }
@@ -60,10 +61,10 @@ const mainChannel = computed(() => {
 const route = useRoute()
 const router = useRouter()
 onMounted(async () => {
-  store.commit('edit/setSurveyId', route.params.id)
+  setSurveyId(route.params.id as string)
 
   try {
-    await store.dispatch('edit/init')
+    await init()
   } catch (err: any) {
     ElMessage.error(err.message)
     setTimeout(() => {
diff --git a/web/src/management/stores/edit.ts b/web/src/management/stores/edit.ts
new file mode 100644
index 00000000..5ddda357
--- /dev/null
+++ b/web/src/management/stores/edit.ts
@@ -0,0 +1,343 @@
+import { defineStore } from 'pinia'
+import { type Ref, ref, reactive, toRef, computed } from 'vue'
+import { getSurveyById } from '@/management/api/survey'
+import { merge as _merge, cloneDeep as _cloneDeep, set as _set } from 'lodash-es'
+import { getNewField } from '@/management/utils'
+import submitFormConfig from '@/management/config/setterConfig/submitConfig'
+import questionLoader from '@/materials/questions/questionLoader'
+
+const innerMetaConfig = {
+  submit: {
+    title: '提交配置',
+    formConfig: submitFormConfig
+  }
+}
+
+function useInitializeSchema(surveyId: Ref<string>) {
+  const schema = reactive({
+    metaData: null,
+    bannerConf: {
+      titleConfig: {
+        mainTitle: '<h3 style="text-align: center">欢迎填写问卷</h3>',
+        subTitle: `<p>为了给您提供更好的服务，希望您能抽出几分钟时间，将您的感受和建议告诉我们，<span style="color: rgb(204, 0, 0)">期待您的参与！</span></p>`,
+        applyTitle: ''
+      },
+      bannerConfig: {
+        bgImage: '',
+        bgImageAllowJump: false,
+        bgImageJumpLink: '',
+        videoLink: '',
+        postImg: ''
+      }
+    },
+    bottomConf: {
+      logoImage: '',
+      logoImageWidth: '28%'
+    },
+    skinConf: {
+      backgroundConf: {
+        color: '#fff'
+      },
+      themeConf: {
+        color: '#ffa600'
+      },
+      contentConf: {
+        opacity: 100
+      }
+    },
+    baseConf: {
+      begTime: '',
+      endTime: '',
+      language: 'chinese',
+      showVoteProcess: 'allow',
+      tLimit: 0,
+      answerBegTime: '',
+      answerEndTime: '',
+      answerLimitTime: 0
+    },
+    submitConf: {
+      submitTitle: '',
+      msgContent: {},
+      confirmAgain: {
+        is_again: true
+      },
+      link: ''
+    },
+    questionDataList: [],
+    logicConf: {
+      showLogicConf: []
+    }
+  })
+
+  function initSchema({ metaData, codeData }: { metaData: any; codeData: any }) {
+    schema.metaData = metaData
+    schema.bannerConf = _merge({}, schema.bannerConf, codeData.bannerConf)
+    schema.bottomConf = _merge({}, schema.bottomConf, codeData.bottomConf)
+    schema.skinConf = _merge({}, schema.skinConf, codeData.skinConf)
+    schema.baseConf = _merge({}, schema.baseConf, codeData.baseConf)
+    schema.submitConf = _merge({}, schema.submitConf, codeData.submitConf)
+    schema.questionDataList = codeData.questionDataList || []
+    schema.logicConf = codeData.logicConf
+
+    console.log(metaData, codeData)
+  }
+
+  async function getSchemaFromRemote() {
+    const res: any = await getSurveyById(surveyId.value)
+    if (res.code === 200) {
+      const metaData = res.data.surveyMetaRes
+      document.title = metaData.title
+      const {
+        bannerConf,
+        bottomConf,
+        skinConf,
+        baseConf,
+        submitConf,
+        dataConf,
+        logicConf = {}
+      } = res.data.surveyConfRes.code
+      initSchema({
+        metaData,
+        codeData: {
+          bannerConf,
+          bottomConf,
+          skinConf,
+          baseConf,
+          submitConf,
+          questionDataList: dataConf.dataList,
+          logicConf
+        }
+      })
+    } else {
+      throw new Error(res.errmsg || '问卷不存在')
+    }
+  }
+
+  return {
+    schema,
+    initSchema,
+    getSchemaFromRemote
+  }
+}
+
+function useQuestionDataListOperations(questionDataList: Ref<any[]>, updateTime: () => void) {
+  function copyQuestion({ index }: { index: number }) {
+    const newQuestion = _cloneDeep(questionDataList.value[index])
+    newQuestion.field = getNewField(questionDataList.value.map((item) => item.field))
+    addQuestion({ question: newQuestion, index })
+  }
+
+  function addQuestion({ question, index }: { question: any; index: number }) {
+    questionDataList.value.splice(index, 0, question)
+    updateTime()
+  }
+
+  function deleteQuestion({ index }: { index: number }) {
+    questionDataList.value.splice(index, 1)
+    updateTime()
+  }
+
+  function moveQuestion({ index, range }: { index: number; range: number }) {
+    console.log('move')
+    let start, end
+    if (range < 0) {
+      // 向上移动
+      start = index + range
+      end = index
+    } else if (range > 0) {
+      // 向下移动
+      start = index + 1
+      end = index + range + 1
+    } else {
+      // 无变化
+      return
+    }
+    const currentData = questionDataList.value[index]
+    // 新位置和老位置之间所有的题目
+    const comparedList = questionDataList.value.slice(start, end)
+    if (range < 0) {
+      // 向上移动
+      questionDataList.value.splice(index + range, 1 - range, currentData, ...comparedList)
+    } else if (range > 0) {
+      // 向下移动
+      questionDataList.value.splice(index, range + 1, ...comparedList, currentData)
+    }
+    updateTime()
+  }
+
+  return {
+    copyQuestion,
+    addQuestion,
+    deleteQuestion,
+    moveQuestion
+  }
+}
+
+function useCurrentEdit({
+  schema,
+  questionDataList
+}: {
+  schema: any
+  questionDataList: Ref<any[]>
+}) {
+  const currentEditOne = ref()
+  const currentEditStatus = ref('Success')
+
+  const currentEditKey = computed(() => {
+    if (currentEditOne.value === null) {
+      return null
+    }
+    let key = ''
+    switch (currentEditOne.value) {
+      case 'banner':
+      case 'mainTitle':
+        key = 'bannerConf'
+        break
+      case 'submit':
+        key = 'submitConf'
+        break
+      case 'logo':
+        key = 'bottomConf'
+        break
+      default:
+        key = `questionDataList.${currentEditOne.value}`
+    }
+    return key
+  })
+
+  const moduleConfig = computed(() => {
+    if (currentEditOne.value === null) {
+      return null
+    }
+
+    if (currentEditOne.value === 'banner' || currentEditOne.value === 'mainTitle') {
+      return schema?.bannerConf
+    } else if (currentEditOne.value === 'submit') {
+      return schema?.submitConf
+    } else if (currentEditOne.value === 'logo') {
+      return schema?.bottomConf
+    } else if (!Number.isNaN(currentEditOne.value)) {
+      return questionDataList.value?.[currentEditOne.value]
+    } else {
+      return null
+    }
+  })
+
+  const formConfigList = computed(() => {
+    if (currentEditOne.value === null) {
+      return null
+    }
+
+    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
+  }
+
+  function changeCurrentEditStatus(status: string) {
+    currentEditStatus.value = status
+  }
+
+  return {
+    currentEditOne,
+    currentEditKey,
+    currentEditStatus,
+    moduleConfig,
+    formConfigList,
+    currentEditMeta,
+    setCurrentEditOne,
+    changeCurrentEditStatus
+  }
+}
+
+export const useEditStore = defineStore('edit', () => {
+  const surveyId = ref('')
+  const schemaUpdateTime = ref(Date.now())
+  const { schema, initSchema, getSchemaFromRemote } = useInitializeSchema(surveyId)
+  const questionDataList = toRef(schema, 'questionDataList')
+  function setQuestionDataList(data: any) {
+    schema.questionDataList = data
+  }
+
+  function setSurveyId(id: string) {
+    surveyId.value = id
+  }
+
+  const {
+    currentEditOne,
+    currentEditKey,
+    currentEditStatus,
+    moduleConfig,
+    formConfigList,
+    currentEditMeta,
+    setCurrentEditOne,
+    changeCurrentEditStatus
+  } = useCurrentEdit({ schema, questionDataList })
+
+  async function init() {
+    const { metaData } = schema
+    if (!metaData || (metaData as any)?._id !== surveyId.value) {
+      getSchemaFromRemote()
+    }
+    currentEditOne.value = null
+    currentEditStatus.value = 'Success'
+  }
+
+  function updateTime() {
+    schemaUpdateTime.value = Date.now()
+  }
+
+  const { copyQuestion, addQuestion, deleteQuestion, moveQuestion } = useQuestionDataListOperations(
+    questionDataList,
+    updateTime
+  )
+
+  function changeSchema({ key, value }: { key: string; value: any }) {
+    _set(schema, key, value)
+    updateTime()
+  }
+
+  function changeThemePreset(presets: any) {
+    Object.keys(presets).forEach((key) => {
+      _set(schema, key, presets[key])
+    })
+  }
+
+  return {
+    surveyId,
+    setSurveyId,
+    currentEditOne,
+    moduleConfig,
+    formConfigList,
+    currentEditKey,
+    currentEditStatus,
+    currentEditMeta,
+    setCurrentEditOne,
+    changeCurrentEditStatus,
+    schemaUpdateTime,
+    schema,
+    questionDataList,
+    setQuestionDataList,
+    init,
+    initSchema,
+    getSchemaFromRemote,
+    copyQuestion,
+    addQuestion,
+    deleteQuestion,
+    moveQuestion,
+    changeSchema,
+    changeThemePreset
+  }
+})
diff --git a/web/vite.config.ts b/web/vite.config.ts
index 1d36bdcf..aa1fb0cf 100644
--- a/web/vite.config.ts
+++ b/web/vite.config.ts
@@ -59,7 +59,13 @@ export default defineConfig({
       'clipboard',
       'qrcode',
       'moment',
-      'moment/locale/zh-cn'
+      'moment/locale/zh-cn',
+      'echarts',
+      'nanoid',
+      'yup',
+      'crypto-js/sha256',
+      'element-plus/es/locale/lang/zh-cn',
+      'node-forge'
     ]
   },
   plugins: [

From 2ad6a777404e627db2e59489deb4933521da73e2 Mon Sep 17 00:00:00 2001
From: yoruponder <49467824@qq.com>
Date: Wed, 10 Jul 2024 14:41:36 +0800
Subject: [PATCH 06/13] feat: survey vuex to pinia (#331)

* feat: survey vuex to pinia

* feat: fix ts type-check

* feat: fix lint error
---
 web/src/render/pages/IndexPage.vue  |  8 +++--
 web/src/render/pages/RenderPage.vue | 10 +++---
 web/src/render/store/actions.js     | 39 ++++++++++++----------
 web/src/render/store/mutations.js   | 18 +++++-----
 web/src/render/store/state.js       | 10 +++---
 web/src/render/stores/survey.js     | 51 ++++++++++++++++++++++++++++-
 6 files changed, 96 insertions(+), 40 deletions(-)

diff --git a/web/src/render/pages/IndexPage.vue b/web/src/render/pages/IndexPage.vue
index 132df03f..3c0ba42a 100644
--- a/web/src/render/pages/IndexPage.vue
+++ b/web/src/render/pages/IndexPage.vue
@@ -8,11 +8,13 @@ import { useRoute } from 'vue-router'
 
 import { getPublishedSurveyInfo, getPreviewSchema } from '../api/survey'
 import useCommandComponent from '../hooks/useCommandComponent'
+import { useSurveyStore } from '../stores/survey'
 
 import AlertDialog from '../components/AlertDialog.vue'
 import { initRuleEngine } from '@/render/hooks/useRuleEngine.js'
 const store = useStore()
 const route = useRoute()
+const surveyStore = useSurveyStore()
 const loadData = (res: any, surveyPath: string) => {
   if (res.code === 200) {
     const data = res.data
@@ -36,7 +38,7 @@ const loadData = (res: any, surveyPath: string) => {
 
     document.title = data.title
 
-    store.commit('setSurveyPath', surveyPath)
+    surveyStore.setSurveyPath(surveyPath)
     store.dispatch('init', questionData)
     initRuleEngine(logicConf?.showLogicConf)
   } else {
@@ -46,7 +48,7 @@ const loadData = (res: any, surveyPath: string) => {
 onMounted(() => {
   const surveyId = route.params.surveyId
   console.log({ surveyId })
-  store.commit('setSurveyPath', surveyId)
+  surveyStore.setSurveyPath(surveyId)
   getDetail(surveyId as string)
 })
 
@@ -60,7 +62,7 @@ const getDetail = async (surveyPath: string) => {
     } else {
       const res: any = await getPublishedSurveyInfo({ surveyPath })
       loadData(res, surveyPath)
-      store.dispatch('getEncryptInfo')
+      surveyStore.getEncryptInfo();
     }
   } catch (error: any) {
     console.log(error)
diff --git a/web/src/render/pages/RenderPage.vue b/web/src/render/pages/RenderPage.vue
index cdc25463..1fce4c56 100644
--- a/web/src/render/pages/RenderPage.vue
+++ b/web/src/render/pages/RenderPage.vue
@@ -29,6 +29,7 @@ import AlertDialog from '../components/AlertDialog.vue'
 import ConfirmDialog from '../components/ConfirmDialog.vue'
 import ProgressBar from '../components/ProgressBar.vue'
 
+import { useSurveyStore } from '../stores/survey'
 import { submitForm } from '../api/survey'
 import encrypt from '../utils/encrypt'
 
@@ -57,12 +58,13 @@ const confirm = useCommandComponent(ConfirmDialog)
 
 const store = useStore()
 const router = useRouter()
+const surveyStore = useSurveyStore()
 
 const bannerConf = computed(() => store.state?.bannerConf || {})
 const renderData = computed(() => store.getters.renderData)
 const submitConf = computed(() => store.state?.submitConf || {})
 const logoConf = computed(() => store.state?.bottomConf || {})
-const surveyPath = computed(() => store.state?.surveyPath || '')
+const surveyPath = computed(() => surveyStore.surveyPath || '')
 
 const validate = (cbk: (v: boolean) => void) => {
   const index = 0
@@ -70,8 +72,8 @@ const validate = (cbk: (v: boolean) => void) => {
 }
 
 const normalizationRequestBody = () => {
-  const enterTime = store.state.enterTime
-  const encryptInfo = store.state.encryptInfo
+  const enterTime = surveyStore.enterTime
+  const encryptInfo = surveyStore.encryptInfo as any;
   const formValues = store.state.formValues
 
   const result: any = {
@@ -82,7 +84,7 @@ const normalizationRequestBody = () => {
   }
   
   if (encryptInfo?.encryptType) {
-    result.encryptType = encryptInfo?.encryptType
+    result.encryptType = encryptInfo.encryptType
     result.data = encrypt[result.encryptType as 'rsa']({
       data: result.data,
       secretKey: encryptInfo?.data?.secretKey
diff --git a/web/src/render/store/actions.js b/web/src/render/store/actions.js
index c6a5122d..969634d9 100644
--- a/web/src/render/store/actions.js
+++ b/web/src/render/store/actions.js
@@ -4,16 +4,17 @@ import 'moment/locale/zh-cn'
 // 设置中文
 moment.locale('zh-cn')
 import adapter from '../adapter'
-import { queryVote, getEncryptInfo } from '@/render/api/survey'
+import { queryVote } from '@/render/api/survey'
 import { RuleMatch } from '@/common/logicEngine/RulesMatch'
+import { useSurveyStore } from '@/render/stores/survey'
 /**
  * CODE_MAP不从management引入，在dev阶段，会导致B端 router被加载，进而导致C端路由被添加 baseUrl: /management
  */
-const CODE_MAP = {
-  SUCCESS: 200,
-  ERROR: 500,
-  NO_AUTH: 403
-}
+// const CODE_MAP = {
+//   SUCCESS: 200,
+//   ERROR: 500,
+//   NO_AUTH: 403
+// }
 const VOTE_INFO_KEY = 'voteinfo'
 import router from '../router'
 export default {
@@ -22,7 +23,8 @@ export default {
     { commit, dispatch },
     { bannerConf, baseConf, bottomConf, dataConf, skinConf, submitConf }
   ) {
-    commit('setEnterTime')
+    const surveyStore = useSurveyStore()
+    surveyStore.setEnterTime();
     const { begTime, endTime, answerBegTime, answerEndTime } = baseConf
     const { msgContent } = submitConf
     const now = Date.now()
@@ -90,8 +92,9 @@ export default {
   },
   // 初始化投票题的数据
   async initVoteData({ state, commit }) {
+    const surveyStore = useSurveyStore()
     const questionData = state.questionData
-    const surveyPath = state.surveyPath
+    const surveyPath = surveyStore.surveyPath
 
     const fieldList = []
 
@@ -163,16 +166,16 @@ export default {
       commit('updateVoteMapByKey', totalPayload)
     })
   },
-  async getEncryptInfo({ commit }) {
-    try {
-      const res = await getEncryptInfo()
-      if (res.code === CODE_MAP.SUCCESS) {
-        commit('setEncryptInfo', res.data)
-      }
-    } catch (error) {
-      console.log(error)
-    }
-  },
+  // async getEncryptInfo({ commit }) {
+  //   try {
+  //     const res = await getEncryptInfo()
+  //     if (res.code === CODE_MAP.SUCCESS) {
+  //       commit('setEncryptInfo', res.data)
+  //     }
+  //   } catch (error) {
+  //     console.log(error)
+  //   }
+  // },
   async initRuleEngine({ commit }, ruleConf) {
     const ruleEngine = new RuleMatch(ruleConf)
     commit('setRuleEgine', ruleEngine)
diff --git a/web/src/render/store/mutations.js b/web/src/render/store/mutations.js
index 4ada3d86..8661936c 100644
--- a/web/src/render/store/mutations.js
+++ b/web/src/render/store/mutations.js
@@ -24,12 +24,12 @@ export default {
     const { key, value, field } = data
     set(state, `questionData.${field}.othersValue.${key}`, value)
   },
-  setEnterTime(state) {
-    state.enterTime = Date.now()
-  },
-  setSurveyPath(state, data) {
-    state.surveyPath = data
-  },
+  // setEnterTime(state) {
+  //   state.enterTime = Date.now()
+  // },
+  // setSurveyPath(state, data) {
+  //   state.surveyPath = data
+  // },
   setVoteMap(state, data) {
     state.voteMap = data
   },
@@ -44,9 +44,9 @@ export default {
   setQuestionSeq(state, data) {
     state.questionSeq = data
   },
-  setEncryptInfo(state, data) {
-    state.encryptInfo = data
-  },
+  // setEncryptInfo(state, data) {
+  //   state.encryptInfo = data
+  // },
   setRuleEgine(state, ruleEngine) {
     state.ruleEngine = ruleEngine
   }
diff --git a/web/src/render/store/state.js b/web/src/render/store/state.js
index 2a63c735..53c692ae 100644
--- a/web/src/render/store/state.js
+++ b/web/src/render/store/state.js
@@ -1,16 +1,16 @@
-import { isMobile } from '../utils/index'
+// import { isMobile } from '../utils/index'
 
 export default {
-  surveyPath: '',
+  // surveyPath: '',
   questionData: null,
-  isMobile: isMobile(),
+  // isMobile: isMobile(),
   errorInfo: {
     errorType: '',
     errorMsg: ''
   },
-  enterTime: null,
+  // enterTime: null,
   questionSeq: [], // 题目的顺序，因为可能会有分页的情况，所以是一个二维数组[[qid1, qid2], [qid3,qid4]]
   voteMap: {},
-  encryptInfo: null,
+  // encryptInfo: null,
   ruleEngine: null
 }
diff --git a/web/src/render/stores/survey.js b/web/src/render/stores/survey.js
index 4d79f31d..b27ac980 100644
--- a/web/src/render/stores/survey.js
+++ b/web/src/render/stores/survey.js
@@ -1 +1,50 @@
-// 问卷相关的Pinia Store
\ No newline at end of file
+// 问卷相关的Pinia Store
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+import { isMobile as isInMobile } from '@/render/utils/index'
+import {  getEncryptInfo as getEncryptInfoApi } from '@/render/api/survey'
+
+/**
+ * CODE_MAP不从management引入，在dev阶段，会导致B端 router被加载，进而导致C端路由被添加 baseUrl: /management
+ */
+const CODE_MAP = {
+  SUCCESS: 200,
+  ERROR: 500,
+  NO_AUTH: 403
+}
+export const useSurveyStore = defineStore('survey', () => {
+  const surveyPath = ref('');
+  const isMobile = ref(isInMobile())
+  const enterTime = ref(0)
+  const encryptInfo = ref(null)
+
+  const setSurveyPath = ( data) => {
+    surveyPath.value = data
+  }
+
+  const setEnterTime = () => {
+    enterTime.value = Date.now()
+  }
+
+  const getEncryptInfo =  async() => {
+    try {
+      const res = await getEncryptInfoApi()
+      if (res.code === CODE_MAP.SUCCESS) {
+        encryptInfo.value = res.data
+      }
+    } catch (error) {
+      console.log(error)
+    }
+  }
+
+  return {
+    surveyPath,
+    isMobile,
+    enterTime,
+    encryptInfo,
+
+    setSurveyPath,
+    setEnterTime,
+    getEncryptInfo
+  }
+})
\ No newline at end of file

From 5a8fab4e4b9278e864d98e649536d83c3173c965 Mon Sep 17 00:00:00 2001
From: sudoooooo <zjbbabybaby@gmail.com>
Date: Wed, 10 Jul 2024 15:30:39 +0800
Subject: [PATCH 07/13] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=BC=95?=
 =?UTF-8?q?=E5=85=A5=E3=80=81lint=20&=20format?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/common/logicEngine/ruleConf.ts        |  2 +-
 web/src/common/typeEnum.ts                    | 20 ++------
 web/src/management/api/space.ts               |  2 +-
 web/src/management/components/LeftMenu.vue    | 28 +++++-----
 web/src/management/router/index.ts            | 51 ++++++++++++-------
 web/src/management/store/index.js             |  2 +-
 web/src/management/stores/edit.ts             | 31 +++++------
 web/src/management/stores/surveyList.ts       |  5 +-
 web/src/management/stores/user.js             |  8 ++-
 web/src/management/stores/workSpace.ts        |  4 +-
 web/src/management/utils/index.js             | 13 ++---
 web/src/management/utils/types/workSpace.ts   |  2 +-
 .../questions/QuestionContainerB/index.jsx    | 14 +----
 .../widgets/BinaryChoiceModule/meta.js        | 30 +++++------
 .../questions/widgets/CheckboxModule/meta.js  | 28 +++++-----
 .../questions/widgets/NpsModule/style.scss    |  2 +-
 .../questions/widgets/RadioModule/meta.js     | 34 ++++++-------
 .../questions/widgets/StarModule/meta.js      |  4 +-
 .../questions/widgets/VoteModule/meta.js      | 28 +++++-----
 web/src/render/adapter/rules.js               |  4 +-
 web/src/render/components/QuestionWrapper.vue |  6 ++-
 web/src/render/main.js                        |  2 -
 web/src/render/pages/EmptyPage.vue            |  4 +-
 web/src/render/pages/IndexPage.vue            | 13 ++---
 web/src/render/pages/RenderPage.vue           |  4 +-
 web/src/render/store/actions.js               |  7 +--
 web/src/render/stores/survey.js               | 14 ++---
 27 files changed, 174 insertions(+), 188 deletions(-)

diff --git a/web/src/common/logicEngine/ruleConf.ts b/web/src/common/logicEngine/ruleConf.ts
index 4f979283..bcf27c3a 100644
--- a/web/src/common/logicEngine/ruleConf.ts
+++ b/web/src/common/logicEngine/ruleConf.ts
@@ -1,4 +1,4 @@
-// 静态数据
+// test：静态数据，实际业务里无用
 export const ruleConf = [
   {
     conditions: [
diff --git a/web/src/common/typeEnum.ts b/web/src/common/typeEnum.ts
index 755e6f24..14087a02 100644
--- a/web/src/common/typeEnum.ts
+++ b/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,19 +23,13 @@ export const typeTagLabels: Record<QUESTION_TYPE, string> = {
 }
 
 // 输入类题型
-export const INPUT = [
-  QUESTION_TYPE.TEXT,
-  QUESTION_TYPE.TEXTAREA
-]
+export const INPUT = [QUESTION_TYPE.TEXT, QUESTION_TYPE.TEXTAREA]
 
 // 选择类题型分类
-export const NORMAL_CHOICES =  [
-  QUESTION_TYPE.RADIO,
-  QUESTION_TYPE.CHECKBOX
-]
+export const NORMAL_CHOICES = [QUESTION_TYPE.RADIO, QUESTION_TYPE.CHECKBOX]
 
 // 选择类题型分类
-export const CHOICES =  [
+export const CHOICES = [
   QUESTION_TYPE.RADIO,
   QUESTION_TYPE.CHECKBOX,
   QUESTION_TYPE.BINARY_CHOICE,
@@ -43,8 +37,4 @@ export const CHOICES =  [
 ]
 
 // 评分题题型分类
-export const RATES = [
-  QUESTION_TYPE.RADIO_STAR,
-  QUESTION_TYPE.RADIO_NPS
-]
-
+export const RATES = [QUESTION_TYPE.RADIO_STAR, QUESTION_TYPE.RADIO_NPS]
diff --git a/web/src/management/api/space.ts b/web/src/management/api/space.ts
index b0aadda9..b0277276 100644
--- a/web/src/management/api/space.ts
+++ b/web/src/management/api/space.ts
@@ -71,4 +71,4 @@ export const getCollaboratorPermissions = (surveyId: string) => {
       surveyId
     }
   })
-}
\ No newline at end of file
+}
diff --git a/web/src/management/components/LeftMenu.vue b/web/src/management/components/LeftMenu.vue
index e9dc05ab..f60668a4 100644
--- a/web/src/management/components/LeftMenu.vue
+++ b/web/src/management/components/LeftMenu.vue
@@ -58,18 +58,22 @@ const tabArr = [
   }
 ]
 const tabs = ref([])
-watch(() => store.state.cooperPermissions, (newVal) => {
-  tabs.value = []
-  // 如果有问卷管理权限，则加入问卷编辑和投放菜单
-  if (newVal.includes(SurveyPermissions.SurveyManage)) {
-    tabs.value.push(tabArr[0])
-    tabs.value.push(tabArr[1])
-  } 
-  // 如果有数据分析权限，则加入数据分析菜单
-  if (newVal.includes(SurveyPermissions.DataManage))  {
-    tabs.value.push(tabArr[2])
-  }
-}, { immediate: true })
+watch(
+  () => store.state.cooperPermissions,
+  (newVal) => {
+    tabs.value = []
+    // 如果有问卷管理权限，则加入问卷编辑和投放菜单
+    if (newVal.includes(SurveyPermissions.SurveyManage)) {
+      tabs.value.push(tabArr[0])
+      tabs.value.push(tabArr[1])
+    }
+    // 如果有数据分析权限，则加入数据分析菜单
+    if (newVal.includes(SurveyPermissions.DataManage)) {
+      tabs.value.push(tabArr[2])
+    }
+  },
+  { immediate: true }
+)
 </script>
 <style lang="scss" scoped>
 .nav {
diff --git a/web/src/management/router/index.ts b/web/src/management/router/index.ts
index f1e82aff..3bd483bd 100644
--- a/web/src/management/router/index.ts
+++ b/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>) {
-  const userStore = useUserStore();
+async function handleLoginGuard(
+  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('您没有该问卷的相关协作权限');
-        next({ name: 'survey' });
+        ElMessage.warning('您没有该问卷的相关协作权限')
+        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
diff --git a/web/src/management/store/index.js b/web/src/management/store/index.js
index 7d8eb427..d4a94044 100644
--- a/web/src/management/store/index.js
+++ b/web/src/management/store/index.js
@@ -12,7 +12,7 @@ export default createStore({
   mutations,
   actions,
   modules: {
-    edit,
+    edit
     // user,
     // list
   }
diff --git a/web/src/management/stores/edit.ts b/web/src/management/stores/edit.ts
index 5ddda357..5a2655c1 100644
--- a/web/src/management/stores/edit.ts
+++ b/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
   }
diff --git a/web/src/management/stores/surveyList.ts b/web/src/management/stores/surveyList.ts
index 017834b3..aef5656c 100644
--- a/web/src/management/stores/surveyList.ts
+++ b/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('')
diff --git a/web/src/management/stores/user.js b/web/src/management/stores/user.js
index ddb963de..468fc177 100644
--- a/web/src/management/stores/user.js
+++ b/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', () => {
@@ -41,11 +39,11 @@ export const useUserStore = defineStore('user', () => {
       })
     )
   }
-  const logout = () =>  {
+  const logout = () => {
     userInfo.value = null
     hasLogined.value = false
     localStorage.removeItem(USER_INFO_KEY)
   }
 
   return { userInfo, hasLogined, loginTime, initialized, init, login, logout }
-})
\ No newline at end of file
+})
diff --git a/web/src/management/stores/workSpace.ts b/web/src/management/stores/workSpace.ts
index 80e09a34..4a39e4e4 100644
--- a/web/src/management/stores/workSpace.ts
+++ b/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,
diff --git a/web/src/management/utils/index.js b/web/src/management/utils/index.js
index 2f84cbb1..516abaa4 100644
--- a/web/src/management/utils/index.js
+++ b/web/src/management/utils/index.js
@@ -39,19 +39,20 @@ export const getQuestionByType = (type, fields) => {
   const questionMeta = questionLoader.getMeta(type)
   const { attrs } = questionMeta
   let newQuestion = defaultQuestionConfig
-  if( attrs ) {
+  if (attrs) {
     let questionSchema = {}
-    attrs.forEach(element => {
+    attrs.forEach((element) => {
       questionSchema[element.name] = element.defaultValue
-    });
+    })
     newQuestion = questionSchema
   } else {
     newQuestion = defaultQuestionConfig
     newQuestion.type = type
   }
-  
+
   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)
@@ -59,7 +60,7 @@ export const getQuestionByType = (type, fields) => {
       option.hash = hash
     }
   }
-  
+
   return newQuestion
 }
 
diff --git a/web/src/management/utils/types/workSpace.ts b/web/src/management/utils/types/workSpace.ts
index 00be8b4e..bcecdd97 100644
--- a/web/src/management/utils/types/workSpace.ts
+++ b/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
diff --git a/web/src/materials/questions/QuestionContainerB/index.jsx b/web/src/materials/questions/QuestionContainerB/index.jsx
index 6512e690..9f82966e 100644
--- a/web/src/materials/questions/QuestionContainerB/index.jsx
+++ b/web/src/materials/questions/QuestionContainerB/index.jsx
@@ -111,20 +111,10 @@ export default defineComponent({
               editConfigure={questionMeta?.editConfigure}
               onChange={this.onChange}
             >
-              <dynamicComponent
-                readonly
-                {...props}
-                onBlur={this.onBlur}
-                onFocus={this.onFocus}
-              />
+              <dynamicComponent readonly {...props} onBlur={this.onBlur} onFocus={this.onFocus} />
             </EditOptions>
           ) : (
-            <dynamicComponent
-              readonly
-              {...props}
-              onBlur={this.onBlur}
-              onFocus={this.onFocus}
-            />
+            <dynamicComponent readonly {...props} onBlur={this.onBlur} onFocus={this.onFocus} />
           )}
         </div>
       </div>
diff --git a/web/src/materials/questions/widgets/BinaryChoiceModule/meta.js b/web/src/materials/questions/widgets/BinaryChoiceModule/meta.js
index c1e7c0b4..fc5b7226 100644
--- a/web/src/materials/questions/widgets/BinaryChoiceModule/meta.js
+++ b/web/src/materials/questions/widgets/BinaryChoiceModule/meta.js
@@ -53,25 +53,25 @@ const meta = {
       description: '这是用于描述选项',
       defaultValue: [
         {
-          "text": "对",
-          "imageUrl": "",
-          "others": false,
-          "mustOthers": false,
-          "othersKey": "",
-          "placeholderDesc": "",
-          "hash": "115019"
+          text: '对',
+          imageUrl: '',
+          others: false,
+          mustOthers: false,
+          othersKey: '',
+          placeholderDesc: '',
+          hash: ''
         },
         {
-          "text": "错",
-          "imageUrl": "",
-          "others": false,
-          "mustOthers": false,
-          "othersKey": "",
-          "placeholderDesc": "",
-          "hash": "115020"
+          text: '错',
+          imageUrl: '',
+          others: false,
+          mustOthers: false,
+          othersKey: '',
+          placeholderDesc: '',
+          hash: ''
         }
       ]
-    },
+    }
   ],
   formConfig: [basicConfig],
   editConfigure: {
diff --git a/web/src/materials/questions/widgets/CheckboxModule/meta.js b/web/src/materials/questions/widgets/CheckboxModule/meta.js
index 68437fac..f74b33f4 100644
--- a/web/src/materials/questions/widgets/CheckboxModule/meta.js
+++ b/web/src/materials/questions/widgets/CheckboxModule/meta.js
@@ -53,22 +53,22 @@ const meta = {
       description: '这是用于描述选项',
       defaultValue: [
         {
-          "text": "选项1",
-          "imageUrl": "",
-          "others": false,
-          "mustOthers": false,
-          "othersKey": "",
-          "placeholderDesc": "",
-          "hash": "115019"
+          text: '选项1',
+          imageUrl: '',
+          others: false,
+          mustOthers: false,
+          othersKey: '',
+          placeholderDesc: '',
+          hash: ''
         },
         {
-          "text": "选项2",
-          "imageUrl": "",
-          "others": false,
-          "mustOthers": false,
-          "othersKey": "",
-          "placeholderDesc": "",
-          "hash": "115020"
+          text: '选项2',
+          imageUrl: '',
+          others: false,
+          mustOthers: false,
+          othersKey: '',
+          placeholderDesc: '',
+          hash: ''
         }
       ]
     },
diff --git a/web/src/materials/questions/widgets/NpsModule/style.scss b/web/src/materials/questions/widgets/NpsModule/style.scss
index b7fa408f..b36c8074 100644
--- a/web/src/materials/questions/widgets/NpsModule/style.scss
+++ b/web/src/materials/questions/widgets/NpsModule/style.scss
@@ -19,7 +19,7 @@
     }
   }
   .question-block {
-    padding: 0!important;
+    padding: 0 !important;
   }
   .radio-nps-hover {
     .rate-item {
diff --git a/web/src/materials/questions/widgets/RadioModule/meta.js b/web/src/materials/questions/widgets/RadioModule/meta.js
index 8784bd07..a1e4a4c4 100644
--- a/web/src/materials/questions/widgets/RadioModule/meta.js
+++ b/web/src/materials/questions/widgets/RadioModule/meta.js
@@ -53,29 +53,27 @@ const meta = {
       description: '这是用于描述选项',
       defaultValue: [
         {
-          "text": "选项1",
-          "imageUrl": "",
-          "others": false,
-          "mustOthers": false,
-          "othersKey": "",
-          "placeholderDesc": "",
-          "hash": "115019"
+          text: '选项1',
+          imageUrl: '',
+          others: false,
+          mustOthers: false,
+          othersKey: '',
+          placeholderDesc: '',
+          hash: ''
         },
         {
-          "text": "选项2",
-          "imageUrl": "",
-          "others": false,
-          "mustOthers": false,
-          "othersKey": "",
-          "placeholderDesc": "",
-          "hash": "115020"
+          text: '选项2',
+          imageUrl: '',
+          others: false,
+          mustOthers: false,
+          othersKey: '',
+          placeholderDesc: '',
+          hash: ''
         }
       ]
-    },
-  ],
-  formConfig: [
-    basicConfig,
+    }
   ],
+  formConfig: [basicConfig],
   editConfigure: {
     optionEdit: {
       show: true
diff --git a/web/src/materials/questions/widgets/StarModule/meta.js b/web/src/materials/questions/widgets/StarModule/meta.js
index a128f01c..193eff39 100644
--- a/web/src/materials/questions/widgets/StarModule/meta.js
+++ b/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,
diff --git a/web/src/materials/questions/widgets/VoteModule/meta.js b/web/src/materials/questions/widgets/VoteModule/meta.js
index 94c514c8..381dc89b 100644
--- a/web/src/materials/questions/widgets/VoteModule/meta.js
+++ b/web/src/materials/questions/widgets/VoteModule/meta.js
@@ -53,22 +53,22 @@ const meta = {
       description: '这是用于描述选项',
       defaultValue: [
         {
-          "text": "选项1",
-          "imageUrl": "",
-          "others": false,
-          "mustOthers": false,
-          "othersKey": "",
-          "placeholderDesc": "",
-          "hash": "115019"
+          text: '选项1',
+          imageUrl: '',
+          others: false,
+          mustOthers: false,
+          othersKey: '',
+          placeholderDesc: '',
+          hash: ''
         },
         {
-          "text": "选项2",
-          "imageUrl": "",
-          "others": false,
-          "mustOthers": false,
-          "othersKey": "",
-          "placeholderDesc": "",
-          "hash": "115020"
+          text: '选项2',
+          imageUrl: '',
+          others: false,
+          mustOthers: false,
+          othersKey: '',
+          placeholderDesc: '',
+          hash: ''
         }
       ]
     },
diff --git a/web/src/render/adapter/rules.js b/web/src/render/adapter/rules.js
index 6a198976..15e848bc 100644
--- a/web/src/render/adapter/rules.js
+++ b/web/src/render/adapter/rules.js
@@ -199,7 +199,7 @@ const generateOthersKeyMap = (question) => {
   let othersKeyMap = undefined
 
   if (RATES.includes(type)) {
-    const { rangeConfig  } = question
+    const { rangeConfig } = question
     othersKeyMap = {}
     for (const key in rangeConfig) {
       if (rangeConfig[key].isShowInput) {
@@ -207,7 +207,7 @@ const generateOthersKeyMap = (question) => {
       }
     }
   } else if (type?.includes(QUESTION_TYPE.RADIO) || type?.includes(QUESTION_TYPE.CHECKBOX)) {
-    const { options } = question 
+    const { options } = question
     othersKeyMap = {}
     options
       .filter((op) => op.others)
diff --git a/web/src/render/components/QuestionWrapper.vue b/web/src/render/components/QuestionWrapper.vue
index d4c4dd50..ed2b8a23 100644
--- a/web/src/render/components/QuestionWrapper.vue
+++ b/web/src/render/components/QuestionWrapper.vue
@@ -57,8 +57,10 @@ const questionConfig = computed(() => {
     moduleConfig.othersValue = unref(othersValue)
   }
   if (
-    RATES.includes(type) && rest?.rangeConfig && 
-    Object.keys(rest?.rangeConfig).filter((index) => rest?.rangeConfig[index].isShowInput).length > 0
+    RATES.includes(type) &&
+    rest?.rangeConfig &&
+    Object.keys(rest?.rangeConfig).filter((index) => rest?.rangeConfig[index].isShowInput).length >
+      0
   ) {
     let { rangeConfig, othersValue } = useShowInput(field)
     moduleConfig.rangeConfig = unref(rangeConfig)
diff --git a/web/src/render/main.js b/web/src/render/main.js
index b7c1c9bc..6d8f5c74 100644
--- a/web/src/render/main.js
+++ b/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')
diff --git a/web/src/render/pages/EmptyPage.vue b/web/src/render/pages/EmptyPage.vue
index 74c7206f..2bb2f28d 100644
--- a/web/src/render/pages/EmptyPage.vue
+++ b/web/src/render/pages/EmptyPage.vue
@@ -7,9 +7,7 @@
   </div>
 </template>
 
-<script setup>
-
-</script>
+<script setup></script>
 
 <style scoped>
 .container {
diff --git a/web/src/render/pages/IndexPage.vue b/web/src/render/pages/IndexPage.vue
index 3c0ba42a..aff4b5c7 100644
--- a/web/src/render/pages/IndexPage.vue
+++ b/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 {
-      bannerConf,
-      baseConf,
-      bottomConf,
-      dataConf,
-      skinConf,
-      submitConf,
-      logicConf
-    } = data.code
+    const { bannerConf, 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)
diff --git a/web/src/render/pages/RenderPage.vue b/web/src/render/pages/RenderPage.vue
index 1fce4c56..3c2a4e9d 100644
--- a/web/src/render/pages/RenderPage.vue
+++ b/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 = {
@@ -82,7 +82,7 @@ const normalizationRequestBody = () => {
     difTime: Date.now() - enterTime,
     clientTime: Date.now()
   }
-  
+
   if (encryptInfo?.encryptType) {
     result.encryptType = encryptInfo.encryptType
     result.data = encrypt[result.encryptType as 'rsa']({
diff --git a/web/src/render/store/actions.js b/web/src/render/store/actions.js
index 969634d9..a4de4908 100644
--- a/web/src/render/store/actions.js
+++ b/web/src/render/store/actions.js
@@ -19,12 +19,9 @@ const VOTE_INFO_KEY = 'voteinfo'
 import router from '../router'
 export default {
   // 初始化
-  init(
-    { commit, dispatch },
-    { bannerConf, baseConf, bottomConf, dataConf, skinConf, submitConf }
-  ) {
+  init({ 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()
diff --git a/web/src/render/stores/survey.js b/web/src/render/stores/survey.js
index b27ac980..461c908e 100644
--- a/web/src/render/stores/survey.js
+++ b/web/src/render/stores/survey.js
@@ -1,8 +1,8 @@
-// 问卷相关的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'
+import { getEncryptInfo as getEncryptInfoApi } from '@/render/api/survey'
 
 /**
  * CODE_MAP不从management引入，在dev阶段，会导致B端 router被加载，进而导致C端路由被添加 baseUrl: /management
@@ -13,12 +13,12 @@ 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)
 
-  const setSurveyPath = ( data) => {
+  const setSurveyPath = (data) => {
     surveyPath.value = data
   }
 
@@ -26,7 +26,7 @@ export const useSurveyStore = defineStore('survey', () => {
     enterTime.value = Date.now()
   }
 
-  const getEncryptInfo =  async() => {
+  const getEncryptInfo = async () => {
     try {
       const res = await getEncryptInfoApi()
       if (res.code === CODE_MAP.SUCCESS) {
@@ -47,4 +47,4 @@ export const useSurveyStore = defineStore('survey', () => {
     setEnterTime,
     getEncryptInfo
   }
-})
\ No newline at end of file
+})

From f08c8bcd2a24167474a4f074d4ece436cc378fa5 Mon Sep 17 00:00:00 2001
From: dayou <853094838@qq.com>
Date: Mon, 15 Jul 2024 11:23:09 +0800
Subject: [PATCH 08/13] =?UTF-8?q?feature:=20=E6=90=AD=E5=BB=BA=E7=AB=AF?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=A8=A1=E5=9D=97=E4=B8=8B=E7=9A=84=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E8=BF=81=E7=A7=BBpinia-edit=E6=A8=A1=E5=9D=97=20(#336?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 搭建端的pinia迁移完成

* fix:删除store
---
 web/src/management/components/LeftMenu.vue    |   6 +-
 web/src/management/main.js                    |   2 -
 .../settingModule/skin/CatalogPanel.vue       |   3 +-
 .../pages/edit/pages/skin/ContentPage.vue     |   6 +-
 web/src/management/router/index.ts            |  17 +-
 web/src/management/store/actions.js           |  21 --
 web/src/management/store/edit/actions.js      |  72 -----
 web/src/management/store/edit/getters.js      |  71 -----
 web/src/management/store/edit/index.js        |  12 -
 web/src/management/store/edit/mutations.js    |  68 -----
 web/src/management/store/edit/state.js        |  60 ----
 web/src/management/store/index.js             |  19 --
 web/src/management/store/list/index.js        | 258 ------------------
 web/src/management/store/mutations.js         |   8 -
 web/src/management/store/state.js             |   5 -
 web/src/management/store/user/index.js        |  64 -----
 web/src/management/stores/edit.ts             |  28 ++
 17 files changed, 43 insertions(+), 677 deletions(-)
 delete mode 100644 web/src/management/store/actions.js
 delete mode 100644 web/src/management/store/edit/actions.js
 delete mode 100644 web/src/management/store/edit/getters.js
 delete mode 100644 web/src/management/store/edit/index.js
 delete mode 100644 web/src/management/store/edit/mutations.js
 delete mode 100644 web/src/management/store/edit/state.js
 delete mode 100644 web/src/management/store/index.js
 delete mode 100644 web/src/management/store/list/index.js
 delete mode 100644 web/src/management/store/mutations.js
 delete mode 100644 web/src/management/store/state.js
 delete mode 100644 web/src/management/store/user/index.js

diff --git a/web/src/management/components/LeftMenu.vue b/web/src/management/components/LeftMenu.vue
index f60668a4..deace7d4 100644
--- a/web/src/management/components/LeftMenu.vue
+++ b/web/src/management/components/LeftMenu.vue
@@ -27,12 +27,12 @@
 
 <script setup>
 import { ref, watch } from 'vue'
-import { useStore } from 'vuex'
+import { useEditStore } from '@/management/stores/edit'
 import { useRoute } from 'vue-router'
 const route = useRoute()
 import LogoIcon from './LogoIcon.vue'
 import { SurveyPermissions } from '@/management/utils/types/workSpace.ts'
-const store = useStore()
+const editStore = useEditStore()
 
 const tabArr = [
   {
@@ -59,7 +59,7 @@ const tabArr = [
 ]
 const tabs = ref([])
 watch(
-  () => store.state.cooperPermissions,
+  () => editStore.cooperPermissions,
   (newVal) => {
     tabs.value = []
     // 如果有问卷管理权限，则加入问卷编辑和投放菜单
diff --git a/web/src/management/main.js b/web/src/management/main.js
index 081784ef..aa44a4fe 100644
--- a/web/src/management/main.js
+++ b/web/src/management/main.js
@@ -1,5 +1,4 @@
 import { createApp } from 'vue'
-import store from './store'
 import { createPinia } from 'pinia'
 import plainText from './directive/plainText'
 import safeHtml from './directive/safeHtml'
@@ -10,7 +9,6 @@ import router from './router'
 const pinia = createPinia()
 const app = createApp(App)
 
-app.use(store)
 app.use(pinia)
 app.use(router)
 
diff --git a/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue b/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue
index 0314c3fb..ae7d844c 100644
--- a/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue
+++ b/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue
@@ -32,11 +32,10 @@ import { useEditStore } from '@/management/stores/edit'
 
 import skinPresets from '@/management/config/skinPresets.js'
 
-const store = useStore()
 const editStore = useEditStore()
 const { changeThemePreset } = editStore
 const groupName = ref<string>('temp')
-const bannerList = computed(() => store?.state?.bannerList || [])
+const bannerList = computed(() => editStore.bannerList || [])
 const groupList = computed(() =>
   Object.keys(bannerList.value).map((key) => ({
     label: bannerList.value[key].name,
diff --git a/web/src/management/pages/edit/pages/skin/ContentPage.vue b/web/src/management/pages/edit/pages/skin/ContentPage.vue
index 5960d677..da3e3910 100644
--- a/web/src/management/pages/edit/pages/skin/ContentPage.vue
+++ b/web/src/management/pages/edit/pages/skin/ContentPage.vue
@@ -13,17 +13,17 @@
 </template>
 <script setup lang="ts">
 import { onMounted } from 'vue'
-import { useStore } from 'vuex'
+import { useEditStore } from '@/management/stores/edit'
 
 import CommonTemplate from '../../components/CommonTemplate.vue'
 import CatalogPanel from '../../modules/settingModule/skin/CatalogPanel.vue'
 import PreviewPanel from '../../modules/settingModule/skin/PreviewPanel.vue'
 import SetterPanel from '../../modules/settingModule/skin/SetterPanel.vue'
 
-const store = useStore()
+const editStore = useEditStore()
 
 onMounted(() => {
-  store.dispatch('getBannerData')
+  editStore.fetchBannerData()
 })
 </script>
 <style lang="scss" scoped>
diff --git a/web/src/management/router/index.ts b/web/src/management/router/index.ts
index 3bd483bd..9ca35d6d 100644
--- a/web/src/management/router/index.ts
+++ b/web/src/management/router/index.ts
@@ -11,6 +11,7 @@ import { analysisTypeMap } from '@/management/config/analysisConfig'
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
 import { useUserStore } from '@/management/stores/user'
+import { useEditStore } from '@/management/stores/edit'
 
 const routes: RouteRecordRaw[] = [
   {
@@ -162,7 +163,6 @@ const router = createRouter({
 })
 
 router.beforeEach(async (to, from, next) => {
-  const store = useStore()
   const userStore = useUserStore()
   // 初始化用户信息
   if (!userStore?.initialized) {
@@ -174,7 +174,7 @@ router.beforeEach(async (to, from, next) => {
   }
 
   if (to.meta.needLogin) {
-    await handleLoginGuard(to, from, next, store)
+    await handleLoginGuard(to, from, next)
   } else {
     next()
   }
@@ -183,12 +183,11 @@ router.beforeEach(async (to, from, next) => {
 async function handleLoginGuard(
   to: RouteLocationNormalized,
   from: RouteLocationNormalized,
-  next: NavigationGuardNext,
-  store: Store<any>
+  next: NavigationGuardNext
 ) {
   const userStore = useUserStore()
   if (userStore?.hasLogined) {
-    await handlePermissionsGuard(to, from, next, store)
+    await handlePermissionsGuard(to, from, next)
   } else {
     next({
       name: 'login',
@@ -200,9 +199,9 @@ async function handleLoginGuard(
 async function handlePermissionsGuard(
   to: RouteLocationNormalized,
   from: RouteLocationNormalized,
-  next: NavigationGuardNext,
-  store: Store<any>
+  next: NavigationGuardNext
 ) {
+  const editStore = useEditStore()
   const currSurveyId = to?.params?.id || ''
   const prevSurveyId = from?.params?.id || ''
   // 如果跳转页面不存在surveyId 或者不需要页面权限，则直接跳转
@@ -211,8 +210,8 @@ async function handlePermissionsGuard(
   } else {
     // 如果跳转编辑页面，且跳转页面和上一页的surveyId不同，判断是否有对应页面权限
     if (currSurveyId !== prevSurveyId) {
-      await store.dispatch('fetchCooperPermissions', currSurveyId)
-      if (hasRequiredPermissions(to.meta.permissions as string[], store.state.cooperPermissions)) {
+      await editStore.fetchCooperPermissions(currSurveyId as string)
+      if (hasRequiredPermissions(to.meta.permissions as string[], editStore.cooperPermissions)) {
         next()
       } else {
         ElMessage.warning('您没有该问卷的相关协作权限')
diff --git a/web/src/management/store/actions.js b/web/src/management/store/actions.js
deleted file mode 100644
index c8e185ea..00000000
--- a/web/src/management/store/actions.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import { getBannerData } from '@/management/api/skin.js'
-import { getCollaboratorPermissions } from '@/management/api/space.ts'
-import { CODE_MAP } from '../api/base'
-
-export default {
-  async getBannerData({ state, commit }) {
-    if (state.bannerList && state.bannerList.length > 0) {
-      return
-    }
-    const res = await getBannerData()
-    if (res.code === 200) {
-      commit('setBannerList', res.data)
-    }
-  },
-  async fetchCooperPermissions({ commit }, id) {
-    const res = await getCollaboratorPermissions(id)
-    if (res.code === CODE_MAP.SUCCESS) {
-      commit('setCooperPermissions', res.data.permissions)
-    }
-  }
-}
diff --git a/web/src/management/store/edit/actions.js b/web/src/management/store/edit/actions.js
deleted file mode 100644
index 5a8a1c11..00000000
--- a/web/src/management/store/edit/actions.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import { getNewField } from '@/management/utils'
-import { cloneDeep as _cloneDeep, get as _get } from 'lodash-es'
-import { getSurveyById } from '@/management/api/survey'
-
-export default {
-  async init({ state, dispatch }) {
-    const metaData = _get(state, 'schema.metaData')
-    if (!metaData || metaData._id !== state.surveyId) {
-      await dispatch('getSchemaFromRemote')
-    }
-    dispatch('resetState')
-  },
-  async getSchemaFromRemote({ commit, state }) {
-    const res = await getSurveyById(state.surveyId)
-    if (res.code === 200) {
-      const metaData = res.data.surveyMetaRes
-      document.title = metaData.title
-      const {
-        bannerConf,
-        bottomConf,
-        skinConf,
-        baseConf,
-        submitConf,
-        dataConf,
-        logicConf = {}
-      } = res.data.surveyConfRes.code
-      commit('initSchema', {
-        metaData,
-        codeData: {
-          bannerConf,
-          bottomConf,
-          skinConf,
-          baseConf,
-          submitConf,
-          questionDataList: dataConf.dataList,
-          logicConf
-        }
-      })
-    } else {
-      throw new Error(res.errmsg || '问卷不存在')
-    }
-  },
-  resetState({ commit }) {
-    commit('setCurrentEditOne', null)
-    commit('changeStatusPreview', { type: 'Success' })
-  },
-  // 复制题目到当前题目后
-  copyQuestion({ commit, state }, { index }) {
-    const newQuestion = _cloneDeep(state.schema.questionDataList[index])
-    newQuestion.field = getNewField(state.schema.questionDataList.map((item) => item.field))
-    commit('addQuestion', { question: newQuestion, index })
-  },
-  addQuestion({ commit }, { question, index }) {
-    commit('addQuestion', { question, index })
-    commit('updateSchemaUpdateTime', Date.now())
-  },
-  deleteQuestion({ commit }, { index }) {
-    commit('deleteQuestion', { index })
-    commit('updateSchemaUpdateTime', Date.now())
-  },
-  moveQuestion({ commit }, { index, range }) {
-    commit('moveQuestion', { index, range })
-    commit('updateSchemaUpdateTime', Date.now())
-  },
-  changeSchema({ commit }, { key, value }) {
-    commit('changeSchema', { key, value })
-    commit('updateSchemaUpdateTime', Date.now())
-  },
-  changeThemePreset({ commit }, presets) {
-    commit('changeThemePreset', presets)
-  }
-}
diff --git a/web/src/management/store/edit/getters.js b/web/src/management/store/edit/getters.js
deleted file mode 100644
index 3350922d..00000000
--- a/web/src/management/store/edit/getters.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import submitFormConfig from '@/management/config/setterConfig/submitConfig'
-import questionLoader from '@/materials/questions/questionLoader'
-
-const innerMetaConfig = {
-  submit: {
-    title: '提交配置',
-    formConfig: submitFormConfig
-  }
-}
-
-export default {
-  moduleConfig(state) {
-    const currentEditOne = state.currentEditOne
-    if (currentEditOne === null) {
-      return null
-    }
-
-    if (currentEditOne === 'banner' || currentEditOne === 'mainTitle') {
-      return state?.schema?.bannerConf
-    } else if (currentEditOne === 'submit') {
-      return state?.schema?.submitConf
-    } else if (currentEditOne === 'logo') {
-      return state?.schema?.bottomConf
-    } else if (!Number.isNaN(currentEditOne)) {
-      return state?.schema?.questionDataList?.[currentEditOne]
-    } else {
-      return null
-    }
-  },
-  formConfigList(state, getters) {
-    const currentEditOne = state.currentEditOne
-    if (currentEditOne === null) {
-      return null
-    }
-
-    return getters?.currentEditMeta?.formConfig || []
-  },
-  currentEditMeta(state) {
-    const currentEditOne = state.currentEditOne
-    if (currentEditOne === null) {
-      return null
-    } else if (innerMetaConfig[currentEditOne]) {
-      return innerMetaConfig[currentEditOne]
-    } else {
-      const questionType = state.schema?.questionDataList?.[currentEditOne]?.type
-      return questionLoader.getMeta(questionType)
-    }
-  },
-  currentEditKey(state) {
-    const currentEditOne = state.currentEditOne
-    if (currentEditOne === null) {
-      return null
-    }
-    let key = ''
-    switch (currentEditOne) {
-      case 'banner':
-      case 'mainTitle':
-        key = 'bannerConf'
-        break
-      case 'submit':
-        key = 'submitConf'
-        break
-      case 'logo':
-        key = 'bottomConf'
-        break
-      default:
-        key = `questionDataList.${currentEditOne}`
-    }
-    return key
-  }
-}
diff --git a/web/src/management/store/edit/index.js b/web/src/management/store/edit/index.js
deleted file mode 100644
index 41d27622..00000000
--- a/web/src/management/store/edit/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import state from './state'
-import mutations from './mutations'
-import actions from './actions'
-import getters from './getters'
-
-export default {
-  namespaced: true,
-  state,
-  actions,
-  getters,
-  mutations
-}
diff --git a/web/src/management/store/edit/mutations.js b/web/src/management/store/edit/mutations.js
deleted file mode 100644
index 412b87a9..00000000
--- a/web/src/management/store/edit/mutations.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import { set as _set, merge as _merge } from 'lodash-es'
-
-export default {
-  setCurrentEditOne(state, data) {
-    state.currentEditOne = data
-  },
-  changeStatusPreview(state, { type }) {
-    state.currentEditStatus = type
-  },
-  updateSchemaUpdateTime(state) {
-    state.schemaUpdateTime = Date.now()
-  },
-  initSchema(state, { metaData, codeData }) {
-    state.schema.metaData = metaData
-    state.schema.bannerConf = _merge({}, state.schema.bannerConf, codeData.bannerConf)
-    state.schema.bottomConf = _merge({}, state.schema.bottomConf, codeData.bottomConf)
-    state.schema.skinConf = _merge({}, state.schema.skinConf, codeData.skinConf)
-    state.schema.baseConf = _merge({}, state.schema.baseConf, codeData.baseConf)
-    state.schema.submitConf = _merge({}, state.schema.submitConf, codeData.submitConf)
-    state.schema.questionDataList = codeData.questionDataList || []
-    state.schema.logicConf = codeData.logicConf
-  },
-  setSurveyId(state, data) {
-    state.surveyId = data
-  },
-  addQuestion(state, { question, index }) {
-    state.schema.questionDataList.splice(index, 0, question)
-  },
-  deleteQuestion(state, { index }) {
-    state.schema.questionDataList.splice(index, 1)
-  },
-  moveQuestion(state, { index, range }) {
-    let start, end
-    if (range < 0) {
-      // 向上移动
-      start = index + range
-      end = index
-    } else if (range > 0) {
-      // 向下移动
-      start = index + 1
-      end = index + range + 1
-    } else {
-      // 无变化
-      return
-    }
-    const currentData = state.schema.questionDataList[index]
-    // 新位置和老位置之间所有的题目
-    const comparedList = state.schema.questionDataList.slice(start, end)
-    if (range < 0) {
-      // 向上移动
-      state.schema.questionDataList.splice(index + range, 1 - range, currentData, ...comparedList)
-    } else if (range > 0) {
-      // 向下移动
-      state.schema.questionDataList.splice(index, range + 1, ...comparedList, currentData)
-    }
-  },
-  changeSchema(state, { key, value }) {
-    _set(state.schema, key, value)
-  },
-  changeThemePreset(state, presets) {
-    Object.keys(presets).forEach((key) => {
-      _set(state.schema, key, presets[key])
-    })
-  },
-  setQuestionDataList(state, data) {
-    state.schema.questionDataList = data
-  }
-}
diff --git a/web/src/management/store/edit/state.js b/web/src/management/store/edit/state.js
deleted file mode 100644
index 1927e24a..00000000
--- a/web/src/management/store/edit/state.js
+++ /dev/null
@@ -1,60 +0,0 @@
-export default {
-  currentEditOne: null,
-  currentEditStatus: 'Success',
-  schemaUpdateTime: Date.now(),
-  surveyId: '', // url上取的surveyId
-  schema: {
-    metaData: null,
-    bannerConf: {
-      titleConfig: {
-        mainTitle: '<h3 style="text-align: center">欢迎填写问卷</h3>',
-        subTitle: `<p>为了给您提供更好的服务，希望您能抽出几分钟时间，将您的感受和建议告诉我们，<span style="color: rgb(204, 0, 0)">期待您的参与！</span></p>`,
-        applyTitle: ''
-      },
-      bannerConfig: {
-        bgImage: '',
-        bgImageAllowJump: false,
-        bgImageJumpLink: '',
-        videoLink: '',
-        postImg: ''
-      }
-    },
-    bottomConf: {
-      logoImage: '',
-      logoImageWidth: '28%'
-    },
-    skinConf: {
-      backgroundConf: {
-        color: '#fff'
-      },
-      themeConf: {
-        color: '#ffa600'
-      },
-      contentConf: {
-        opacity: 100
-      }
-    },
-    baseConf: {
-      begTime: '',
-      endTime: '',
-      language: 'chinese',
-      showVoteProcess: 'allow',
-      tLimit: 0,
-      answerBegTime: '',
-      answerEndTime: '',
-      answerLimitTime: 0
-    },
-    submitConf: {
-      submitTitle: '',
-      msgContent: {},
-      confirmAgain: {
-        is_again: true
-      },
-      link: ''
-    },
-    questionDataList: [],
-    logicConf: {
-      showLogicConf: []
-    }
-  }
-}
diff --git a/web/src/management/store/index.js b/web/src/management/store/index.js
deleted file mode 100644
index d4a94044..00000000
--- a/web/src/management/store/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { createStore } from 'vuex'
-import edit from './edit'
-// import user from './user'
-// import list from './list'
-import actions from './actions'
-import mutations from './mutations'
-import state from './state'
-
-export default createStore({
-  state,
-  getters: {},
-  mutations,
-  actions,
-  modules: {
-    edit
-    // user,
-    // list
-  }
-})
diff --git a/web/src/management/store/list/index.js b/web/src/management/store/list/index.js
deleted file mode 100644
index 7561bcbe..00000000
--- a/web/src/management/store/list/index.js
+++ /dev/null
@@ -1,258 +0,0 @@
-import {
-  createSpace,
-  getSpaceList,
-  getSpaceDetail,
-  updateSpace,
-  deleteSpace
-} from '@/management/api/space'
-import { CODE_MAP } from '@/management/api/base'
-import { ElMessage } from 'element-plus'
-import 'element-plus/theme-chalk/src/message.scss'
-import { getSurveyList as surveyList } from '@/management/api/survey'
-import { set } from 'lodash-es'
-import { SpaceType } from '@/management/utils/types/workSpace'
-
-export default {
-  namespaced: true,
-  state: {
-    // 空间管理
-    spaceMenus: [
-      {
-        icon: 'icon-wodekongjian',
-        name: '我的空间',
-        id: SpaceType.Personal
-      },
-      {
-        icon: 'icon-tuanduikongjian',
-        name: '团队空间',
-        id: SpaceType.Group,
-        children: [
-          // {
-          //   name: '小桔问卷调研团队',
-          //   id: 'xxxx',
-          // }
-        ]
-      }
-    ],
-    spaceType: SpaceType.Personal,
-    workSpaceId: '',
-    spaceDetail: null,
-    workSpaceList: [],
-    // 列表管理
-    surveyList: [],
-    surveyTotal: 0,
-    searchVal: '',
-    selectValueMap: {
-      surveyType: '',
-      'curStatus.status': ''
-    },
-    buttonValueMap: {
-      'curStatus.date': '',
-      createDate: -1
-    }
-  },
-  getters: {
-    listFilter(state) {
-      return [
-        {
-          comparator: '',
-          condition: [
-            {
-              field: 'title',
-              value: state.searchVal,
-              comparator: '$regex'
-            }
-          ]
-        },
-        {
-          comparator: '',
-          condition: [
-            {
-              field: 'curStatus.status',
-              value: state.selectValueMap['curStatus.status']
-            }
-          ]
-        },
-        {
-          comparator: '',
-          condition: [
-            {
-              field: 'surveyType',
-              value: state.selectValueMap.surveyType
-            }
-          ]
-        }
-      ]
-    },
-    listOrder(state) {
-      const { buttonValueMap } = state
-      return Object.entries(buttonValueMap)
-        .filter(([, effectValue]) => effectValue)
-        .reduce((prev, item) => {
-          const [effectKey, effectValue] = item
-          prev.push({ field: effectKey, value: effectValue })
-          return prev
-        }, [])
-    }
-  },
-  mutations: {
-    updateSpaceMenus(state, workSpace) {
-      // 更新空间列表下的团队空间
-      set(state, 'spaceMenus[1].children', workSpace)
-    },
-    changeSpaceType(state, spaceType) {
-      state.spaceType = spaceType
-    },
-    changeWorkSpace(state, workSpaceId) {
-      // 切换空间清除筛选条件
-      this.commit('list/resetSelectValueMap')
-      this.commit('list/resetButtonValueMap')
-      this.commit('list/setSearchVal', '')
-      state.workSpaceId = workSpaceId
-    },
-    setSpaceDetail(state, data) {
-      state.spaceDetail = data
-    },
-    setWorkSpaceList(state, data) {
-      state.workSpaceList = data
-    },
-    setSurveyList(state, list) {
-      state.surveyList = list
-    },
-    setSurveyTotal(state, total) {
-      state.surveyTotal = total
-    },
-    setSearchVal(state, data) {
-      state.searchVal = data
-    },
-    resetSelectValueMap(state) {
-      state.selectValueMap = {
-        surveyType: '',
-        'curStatus.status': ''
-      }
-    },
-    changeSelectValueMap(state, { key, value }) {
-      state.selectValueMap[key] = value
-    },
-    resetButtonValueMap(state) {
-      state.buttonValueMap = {
-        'curStatus.date': '',
-        createDate: -1
-      }
-    },
-    changeButtonValueMap(state, { key, value }) {
-      state.buttonValueMap[key] = value
-    }
-  },
-  actions: {
-    async getSpaceList({ commit }) {
-      try {
-        const res = await getSpaceList()
-
-        if (res.code === CODE_MAP.SUCCESS) {
-          const { list } = res.data
-          const workSpace = list.map((item) => {
-            return {
-              id: item._id,
-              name: item.name
-            }
-          })
-          commit('setWorkSpaceList', list)
-          commit('updateSpaceMenus', workSpace)
-        } else {
-          ElMessage.error('getSpaceList' + res.errmsg)
-        }
-      } catch (err) {
-        ElMessage.error('getSpaceList' + err)
-      }
-    },
-    async addSpace({}, params) {
-      const res = await createSpace({
-        name: params.name,
-        description: params.description,
-        members: params.members
-      })
-
-      if (res.code === CODE_MAP.SUCCESS) {
-        ElMessage.success('添加成功')
-      } else {
-        ElMessage.error('createSpace  code err' + res.errmsg)
-      }
-    },
-    async getSpaceDetail({ state, commit }, id) {
-      try {
-        const workspaceId = id || state.workSpaceId
-        const res = await getSpaceDetail(workspaceId)
-        if (res.code === CODE_MAP.SUCCESS) {
-          commit('setSpaceDetail', res.data)
-        } else {
-          ElMessage.error('getSpaceList' + res.errmsg)
-        }
-      } catch (err) {
-        ElMessage.error('getSpaceList' + err)
-      }
-    },
-    async updateSpace({}, params) {
-      const res = await updateSpace({
-        workspaceId: params._id,
-        name: params.name,
-        description: params.description,
-        members: params.members
-      })
-
-      if (res.code === CODE_MAP.SUCCESS) {
-        ElMessage.success('更新成功')
-      } else {
-        ElMessage.error(res.errmsg)
-      }
-    },
-    async deleteSpace({}, workspaceId) {
-      try {
-        const res = await deleteSpace(workspaceId)
-
-        if (res.code === CODE_MAP.SUCCESS) {
-          ElMessage.success('删除成功')
-        } else {
-          ElMessage.error(res.errmsg)
-        }
-      } catch (err) {
-        ElMessage.error(err)
-      }
-    },
-    async getSurveyList({ state, getters, commit }, payload) {
-      const filterString = JSON.stringify(
-        getters.listFilter.filter((item) => {
-          return item.condition[0].value
-        })
-      )
-      const orderString = JSON.stringify(getters.listOrder)
-      try {
-        let params = {
-          curPage: payload?.curPage || 1,
-          pageSize: payload?.pageSize || 10, // 默认一页10条
-          filter: filterString,
-          order: orderString,
-          workspaceId: state.workSpaceId
-        }
-        // if(payload?.order) {
-        //   params.order = payload.order
-        // }
-        // if(payload.filter) {
-        //   params.filter = payload.filter
-        // }
-        // if(payload?.workspaceId) {
-        //   params.workspaceId = payload.workspaceId
-        // }
-        const res = await surveyList(params)
-        if (res.code === CODE_MAP.SUCCESS) {
-          commit('setSurveyList', res.data.data)
-          commit('setSurveyTotal', res.data.count)
-        } else {
-          ElMessage.error(res.errmsg)
-        }
-      } catch (error) {
-        ElMessage.error('getSurveyList status' + error)
-      }
-    }
-  }
-}
diff --git a/web/src/management/store/mutations.js b/web/src/management/store/mutations.js
deleted file mode 100644
index 0bf45451..00000000
--- a/web/src/management/store/mutations.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export default {
-  setBannerList(state, data) {
-    state.bannerList = data
-  },
-  setCooperPermissions(state, data) {
-    state.cooperPermissions = data
-  }
-}
diff --git a/web/src/management/store/state.js b/web/src/management/store/state.js
deleted file mode 100644
index 8ef14c4d..00000000
--- a/web/src/management/store/state.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { SurveyPermissions } from '@/management/utils/types/workSpace'
-export default {
-  bannerList: [],
-  cooperPermissions: Object.values(SurveyPermissions)
-}
diff --git a/web/src/management/store/user/index.js b/web/src/management/store/user/index.js
deleted file mode 100644
index 14a991eb..00000000
--- a/web/src/management/store/user/index.js
+++ /dev/null
@@ -1,64 +0,0 @@
-const USER_INFO_KEY = 'surveyUserInfo'
-
-export default {
-  namespaced: true,
-  state: {
-    userInfo: {
-      token: '',
-      username: ''
-    },
-    hasLogined: false,
-    loginTime: null,
-    initialized: false
-  },
-  mutations: {
-    setUserInfo(state, data) {
-      state.userInfo = data
-    },
-    setHsLogined(state, data) {
-      state.hasLogined = data
-    },
-    setLoginTime(state, data) {
-      state.loginTime = data
-    },
-    setInitialized(state, data) {
-      state.initialized = data
-    }
-  },
-  actions: {
-    init({ dispatch, commit }) {
-      const localData = localStorage.getItem(USER_INFO_KEY)
-      if (localData) {
-        try {
-          const { userInfo, loginTime } = JSON.parse(localData)
-          if (Date.now() - loginTime > 7 * 3600000) {
-            localStorage.removeItem(USER_INFO_KEY)
-          } else {
-            dispatch('login', userInfo)
-          }
-        } catch (error) {
-          console.log(error)
-        }
-      }
-      commit('setInitialized', true)
-    },
-    login({ commit }, data) {
-      const loginTime = Date.now()
-      commit('setUserInfo', data)
-      commit('setHsLogined', true)
-      commit('setLoginTime', loginTime)
-      localStorage.setItem(
-        USER_INFO_KEY,
-        JSON.stringify({
-          userInfo: data,
-          loginTime: loginTime
-        })
-      )
-    },
-    logout({ commit }) {
-      commit('setUserInfo', null)
-      commit('setHsLogined', false)
-      localStorage.removeItem(USER_INFO_KEY)
-    }
-  }
-}
diff --git a/web/src/management/stores/edit.ts b/web/src/management/stores/edit.ts
index 5a2655c1..4061c9f0 100644
--- a/web/src/management/stores/edit.ts
+++ b/web/src/management/stores/edit.ts
@@ -7,6 +7,10 @@ import { getNewField } from '@/management/utils'
 import submitFormConfig from '@/management/config/setterConfig/submitConfig'
 
 import questionLoader from '@/materials/questions/questionLoader'
+import { SurveyPermissions } from '@/management/utils/types/workSpace'
+import { getBannerData } from '@/management/api/skin.js'
+import { getCollaboratorPermissions } from '@/management/api/space'
+import { CODE_MAP } from '../api/base'
 
 const innerMetaConfig = {
   submit: {
@@ -262,8 +266,16 @@ function useCurrentEdit({
   }
 }
 
+type IBannerItem = {
+  name: string
+  key: string
+  list: Array<Object>
+}
+type IBannerList = Record<string, IBannerItem>
 export const useEditStore = defineStore('edit', () => {
   const surveyId = ref('')
+  const bannerList: Ref<IBannerList> = ref({})
+  const cooperPermissions = ref(Object.values(SurveyPermissions))
   const schemaUpdateTime = ref(Date.now())
   const { schema, initSchema, getSchemaFromRemote } = useInitializeSchema(surveyId)
   const questionDataList = toRef(schema, 'questionDataList')
@@ -276,6 +288,18 @@ export const useEditStore = defineStore('edit', () => {
     surveyId.value = id
   }
 
+  const fetchBannerData = async () => {
+    const res: any = await getBannerData()
+    if (res.code === CODE_MAP.SUCCESS) {
+      bannerList.value = res.data
+    }
+  }
+  const fetchCooperPermissions = async (id: string) => {
+    const res: any = await getCollaboratorPermissions(id)
+    if (res.code === CODE_MAP.SUCCESS) {
+      cooperPermissions.value = res.data.permissions
+    }
+  }
   const {
     currentEditOne,
     currentEditKey,
@@ -319,6 +343,10 @@ export const useEditStore = defineStore('edit', () => {
   return {
     surveyId,
     setSurveyId,
+    bannerList,
+    fetchBannerData,
+    cooperPermissions,
+    fetchCooperPermissions,
     currentEditOne,
     moduleConfig,
     formConfigList,

From 09866663f252597628cd2a8f565fcf765055f8ae Mon Sep 17 00:00:00 2001
From: hiStephen <30630927+1004801012@users.noreply.github.com>
Date: Tue, 16 Jul 2024 10:56:39 +0800
Subject: [PATCH 09/13] =?UTF-8?q?feat:=20=E7=AD=94=E9=A2=98=E9=A1=B5?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3vuex=E8=BF=81=E7=A7=BBpinia=20(#341)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/render/components/MainRenderer.vue    |   4 +-
 web/src/render/components/QuestionWrapper.vue |   4 +-
 web/src/render/hooks/useShowInput.js          |   5 +-
 web/src/render/hooks/useShowOthers.js         |   5 +-
 web/src/render/hooks/useVoteMap.js            |  12 +-
 web/src/render/pages/RenderPage.vue           |   4 +-
 web/src/render/store/actions.js               | 159 +++++++++---------
 web/src/render/store/getters.js               |  49 +++---
 web/src/render/store/mutations.js             |  39 ++---
 web/src/render/store/state.js                 |   6 +-
 web/src/render/stores/question.js             | 157 +++++++++++++++++
 11 files changed, 306 insertions(+), 138 deletions(-)
 create mode 100644 web/src/render/stores/question.js

diff --git a/web/src/render/components/MainRenderer.vue b/web/src/render/components/MainRenderer.vue
index f367a11e..4bb8e0de 100644
--- a/web/src/render/components/MainRenderer.vue
+++ b/web/src/render/components/MainRenderer.vue
@@ -16,10 +16,12 @@ import { computed } from 'vue'
 import { useStore } from 'vuex'
 
 import MaterialGroup from './MaterialGroup.vue'
+import { useQuestionStore } from '../stores/question'
 
 const store = useStore()
+const questionStore = useQuestionStore()
 
-const renderData = computed(() => store.getters?.renderData)
+const renderData = computed(() => questionStore.renderData)
 const rules = computed(() => store.state.rules)
 const formValues = computed(() => store.state.formValues)
 
diff --git a/web/src/render/components/QuestionWrapper.vue b/web/src/render/components/QuestionWrapper.vue
index ed2b8a23..df8e0113 100644
--- a/web/src/render/components/QuestionWrapper.vue
+++ b/web/src/render/components/QuestionWrapper.vue
@@ -16,6 +16,7 @@ import { useShowInput } from '@/render/hooks/useShowInput'
 import store from '@/render/store'
 import { cloneDeep } from 'lodash-es'
 import { ruleEngine } from '@/render/hooks/useRuleEngine.js'
+import { useQuestionStore } from '../stores/question'
 
 import { NORMAL_CHOICES, RATES, QUESTION_TYPE } from '@/common/typeEnum.ts'
 
@@ -32,6 +33,7 @@ const props = defineProps({
   }
 })
 const emit = defineEmits(['change'])
+const questionStore = useQuestionStore()
 
 const formValues = computed(() => {
   return store.state.formValues
@@ -105,7 +107,7 @@ const handleChange = (data) => {
   emit('change', data)
   // 处理投票题
   if (props.moduleConfig.type === QUESTION_TYPE.VOTE) {
-    store.dispatch('updateVoteData', data)
+    questionStore.updateVoteData(data)
   }
 }
 </script>
diff --git a/web/src/render/hooks/useShowInput.js b/web/src/render/hooks/useShowInput.js
index 2bc446ee..66ee9018 100644
--- a/web/src/render/hooks/useShowInput.js
+++ b/web/src/render/hooks/useShowInput.js
@@ -1,8 +1,11 @@
 import store from '../store/index'
+import { useQuestionStore } from '../stores/question'
+
 export const useShowInput = (questionKey) => {
+  const questionStore = useQuestionStore()
   const formValues = store.state.formValues
   const questionVal = formValues[questionKey]
-  let rangeConfig = store.state.questionData[questionKey].rangeConfig
+  let rangeConfig = questionStore.questionData[questionKey].rangeConfig
   let othersValue = {}
   if (rangeConfig && Object.keys(rangeConfig).length > 0) {
     for (let key in rangeConfig) {
diff --git a/web/src/render/hooks/useShowOthers.js b/web/src/render/hooks/useShowOthers.js
index 379c9874..c405eae4 100644
--- a/web/src/render/hooks/useShowOthers.js
+++ b/web/src/render/hooks/useShowOthers.js
@@ -1,9 +1,12 @@
 import store from '../store/index'
+import { useQuestionStore } from '../stores/question'
+
 export const useShowOthers = (questionKey) => {
+  const questionStore = useQuestionStore()
   const formValues = store.state.formValues
   const questionVal = formValues[questionKey]
   let othersValue = {}
-  let options = store.state.questionData[questionKey].options.map((optionItem) => {
+  let options = questionStore.questionData[questionKey].options.map((optionItem) => {
     if (optionItem.others) {
       const opKey = `${questionKey}_${optionItem.hash}`
       othersValue[opKey] = formValues[opKey]
diff --git a/web/src/render/hooks/useVoteMap.js b/web/src/render/hooks/useVoteMap.js
index 70d7da95..31a1b397 100644
--- a/web/src/render/hooks/useVoteMap.js
+++ b/web/src/render/hooks/useVoteMap.js
@@ -1,10 +1,12 @@
-import store from '../store/index'
-export const useVoteMap = (questionKey) => {
-  let voteTotal = store.state.voteMap?.[questionKey]?.total || 0
+import { useQuestionStore } from '../stores/question'
 
-  const options = store.state.questionData[questionKey].options.map((option) => {
+export const useVoteMap = (questionKey) => {
+  const questionStore = useQuestionStore()
+  let voteTotal = questionStore.voteMap?.[questionKey]?.total || 0
+
+  const options = questionStore.questionData[questionKey].options.map((option) => {
     const optionHash = option.hash
-    const voteCount = store.state.voteMap?.[questionKey]?.[optionHash] || 0
+    const voteCount = questionStore.voteMap?.[questionKey]?.[optionHash] || 0
 
     return {
       ...option,
diff --git a/web/src/render/pages/RenderPage.vue b/web/src/render/pages/RenderPage.vue
index 3c2a4e9d..9be5a020 100644
--- a/web/src/render/pages/RenderPage.vue
+++ b/web/src/render/pages/RenderPage.vue
@@ -30,6 +30,7 @@ import ConfirmDialog from '../components/ConfirmDialog.vue'
 import ProgressBar from '../components/ProgressBar.vue'
 
 import { useSurveyStore } from '../stores/survey'
+import { useQuestionStore } from '../stores/question'
 import { submitForm } from '../api/survey'
 import encrypt from '../utils/encrypt'
 
@@ -59,9 +60,10 @@ const confirm = useCommandComponent(ConfirmDialog)
 const store = useStore()
 const router = useRouter()
 const surveyStore = useSurveyStore()
+const questionStore = useQuestionStore()
 
 const bannerConf = computed(() => store.state?.bannerConf || {})
-const renderData = computed(() => store.getters.renderData)
+const renderData = computed(() => questionStore.renderData)
 const submitConf = computed(() => store.state?.submitConf || {})
 const logoConf = computed(() => store.state?.bottomConf || {})
 const surveyPath = computed(() => surveyStore.surveyPath || '')
diff --git a/web/src/render/store/actions.js b/web/src/render/store/actions.js
index a4de4908..777d4227 100644
--- a/web/src/render/store/actions.js
+++ b/web/src/render/store/actions.js
@@ -4,9 +4,10 @@ import 'moment/locale/zh-cn'
 // 设置中文
 moment.locale('zh-cn')
 import adapter from '../adapter'
-import { queryVote } from '@/render/api/survey'
+// import { queryVote } from '@/render/api/survey'
 import { RuleMatch } from '@/common/logicEngine/RulesMatch'
 import { useSurveyStore } from '@/render/stores/survey'
+import { useQuestionStore } from '@/render/stores/question'
 /**
  * CODE_MAP不从management引入，在dev阶段，会导致B端 router被加载，进而导致C端路由被添加 baseUrl: /management
  */
@@ -15,12 +16,13 @@ import { useSurveyStore } from '@/render/stores/survey'
 //   ERROR: 500,
 //   NO_AUTH: 403
 // }
-const VOTE_INFO_KEY = 'voteinfo'
+// const VOTE_INFO_KEY = 'voteinfo'
 import router from '../router'
 export default {
   // 初始化
-  init({ commit, dispatch }, { bannerConf, baseConf, bottomConf, dataConf, skinConf, submitConf }) {
+  init({ commit }, { bannerConf, baseConf, bottomConf, dataConf, skinConf, submitConf }) {
     const surveyStore = useSurveyStore()
+    const questionStore = useQuestionStore()
     surveyStore.setEnterTime()
     const { begTime, endTime, answerBegTime, answerEndTime } = baseConf
     const { msgContent } = submitConf
@@ -67,10 +69,11 @@ export default {
       submitConf
     })
 
+    questionStore.questionData = questionData
+    questionStore.questionSeq = questionSeq
+
     // 将数据设置到state上
     commit('assignState', {
-      questionData,
-      questionSeq,
       rules,
       bannerConf,
       baseConf,
@@ -81,88 +84,90 @@ export default {
       formValues
     })
     // 获取已投票数据
-    dispatch('initVoteData')
+    questionStore.initVoteData()
   },
   // 用户输入或者选择后，更新表单数据
   changeData({ commit }, data) {
     commit('changeFormData', data)
   },
   // 初始化投票题的数据
-  async initVoteData({ state, commit }) {
-    const surveyStore = useSurveyStore()
-    const questionData = state.questionData
-    const surveyPath = surveyStore.surveyPath
+  // async initVoteData({ state, commit }) {
+  //   const surveyStore = useSurveyStore()
+  //   const questionStore = useQuestionStore()
+  //   const questionData = questionStore.questionData
+  //   const surveyPath = surveyStore.surveyPath
 
-    const fieldList = []
+  //   const fieldList = []
 
-    for (const field in questionData) {
-      const { type } = questionData[field]
-      if (/vote/.test(type)) {
-        fieldList.push(field)
-      }
-    }
+  //   for (const field in questionData) {
+  //     const { type } = questionData[field]
+  //     if (/vote/.test(type)) {
+  //       fieldList.push(field)
+  //     }
+  //   }
 
-    if (fieldList.length <= 0) {
-      return
-    }
-    try {
-      localStorage.removeItem(VOTE_INFO_KEY)
-      const voteRes = await queryVote({
-        surveyPath,
-        fieldList: fieldList.join(',')
-      })
+  //   if (fieldList.length <= 0) {
+  //     return
+  //   }
+  //   try {
+  //     localStorage.removeItem(VOTE_INFO_KEY)
+  //     const voteRes = await queryVote({
+  //       surveyPath,
+  //       fieldList: fieldList.join(',')
+  //     })
 
-      if (voteRes.code === 200) {
-        localStorage.setItem(
-          VOTE_INFO_KEY,
-          JSON.stringify({
-            ...voteRes.data
-          })
-        )
-        commit('setVoteMap', voteRes.data)
-      }
-    } catch (error) {
-      console.log(error)
-    }
-  },
-  updateVoteData({ state, commit }, data) {
-    const { key: questionKey, value: questionVal } = data
-    // 更新前获取接口缓存在localStorage中的数据
-    const localData = localStorage.getItem(VOTE_INFO_KEY)
-    const voteinfo = JSON.parse(localData)
-    const currentQuestion = state.questionData[questionKey]
-    const options = currentQuestion.options
-    const voteTotal = voteinfo?.[questionKey]?.total || 0
-    let totalPayload = {
-      questionKey,
-      voteKey: 'total',
-      voteValue: voteTotal
-    }
-    options.forEach((option) => {
-      const optionhash = option.hash
-      const voteCount = voteinfo?.[questionKey]?.[optionhash] || 0
-      // 如果选中值包含该选项，对应voteCount 和 voteTotal  + 1
-      if (
-        Array.isArray(questionVal) ? questionVal.includes(optionhash) : questionVal === optionhash
-      ) {
-        const countPayload = {
-          questionKey,
-          voteKey: optionhash,
-          voteValue: voteCount + 1
-        }
-        totalPayload.voteValue += 1
-        commit('updateVoteMapByKey', countPayload)
-      } else {
-        const countPayload = {
-          questionKey,
-          voteKey: optionhash,
-          voteValue: voteCount
-        }
-        commit('updateVoteMapByKey', countPayload)
-      }
-      commit('updateVoteMapByKey', totalPayload)
-    })
-  },
+  //     if (voteRes.code === 200) {
+  //       localStorage.setItem(
+  //         VOTE_INFO_KEY,
+  //         JSON.stringify({
+  //           ...voteRes.data
+  //         })
+  //       )
+  //       questionStore.setVoteMap(voteRes.data)
+  //     }
+  //   } catch (error) {
+  //     console.log(error)
+  //   }
+  // },
+  // updateVoteData({ state, commit }, data) {
+  //   const questionStore = useQuestionStore()
+  //   const { key: questionKey, value: questionVal } = data
+  //   // 更新前获取接口缓存在localStorage中的数据
+  //   const localData = localStorage.getItem(VOTE_INFO_KEY)
+  //   const voteinfo = JSON.parse(localData)
+  //   const currentQuestion = questionStore.questionData[questionKey]
+  //   const options = currentQuestion.options
+  //   const voteTotal = voteinfo?.[questionKey]?.total || 0
+  //   let totalPayload = {
+  //     questionKey,
+  //     voteKey: 'total',
+  //     voteValue: voteTotal
+  //   }
+  //   options.forEach((option) => {
+  //     const optionhash = option.hash
+  //     const voteCount = voteinfo?.[questionKey]?.[optionhash] || 0
+  //     // 如果选中值包含该选项，对应voteCount 和 voteTotal  + 1
+  //     if (
+  //       Array.isArray(questionVal) ? questionVal.includes(optionhash) : questionVal === optionhash
+  //     ) {
+  //       const countPayload = {
+  //         questionKey,
+  //         voteKey: optionhash,
+  //         voteValue: voteCount + 1
+  //       }
+  //       totalPayload.voteValue += 1
+  //       questionStore.updateVoteMapByKey(countPayload)
+  //     } else {
+  //       const countPayload = {
+  //         questionKey,
+  //         voteKey: optionhash,
+  //         voteValue: voteCount
+  //       }
+  //       questionStore.updateVoteMapByKey(countPayload)
+  //     }
+  //     questionStore.updateVoteMapByKey(totalPayload)
+  //   })
+  // },
   // async getEncryptInfo({ commit }) {
   //   try {
   //     const res = await getEncryptInfo()
diff --git a/web/src/render/store/getters.js b/web/src/render/store/getters.js
index 79d8a23f..81f7e1f5 100644
--- a/web/src/render/store/getters.js
+++ b/web/src/render/store/getters.js
@@ -1,30 +1,25 @@
 export default {
   // 题目列表
-  renderData: (state) => {
-    const { questionSeq, questionData } = state
-
-    let index = 1
-    return (
-      questionSeq &&
-      questionSeq.reduce((pre, item) => {
-        const questionArr = []
-
-        item.forEach((questionKey) => {
-          const question = { ...questionData[questionKey] }
-          // 开启显示序号
-          if (question.showIndex) {
-            question.indexNumber = index++
-          }
-
-          questionArr.push(question)
-        })
-
-        if (questionArr && questionArr.length) {
-          pre.push(questionArr)
-        }
-
-        return pre
-      }, [])
-    )
-  }
+  // renderData: (state) => {
+  //   const { questionSeq, questionData } = state
+  //   let index = 1
+  //   return (
+  //     questionSeq &&
+  //     questionSeq.reduce((pre, item) => {
+  //       const questionArr = []
+  //       item.forEach((questionKey) => {
+  //         const question = { ...questionData[questionKey] }
+  //         // 开启显示序号
+  //         if (question.showIndex) {
+  //           question.indexNumber = index++
+  //         }
+  //         questionArr.push(question)
+  //       })
+  //       if (questionArr && questionArr.length) {
+  //         pre.push(questionArr)
+  //       }
+  //       return pre
+  //     }, [])
+  //   )
+  // }
 }
diff --git a/web/src/render/store/mutations.js b/web/src/render/store/mutations.js
index 8661936c..e862dfef 100644
--- a/web/src/render/store/mutations.js
+++ b/web/src/render/store/mutations.js
@@ -6,9 +6,6 @@ export default {
       state[key] = value
     })
   },
-  setQuestionData(state, data) {
-    state.questionData = data
-  },
   setErrorInfo(state, { errorType, errorMsg }) {
     state.errorInfo = {
       errorType,
@@ -20,30 +17,30 @@ export default {
     // console.log('formValues', key, value)
     set(state, `formValues.${key}`, value)
   },
-  changeSelectMoreData(state, data) {
-    const { key, value, field } = data
-    set(state, `questionData.${field}.othersValue.${key}`, value)
-  },
+  // changeSelectMoreData(state, data) {
+  //   const { key, value, field } = data
+  //   set(state, `questionData.${field}.othersValue.${key}`, value)
+  // },
   // setEnterTime(state) {
   //   state.enterTime = Date.now()
   // },
   // setSurveyPath(state, data) {
   //   state.surveyPath = data
   // },
-  setVoteMap(state, data) {
-    state.voteMap = data
-  },
-  updateVoteMapByKey(state, data) {
-    const { questionKey, voteKey, voteValue } = data
-    // 兼容为空的情况
-    if (!state.voteMap[questionKey]) {
-      state.voteMap[questionKey] = {}
-    }
-    state.voteMap[questionKey][voteKey] = voteValue
-  },
-  setQuestionSeq(state, data) {
-    state.questionSeq = data
-  },
+  // setVoteMap(state, data) {
+  //   state.voteMap = data
+  // },
+  // updateVoteMapByKey(state, data) {
+  //   const { questionKey, voteKey, voteValue } = data
+  //   // 兼容为空的情况
+  //   if (!state.voteMap[questionKey]) {
+  //     state.voteMap[questionKey] = {}
+  //   }
+  //   state.voteMap[questionKey][voteKey] = voteValue
+  // },
+  // setQuestionSeq(state, data) {
+  //   state.questionSeq = data
+  // },
   // setEncryptInfo(state, data) {
   //   state.encryptInfo = data
   // },
diff --git a/web/src/render/store/state.js b/web/src/render/store/state.js
index 53c692ae..b784a1fb 100644
--- a/web/src/render/store/state.js
+++ b/web/src/render/store/state.js
@@ -2,15 +2,15 @@
 
 export default {
   // surveyPath: '',
-  questionData: null,
+  // questionData: null,
   // isMobile: isMobile(),
   errorInfo: {
     errorType: '',
     errorMsg: ''
   },
   // enterTime: null,
-  questionSeq: [], // 题目的顺序，因为可能会有分页的情况，所以是一个二维数组[[qid1, qid2], [qid3,qid4]]
-  voteMap: {},
+  // questionSeq: [], // 题目的顺序，因为可能会有分页的情况，所以是一个二维数组[[qid1, qid2], [qid3,qid4]]
+  // voteMap: {},
   // encryptInfo: null,
   ruleEngine: null
 }
diff --git a/web/src/render/stores/question.js b/web/src/render/stores/question.js
new file mode 100644
index 00000000..8cd603fb
--- /dev/null
+++ b/web/src/render/stores/question.js
@@ -0,0 +1,157 @@
+import { ref, computed } from 'vue'
+import { defineStore } from 'pinia'
+import { set } from 'lodash-es'
+import { useSurveyStore } from '@/render/stores/survey'
+import { queryVote } from '@/render/api/survey'
+
+const VOTE_INFO_KEY = 'voteinfo'
+
+export const useQuestionStore = defineStore('question', () => {
+  const voteMap = ref({})
+  const questionData = ref(null)
+  const questionSeq = ref([]) // 题目的顺序，因为可能会有分页的情况，所以是一个二维数组[[qid1, qid2], [qid3,qid4]]
+
+  // 题目列表
+  const renderData = computed(() => {
+    let index = 1
+    return (
+      questionSeq.value &&
+      questionSeq.value.reduce((pre, item) => {
+        const questionArr = []
+
+        item.forEach((questionKey) => {
+          const question = { ...questionData.value[questionKey] }
+          // 开启显示序号
+          if (question.showIndex) {
+            question.indexNumber = index++
+          }
+
+          questionArr.push(question)
+        })
+
+        if (questionArr && questionArr.length) {
+          pre.push(questionArr)
+        }
+
+        return pre
+      }, [])
+    )
+  })
+
+  const setQuestionData = (data) => {
+    questionData.value = data
+  }
+
+  const changeSelectMoreData = (data) => {
+    const { key, value, field } = data
+    set(questionData.value, `${field}.othersValue.${key}`, value)
+  }
+
+  const setQuestionSeq = (data) => {
+    questionSeq.value = data
+  }
+
+  const setVoteMap = (data) => {
+    voteMap.value = data
+  }
+
+  const updateVoteMapByKey = (data) => {
+    const { questionKey, voteKey, voteValue } = data
+    // 兼容为空的情况
+    if (!voteMap.value[questionKey]) {
+      voteMap.value[questionKey] = {}
+    }
+    voteMap.value[questionKey][voteKey] = voteValue
+  }
+
+  //初始化投票题的数据
+  const initVoteData = async () => {
+    const surveyStore = useSurveyStore()
+    const surveyPath = surveyStore.surveyPath
+
+    const fieldList = []
+
+    for (const field in questionData.value) {
+      const { type } = questionData.value[field]
+      if (/vote/.test(type)) {
+        fieldList.push(field)
+      }
+    }
+
+    if (fieldList.length <= 0) {
+      return
+    }
+    try {
+      localStorage.removeItem(VOTE_INFO_KEY)
+      const voteRes = await queryVote({
+        surveyPath,
+        fieldList: fieldList.join(',')
+      })
+
+      if (voteRes.code === 200) {
+        localStorage.setItem(
+          VOTE_INFO_KEY,
+          JSON.stringify({
+            ...voteRes.data
+          })
+        )
+        setVoteMap(voteRes.data)
+      }
+    } catch (error) {
+      console.log(error)
+    }
+  }
+
+  const updateVoteData = (data) => {
+    const { key: questionKey, value: questionVal } = data
+    // 更新前获取接口缓存在localStorage中的数据
+    const localData = localStorage.getItem(VOTE_INFO_KEY)
+    const voteinfo = JSON.parse(localData)
+    const currentQuestion = questionData.value[questionKey]
+    const options = currentQuestion.options
+    const voteTotal = voteinfo?.[questionKey]?.total || 0
+    let totalPayload = {
+      questionKey,
+      voteKey: 'total',
+      voteValue: voteTotal
+    }
+    options.forEach((option) => {
+      const optionhash = option.hash
+      const voteCount = voteinfo?.[questionKey]?.[optionhash] || 0
+      // 如果选中值包含该选项，对应voteCount 和 voteTotal  + 1
+      if (
+        Array.isArray(questionVal) ? questionVal.includes(optionhash) : questionVal === optionhash
+      ) {
+        const countPayload = {
+          questionKey,
+          voteKey: optionhash,
+          voteValue: voteCount + 1
+        }
+        totalPayload.voteValue += 1
+        updateVoteMapByKey(countPayload)
+      } else {
+        const countPayload = {
+          questionKey,
+          voteKey: optionhash,
+          voteValue: voteCount
+        }
+        updateVoteMapByKey(countPayload)
+      }
+      updateVoteMapByKey(totalPayload)
+    })
+  }
+
+  return {
+    voteMap,
+    questionData,
+    questionSeq,
+    renderData,
+    setQuestionData,
+    changeSelectMoreData,
+    setQuestionSeq,
+    setVoteMap,
+    updateVoteMapByKey,
+    initVoteData,
+    updateVoteData
+  }
+})

From 7ff691471b365d2eb954e3cf712ce227a0aade2d Mon Sep 17 00:00:00 2001
From: dayou <853094838@qq.com>
Date: Tue, 16 Jul 2024 14:32:28 +0800
Subject: [PATCH 10/13] =?UTF-8?q?fix:=20user=E6=A8=A1=E5=9D=97=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E4=B8=BAts=20(#348)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settingModule/skin/CatalogPanel.vue        |  1 -
 .../pages/list/components/MemberSelect.vue     |  2 +-
 web/src/management/router/index.ts             |  1 -
 web/src/management/stores/{user.js => user.ts} | 18 ++++++++++++------
 4 files changed, 13 insertions(+), 9 deletions(-)
 rename web/src/management/stores/{user.js => user.ts} (76%)

diff --git a/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue b/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue
index ae7d844c..5e82c68c 100644
--- a/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue
+++ b/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue
@@ -27,7 +27,6 @@
 </template>
 <script setup lang="ts">
 import { computed, ref } from 'vue'
-import { useStore } from 'vuex'
 import { useEditStore } from '@/management/stores/edit'
 
 import skinPresets from '@/management/config/skinPresets.js'
diff --git a/web/src/management/pages/list/components/MemberSelect.vue b/web/src/management/pages/list/components/MemberSelect.vue
index 9bb83ad2..2633adf0 100644
--- a/web/src/management/pages/list/components/MemberSelect.vue
+++ b/web/src/management/pages/list/components/MemberSelect.vue
@@ -65,7 +65,7 @@ const remoteMethod = async (query: string) => {
     if (res.code === CODE_MAP.SUCCESS) {
       selectOptions.value = res.data.map((item: any) => {
         // 不可以选中自己
-        const currentUser = item.username === userStore.userInfo.username
+        const currentUser = item.username === userStore.userInfo?.username
         return {
           value: item.userId,
           label: item.username,
diff --git a/web/src/management/router/index.ts b/web/src/management/router/index.ts
index 9ca35d6d..be4ef401 100644
--- a/web/src/management/router/index.ts
+++ b/web/src/management/router/index.ts
@@ -5,7 +5,6 @@ import {
   type NavigationGuardNext
 } from 'vue-router'
 import type { RouteRecordRaw } from 'vue-router'
-import { useStore, type Store } from 'vuex'
 import { SurveyPermissions } from '@/management/utils/types/workSpace'
 import { analysisTypeMap } from '@/management/config/analysisConfig'
 import { ElMessage } from 'element-plus'
diff --git a/web/src/management/stores/user.js b/web/src/management/stores/user.ts
similarity index 76%
rename from web/src/management/stores/user.js
rename to web/src/management/stores/user.ts
index 468fc177..5b152519 100644
--- a/web/src/management/stores/user.js
+++ b/web/src/management/stores/user.ts
@@ -1,22 +1,27 @@
-import { ref } from 'vue'
 import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
+type IUserInfo = {
+  username: string
+  token: string
+}
 
 const USER_INFO_KEY = 'surveyUserInfo'
 export const useUserStore = defineStore('user', () => {
-  const userInfo = ref({
+  const userInfo = ref<IUserInfo | null>({
     username: '',
     token: ''
   })
   const hasLogined = ref(false)
-  const loginTime = ref(null)
+  const loginTime = ref<number | null>(null)
   const initialized = ref(false)
 
   const init = () => {
     const localData = localStorage.getItem(USER_INFO_KEY)
     if (localData) {
       try {
-        const { userInfo: info, loginTime } = JSON.parse(localData)
-        if (Date.now() - loginTime > 7 * 3600000) {
+        const { userInfo: info, loginTime: time } = JSON.parse(localData)
+        if (Date.now() - time > 7 * 3600000) {
           localStorage.removeItem(USER_INFO_KEY)
         } else {
           login(info)
@@ -27,7 +32,7 @@ export const useUserStore = defineStore('user', () => {
     }
     initialized.value = true
   }
-  const login = (data) => {
+  const login = (data: IUserInfo) => {
     userInfo.value = data
     hasLogined.value = true
     loginTime.value = Date.now()
@@ -47,3 +52,4 @@ export const useUserStore = defineStore('user', () => {
 
   return { userInfo, hasLogined, loginTime, initialized, init, login, logout }
 })
+

From bd603eccfb4bf5cdeb7420a303cb6fb8def404a1 Mon Sep 17 00:00:00 2001
From: yoruponder <49467824@qq.com>
Date: Wed, 17 Jul 2024 20:11:41 +0800
Subject: [PATCH 11/13] feat: errorInfo to pinia (#353)

---
 web/src/render/pages/ErrorPage.vue | 11 +++++++++--
 web/src/render/store/actions.js    | 23 ++++++++++++++++++++---
 web/src/render/stores/errorInfo.js | 22 ++++++++++++++++++++++
 3 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 web/src/render/stores/errorInfo.js

diff --git a/web/src/render/pages/ErrorPage.vue b/web/src/render/pages/ErrorPage.vue
index 88a209ce..47dfac44 100755
--- a/web/src/render/pages/ErrorPage.vue
+++ b/web/src/render/pages/ErrorPage.vue
@@ -14,13 +14,17 @@ import { computed } from 'vue'
 import { useStore } from 'vuex'
 // @ts-ignore
 import communalLoader from '@materials/communals/communalLoader.js'
+import { useErrorInfo } from '../stores/errorInfo'
 
 const LogoIcon = communalLoader.loadComponent('LogoIcon')
 
 const store = useStore()
+const {errorInfo} = useErrorInfo();
 
 const errorImageUrl = computed(() => {
-  const errorType = store.state?.errorInfo?.errorType
+  // const errorType = store.state?.errorInfo?.errorType
+  const errorType = errorInfo?.errorType
+  
   const imageMap = {
     overTime: '/imgs/icons/overtime.webp',
     default: '/imgs/icons/error.webp'
@@ -29,7 +33,10 @@ const errorImageUrl = computed(() => {
   return imageMap[errorType as 'overTime'] || imageMap.default
 })
 
-const errorMsg = computed(() => store.state?.errorInfo?.errorMsg || '提交失败')
+// const errorMsg = computed(() => store.state?.errorInfo?.errorMsg || '提交失败')
+const errorMsg = computed(() => {
+  return errorInfo?.errorMsg || '提交失败'
+})
 const logoConf = computed(() => store.state?.bottomConf || {})
 </script>
 <style lang="scss" scoped>
diff --git a/web/src/render/store/actions.js b/web/src/render/store/actions.js
index 777d4227..9e08a342 100644
--- a/web/src/render/store/actions.js
+++ b/web/src/render/store/actions.js
@@ -8,6 +8,7 @@ import adapter from '../adapter'
 import { RuleMatch } from '@/common/logicEngine/RulesMatch'
 import { useSurveyStore } from '@/render/stores/survey'
 import { useQuestionStore } from '@/render/stores/question'
+import { useErrorInfo } from '@/render/stores/errorInfo'
 /**
  * CODE_MAP不从management引入，在dev阶段，会导致B端 router被加载，进而导致C端路由被添加 baseUrl: /management
  */
@@ -23,13 +24,20 @@ export default {
   init({ commit }, { bannerConf, baseConf, bottomConf, dataConf, skinConf, submitConf }) {
     const surveyStore = useSurveyStore()
     const questionStore = useQuestionStore()
+    const { setErrorInfo } = useErrorInfo()
+
     surveyStore.setEnterTime()
     const { begTime, endTime, answerBegTime, answerEndTime } = baseConf
     const { msgContent } = submitConf
     const now = Date.now()
     if (now < new Date(begTime).getTime()) {
       router.push({ name: 'errorPage' })
-      commit('setErrorInfo', {
+      // commit('setErrorInfo', {
+      //   errorType: 'overTime',
+      //   errorMsg: `<p>问卷未到开始填写时间，暂时无法进行填写<p/>
+      //              <p>开始时间为: ${begTime}</p>`
+      // })
+      setErrorInfo({
         errorType: 'overTime',
         errorMsg: `<p>问卷未到开始填写时间，暂时无法进行填写<p/>
                    <p>开始时间为: ${begTime}</p>`
@@ -37,7 +45,11 @@ export default {
       return
     } else if (now > new Date(endTime).getTime()) {
       router.push({ name: 'errorPage' })
-      commit('setErrorInfo', {
+      // commit('setErrorInfo', {
+      //   errorType: 'overTime',
+      //   errorMsg: msgContent.msg_9001 || '您来晚了，感谢支持问卷~'
+      // })
+      setErrorInfo({
         errorType: 'overTime',
         errorMsg: msgContent.msg_9001 || '您来晚了，感谢支持问卷~'
       })
@@ -49,7 +61,12 @@ export default {
       const momentEndTime = moment(`${todayStr} ${answerEndTime}`)
       if (momentNow.isBefore(momentStartTime) || momentNow.isAfter(momentEndTime)) {
         router.push({ name: 'errorPage' })
-        commit('setErrorInfo', {
+        // commit('setErrorInfo', {
+        //   errorType: 'overTime',
+        //   errorMsg: `<p>不在答题时间范围内，暂时无法进行填写<p/>
+        //             <p>答题时间为: ${answerBegTime} ~ ${answerEndTime}</p>`
+        // })
+        setErrorInfo({
           errorType: 'overTime',
           errorMsg: `<p>不在答题时间范围内，暂时无法进行填写<p/>
                     <p>答题时间为: ${answerBegTime} ~ ${answerEndTime}</p>`
diff --git a/web/src/render/stores/errorInfo.js b/web/src/render/stores/errorInfo.js
new file mode 100644
index 00000000..1ca00276
--- /dev/null
+++ b/web/src/render/stores/errorInfo.js
@@ -0,0 +1,22 @@
+import { ref } from 'vue'
+import { defineStore } from 'pinia'
+
+export const useErrorInfo = defineStore('errorInfo', () => {
+  const errorInfo = ref( {
+    errorType: '',
+    errorMsg: ''
+  })
+
+  const setErrorInfo = ( { errorType, errorMsg }) => {
+    errorInfo.value = {
+      errorType,
+      errorMsg
+    }
+  };
+
+  return {
+    errorInfo,
+
+    setErrorInfo
+  }
+})

From 6b7b3a12d84815dd0a2b718a277924e7b12c47d3 Mon Sep 17 00:00:00 2001
From: ysansan <hippeauxie@gmail.com>
Date: Fri, 19 Jul 2024 18:55:22 +0800
Subject: [PATCH 12/13] =?UTF-8?q?feat:=20pinia=E8=BF=81=E7=A7=BB--?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E7=9B=B8=E5=85=B3=E9=81=97=E6=BC=8F=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=20(#355)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Ysansan <ysansan98@outlook.com>
---
 web/src/render/App.vue                        |  10 +-
 web/src/render/components/MainRenderer.vue    |  11 +-
 web/src/render/components/QuestionWrapper.vue |   8 +-
 web/src/render/hooks/useProgress.js           |   5 +-
 web/src/render/hooks/useShowInput.js          |   8 +-
 web/src/render/hooks/useShowOthers.js         |   7 +-
 web/src/render/main.js                        |   2 -
 web/src/render/pages/ErrorPage.vue            |  11 +-
 web/src/render/pages/IndexPage.vue            |   4 +-
 web/src/render/pages/RenderPage.vue           |  11 +-
 web/src/render/pages/SuccessPage.vue          |   8 +-
 web/src/render/store/actions.js               | 202 ------------------
 web/src/render/store/getters.js               |  25 ---
 web/src/render/store/index.js                 |  13 --
 web/src/render/store/mutations.js             |  50 -----
 web/src/render/store/state.js                 |  16 --
 web/src/render/stores/survey.js               | 114 ++++++++++
 17 files changed, 155 insertions(+), 350 deletions(-)
 delete mode 100644 web/src/render/store/actions.js
 delete mode 100644 web/src/render/store/getters.js
 delete mode 100644 web/src/render/store/index.js
 delete mode 100644 web/src/render/store/mutations.js
 delete mode 100644 web/src/render/store/state.js

diff --git a/web/src/render/App.vue b/web/src/render/App.vue
index c4f914ea..242905c1 100644
--- a/web/src/render/App.vue
+++ b/web/src/render/App.vue
@@ -4,12 +4,12 @@
   </div>
 </template>
 <script setup lang="ts">
-import { computed, watch } from 'vue'
-import { useStore } from 'vuex'
-import { get as _get } from 'lodash-es'
+import { watch } from 'vue'
+import { storeToRefs } from 'pinia'
 
-const store = useStore()
-const skinConf = computed(() => _get(store, 'state.skinConf', {}))
+import { useSurveyStore } from './stores/survey'
+
+const { skinConf } = storeToRefs(useSurveyStore())
 
 const updateSkinConfig = (value: any) => {
   const root = document.documentElement
diff --git a/web/src/render/components/MainRenderer.vue b/web/src/render/components/MainRenderer.vue
index 4bb8e0de..fde335c3 100644
--- a/web/src/render/components/MainRenderer.vue
+++ b/web/src/render/components/MainRenderer.vue
@@ -13,19 +13,20 @@
 </template>
 <script setup lang="ts">
 import { computed } from 'vue'
-import { useStore } from 'vuex'
+import { storeToRefs } from 'pinia'
 
 import MaterialGroup from './MaterialGroup.vue'
 import { useQuestionStore } from '../stores/question'
+import { useSurveyStore } from '../stores/survey'
 
-const store = useStore()
+const surveyStore = useSurveyStore()
 const questionStore = useQuestionStore()
 
 const renderData = computed(() => questionStore.renderData)
-const rules = computed(() => store.state.rules)
-const formValues = computed(() => store.state.formValues)
+
+const { rules, formValues } = storeToRefs(surveyStore)
 
 const handleChangeData = (data: any) => {
-  store.dispatch('changeData', data)
+  surveyStore.changeData(data)
 }
 </script>
diff --git a/web/src/render/components/QuestionWrapper.vue b/web/src/render/components/QuestionWrapper.vue
index df8e0113..e18e9280 100644
--- a/web/src/render/components/QuestionWrapper.vue
+++ b/web/src/render/components/QuestionWrapper.vue
@@ -13,10 +13,10 @@ import QuestionRuleContainer from '../../materials/questions/QuestionRuleContain
 import { useVoteMap } from '@/render/hooks/useVoteMap'
 import { useShowOthers } from '@/render/hooks/useShowOthers'
 import { useShowInput } from '@/render/hooks/useShowInput'
-import store from '@/render/store'
 import { cloneDeep } from 'lodash-es'
 import { ruleEngine } from '@/render/hooks/useRuleEngine.js'
 import { useQuestionStore } from '../stores/question'
+import { useSurveyStore } from '../stores/survey'
 
 import { NORMAL_CHOICES, RATES, QUESTION_TYPE } from '@/common/typeEnum.ts'
 
@@ -34,9 +34,10 @@ const props = defineProps({
 })
 const emit = defineEmits(['change'])
 const questionStore = useQuestionStore()
+const surveyStore = useSurveyStore()
 
 const formValues = computed(() => {
-  return store.state.formValues
+  return surveyStore.formValues
 })
 const questionConfig = computed(() => {
   let moduleConfig = props.moduleConfig
@@ -98,7 +99,8 @@ watch(
         key: field,
         value: value
       }
-      store.commit('changeFormData', data)
+      // store.commit('changeFormData', data)
+      surveyStore.changeData(data)
     }
   }
 )
diff --git a/web/src/render/hooks/useProgress.js b/web/src/render/hooks/useProgress.js
index 731b0a48..b76981cb 100644
--- a/web/src/render/hooks/useProgress.js
+++ b/web/src/render/hooks/useProgress.js
@@ -1,6 +1,7 @@
-import store from '../store/index'
+import { useSurveyStore } from '../stores/survey'
 import { computed } from 'vue'
 export const useProgressBar = () => {
+  const surveyStore = useSurveyStore()
   const isVariableEmpty = (variable) => {
     if (variable === undefined || variable === null) {
       return true
@@ -22,7 +23,7 @@ export const useProgressBar = () => {
       fillCount: 0,
       topicCount: 0
     }
-    const formValues = store.state.formValues
+    const formValues = surveyStore.formValues
     for (let key in formValues) {
       if (key.split('_').length > 1) continue
 
diff --git a/web/src/render/hooks/useShowInput.js b/web/src/render/hooks/useShowInput.js
index 66ee9018..b4982c4f 100644
--- a/web/src/render/hooks/useShowInput.js
+++ b/web/src/render/hooks/useShowInput.js
@@ -1,9 +1,10 @@
-import store from '../store/index'
 import { useQuestionStore } from '../stores/question'
+import { useSurveyStore } from '../stores/survey'
 
 export const useShowInput = (questionKey) => {
   const questionStore = useQuestionStore()
-  const formValues = store.state.formValues
+  const surveyStore = useSurveyStore()
+  const formValues = surveyStore.formValues
   const questionVal = formValues[questionKey]
   let rangeConfig = questionStore.questionData[questionKey].rangeConfig
   let othersValue = {}
@@ -21,7 +22,8 @@ export const useShowInput = (questionKey) => {
             key: rangeKey,
             value: ''
           }
-          store.commit('changeFormData', data)
+
+          surveyStore.changeData(data)
         }
       }
     }
diff --git a/web/src/render/hooks/useShowOthers.js b/web/src/render/hooks/useShowOthers.js
index c405eae4..df5a8b9e 100644
--- a/web/src/render/hooks/useShowOthers.js
+++ b/web/src/render/hooks/useShowOthers.js
@@ -1,9 +1,10 @@
-import store from '../store/index'
 import { useQuestionStore } from '../stores/question'
+import { useSurveyStore } from '../stores/survey'
 
 export const useShowOthers = (questionKey) => {
   const questionStore = useQuestionStore()
-  const formValues = store.state.formValues
+  const surveyStore = useSurveyStore()
+  const formValues = surveyStore.formValues
   const questionVal = formValues[questionKey]
   let othersValue = {}
   let options = questionStore.questionData[questionKey].options.map((optionItem) => {
@@ -16,7 +17,7 @@ export const useShowOthers = (questionKey) => {
           key: opKey,
           value: ''
         }
-        store.commit('changeFormData', data)
+        surveyStore.changeData(data)
       }
       return {
         ...optionItem,
diff --git a/web/src/render/main.js b/web/src/render/main.js
index 6d8f5c74..ca68f229 100644
--- a/web/src/render/main.js
+++ b/web/src/render/main.js
@@ -2,7 +2,6 @@ import { createApp } from 'vue'
 import App from './App.vue'
 import EventBus from './utils/eventbus'
 import router from './router'
-import store from './store'
 import { createPinia } from 'pinia'
 
 const app = createApp(App)
@@ -12,7 +11,6 @@ const $bus = new EventBus()
 app.provide('$bus', $bus)
 // 挂载到this上
 app.config.globalProperties.$bus = $bus
-app.use(store)
 app.use(pinia)
 app.use(router)
 
diff --git a/web/src/render/pages/ErrorPage.vue b/web/src/render/pages/ErrorPage.vue
index 47dfac44..28ac2d80 100755
--- a/web/src/render/pages/ErrorPage.vue
+++ b/web/src/render/pages/ErrorPage.vue
@@ -11,20 +11,18 @@
 </template>
 <script setup lang="ts">
 import { computed } from 'vue'
-import { useStore } from 'vuex'
 // @ts-ignore
 import communalLoader from '@materials/communals/communalLoader.js'
 import { useErrorInfo } from '../stores/errorInfo'
+import { useSurveyStore } from '../stores/survey'
 
 const LogoIcon = communalLoader.loadComponent('LogoIcon')
 
-const store = useStore()
-const {errorInfo} = useErrorInfo();
+const surveyStore = useSurveyStore()
+const { errorInfo } = useErrorInfo()
 
 const errorImageUrl = computed(() => {
-  // const errorType = store.state?.errorInfo?.errorType
   const errorType = errorInfo?.errorType
-  
   const imageMap = {
     overTime: '/imgs/icons/overtime.webp',
     default: '/imgs/icons/error.webp'
@@ -33,11 +31,10 @@ const errorImageUrl = computed(() => {
   return imageMap[errorType as 'overTime'] || imageMap.default
 })
 
-// const errorMsg = computed(() => store.state?.errorInfo?.errorMsg || '提交失败')
 const errorMsg = computed(() => {
   return errorInfo?.errorMsg || '提交失败'
 })
-const logoConf = computed(() => store.state?.bottomConf || {})
+const logoConf = computed(() => surveyStore.bottomConf || {})
 </script>
 <style lang="scss" scoped>
 .result-page-wrap {
diff --git a/web/src/render/pages/IndexPage.vue b/web/src/render/pages/IndexPage.vue
index aff4b5c7..a692975e 100644
--- a/web/src/render/pages/IndexPage.vue
+++ b/web/src/render/pages/IndexPage.vue
@@ -3,7 +3,6 @@
 </template>
 <script setup lang="ts">
 import { onMounted } from 'vue'
-import { useStore } from 'vuex'
 import { useRoute } from 'vue-router'
 
 import { getPublishedSurveyInfo, getPreviewSchema } from '../api/survey'
@@ -12,7 +11,6 @@ import { useSurveyStore } from '../stores/survey'
 
 import AlertDialog from '../components/AlertDialog.vue'
 import { initRuleEngine } from '@/render/hooks/useRuleEngine.js'
-const store = useStore()
 const route = useRoute()
 const surveyStore = useSurveyStore()
 const loadData = (res: any, surveyPath: string) => {
@@ -32,7 +30,7 @@ const loadData = (res: any, surveyPath: string) => {
     document.title = data.title
 
     surveyStore.setSurveyPath(surveyPath)
-    store.dispatch('init', questionData)
+    surveyStore.initSurvey(questionData)
     initRuleEngine(logicConf?.showLogicConf)
   } else {
     throw new Error(res.errmsg)
diff --git a/web/src/render/pages/RenderPage.vue b/web/src/render/pages/RenderPage.vue
index 9be5a020..18635bb5 100644
--- a/web/src/render/pages/RenderPage.vue
+++ b/web/src/render/pages/RenderPage.vue
@@ -20,7 +20,7 @@
 </template>
 <script setup lang="ts">
 import { computed, ref } from 'vue'
-import { useStore } from 'vuex'
+import { storeToRefs } from 'pinia'
 import { useRouter } from 'vue-router'
 // @ts-ignore
 import communalLoader from '@materials/communals/communalLoader.js'
@@ -57,15 +57,12 @@ const boxRef = ref<HTMLElement>()
 const alert = useCommandComponent(AlertDialog)
 const confirm = useCommandComponent(ConfirmDialog)
 
-const store = useStore()
 const router = useRouter()
 const surveyStore = useSurveyStore()
 const questionStore = useQuestionStore()
 
-const bannerConf = computed(() => store.state?.bannerConf || {})
 const renderData = computed(() => questionStore.renderData)
-const submitConf = computed(() => store.state?.submitConf || {})
-const logoConf = computed(() => store.state?.bottomConf || {})
+const { bannerConf, submitConf, bottomConf: logoConf } = storeToRefs(surveyStore)
 const surveyPath = computed(() => surveyStore.surveyPath || '')
 
 const validate = (cbk: (v: boolean) => void) => {
@@ -76,7 +73,7 @@ const validate = (cbk: (v: boolean) => void) => {
 const normalizationRequestBody = () => {
   const enterTime = surveyStore.enterTime
   const encryptInfo = surveyStore.encryptInfo as any
-  const formValues = store.state.formValues
+  const formValues = surveyStore.formValues
 
   const result: any = {
     surveyPath: surveyPath.value,
@@ -123,7 +120,7 @@ const submitSurver = async () => {
 }
 
 const handleSubmit = () => {
-  const confirmAgain = store.state.submitConf.confirmAgain
+  const confirmAgain = (surveyStore.submitConf as any).confirmAgain
   const { again_text, is_again } = confirmAgain
 
   if (is_again) {
diff --git a/web/src/render/pages/SuccessPage.vue b/web/src/render/pages/SuccessPage.vue
index b59040e6..c922d031 100644
--- a/web/src/render/pages/SuccessPage.vue
+++ b/web/src/render/pages/SuccessPage.vue
@@ -11,16 +11,16 @@
 </template>
 <script setup lang="ts">
 import { computed } from 'vue'
-import { useStore } from 'vuex'
+import { useSurveyStore } from '../stores/survey'
 // @ts-ignore
 import communalLoader from '@materials/communals/communalLoader.js'
 
 const LogoIcon = communalLoader.loadComponent('LogoIcon')
-const store = useStore()
+const surveyStore = useSurveyStore()
 
-const logoConf = computed(() => store.state?.bottomConf || {})
+const logoConf = computed(() => surveyStore?.bottomConf || {})
 const successMsg = computed(() => {
-  const msgContent = store.state?.submitConf?.msgContent || {}
+  const msgContent = (surveyStore?.submitConf as any)?.msgContent || {}
   return msgContent?.msg_200 || '提交成功'
 })
 </script>
diff --git a/web/src/render/store/actions.js b/web/src/render/store/actions.js
deleted file mode 100644
index 9e08a342..00000000
--- a/web/src/render/store/actions.js
+++ /dev/null
@@ -1,202 +0,0 @@
-import moment from 'moment'
-// 引入中文
-import 'moment/locale/zh-cn'
-// 设置中文
-moment.locale('zh-cn')
-import adapter from '../adapter'
-// import { queryVote } from '@/render/api/survey'
-import { RuleMatch } from '@/common/logicEngine/RulesMatch'
-import { useSurveyStore } from '@/render/stores/survey'
-import { useQuestionStore } from '@/render/stores/question'
-import { useErrorInfo } from '@/render/stores/errorInfo'
-/**
- * CODE_MAP不从management引入，在dev阶段，会导致B端 router被加载，进而导致C端路由被添加 baseUrl: /management
- */
-// const CODE_MAP = {
-//   SUCCESS: 200,
-//   ERROR: 500,
-//   NO_AUTH: 403
-// }
-// const VOTE_INFO_KEY = 'voteinfo'
-import router from '../router'
-export default {
-  // 初始化
-  init({ commit }, { bannerConf, baseConf, bottomConf, dataConf, skinConf, submitConf }) {
-    const surveyStore = useSurveyStore()
-    const questionStore = useQuestionStore()
-    const { setErrorInfo } = useErrorInfo()
-
-    surveyStore.setEnterTime()
-    const { begTime, endTime, answerBegTime, answerEndTime } = baseConf
-    const { msgContent } = submitConf
-    const now = Date.now()
-    if (now < new Date(begTime).getTime()) {
-      router.push({ name: 'errorPage' })
-      // commit('setErrorInfo', {
-      //   errorType: 'overTime',
-      //   errorMsg: `<p>问卷未到开始填写时间，暂时无法进行填写<p/>
-      //              <p>开始时间为: ${begTime}</p>`
-      // })
-      setErrorInfo({
-        errorType: 'overTime',
-        errorMsg: `<p>问卷未到开始填写时间，暂时无法进行填写<p/>
-                   <p>开始时间为: ${begTime}</p>`
-      })
-      return
-    } else if (now > new Date(endTime).getTime()) {
-      router.push({ name: 'errorPage' })
-      // commit('setErrorInfo', {
-      //   errorType: 'overTime',
-      //   errorMsg: msgContent.msg_9001 || '您来晚了，感谢支持问卷~'
-      // })
-      setErrorInfo({
-        errorType: 'overTime',
-        errorMsg: msgContent.msg_9001 || '您来晚了，感谢支持问卷~'
-      })
-      return
-    } else if (answerBegTime && answerEndTime) {
-      const momentNow = moment()
-      const todayStr = momentNow.format('yyyy-MM-DD')
-      const momentStartTime = moment(`${todayStr} ${answerBegTime}`)
-      const momentEndTime = moment(`${todayStr} ${answerEndTime}`)
-      if (momentNow.isBefore(momentStartTime) || momentNow.isAfter(momentEndTime)) {
-        router.push({ name: 'errorPage' })
-        // commit('setErrorInfo', {
-        //   errorType: 'overTime',
-        //   errorMsg: `<p>不在答题时间范围内，暂时无法进行填写<p/>
-        //             <p>答题时间为: ${answerBegTime} ~ ${answerEndTime}</p>`
-        // })
-        setErrorInfo({
-          errorType: 'overTime',
-          errorMsg: `<p>不在答题时间范围内，暂时无法进行填写<p/>
-                    <p>答题时间为: ${answerBegTime} ~ ${answerEndTime}</p>`
-        })
-        return
-      }
-    }
-    router.push({ name: 'renderPage' })
-
-    // 根据初始的schema生成questionData, questionSeq, rules, formValues, 这四个字段
-    const { questionData, questionSeq, rules, formValues } = adapter.generateData({
-      bannerConf,
-      baseConf,
-      bottomConf,
-      dataConf,
-      skinConf,
-      submitConf
-    })
-
-    questionStore.questionData = questionData
-    questionStore.questionSeq = questionSeq
-
-    // 将数据设置到state上
-    commit('assignState', {
-      rules,
-      bannerConf,
-      baseConf,
-      bottomConf,
-      dataConf,
-      skinConf,
-      submitConf,
-      formValues
-    })
-    // 获取已投票数据
-    questionStore.initVoteData()
-  },
-  // 用户输入或者选择后，更新表单数据
-  changeData({ commit }, data) {
-    commit('changeFormData', data)
-  },
-  // 初始化投票题的数据
-  // async initVoteData({ state, commit }) {
-  //   const surveyStore = useSurveyStore()
-  //   const questionStore = useQuestionStore()
-  //   const questionData = questionStore.questionData
-  //   const surveyPath = surveyStore.surveyPath
-
-  //   const fieldList = []
-
-  //   for (const field in questionData) {
-  //     const { type } = questionData[field]
-  //     if (/vote/.test(type)) {
-  //       fieldList.push(field)
-  //     }
-  //   }
-
-  //   if (fieldList.length <= 0) {
-  //     return
-  //   }
-  //   try {
-  //     localStorage.removeItem(VOTE_INFO_KEY)
-  //     const voteRes = await queryVote({
-  //       surveyPath,
-  //       fieldList: fieldList.join(',')
-  //     })
-
-  //     if (voteRes.code === 200) {
-  //       localStorage.setItem(
-  //         VOTE_INFO_KEY,
-  //         JSON.stringify({
-  //           ...voteRes.data
-  //         })
-  //       )
-  //       questionStore.setVoteMap(voteRes.data)
-  //     }
-  //   } catch (error) {
-  //     console.log(error)
-  //   }
-  // },
-  // updateVoteData({ state, commit }, data) {
-  //   const questionStore = useQuestionStore()
-  //   const { key: questionKey, value: questionVal } = data
-  //   // 更新前获取接口缓存在localStorage中的数据
-  //   const localData = localStorage.getItem(VOTE_INFO_KEY)
-  //   const voteinfo = JSON.parse(localData)
-  //   const currentQuestion = questionStore.questionData[questionKey]
-  //   const options = currentQuestion.options
-  //   const voteTotal = voteinfo?.[questionKey]?.total || 0
-  //   let totalPayload = {
-  //     questionKey,
-  //     voteKey: 'total',
-  //     voteValue: voteTotal
-  //   }
-  //   options.forEach((option) => {
-  //     const optionhash = option.hash
-  //     const voteCount = voteinfo?.[questionKey]?.[optionhash] || 0
-  //     // 如果选中值包含该选项，对应voteCount 和 voteTotal  + 1
-  //     if (
-  //       Array.isArray(questionVal) ? questionVal.includes(optionhash) : questionVal === optionhash
-  //     ) {
-  //       const countPayload = {
-  //         questionKey,
-  //         voteKey: optionhash,
-  //         voteValue: voteCount + 1
-  //       }
-  //       totalPayload.voteValue += 1
-  //       questionStore.updateVoteMapByKey(countPayload)
-  //     } else {
-  //       const countPayload = {
-  //         questionKey,
-  //         voteKey: optionhash,
-  //         voteValue: voteCount
-  //       }
-  //       questionStore.updateVoteMapByKey(countPayload)
-  //     }
-  //     questionStore.updateVoteMapByKey(totalPayload)
-  //   })
-  // },
-  // async getEncryptInfo({ commit }) {
-  //   try {
-  //     const res = await getEncryptInfo()
-  //     if (res.code === CODE_MAP.SUCCESS) {
-  //       commit('setEncryptInfo', res.data)
-  //     }
-  //   } catch (error) {
-  //     console.log(error)
-  //   }
-  // },
-  async initRuleEngine({ commit }, ruleConf) {
-    const ruleEngine = new RuleMatch(ruleConf)
-    commit('setRuleEgine', ruleEngine)
-  }
-}
diff --git a/web/src/render/store/getters.js b/web/src/render/store/getters.js
deleted file mode 100644
index 81f7e1f5..00000000
--- a/web/src/render/store/getters.js
+++ /dev/null
@@ -1,25 +0,0 @@
-export default {
-  // 题目列表
-  // renderData: (state) => {
-  //   const { questionSeq, questionData } = state
-  //   let index = 1
-  //   return (
-  //     questionSeq &&
-  //     questionSeq.reduce((pre, item) => {
-  //       const questionArr = []
-  //       item.forEach((questionKey) => {
-  //         const question = { ...questionData[questionKey] }
-  //         // 开启显示序号
-  //         if (question.showIndex) {
-  //           question.indexNumber = index++
-  //         }
-  //         questionArr.push(question)
-  //       })
-  //       if (questionArr && questionArr.length) {
-  //         pre.push(questionArr)
-  //       }
-  //       return pre
-  //     }, [])
-  //   )
-  // }
-}
diff --git a/web/src/render/store/index.js b/web/src/render/store/index.js
deleted file mode 100644
index 4013b40c..00000000
--- a/web/src/render/store/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { createStore } from 'vuex'
-
-import state from './state'
-import getters from './getters'
-import mutations from './mutations'
-import actions from './actions'
-
-export default createStore({
-  state,
-  getters,
-  mutations,
-  actions
-})
diff --git a/web/src/render/store/mutations.js b/web/src/render/store/mutations.js
deleted file mode 100644
index e862dfef..00000000
--- a/web/src/render/store/mutations.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import { forEach, set } from 'lodash-es'
-export default {
-  // 将数据设置到state上
-  assignState(state, data) {
-    forEach(data, (value, key) => {
-      state[key] = value
-    })
-  },
-  setErrorInfo(state, { errorType, errorMsg }) {
-    state.errorInfo = {
-      errorType,
-      errorMsg
-    }
-  },
-  changeFormData(state, data) {
-    let { key, value } = data
-    // console.log('formValues', key, value)
-    set(state, `formValues.${key}`, value)
-  },
-  // changeSelectMoreData(state, data) {
-  //   const { key, value, field } = data
-  //   set(state, `questionData.${field}.othersValue.${key}`, value)
-  // },
-  // setEnterTime(state) {
-  //   state.enterTime = Date.now()
-  // },
-  // setSurveyPath(state, data) {
-  //   state.surveyPath = data
-  // },
-  // setVoteMap(state, data) {
-  //   state.voteMap = data
-  // },
-  // updateVoteMapByKey(state, data) {
-  //   const { questionKey, voteKey, voteValue } = data
-  //   // 兼容为空的情况
-  //   if (!state.voteMap[questionKey]) {
-  //     state.voteMap[questionKey] = {}
-  //   }
-  //   state.voteMap[questionKey][voteKey] = voteValue
-  // },
-  // setQuestionSeq(state, data) {
-  //   state.questionSeq = data
-  // },
-  // setEncryptInfo(state, data) {
-  //   state.encryptInfo = data
-  // },
-  setRuleEgine(state, ruleEngine) {
-    state.ruleEngine = ruleEngine
-  }
-}
diff --git a/web/src/render/store/state.js b/web/src/render/store/state.js
deleted file mode 100644
index b784a1fb..00000000
--- a/web/src/render/store/state.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// import { isMobile } from '../utils/index'
-
-export default {
-  // surveyPath: '',
-  // questionData: null,
-  // isMobile: isMobile(),
-  errorInfo: {
-    errorType: '',
-    errorMsg: ''
-  },
-  // enterTime: null,
-  // questionSeq: [], // 题目的顺序，因为可能会有分页的情况，所以是一个二维数组[[qid1, qid2], [qid3,qid4]]
-  // voteMap: {},
-  // encryptInfo: null,
-  ruleEngine: null
-}
diff --git a/web/src/render/stores/survey.js b/web/src/render/stores/survey.js
index 461c908e..b241651a 100644
--- a/web/src/render/stores/survey.js
+++ b/web/src/render/stores/survey.js
@@ -1,8 +1,20 @@
 import { ref } from 'vue'
+import { useRouter } from 'vue-router'
 import { defineStore } from 'pinia'
+import { pick } from 'lodash-es'
 
 import { isMobile as isInMobile } from '@/render/utils/index'
 import { getEncryptInfo as getEncryptInfoApi } from '@/render/api/survey'
+import { useQuestionStore } from '@/render/stores/question'
+import { useErrorInfo } from '@/render/stores/errorInfo'
+
+import moment from 'moment'
+// 引入中文
+import 'moment/locale/zh-cn'
+// 设置中文
+moment.locale('zh-cn')
+
+import adapter from '../adapter'
 
 /**
  * CODE_MAP不从management引入，在dev阶段，会导致B端 router被加载，进而导致C端路由被添加 baseUrl: /management
@@ -17,6 +29,18 @@ export const useSurveyStore = defineStore('survey', () => {
   const isMobile = ref(isInMobile())
   const enterTime = ref(0)
   const encryptInfo = ref(null)
+  const rules = ref({})
+  const bannerConf = ref({})
+  const baseConf = ref({})
+  const bottomConf = ref({})
+  const dataConf = ref({})
+  const skinConf = ref({})
+  const submitConf = ref({})
+  const formValues = ref({})
+
+  const router = useRouter()
+  const questionStore = useQuestionStore()
+  const { setErrorInfo } = useErrorInfo()
 
   const setSurveyPath = (data) => {
     surveyPath.value = data
@@ -37,12 +61,102 @@ export const useSurveyStore = defineStore('survey', () => {
     }
   }
 
+  const canFillQuestionnaire = (baseConf) => {
+    const { begTime, endTime, answerBegTime, answerEndTime } = baseConf
+    const { msgContent } = submitConf
+    const now = Date.now()
+    let isSuccess = true
+
+    if (now < new Date(begTime).getTime()) {
+      isSuccess = false
+      setErrorInfo({
+        errorType: 'overTime',
+        errorMsg: `<p>问卷未到开始填写时间，暂时无法进行填写<p/>
+                   <p>开始时间为: ${begTime}</p>`
+      })
+    } else if (now > new Date(endTime).getTime()) {
+      isSuccess = false
+      setErrorInfo({
+        errorType: 'overTime',
+        errorMsg: msgContent.msg_9001 || '您来晚了，感谢支持问卷~'
+      })
+    } else if (answerBegTime && answerEndTime) {
+      const momentNow = moment()
+      const todayStr = momentNow.format('yyyy-MM-DD')
+      const momentStartTime = moment(`${todayStr} ${answerBegTime}`)
+      const momentEndTime = moment(`${todayStr} ${answerEndTime}`)
+      if (momentNow.isBefore(momentStartTime) || momentNow.isAfter(momentEndTime)) {
+        isSuccess = false
+        setErrorInfo({
+          errorType: 'overTime',
+          errorMsg: `<p>不在答题时间范围内，暂时无法进行填写<p/>
+                    <p>答题时间为: ${answerBegTime} ~ ${answerEndTime}</p>`
+        })
+      }
+    }
+
+    if (!isSuccess) {
+      router.push({ name: 'errorPage' })
+    }
+
+    return isSuccess
+  }
+  const initSurvey = (option) => {
+    setEnterTime()
+
+    if (!canFillQuestionnaire(option.baseConf)) {
+      return
+    }
+
+    // 根据初始的schema生成questionData, questionSeq, rules, formValues, 这四个字段
+    const {
+      questionData,
+      questionSeq,
+      rules: _rules,
+      formValues: _formValues
+    } = adapter.generateData(
+      pick(option, ['bannerConf', 'baseConf', 'bottomConf', 'dataConf', 'skinConf', 'submitConf'])
+    )
+
+    questionStore.questionData = questionData
+    questionStore.questionSeq = questionSeq
+
+    rules.value = _rules
+    bannerConf.value = option.bannerConf
+    baseConf.value = option.baseConf
+    bottomConf.value = option.bottomConf
+    dataConf.value = option.dataConf
+    skinConf.value = option.skinConf
+    submitConf.value = option.submitConf
+    formValues.value = _formValues
+
+    // 获取已投票数据
+    questionStore.initVoteData()
+  }
+
+  const changeData = (data) => {
+    let { key, value } = data
+    if (key in formValues.value) {
+      formValues.value[key] = value
+    }
+  }
+
   return {
     surveyPath,
     isMobile,
     enterTime,
     encryptInfo,
+    rules,
+    bannerConf,
+    baseConf,
+    bottomConf,
+    dataConf,
+    skinConf,
+    submitConf,
+    formValues,
 
+    initSurvey,
+    changeData,
     setSurveyPath,
     setEnterTime,
     getEncryptInfo

From 9afd1d1c7c4d9c71df062b63359b7f98a614ea63 Mon Sep 17 00:00:00 2001
From: sudoooooo <zjbbabybaby@gmail.com>
Date: Mon, 22 Jul 2024 17:18:37 +0800
Subject: [PATCH 13/13] =?UTF-8?q?fix:=20render=E9=94=99=E8=AF=AF=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/questionModule/PreviewPanel.vue   | 48 ++++++++++---------
 web/src/render/pages/ErrorPage.vue            | 26 +++++-----
 web/src/render/stores/errorInfo.js            |  6 +--
 web/src/render/stores/survey.js               |  6 ++-
 4 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/web/src/management/pages/edit/modules/questionModule/PreviewPanel.vue b/web/src/management/pages/edit/modules/questionModule/PreviewPanel.vue
index d9640982..a8ca36a2 100644
--- a/web/src/management/pages/edit/modules/questionModule/PreviewPanel.vue
+++ b/web/src/management/pages/edit/modules/questionModule/PreviewPanel.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script setup>
-import { computed, ref, watch, toRefs } from 'vue'
+import { ref, watch, toRefs } from 'vue'
 import communalLoader from '@materials/communals/communalLoader.js'
 import MaterialGroup from '@/management/pages/edit/components/MaterialGroup.vue'
 import { storeToRefs } from 'pinia'
@@ -47,12 +47,12 @@ const mainOperation = ref(null)
 const materialGroup = ref(null)
 
 const { bannerConf, submitConf, skinConf } = toRefs(schema)
-const autoScrollData = computed(() => {
-  return {
-    currentEditOne: currentEditOne.value,
-    len: questionDataList.value.length
-  }
-})
+// const autoScrollData = computed(() => {
+//   return {
+//     currentEditOne: currentEditOne.value,
+//     len: questionDataList.value.length
+//   }
+// })
 
 const handleChange = (data) => {
   if (currentEditOne.value === null) {
@@ -108,22 +108,24 @@ watch(
   }
 )
 
-watch(autoScrollData, (newVal) => {
-  const { currentEditOne } = newVal
-  if (typeof currentEditOne === 'number') {
-    setTimeout(() => {
-      const field = questionDataList.value?.[currentEditOne]?.field
-      if (field) {
-        const questionModule = materialGroup.value?.getQuestionRefByField(field)
-        if (questionModule && questionModule.$el) {
-          questionModule.$el.scrollIntoView({
-            behavior: 'smooth'
-          })
-        }
-      }
-    }, 0)
-  }
-})
+// 实际编辑题目不会只是从上到下而需要上下题目对比。
+// 一直跳动到顶部影响编辑操作，若有场景需要可自行放开
+// watch(autoScrollData, (newVal) => {
+//   const { currentEditOne } = newVal
+//   if (typeof currentEditOne === 'number') {
+//     setTimeout(() => {
+//       const field = questionDataList.value?.[currentEditOne]?.field
+//       if (field) {
+//         const questionModule = materialGroup.value?.getQuestionRefByField(field)
+//         if (questionModule && questionModule.$el) {
+//           questionModule.$el.scrollIntoView({
+//             behavior: 'smooth'
+//           })
+//         }
+//       }
+//     }, 0)
+//   }
+// })
 </script>
 
 <style lang="scss" scoped>
diff --git a/web/src/render/pages/ErrorPage.vue b/web/src/render/pages/ErrorPage.vue
index 28ac2d80..38ac19cb 100755
--- a/web/src/render/pages/ErrorPage.vue
+++ b/web/src/render/pages/ErrorPage.vue
@@ -2,16 +2,17 @@
   <div class="result-page-wrap">
     <div class="result-page">
       <div class="page-content">
-        <img class="img" :src="errorImageUrl" />
+        <img class="img" :src="errorImage" />
         <div class="msg" v-html="errorMsg"></div>
       </div>
       <LogoIcon :logo-conf="logoConf" :readonly="true" />
     </div>
   </div>
 </template>
-<script setup lang="ts">
+<script setup>
 import { computed } from 'vue'
-// @ts-ignore
+import { storeToRefs } from 'pinia'
+
 import communalLoader from '@materials/communals/communalLoader.js'
 import { useErrorInfo } from '../stores/errorInfo'
 import { useSurveyStore } from '../stores/survey'
@@ -19,20 +20,21 @@ import { useSurveyStore } from '../stores/survey'
 const LogoIcon = communalLoader.loadComponent('LogoIcon')
 
 const surveyStore = useSurveyStore()
-const { errorInfo } = useErrorInfo()
+const errorStore = useErrorInfo()
+const { errorInfo } = storeToRefs(errorStore)
+const imageMap = {
+  overTime: '/imgs/icons/overtime.webp',
+  default: '/imgs/icons/error.webp'
+}
 
-const errorImageUrl = computed(() => {
-  const errorType = errorInfo?.errorType
-  const imageMap = {
-    overTime: '/imgs/icons/overtime.webp',
-    default: '/imgs/icons/error.webp'
-  }
+const errorImage = computed(() => {
+  const errorType = errorInfo.value.errorType
 
-  return imageMap[errorType as 'overTime'] || imageMap.default
+  return imageMap[errorType] || imageMap.default
 })
 
 const errorMsg = computed(() => {
-  return errorInfo?.errorMsg || '提交失败'
+  return errorInfo.value.errorMsg || '提交失败'
 })
 const logoConf = computed(() => surveyStore.bottomConf || {})
 </script>
diff --git a/web/src/render/stores/errorInfo.js b/web/src/render/stores/errorInfo.js
index 1ca00276..b0b6e7a0 100644
--- a/web/src/render/stores/errorInfo.js
+++ b/web/src/render/stores/errorInfo.js
@@ -2,17 +2,17 @@ import { ref } from 'vue'
 import { defineStore } from 'pinia'
 
 export const useErrorInfo = defineStore('errorInfo', () => {
-  const errorInfo = ref( {
+  const errorInfo = ref({
     errorType: '',
     errorMsg: ''
   })
 
-  const setErrorInfo = ( { errorType, errorMsg }) => {
+  const setErrorInfo = ({ errorType, errorMsg }) => {
     errorInfo.value = {
       errorType,
       errorMsg
     }
-  };
+  }
 
   return {
     errorInfo,
diff --git a/web/src/render/stores/survey.js b/web/src/render/stores/survey.js
index b241651a..182b1275 100644
--- a/web/src/render/stores/survey.js
+++ b/web/src/render/stores/survey.js
@@ -61,7 +61,7 @@ export const useSurveyStore = defineStore('survey', () => {
     }
   }
 
-  const canFillQuestionnaire = (baseConf) => {
+  const canFillQuestionnaire = (baseConf, submitConf) => {
     const { begTime, endTime, answerBegTime, answerEndTime } = baseConf
     const { msgContent } = submitConf
     const now = Date.now()
@@ -104,7 +104,7 @@ export const useSurveyStore = defineStore('survey', () => {
   const initSurvey = (option) => {
     setEnterTime()
 
-    if (!canFillQuestionnaire(option.baseConf)) {
+    if (!canFillQuestionnaire(option.baseConf, option.submitConf)) {
       return
     }
 
@@ -121,6 +121,7 @@ export const useSurveyStore = defineStore('survey', () => {
     questionStore.questionData = questionData
     questionStore.questionSeq = questionSeq
 
+    // 将数据设置到state上
     rules.value = _rules
     bannerConf.value = option.bannerConf
     baseConf.value = option.baseConf
@@ -134,6 +135,7 @@ export const useSurveyStore = defineStore('survey', () => {
     questionStore.initVoteData()
   }
 
+  // 用户输入或者选择后，更新表单数据
   const changeData = (data) => {
     let { key, value } = data
     if (key in formValues.value) {