feat: 任务中心和数据流转，新增一列，选择组织

@@ -15,6 +15,7 @@ export interface GetTaskListParamsType {
 
 
 export interface CreateTaskRecordType {
 export interface CreateTaskRecordType {
   name: string;
   name: string;
+  organizationId: string;
   targetType: TaskTargetEnum;
   targetType: TaskTargetEnum;
   executeTarget: {
   executeTarget: {
     organizationId?: string;
     organizationId?: string;

@@ -34,13 +34,14 @@
 
 
   const getValue = async () => {
   const getValue = async () => {
     const record = (await validateFields()) || {};
     const record = (await validateFields()) || {};
-    const { type, remark } = record;
+    const { type, remark, organizationId } = record;
     const datasourceType = Reflect.get(record, BasicInfoFormField.DATA_SOURCE_TYPE);
     const datasourceType = Reflect.get(record, BasicInfoFormField.DATA_SOURCE_TYPE);
     const convertDevices = Reflect.get(record, BasicInfoFormField.DATA_SOURCE_DEVICE);
     const convertDevices = Reflect.get(record, BasicInfoFormField.DATA_SOURCE_DEVICE);
     const convertProducts = Reflect.get(record, BasicInfoFormField.DATA_SOURCE_PRODUCT);
     const convertProducts = Reflect.get(record, BasicInfoFormField.DATA_SOURCE_PRODUCT);
     return {
     return {
       type,
       type,
       remark,
       remark,
+      organizationId,
       datasourceType,
       datasourceType,
       datasourceContent: {
       datasourceContent: {
         convertProducts,
         convertProducts,

-import { FormSchema } from '/@/components/Form';
+import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { getDeviceProfile } from '/@/api/alarm/position';
 import { getDeviceProfile } from '/@/api/alarm/position';
 import { BasicInfoFormField, DataSourceType } from '../enum';
 import { BasicInfoFormField, DataSourceType } from '../enum';
 import { DeviceRecord } from '/@/api/device/model/deviceModel';
 import { DeviceRecord } from '/@/api/device/model/deviceModel';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { useMessage } from '/@/hooks/web/useMessage';
+import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
+
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 
 
 export const stepConfig = ['选择流转方式', '完善配置参数'];
 export const stepConfig = ['选择流转方式', '完善配置参数'];
 
 
@@ -122,6 +125,13 @@ export const modeForm = (disabled: boolean): FormSchema[] => {
       },
       },
     },
     },
     {
     {
+      required: true,
+      field: 'organizationId',
+      label: '所属组织',
+      colProps: { span: 24 },
+      component: 'OrgTreeSelect',
+    },
+    {
       field: 'type',
       field: 'type',
       label: '转换方式',
       label: '转换方式',
       component: 'ApiSelect',
       component: 'ApiSelect',

@@ -15,7 +15,9 @@ import { ProductPicker, validateProductPicker } from '../ProductPicker';
 import { useGlobSetting } from '/@/hooks/setting';
 import { useGlobSetting } from '/@/hooks/setting';
 import { TransportTypeEnum } from '/@/enums/deviceEnum';
 import { TransportTypeEnum } from '/@/enums/deviceEnum';
 import { validateTCPCustomCommand } from '/@/components/Form/src/components/ThingsModelForm';
 import { validateTCPCustomCommand } from '/@/components/Form/src/components/ThingsModelForm';
+import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
 
 
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 useComponentRegister('DevicePicker', DevicePicker);
 useComponentRegister('DevicePicker', DevicePicker);
 useComponentRegister('ProductPicker', ProductPicker);
 useComponentRegister('ProductPicker', ProductPicker);
 useComponentRegister('PollCommandInput', PollCommandInput);
 useComponentRegister('PollCommandInput', PollCommandInput);
@@ -25,6 +27,8 @@ const { disabledTaskCenterExecuteIntervalUnitSecond } = useGlobSetting();
 export enum FormFieldsEnum {
 export enum FormFieldsEnum {
   // 任务名称
   // 任务名称
   NAME = 'name',
   NAME = 'name',
+  // 所属组织
+  ORGANIZATION_ID = 'organizationId',
   // 目标类型
   // 目标类型
   TARGET_TYPE = 'targetType',
   TARGET_TYPE = 'targetType',
   // 设备类型选择
   // 设备类型选择
@@ -99,6 +103,13 @@ export const formSchemas: FormSchema[] = [
     },
     },
   },
   },
   {
   {
+    required: true,
+    field: FormFieldsEnum.ORGANIZATION_ID,
+    label: '所属组织',
+    colProps: { span: 24 },
+    component: 'OrgTreeSelect',
+  },
+  {
     field: FormFieldsEnum.TARGET_TYPE,
     field: FormFieldsEnum.TARGET_TYPE,
     component: 'RadioGroup',
     component: 'RadioGroup',
     label: '目标类型',
     label: '目标类型',

@@ -92,6 +92,7 @@ export const composeData = (result: Required<FormValueType>): CreateTaskRecordTy
 
 
   return {
   return {
     name,
     name,
+    organizationId: result.organizationId,
     targetType,
     targetType,
     executeContent: {
     executeContent: {
       pushContent: {
       pushContent: {
@@ -127,6 +128,7 @@ export const parseData = (result: TaskRecordType): Required<FormValueType> => {
   const { type: executeTimeType, period, periodType, time, pollUnit } = executeTime;
   const { type: executeTimeType, period, periodType, time, pollUnit } = executeTime;
   return {
   return {
     name,
     name,
+    organizationId: result.organizationId,
     targetType,
     targetType,
     rpcCommand: pushWay === PushWayEnum.MQTT ? JSON.stringify(rpcCommand, null, 2) : rpcCommand,
     rpcCommand: pushWay === PushWayEnum.MQTT ? JSON.stringify(rpcCommand, null, 2) : rpcCommand,
     transportType: pushWay,
     transportType: pushWay,