From c4b730c8afbab14c0bd67508c216b324a2535797 Mon Sep 17 00:00:00 2001
From: dayou <853094838@qq.com>
Date: Tue, 30 Jul 2024 14:51:33 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20(#370)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/management/stores/edit.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/management/stores/edit.ts b/web/src/management/stores/edit.ts
index cad89467..38a766df 100644
--- a/web/src/management/stores/edit.ts
+++ b/web/src/management/stores/edit.ts
@@ -5,7 +5,7 @@ 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/pages/edit/setterConfig/statusConfig'
+import submitFormConfig from '@/management/pages/edit/setterConfig/submitConfig'
 
 import questionLoader from '@/materials/questions/questionLoader'
 import { SurveyPermissions } from '@/management/utils/types/workSpace'

From 9a35de7e363ce73be51eefa597ee3ee94ab2a13d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BB=E8=B0=B1?=
 <144224541+xixiIBN5100@users.noreply.github.com>
Date: Tue, 30 Jul 2024 15:27:49 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix(Navbar):=E4=BF=AE=E5=A4=8D=E4=BA=86?=
 =?UTF-8?q?=E7=9F=AD=E6=A0=87=E9=A2=98hover=E7=A9=BA=E7=99=BD=E5=A4=84?=
 =?UTF-8?q?=E4=BC=9A=E8=A7=A6=E5=8F=91=E6=8C=87=E7=A4=BA=E6=A1=86=E7=9A=84?=
 =?UTF-8?q?bug=20(#365)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix(Navbar):修复了短标题hover空白处会触发指示框的bug
---
 .../management/pages/edit/modules/generalModule/TitlePanel.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/src/management/pages/edit/modules/generalModule/TitlePanel.vue b/web/src/management/pages/edit/modules/generalModule/TitlePanel.vue
index 3e3192c6..3a7c9eba 100644
--- a/web/src/management/pages/edit/modules/generalModule/TitlePanel.vue
+++ b/web/src/management/pages/edit/modules/generalModule/TitlePanel.vue
@@ -49,14 +49,13 @@ const hideFullTitle = () => {
 <style lang="scss" scoped>
 .title-container {
   position: relative;
-  width: 280px;
+  max-width: 280px;
 }
 
 .title {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  width: 100%;
   cursor: pointer;
 }
 

From 4d5c3eb15d29f58f4c49e6107f1d0fa89a26a96f Mon Sep 17 00:00:00 2001
From: Jiangchunfu <mrj_kevin@163.com>
Date: Wed, 31 Jul 2024 17:21:54 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=B0=8F=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=968=20(#371)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor: 去除重复元素

* feat: edit 布局优化

* style: 题目大纲滚动时固定tab-header

---------

Co-authored-by: jiangchunfu <jiangchunfu@kaike.la>
---
 web/src/management/pages/analysis/AnalysisPage.vue       | 2 +-
 web/src/management/pages/edit/index.vue                  | 2 +-
 .../pages/edit/modules/questionModule/CatalogPanel.vue   | 9 +++++++--
 .../pages/edit/modules/resultModule/CatalogPanel.vue     | 2 +-
 .../pages/edit/modules/skinModule/CatalogPanel.vue       | 2 +-
 web/src/management/pages/edit/pages/edit/index.vue       | 2 ++
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/web/src/management/pages/analysis/AnalysisPage.vue b/web/src/management/pages/analysis/AnalysisPage.vue
index 46eb24c2..e9eda3ef 100644
--- a/web/src/management/pages/analysis/AnalysisPage.vue
+++ b/web/src/management/pages/analysis/AnalysisPage.vue
@@ -41,7 +41,7 @@ import { analysisType } from '@/management/config/analysisConfig'
   .right {
     width: 100%;
     height: 100%;
-    min-width: 1160px;
+    min-width: 1300px;
     display: flex;
     flex-direction: column;
     overflow: hidden;
diff --git a/web/src/management/pages/edit/index.vue b/web/src/management/pages/edit/index.vue
index 97e41b7e..c675c19d 100644
--- a/web/src/management/pages/edit/index.vue
+++ b/web/src/management/pages/edit/index.vue
@@ -60,7 +60,7 @@ onMounted(async () => {
   }
 
   .right {
-    min-width: 1160px;
+    min-width: 1300px;
     height: 100%;
     padding-left: 80px;
     overflow: hidden;
diff --git a/web/src/management/pages/edit/modules/questionModule/CatalogPanel.vue b/web/src/management/pages/edit/modules/questionModule/CatalogPanel.vue
index 875efb4b..65f794cb 100644
--- a/web/src/management/pages/edit/modules/questionModule/CatalogPanel.vue
+++ b/web/src/management/pages/edit/modules/questionModule/CatalogPanel.vue
@@ -18,14 +18,19 @@ const tabSelected = ref<string>('0')
 </script>
 <style lang="scss" scoped>
 .tab-box {
-  width: 300px;
+  width: 360px;
   height: 100%;
   box-shadow: none;
   border: none;
-  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
   :deep(.el-tabs__nav) {
     width: 100%;
   }
+  :deep(.el-tabs__content) {
+    flex: 1;
+    overflow-y: auto;
+  }
   :deep(.el-tabs__item) {
     text-align: center;
   }
diff --git a/web/src/management/pages/edit/modules/resultModule/CatalogPanel.vue b/web/src/management/pages/edit/modules/resultModule/CatalogPanel.vue
index 48d6d666..5896b104 100644
--- a/web/src/management/pages/edit/modules/resultModule/CatalogPanel.vue
+++ b/web/src/management/pages/edit/modules/resultModule/CatalogPanel.vue
@@ -45,7 +45,7 @@ const handleChangePreview = (data: any) => {
 </script>
 <style lang="scss" scoped>
 .tab-box {
-  width: 300px;
+  width: 360px;
   height: 100%;
   box-shadow: none;
   border: none;
diff --git a/web/src/management/pages/edit/modules/skinModule/CatalogPanel.vue b/web/src/management/pages/edit/modules/skinModule/CatalogPanel.vue
index 09b4db67..c884f600 100644
--- a/web/src/management/pages/edit/modules/skinModule/CatalogPanel.vue
+++ b/web/src/management/pages/edit/modules/skinModule/CatalogPanel.vue
@@ -87,7 +87,7 @@ const changePreset = (banner: any) => {
 </script>
 <style lang="scss" scoped>
 .tab-box {
-  width: 300px;
+  width: 360px;
   height: 100%;
   box-shadow: none;
   border: none;
diff --git a/web/src/management/pages/edit/pages/edit/index.vue b/web/src/management/pages/edit/pages/edit/index.vue
index 3565a758..51085729 100644
--- a/web/src/management/pages/edit/pages/edit/index.vue
+++ b/web/src/management/pages/edit/pages/edit/index.vue
@@ -55,6 +55,8 @@ watch(
   .navbar-tab {
     position: absolute;
     top: 10px;
+    left: 50%;
+    transform: translate(-50%);
     cursor: pointer;
     :deep(.el-radio-button__original-radio + .el-radio-button__inner) {
       font-size: 12px;

From 681e8fa3aec6d63ddcfcd1ecf45643e511407d6a Mon Sep 17 00:00:00 2001
From: sudoooooo <zjbbabybaby@gmail.com>
Date: Sun, 4 Aug 2024 12:21:08 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?difTime->diffTime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/src/models/surveyResponse.entity.ts    |   2 +-
 .../survey/services/dataStatistic.service.ts  |   2 +-
 server/src/modules/survey/utils/index.ts      |   2 +-
 .../controllers/surveyResponse.controller.ts  |   6 +-
 .../services/surveyResponse.service.ts        |   4 +-
 server/src/utils/messagePushing.spec.ts       |   2 +-
 web/src/render/pages/RenderPage.vue           | 139 +++++++++---------
 7 files changed, 81 insertions(+), 76 deletions(-)

diff --git a/server/src/models/surveyResponse.entity.ts b/server/src/models/surveyResponse.entity.ts
index adce23d3..fce0bfd1 100644
--- a/server/src/models/surveyResponse.entity.ts
+++ b/server/src/models/surveyResponse.entity.ts
@@ -14,7 +14,7 @@ export class SurveyResponse extends BaseEntity {
   data: Record<string, any>;
 
   @Column()
-  difTime: number;
+  diffTime: number;
 
   @Column()
   clientTime: number;
diff --git a/server/src/modules/survey/services/dataStatistic.service.ts b/server/src/modules/survey/services/dataStatistic.service.ts
index 6ccfb5db..0551b432 100644
--- a/server/src/modules/survey/services/dataStatistic.service.ts
+++ b/server/src/modules/survey/services/dataStatistic.service.ts
@@ -90,7 +90,7 @@ export class DataStatisticService {
       }
       return {
         ...data,
-        difTime: (submitedData.difTime / 1000).toFixed(2),
+        diffTime: (submitedData.diffTime / 1000).toFixed(2),
         createDate: moment(submitedData.createDate).format(
           'YYYY-MM-DD HH:mm:ss',
         ),
diff --git a/server/src/modules/survey/utils/index.ts b/server/src/modules/survey/utils/index.ts
index 4f9a17bc..a6a64ccd 100644
--- a/server/src/modules/survey/utils/index.ts
+++ b/server/src/modules/survey/utils/index.ts
@@ -58,7 +58,7 @@ export function getListHeadByDataList(dataList) {
     };
   });
   listHead.push({
-    field: 'difTime',
+    field: 'diffTime',
     title: '答题耗时（秒）',
     type: QUESTION_TYPE.TEXT,
   });
diff --git a/server/src/modules/surveyResponse/controllers/surveyResponse.controller.ts b/server/src/modules/surveyResponse/controllers/surveyResponse.controller.ts
index bdf493f3..af8193f3 100644
--- a/server/src/modules/surveyResponse/controllers/surveyResponse.controller.ts
+++ b/server/src/modules/surveyResponse/controllers/surveyResponse.controller.ts
@@ -47,7 +47,7 @@ export class SurveyResponseController {
       encryptType: Joi.string(),
       sessionId: Joi.string(),
       clientTime: Joi.number().required(),
-      difTime: Joi.number(),
+      diffTime: Joi.number(),
       password: Joi.string().allow(null, ''),
       whitelist: Joi.string().allow(null, ''),
     }).validate(reqBody, { allowUnknown: true });
@@ -65,7 +65,7 @@ export class SurveyResponseController {
       data,
       sessionId,
       clientTime,
-      difTime,
+      diffTime,
       password,
       whitelist: whitelistValue,
     } = value;
@@ -254,7 +254,7 @@ export class SurveyResponseController {
         surveyPath: value.surveyPath,
         data: decryptedData,
         clientTime,
-        difTime,
+        diffTime,
         surveyId: responseSchema.pageId,
         optionTextAndId,
       });
diff --git a/server/src/modules/surveyResponse/services/surveyResponse.service.ts b/server/src/modules/surveyResponse/services/surveyResponse.service.ts
index b9438a81..59fa3543 100644
--- a/server/src/modules/surveyResponse/services/surveyResponse.service.ts
+++ b/server/src/modules/surveyResponse/services/surveyResponse.service.ts
@@ -12,7 +12,7 @@ export class SurveyResponseService {
   async createSurveyResponse({
     data,
     clientTime,
-    difTime,
+    diffTime,
     surveyId,
     surveyPath,
     optionTextAndId,
@@ -22,7 +22,7 @@ export class SurveyResponseService {
       data,
       secretKeys: [],
       clientTime,
-      difTime,
+      diffTime,
       pageId: surveyId,
       optionTextAndId,
     });
diff --git a/server/src/utils/messagePushing.spec.ts b/server/src/utils/messagePushing.spec.ts
index 010706ad..9788c814 100644
--- a/server/src/utils/messagePushing.spec.ts
+++ b/server/src/utils/messagePushing.spec.ts
@@ -12,7 +12,7 @@ describe('getPushingData', () => {
         status: RECORD_STATUS.NEW,
         date: 1711025113146,
       },
-      difTime: 30518,
+      diffTime: 30518,
       data: {
         data458: '15000000000',
         data515: '115019',
diff --git a/web/src/render/pages/RenderPage.vue b/web/src/render/pages/RenderPage.vue
index 6cf290e1..f6c411b4 100644
--- a/web/src/render/pages/RenderPage.vue
+++ b/web/src/render/pages/RenderPage.vue
@@ -19,128 +19,133 @@
   </div>
 </template>
 <script setup lang="ts">
-import { computed, ref } from 'vue'
-import { storeToRefs } from 'pinia'
-import { useRouter } from 'vue-router'
+import { computed, ref } from "vue";
+import { storeToRefs } from "pinia";
+import { useRouter } from "vue-router";
 // @ts-ignore
-import communalLoader from '@materials/communals/communalLoader.js'
-import MainRenderer from '../components/MainRenderer.vue'
-import AlertDialog from '../components/AlertDialog.vue'
-import ConfirmDialog from '../components/ConfirmDialog.vue'
-import ProgressBar from '../components/ProgressBar.vue'
+import communalLoader from "@materials/communals/communalLoader.js";
+import MainRenderer from "../components/MainRenderer.vue";
+import AlertDialog from "../components/AlertDialog.vue";
+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'
+import { useSurveyStore } from "../stores/survey";
+import { useQuestionStore } from "../stores/question";
+import { submitForm } from "../api/survey";
+import encrypt from "../utils/encrypt";
 
-import useCommandComponent from '../hooks/useCommandComponent'
+import useCommandComponent from "../hooks/useCommandComponent";
 
 interface Props {
-  questionInfo?: any
-  isMobile?: boolean
+  questionInfo?: any;
+  isMobile?: boolean;
 }
 
 withDefaults(defineProps<Props>(), {
   questionInfo: {},
-  isMobile: false
-})
+  isMobile: false,
+});
 
-const HeaderContent = communalLoader.loadComponent('HeaderContent')
-const MainTitle = communalLoader.loadComponent('MainTitle')
-const SubmitButton = communalLoader.loadComponent('SubmitButton')
-const LogoIcon = communalLoader.loadComponent('LogoIcon')
+const HeaderContent = communalLoader.loadComponent("HeaderContent");
+const MainTitle = communalLoader.loadComponent("MainTitle");
+const SubmitButton = communalLoader.loadComponent("SubmitButton");
+const LogoIcon = communalLoader.loadComponent("LogoIcon");
 
-const mainRef = ref<any>()
-const boxRef = ref<HTMLElement>()
+const mainRef = ref<any>();
+const boxRef = ref<HTMLElement>();
 
-const alert = useCommandComponent(AlertDialog)
-const confirm = useCommandComponent(ConfirmDialog)
+const alert = useCommandComponent(AlertDialog);
+const confirm = useCommandComponent(ConfirmDialog);
 
-const router = useRouter()
-const surveyStore = useSurveyStore()
-const questionStore = useQuestionStore()
+const router = useRouter();
+const surveyStore = useSurveyStore();
+const questionStore = useQuestionStore();
 
-const renderData = computed(() => questionStore.renderData)
-const { bannerConf, submitConf, bottomConf: logoConf, whiteData } = storeToRefs(surveyStore)
-const surveyPath = computed(() => surveyStore.surveyPath || '')
+const renderData = computed(() => questionStore.renderData);
+const {
+  bannerConf,
+  submitConf,
+  bottomConf: logoConf,
+  whiteData,
+} = storeToRefs(surveyStore);
+const surveyPath = computed(() => surveyStore.surveyPath || "");
 
 const validate = (cbk: (v: boolean) => void) => {
-  const index = 0
-  mainRef.value.$refs.formGroup[index].validate(cbk)
-}
+  const index = 0;
+  mainRef.value.$refs.formGroup[index].validate(cbk);
+};
 
 const normalizationRequestBody = () => {
-  const enterTime = surveyStore.enterTime
-  const encryptInfo = surveyStore.encryptInfo as any
-  const formValues = surveyStore.formValues
+  const enterTime = surveyStore.enterTime;
+  const encryptInfo = surveyStore.encryptInfo as any;
+  const formValues = surveyStore.formValues;
 
   const result: any = {
     surveyPath: surveyPath.value,
     data: JSON.stringify(formValues),
-    difTime: Date.now() - enterTime,
+    diffTime: Date.now() - enterTime,
     clientTime: Date.now(),
-    ...whiteData.value
-  }
+    ...whiteData.value,
+  };
 
   if (encryptInfo?.encryptType) {
-    result.encryptType = encryptInfo.encryptType
-    result.data = encrypt[result.encryptType as 'rsa']({
+    result.encryptType = encryptInfo.encryptType;
+    result.data = encrypt[result.encryptType as "rsa"]({
       data: result.data,
-      secretKey: encryptInfo?.data?.secretKey
-    })
+      secretKey: encryptInfo?.data?.secretKey,
+    });
     if (encryptInfo?.data?.sessionId) {
-      result.sessionId = encryptInfo.data.sessionId
+      result.sessionId = encryptInfo.data.sessionId;
     }
   } else {
-    result.data = JSON.stringify(result.data)
+    result.data = JSON.stringify(result.data);
   }
 
-  return result
-}
+  return result;
+};
 
 const submitSurver = async () => {
   if (surveyPath.value.length > 8) {
-    router.push({ name: 'successPage' })
-    return
+    router.push({ name: "successPage" });
+    return;
   }
   try {
-    const params = normalizationRequestBody()
-    console.log(params)
-    const res: any = await submitForm(params)
+    const params = normalizationRequestBody();
+    console.log(params);
+    const res: any = await submitForm(params);
     if (res.code === 200) {
-      router.push({ name: 'successPage' })
+      router.push({ name: "successPage" });
     } else {
       alert({
-        title: res.errmsg || '提交失败'
-      })
+        title: res.errmsg || "提交失败",
+      });
     }
   } catch (error) {
-    console.log(error)
+    console.log(error);
   }
-}
+};
 
 const handleSubmit = () => {
-  const confirmAgain = (surveyStore.submitConf as any).confirmAgain
-  const { again_text, is_again } = confirmAgain
+  const confirmAgain = (surveyStore.submitConf as any).confirmAgain;
+  const { again_text, is_again } = confirmAgain;
 
   if (is_again) {
     confirm({
       title: again_text,
       onConfirm: async () => {
         try {
-          submitSurver()
+          submitSurver();
         } catch (error) {
-          console.log(error)
+          console.log(error);
         } finally {
-          confirm.close()
+          confirm.close();
         }
-      }
-    })
+      },
+    });
   } else {
-    submitSurver()
+    submitSurver();
   }
-}
+};
 </script>
 <style scoped lang="scss">
 .index {

From 517906f77fec07478a7da6e51f385e779eab5ea0 Mon Sep 17 00:00:00 2001
From: Jiangchunfu <mrj_kevin@163.com>
Date: Sun, 4 Aug 2024 12:38:28 +0800
Subject: [PATCH 5/6] =?UTF-8?q?feat:=20=E5=B0=8F=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=BE(4)=20(#379)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TitleModules/TitleContent/index.jsx       | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/web/src/materials/questions/widgets/TitleModules/TitleContent/index.jsx b/web/src/materials/questions/widgets/TitleModules/TitleContent/index.jsx
index 560fe7dd..0cba4d9a 100644
--- a/web/src/materials/questions/widgets/TitleModules/TitleContent/index.jsx
+++ b/web/src/materials/questions/widgets/TitleModules/TitleContent/index.jsx
@@ -38,6 +38,7 @@ export default defineComponent({
   },
   setup(props, { slots }) {
     const status = ref('')
+    const moduleTitleRef = ref()
     watch(
       () => props.isSelected,
       () => {
@@ -45,11 +46,13 @@ export default defineComponent({
       }
     )
 
-    const handleClick = () => {
-      if (props.isSelected) {
-        status.value = 'edit'
+    watch(status, (v) => {
+      if (v === 'edit') {
+        document.addEventListener('click', handleDocumentClick)
+      } else {
+        document.removeEventListener('click', handleDocumentClick)
       }
-    }
+    })
 
     const typeName = computed(() => {
       if (!props.showType) return ''
@@ -84,13 +87,34 @@ export default defineComponent({
       return htmlText
     })
 
-    return { slots, handleClick, status, tagTitle }
+    function handleClick(e) {
+      if (props.isSelected && status.value === 'preview') {
+        e.stopPropagation()
+        status.value = 'edit'
+      }
+    }
+
+    function handleDocumentClick(e) {
+      const richEditorDOM = moduleTitleRef.value.querySelector('.rich-editor')
+      const isClickRichEditor = richEditorDOM?.contains(e.target)
+
+      if (status.value === 'edit' && richEditorDOM && !isClickRichEditor) {
+        // 监听编辑状态时点击非编辑区域
+        status.value = 'preview'
+      }
+    }
+
+    return { slots, handleClick, status, tagTitle, moduleTitleRef }
   },
   render() {
     const { isRequired, indexNumber, slots, status, tagTitle } = this
 
     return (
-      <div class={['module-title', isRequired ? 'is-required' : '']} onClick={this.handleClick}>
+      <div
+        ref="moduleTitleRef"
+        class={['module-title', isRequired ? 'is-required' : '']}
+        onClick={this.handleClick}
+      >
         {isRequired && <i class="module-title-required">*</i>}
         <div class="module-content">
           {this.showIndex && <span class="index"> {indexNumber}.</span>}

From 9d89a1cecac1a051aa77671f27e011b30a0ece8e Mon Sep 17 00:00:00 2001
From: Jiangchunfu <mrj_kevin@163.com>
Date: Sun, 4 Aug 2024 12:38:59 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A2=98=E7=9B=AE?=
 =?UTF-8?q?=E6=9C=AA=E8=81=9A=E7=84=A6=E6=97=B6=E6=8B=96=E6=8B=BD=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98=20(#375)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: jiangchunfu <jiangchunfu@kaike.la>
---
 .../pages/edit/components/MaterialGroup.vue        |  4 ++--
 .../pages/edit/components/QuestionWrapper.vue      | 14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/web/src/management/pages/edit/components/MaterialGroup.vue b/web/src/management/pages/edit/components/MaterialGroup.vue
index 15463293..f1decd92 100644
--- a/web/src/management/pages/edit/components/MaterialGroup.vue
+++ b/web/src/management/pages/edit/components/MaterialGroup.vue
@@ -1,8 +1,8 @@
 <template>
   <draggable
     v-model="renderData"
-    handle=".question-wrapper.isSelected"
-    filter=".question-wrapper.isSelected .question.isSelected"
+    handle=".question-wrapper.is-move"
+    filter=".question-wrapper.is-move .question.isSelected"
     :preventOnFilter="false"
     :group="DND_GROUP"
     :onEnd="checkEnd"
diff --git a/web/src/management/pages/edit/components/QuestionWrapper.vue b/web/src/management/pages/edit/components/QuestionWrapper.vue
index 58de203c..dea0b0ff 100644
--- a/web/src/management/pages/edit/components/QuestionWrapper.vue
+++ b/web/src/management/pages/edit/components/QuestionWrapper.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    :class="itemClass"
+    :class="[itemClass, { 'is-move': isSelected || isMove }]"
     @mouseenter="onMouseenter"
     @mouseleave="onMouseleave"
     @click="clickFormItem"
@@ -8,7 +8,12 @@
     <div><slot v-if="moduleConfig.type !== 'section'"></slot></div>
 
     <div :class="[showHover ? 'visibily' : 'hidden', 'hoverItem']">
-      <div class="item el-icon-rank" @click.stop.prevent="onMove">
+      <div
+        class="item el-icon-rank"
+        @click.stop.prevent
+        @mouseenter="setMoveState(true)"
+        @mouseleave="setMoveState(false)"
+      >
         <i-ep-rank />
       </div>
       <div v-if="showUp" class="item" @click.stop.prevent="onMoveUp">
@@ -62,6 +67,7 @@ const emit = defineEmits(['changeSeq', 'select'])
 const { getShowLogicText, hasShowLogic } = useShowLogicInfo(props.moduleConfig.field)
 
 const isHover = ref(false)
+const isMove = ref(false)
 
 const itemClass = computed(() => {
   return {
@@ -154,7 +160,9 @@ const onDelete = async () => {
   }
 }
 
-const onMove = () => {}
+const setMoveState = (state: boolean) => {
+  isMove.value = state
+}
 </script>
 
 <style lang="scss" scoped>