From 335765e3ea6ab4e9042b8fe5b95f71aef8f82284 Mon Sep 17 00:00:00 2001
From: dayou <853094838@qq.com>
Date: Fri, 28 Jun 2024 17:09:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=89=A9=E6=96=99=E8=84=B1=E7=A6=BBsto?=
 =?UTF-8?q?re=E4=BE=9D=E8=B5=96=20(#312)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../materials/questions/QuestionContainerB/index.jsx |  3 +--
 .../EditOptions/AdvancedConfig/RateConfig.vue        |  7 +------
 .../widgets/EditOptions/Options/OptionEdit.vue       |  8 +-------
 .../questions/widgets/EditOptions/index.jsx          | 12 +++---------
 4 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/web/src/materials/questions/QuestionContainerB/index.jsx b/web/src/materials/questions/QuestionContainerB/index.jsx
index a11debe0..6512e690 100644
--- a/web/src/materials/questions/QuestionContainerB/index.jsx
+++ b/web/src/materials/questions/QuestionContainerB/index.jsx
@@ -109,13 +109,13 @@ export default defineComponent({
             <EditOptions
               moduleConfig={props.moduleConfig}
               editConfigure={questionMeta?.editConfigure}
+              onChange={this.onChange}
             >
               <dynamicComponent
                 readonly
                 {...props}
                 onBlur={this.onBlur}
                 onFocus={this.onFocus}
-                change={this.onChange}
               />
             </EditOptions>
           ) : (
@@ -124,7 +124,6 @@ export default defineComponent({
               {...props}
               onBlur={this.onBlur}
               onFocus={this.onFocus}
-              change={this.onChange}
             />
           )}
         </div>
diff --git a/web/src/materials/questions/widgets/EditOptions/AdvancedConfig/RateConfig.vue b/web/src/materials/questions/widgets/EditOptions/AdvancedConfig/RateConfig.vue
index 4737b457..be42487e 100644
--- a/web/src/materials/questions/widgets/EditOptions/AdvancedConfig/RateConfig.vue
+++ b/web/src/materials/questions/widgets/EditOptions/AdvancedConfig/RateConfig.vue
@@ -43,7 +43,6 @@
 </template>
 <script>
 import { get as _get } from 'lodash-es'
-import { mapGetters } from 'vuex'
 export default {
   props: {
     min: {
@@ -80,9 +79,6 @@ export default {
     this.initRange()
   },
   computed: {
-    ...mapGetters({
-      currentEditKey: 'edit/currentEditKey'
-    }),
     innerVisible: {
       get() {
         return this.visible
@@ -119,9 +115,8 @@ export default {
           explain: item.explain
         }
       }
-      const paramsKey = `rangeConfig`
       const payload = {
-        key: `${this.currentEditKey}.${paramsKey}`,
+        key: `rangeConfig`,
         value: res
       }
       this.$emit('confirm', payload)
diff --git a/web/src/materials/questions/widgets/EditOptions/Options/OptionEdit.vue b/web/src/materials/questions/widgets/EditOptions/Options/OptionEdit.vue
index 19da01d9..8025a528 100644
--- a/web/src/materials/questions/widgets/EditOptions/Options/OptionEdit.vue
+++ b/web/src/materials/questions/widgets/EditOptions/Options/OptionEdit.vue
@@ -39,17 +39,11 @@
 
 <script>
 import draggable from 'vuedraggable'
-import { mapGetters } from 'vuex'
 import { cloneDeep as _cloneDeep } from 'lodash-es'
 import RichEditor from '@/common/Editor/RichEditor.vue'
 
 export default {
   name: 'OptionEdit',
-  computed: {
-    ...mapGetters({
-      currentEditKey: 'edit/currentEditKey'
-    })
-  },
   props: {
     optionList: {
       type: Array,
@@ -93,7 +87,7 @@ export default {
     handleChange(index, value) {
       // 更新单个选项文案
       const optionKey = `options[${index}].text`
-      const key = `${this.currentEditKey}.${optionKey}`
+      const key = `${optionKey}`
       this.$emit('change', { key, value })
     },
     onAddOption(index) {
diff --git a/web/src/materials/questions/widgets/EditOptions/index.jsx b/web/src/materials/questions/widgets/EditOptions/index.jsx
index a9c6f9c8..8d80df27 100644
--- a/web/src/materials/questions/widgets/EditOptions/index.jsx
+++ b/web/src/materials/questions/widgets/EditOptions/index.jsx
@@ -1,7 +1,5 @@
 import { defineComponent, ref, computed, onMounted } from 'vue'
 
-import store from '@/management/store'
-
 import OptionEdit from './Options/OptionEdit.vue'
 import OptionEditBar from './Options/OptionEditBar.vue'
 import UseOptionBase from './Options/UseOptionBase'
@@ -10,7 +8,6 @@ export default defineComponent({
   name: 'EditOptions',
   provide() {
     return {
-      currentEditKey: store.getters['edit/currentEditKey'],
       moduleConfig: computed(() => this.moduleConfig)
     }
   },
@@ -24,10 +21,7 @@ export default defineComponent({
       required: true
     }
   },
-  setup(props, { slots }) {
-    const currentEditKey = computed(() => {
-      return store.getters['edit/currentEditKey']
-    })
+  setup(props, { slots, emit }) {
     const getOptions = computed(() => {
       return props.moduleConfig.options
     })
@@ -44,12 +38,12 @@ export default defineComponent({
 
     const handleOptionChange = (value) => {
       const optionKey = `options`
-      const key = `${currentEditKey.value}.${optionKey}`
+      const key = `${optionKey}`
       handleChange({ key, value })
     }
 
     const handleChange = ({ key, value }) => {
-      store.dispatch('edit/changeSchema', { key, value })
+      emit('change', { key, value })
     }
 
     const hasAdvancedConfig = ref(false)