From b03dd8846eac24a0e5d18984c807b1efd14a6ac0 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Thu, 20 Jul 2023 09:31:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9jetlinks-store?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/type.ts                             | 17 ++++++++++
 .../DataCollect/Collector/Tree/Save/index.vue | 29 +++++++++--------
 .../DataCollect/Collector/Tree/index.vue      |  8 ++---
 .../components/NotificationRecord/index.vue   | 20 ++++++------
 .../Metadata/Base/Edit/ValueTypeForm.vue      |  2 --
 .../link/Type/Detail/LocalAddressSelect.vue   | 17 ++++++----
 src/views/link/Type/Detail/index.vue          | 32 +++++++++----------
 .../rule-engine/Alarm/Configuration/index.vue | 11 ++++---
 .../rule-engine/Alarm/Log/Detail/info.vue     | 21 +++++++++---
 .../Alarm/Log/TabComponent/index.vue          |  3 +-
 src/views/rule-engine/Alarm/Log/index.vue     |  2 --
 11 files changed, 97 insertions(+), 65 deletions(-)
 create mode 100644 src/store/type.ts

diff --git a/src/store/type.ts b/src/store/type.ts
new file mode 100644
index 00000000..14220140
--- /dev/null
+++ b/src/store/type.ts
@@ -0,0 +1,17 @@
+import { defineStore } from "pinia";
+
+export const useTypeStore = defineStore({
+    id: 'type',
+    state: () => ({
+        configRef: [] as any,
+        resourcesClusters: {} as any,
+    }),
+    actions: {
+        setConfigRef(current: any[]) {
+            this.configRef = current
+        },
+        setResourcesClusters(current: any) {
+            this.resourcesClusters = current
+        }
+    }
+})
\ No newline at end of file
diff --git a/src/views/DataCollect/Collector/Tree/Save/index.vue b/src/views/DataCollect/Collector/Tree/Save/index.vue
index 9e3a5c89..504b77d0 100644
--- a/src/views/DataCollect/Collector/Tree/Save/index.vue
+++ b/src/views/DataCollect/Collector/Tree/Save/index.vue
@@ -156,13 +156,10 @@
 </template>
 <script lang="ts" setup>
 import { save, update } from '@/api/data-collect/collector';
-import { Store } from 'jetlinks-store';
 import { LeftTreeRules } from '../../data';
 import type { FormInstance } from 'ant-design-vue';
 
 const loading = ref(false);
-const channelListAll = ref();
-const channelList = ref();
 const visibleEndian = ref(false);
 const visibleUnitId = ref(false);
 
@@ -171,6 +168,10 @@ const props = defineProps({
         type: Object,
         default: () => {},
     },
+    channelListAll: {
+        type: Array,
+        default: () => []
+    }
 });
 
 const emit = defineEmits(['change']);
@@ -178,6 +179,16 @@ const emit = defineEmits(['change']);
 const id = props.data.id;
 const formRef = ref<FormInstance>();
 
+const _channelListAll = computed(() => {
+    return props.channelListAll || [];
+})
+const channelList = computed(() => {
+   return _channelListAll.value.map((item: any) => ({
+        value: item.id,
+        label: item.name,
+    }));
+})
+
 
 const endianData = computed(() => {
     const { endian, endianIn } = formData.value.configuration;
@@ -213,7 +224,7 @@ const formData = ref({
 const handleOk = async () => {
     const data = await formRef.value?.validate();
 
-    const { provider, name } = channelListAll.value.find(
+    const { provider, name } = _channelListAll.value.find(
         (item: any) => item.id === formData.value.channelId,
     );
     const params = {
@@ -252,14 +263,6 @@ const changeCardSelectEndian = (value: Array<string>) => {
 const changeCardSelectEndianIn = (value: Array<string>) => {
     formData.value.configuration.endianIn = value[0];
 };
-const getChannelNoPaging = async () => {
-    channelListAll.value = Store.get('channelListAll');
-    channelList.value = channelListAll.value.map((item) => ({
-        value: item.id,
-        label: item.name,
-    }));
-};
-getChannelNoPaging();
 
 const filterOption = (input: string, option: any) => {
     return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
@@ -268,7 +271,7 @@ const filterOption = (input: string, option: any) => {
 watch(
     () => formData.value.channelId,
     (value) => {
-        const dt = channelListAll.value.find((item) => item.id === value);
+        const dt = _channelListAll.value.find((item) => item.id === value);
         visibleUnitId.value = visibleEndian.value =
             dt?.provider && dt?.provider === 'MODBUS_TCP';
     },
diff --git a/src/views/DataCollect/Collector/Tree/index.vue b/src/views/DataCollect/Collector/Tree/index.vue
index 2672937b..327bc330 100644
--- a/src/views/DataCollect/Collector/Tree/index.vue
+++ b/src/views/DataCollect/Collector/Tree/index.vue
@@ -111,7 +111,7 @@
             </j-tree>
             <j-empty v-else description="暂无数据" />
         </j-spin>
-        <Save v-if="visible" :data="current" @change="saveChange" />
+        <Save :channelListAll="channelListAll" v-if="visible" :data="current" @change="saveChange" />
     </div>
 </template>
 
@@ -124,7 +124,6 @@ import {
 } from '@/api/data-collect/collector';
 import Save from './Save/index.vue';
 import { onlyMessage } from '@/utils/comm';
-import { Store } from 'jetlinks-store';
 import _ from 'lodash';
 import { colorMap } from '../data.ts';
 
@@ -144,6 +143,7 @@ const searchValue = ref();
 const visible = ref(false);
 const current = ref({});
 const collectorAll = ref();
+const channelListAll = ref<any[]>([])
 
 const root = [
     {
@@ -274,8 +274,8 @@ const handleSearch = async (value: any) => {
 };
 const getChannelNoPaging = async () => {
 
-    const res = await queryChannelNoPaging();
-    Store.set('channelListAll', res.result);
+    const res: any = await queryChannelNoPaging();
+    channelListAll.value = res.result;
 };
 
 const treeSelect = (keys: string, e: any) => {
diff --git a/src/views/account/Center/components/StationMessage/components/NotificationRecord/index.vue b/src/views/account/Center/components/StationMessage/components/NotificationRecord/index.vue
index 33e799fa..1bee9528 100644
--- a/src/views/account/Center/components/StationMessage/components/NotificationRecord/index.vue
+++ b/src/views/account/Center/components/StationMessage/components/NotificationRecord/index.vue
@@ -15,11 +15,11 @@
             :bodyStyle="{ padding: 0 }"
             :defaultParams="defaultParams"
         >
-            <template #rightExtraRender>
+            <!-- <template #rightExtraRender>
                 <j-popconfirm title="确认全部已读？" @confirm="onAllRead">
                     <j-button type="primary">全部已读</j-button>
                 </j-popconfirm>
-            </template>
+            </template> -->
             <template #topicProvider="slotProps">
                 {{ slotProps.topicName }}
             </template>
@@ -240,14 +240,14 @@ watchEffect(() => {
     }
 });
 
-const onAllRead = async () => {
-    const resp = await changeAllStatus('_read', getType.value);
-    if (resp.status === 200) {
-        onlyMessage('操作成功！');
-        refresh();
-        user.updateAlarm();
-    }
-};
+// const onAllRead = async () => {
+//     const resp = await changeAllStatus('_read', getType.value);
+//     if (resp.status === 200) {
+//         onlyMessage('操作成功！');
+//         refresh();
+//         user.updateAlarm();
+//     }
+// };
 
 onMounted(() => {
     if (routerParams.params?.value.row) {
diff --git a/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue b/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue
index ed0942ef..05c7d887 100644
--- a/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue
+++ b/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue
@@ -59,7 +59,6 @@ import { DataTypeList, FileTypeList } from '@/views/device/data';
 import { DefaultOptionType, SelectValue } from 'ant-design-vue/es/select';
 import { PropType } from 'vue'
 import { getUnit } from '@/api/device/instance';
-import { Store } from 'jetlinks-store';
 import InputSelect from '@/components/InputSelect/index.vue';
 import BooleanParam from '@/components/Metadata/BooleanParam/index.vue'
 import EnumParam from '@/components/Metadata/EnumParam/index.vue'
@@ -140,7 +139,6 @@ const unit = reactive({
         value: item.id,
       }));
       // 缓存单位数据
-      Store.set('units', _data);
       unit.unitOptions = _data;
     })
   },
diff --git a/src/views/link/Type/Detail/LocalAddressSelect.vue b/src/views/link/Type/Detail/LocalAddressSelect.vue
index ad5815e4..6817dcc3 100644
--- a/src/views/link/Type/Detail/LocalAddressSelect.vue
+++ b/src/views/link/Type/Detail/LocalAddressSelect.vue
@@ -12,8 +12,13 @@
 </template>
 
 <script lang="ts" setup>
-import { Store } from "jetlinks-store"
 import { resourceClustersById } from "@/api/link/type"
+import { useTypeStore } from "@/store/type"
+import { cloneDeep } from "lodash-es"
+import { storeToRefs } from "pinia"
+
+const _typeStore = useTypeStore()
+const { resourcesClusters } = storeToRefs(_typeStore)
 
 const props = defineProps({
     value: {
@@ -36,7 +41,7 @@ const host = ref<string>()
 const options = ref<any[]>([])
 
 const getResourcesClustersById = async (id: string) => {
-    const _value = Store.get('resourcesClusters')?.[id]
+    const _value = resourcesClusters.value?.[id]
     if(!_value){
         const resp = await resourceClustersById(id)
         if (resp.status === 200) {
@@ -44,15 +49,15 @@ const getResourcesClustersById = async (id: string) => {
             const checkedHost = [{ value: checked?.host, label: checked?.host }];
             options.value = checked ? checkedHost : []
 
-            const resourcesClusters = Store.get('resourcesClusters') || {}
-            resourcesClusters[id] = resp.result
-            Store.set('resourcesClusters', resourcesClusters)
+            const _resourcesClusters = cloneDeep(resourcesClusters.value)
+            _resourcesClusters[id] = resp.result
+            _typeStore.setResourcesClusters(_resourcesClusters)
             emit('valueChange', props.value)
         } else {
             options.value = []
         }
     } else {
-        const checked = Store.get('resourcesClusters')?.[id]?.[0]
+        const checked = resourcesClusters.value?.[id]?.[0]
         const checkedHost = [{ value: checked?.host, label: checked?.host }];
         options.value = checked ? checkedHost : []
     }
diff --git a/src/views/link/Type/Detail/index.vue b/src/views/link/Type/Detail/index.vue
index e15e86a2..4660b462 100644
--- a/src/views/link/Type/Detail/index.vue
+++ b/src/views/link/Type/Detail/index.vue
@@ -1143,9 +1143,10 @@ import {
 } from '../data';
 import { cloneDeep } from 'lodash-es';
 import type { FormData2Type, FormDataType } from '../type';
-import { Store } from 'jetlinks-store';
 import LocalAddressSelect from './LocalAddressSelect.vue';
 import { isNoCommunity } from '@/utils/utils';
+import { useTypeStore } from '@/store/type';
+import { storeToRefs } from 'pinia';
 
 const route = useRoute();
 const NetworkType = route.query.type as string;
@@ -1157,6 +1158,9 @@ const formRef1 = ref<FormInstance>();
 const formRef2 = ref<FormInstance>();
 const shareCluster = ref(true);
 
+const _typeStore = useTypeStore()
+const { configRef, resourcesClusters } = storeToRefs(_typeStore)
+
 const formData = ref<FormDataType>({
     ...FormStates,
 });
@@ -1198,7 +1202,7 @@ const filterPortOption = (input: string, option: any) => {
 
 const getPortList = (list: any[], id: string) => {
   const keys = dynamicValidateForm?.cluster?.map?.(item => item.configuration?.port) || []
-  console.log(dynamicValidateForm?.cluster, id, keys)
+//   console.log(dynamicValidateForm?.cluster, id, keys)
   return (list || []).filter(item => item.value === id || !keys.includes(item.value) )
 }
 
@@ -1251,7 +1255,7 @@ const changeType = (value: string) => {
 const updateClustersListIndex = () => {
     const { cluster } = dynamicValidateForm;
     const filters = cluster?.map((item) => item.serverId);
-    const newConfigRef = shareCluster.value ? Store.get('configRef')?.filter(
+    const newConfigRef = shareCluster.value ? (configRef.value || [])?.filter(
         (item: any) => !filters.includes(item.clusterNodeId),
     ) : configClustersList.value?.filter(
         (item: any) => !filters.includes(item.id),
@@ -1299,7 +1303,7 @@ const changeHost = (
         if(!flag){
             configuration.port = undefined;
         }
-        const checked = Store.get('resourcesClusters')?.[serverId || '']
+        const checked = resourcesClusters.value?.[serverId || '']
         if(checked){
             getPortOptions(checked, index)
         }
@@ -1387,14 +1391,15 @@ const getCertificates = async () => {
 };
 
 const getResourcesCurrent = () => {
-    resourcesCurrent().then((resp) => {
+    resourcesCurrent().then((resp: any) => {
         if (resp.status === 200) {
+            _typeStore.setConfigRef(resp.result || [])
+
             const clusterNodeId = resp.result?.[0]?.clusterNodeId
-            const resourcesClusters = Store.get('resourcesClusters') || {}
-            resourcesClusters[clusterNodeId] = resp.result
-            Store.set('resourcesClusters', resourcesClusters)
-            Store.set('configRef', resp.result);
-            getPortOptions(Store.get('resourcesClusters')?.[clusterNodeId]);
+            const _resourcesClusters = cloneDeep(resourcesClusters.value || {})
+            _resourcesClusters[clusterNodeId] = resp.result
+            _typeStore.setResourcesClusters(_resourcesClusters)
+            getPortOptions(resp.result);
         }
     });
 };
@@ -1422,11 +1427,6 @@ const getDetail = () => {
                         ...cloneDeep(Configuration), //防止编辑时，表单字段不完善，导致输入/选择框新出现时找不到
                         ...configuration,
                     };
-
-                    // const configRef = Store.get('configRef').filter(
-                    //     (item: any) => item.host === '0.0.0.0',
-                    // );
-                    // getPortOptions(configRef); //更新端口
                 } else {
                     dynamicValidateForm.cluster = cluster;
                     // const arr = cluster.map((item: any) => item.configuration.serverId)
@@ -1479,7 +1479,7 @@ watch(
     (value) => {
         formData.value.shareCluster = value;
         value
-            ? getPortOptions(Store.get('configRef'))
+            ? getPortOptions(configRef.value)
             : (portOptionsIndex.value[0] = []);
         updateClustersListIndex();
     },
diff --git a/src/views/rule-engine/Alarm/Configuration/index.vue b/src/views/rule-engine/Alarm/Configuration/index.vue
index 833c03f6..8ca56655 100644
--- a/src/views/rule-engine/Alarm/Configuration/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/index.vue
@@ -89,7 +89,7 @@
                                             告警级别
                                         </div>
                                         <div>
-                                            {{ (Store.get('default-level') || []).find((item: any) => item?.level === slotProps.level)?.title ||
+                                            {{ (defaultLevel || []).find((item: any) => item?.level === slotProps.level)?.title ||
             slotProps.level }}
                                         </div>
                                     </j-col>
@@ -124,11 +124,11 @@
                     <template #level="slotProps">
                         <j-tooltip
                             placement="topLeft"
-                            :title="(Store.get('default-level') || []).find((item) => item?.level === slotProps.level)?.title ||
+                            :title="(defaultLevel || []).find((item) => item?.level === slotProps.level)?.title ||
             slotProps.level"
                         >
                             <div class="ellipsis">
-                                {{ (Store.get('default-level') || []).find((item) => item?.level === slotProps.level)?.title ||
+                                {{ (defaultLevel || []).find((item) => item?.level === slotProps.level)?.title ||
             slotProps.level }}
                             </div>
                         </j-tooltip>
@@ -196,7 +196,6 @@ import {
     getScene,
 } from '@/api/rule-engine/configuration';
 import { queryLevel } from '@/api/rule-engine/config';
-import { Store } from 'jetlinks-store';
 import type { ActionsType } from '@/components/Table/index.vue';
 import { getImage, onlyMessage } from '@/utils/comm';
 import { useMenuStore } from '@/store/menu';
@@ -352,6 +351,8 @@ const columns = [
 const visible = ref<boolean>(false);
 const current = ref<any>({});
 
+const defaultLevel = ref<any[]>([]);
+
 const map = {
     product: '产品',
     device: '设备',
@@ -380,7 +381,7 @@ const handleSearch = (e: any) => {
 const queryDefaultLevel = () => {
     queryLevel().then((res) => {
         if (res.status === 200) {
-            Store.set('default-level', res.result?.levels || []);
+            defaultLevel.value = res.result?.levels || [];
         }
     });
 };
diff --git a/src/views/rule-engine/Alarm/Log/Detail/info.vue b/src/views/rule-engine/Alarm/Log/Detail/info.vue
index c191d995..a84e40f0 100644
--- a/src/views/rule-engine/Alarm/Log/Detail/info.vue
+++ b/src/views/rule-engine/Alarm/Log/Detail/info.vue
@@ -30,13 +30,11 @@
             <j-descriptions-item label="告警级别" :span="1">
                 <j-tooltip
                     placement="topLeft"
-                    :title="(Store.get('default-level') || []).find((item: any) => item?.level === data?.level)
-                ?.title || props.data?.level"
+                    :title="_level"
                 >
                     <Ellipsis>
                         <span>
-                            {{(Store.get('default-level') || []).find((item: any) => item?.level === data?.level)
-                ?.title || props.data?.level}}
+                            {{_level}}
                         </span>
                     </Ellipsis>
                 </j-tooltip>
@@ -60,8 +58,8 @@
 </template>
 
 <script lang="ts" setup>
+import { queryLevel } from '@/api/rule-engine/config';
 import dayjs from 'dayjs';
-import { Store } from 'jetlinks-store';
 import JsonViewer from 'vue-json-viewer';
 const props = defineProps({
     data: Object,
@@ -70,11 +68,24 @@ const props = defineProps({
 const data = computed(()=>{
     return JSON.parse(props.data?.alarmInfo);
 })
+const defaultLevel = ref<any[]>([])
 
 const emit = defineEmits(['close']);
 const closeModal = () => {
     emit('close');
 };
+
+const _level = computed(() => {
+    return (defaultLevel.value || []).find((item: any) => item?.level === props.data?.level)?.title || props.data?.level
+})
+
+onMounted(() => {
+    queryLevel().then((res)=>{
+        if(res.status === 200 ){
+            defaultLevel.value = res.result?.levels || [];
+        }
+    })
+})
 </script>
 <style lang="less" scoped>
 </style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Alarm/Log/TabComponent/index.vue b/src/views/rule-engine/Alarm/Log/TabComponent/index.vue
index f45429f1..fb87789a 100644
--- a/src/views/rule-engine/Alarm/Log/TabComponent/index.vue
+++ b/src/views/rule-engine/Alarm/Log/TabComponent/index.vue
@@ -138,7 +138,6 @@ import { queryLevel } from '@/api/rule-engine/config';
 import Search from '@/components/Search';
 import { useAlarmStore } from '@/store/alarm';
 import { storeToRefs } from 'pinia';
-import { Store } from 'jetlinks-store';
 import dayjs from 'dayjs';
 import type { ActionsType } from '@/components/Table';
 import SolveComponent from '../SolveComponent/index.vue';
@@ -149,10 +148,10 @@ const menuStory = useMenuStore();
 const tableRef = ref();
 const alarmStore = useAlarmStore();
 const { data } = storeToRefs(alarmStore);
+
 const getDefaulitLevel = () => {
     queryLevel().then((res) => {
         if (res.status === 200) {
-            Store.set('default-level', res.result?.levels || []);
             data.value.defaultLevel = res.result?.levels || [];
         }
     });
diff --git a/src/views/rule-engine/Alarm/Log/index.vue b/src/views/rule-engine/Alarm/Log/index.vue
index f886b287..7467ef01 100644
--- a/src/views/rule-engine/Alarm/Log/index.vue
+++ b/src/views/rule-engine/Alarm/Log/index.vue
@@ -9,7 +9,6 @@ import { isNoCommunity } from '@/utils/utils';
 import { useAlarmStore } from '@/store/alarm';
 import { storeToRefs } from 'pinia';
 import { queryLevel } from '@/api/rule-engine/config';
-import { Store } from 'jetlinks-store';
 import  TableComponents  from './TabComponent/index.vue';
 const list = [
     {
@@ -56,7 +55,6 @@ const { data }  = storeToRefs(alarmStore);
 const getDefaulitLevel = () => {
     queryLevel().then((res)=>{
         if(res.status === 200 ){
-            Store.set('default-level', res.result?.levels || []);
             data.value.defaultLevel = res.result?.levels || [];
         }
     })

From b6f89216b410f9b99b13a3d736e4cfc78fa8b787 Mon Sep 17 00:00:00 2001
From: fuhao <62583365+haodd0216@users.noreply.github.com>
Date: Thu, 20 Jul 2023 11:42:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20bug#15992=E3=80=8115977?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChildDevice/BindChildDevice/index.vue     | 115 ++++++++++--------
 .../ChildDevice/EdgeMap/PatchMapping.vue      | 104 ++++++++++++++--
 .../Instance/Detail/EdgeMap/PatchMapping.vue  |   5 +
 3 files changed, 166 insertions(+), 58 deletions(-)

diff --git a/src/views/device/Instance/Detail/ChildDevice/BindChildDevice/index.vue b/src/views/device/Instance/Detail/ChildDevice/BindChildDevice/index.vue
index b1eb60f9..5ebb69fa 100644
--- a/src/views/device/Instance/Detail/ChildDevice/BindChildDevice/index.vue
+++ b/src/views/device/Instance/Detail/ChildDevice/BindChildDevice/index.vue
@@ -32,11 +32,11 @@
                                     value: '',
                                     type: 'or',
                                 },
-                            //     {
-                            //         column: 'parentId$not',
-                            //         value: detail.id,
-                            //         type: 'or',
-                            //     },
+                                //     {
+                                //         column: 'parentId$not',
+                                //         value: detail.id,
+                                //         type: 'or',
+                                //     },
                             ],
                         },
                         {
@@ -88,18 +88,24 @@
 </template>
 
 <script setup lang="ts" name="BindChildDevice">
-import { query, queryByParent, bindDevice, queryDeviceMapping, saveDeviceMapping } from '@/api/device/instance';
+import {
+    query,
+    queryByParent,
+    bindDevice,
+    queryDeviceMapping,
+    saveDeviceMapping,
+} from '@/api/device/instance';
 import moment from 'moment';
 import { useInstanceStore } from '@/store/instance';
 import { storeToRefs } from 'pinia';
 import { onlyMessage } from '@/utils/comm';
 
 const props = defineProps({
-  parentIds: {
-    type: Array,
-    default: () => []
-  }
-})
+    parentIds: {
+        type: Array,
+        default: () => [],
+    },
+});
 
 const instanceStore = useInstanceStore();
 const { detail } = storeToRefs(instanceStore);
@@ -176,13 +182,16 @@ const handleSearch = (e: any) => {
 
 const onSelectChange = (keys: string[], rows: string[]) => {
     _selectedRowKeys.value = [...keys];
-  console.log(rows)
-    _selectedRowMap.value = rows.map(item => ({ deviceId: item.id, deviceName: item.name}))
+    console.log(rows);
+    _selectedRowMap.value = rows.map((item) => ({
+        deviceId: item.id,
+        deviceName: item.name,
+    }));
 };
 
 const cancelSelect = () => {
     _selectedRowKeys.value = [];
-    _selectedRowMap.value = []
+    _selectedRowMap.value = [];
 };
 
 const handleOk = () => {
@@ -191,51 +200,57 @@ const handleOk = () => {
         return;
     }
     btnLoading.value = true;
-    if (instanceStore.current.accessProvider === 'official-edge-gateway') { // 网关设备
-      queryDeviceMapping(instanceStore.current.id)
-          .then(res => {
-            const arr = bindDeviceRef.value?._dataSource.filter((item: any) => {
-              return _selectedRowKeys.value.includes(item.id);
-            }).map((item: any) => {
-                const _item = res.result?.[0]?.find((val: any) => val.deviceId === item.id)
-                if(_item){
-                    return {
-                        id: _item.id,
-                        deviceId: _item.deviceId,
-                        deviceName: _item.deviceName
-                    }
-                }else {
-                    return {
-                        deviceId: item.id,
-                        deviceName: item.name
-                    }
+    if (instanceStore.current.accessProvider === 'official-edge-gateway') {
+        // 网关设备
+        queryDeviceMapping(instanceStore.current.id)
+            .then((res) => {
+                const arr = bindDeviceRef.value?._dataSource
+                    .filter((item) => {
+                        return (
+                            !res.result?.[0]?.find(
+                                (val) => val.deviceId === item.id,
+                            ) && _selectedRowKeys.value.includes(item.id)
+                        );
+                    })
+                    .map((item) => {
+                        return {
+                            deviceId: item.id,
+                            deviceName: item.name,
+                        };
+                    });
+                if(arr.length){
+                    return saveDeviceMapping(instanceStore.current.id, {
+                        info: arr,
+                    });
                 }
             })
-            return saveDeviceMapping(instanceStore.current.id, {info: arr})
-          }).then(res => {
-            emit('change', true);
-            cancelSelect();
-            onlyMessage('操作成功');
-          })
-          .finally(() => {
-            btnLoading.value = false;
-          });
+            .then((res) => {
+                return bindDevice(detail.value.id, _selectedRowKeys.value);
+            })
+            .then((res) => {
+                emit('change', true);
+                cancelSelect();
+                onlyMessage('操作成功');
+            })
+            .finally(() => {
+                btnLoading.value = false;
+            });
     } else {
-      bindDevice(detail.value.id, _selectedRowKeys.value).then(res => {
-        emit('change', true);
-        cancelSelect();
-        onlyMessage('操作成功');
-      }).finally(() => {
-        btnLoading.value = false;
-      });
+        bindDevice(detail.value.id, _selectedRowKeys.value)
+            .then((res) => {
+                emit('change', true);
+                cancelSelect();
+                onlyMessage('操作成功');
+            })
+            .finally(() => {
+                btnLoading.value = false;
+            });
     }
-
 };
 
 const handleCancel = () => {
     emit('change', false);
 };
-
 </script>
 
 <style scoped lang="less"></style>
diff --git a/src/views/device/Instance/Detail/ChildDevice/EdgeMap/PatchMapping.vue b/src/views/device/Instance/Detail/ChildDevice/EdgeMap/PatchMapping.vue
index 66345b8b..646a51db 100644
--- a/src/views/device/Instance/Detail/ChildDevice/EdgeMap/PatchMapping.vue
+++ b/src/views/device/Instance/Detail/ChildDevice/EdgeMap/PatchMapping.vue
@@ -16,9 +16,11 @@
                         <j-tree
                             checkable
                             :height="300"
-                            :tree-data="dataSource"
+                            :tree-data="treeList"
                             :checkedKeys="checkedKeys"
+                            :load-data="onLoadData"
                             @check="onCheck"
+                            v-model:expandedKeys="expandedKeys"
                         />
                     </j-card>
                     <div style="width: 100px">
@@ -56,8 +58,17 @@
 </template>
 
 <script lang="ts" setup>
-import { treeEdgeMap, saveEdgeMap, addDevice } from '@/api/device/instance';
+import {
+    treeEdgeMap,
+    saveEdgeMap,
+    addDevice,
+    edgeChannel,
+    edgeCollector,
+    edgePoint,
+    saveDeviceMapping,
+} from '@/api/device/instance';
 import { onlyMessage } from '@/utils/comm';
+import type { TreeProps } from 'ant-design-vue';
 const _props = defineProps({
     metaData: {
         type: Array,
@@ -74,6 +85,9 @@ const _props = defineProps({
     deviceData: {
         type: Object,
     },
+    text: {
+        type: String,
+    }
 });
 const _emits = defineEmits(['close', 'save']);
 
@@ -113,16 +127,83 @@ const handleSearch = async () => {
     }
 };
 
+const expandedKeys = ref<string[]>([]);
 const onCheck = (keys: string[], e: any) => {
     checkedKeys.value = [...keys];
+    expandedKeys.value.push(e.node.id);
     leftList.value = e?.checkedNodes || [];
 };
 
 const onRight = () => {
-    console.log(rightList.value,leftList.value);
+    console.log(rightList.value, leftList.value);
     rightList.value = leftList.value;
 };
 
+const treeList = ref<any[]>([]);
+const getChannel = async () => {
+    if (_props.edgeId) {
+        loading.value = true;
+        const resp: any = await edgeChannel(_props.edgeId);
+        loading.value = false;
+        if (resp.status === 200) {
+            treeList.value = resp.result?.[0]?.map((item: any) => ({
+                ...item,
+                title: item.name,
+                key: item.id,
+                checkable: false,
+                type: 'channel',
+                parentId: '',
+                provider: item.provider,
+            }));
+        }
+    }
+};
+
+const onLoadData: TreeProps['loadData'] = (treeNode) => {
+    console.log(treeNode);
+    return new Promise(async (resolve) => {
+        if (treeNode.dataRef?.children) {
+            resolve();
+            return;
+        }
+        const params = {
+            terms: [
+                {
+                    terms: [
+                        {
+                            column:
+                                treeNode.type === 'channel'
+                                    ? 'channelId'
+                                    : 'collectorId',
+                            value: treeNode.key,
+                        },
+                    ],
+                },
+            ],
+        };
+        const res =
+            treeNode.type === 'channel'
+                ? await edgeCollector(
+                      <string>_props.edgeId,
+                      params,
+                  )
+                : await edgePoint(
+                      <string>_props.edgeId,
+                      params,
+                  );
+        (<any>treeNode.dataRef).children = res.result?.[0].map((item: any) => ({
+            ...item,
+            title: item.name,
+            key: item.id,
+            type: treeNode.type === 'channel' ? 'collector' : 'point',
+            parentId: treeNode.key,
+            checkable: treeNode.type === 'channel' ? true : false,
+            isLeaf: treeNode.type === 'channel' ? false : true,
+        }));
+        treeList.value = [...treeList.value];
+        resolve();
+    });
+};
 const _delete = (_key: string) => {
     const _index = rightList.value.findIndex((i) => i.key === _key);
     rightList.value.splice(_index, 1);
@@ -144,7 +225,7 @@ const handleClick = async () => {
                 metadataId: (_props.metaData as any[]).find(
                     (i: any) => i.name === element.name,
                 )?.metadataId,
-                provider: dataSource.value.find(
+                provider: treeList.value.find(
                     (it: any) => it.id === item.parentId,
                 ).provider,
             }));
@@ -167,13 +248,19 @@ const handleClick = async () => {
             }
         } else {
             if (filterParms && filterParms.length !== 0) {
-                const res = await addDevice(_props.deviceData);
+                const res: any = await addDevice(_props.deviceData);
                 if (res.status === 200) {
-                    const resq = await saveEdgeMap(_props.edgeId, {
+                    const resq: any = await saveEdgeMap(_props.edgeId, {
                         deviceId: res.result?.id,
                         provider: filterParms[0]?.provider,
                         requestList: filterParms,
                     });
+                    const resp = await saveDeviceMapping(_props.edgeId, {
+                        info: [{
+                            deviceId: res.result?.id,
+                            deviceName: res.result?.name,
+                        }],
+                    })
                     if (res.status === 200) {
                         onlyMessage('操作成功');
                         _emits('save');
@@ -191,7 +278,8 @@ const handleClose = () => {
 
 onMounted(() => {
     if (_props.edgeId) {
-        handleSearch();
+        // handleSearch();
+        getChannel();
     }
 });
 </script>
@@ -212,4 +300,4 @@ onMounted(() => {
         }
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/Instance/Detail/EdgeMap/PatchMapping.vue b/src/views/device/Instance/Detail/EdgeMap/PatchMapping.vue
index 86818e91..65250054 100644
--- a/src/views/device/Instance/Detail/EdgeMap/PatchMapping.vue
+++ b/src/views/device/Instance/Detail/EdgeMap/PatchMapping.vue
@@ -20,6 +20,7 @@
                             :checkedKeys="checkedKeys"
                             :load-data="onLoadData"
                             @check="onCheck"
+                            v-model:expandedKeys="expandedKeys"
                         />
                     </j-card>
                     <div style="width: 100px">
@@ -120,7 +121,11 @@ const handleSearch = async () => {
     }
 };
 
+
+const expandedKeys = ref<string[]>([])
 const onCheck = (keys: string[], e: any) => {
+    // console.log(expandedKeys.push(e));
+    expandedKeys.value.push(e.node.id)
     checkedKeys.value = [...keys];
     leftList.value = e?.checkedNodes || [];
 };