From 1356c5e72cfab4ba845d16f5b0d775842bb78658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=98=B1=E8=BE=BE?= <chen.yuda@ebiz-digits.com>
Date: Wed, 19 Mar 2025 17:26:40 +0800
Subject: [PATCH] =?UTF-8?q?actorref(src):=20=E9=87=8D=E6=9E=84=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BB=A5=E6=8F=90=E9=AB=98=E4=BB=A3=E7=A0=81=E5=8F=AF?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 更新了多个组件的属性定义和事件处理逻辑
- 优化了部分代码结构，提高了代码的可读性和可维护性
-调整了部分样式，提升了用户体验
---
 src/components/contenteditable.vue            | 35 ++++++++++---------
 .../ActionCompoents/QuestionAction.vue        |  8 +++--
 .../QuestionItemAction/RateQuestionAction.vue |  6 ++--
 .../Design/components/ChooseQuestion.vue      | 17 ++++-----
 .../components/Questions/MatrixRadio.vue      |  3 +-
 .../Design/components/Questions/Rate.vue      | 24 +++++--------
 .../components/Questions/RateCharacter.vue    | 22 ++++++------
 .../Market/components/MarketItem.vue          | 24 +++++++------
 src/views/Survey/views/Create/Index.vue       | 28 ++++++++-------
 src/views/Survey/views/Preview/Index.vue      | 13 ++++---
 src/views/Survey/views/Publish/Index.vue      | 28 +++++++--------
 11 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/src/components/contenteditable.vue b/src/components/contenteditable.vue
index ca0cbd0..5d1869c 100644
--- a/src/components/contenteditable.vue
+++ b/src/components/contenteditable.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="flex contenteditable align-center space-between" :class="className">
     <p
+      v-if="active"
       :id="'editor' + id"
       ref="editor"
       :contenteditable="active"
@@ -8,6 +9,7 @@
       @focus="onFocus"
       v-html="modelValue"
     ></p>
+    <p v-else ref="editor" class="van-field contenteditable-content" v-html="modelValue"></p>
     <div class="right-icon ml10">
       <slot name="right-icon"></slot>
     </div>
@@ -25,21 +27,20 @@ import { defineEmits, ref, onMounted, watch } from 'vue';
 import { v4 as uuidv4 } from 'uuid';
 import CommonApi from '@/api/common.js';
 
-const props = defineProps({
-  modelValue: {
-    type: String,
-    default: ''
-  },
+defineProps({
   className: {
     type: String,
     default: ''
-  },
-  active: {
-    type: Boolean,
-    default: false
   }
 });
-
+const modelValue = defineModel('modelValue', {
+  type: String,
+  default: ''
+});
+const active = defineModel('active', {
+  type: Boolean,
+  default: false
+});
 const id = ref(uuidv4());
 
 const editor = ref(null);
@@ -47,10 +48,9 @@ const editorAction = ref(null);
 const emit = defineEmits(['update:modelValue', 'blur']);
 const save = (e) => {
   emit('update:modelValue', e.innerHTML);
+  emit('blur', e.innerHTML);
 };
-
 const savedRange = ref(null);
-
 const functions = {
   boldModern: () => {
     document.execCommand('bold', true, null);
@@ -103,16 +103,17 @@ const funEvent = (item) => {
 };
 
 watch(
-  () => props.active,
+  () => active.value,
   (newVal) => {
-    if (newVal) {
-      // showAction.value = true;
-    } else {
+    if (!newVal) {
       save(editor.value);
       setTimeout(() => {
         showAction.value = false;
       }, 100);
     }
+  },
+  {
+    deep: true
   }
 );
 
@@ -162,7 +163,7 @@ onMounted(() => {
     if (!isEditor && !isActionBar) {
       showAction.value = false;
       save(editor.value);
-      emit('blur', editor.value);
+      // emit('blur', editor.value);
     }
   });
 
diff --git a/src/views/Design/components/ActionCompoents/QuestionAction.vue b/src/views/Design/components/ActionCompoents/QuestionAction.vue
index 187d942..bd7b934 100644
--- a/src/views/Design/components/ActionCompoents/QuestionAction.vue
+++ b/src/views/Design/components/ActionCompoents/QuestionAction.vue
@@ -192,7 +192,12 @@ const saveLogics = () => {
 };
 
 // 当前题目
-const activeQuestion = ref(props.data);
+const activeQuestion = defineModel('data', {
+  type: Object,
+  default: () => {
+    // 传递
+  }
+});
 //  设置更新
 const show = ref(false);
 const questionShow = ref(false);
@@ -251,7 +256,6 @@ watch(
     immediate: true
   }
 );
-
 // 打开题目弹窗
 const openQuestionActionModel = () => {
   show.value = true;
diff --git a/src/views/Design/components/ActionCompoents/components/QuestionItemAction/RateQuestionAction.vue b/src/views/Design/components/ActionCompoents/components/QuestionItemAction/RateQuestionAction.vue
index 2d296e2..1c0e8cb 100644
--- a/src/views/Design/components/ActionCompoents/components/QuestionItemAction/RateQuestionAction.vue
+++ b/src/views/Design/components/ActionCompoents/components/QuestionItemAction/RateQuestionAction.vue
@@ -14,8 +14,8 @@
         <van-stepper
           v-model="localConfig.min"
           button-size="22px"
-          @blur="minChange"
           @change="minChange"
+          @blur="minChange(localConfig.min)"
         />
       </div>
       <div class="score">
@@ -24,8 +24,8 @@
           v-model="localConfig.max"
           :max="maxLimit"
           button-size="22px"
-          @blur="maxChange"
           @change="maxChange"
+          @blur="maxChange(localConfig.max)"
         />
       </div>
       <div class="score">
@@ -35,7 +35,7 @@
           :min="0"
           button-size="22px"
           @blur="intervalChange"
-          @change="intervalChange"
+          @change="intervalChange(localConfig.score_interval)"
         />
       </div>
     </van-cell-group>
diff --git a/src/views/Design/components/ChooseQuestion.vue b/src/views/Design/components/ChooseQuestion.vue
index e00e30b..89b437a 100644
--- a/src/views/Design/components/ChooseQuestion.vue
+++ b/src/views/Design/components/ChooseQuestion.vue
@@ -40,17 +40,9 @@
 </template>
 <script setup>
 import QuestionAction from '@/views/Design/components/ActionCompoents/QuestionAction.vue';
-import { ref } from 'vue';
-
 import { basicQuesTypeList } from '@/utils/common.js';
 
 const props = defineProps({
-  element: {
-    type: Object,
-    default: () => {
-      // 此方法目前为空，未来可能扩展
-    }
-  },
   index: {
     type: Number,
     default: 0
@@ -86,14 +78,19 @@ const getQuestionType = (type) => {
   return typeName;
 };
 
-const element = ref(props.element);
+const element = defineModel('element', {
+  type: Object,
+  default: () => {
+    return {};
+  }
+});
 
 // 选中题目后出现的操作
 const emit = defineEmits(['getChooseQuestionId', 'move', 'copy', 'setting', 'logics']);
 
 // 选中题目
 const chooseItem = () => {
-  emit('getChooseQuestionId', props.element, props.index);
+  emit('getChooseQuestionId', element.value, props.index);
 };
 </script>
 <style scoped lang="scss">
diff --git a/src/views/Design/components/Questions/MatrixRadio.vue b/src/views/Design/components/Questions/MatrixRadio.vue
index d241b32..b3aacda 100644
--- a/src/views/Design/components/Questions/MatrixRadio.vue
+++ b/src/views/Design/components/Questions/MatrixRadio.vue
@@ -117,8 +117,7 @@ function handleMatrixRadioChange(row: number, col: number) {
 // emits('update:matrixAnswer', props.matrixAnswer);
 // emits('update:rowRecord', props.rowRecord);
 // };
-const emitValue = (val: unknown) => {
-  console.log(val);
+const emitValue = () => {
   emit('update:element', element.value);
 };
 </script>
diff --git a/src/views/Design/components/Questions/Rate.vue b/src/views/Design/components/Questions/Rate.vue
index 62fe07e..0dcce0b 100644
--- a/src/views/Design/components/Questions/Rate.vue
+++ b/src/views/Design/components/Questions/Rate.vue
@@ -49,14 +49,10 @@
 </template>
 
 <script setup>
-import { ref, toRefs, watch } from 'vue';
+import { ref } from 'vue';
 import RateCharacter from './RateCharacter.vue';
 
-const props = defineProps({
-  element: {
-    type: Object,
-    required: true
-  },
+defineProps({
   active: {
     type: Boolean,
     default: false
@@ -72,18 +68,14 @@ const props = defineProps({
 const emit = defineEmits(['update:element']);
 
 const chooseId = ref('');
-const { element } = toRefs(props);
 
-const emitValue = (newVal) => {
-  emit('update:element', newVal || element.value);
+const element = defineModel('element', {
+  type: Object,
+  required: true
+});
+const emitValue = () => {
+  emit('update:element', element.value);
 };
-watch(
-  element.value,
-  (newVal) => {
-    emitValue(newVal);
-  },
-  { deep: true }
-);
 
 const chooseOption = (item) => {
   chooseId.value = item.id;
diff --git a/src/views/Design/components/Questions/RateCharacter.vue b/src/views/Design/components/Questions/RateCharacter.vue
index 77b9676..24c52e5 100644
--- a/src/views/Design/components/Questions/RateCharacter.vue
+++ b/src/views/Design/components/Questions/RateCharacter.vue
@@ -46,13 +46,10 @@ const test = ref(1);
 setTimeout(() => {
   test.value = 2;
 }, 300);
-const props = defineProps({
-  config: {
-    type: Object,
-    required: true
-  }
+const config = defineModel('config', {
+  type: Object,
+  required: true
 });
-
 const index = defineModel('index', {
   type: Number
 });
@@ -94,26 +91,29 @@ watch(
 
 // 监听 min、max 和 score_interval 的变化
 watch(
-  () => [props.config.min, props.config.max, props.config.score_interval],
+  () => [config.value.min, config.value.max, config.value.score_interval],
   (newValues) => {
     const [newMin, newMax, newScoreInterval] = newValues;
     renderScore(newMin, newMax, newScoreInterval);
   },
-  { immediate: true }
+  { immediate: true, deep: true }
 );
 </script>
 
 <style scoped lang="scss">
 ul {
   display: flex;
+  align-items: center;
+  justify-content: space-between;
 
   //margin-bottom: 10px;
 }
 
 .rate_item {
-  width: 21px;
-  height: 21px;
-  margin: 0 5px 0 0;
+  width: 20px;
+  height: 20px;
+
+  //margin: 0 5px 0 0;
   border: 1px solid #979797;
   border-radius: 5px;
 
diff --git a/src/views/Home/components/Market/components/MarketItem.vue b/src/views/Home/components/Market/components/MarketItem.vue
index 8a9834e..7970799 100644
--- a/src/views/Home/components/Market/components/MarketItem.vue
+++ b/src/views/Home/components/Market/components/MarketItem.vue
@@ -51,7 +51,7 @@
 import { ref, defineProps, onMounted } from 'vue';
 import { deleteTemplate } from '@/api/home/index.js';
 import { showDialog, showSuccessToast, showFailToast } from 'vant';
-import { useRouter } from 'vue-router';
+// import { useRouter } from 'vue-router';
 import png11 from '@/assets/img/home/11.png';
 import png13 from '@/assets/img/home/13.png';
 import png14 from '@/assets/img/home/14.png';
@@ -61,7 +61,7 @@ import png17 from '@/assets/img/home/17.png';
 import png18 from '@/assets/img/home/18.png';
 import png31 from '@/assets/img/home/31.png';
 
-const router = useRouter();
+// const router = useRouter();
 const { info } = defineProps({
   info: {
     type: Object,
@@ -70,13 +70,14 @@ const { info } = defineProps({
   }
 });
 const userInfo = ref({ userName: '' });
-const toDetail = (item) => {
-  router.push({
-    path: '/create',
-    query: {
-      sn: item.sn
-    }
-  });
+const toDetail = () => {
+  // return false
+  // router.push({
+  //   path: '/create',
+  //   query: {
+  //     sn: item.sn
+  //   }
+  // });
 };
 const deleteItem = (item) => {
   showDialog({
@@ -84,7 +85,7 @@ const deleteItem = (item) => {
     showCancelButton: true,
     confirmButtonColor: '#03B03C'
   })
-    .then(async () => {
+    .then(async() => {
       const res = await deleteTemplate(item.sn);
       if (res.data.code === 0) {
         showSuccessToast('删除成功');
@@ -107,7 +108,8 @@ const setImg = (code) => {
     18: png18,
     31: png31
   };
-  return imageMap[code] || png11; // 默认返回 png11 如果 code 不存在
+  // 默认返回 png11 如果 code 不存在
+  return imageMap[code] || png11;
 };
 
 onMounted(() => {
diff --git a/src/views/Survey/views/Create/Index.vue b/src/views/Survey/views/Create/Index.vue
index d15fcc8..bab2748 100644
--- a/src/views/Survey/views/Create/Index.vue
+++ b/src/views/Survey/views/Create/Index.vue
@@ -424,14 +424,14 @@ const questionEvent = (item) => {
       options:
         item.json.options.length > 0
           ? item.json.options.map((item) => {
-              return item.map((it) => {
-                return {
-                  ...it,
-                  // 主键生成
-                  id: uuidv4()
-                };
-              });
-            })
+            return item.map((it) => {
+              return {
+                ...it,
+                // 主键生成
+                id: uuidv4()
+              };
+            });
+          })
           : []
     })
   );
@@ -553,10 +553,12 @@ watch(
 
 // 保存   目前没有任何逻辑可以执行所有保存
 const saveAs = () => {
-  //   保存所有
-  showConfirmDialog({
-    message: '问卷保存成功',
-    showCancelButton: false
+  sync({ sn: route.query.sn }).then(() => {
+    //   保存所有
+    showConfirmDialog({
+      message: '问卷保存成功',
+      showCancelButton: false
+    });
   });
 };
 // 投放
@@ -568,7 +570,7 @@ const previewQuestion = () => {
   router.push({ name: 'preview', query: { ...route.query } });
 };
 
-onMounted(async () => {
+onMounted(async() => {
   await getQuestionDetail();
 });
 </script>
diff --git a/src/views/Survey/views/Preview/Index.vue b/src/views/Survey/views/Preview/Index.vue
index eb895a4..b76b72a 100644
--- a/src/views/Survey/views/Preview/Index.vue
+++ b/src/views/Survey/views/Preview/Index.vue
@@ -1429,17 +1429,20 @@ function hasNConsecutiveNumbers(arr, n, onTrue, onFalse) {
 // eslint-disable
 // 跳转链接
 function toUrl(url) {
+  // 创建一个新的变量来存储修改后的 URL
+  let modifiedUrl = url;
+
   // 判断是否小程序路径
-  if (url[0] === '/') {
+  if (modifiedUrl[0] === '/') {
     // 判断是否在小程序环境
     wx.miniProgram.getEnv(() => {
-      wx.miniProgram.redirectTo({ url });
+      wx.miniProgram.redirectTo({ url: modifiedUrl });
     });
   } else {
-    if (url.indexOf('http://') === -1 && url.indexOf('https://') === -1) {
-      url = `http://${url}`;
+    if (modifiedUrl.indexOf('http://') === -1 && modifiedUrl.indexOf('https://') === -1) {
+      modifiedUrl = `http://${modifiedUrl}`;
     }
-    open(url);
+    open(modifiedUrl);
   }
 }
 /* eslint-enable */
diff --git a/src/views/Survey/views/Publish/Index.vue b/src/views/Survey/views/Publish/Index.vue
index 733b64c..5102080 100644
--- a/src/views/Survey/views/Publish/Index.vue
+++ b/src/views/Survey/views/Publish/Index.vue
@@ -93,17 +93,17 @@ type OperateItem = (typeof operateList)[0];
 
 const operateBtn = (item: OperateItem) => {
   switch (item.type) {
-    case 'shareLink':
-      shareLink();
-      break;
-    case 'copyLink':
-      copyLink();
-      break;
-    case 'qrCode':
-      downLoadImg();
-      break;
-    default:
-      break;
+  case 'shareLink':
+    shareLink();
+    break;
+  case 'copyLink':
+    copyLink();
+    break;
+  case 'qrCode':
+    downLoadImg();
+    break;
+  default:
+    break;
   }
 };
 // 复制链接
@@ -121,8 +121,8 @@ function shareLink() {
   const params = {
     type: 'shareToWx',
     title:
-      surveyTitle.value ||
-      (publishInfo.value.download_url.title
+      surveyTitle.value
+      || (publishInfo.value.download_url.title
         ? publishInfo.value.download_url.title.replace(/_发布二维码\.[a-zA-Z]+$/, '')
         : ''),
     description: publishInfo.value.desc || '填写问卷',
@@ -195,7 +195,7 @@ watch(status, (val) => {
     getCode();
   }
 });
-onMounted(async () => {
+onMounted(async() => {
   fetchInfo();
 });
 </script>