diff --git a/web/src/management/pages/edit/components/MaterialGroup.vue b/web/src/management/pages/edit/components/MaterialGroup.vue index ebdb9329..8e08707c 100644 --- a/web/src/management/pages/edit/components/MaterialGroup.vue +++ b/web/src/management/pages/edit/components/MaterialGroup.vue @@ -14,7 +14,7 @@ :ref="`questionWrapper-${element.field}`" :moduleConfig="element" :qIndex="element.qIndex" - :isFirst="index==0" + :isFirst="index == 0" :indexNumber="element.indexNumber" :isSelected="currentEditOne === element.qIndex" :isLast="index + 1 === questionDataList.length" @@ -28,7 +28,11 @@ :isSelected="currentEditOne === element.qIndex" :readonly="true" @change="handleChange" - > + > + + @@ -60,12 +64,12 @@ export default defineComponent({ } } }, - emits: ['change', 'select', 'changeSeq','change'], + emits: ['change', 'select', 'changeSeq', 'change'], setup(props, { emit }) { const editStore = useEditStore() const renderData = computed({ get() { - return props.questionDataList; //filterQuestionPreviewData(props.questionDataList) + return props.questionDataList //filterQuestionPreviewData(props.questionDataList) }, set(value) { editStore.moveQuestionDataList(value) diff --git a/web/src/management/pages/edit/modules/questionModule/PreviewPanel.vue b/web/src/management/pages/edit/modules/questionModule/PreviewPanel.vue index 56679265..e886ae13 100644 --- a/web/src/management/pages/edit/modules/questionModule/PreviewPanel.vue +++ b/web/src/management/pages/edit/modules/questionModule/PreviewPanel.vue @@ -20,7 +20,11 @@ @change="handleChange" @changeSeq="onQuestionOperation" ref="materialGroup" - /> + > + + import { ref, watch, toRefs } from 'vue' +import { storeToRefs } from 'pinia' + import communalLoader from '@materials/communals/communalLoader.js' + import PageWrapper from '@/management/pages/edit/components/Pagination/PaginationWrapper.vue' import MaterialGroup from '@/management/pages/edit/components/MaterialGroup.vue' -import { storeToRefs } from 'pinia' +import AdvancedComponent from './components/AdvancedConfig/index.vue' + import { useEditStore } from '@/management/stores/edit' const MainTitle = communalLoader.loadComponent('MainTitle') @@ -95,6 +103,7 @@ const onQuestionOperation = (data) => { break } } + watch( skinConf, (newVal) => { diff --git a/web/src/materials/questions/widgets/EditOptions/AdvancedConfig/OptionConfig.vue b/web/src/management/pages/edit/modules/questionModule/components/AdvancedConfig/OptionConfig.vue similarity index 61% rename from web/src/materials/questions/widgets/EditOptions/AdvancedConfig/OptionConfig.vue rename to web/src/management/pages/edit/modules/questionModule/components/AdvancedConfig/OptionConfig.vue index 8f9c9cac..a3a6c317 100644 --- a/web/src/materials/questions/widgets/EditOptions/AdvancedConfig/OptionConfig.vue +++ b/web/src/management/pages/edit/modules/questionModule/components/AdvancedConfig/OptionConfig.vue @@ -1,77 +1,74 @@ diff --git a/web/src/management/pages/edit/modules/questionModule/components/AdvancedConfig/index.vue b/web/src/management/pages/edit/modules/questionModule/components/AdvancedConfig/index.vue new file mode 100644 index 00000000..ba18f6c2 --- /dev/null +++ b/web/src/management/pages/edit/modules/questionModule/components/AdvancedConfig/index.vue @@ -0,0 +1,47 @@ + + + diff --git a/web/src/materials/questions/QuestionContainerB/index.jsx b/web/src/materials/questions/QuestionContainerB/index.jsx index 9f82966e..b3247362 100644 --- a/web/src/materials/questions/QuestionContainerB/index.jsx +++ b/web/src/materials/questions/QuestionContainerB/index.jsx @@ -1,4 +1,4 @@ -import { computed, defineComponent, onMounted, shallowRef, ref } from 'vue' +import { computed, defineComponent, onMounted, shallowRef, ref, provide } from 'vue' import questionLoader from '@/materials/questions/questionLoader.js' @@ -46,7 +46,7 @@ export default defineComponent({ } }, emits: ['blur', 'focus', 'change', 'select'], - setup(props, { emit }) { + setup(props, { slots, emit }) { const BlockComponent = shallowRef(null) const questionMeta = ref({}) @@ -76,6 +76,11 @@ export default defineComponent({ emit('change', data) } + // 透传高级组件 + provide('slots', { + advancedEdit: slots.advancedEdit + }) + return { props, BlockComponent, diff --git a/web/src/materials/questions/widgets/EditOptions/AdvancedConfig/RateConfig.vue b/web/src/materials/questions/widgets/EditOptions/AdvancedConfig/RateConfig.vue deleted file mode 100644 index be42487e..00000000 --- a/web/src/materials/questions/widgets/EditOptions/AdvancedConfig/RateConfig.vue +++ /dev/null @@ -1,160 +0,0 @@ - - - diff --git a/web/src/materials/questions/widgets/EditOptions/Options/OptionEditBar.vue b/web/src/materials/questions/widgets/EditOptions/Options/OptionEditBar.vue index 58a66a64..e9689c47 100644 --- a/web/src/materials/questions/widgets/EditOptions/Options/OptionEditBar.vue +++ b/web/src/materials/questions/widgets/EditOptions/Options/OptionEditBar.vue @@ -1,60 +1,22 @@