From e0c9fa623af93aa248781489f657638c061586e4 Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Sat, 15 Jul 2023 16:18:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/Firmware/Task/index.vue           | 12 +++++++-----
 src/views/link/AccessConfig/index.vue              |  6 ++++++
 src/views/link/Type/Detail/index.vue               |  2 +-
 src/views/notice/Template/Detail/index.vue         |  3 +++
 .../system/DataSource/components/EditDialog.vue    | 14 ++++++++++----
 5 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/views/device/Firmware/Task/index.vue b/src/views/device/Firmware/Task/index.vue
index fe517201..7322f405 100644
--- a/src/views/device/Firmware/Task/index.vue
+++ b/src/views/device/Firmware/Task/index.vue
@@ -8,7 +8,6 @@
             :request="task"
             :defaultParams="{
                 sorts: [{ name: 'createTime', order: 'desc' }],
-                terms: defaultParams,
             }"
             :params="params"
         >
@@ -125,7 +124,7 @@ const columns = [
     },
 ];
 
-const defaultParams = [
+const defaultParams =
     {
         terms: [
             {
@@ -133,8 +132,8 @@ const defaultParams = [
                 value: route.query.id,
             },
         ],
-    },
-];
+}
+
 
 const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
     if (!data) {
@@ -233,7 +232,10 @@ const saveChange = (value: boolean) => {
  * @param params
  */
 const handleSearch = (e: any) => {
-    params.value = e;
+      const query = {"terms":[
+        e,defaultParams
+      ]}
+      params.value = query
 };
 </script>
 
diff --git a/src/views/link/AccessConfig/index.vue b/src/views/link/AccessConfig/index.vue
index 52fa9689..dc0b8db3 100644
--- a/src/views/link/AccessConfig/index.vue
+++ b/src/views/link/AccessConfig/index.vue
@@ -69,11 +69,17 @@
                                             v-if="slotProps.channelInfo"
                                             class="card-item-content-text"
                                         >
+                                        <Ellipsis
+                                        style="
+                                            width: calc(100% - 100px);
+                                        "
+                                    >
                                             <div
                                                 class="card-item-content-text-title"
                                             >
                                                 {{ slotProps.channelInfo.name }}
                                             </div>
+                                            </Ellipsis>
                                             <Ellipsis
                                                 style="
                                                     width: calc(100% - 10px);
diff --git a/src/views/link/Type/Detail/index.vue b/src/views/link/Type/Detail/index.vue
index 8a84aa8b..edfca5c3 100644
--- a/src/views/link/Type/Detail/index.vue
+++ b/src/views/link/Type/Detail/index.vue
@@ -949,7 +949,7 @@
                                                     "
                                                 >
                                                     <j-form-item
-                                                        label="长度"
+                                                        label="字节长度"
                                                         :name="[
                                                             'cluster',
                                                             index,
diff --git a/src/views/notice/Template/Detail/index.vue b/src/views/notice/Template/Detail/index.vue
index 421f3b3a..2af9e7c6 100644
--- a/src/views/notice/Template/Detail/index.vue
+++ b/src/views/notice/Template/Detail/index.vue
@@ -1244,6 +1244,9 @@ const handleSubmit = () => {
       if (formData.value.template.messageType === 'markdown') {
         formData.value.template.markdown!.text = formData.value.template.message
       }
+      if (formData.value.template.messageType === 'link'){
+        formData.value.template.link!.text = formData.value.template.message
+      }
     }
 
   formRef.value?.validate()
diff --git a/src/views/system/DataSource/components/EditDialog.vue b/src/views/system/DataSource/components/EditDialog.vue
index fd5072b5..0d18da95 100644
--- a/src/views/system/DataSource/components/EditDialog.vue
+++ b/src/views/system/DataSource/components/EditDialog.vue
@@ -261,10 +261,16 @@ const validateAddress = (_rule: Rule, value: string): Promise<any> => {
 const getTypeOption = () => {
     getDataTypeDict_api().then((resp: any) => {
         const result = resp.result as dictItemType[];
-        form.typeOptions = result.map((item) => ({
-            label: item.name,
-            value: item.id,
-        }));
+        const options:any = []
+         result.forEach((item) => {
+            if(item.name !== 'redis'){
+                options.push({
+                label: item.name,
+                value: item.id,
+                })
+            }
+        });
+        form.typeOptions =  options
     });
 };