From 4447e11d7c03edc16987fb271715c601fdb2c8c0 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Wed, 29 Mar 2023 23:01:24 +0800
Subject: [PATCH 01/12] =?UTF-8?q?update:=20=E4=BC=98=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.ts                          |  2 +-
 src/views/init-home/data/baseMenu.ts          |  2 +-
 .../Scene/Save/Device/InvokeFunction.vue      |  2 +-
 .../Scene/Save/action/ListItem/CheckItem.vue  |  8 +++--
 .../Save/components/DropdownButton/Menus.vue  |  8 +++--
 .../components/FunctionCall/FunctionCall.vue  | 35 ++++++++++++-------
 yarn.lock                                     |  4 +--
 7 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/utils/request.ts b/src/utils/request.ts
index 1bf7ad8a..2b8d2cb7 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -122,7 +122,7 @@ const showNotification = (message: string, description: string, key?: string, sh
   if (show) {
     Notification.error({
       key,
-      message,
+      message: '',
       description
     })
   }
diff --git a/src/views/init-home/data/baseMenu.ts b/src/views/init-home/data/baseMenu.ts
index d3a1628a..f8635ef7 100644
--- a/src/views/init-home/data/baseMenu.ts
+++ b/src/views/init-home/data/baseMenu.ts
@@ -1688,7 +1688,7 @@ export default [
             ],
             accessSupport: { text: "支持", value: "support" },
             supportDataAccess: true,
-            assetType: 'ataCollectCollector'
+            assetType: 'dataCollectCollector'
           },
         ],
       },
diff --git a/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue b/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue
index 5e2e3cfa..f0246cb2 100644
--- a/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue
+++ b/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue
@@ -114,7 +114,6 @@ const functionData = computed(() => {
 const rules = [{
   validator(_: string, value: any) {
     console.log(value)
-    debugger
     if (!value?.length && functionData.value.length) {
       return Promise.reject('请输入功能值')
     } else {
@@ -137,6 +136,7 @@ const onSelect = (v: string, item: any) => {
 }
 
 const callDataChange = (v: any[]) => {
+  console.log('callDataChange',v)
   emit('update:functionParameters', v)
 }
 
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue b/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue
index 47e1c542..2ea815b5 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue
@@ -35,7 +35,10 @@ const rules = [{
   validator(_: any, v?: ActionsType) {
     console.log('validator',v)
     if (v?.executor === 'device') {
-      if(!v.device?.productId || !v.device?.selectorValues) {
+      if(
+        !v.device?.productId ||  // 产品已删除
+        !v.device?.selectorValues // 设备已删除
+      ) {
         return Promise.reject(new Error('该数据已发生变更，请重新配置'))
       }
     }
@@ -53,12 +56,13 @@ const formTouchOff = () => {
 const checkDeviceDelete = async () => {
   const item = _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].device
   const proResp = await queryProductList({ terms: [{ terms: [{ column: 'id', termType: 'eq', value: item!.productId }]}]})
-  if (proResp.success && (proResp.result as any)?.total === 0) { // 产品已删除
+  if (proResp.success && (proResp.result as any)?.total === 0 && item && item.productId) { // 产品已删除
     _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].device!.productId = undefined
     formTouchOff()
     return
   }
   if (item?.selector === 'fixed') {
+    console.log(item)
     const deviceList = item!.selectorValues?.map(item => item.value) || []
     const deviceResp = await deviceQuery({ terms: [{ terms: [{ column: 'id', termType: 'in', value: deviceList.toString() }]}]})
     if (deviceResp.success && (deviceResp.result as any)?.total < (item!.selectorValues?.length || 0)) { // 某一个设备被删除
diff --git a/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue b/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue
index 8516c14a..c8a0429c 100644
--- a/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue
+++ b/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue
@@ -1,9 +1,11 @@
 <template>
   <j-menu class='scene-dropdown-menus' @click='click' :selectedKeys='[myValue]'>
     <j-menu-item v-for='item in myOptions' :key='item.value' :title='item.label'>
-      <Ellipsis >
-        {{ item.label }}
-      </Ellipsis>
+      <div>
+        <Ellipsis >
+          {{ item.label }}
+        </Ellipsis>
+      </div>
     </j-menu-item>
   </j-menu>
 </template>
diff --git a/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue b/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
index 27249071..accd5e7b 100644
--- a/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
+++ b/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
@@ -8,7 +8,9 @@
   >
     <template #bodyCell="{ column, record, index }">
       <template v-if='column.dataIndex === "name"'>
-        {{ record.name }}
+        <Ellipsis>
+         {{ record.name }}
+        </Ellipsis>
       </template>
       <template v-if='column.dataIndex === "type"'>
         {{ record.type }}
@@ -29,12 +31,14 @@
         </j-tooltip>
       </template>
       <template v-if='column.dataIndex === "value"'>
-        <ValueItem
-          v-model:modelValue='record.value'
-          :itemType="record.type"
-          :options="handleOptions(record)"
-          @change='valueChange'
-        />
+        <div style='max-width: 260px'>
+          <ValueItem
+            v-model:modelValue='record.value'
+            :itemType="record.type"
+            :options="handleOptions(record)"
+            @change='valueChange'
+          />
+        </div>
       </template>
     </template>
   </j-table>
@@ -42,7 +46,6 @@
 
 <script setup lang='ts' name='FunctionCall'>
 import type { PropType } from 'vue'
-import { debounce } from 'lodash-es'
 
 type Emit = {
   (e: 'change', data: Array<{ name: string, value: any}>): void
@@ -69,7 +72,8 @@ const dataSource = reactive<{value: any[]}>({
 const columns = [
   {
     title: '参数名称',
-    dataIndex: 'name'
+    dataIndex: 'name',
+    width: 300
   },
   {
     title: '类型',
@@ -95,11 +99,16 @@ const handleOptions = (record: any) => {
 }
 
 const valueChange = () => {
-  const _value = dataSource.value.map(item => ({
-    name: item.id, value: item.value
-  }))
-  emit('change', _value)
+  console.log('valueChange', dataSource.value)
+  const _value = dataSource.value.map(item => {
+    console.log(item.value)
+    return {
+      name: item.id, value: item.value
+    }
+  })
+  console.log('valueChange2', _value)
   emit('update:value', _value)
+  emit('change', _value)
 }
 
 watch(() => props.data, () => {
diff --git a/yarn.lock b/yarn.lock
index 95dc6559..3eb7199a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3700,8 +3700,8 @@ jetlinks-store@^0.0.3:
 
 jetlinks-ui-components@^1.0.5:
   version "1.0.5"
-  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#a8c912f424b8e6c3e0aa8e2aa9ddcc59fe13cd3a"
-  integrity sha512-zZsVbqG7sLfKsizK+8sT0bCmAz7rEu/qoS5yYSEUzGMvTGQU3Q5W6qdT/5o5v92BYFP+1Kud1l5CNhA3e3NtWQ==
+  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#d5d2b919f89cede8e7236149afdb9ab1e5684e9b"
+  integrity sha512-vWNz2YT1bsfh0xAAnJLEfFcukeX4QE3HyloaJJp3xU9wVbwtS38sdKEQepHZdsDKwzgKWdL03/o/qE3hgBKpwQ==
   dependencies:
     "@vueuse/core" "^9.12.0"
     ant-design-vue "^3.2.15"

From d7790f203f19d95523e18989015c72ae1e3efcfe Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Thu, 30 Mar 2023 10:56:51 +0800
Subject: [PATCH 02/12] =?UTF-8?q?fix:=20bug#11139=E3=80=8111214?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/Department/product/index.vue | 2 +-
 src/views/system/Menu/Detail/BasicInfo.vue    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/system/Department/product/index.vue b/src/views/system/Department/product/index.vue
index 986b7ea6..53ab716a 100644
--- a/src/views/system/Department/product/index.vue
+++ b/src/views/system/Department/product/index.vue
@@ -553,7 +553,7 @@ watch(
 );
 
 watch(
-    () => dialogs.editShow,
+    () => dialogs.addShow,
     (val: boolean) => {
         if (!val) tableData.selectedRows = [];
     },
diff --git a/src/views/system/Menu/Detail/BasicInfo.vue b/src/views/system/Menu/Detail/BasicInfo.vue
index 833f4b88..4d965770 100644
--- a/src/views/system/Menu/Detail/BasicInfo.vue
+++ b/src/views/system/Menu/Detail/BasicInfo.vue
@@ -189,12 +189,13 @@
                             style="width: 500px"
                             placeholder="请选择资产类型"
                             show-search
+                            :options="form.assetsType"
                         >
-                            <j-select-option
+                            <!-- <j-select-option
                                 v-for="item in form.assetsType"
                                 :value="item.value"
                                 >{{ item.label }}</j-select-option
-                            >
+                            > -->
                         </j-select>
                     </j-form-item>
 

From 0675fcff7bcf391525a1ea360c871a43d883ff49 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Thu, 30 Mar 2023 11:22:52 +0800
Subject: [PATCH 03/12] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Instance/Detail/Function/components/Simple.vue  | 13 ++++++++++---
 src/views/device/Instance/index.vue                 |  2 +-
 src/views/edge/Resource/Issue/index.vue             |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/device/Instance/Detail/Function/components/Simple.vue b/src/views/device/Instance/Detail/Function/components/Simple.vue
index fb0f2247..add55c46 100644
--- a/src/views/device/Instance/Detail/Function/components/Simple.vue
+++ b/src/views/device/Instance/Detail/Function/components/Simple.vue
@@ -6,7 +6,7 @@
                 <span>精简模式下参数只支持输入框的方式录入</span>
             </j-space>
         </div>
-        <j-tabs v-model="activeKey" tab-position="left">
+        <j-tabs v-model="activeKey" tab-position="left" @change="onTabChange" :destroyInactiveTabPane="true">
             <j-tab-pane v-for="func in newFunctions" :key="func.id">
                 <template #tab>
                     <Ellipsis style="width: 100px; text-align: left">
@@ -95,7 +95,7 @@
                             :ref="`result${func.id}Ref`"
                             class="execute-result"
                         >
-                            {{ func.executeResult }}
+                            {{ executeResult || '' }}
                         </span>
                     </j-col>
                 </j-row>
@@ -135,6 +135,8 @@ const columns = ref([
     },
 ]);
 
+const executeResult = ref('')
+
 // 设备功能数据处理
 const newFunctions = computed(() => {
     const result: any = [];
@@ -205,7 +207,7 @@ const handleExecute = async (func: any) => {
             );
             if (!success) return;
             message.success('操作成功');
-            func.executeResult = result instanceof Array ? result[0] : result;
+            executeResult.value = result instanceof Array ? result[0] : result;
             proxy?.$forceUpdate();
         })
         .catch((err: any) => {
@@ -216,8 +218,13 @@ const handleExecute = async (func: any) => {
  * 清空
  */
 const handleClear = (func: any) => {
+    executeResult.value = ''
     proxy?.$refs[`${func.id}Ref`][0].resetFields();
 };
+
+const onTabChange = (_key: string) => {
+    executeResult.value = ''
+}
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/device/Instance/index.vue b/src/views/device/Instance/index.vue
index 0d05923a..98ebab07 100644
--- a/src/views/device/Instance/index.vue
+++ b/src/views/device/Instance/index.vue
@@ -220,7 +220,7 @@
             </template>
             <template #createTime="slotProps">
                 <span>{{
-                    dayjs(slotProps.createTime).format('YYYY-MM-DD HH:mm:ss')
+                    slotProps?.createTime ? dayjs(slotProps.createTime).format('YYYY-MM-DD HH:mm:ss') : ''
                 }}</span>
             </template>
             <template #action="slotProps">
diff --git a/src/views/edge/Resource/Issue/index.vue b/src/views/edge/Resource/Issue/index.vue
index c7ac1de2..e6c0059f 100644
--- a/src/views/edge/Resource/Issue/index.vue
+++ b/src/views/edge/Resource/Issue/index.vue
@@ -47,7 +47,7 @@
             </template>
             <template #registerTime="slotProps">
                 <span>{{
-                    dayjs(slotProps.registerTime).format('YYYY-MM-DD HH:mm:ss')
+                    slotProps?.registerTime ? dayjs(slotProps.registerTime).format('YYYY-MM-DD HH:mm:ss') : ''
                 }}</span>
             </template>
         </JProTable>

From ceec8a65e330fbaff223d0d89f37e3506d014b43 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Thu, 30 Mar 2023 11:27:09 +0800
Subject: [PATCH 04/12] fix: bug#10954

---
 src/api/system/apply.ts            |  2 +-
 src/views/account/Center/index.vue |  2 +-
 src/views/iframe/index.vue         | 49 ++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 src/views/iframe/index.vue

diff --git a/src/api/system/apply.ts b/src/api/system/apply.ts
index 329bef1e..374a997b 100644
--- a/src/api/system/apply.ts
+++ b/src/api/system/apply.ts
@@ -13,7 +13,7 @@ export const delApply_api = (id: string) => server.remove(`/application/${id}`)
 // 获取组织列表
 export const getDepartmentList_api = (params: any) => server.get(`/organization/_all/tree`, params);
 // 获取应用详情
-export const getAppInfo_api = (id: string) => server.get(`/application/${id}`);
+export const getAppInfo_api = (id: string) => server.get<any>(`/application/${id}`);
 // 新增应用
 export const addApp_api = (data: object) => server.post(`/application`, data);
 // 更新应用
diff --git a/src/views/account/Center/index.vue b/src/views/account/Center/index.vue
index dc63f735..ffb6eaa0 100644
--- a/src/views/account/Center/index.vue
+++ b/src/views/account/Center/index.vue
@@ -265,7 +265,7 @@ const unBind = (id: string) => {
 };
 const clickBind = (id: string) => {
     window.open(
-        `${location.host}${BASE_API_PATH}/application/sso/${id}/login?autoCreateUser=false`,
+        `${BASE_API_PATH}/application/sso/${id}/login?autoCreateUser=false`,
     );
     localStorage.setItem('onBind', 'false');
     localStorage.setItem('onLogin', 'yes');
diff --git a/src/views/iframe/index.vue b/src/views/iframe/index.vue
new file mode 100644
index 00000000..e70e948e
--- /dev/null
+++ b/src/views/iframe/index.vue
@@ -0,0 +1,49 @@
+<template>
+    <page-container>
+        <iframe
+            :src="iframeUrl"
+            frameBorder="0"
+            style="width: 100%; height: calc(100vh - 140px)"
+        ></iframe>
+    </page-container>
+</template>
+
+<script setup lang="ts">
+import { TOKEN_KEY } from '@/utils/variable';
+import { LocalStore } from '@/utils/comm';
+import { getAppInfo_api } from '@/api/system/apply';
+
+const iframeUrl = ref<string>('');
+
+const handle = async (appId: string, url: string) => {
+    const res = await getAppInfo_api(appId);
+    let menuUrl: any = url;
+    if (res.status === 200) {
+        // console.log(res.result);
+        if (res.result.page.routeType === 'hash') {
+            menuUrl = `${url}`;
+        }
+        if (res.result.provider === 'internal-standalone') {
+            //{baseUrl}/api/application/sso/{appId}/login?redirect={menuUrl}
+            const urlStandalone = `${res.result.page.baseUrl}/api/application/sso/${appId}/login?redirect=${menuUrl}?layout=false`;
+            iframeUrl.value = urlStandalone;
+            // console.log(urlStandalone);
+        } else if (res.result.provider === 'internal-integrated') {
+            const tokenUrl = `${
+                res.result.page.baseUrl
+            }?X-Access-Token=${LocalStore.get(TOKEN_KEY)}`;
+            iframeUrl.value = tokenUrl;
+        } else {
+            const urlOther = `${res.result.page.baseUrl}/${menuUrl}`;
+            iframeUrl.value = urlOther;
+        }
+    }
+};
+
+watchEffect(() => {
+    const params = location.pathname.split('/')?.[1];
+    const url = location.pathname.split('/').slice(2).join('/');
+    // console.log(params, url);
+    handle(params, url);
+});
+</script>

From 18d950d63fc1cad34ef9c52d261e6f5161aadc32 Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Thu, 30 Mar 2023 11:32:15 +0800
Subject: [PATCH 05/12] fix: bug#10777 11128 11212

---
 src/views/init-home/data/baseMenu.ts                  | 11 +----------
 .../system/Role/Detail/components/PermissTree.vue     | 11 ++++++-----
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/views/init-home/data/baseMenu.ts b/src/views/init-home/data/baseMenu.ts
index f8635ef7..0bbfc653 100644
--- a/src/views/init-home/data/baseMenu.ts
+++ b/src/views/init-home/data/baseMenu.ts
@@ -1366,16 +1366,7 @@ export default [
                   },
                 ],
               },
-              {
-                id: 'action',
-                name: '启/禁用',
-                permissions: [
-                  {
-                    permission: 'firmware-upgrade-task-manager',
-                    actions: ['save'],
-                  }
-                ],
-              },
+        
             ],
             accessSupport: { text: "间接支持", value: "indirect" },
             supportDataAccess: false,
diff --git a/src/views/system/Role/Detail/components/PermissTree.vue b/src/views/system/Role/Detail/components/PermissTree.vue
index c2eb811b..bf25cf37 100644
--- a/src/views/system/Role/Detail/components/PermissTree.vue
+++ b/src/views/system/Role/Detail/components/PermissTree.vue
@@ -6,6 +6,7 @@
             :pagination="false"
             :rowKey="'id'"
             :scroll="{ y: '500px' }"
+            ref="treeRef"
         >
             <!-- 表头 -->
             <template #headerCell="{ column }">
@@ -99,13 +100,14 @@
 <script setup lang="ts">
 import { cloneDeep } from 'lodash-es';
 import { getPrimissTree_api } from '@/api/system/role';
-
+import { getCurrentInstance } from 'vue';
 const emits = defineEmits(['update:selectItems']);
 const route = useRoute();
 const props = defineProps({
     selectItems: Array,
 });
-
+const treeRef = ref();
+let { ctx: that, proxy } = getCurrentInstance();
 const columns = [
     {
         title: '菜单权限',
@@ -282,7 +284,6 @@ function menuChange(
     row: tableItemType,
     setButtonBool: boolean = true,
 ): undefined {
-    console.log(row, 'test');
     // 判断是否需要对子菜单及操作权限进行选择
     if (setButtonBool) {
         if (row.buttons && row.buttons.length > 0)
@@ -311,7 +312,7 @@ function menuChange(
         const parent = flatTableData.find(
             (item) => item.id === row.parentId,
         ) as tableItemType;
-        setStatus(parent, 'children');
+        // setStatus(parent, 'children');
         // 若该父节点不是根节点  重复此操作以此来确定该父节点的父节点状态
         if (parent.parentId) {
             return menuChange(parent, false);
@@ -334,6 +335,7 @@ function menuChange(
         indeterminate.value = false;
     }
     emits('update:selectItems', selectList); // 选中的项传回父组件
+    treeRef.value.$forceUpdate();
 }
 
 /**
@@ -430,7 +432,6 @@ function setStatus(
     prop: 'children' | 'buttons' = 'children',
 ) {
     const childrens = target[prop] as any[];
-
     if (childrens && childrens instanceof Array) {
         // 如果子选项有半全选，则当前节点直接为半全选
         const indeterminateLen = childrens.filter(

From 92315c3c3943ab813f250a986617ff9f10cf9ba5 Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Thu, 30 Mar 2023 11:45:09 +0800
Subject: [PATCH 06/12] fix: bug#10777

---
 src/views/system/Role/Detail/components/PermissTree.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/Role/Detail/components/PermissTree.vue b/src/views/system/Role/Detail/components/PermissTree.vue
index bf25cf37..72fc7a80 100644
--- a/src/views/system/Role/Detail/components/PermissTree.vue
+++ b/src/views/system/Role/Detail/components/PermissTree.vue
@@ -312,7 +312,7 @@ function menuChange(
         const parent = flatTableData.find(
             (item) => item.id === row.parentId,
         ) as tableItemType;
-        // setStatus(parent, 'children');
+        setStatus(parent, 'children');
         // 若该父节点不是根节点  重复此操作以此来确定该父节点的父节点状态
         if (parent.parentId) {
             return menuChange(parent, false);

From c6ec16350ede7b8c922a635bd18015864bc49f9e Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Thu, 30 Mar 2023 11:50:32 +0800
Subject: [PATCH 07/12] fix: bug#11221

---
 .../system/Apply/Save/components/EditForm.vue    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/system/Apply/Save/components/EditForm.vue b/src/views/system/Apply/Save/components/EditForm.vue
index a39fe6ff..a2de009f 100644
--- a/src/views/system/Apply/Save/components/EditForm.vue
+++ b/src/views/system/Apply/Save/components/EditForm.vue
@@ -1718,20 +1718,20 @@ function getInfo(id: string) {
     getAppInfo_api(id).then((resp: any) => {
         // 后端返回的headers和parameters中, key转为label
         if (resp.result.apiClient) {
-            resp.result.apiClient.headers = resp.result.apiClient.headers.map(
+            resp.result.apiClient.headers = resp.result.apiClient.headers?.map(
                 (m: any) => ({
                     ...m,
                     label: m.key,
                 }),
             );
             resp.result.apiClient.parameters =
-                resp.result.apiClient.parameters.map((m: any) => ({
+                resp.result.apiClient.parameters?.map((m: any) => ({
                     ...m,
                     label: m.key,
                 }));
         }
         if (resp.result.page) {
-            resp.result.page.parameters = resp.result.page.parameters.map(
+            resp.result.page.parameters = resp.result.page.parameters?.map(
                 (m: any) => ({
                     ...m,
                     label: m.key,
@@ -1741,7 +1741,7 @@ function getInfo(id: string) {
         form.data = {
             ...initForm, // 查询详情, 赋值初始字段. 解决编辑改变接入方式报错的问题: bug#10892
             ...resp.result,
-            integrationModes: resp.result.integrationModes.map(
+            integrationModes: resp.result.integrationModes?.map(
                 (item: any) => item.value,
             ),
         } as formType;
@@ -1753,7 +1753,7 @@ function getRoleIdList() {
     getRoleList_api().then((resp) => {
         if (resp.status === 200) {
             const result = resp.result as dictType;
-            form.roleIdList = result.map((item) => ({
+            form.roleIdList = result?.map((item) => ({
                 label: item.name,
                 value: item.id,
             }));
@@ -1821,13 +1821,13 @@ function clickSave() {
 
         // headers和params参数label需改为key传给后端
         if (params.integrationModes.includes('apiClient')) {
-            params.apiClient.headers = params.apiClient.headers.map(
+            params.apiClient.headers = params.apiClient.headers?.map(
                 (m: any) => ({
                     ...m,
                     key: m.label,
                 }),
             );
-            params.apiClient.parameters = params.apiClient.parameters.map(
+            params.apiClient.parameters = params.apiClient.parameters?.map(
                 (m: any) => ({
                     ...m,
                     key: m.label,
@@ -1835,7 +1835,7 @@ function clickSave() {
             );
         }
         if (params.integrationModes.includes('page')) {
-            params.page.parameters = params.page.parameters.map((m: any) => ({
+            params.page.parameters = params.page.parameters?.map((m: any) => ({
                 ...m,
                 key: m.label,
             }));

From e3c98846068f73391eb9ea509509e70fc58cc602 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 30 Mar 2023 09:08:21 +0800
Subject: [PATCH 08/12] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=E8=A7=84=E5=88=99-=E5=8A=9F=E8=83=BD=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E9=AA=8C=E8=AF=81=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ValueItem/index.vue                     | 10 +++++-----
 .../Save/components/FunctionCall/FunctionCall.vue      |  3 ---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/components/ValueItem/index.vue b/src/components/ValueItem/index.vue
index 09d33c26..769951c6 100644
--- a/src/components/ValueItem/index.vue
+++ b/src/components/ValueItem/index.vue
@@ -176,8 +176,8 @@ const objectValue = ref<string>('');
 const handleItemModalSubmit = () => {
     myValue.value = objectValue.value.replace(/[\r\n]\s*/g, '');
     modalVis.value = false;
+    emit('update:modelValue', objectValue.value);
     emit('change', objectValue.value)
-    emit('update:modelValue', myValue.value);
 };
 
 // 文件上传
@@ -192,23 +192,23 @@ const handleFileChange = (info: UploadChangeParam<UploadFile<any>>) => {
 };
 
 const selectChange = (e: string, option: any) => {
-  emit('change', e, option)
   emit('update:modelValue', myValue.value);
+  emit('change', e, option)
 }
 
 const timeChange = (e: any) => {
-  emit('change', e)
   emit('update:modelValue', myValue.value);
+  emit('change', e)
 }
 
 const inputChange = (e: any) => {
-  emit('change', e && e.target ? e.target.value : e)
   emit('update:modelValue', myValue.value);
+  emit('change', e && e.target ? e.target.value : e)
 }
 
 const dateChange = (e: any) => {
-  emit('change', e)
   emit('update:modelValue', myValue.value);
+  emit('change', e)
 }
 
 myValue.value = props.modelValue
diff --git a/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue b/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
index accd5e7b..5436ca4e 100644
--- a/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
+++ b/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
@@ -99,14 +99,11 @@ const handleOptions = (record: any) => {
 }
 
 const valueChange = () => {
-  console.log('valueChange', dataSource.value)
   const _value = dataSource.value.map(item => {
-    console.log(item.value)
     return {
       name: item.id, value: item.value
     }
   })
-  console.log('valueChange2', _value)
   emit('update:value', _value)
   emit('change', _value)
 }

From a3cb28ed5be54fab868370c84db6b6e321d3bf3d Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 30 Mar 2023 09:25:06 +0800
Subject: [PATCH 09/12] fix: bug#11192

---
 src/views/rule-engine/Scene/Save/components/Timer/util.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/rule-engine/Scene/Save/components/Timer/util.ts b/src/views/rule-engine/Scene/Save/components/Timer/util.ts
index c919aa48..23ad9b50 100644
--- a/src/views/rule-engine/Scene/Save/components/Timer/util.ts
+++ b/src/views/rule-engine/Scene/Save/components/Timer/util.ts
@@ -73,7 +73,7 @@ export const handleTimerOptions = (timer: OperationTimer):TimerOption => {
     const whenStrArr = continuousValue(timer.when! || [], timer!.trigger);
     const whenStrArr3 = whenStrArr.splice(0, 3);
     when += whenStrArr3.join('、');
-    when += `等${timer.when!.length}天`;
+    when += `...等${timer.when!.length}天`;
   }
 
   if (timer.once) {

From d3ea02c0f6661768b6b0886cd5aad4d3a6086f96 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 30 Mar 2023 11:08:26 +0800
Subject: [PATCH 10/12] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E7=AE=A1=E7=90=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/Department/components/LeftTree.vue | 117 ++++++++++--------
 src/views/system/Department/index.vue         |  72 ++++++-----
 src/views/system/Department/user/index.vue    |   1 +
 3 files changed, 105 insertions(+), 85 deletions(-)

diff --git a/src/views/system/Department/components/LeftTree.vue b/src/views/system/Department/components/LeftTree.vue
index b5565e0f..e2972961 100644
--- a/src/views/system/Department/components/LeftTree.vue
+++ b/src/views/system/Department/components/LeftTree.vue
@@ -23,58 +23,59 @@
         </div>
 
         <div class="tree">
-            <jTree
-                v-if="treeData.length > 0"
-                :tree-data="treeData"
-                v-model:selected-keys="selectedKeys"
-                v-model:expandedKeys="expandedKeys"
-                :fieldNames="{ key: 'id' }"
-            >
-                <template #title="{ name, data }">
-                    <span>{{ name }}</span>
-                    <span class="func-btns" @click="(e) => e.stopPropagation()">
-                        <PermissionButton
-                            :hasPermission="`${permission}:update`"
-                            type="link"
-                            :tooltip="{
-                                title: '编辑',
-                            }"
-                            @click="openDialog(data)"
-                        >
-                            <AIcon type="EditOutlined" />
-                        </PermissionButton>
-                        <PermissionButton
-                            :hasPermission="`${permission}:add`"
-                            type="link"
-                            :tooltip="{
-                                title: '新增子组织',
-                            }"
-                            @click="
-                                openDialog({
-                                    ...data,
-                                    id: '',
-                                    parentId: data.id,
-                                })
-                            "
-                        >
-                            <AIcon type="PlusCircleOutlined" />
-                        </PermissionButton>
-                        <PermissionButton
-                            type="link"
-                            :hasPermission="`${permission}:delete`"
-                            :tooltip="{ title: '删除' }"
-                            :popConfirm="{
-                                title: `确定要删除吗`,
-                                onConfirm: () => delDepartment(data.id),
-                            }"
-                        >
-                            <AIcon type="DeleteOutlined" />
-                        </PermissionButton>
-                    </span>
-                </template>
-            </jTree>
-            <div class="loading" v-else-if="loading"><j-spin /></div>
-            <j-empty v-else description="暂无数据" />
+          <j-spin :spinning='loading'>
+              <jTree
+                  v-if="treeData.length > 0"
+                  :tree-data="treeData"
+                  v-model:selected-keys="selectedKeys"
+                  v-model:expandedKeys="expandedKeys"
+                  :fieldNames="{ key: 'id' }"
+              >
+                  <template #title="{ name, data }">
+                      <span>{{ name }}</span>
+                      <span class="func-btns" @click="(e) => e.stopPropagation()">
+                          <PermissionButton
+                              :hasPermission="`${permission}:update`"
+                              type="link"
+                              :tooltip="{
+                                  title: '编辑',
+                              }"
+                              @click="openDialog(data)"
+                          >
+                              <AIcon type="EditOutlined" />
+                          </PermissionButton>
+                          <PermissionButton
+                              :hasPermission="`${permission}:add`"
+                              type="link"
+                              :tooltip="{
+                                  title: '新增子组织',
+                              }"
+                              @click="
+                                  openDialog({
+                                      ...data,
+                                      id: '',
+                                      parentId: data.id,
+                                  })
+                              "
+                          >
+                              <AIcon type="PlusCircleOutlined" />
+                          </PermissionButton>
+                          <PermissionButton
+                              type="link"
+                              :hasPermission="`${permission}:delete`"
+                              :tooltip="{ title: '删除' }"
+                              :popConfirm="{
+                                  title: `确定要删除吗`,
+                                  onConfirm: () => delDepartment(data.id),
+                              }"
+                          >
+                              <AIcon type="DeleteOutlined" />
+                          </PermissionButton>
+                      </span>
+                  </template>
+              </jTree>
+              <j-empty v-else description="暂无数据" />
+          </j-spin>
         </div>
         <!-- 编辑弹窗 -->
         <EditDepartmentDialog
@@ -227,6 +228,9 @@ function init() {
 .left-tree-container {
     padding-right: 24px;
     border-right: 1px solid #f0f0f0;
+    display: flex;
+    height: 100%;
+    flex-direction: column;
 
     .add-btn {
         margin: 24px 0;
@@ -262,10 +266,17 @@ function init() {
         }
     }
 
-    .loading {
+
+    .tree {
+      overflow-y: auto;
+      overflow-x: hidden;
+
+      .loading {
         display: flex;
+        width: 100%;
         justify-content: center;
         margin-top: 20px;
+      }
     }
 }
 </style>
diff --git a/src/views/system/Department/index.vue b/src/views/system/Department/index.vue
index 3ebef3e7..7f40433e 100644
--- a/src/views/system/Department/index.vue
+++ b/src/views/system/Department/index.vue
@@ -1,28 +1,30 @@
 <template>
     <page-container>
-        <div class="department-container">
+        <div class="department-warp">
+          <div class='department-container'>
             <div class="left">
-                <LeftTree @change="(id) => (departmentId = id)" />
+              <LeftTree @change="(id) => (departmentId = id)" />
             </div>
             <div class="right">
-                <j-tabs v-model:activeKey="activeKey" destroyInactiveTabPane>
-                    <j-tab-pane key="product" tab="产品">
-                        <Product
-                            :parentId="departmentId"
-                            @open-device-bind="openDeviceBind"
-                        />
-                    </j-tab-pane>
-                    <j-tab-pane key="device" tab="设备">
-                        <Device
-                            :parentId="departmentId"
-                            v-model:bindBool="bindBool"
-                        />
-                    </j-tab-pane>
-                    <j-tab-pane key="user" tab="用户">
-                        <User :parentId="departmentId" />
-                    </j-tab-pane>
-                </j-tabs>
+              <j-tabs v-model:activeKey="activeKey" destroyInactiveTabPane>
+                <j-tab-pane key="product" tab="产品">
+                  <Product
+                    :parentId="departmentId"
+                    @open-device-bind="openDeviceBind"
+                  />
+                </j-tab-pane>
+                <j-tab-pane key="device" tab="设备">
+                  <Device
+                    :parentId="departmentId"
+                    v-model:bindBool="bindBool"
+                  />
+                </j-tab-pane>
+                <j-tab-pane key="user" tab="用户">
+                  <User :parentId="departmentId" />
+                </j-tab-pane>
+              </j-tabs>
             </div>
+          </div>
         </div>
     </page-container>
 </template>
@@ -45,19 +47,25 @@ const openDeviceBind = () => {
 </script>
 
 <style lang="less" scoped>
-.department-container {
-    display: flex;
-    background-color: #fff;
-    padding: 24px;
+.department-warp {
+  background-color: #fff;
+  padding: 24px;
+  .department-container {
+      position: relative;
 
-    .left {
-        flex-basis: 300px;
-    }
-    .right {
-        width: calc(100% - 300px);
-        :deep(.ant-tabs-nav-wrap) {
-            padding-left: 24px;
-        }
-    }
+      .left {
+          position: absolute;
+          height: 100%;
+          width: 300px;
+      }
+
+      .right {
+          width: calc(100% - 316px);
+          margin-left: 316px;
+          :deep(.ant-tabs-nav-wrap) {
+              padding-left: 24px;
+          }
+      }
+  }
 }
 </style>
diff --git a/src/views/system/Department/user/index.vue b/src/views/system/Department/user/index.vue
index a6e459c1..cb79dd88 100644
--- a/src/views/system/Department/user/index.vue
+++ b/src/views/system/Department/user/index.vue
@@ -155,6 +155,7 @@ const handleParams = (params: any) => {
 
 // 表格
 const tableRef = ref<Record<string, any>>({}); // 表格实例
+
 const table = reactive({
     _selectedRowKeys: [] as string[],
 

From 9b7b78fe3334c6da2080cf80040a03aa61654b1c Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 30 Mar 2023 11:11:41 +0800
Subject: [PATCH 11/12] fix: bug#11191

---
 .../rule-engine/Scene/Save/components/Timer/index.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/views/rule-engine/Scene/Save/components/Timer/index.vue b/src/views/rule-engine/Scene/Save/components/Timer/index.vue
index c0930d3e..7531a609 100644
--- a/src/views/rule-engine/Scene/Save/components/Timer/index.vue
+++ b/src/views/rule-engine/Scene/Save/components/Timer/index.vue
@@ -215,9 +215,20 @@ defineExpose({
     resolve(data)
   })
 })
+
 Object.assign(formModel, props.value)
 formModel.when = props.value.when || []
 
+watchEffect(() => {
+  if(props.value?.period.unit === 'hours') {
+    unitMax.
+      value = 99999
+  } else {
+    unitMax.value = 99
+  }
+})
+
+
 </script>
 
 <style scoped lang='less'>

From 947f34bed59eb119005465ae40ab380aa68f2ac3 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 30 Mar 2023 13:37:31 +0800
Subject: [PATCH 12/12] fix: bug#11218

---
 .../Scene/Save/action/Device/actions/FunctionItem.vue         | 3 +++
 .../Scene/Save/action/Device/actions/WriteProperty.vue        | 3 +++
 .../Scene/Save/components/DropdownButton/Menus.vue            | 4 ++--
 .../Scene/Save/components/ParamsDropdown/index.vue            | 1 +
 .../rule-engine/Scene/Save/components/Terms/ParamsItem.vue    | 4 ++--
 vite.config.ts                                                | 4 ++--
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue
index c4b54f15..86516c7d 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue
@@ -65,10 +65,12 @@ const handleOptions = computed(() => {
             {
                 label: _item.trueText || true,
                 value: _item.trueValue || true,
+                id: _item.trueValue || true,
             },
             {
                 label: _item.falseText || false,
                 value: _item.falseValue || false,
+                id: _item.falseValue || false,
             },
         ];
     }
@@ -77,6 +79,7 @@ const handleOptions = computed(() => {
             return {
                 label: i.text,
                 value: i.value,
+                id: i.value,
             };
         });
     }
diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue
index e47a0b77..66e79d5f 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue
@@ -136,10 +136,12 @@ const handleOptions = computed(() => {
             {
                 label: _item.trueText || true,
                 value: _item.trueValue || true,
+                id: _item.trueValue || true,
             },
             {
                 label: _item.falseText || false,
                 value: _item.falseValue || false,
+                id: _item.falseValue || false,
             },
         ];
     }
@@ -148,6 +150,7 @@ const handleOptions = computed(() => {
             return {
                 label: i.text,
                 value: i.value,
+                id: i.value,
             };
         });
     }
diff --git a/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue b/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue
index c8a0429c..caf8b729 100644
--- a/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue
+++ b/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue
@@ -62,7 +62,7 @@ const handleBoolean = (key: string) => {
 const click = (e: any) => {
   const _key = ['true', 'false'].includes(e.key) ? handleBoolean(e.key) : e.key
   const option = getOption(myOptions.value, _key, props.valueName)
-  myValue.value = _key
+  myValue.value = e.key
   emit('update:value', _key)
   emit('click', _key, {
     key: _key,
@@ -71,7 +71,7 @@ const click = (e: any) => {
 }
 
 watch(() => props.value, () => {
-  myValue.value = props.value
+  myValue.value = isBoolean(props.value) ? String(props.value) : props.value
 }, { immediate: true})
 </script>
 
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 69b522a8..34042720 100644
--- a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
+++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
@@ -162,6 +162,7 @@ watchEffect(() => {
   const option = getOption(_options, props.value as string, props.valueName) // 回显label值
   myValue.value = props.value
   mySource.value = props.source
+  console.log(option, _options, props.valueName)
   if (option) {
     label.value = option[props.labelName] || option.name
     treeOpenKeys.value = openKeysByTree(_options, props.value, props.valueName)
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
index 5d6663fb..d88a5072 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
+++ b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
@@ -177,8 +177,8 @@ const handOptionByColumn = (option: any) => {
 
     if (option.dataType === 'boolean') {
       valueOptions.value = option.options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || [
-        { label: '是', value: true },
-        { label: '否', value: false },
+        { label: '是', value: true, id: true },
+        { label: '否', value: false, id: false },
       ]
     } else if(option.dataType === 'enum') {
       valueOptions.value = option.options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || []
diff --git a/vite.config.ts b/vite.config.ts
index 1b248650..a55d7960 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -92,8 +92,8 @@ export default defineConfig(({ mode}) => {
               [env.VITE_APP_BASE_API]: {
                   // target: 'http://192.168.33.22:8800',
                   // target: 'http://192.168.32.244:8881',
-                  target: 'http://120.77.179.54:8844', // 120测试
-                  // target: 'http://192.168.33.46:8844', // 本地开发环境
+                  // target: 'http://120.77.179.54:8844', // 120测试
+                  target: 'http://192.168.33.46:8844', // 本地开发环境
                   ws: 'ws://192.168.33.46:8844',
                   changeOrigin: true,
                   rewrite: (path) => path.replace(/^\/api/, '')