编辑冲突检测 (#351)

server/src/modules/survey/services/surveyHistory.service.ts

@@ -70,7 +70,7 @@ export class SurveyHistoryService {
         'operator.sessionId': { $ne: sessionId },
       },
       order: { createDate: 'DESC' },
-      take: 100,
+      take: 1,
       select: ['createDate', 'operator', 'type', '_id'],
     });
 

web/src/management/pages/edit/index.vue

@@ -18,6 +18,7 @@ import { onMounted, ref, onUnmounted } from 'vue'
 import { useStore } from 'vuex'
 import { useRouter, useRoute } from 'vue-router'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import type { Action } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
 
 import LeftMenu from '@/management/components/LeftMenu.vue'
@@ -31,44 +32,40 @@ const router = useRouter()
 const route = useRoute()
 const authCheckInterval = ref<any>(null)
 const showConfirmBox = () => {
-  const token = store.state.user.userInfo.token
+  ElMessageBox.alert('登录状态已失效，请重新登陆。', '提示', {
-  ElMessageBox.alert('登录状态已失效，请刷新同步。页面将展示最新保存的内容。', '提示', {
     confirmButtonText: '确认',
-    callback: () => {
+    showClose: false,
-      axios.get('/auth/statuscheck', {
+    callback: (action: Action) => {
-        headers: {
+      if (action === 'confirm') {
-        'Authorization': `Bearer ${token}`
+        axios.get('/auth/statuscheck')
-        }
+          .then((response) => {
-      })
+            if (response.data.expired) {
-      .then((response) => {
+              store.dispatch('user/logout').then(() => {
-        if (response.data.expired) {
+                router.replace({name: 'login'});  // 仍然失效，登出，跳转到登录界面
-          store.dispatch('user/logout').then(() => {
+              })
-            router.replace({name: 'login'});  // 仍然失效，登出，跳转到登录界面
+            } else {
+              location.reload(); // 已登录，刷新页面
+            }
           })
-        } else {
+          .catch((error) => {
-          location.reload(); // 已登录，刷新页面
+            console.log("error: " + error);
+            store.dispatch('user/logout').then(() => {
+              router.replace({name: 'login'});
+            })
+          });
         }
-      })
-      .catch((error) => {
-        console.log("error: " + error);
-        ElMessage.error(error.message || '请求失败');
-      });
     }
   });
 }
 const checkAuth = () => {
-  const token = store.state.user.userInfo.token
+  axios.get('/auth/statuscheck').then((response) => {
-  axios.get('/auth/statuscheck', {
-    headers: {
-    'Authorization': `Bearer ${token}`
-    }
-  }).then((response) => {
     if (response.data.expired) {
+      clearInterval(authCheckInterval.value);
+      authCheckInterval.value = null
       showConfirmBox();
     }
   }).catch((error) => {
     console.log("erro:" + error)
-    ElMessage.error(error)
   });
 }
 onMounted(async () => {
@@ -77,6 +74,9 @@ onMounted(async () => {
   try {
     await store.dispatch('edit/init')
     await initShowLogicEngine(store.state.edit.schema.logicConf.showLogicConf || {})
+
+    // 启动定时器，每30分钟调用一次
+    authCheckInterval.value = setInterval(() => checkAuth(), 1000);
   } catch (err: any) {
     ElMessage.error(err.message)
 
@@ -84,13 +84,10 @@ onMounted(async () => {
       router.replace({ name: 'survey' })
     }, 1000)
   }
-  // 启动定时器，每30分钟调用一次
-  authCheckInterval.value = setInterval(() => {
-    checkAuth()
-  }, 30 * 60 * 1000);
 })
 onUnmounted(() => {
   clearInterval(authCheckInterval.value);
+  authCheckInterval.value = null
 })
 </script>
 <style lang="scss" scoped>

web/src/management/pages/edit/modules/contentModule/PublishPanel.vue

@@ -7,7 +7,7 @@
 import { ref, computed } from 'vue'
 import { useStore } from 'vuex'
 import { useRouter } from 'vue-router'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, type Action } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
 import { publishSurvey, saveSurvey, getConflictHistory } from '@/management/api/survey'
 import { showLogicEngine } from '@/management/hooks/useShowLogicEngine'
@@ -35,14 +35,12 @@ const updateLogicConf = () => {
 const checkConflict = async (surveyid:string) => {
   try {
     const dailyHis = await getConflictHistory({surveyId: surveyid, historyType: 'dailyHis', sessionId: sessionStorage.getItem('sessionUUID')})
-    console.log(dailyHis)
     if (dailyHis.data.length > 0) {
       const lastHis = dailyHis.data.at(0)
       if (Date.now() - lastHis.createDate > 2 * 60 * 1000) {
         return [false, '']
-      } else {
-        return [true, lastHis.operator.username]
       }
+      return [true, lastHis.operator.username]
     }
   } catch (error) {
     console.log(error)
@@ -62,15 +60,19 @@ const onSave = async () => {
     if (conflictName == store.state.user.userInfo.username) {
       ElMessageBox.alert('当前问卷已在其它页面开启编辑，刷新以获取最新内容。', '提示', {
         confirmButtonText: '确认',
-        callback: () => {
+        callback: (action: Action) => {
-          location.reload(); 
+          if (action === 'confirm') {
+            store.dispatch('edit/getSchemaFromRemote')
+          }
         }
       });
     } else {
       ElMessageBox.alert(`当前问卷2分钟内由${conflictName}编辑，刷新以获取最新内容。`, '提示', {
         confirmButtonText: '确认',
-        callback: () => {
+        callback: (action: Action) => {
-          location.reload(); 
+          if (action === 'confirm') {
+            store.dispatch('edit/getSchemaFromRemote')
+          }
         }
       });
     }

web/src/management/pages/edit/modules/contentModule/SavePanel.vue

@@ -17,9 +17,9 @@
 import { ref, computed, nextTick, watch, onMounted } from 'vue'
 import { useStore } from 'vuex'
 import { get as _get } from 'lodash-es'
-import { v4 as uuidv4 } from 'uuid'
+import { nanoid } from 'nanoid'
 
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, type Action } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
 
 import { saveSurvey } from '@/management/api/survey'
@@ -43,20 +43,19 @@ const store = useStore()
 
 onMounted(() => {
   if (!sessionStorage.getItem('sessionUUID')) {
-    sessionStorage.setItem('sessionUUID', uuidv4());
+    sessionStorage.setItem('sessionUUID', nanoid());
   }
 })
 const checkConflict = async (surveyid: string) => {
   try {
+    
     const dailyHis = await getConflictHistory({surveyId: surveyid, historyType: 'dailyHis', sessionId: sessionStorage.getItem('sessionUUID')})
-    //sconsole.log(dailyHis)
     if (dailyHis.data.length > 0) {
       const lastHis = dailyHis.data.at(0)
       if (Date.now() - lastHis.createDate > 2 * 60 * 1000) {
         return [false, '']
-      } else {
-        return [true, lastHis.operator.username]
       }
+      return [true, lastHis.operator.username]
     }
   }catch (error) {
     console.log(error)
@@ -79,15 +78,19 @@ const onSave = async () => {
     if (conflictName == store.state.user.userInfo.username) {
       ElMessageBox.alert('当前问卷已在其它页面开启编辑，刷新以获取最新内容。', '提示', {
         confirmButtonText: '确认',
-        callback: () => {
+        callback: (action: Action) => {
-          location.reload(); 
+          if (action === 'confirm') {
+            store.dispatch('edit/getSchemaFromRemote')
+          }
         }
       });
     } else {
       ElMessageBox.alert(`当前问卷2分钟内由${conflictName}编辑，刷新以获取最新内容。`, '提示', {
         confirmButtonText: '确认',
-        callback: () => {
+        callback: (action: Action) => {
-          location.reload(); 
+          if (action === 'confirm') {
+            store.dispatch('edit/getSchemaFromRemote')
+          }
         }
       });
     }