From 5f41a9a125103181af220fd9d6a94904395d0db9 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Tue, 10 Oct 2023 10:25:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=9B=E5=90=88=E5=B9=B6dev=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/encodeQuery.ts                      |  4 +-
 .../DataCollect/Collector/Point/Scan/Tree.vue |  2 -
 .../Instance/Detail/Diagnose/Status/index.tsx |  4 +-
 .../Instance/Detail/Diagnose/Status/util.ts   |  2 +
 .../components/EditTable/PatchMapping.vue     |  8 +-
 .../components/Metadata/Import/index.vue      | 79 ++++++++++---------
 src/views/media/Device/Channel/Live/index.vue |  8 +-
 .../media/Device/Channel/Share/index.vue      |  5 +-
 .../DropdownButton/DropdownButton.vue         |  4 +-
 .../Save/components/ParamsDropdown/index.vue  |  4 +-
 src/views/system/Menu/Setting/index.vue       |  4 +-
 11 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/src/utils/encodeQuery.ts b/src/utils/encodeQuery.ts
index b406d719..72d03ab2 100644
--- a/src/utils/encodeQuery.ts
+++ b/src/utils/encodeQuery.ts
@@ -29,7 +29,7 @@ const handleTermsToString = (queryTerms: any, terms: Array<TermsType>, parentKey
     Object.keys(a).forEach((b) => {
       const key = `${parentKey}[${aIndex}].${b}`
       if (b === 'terms') {
-        handleTermsToString(queryTerms, a[b], `${key}.`)
+        handleTermsToString(queryTerms, a[b], `${key}`)
       } else {
         queryTerms[key] = a[b]
       }
@@ -48,7 +48,7 @@ export const paramsEncodeQuery = (params?: ParamsType) => {
     const { sorts, terms } = params
 
     if (terms) {
-      handleTermsToString(queryParams, terms, 'terms.')
+      handleTermsToString(queryParams, terms, 'terms')
     }
 
     if (sorts) {
diff --git a/src/views/DataCollect/Collector/Point/Scan/Tree.vue b/src/views/DataCollect/Collector/Point/Scan/Tree.vue
index 7ccdc907..f036dfe3 100644
--- a/src/views/DataCollect/Collector/Point/Scan/Tree.vue
+++ b/src/views/DataCollect/Collector/Point/Scan/Tree.vue
@@ -15,8 +15,6 @@
                 checkable
                 @check="onCheck"
                 :height="600"
-                :showLine="{ showLeafIcon: false }"
-                :show-icon="true"
             >
                 <template #title="{ name, key }">
                     <span
diff --git a/src/views/device/Instance/Detail/Diagnose/Status/index.tsx b/src/views/device/Instance/Detail/Diagnose/Status/index.tsx
index 46dd955c..48d6fcb7 100644
--- a/src/views/device/Instance/Detail/Diagnose/Status/index.tsx
+++ b/src/views/device/Instance/Detail/Diagnose/Status/index.tsx
@@ -63,7 +63,7 @@ const Status = defineComponent({
         }
 
         const jumpAccessConfig = () => {
-            menuStory.jumpPage('device/Product/Detail', { id: unref(device).productId, tab: 'access' });
+            menuStory.jumpPage('device/Product/Detail', { id: unref(device).productId, tab: 'Device' });
         };
 
         const jumpDeviceConfig = () => {
@@ -1806,4 +1806,4 @@ const Status = defineComponent({
     },
 })
 
-export default Status
\ No newline at end of file
+export default Status
diff --git a/src/views/device/Instance/Detail/Diagnose/Status/util.ts b/src/views/device/Instance/Detail/Diagnose/Status/util.ts
index 11811906..758a12bb 100644
--- a/src/views/device/Instance/Detail/Diagnose/Status/util.ts
+++ b/src/views/device/Instance/Detail/Diagnose/Status/util.ts
@@ -259,4 +259,6 @@ urlMap.set('mqtt-client-gateway', 'topic');
 urlMap.set('http-server-gateway', 'url');
 urlMap.set('websocket-server', 'url');
 urlMap.set('coap-server-gateway', 'url');
+urlMap.set('udp-device-gateway', 'url');
+urlMap.set('tcp-server-gateway', 'url');
 
diff --git a/src/views/device/Instance/Detail/components/EditTable/PatchMapping.vue b/src/views/device/Instance/Detail/components/EditTable/PatchMapping.vue
index c0db75c9..a89cbea6 100644
--- a/src/views/device/Instance/Detail/components/EditTable/PatchMapping.vue
+++ b/src/views/device/Instance/Detail/components/EditTable/PatchMapping.vue
@@ -19,8 +19,6 @@
                             :tree-data="dataSource"
                             :checkedKeys="checkedKeys"
                             @check="onCheck"
-                            :showLine="{ showLeafIcon: false }"
-                            :show-icon="true"
                         />
                     </j-card>
                     <div style="width: 100px">
@@ -137,7 +135,7 @@ const _delete = (_key: string) => {
 };
 
 const handleClick = async () => {
-   
+
     if (!rightList.value.length) {
         onlyMessage('请选择采集器', 'warning');
     } else {
@@ -154,7 +152,7 @@ const handleClick = async () => {
             }));
             params.push(...array);
         });
-        
+
         const filterParms = params.filter((item) => !!item.metadataId);
         if (filterParms && filterParms.length !== 0) {
             const res = await saveMapping(_props.deviceId, _props.type, filterParms);
@@ -194,4 +192,4 @@ watchEffect(() => {
         }
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/components/Metadata/Import/index.vue b/src/views/device/components/Metadata/Import/index.vue
index f269e46c..6ffb3c96 100644
--- a/src/views/device/components/Metadata/Import/index.vue
+++ b/src/views/device/components/Metadata/Import/index.vue
@@ -267,17 +267,17 @@ loadData();
 //                 }
 //                 if(!item?.name){
 //                     onlyMessage(`属性定义第${index + 1}个数组中缺失name属性`,'error');
-//                     return 
+//                     return
 //                 }
 //                 if(!item?.expands?.source){
 //                     onlyMessage(`属性定义第${index + 1}个数组中缺失expands.source属性`,'error');
-//                     return 
+//                     return
 //                 }
-               
+
 //                 if((item?.expands?.source === 'device' ||    item?.expands?.source === 'rule') && !item?.expands?.type){
 //                     onlyMessage(`属性定义第${index + 1}个数组中缺失type属性`,'error');
 //                     return
-//                 }           
+//                 }
 //         }) || false
 // }
 const requiredCheck = (data:any) =>{
@@ -287,12 +287,12 @@ const requiredCheck = (data:any) =>{
                 if(!item?.id){
                     onlyMessage(`属性定义第${index + 1}个数组中缺失id属性`,'error');
                     check = true
-                    return 
+                    return
                 }
                 if(!item?.name){
                     onlyMessage(`属性定义第${index + 1}个数组中缺失name属性`,'error');
                     check = true
-                    return 
+                    return
                 }
                 if(!item?.valueType?.type){
                     onlyMessage(`标签定义第${index + 1}个数组中缺失valueType.type属性`,'error');
@@ -302,14 +302,14 @@ const requiredCheck = (data:any) =>{
                 if(!item?.expands?.source){
                     onlyMessage(`属性定义第${index + 1}个数组中缺失expands.source属性`,'error');
                     check = true
-                    return 
+                    return
                 }
-               
+
                 if((item?.expands?.source === 'device' ||    item?.expands?.source === 'rule') && !item?.expands?.type){
                     onlyMessage(`属性定义第${index + 1}个数组中缺失type属性`,'error');
                     check = true
                     return
-                }           
+                }
         })
     }
     if(data?.functions  && !check){
@@ -323,7 +323,7 @@ const requiredCheck = (data:any) =>{
                     onlyMessage(`方法定义第${index + 1}个数组中缺失name属性`,'error');
                     check = true
                     return
-                } 
+                }
             if(!item?.async && item?.async !== false){
                     onlyMessage(`方法定义第${index + 1}个数组中缺失async属性`,'error');
                     check = true
@@ -375,13 +375,13 @@ const requiredCheck = (data:any) =>{
                     onlyMessage(`事件定义第${index + 1}个数组中缺失valueType.properties数组第${number+1}项的valueType.type属性`,'error');
                     check = true
                     return
-                }   
-                    })   
+                }
+                    })
                 }else{
                     onlyMessage(`事件定义第${index + 1}个数组中缺失valueType.properties数组`,'error');
                     check = true
                     return
-                } 
+                }
             }
         })
     }
@@ -396,7 +396,7 @@ const requiredCheck = (data:any) =>{
                     onlyMessage(`标签定义第${index + 1}个数组中缺失name属性`,'error');
                     check = true
                     return
-                } 
+                }
             if(!item?.valueType?.type){
                     onlyMessage(`标签定义第${index + 1}个数组中缺失valueType.type属性`,'error');
                     check = true
@@ -419,18 +419,18 @@ const aliCheck = (data:any) => {
                 if(!item?.identifier){
                     onlyMessage(`属性定义第${index + 1}个数组中缺失identifier属性`,'error');
                     check = true
-                    return 
+                    return
                 }
                 if(!item?.name){
                     onlyMessage(`属性定义第${index + 1}个数组中缺失name属性`,'error');
                     check = true
-                    return 
+                    return
                 }
                 if(!item?.dataType?.type){
                     onlyMessage(`属性定义第${index + 1}个数组中缺失dataType.type属性`,'error');
                     check = true
-                    return 
-                }  
+                    return
+                }
         })
     }
     if(data?.functions  && !check){
@@ -444,7 +444,7 @@ const aliCheck = (data:any) => {
                     onlyMessage(`方法定义第${index + 1}个数组中缺失name属性`,'error');
                     check = true
                     return
-                } 
+                }
             if(!item?.callType){
                     onlyMessage(`方法定义第${index + 1}个数组中缺失callType属性`,'error');
                     check = true
@@ -486,23 +486,23 @@ const aliCheck = (data:any) => {
                     onlyMessage(`事件定义第${index + 1}个数组中缺失outputData数组第${number+1}项的dataType.type属性`,'error');
                     check = true
                     return
-                }   
+                }
                 if(!i?.dataType?.specs){
                     onlyMessage(`事件定义第${index + 1}个数组中缺失outputData数组第${number+1}项的dataType.specs属性`,'error');
                     check = true
                     return
-                }   
-                    })   
+                }
+                    })
                 }else{
                     onlyMessage(`事件定义第${index + 1}个数组中缺失outputData数组`,'error');
                     check = true
                     return
-                } 
+                }
             }
         })
     }
     return check
-} 
+}
 const beforeUpload: UploadProps['beforeUpload'] = (file) => {
     if(file.type === 'application/json') {
         const reader = new FileReader();
@@ -510,17 +510,10 @@ const beforeUpload: UploadProps['beforeUpload'] = (file) => {
         reader.onload = (json) => {
             if(json.target?.result){
                 const data = JSON.parse(json.target?.result);
-                Object.keys(data).forEach((i:any)=>{
-                    const map = new Map()
-                    data[i].forEach((item:any)=>(
-                        map.set(item.id,item)
-                    ))
-                    data[i] = [...map.values()]
-                })
-                let check = formModel.metadata === 'jetlinks' ? requiredCheck(data) : aliCheck(data) 
+                let check = formModel.metadata === 'jetlinks' ? requiredCheck(data) : aliCheck(data)
                 if(!check){
                     onlyMessage('操作成功！')
-                    formModel.import = JSON.stringify(data);
+                    formModel.import = json.target?.result;
                 }
             } else {
                 onlyMessage('文件内容不能为空', 'error')
@@ -587,7 +580,13 @@ const handleImport = async () => {
         if (data.metadata === 'alink') {
             try {
                 const _import = JSON.parse(data.import);
-               
+                Object.keys(_import).forEach((i:any)=>{
+                    const map = new Map()
+                    _import[i].forEach((item:any)=>(
+                        map.set(item.id,item)
+                    ))
+                    _import[i] = [...map.values()]
+                })
                 loading.value = true;
                 const res = await convertMetadata(
                     'from',
@@ -638,7 +637,15 @@ const handleImport = async () => {
                     data[data?.type === 'copy' ? 'copy' : 'import'] ||
                         '{}',
                 );
-                
+                if(data?.type === 'import'){
+                        Object.keys(_object).forEach((i:any)=>{
+                        const map = new Map()
+                        _object[i].forEach((item:any)=>(
+                            map.set(item.id,item)
+                        ))
+                        _object[i] = [...map.values()]
+                    })
+                }
                 if (
                     !(
                         !!_object?.properties ||
@@ -717,4 +724,4 @@ const handleImport = async () => {
     line-height: 30px;
     margin: 0 -11px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/media/Device/Channel/Live/index.vue b/src/views/media/Device/Channel/Live/index.vue
index 91a2d394..bb2c06fa 100644
--- a/src/views/media/Device/Channel/Live/index.vue
+++ b/src/views/media/Device/Channel/Live/index.vue
@@ -30,17 +30,15 @@
             </div>
         </div>
         <div class="media-live">
-            <div class="media-live-video">
+            <div class="media-live-video" @mouseenter="visibleChange"  @mouseleave="mouseleave">
                 <div
                     :class="mediaToolClass"
-                    @mouseleave="mouseleave"
                     @mouseenter="showTool = true"
                 >
                     <div class="tool-item" v-if="type !== 'share'">
                         <template v-if="isRecord === 0">
                             <j-dropdown
                                 trigger="click"
-                                @visibleChange="visibleChange"
                                 @click="showToolLock = true"
                             >
                                 <div>开始录像</div>
@@ -212,8 +210,8 @@ const mouseleave = () => {
     }
 };
 
-const visibleChange = (v: boolean) => {
-    showTool.value = v;
+const visibleChange = () => {
+    showTool.value = true;
 };
 
 const getPopupContainer = (trigger: HTMLElement) => {
diff --git a/src/views/media/Device/Channel/Share/index.vue b/src/views/media/Device/Channel/Share/index.vue
index 5df9137c..fe5bf013 100644
--- a/src/views/media/Device/Channel/Share/index.vue
+++ b/src/views/media/Device/Channel/Share/index.vue
@@ -7,6 +7,8 @@ import { LocalStore } from '@/utils/comm';
 import { TOKEN_KEY } from '@/utils/variable';
 import ShareLive from '../Live/shareLive.vue';
 
+import { useSystem } from '@/store/system';
+const system = useSystem();
 const playData = ref({
     deviceId: '',
     channelId: '',
@@ -18,6 +20,7 @@ const playData = ref({
 const route = useRoute();
 
 watchEffect(() => {
+    system.getSystemConfig()
     const obj: any = unref(route.query) || {};
     playData.value = {
         deviceId: obj?.deviceId || '',
@@ -29,4 +32,4 @@ watchEffect(() => {
         LocalStore.set(TOKEN_KEY, obj?.[TOKEN_KEY]);
     }
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/rule-engine/Scene/Save/components/DropdownButton/DropdownButton.vue b/src/views/rule-engine/Scene/Save/components/DropdownButton/DropdownButton.vue
index 11055f19..d6eb252f 100644
--- a/src/views/rule-engine/Scene/Save/components/DropdownButton/DropdownButton.vue
+++ b/src/views/rule-engine/Scene/Save/components/DropdownButton/DropdownButton.vue
@@ -38,8 +38,6 @@
               :height='450'
               :virtual='true'
               @select='treeSelect'
-              :showLine="{ showLeafIcon: false }"
-              :show-icon="true"
             >
               <template #title="{ name, description }">
                 <j-space>
@@ -164,4 +162,4 @@ watchEffect(() => {
 
 <style scoped lang='less'>
 @import './index.less';
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
index 6c168814..103b5537 100644
--- a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
+++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
@@ -55,8 +55,6 @@
                     :height='450'
                     :virtual='true'
                     @select='treeSelect'
-                    :showLine="{ showLeafIcon: false }"
-                    :show-icon="true"
                   >
                     <template #title="{ name, description }">
                       <j-space>
@@ -198,4 +196,4 @@ watchEffect(() => {
     display: none;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/system/Menu/Setting/index.vue b/src/views/system/Menu/Setting/index.vue
index b5fff30b..1260bc44 100644
--- a/src/views/system/Menu/Setting/index.vue
+++ b/src/views/system/Menu/Setting/index.vue
@@ -21,8 +21,6 @@
                           :selectedKeys="selectedKeys"
                           @drop="onDrop"
                           @dragend="onDragend"
-                          :showLine="{ showLeafIcon: false }"
-                            :show-icon="true"
                         >
                           <template #title="row">
                             <div class="tree-content">
@@ -121,7 +119,7 @@ const params = {
 let filterProtocolList: any[] = [];
 const getProvidersFn = async () => {
     if(!isNoCommunity){
-        return 
+        return
     }else{
         const res: any = await getProviders();
         filterProtocolList = protocolList.filter((item) => {