From 8307a1353e21ef10bbd5bd189a08c699c183cad0 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Wed, 28 Jun 2023 09:42:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=89=A9=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E7=9A=84=E5=85=B6=E4=BB=96=E9=85=8D=E7=BD=AE=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E7=B1=BB=E5=9E=8B=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 修改登录后跳转方式

* fix: 修改物模型的其他配置按照类型配置
---
 src/components/Metadata/ConfigParam/index.vue | 24 +++++++++++++++----
 src/components/ValueItem/index.vue            |  6 +++++
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/components/Metadata/ConfigParam/index.vue b/src/components/Metadata/ConfigParam/index.vue
index 64b8157e..50c0e453 100644
--- a/src/components/Metadata/ConfigParam/index.vue
+++ b/src/components/Metadata/ConfigParam/index.vue
@@ -8,18 +8,32 @@
       </template>
       <template #content>
         <div style="max-width: 400px;" class="ant-form-vertical">
-          <j-form-item v-for="item in config.properties" :name="name.concat([item.property])" :label="item.name">
-            <template v-if='item.type?.type === "string"'>
+          <j-form-item v-for="item in config.properties" :key="item.property" :name="name.concat([item.property])" :label="item.name">
+            <!-- <template v-if='item.type?.type === "string"'>
               <j-input v-model:value='value[item.property]' size="small" :placeholder="`请输入${item.name}`"/>
             </template>
-            <j-select v-else v-model:value="value[item.property]" :options="item.type?.elements?.map((e: { 'text': string, 'value': string }) => ({
+            <template v-else-if='item.type?.type === "int"'>
+              <j-input-number style="width: 100%;" v-model:value='value[item.property]' size="small" :placeholder="`请输入${item.name}`"/>
+            </template>
+            <j-select v-else :mode="item.type?.multi ? 'multiple' : ''" v-model:value="value[item.property]" :options="item.type?.elements?.map((e: { 'text': string, 'value': string }) => ({
               label: e.text,
               value: e.value,
-            }))" size="small" :placeholder="`请输入${item.name}`"></j-select>
+            }))" size="small" :placeholder="`请输入${item.name}`"></j-select> -->
+            <ValueItem
+                v-model:modelValue="value[item.property]"
+                :itemType="item.type?.type"
+                :mode="item?.type?.multi ? 'multiple' : ''"
+                :options="
+                    item.type?.elements?.map(e => ({
+                      label: e.text,
+                      value: e.value,
+                    }))
+                "
+            />
           </j-form-item>
         </div>
       </template>
-      {{ config.name || 存储配置 }}
+      {{ config.name || '存储配置' }}
       <AIcon type="EditOutlined" class="item-icon" />
     </j-popover>
   </j-button>
diff --git a/src/components/ValueItem/index.vue b/src/components/ValueItem/index.vue
index a580808d..cef5feda 100644
--- a/src/components/ValueItem/index.vue
+++ b/src/components/ValueItem/index.vue
@@ -3,6 +3,7 @@
     <div class="value-item-warp">
         <j-select
             v-if="typeMap.get(itemType) === 'select'"
+            :mode="mode"
             v-model:value="myValue"
             :options="options"
             allowClear
@@ -139,6 +140,11 @@ const props = defineProps({
         type: Array as PropType<DefaultOptionType[]>,
         default: () => [],
     },
+    // 多选框
+    mode: {
+        type: String as PropType<'multiple' | 'tags' | 'combobox' | ''>,
+        default: ''
+    }
 });
 // type Props = {
 //     itemData?: Object;