Merge branch 'fix/device-update' into 'main_dev'

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

See merge request yunteng/thingskit-front!1119

@@ -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,
+            },
+          },
+        },
       };
     },
   },