From 402057b1d68c98b35cb34a9370199e93a2372fc6 Mon Sep 17 00:00:00 2001
From: qiaochuLei <124648559+qiaochuLei@users.noreply.github.com>
Date: Wed, 16 Aug 2023 17:22:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B5=84=E4=BA=A7=E5=88=86=E9=85=8D?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 资产分配权限为空问题

* fix: bug#17557、17299
---
 src/views/rule-engine/Alarm/Config/Io/Save/input.vue   | 10 ++++++++++
 .../Department/components/AddDeviceOrProductDialog.vue |  8 ++++----
 src/views/system/Department/components/LeftTree.vue    |  1 -
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/views/rule-engine/Alarm/Config/Io/Save/input.vue b/src/views/rule-engine/Alarm/Config/Io/Save/input.vue
index 7620b032..d72a26f0 100644
--- a/src/views/rule-engine/Alarm/Config/Io/Save/input.vue
+++ b/src/views/rule-engine/Alarm/Config/Io/Save/input.vue
@@ -11,9 +11,14 @@
     >
         <j-form layout="vertical" :model="inputData" ref="formRef">
             <j-form-item
+                v-if="inputData.status"
                 label="kafka地址"
                 name="address"
                 :rules="[
+                    {
+                        required: true,
+                        message: '请输入topic',
+                    },
                     {
                         max: 64,
                         message: '最多输入64个字符',
@@ -26,9 +31,14 @@
                 ></j-input>
             </j-form-item>
             <j-form-item
+                v-if="inputData.status"
                 label="topic"
                 name="topic"
                 :rules="[
+                    {
+                        required: true,
+                        message: '请输入topic',
+                    },
                     {
                         max: 64,
                         message: '最多输入64个字符',
diff --git a/src/views/system/Department/components/AddDeviceOrProductDialog.vue b/src/views/system/Department/components/AddDeviceOrProductDialog.vue
index 7706106b..01e21356 100644
--- a/src/views/system/Department/components/AddDeviceOrProductDialog.vue
+++ b/src/views/system/Department/components/AddDeviceOrProductDialog.vue
@@ -312,8 +312,8 @@ const table: any = {
                     (perResp: any) => {
                         data.forEach((item) => {
                             item.permissionList = perResp.result
-                                .find((f: any) => f.assetId === item.id)
-                                .permissionInfoList?.map((m: any) => ({
+                                .find((f: any) => f?.assetId === item.id)
+                                ?.permissionInfoList?.map((m: any) => ({
                                     label: m.name,
                                     value: m.id,
                                     disabled: true,
@@ -321,13 +321,13 @@ const table: any = {
                             item.selectPermissions = ['read'];
                             // 资产排序
                             item.permissionList = item.permissionList
-                                .map((m: any) => {
+                                ?.map((m: any) => {
                                     return {
                                         ...m,
                                         idx: idxMap[m.value],
                                     };
                                 })
-                                .sort((a: any, b: any) => a.idx - b.idx);
+                                ?.sort((a: any, b: any) => a.idx - b.idx);
                             // 产品的状态进行转换处理
                             if (props.assetType === 'product') {
                                 item.state = {
diff --git a/src/views/system/Department/components/LeftTree.vue b/src/views/system/Department/components/LeftTree.vue
index 372d8957..909d408c 100644
--- a/src/views/system/Department/components/LeftTree.vue
+++ b/src/views/system/Department/components/LeftTree.vue
@@ -165,7 +165,6 @@ const search = debounce(() => {
 
     function dig(_data: any[]): any {
         const pIds: string[] = [];
-        expandedKeys.value = []
         if (!_data.length) return;
         _data.forEach((item) => {
             if (treeMap.has(item)) {