From 3fc1e30027ccfc3292ab6aa39284736cbf4af956 Mon Sep 17 00:00:00 2001
From: wangshuaiswim <shuai-1991@qq.com>
Date: Mon, 27 Mar 2023 17:14:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=89=A9=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E5=B1=9E=E6=80=A7=E6=8F=90=E4=BA=A4=E6=97=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0type=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Metadata/VirtualRuleParam/index.vue  | 13 +++++++++----
 .../components/Metadata/Base/Edit/ExpandsForm.vue   |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/Metadata/VirtualRuleParam/index.vue b/src/components/Metadata/VirtualRuleParam/index.vue
index 5452a0e5..751a1033 100644
--- a/src/components/Metadata/VirtualRuleParam/index.vue
+++ b/src/components/Metadata/VirtualRuleParam/index.vue
@@ -1,4 +1,7 @@
 <template>
+  <j-form-item :name="name.concat(['type'])" v-show="false">
+    <j-input v-model:value="value.type" disabled/>
+  </j-form-item>
   <j-form-item :name="name.concat(['script'])">
     <f-rule-editor v-model:value="value.script" :id="id" :virtualRule="value"></f-rule-editor>
   </j-form-item>
@@ -60,10 +63,12 @@ interface Emits {
 const emit = defineEmits<Emits>()
 
 onMounted(() => {
-  emit('update:value', {
-    ...props.value,
-    type: 'script'
-  })
+  if (!props.value.type) {
+    emit('update:value', {
+      ...props.value,
+      type: 'script'
+    })
+  }
 })
 
 const aggTypeOptions = ref()
diff --git a/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue b/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue
index cde594c2..2a716984 100644
--- a/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue
+++ b/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue
@@ -5,7 +5,7 @@
     <j-select v-model:value="_value.source" :options="PropertySource" size="small"
       :disabled="metadataStore.model.action === 'edit'" @change="changeSource"></j-select>
   </j-form-item>
-  <virtual-rule-param v-if="_value.source === 'rule'" v-model:value="_value.virtualRule"
+  <virtual-rule-param v-if="type === 'product' && _value.source === 'rule'" v-model:value="_value.virtualRule"
     :name="name.concat(['virtualRule'])" :id="id" :showWindow="_value.source === 'rule'"></virtual-rule-param>
   <j-form-item label="读写类型" :name="name.concat(['type'])" :rules="[
     { required: true, message: '请选择读写类型' },

From bc95eda133603dbffa22e92f100babda6cdee539 Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Mon, 27 Mar 2023 17:23:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20bug#11026=E3=80=8111048=E3=80=811104?=
 =?UTF-8?q?6=E3=80=8111049=E3=80=8111045=E3=80=8111039=20=E9=87=87?=
 =?UTF-8?q?=E9=9B=86=E5=99=A8=E8=A7=A3=E5=86=B3=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/data-collect/collector.ts             |  5 ++-
 .../Collector/Point/Save/SaveModBus.vue       |  8 +++-
 .../DataCollect/Collector/Point/index.vue     |  2 +-
 .../DataCollect/Collector/Tree/Save/index.vue | 22 ++--------
 .../DataCollect/Collector/Tree/index.vue      | 41 ++++++++++++++-----
 src/views/DataCollect/Collector/index.vue     |  2 +-
 6 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/src/api/data-collect/collector.ts b/src/api/data-collect/collector.ts
index 6c1ed981..8f91b4f8 100644
--- a/src/api/data-collect/collector.ts
+++ b/src/api/data-collect/collector.ts
@@ -4,7 +4,10 @@ export const queryCollector = (data: any) =>
     server.post(`/data-collect/collector/_query/no-paging?paging=false`, data);
 
 export const queryChannelNoPaging = () =>
-    server.post(`/data-collect/channel/_query/no-paging`, { paging: false });
+    server.post(`/data-collect/channel/_query/no-paging`, {
+        paging: false,
+        sorts: [{ name: 'createTime', order: 'desc' }],
+    });
 
 export const save = (data: any) => server.post(`/data-collect/collector`, data);
 
diff --git a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
index 07a0ce3c..f6289260 100644
--- a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
+++ b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
@@ -301,7 +301,13 @@ const formData = ref({
 });
 
 const handleOk = async () => {
-    const data = await formRef.value?.validate();
+    console.log(2, formRef.value, formRef.value?.validate());
+
+    const data = await formRef.value?.validate().catch((err) => {
+        console.log(23, err);
+    });
+    console.log(3, data);
+
     delete data?.nspwc;
     const { codec } = data?.configuration;
 
diff --git a/src/views/DataCollect/Collector/Point/index.vue b/src/views/DataCollect/Collector/Point/index.vue
index bab0527e..6d1b34ed 100644
--- a/src/views/DataCollect/Collector/Point/index.vue
+++ b/src/views/DataCollect/Collector/Point/index.vue
@@ -20,7 +20,7 @@
                 <template #headerTitle>
                     <j-space>
                         <PermissionButton
-                            v-if="data?.provider !== 'OPC_UA'"
+                            v-if="data?.provider == 'MODBUS_TCP'"
                             type="primary"
                             @click="handlAdd"
                             hasPermission="DataCollect/Collector:add"
diff --git a/src/views/DataCollect/Collector/Tree/Save/index.vue b/src/views/DataCollect/Collector/Tree/Save/index.vue
index 5142f14d..bb7fbe52 100644
--- a/src/views/DataCollect/Collector/Tree/Save/index.vue
+++ b/src/views/DataCollect/Collector/Tree/Save/index.vue
@@ -56,22 +56,8 @@
             <j-form-item
                 :name="['circuitBreaker', 'type']"
                 :rules="LeftTreeRules.type"
+                label="故障处理"
             >
-                <template #label>
-                    <span>
-                        故障处理
-                        <j-tooltip
-                            :title="
-                                getTypeTooltip(formData.circuitBreaker.type)
-                            "
-                        >
-                            <AIcon
-                                type="QuestionCircleOutlined"
-                                style="margin-left: 2px"
-                            />
-                        </j-tooltip>
-                    </span>
-                </template>
                 <j-card-select
                     :showImage="false"
                     v-model:value="formData.circuitBreaker.type"
@@ -83,6 +69,9 @@
                     @change="changeCardSelectType"
                 />
             </j-form-item>
+            <p style="color: #616161">
+                {{ getTypeTooltip(formData.circuitBreaker.type) }}
+            </p>
             <j-form-item
                 :name="['configuration', 'endian']"
                 v-if="visibleEndian"
@@ -137,15 +126,12 @@
     </j-modal>
 </template>
 <script lang="ts" setup>
-import { Form } from 'ant-design-vue';
 import { save, update } from '@/api/data-collect/collector';
 import { Store } from 'jetlinks-store';
-import { cloneDeep } from 'lodash';
 import { LeftTreeRules } from '../../data';
 import type { FormInstance } from 'ant-design-vue';
 
 const loading = ref(false);
-const useForm = Form.useForm;
 const channelListAll = ref();
 const channelList = ref();
 const visibleEndian = ref(false);
diff --git a/src/views/DataCollect/Collector/Tree/index.vue b/src/views/DataCollect/Collector/Tree/index.vue
index 5999cc5b..808ee9e1 100644
--- a/src/views/DataCollect/Collector/Tree/index.vue
+++ b/src/views/DataCollect/Collector/Tree/index.vue
@@ -24,7 +24,10 @@
                 :tree-data="defualtDataSource"
                 v-model:selected-keys="selectedKeys"
                 :fieldNames="{ key: 'id' }"
-                v-if="defualtDataSource[0].children.length !== 0"
+                v-if="
+                    defualtDataSource.length !== 0 ||
+                    defualtDataSource?.[0]?.children?.length !== 0
+                "
                 :height="600"
                 defaultExpandAll
             >
@@ -129,13 +132,15 @@ const visible = ref(false);
 const current = ref({});
 const collectorAll = ref();
 
-const defualtDataSource: any = ref([
+const root = [
     {
         id: '*',
         name: '全部',
         children: [],
     },
-]);
+];
+
+const defualtDataSource: any = ref(_.cloneDeep(root));
 
 const defualtParams = {
     paging: false,
@@ -195,9 +200,11 @@ const saveChange = (value: object) => {
 };
 
 const handleSearch = async (value: any) => {
+    let clickSearch = false;
     if (!searchValue.value && !value) {
         params.value = _.cloneDeep(defualtParams);
     } else if (!!searchValue.value) {
+        clickSearch = true;
         params.value = { ..._.cloneDeep(defualtParams) };
         params.value.terms[1] = {
             terms: [
@@ -214,12 +221,24 @@ const handleSearch = async (value: any) => {
     spinning.value = true;
     const res: any = await queryCollector(params.value);
     if (res.status === 200) {
-        defualtDataSource.value[0].children = res.result;
-        collectorAll.value = res.result;
-        if (selectedKeys.value.length === 0) {
-            selectedKeys.value = [res?.result[0]?.id] || [];
-            emits('change', res?.result[0]);
+        if (clickSearch) {
+            defualtDataSource.value = res.result;
+        } else {
+            defualtDataSource.value = _.cloneDeep(root);
+            defualtDataSource.value[0].children = res.result;
         }
+        collectorAll.value = res.result;
+
+        if (selectedKeys.value.length === 0) {
+            selectedKeys.value = ['*'];
+        }
+
+        //激活change事件
+        setTimeout(() => {
+            const _selectedKeys = _.cloneDeep(selectedKeys.value);
+            selectedKeys.value = [];
+            selectedKeys.value = _selectedKeys;
+        }, 0);
     }
     spinning.value = false;
 };
@@ -238,8 +257,10 @@ watch(
     () => selectedKeys.value,
     (n) => {
         const key = _.isArray(n) ? n[0] : n;
-        const row = collectorAll.value.find((i: any) => i.id === key);
-        emits('change', row);
+        if (key) {
+            const row = collectorAll.value.find((i: any) => i.id === key);
+            emits('change', row);
+        }
     },
 );
 
diff --git a/src/views/DataCollect/Collector/index.vue b/src/views/DataCollect/Collector/index.vue
index f5ca641e..2b6af53d 100644
--- a/src/views/DataCollect/Collector/index.vue
+++ b/src/views/DataCollect/Collector/index.vue
@@ -6,7 +6,7 @@
             </div>
             <div class="right">
                 <j-spin :spinning="spinning">
-                    <Point v-if="!!data" :data="data" />
+                    <Point v-if="data || data === undefined" :data="data" />
                     <j-empty style="margin-top: 20%" v-else />
                 </j-spin>
             </div>