From b144bd2ba4699edfd2e4cd47c24db9ec290ebfdf Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Thu, 25 Jan 2024 16:57:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20formConfig=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/JiHeExpressway/components/FormConfig/index.vue | 2 +-
 .../components/FormConfig/utils/defaultValue.js          | 9 ++++++---
 .../event/commandDispatch/Cards/DisposalPlan/index.vue   | 6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue
index cdd58ee0..86f28211 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ElForm :style="getStyle()" :label-width="labelWidth" class="FormConfig" size="mini">
     <template v-for="(item, index) in formList">
-      <ElFormItem class="formItem" :rules="getRules(item)" v-if="formItemVisible(item)" :key="item.key"
+      <ElFormItem class="formItem" :rules="getRules(item)" v-if="formItemVisible(item)" :key="`${item.key}|${index}`"
         :label="item.label" :style="gridStyle(item, index)">
         <slot :name="item.key" :data="item" :formData="modelFormData">
           <ProxyCom :value="getValue(item)" :item="item" @update:value="data => updateValue(item, data)" />
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/utils/defaultValue.js b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/utils/defaultValue.js
index b055db7f..2fa5a4c2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/utils/defaultValue.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/utils/defaultValue.js
@@ -30,11 +30,14 @@ export function getDefaultValue(item, data) {
   return typeof getValue === "function" ? getValue(item) : null;
 }
 
-export function reduceDefaultValue(formList, data) {
+export function reduceDefaultValue(formList, data, total = {}) {
   if (!Array.isArray(formList)) return null;
 
   return formList.reduce((prev, cur) => {
-    if (cur?.key)
+    if (cur?.type === "MultipleLabelItem")
+      Array.isArray(cur.options?.options) &&
+        reduceDefaultValue(cur.options.options, data, prev);
+    else if (cur?.key)
       pathSet(
         prev,
         cur.key,
@@ -43,5 +46,5 @@ export function reduceDefaultValue(formList, data) {
     // prev[cur.key] = getDefaultValue(cur, pathGet(data || {}, cur.key));
 
     return prev;
-  }, {});
+  }, total);
 }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalPlan/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalPlan/index.vue
index b79852d3..247f5714 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalPlan/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalPlan/index.vue
@@ -26,12 +26,12 @@ function getDefaultBlockOption() {
 
 function getDefaultLegendOption() {
   return {
-    width: 9,
-    height: 9,
+    width: 11,
+    height: 11,
     y: 0,
     text: {
       font: "PingFang SC",
-      fontSize: 9,
+      fontSize: 11,
       align: 'left',
       color: "#FFFFFF"
     },