From 3beae8b718d2a4f087c37d2fae655c99c380384c Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Tue, 5 Dec 2023 11:11:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#20763=E3=80=8120736=E3=80=8120731?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: bug#20763、20736、20731
---
 package.json                                    |  2 ++
 src/components/FRuleEditor-copy/Debug/index.vue |  3 +--
 .../DataCollect/Collector/Tree/Save/index.vue   |  3 ++-
 src/views/device/DashBoard/components/Amap.vue  |  4 ++--
 .../Info/components/InklingModal/index.vue      |  2 +-
 .../Instance/Detail/Running/Event/index.vue     |  3 ++-
 .../Detail/Running/Property/Detail/Charts.vue   | 17 ++++++++++++-----
 .../Running/Property/Detail/PropertyAMap.vue    |  8 +++++---
 src/views/system/Menu/Detail/BasicInfo.vue      |  2 +-
 src/views/system/Menu/index.vue                 | 17 +++++++----------
 yarn.lock                                       | 15 +++++++++++++++
 11 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/package.json b/package.json
index dc3a1f35..bbf571d7 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "prepare": "husky install"
   },
   "dependencies": {
+    "@ant-design/icons-vue": "^7.0.1",
     "@liveqing/liveplayer-v3": "^3.7.10",
     "@types/marked": "^4.0.8",
     "@vitejs/plugin-vue-jsx": "^3.0.0",
@@ -37,6 +38,7 @@
     "nrm": "^1.2.5",
     "pinia": "^2.0.28",
     "rollup-plugin-copy": "^3.4.0",
+    "rxjs": "^7.8.1",
     "unplugin-auto-import": "^0.12.1",
     "unplugin-vue-components": "^0.22.12",
     "v-clipboard3": "^0.1.4",
diff --git a/src/components/FRuleEditor-copy/Debug/index.vue b/src/components/FRuleEditor-copy/Debug/index.vue
index 757cb47a..fa98f583 100644
--- a/src/components/FRuleEditor-copy/Debug/index.vue
+++ b/src/components/FRuleEditor-copy/Debug/index.vue
@@ -71,7 +71,6 @@
 </template>
 <script setup lang="ts" name="Debug">
 import { PropType } from 'vue';
-import { DeleteOutlined, PlusOutlined } from '@ant-design/icons-vue';
 import { useProductStore } from '@/store/product';
 import { useRuleEditorStore } from '@/store/ruleEditor';
 import moment from 'moment';
@@ -300,4 +299,4 @@ getProperty()
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/DataCollect/Collector/Tree/Save/index.vue b/src/views/DataCollect/Collector/Tree/Save/index.vue
index 71ccb285..05822b99 100644
--- a/src/views/DataCollect/Collector/Tree/Save/index.vue
+++ b/src/views/DataCollect/Collector/Tree/Save/index.vue
@@ -39,7 +39,7 @@
                     placeholder="请输入采集器名称"
                     v-model:value="formData.name"
                 />
-              
+
             </j-form-item>
             <j-form-item  v-if="provider === 'snap7'" label="IP" :name="['configuration', 'host']" :rules="LeftTreeRules.host" >
               <j-input v-model:value="formData.configuration.host" autocomplete="off" placeholder="请输入通道IP" :disabled="false"/>
@@ -163,6 +163,7 @@
                 v-if="provider !== 'snap7'"
                 :name="['configuration', 'requestTimeout']"
                 :rules="LeftTreeRules.requestTimeout"
+                label='请求超时时间'
             >
                 <j-input-number
                     style="width: 100%"
diff --git a/src/views/device/DashBoard/components/Amap.vue b/src/views/device/DashBoard/components/Amap.vue
index 9311e1e1..820a1d52 100644
--- a/src/views/device/DashBoard/components/Amap.vue
+++ b/src/views/device/DashBoard/components/Amap.vue
@@ -26,7 +26,7 @@
                     clipOrigin: [459, 92],
                     clipSize: [50, 68],
                 }"
-                >123</el-amap-label-marker
+                ></el-amap-label-marker
             >
         </AmapComponent>
     </div>
@@ -47,4 +47,4 @@ const getMapData = async () => {
 getMapData();
 </script>
 <style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/Instance/Detail/Info/components/InklingModal/index.vue b/src/views/device/Instance/Detail/Info/components/InklingModal/index.vue
index 2f7f7adf..d8cebbc7 100644
--- a/src/views/device/Instance/Detail/Info/components/InklingModal/index.vue
+++ b/src/views/device/Instance/Detail/Info/components/InklingModal/index.vue
@@ -71,4 +71,4 @@ const handleCancel = () => {
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/Instance/Detail/Running/Event/index.vue b/src/views/device/Instance/Detail/Running/Event/index.vue
index ec1f7295..eca939e7 100644
--- a/src/views/device/Instance/Detail/Running/Event/index.vue
+++ b/src/views/device/Instance/Detail/Running/Event/index.vue
@@ -83,6 +83,7 @@ watchEffect(() => {
                     type: i?.valueType?.type || 'string',
                     rename: i.id
                 },
+                ellipsis: true,
             });
         });
     } else {
@@ -124,4 +125,4 @@ const detail = (_info: any) => {
         padding: 0 20px;
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue b/src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue
index 9bda45a6..ebb41ec4 100644
--- a/src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue
+++ b/src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue
@@ -81,8 +81,11 @@ const queryChartsAggList = async () => {
             from: prop.time[0],
             to: prop.time[1],
         },
-    });
-    loading.value = false;
+    }).finally(
+       ()=>{
+        loading.value = false;
+       }
+    )
     if (resp.status === 200) {
         const dataList: any[] = [
             {
@@ -127,8 +130,12 @@ const queryChartsList = async () => {
             ],
             sorts: [{ name: 'timestamp', order: 'asc' }],
         },
-    );
-    loading.value = false;
+    ).finally(
+       ()=>{
+        loading.value = false;
+       }
+    )
+
     if (resp.status === 200) {
         const dataList: any[] = [
             {
@@ -216,4 +223,4 @@ watchEffect(() => {
         getOptions(chartsList.value);
     }
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/device/Instance/Detail/Running/Property/Detail/PropertyAMap.vue b/src/views/device/Instance/Detail/Running/Property/Detail/PropertyAMap.vue
index 50cf5938..cf62afe0 100644
--- a/src/views/device/Instance/Detail/Running/Property/Detail/PropertyAMap.vue
+++ b/src/views/device/Instance/Detail/Running/Property/Detail/PropertyAMap.vue
@@ -65,8 +65,10 @@ const query = async () => {
             },
             sorts: { timestamp: 'asc' },
         }),
-    );
-    loading.value = false;
+    ).finally(()=>{
+        loading.value = false;
+    }
+    )
     if (resp.status === 200) {
         const list: any[] = [];
         ((resp.result as any)?.data || []).forEach((item: any) => {
@@ -93,4 +95,4 @@ watch(
 </script>
 
 <style lang="less" scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/system/Menu/Detail/BasicInfo.vue b/src/views/system/Menu/Detail/BasicInfo.vue
index 74e0cb62..e1cf0c34 100644
--- a/src/views/system/Menu/Detail/BasicInfo.vue
+++ b/src/views/system/Menu/Detail/BasicInfo.vue
@@ -66,7 +66,7 @@
                                     required: true,
                                     message: '请输入页面地址',
                                 },
-                                { max: 128, message: '最多可输入128字符' },
+                                { max: 128, message: '最多可输入128个字符' },
                                 { pattern: /^\//, message: '请正确填写地址，以/开头' },
                             ]" :validateFirst="true" label="页面地址" name="url">
                                 <j-input v-model:value="form.data.url" placeholder="请输入页面地址" />
diff --git a/src/views/system/Menu/index.vue b/src/views/system/Menu/index.vue
index 39e67de4..9265d9c8 100644
--- a/src/views/system/Menu/index.vue
+++ b/src/views/system/Menu/index.vue
@@ -196,17 +196,14 @@ const table = reactive({
                     ],
                 },
                 {
-                terms:[
+                  type: 'or',
+                  terms:[
                     {
-                        terms:[
-                            {
-                                value:"%show\":true%",
-                                termType:"like",
-                                column:"options"
-                            }
-                        ]
+                      value:"%show\":true%",
+                      termType:"like",
+                      column:"options"
                     }
-                ]
+                  ]
             }
             ],
         };
@@ -239,7 +236,7 @@ const table = reactive({
         router.push(
             `/system/Menu/detail/:id?pid=${row.id}&basePath=${
                 row.url || ''
-            }&sortIndex=${sortIndex + 1}&isChildren=${true}`,
+            }&sortIndex=${sortIndex + 1}`,
         );
 
     },
diff --git a/yarn.lock b/yarn.lock
index 093c3df7..810c2ed2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -54,6 +54,14 @@
     "@ant-design/colors" "^6.0.0"
     "@ant-design/icons-svg" "^4.2.1"
 
+"@ant-design/icons-vue@^7.0.1":
+  version "7.0.1"
+  resolved "https://registry.npmjs.org/@ant-design/icons-vue/-/icons-vue-7.0.1.tgz#83de301771fadd03f3890e627314102405c31c22"
+  integrity sha512-eCqY2unfZK6Fe02AwFlDHLfoyEFreP6rBwAZMIJ1LugmfMiVgwWDYlp1YsRugaPtICYOabV1iWxXdP12u9U43Q==
+  dependencies:
+    "@ant-design/colors" "^6.0.0"
+    "@ant-design/icons-svg" "^4.2.1"
+
 "@antfu/utils@^0.7.2":
   version "0.7.2"
   resolved "https://registry.npmjs.org/@antfu/utils/-/utils-0.7.2.tgz"
@@ -5891,6 +5899,13 @@ rxjs@^7.5.7:
   dependencies:
     tslib "^2.1.0"
 
+rxjs@^7.8.1:
+  version "7.8.1"
+  resolved "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
+  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
+  dependencies:
+    tslib "^2.1.0"
+
 safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.jetlinks.cn/safe-buffer/-/safe-buffer-5.2.1.tgz"