From dcd5e41641618f1ea2b555d3193bd51ebaea36f1 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 6 Jul 2022 16:10:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/article/drafts.vue |  6 +--
 .../modules/communityParty/article/index.vue  |  2 +-
 src/views/modules/cpts/base/cpts/edit.vue     | 39 +++++++++++++++++--
 src/views/modules/cpts/base/index.vue         |  2 +-
 4 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/communityParty/article/drafts.vue b/src/views/modules/communityParty/article/drafts.vue
index 1451da54..170a4db8 100644
--- a/src/views/modules/communityParty/article/drafts.vue
+++ b/src/views/modules/communityParty/article/drafts.vue
@@ -25,7 +25,7 @@
     >
       <template v-slot:editOperateSup="{ id, formType, info }">
         <el-button
-          v-if="formType != 'watch'"
+          v-if="formType != 'watch' && info.richTextFlag == '1'"
           type="warning"
           size="small"
           :disabled="draftBtnDisable"
@@ -102,7 +102,7 @@ export default {
           keyName: "imgArr",
           type: "upload",
           limit: 1,
-          listType: 'picture-card',
+          listType: "picture-card",
           editDisabled: true,
           rules: [],
           value: () => [],
@@ -131,7 +131,7 @@ export default {
           type: "cascader",
           value: [],
           supKeys: ["publishRangeDesc"],
-          supValues: [[]],
+          supValues: [""],
           optionUrl: "/gov/org/customeragency/agencygridtree",
           optionUrlParams: {
             agencyId: this.$store.state.user.agencyId,
diff --git a/src/views/modules/communityParty/article/index.vue b/src/views/modules/communityParty/article/index.vue
index 333d13e9..c3d14f1a 100644
--- a/src/views/modules/communityParty/article/index.vue
+++ b/src/views/modules/communityParty/article/index.vue
@@ -252,7 +252,7 @@ export default {
           type: "cascader",
           value: () => [],
           supKeys: ["publishRangeDesc"],
-          supValues: [() => []],
+          supValues: [""],
           optionUrl: "/gov/org/customeragency/agencygridtree",
           optionUrlParams: {
             agencyId: this.$store.state.user.agencyId,
diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue
index 73cd539c..24a3e96c 100644
--- a/src/views/modules/cpts/base/cpts/edit.vue
+++ b/src/views/modules/cpts/base/cpts/edit.vue
@@ -429,12 +429,43 @@ export default {
     iniFmData() {
       const { editParams, fmData, editParamsDiv } = this;
       editParams.forEach((item, index) => {
-        fmData[item.keyName] =
-          typeof item.value == "function" ? item.value() : "";
+        if (typeof item.value == "function") {
+          fmData[item.keyName] = item.value();
+        } else if (
+          typeof item.value == "string" ||
+          typeof item.value == "number" ||
+          typeof item.value == "boolean"
+        ) {
+          fmData[item.keyName] = item.value;
+        } else if (typeof item.value == "undefined") {
+          fmData[item.keyName] = "";
+        } else {
+          fmData[item.keyName] = item.value || "";
+          console.error(
+            "不应该直接传入数组或对象的值，这样会导致传入的值被子组件修改。editParams-------------cpts/base/cpts/edit.vue",
+            item
+          );
+        }
+
         if (item.supValues) {
           item.supValues.forEach((value, index) => {
-            fmData[item.supKeys[index]] =
-              typeof value == "function" ? value() : "";
+            if (typeof value == "function") {
+              fmData[item.supKeys[index]] = value();
+            } else if (
+              typeof value == "string" ||
+              typeof value == "number" ||
+              typeof value == "boolean"
+            ) {
+              fmData[item.supKeys[index]] = value;
+            } else if (typeof value == "undefined") {
+              fmData[item.supKeys[index]] = "";
+            } else {
+              fmData[item.supKeys[index]] = value;
+              console.error(
+                "不应该直接传入数组或对象的值，这样会导致传入的值被子组件修改。editParams-------------cpts/base/cpts/edit.vue",
+                item
+              );
+            }
           });
         }
 
diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index 890b00a4..d6660da3 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -363,7 +363,7 @@ export default {
     },
     editBtnName: {
       type: Function,
-      default: () => "编辑",
+      default: () => "修改",
     },
     delAuth: {
       type: Function,