Merge branch 'main_dev' into 'main'

fix: 修复更改设备类型为网关子设备时关联网关设备组织关系

See merge request yunteng/thingskit-front!1121

@@ -49,6 +49,7 @@ enum DeviceUrl {
   GET_DEVICE_ATTRIBUTE = '/device/attributes',
   GET_DEVICE = '/device/list',
   GET_DEVICE_RELATION = '/device/device/relation',
+  GET_GATEWAY_LIST = '/device/gateway/list',
 }
 
 /**
@@ -240,6 +241,15 @@ export const sendCommandTwoway = (params: SendCommandParams) => {
   );
 };
 
+export const getMeetTheConditionsGatewayDevice = (
+  params?: Partial<Record<'organizationId' | 'transportType', string>>
+) => {
+  return defHttp.get<DeviceRecord[]>({
+    url: DeviceUrl.GET_GATEWAY_LIST,
+    params,
+  });
+};
+
 export const getDeviceRelation = (params: { deviceId: string; isSlave: boolean }) => {
   return defHttp.get<string>({
     url: DeviceUrl.GET_DEVICE_RELATION,

@@ -186,6 +186,7 @@ export interface DeviceRecord {
   alias?: string;
   brand?: string;
   deviceProfileId: string;
+  organizationId: string;
   deviceProfile: {
     default: boolean;
     name: string;

@@ -2,7 +2,7 @@
   import { ApiTreeSelect } from '/@/components/Form';
   import { Button } from 'ant-design-vue';
   import { getOrganizationList } from '/@/api/system/system';
-  import { computed, ref, unref } from 'vue';
+  import { computed, ref, unref, watch } from 'vue';
   import OrganizationDrawer from '/@/views/system/organization/OrganizationDrawer.vue';
   import { useDrawer } from '/@/components/Drawer';
   import { OrganizationListItem } from '/@/api/system/model/systemModel';
@@ -79,6 +79,11 @@
     needReload.value = true;
     timespan.value = Date.now();
   };
+
+  watch(
+    () => props.apiTreeSelectProps,
+    () => handleReload()
+  );
 </script>
 
 <template>

@@ -4,10 +4,10 @@ import { getGatewayDevice, queryDeviceProfileBy } from '/@/api/device/deviceMana
 import { TransportTypeEnum } from '../../profiles/components/TransportDescript/const';
 import { JSONEditorValidator } from '/@/components/CodeEditor/src/JSONEditor';
 import { JSONEditor } from '/@/components/CodeEditor';
-import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
+import { DeviceRecord, DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { getModelServices } from '/@/api/device/modelOfMatter';
 import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
-import { h, nextTick, toRaw, unref } from 'vue';
+import { h, toRaw, unref } from 'vue';
 import ObjectModelValidateForm from '/@/components/Form/src/externalCompns/components/ObjectModelValidateForm/ObjectModelValidateForm.vue';
 import { CommandDeliveryWayEnum, ServiceCallTypeEnum } from '/@/enums/toolEnum';
 import { TaskTypeEnum } from '/@/views/task/center/config';
@@ -15,9 +15,6 @@ import { AddressTypeEnum } from '/@/views/task/center/components/PollCommandInpu
 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';
 import LockControlGroup from '/@/components/Form/src/components/LockControlGroup.vue';
 import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
 
@@ -305,7 +302,7 @@ export const step1Schemas: FormSchema[] = [
     ifShow: ({ values }) => values.deviceType === 'SENSOR',
     componentProps: ({ formModel, formActionType }) => {
       const { transportType } = formModel;
-      const { validateFields } = formActionType;
+      const { setFieldsValue } = formActionType;
       if (!transportType) return {};
       return {
         api: async (params: Recordable) => {
@@ -320,22 +317,23 @@ export const step1Schemas: FormSchema[] = [
         params: {
           transportType,
         },
+        placeholder: '请选择网关设备',
         valueField: 'tbDeviceId',
         labelField: 'alias',
-        onChange: async (value, options) => {
-          await nextTick();
-          if (value) {
-            const data = await getOrganizationList({ organizationId: options?.organizationId });
-            copyTransFun(data as any as any[]);
-            formModel.organizationList = data;
+        onChange: async (_value: string, option: DeviceRecord) => {
+          setFieldsValue({ sensorOrganizationId: option?.organizationId, organizationId: null });
+        },
+        onOptionsChange(options: (DeviceRecord & Record<'value', string>)[]) {
+          if (formModel?.deviceType === DeviceTypeEnum.SENSOR && formModel?.gatewayId) {
+            const result = options.find((item) => item.value === formModel?.gatewayId);
+            result && setFieldsValue({ sensorOrganizationId: result?.organizationId });
           }
-          validateFields(['gatewayId']);
         },
       };
     },
   },
   {
-    field: 'organizationList',
+    field: 'sensorOrganizationId',
     label: '依据网关设备请求的组织数组',
     component: 'Input',
     ifShow: false,
@@ -354,6 +352,13 @@ export const step1Schemas: FormSchema[] = [
       return {
         component: 'OrgTreeSelect',
         defaultLockStatus: !!formModel?.isUpdate,
+        componentProps: {
+          apiTreeSelectProps: {
+            params: {
+              organizationId: formModel?.sensorOrganizationId,
+            },
+          },
+        },
       };
     },
   },

 import { Options } from './type';
-import { getMeetTheConditionsDevice } from '/@/api/dataBoard';
+import { getMeetTheConditionsGatewayDevice } from '/@/api/dataBoard';
 import { queryDeviceProfileBy } from '/@/api/device/deviceManager';
 import { DeviceRecord, DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { findDictItemByCode } from '/@/api/system/dict';
-import { getOrganizationList } from '/@/api/system/system';
-import { FormSchema } from '/@/components/Form';
+import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { BasicColumn } from '/@/components/Table';
-import { copyTransFun } from '/@/utils/fnUtils';
+import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
 import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
 import XLSX, { CellObject } from 'xlsx';
 
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
+
 export enum FieldsEnum {
   ORGANIZATION_ID = 'organizationId',
   DEVICE_TYPE = 'deviceTypeEnum',
@@ -23,6 +24,8 @@ export enum FieldsEnum {
   IS_TCP_DEVICE_PROFILE = 'isTcpDeviceProfile',
   TRANSPORT_TYPE = 'transportType',
   PRODUCTION_NAME = 'productionName',
+
+  GATEWAY_ORGANIZATION_ID = 'gatewayOrganizationId',
 }
 
 export enum DelimiterEnum {
@@ -108,30 +111,6 @@ export enum CredentialsNameEnum {
 
 export const basicInfoForm: FormSchema[] = [
   {
-    field: FieldsEnum.ORGANIZATION_ID,
-    label: '所属组织',
-    component: 'ApiTreeSelect',
-    rules: [{ required: true, message: '所属组织为必填项' }],
-    componentProps: ({ formModel, formActionType }) => {
-      const { setFieldsValue } = formActionType;
-      return {
-        maxLength: 250,
-        placeholder: '请选择所属组织',
-        api: async () => {
-          const data = (await getOrganizationList()) as unknown as Recordable[];
-          copyTransFun(data);
-          return data;
-        },
-        getPopupContainer: () => document.body,
-        onChange(e) {
-          if (e != formModel?.[FieldsEnum.ORGANIZATION_ID]) {
-            setFieldsValue({ [FieldsEnum.GATEWAY_TB_DEVICE_ID]: null });
-          }
-        },
-      };
-    },
-  },
-  {
     field: FieldsEnum.DEVICE_TYPE,
     label: '设备类型',
     component: 'ApiSelect',
@@ -150,6 +129,7 @@ export const basicInfoForm: FormSchema[] = [
             [FieldsEnum.DEVICE_TYPE_NAME]: value ? options.label : null,
             [FieldsEnum.TK_DEVICE_PROFILE_ID]: null,
             [FieldsEnum.GATEWAY_TB_DEVICE_ID]: null,
+            [FieldsEnum.ORGANIZATION_ID]: null,
           });
           clearValidate();
         },
@@ -181,6 +161,7 @@ export const basicInfoForm: FormSchema[] = [
             [FieldsEnum.GATEWAY_TB_DEVICE_ID]: null,
             [FieldsEnum.TRANSPORT_TYPE]: options?.transportType,
             [FieldsEnum.PRODUCTION_NAME]: options?.label,
+            [FieldsEnum.ORGANIZATION_ID]: null,
           });
         },
         showSearch: true,
@@ -203,30 +184,29 @@ export const basicInfoForm: FormSchema[] = [
     show: false,
   },
   {
+    field: FieldsEnum.GATEWAY_ORGANIZATION_ID,
+    label: '',
+    component: 'Input',
+    show: false,
+  },
+  {
     field: FieldsEnum.GATEWAY_TB_DEVICE_ID,
     component: 'ApiSelect',
     label: '网关设备',
     ifShow: ({ model }) => model[FieldsEnum.DEVICE_TYPE] === DeviceTypeEnum.SENSOR,
     required: true,
-    componentProps: ({ formModel }) => {
-      const organizationId = formModel[FieldsEnum.ORGANIZATION_ID];
-      const transportType = formModel[FieldsEnum.TRANSPORT_TYPE];
+    componentProps: ({ formModel, formActionType }) => {
+      const transportType: string = formModel[FieldsEnum.TRANSPORT_TYPE];
       return {
         api: async () => {
           try {
-            if (!organizationId) return;
-            const result = await getMeetTheConditionsDevice({
-              deviceType: DeviceTypeEnum.GATEWAY,
-              organizationId,
+            const result = await getMeetTheConditionsGatewayDevice({ transportType });
+            return result.map((item) => {
+              return {
+                ...item,
+                name: item.alias || item.name,
+              };
             });
-            return result
-              .map((item) => {
-                return {
-                  ...item,
-                  name: item.alias || item.name,
-                };
-              })
-              .filter((item) => item.transportType === transportType);
           } catch (error) {
             return [];
           }
@@ -239,6 +219,28 @@ export const basicInfoForm: FormSchema[] = [
           return options.label.includes(inputValue);
         },
         placeholder: '请选择网关设备',
+        onChange(_value: string, option: DeviceRecord) {
+          const { setFieldsValue } = formActionType;
+          setFieldsValue({
+            [FieldsEnum.GATEWAY_ORGANIZATION_ID]: option?.organizationId,
+            [FieldsEnum.ORGANIZATION_ID]: null,
+          });
+        },
+      };
+    },
+  },
+  {
+    field: FieldsEnum.ORGANIZATION_ID,
+    label: '所属组织',
+    component: 'OrgTreeSelect',
+    rules: [{ required: true, message: '所属组织为必填项' }],
+    componentProps: ({ formModel }) => {
+      return {
+        apiTreeSelectProps: {
+          params: {
+            organizationId: formModel?.[FieldsEnum.GATEWAY_ORGANIZATION_ID],
+          },
+        },
       };
     },
   },

@@ -201,13 +201,6 @@
         slots: { customRender: 'action' },
         fixed: 'right',
       },
-      rowSelection: {
-        getCheckboxProps: (record: ModelOfMatterItemRecordType) => {
-          return {
-            disabled: record.status === 1,
-          };
-        },
-      },
     });
 
   const getHasBatchDelete = computed(() => !getRowSelection().selectedRowKeys?.length);