Merge branch 'feat/device-organizationId' into 'main_dev'

产品新增网关子时修改选择网关和组织的逻辑

See merge request yunteng/thingskit-front!1013

@@ -41,7 +41,7 @@ VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME = 500000
 VITE_GLOB_ALARM_NOTIFY_DURATION = 5
 
 # Should Disabled Task Center Execute Interval Unit (Second)
-VITE_GLOB_DISABLED_TASK_CENTER_EXECUTE_INTERVAL_UNIT_SECOND = true
+VITE_GLOB_DISABLED_TASK_CENTER_EXECUTE_INTERVAL_UNIT_SECOND = false
 
 # Software version number
 VITE_GLOB_SOFTWARE_VERSION_NUMBER = ThingsKit v1.2.0_release

-版本：v1.1.2_release
+版本：v1.2.0_release
 
 ## 准备
 

@@ -37,10 +37,11 @@ export interface AccountListItem {
 }
 
 export interface OrganizationListItem {
-  id: string;
-  name: string;
+  id?: string;
+  name?: string;
   parentId?: string;
-  remark: string;
+  remark?: string;
+  organizationId?: string;
 }
 
 export interface MenuListItem {

@@ -16,6 +16,9 @@ import { FileItem } from '/@/components/Form/src/components/ApiUpload.vue';
 import { createImgPreview } from '/@/components/Preview';
 import { uploadThumbnail } from '/@/api/configuration/center/configurationCenter';
 
+import { getOrganizationList } from '/@/api/system/system';
+import { copyTransFun } from '/@/utils/fnUtils';
+
 useComponentRegister('JSONEditor', JSONEditor);
 useComponentRegister('ObjectModelValidateForm', ObjectModelValidateForm);
 
@@ -263,22 +266,15 @@ export const step1Schemas: FormSchema[] = [
     ifShow: ({ values }) => isGateWay(values.deviceType),
   },
   {
-    field: 'organizationId',
-    label: '所属组织',
-    component: 'Input',
-    required: true,
-    slot: 'addOrg',
-  },
-  {
     field: 'gatewayId',
     label: '网关设备',
     required: true,
     component: 'ApiSelect',
-    ifShow: ({ values }) => values.deviceType === 'SENSOR' && values.organizationId,
+    ifShow: ({ values }) => values.deviceType === 'SENSOR',
     componentProps: ({ formModel, formActionType }) => {
-      const { organizationId, transportType } = formModel;
+      const { transportType } = formModel;
       const { validateFields } = formActionType;
-      if (![organizationId, transportType].every(Boolean)) return {};
+      if (!transportType) return {};
       return {
         api: async (params: Recordable) => {
           try {
@@ -291,19 +287,36 @@ export const step1Schemas: FormSchema[] = [
         },
         showSearch: true,
         params: {
-          organizationId,
           transportType,
         },
         valueField: 'tbDeviceId',
         labelField: 'alias',
-        onChange: async () => {
+        onChange: async (value, options) => {
           await nextTick();
+          if (value) {
+            const data = await getOrganizationList({ organizationId: options?.organizationId });
+            copyTransFun(data as any as any[]);
+            formModel.organizationList = data;
+          }
           validateFields(['gatewayId']);
         },
       };
     },
   },
   {
+    field: 'organizationList',
+    label: '依据网关设备请求的组织数组',
+    component: 'Input',
+    ifShow: false,
+  },
+  {
+    field: 'organizationId',
+    label: '所属组织',
+    component: 'Input',
+    required: true,
+    slot: 'addOrg',
+  },
+  {
     field: 'label',
     label: '设备标签',
     component: 'Input',

@@ -14,7 +14,7 @@
                 placeholder="请选择组织"
                 allow-clear
                 tree-default-expand-all
-                :tree-data="treeData"
+                :tree-data="model?.['organizationList'] || treeData"
               />
             </div>
             <div>
@@ -448,10 +448,10 @@
       }
 
       const handleTreeOrg = () => {
-        const clearGatewayId = {
-          gatewayId: '',
-        };
-        setFieldsValue(clearGatewayId);
+        // const clearGatewayId = {
+        //   gatewayId: '',
+        // };
+        // setFieldsValue(clearGatewayId);
       };
 
       return {