From 58a0695fffd66af752630b30b956208956a84bf6 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Fri, 26 May 2023 10:20:26 +0800
Subject: [PATCH] fix: bug#13956,12031

---
 src/components/Metadata/ConfigParam/index.vue              | 7 +++++--
 .../device/components/Metadata/Base/Edit/ExpandsForm.vue   | 2 +-
 src/views/media/Device/Channel/Live/index.vue              | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/Metadata/ConfigParam/index.vue b/src/components/Metadata/ConfigParam/index.vue
index eea9c5e1..64b8157e 100644
--- a/src/components/Metadata/ConfigParam/index.vue
+++ b/src/components/Metadata/ConfigParam/index.vue
@@ -9,14 +9,17 @@
       <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">
-            <j-select v-model:value="value[item.property]" :options="item.type?.elements?.map((e: { 'text': string, 'value': string }) => ({
+            <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 }) => ({
               label: e.text,
               value: e.value,
             }))" size="small" :placeholder="`请输入${item.name}`"></j-select>
           </j-form-item>
         </div>
       </template>
-      存储配置
+      {{ config.name || 存储配置 }}
       <AIcon type="EditOutlined" class="item-icon" />
     </j-popover>
   </j-button>
diff --git a/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue b/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue
index 2a716984..c9aca052 100644
--- a/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue
+++ b/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue
@@ -12,7 +12,7 @@
   ]">
     <j-select v-model:value="_value.type" :options="ExpandsTypeList" mode="multiple" size="small" :disabled="['manual', 'rule'].includes(_value.source)"></j-select>
   </j-form-item>
-  <j-form-item label="其他配置" v-if="config.length > 0">
+  <j-form-item label="其它配置" v-if="config.length > 0">
     <j-form-item v-for="(item, index) in config" :key="index">
       <config-param v-model:value="_value" :config="item" :name="name"></config-param>
     </j-form-item>
diff --git a/src/views/media/Device/Channel/Live/index.vue b/src/views/media/Device/Channel/Live/index.vue
index 3a3f4127..67556136 100644
--- a/src/views/media/Device/Channel/Live/index.vue
+++ b/src/views/media/Device/Channel/Live/index.vue
@@ -27,7 +27,7 @@
                                 <a-icon type='QuestionCircleOutlined' />
                               </j-tooltip>
                             </j-menu-item>
-                            <j-menu-item key='true'>
+                            <j-menu-item key='true' v-if='route.query.type !== "fixed-media"'>
                               <span style='padding-right: 12px;'>云端存储</span>
                               <j-tooltip title='存储在服务器中'>
                                 <a-icon type='QuestionCircleOutlined' />