wip: product detail model of matter tsl

@@ -43,7 +43,7 @@ VITE_GLOB_CONFIGURATION = /thingskit-drawio
 VITE_CONTENT_SECURITY_POLICY = false
 
 # Alarm Notify Polling Interval Time
-VITE_ALARM_NOTIFY_POLLING_INTERVAL_TIME = 5000
+VITE_ALARM_NOTIFY_POLLING_INTERVAL_TIME = 500000
 
 # Alarm Notify Auto Close Time Unit is Second
 VITE_ALARM_NOTIFY_DURATION = 5

@@ -48,3 +48,40 @@ export interface DeviceProfileModel {
 export type ChildDeviceParams = BasicPageParams & {
   formId: string;
 };
+
+export interface Configuration {
+  type: string;
+}
+
+export interface TransportConfiguration {
+  type: string;
+}
+
+export interface ProvisionConfiguration {
+  type: string;
+  provisionDeviceSecret?: any;
+}
+
+export interface ProfileData {
+  configuration: Configuration;
+  transportConfiguration: TransportConfiguration;
+  provisionConfiguration: ProvisionConfiguration;
+  alarms?: any;
+}
+
+export interface DeviceRecord {
+  id: string;
+  creator: string;
+  createTime: string;
+  name: string;
+  tenantId: string;
+  transportType: string;
+  provisionType: string;
+  deviceType: string;
+  tbProfileId: string;
+  profileData: ProfileData;
+  defaultQueueName: string;
+  image: string;
+  type: string;
+  default: boolean;
+}

+import { FunctionType } from '/@/views/device/profiles/step/cpns/physical/cpns/config';
+
+export interface Specs {
+  min: string;
+  max: string;
+  unit: string;
+  unitName: string;
+  step: string;
+  length: string;
+  boolOpen: string;
+  boolClose: string;
+}
+
+export interface FunctionJson {
+  type: string;
+  specs?: Partial<Specs>;
+  specsList?: ModelOfMatterParams[];
+}
+
+export interface ModelOfMatterParams {
+  deviceProfileId: string;
+  functionJson: FunctionJson;
+  functionName: string;
+  functionType: FunctionType;
+  identifier: string;
+  remark: string;
+  id?: string;
+}
+
+export interface GetModelTslParams {
+  functionType: FunctionType;
+  deviceProfileId: string;
+}

+import { BasicPageParams } from '../model/baseModel';
+import { GetModelTslParams, ModelOfMatterParams } from './model/modelOfMatterModel';
+import { defHttp } from '/@/utils/http/axios';
+
+enum ModelOfMatter {
+  CREATE = '/things_model',
+  UPDATE = '/things_model',
+  DELETE = '/things_model',
+  TSL = '/things_model',
+  LIST = '/things_model/page',
+}
+
+export const getModelList = (params: BasicPageParams) => {
+  return defHttp.get({
+    url: `${ModelOfMatter.LIST}`,
+    params,
+  });
+};
+
+export const getModelTsl = (params: GetModelTslParams) => {
+  const { functionType, deviceProfileId } = params;
+  return defHttp.get({
+    url: `${ModelOfMatter.TSL}/${functionType}/${deviceProfileId}`,
+  });
+};
+
+export const createModel = (params: Partial<ModelOfMatterParams>) => {
+  return defHttp.post({
+    url: ModelOfMatter.CREATE,
+    params,
+  });
+};
+
+export const updateModel = (params: Partial<ModelOfMatterParams>) => {
+  return defHttp.put({
+    url: ModelOfMatter.UPDATE,
+    params,
+  });
+};
+
+export const deleteModel = (params: string[]) => {
+  return defHttp.delete({
+    url: ModelOfMatter.DELETE,
+    params: {
+      ids: params,
+    },
+  });
+};

@@ -20,7 +20,7 @@ enum SysDictApi {
  * @param code
  */
 export const findDictItemByCode = (params?: DictCodeParams) => {
-  return defHttp.post<SysDictItemResult>({
+  return defHttp.post<SysDictItemResult[]>({
     url: SysDictApi.CONFIG_ITEM_URL + '/find',
     params,
   });

@@ -12,6 +12,8 @@ export { default as ApiTreeSelect } from './src/components/ApiTreeSelect.vue';
 export { default as ApiRadioGroup } from './src/components/ApiRadioGroup.vue';
 export { default as ApiUpload } from './src/components/ApiUpload.vue';
 
+export { default as StructForm } from './src/externalCompns/components/StructForm/StructForm.vue';
+
 //注册自定义组件
 export {
   JEasyCron,

@@ -35,7 +35,8 @@ import ColorPicker from './components/ColorPicker.vue';
 import IconDrawer from './components/IconDrawer.vue';
 import ApiUpload from './components/ApiUpload.vue';
 import ApiSearchSelect from './components/ApiSearchSelect.vue';
-import CustomeMinMaxInput from './externalCompns/components/CustomeMinMaxInput.vue';
+import CustomMinMaxInput from './externalCompns/components/CustomMinMaxInput.vue';
+import StructForm from './externalCompns/components/StructForm/StructForm.vue';
 
 const componentMap = new Map<ComponentType, Component>();
 
@@ -78,7 +79,8 @@ componentMap.set('ColorPicker', ColorPicker);
 componentMap.set('IconDrawer', IconDrawer);
 componentMap.set('ApiUpload', ApiUpload);
 componentMap.set('ApiSearchSelect', ApiSearchSelect);
-componentMap.set('CustomeMinMaxInput', CustomeMinMaxInput);
+componentMap.set('CustomMinMaxInput', CustomMinMaxInput);
+componentMap.set('StructForm', StructForm);
 
 export function add(compName: ComponentType, component: Component) {
   componentMap.set(compName, component);

+<script lang="ts">
+  export default {
+    inheritAttrs: false,
+  };
+</script>
+<script lang="ts" setup>
+  import StructFormModel from './StructFormModel.vue';
+  import { useModal } from '/@/components/Modal';
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
+  import { computed, unref } from 'vue';
+  import { buildUUID } from '/@/utils/uuid';
+  import { Divider, Button } from 'ant-design-vue';
+  import { OpenModalMode, OpenModalParams, StructRecord } from './type';
+  import { cloneDeep } from 'lodash-es';
+
+  const emit = defineEmits(['update:value']);
+
+  const props = withDefaults(
+    defineProps<{
+      value: ModelOfMatterParams[];
+    }>(),
+    {
+      value: () => [],
+    }
+  );
+
+  const getValue = computed<StructRecord[]>(() => {
+    const { value } = props;
+    return value.map((item) => {
+      return {
+        ...(item as StructRecord),
+        ...((item as StructRecord).id ? {} : { id: buildUUID() }),
+      };
+    });
+  });
+
+  const [registerModal, { openModal }] = useModal();
+
+  const handleCreateParams = () => {
+    openModal(true, {
+      mode: OpenModalMode.CREATE,
+    } as OpenModalParams);
+  };
+
+  const handleUpdate = (value: StructRecord) => {
+    openModal(true, {
+      mode: OpenModalMode.UPDATE,
+      record: value,
+    } as OpenModalParams);
+  };
+
+  const handleDelete = (value: StructRecord) => {
+    const index = unref(getValue).findIndex((item) => item.id === value.id);
+    const _value = cloneDeep(unref(getValue));
+    _value.splice(index, 1);
+    emit('update:value', _value);
+  };
+
+  const handleSaveStruct = (mode: OpenModalMode, value: StructRecord) => {
+    const _value = cloneDeep(unref(getValue));
+
+    if (mode === OpenModalMode.UPDATE) {
+      const index = unref(getValue).findIndex((item) => item.id === value.id);
+      ~index && _value.splice(index, 1, value);
+    } else {
+      _value.push(value);
+    }
+
+    emit('update:value', _value);
+  };
+</script>
+
+<template>
+  <section>
+    <div class="text-blue-500 cursor-pointer">
+      <section>
+        <div
+          class="flex bg-blue-50 mb-2 p-2 text-gray-500 justify-between items-center"
+          v-for="item in getValue"
+          :key="item.id"
+        >
+          <div>参数名称: {{ item.functionName }}</div>
+          <div class="flex">
+            <Button class="!p-0" type="link" @click="handleUpdate(item)">编辑</Button>
+            <Divider type="vertical" />
+            <Button class="!p-0" type="link" @click="handleDelete(item)">删除</Button>
+          </div>
+        </div>
+      </section>
+      <div>
+        <span class="mr-2">
+          <PlusOutlined />
+        </span>
+        <span @click="handleCreateParams">增加参数</span>
+      </div>
+    </div>
+    <StructFormModel @register="registerModal" @submit="handleSaveStruct" />
+  </section>
+</template>
+
+<style lang="less" scoped></style>

+<script lang="ts">
+  export default {
+    inheritAttrs: false,
+  };
+</script>
+<script lang="ts" setup>
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { formSchemas } from './config';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { OpenModalMode, OpenModalParams, StructRecord } from './type';
+  import { ref, unref } from 'vue';
+  import { transformFormValue } from './util';
+  import { cloneDeep } from 'lodash-es';
+
+  const modalReceiveRecord = ref<OpenModalParams>({
+    mode: OpenModalMode.CREATE,
+  });
+
+  const emit = defineEmits(['register', 'submit']);
+
+  const [register, { validate, setFieldsValue }] = useForm({
+    labelWidth: 100,
+    schemas: formSchemas,
+    actionColOptions: {
+      span: 14,
+    },
+    showResetButton: false,
+    submitOnReset: false,
+    showActionButtonGroup: false,
+  });
+
+  const [registerModal, { closeModal }] = useModalInner((record: OpenModalParams) => {
+    modalReceiveRecord.value = record;
+    const data = record.record || {};
+    const { functionJson = {} } = data! as StructRecord;
+    const { specs = {} } = functionJson as StructRecord['functionJson'];
+    if (record.record) {
+      const value = {
+        ...data,
+        ...functionJson,
+        ...specs,
+        valueRange: {
+          min: specs.min,
+          max: specs.max,
+        },
+      };
+
+      setFieldsValue(value);
+    }
+  });
+
+  const handleSubmit = async () => {
+    try {
+      const _value = await validate();
+      let value = transformFormValue(_value);
+      value = {
+        ...value,
+        ...(unref(modalReceiveRecord)?.record?.id
+          ? { id: unref(modalReceiveRecord)?.record?.id }
+          : {}),
+      };
+      emit('submit', unref(modalReceiveRecord).mode, cloneDeep(value));
+      closeModal();
+    } catch (error) {}
+  };
+</script>
+
+<template>
+  <BasicModal
+    @register="registerModal"
+    :title="modalReceiveRecord.mode === OpenModalMode.CREATE ? '创建参数' : '编辑参数'"
+    :width="800"
+    @ok="handleSubmit"
+    destroy-on-close
+  >
+    <BasicForm @register="register" />
+  </BasicModal>
+</template>
+
+<style lang="less" scoped></style>

+import { h } from 'vue';
+import { findDictItemByCode } from '/@/api/system/dict';
+import { FormSchema } from '/@/components/Table';
+import { FormField } from '/@/views/device/profiles/step/cpns/physical/cpns/config';
+
+export enum DateTypeEnum {
+  IS_NUMBER_INT = 'INT',
+  IS_NUMBER_DOUBLE = 'DOUBLE',
+  IS_STRING = 'TEXT',
+  IS_STRUCT = 'STRUCT',
+  IS_BOOL = 'BOOL',
+}
+
+export const formSchemas: FormSchema[] = [
+  {
+    field: FormField.FUNCTION_NAME,
+    label: '功能名称',
+    required: true,
+    component: 'Input',
+    colProps: {
+      span: 18,
+    },
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入功能名称',
+    },
+  },
+  {
+    field: FormField.IDENTIFIER,
+    label: '标识符',
+    required: true,
+    component: 'Input',
+    colProps: {
+      span: 18,
+    },
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入标识符',
+    },
+  },
+  {
+    field: FormField.TYPE,
+    label: '数据类型',
+    required: true,
+    component: 'ApiSelect',
+    colProps: {
+      span: 9,
+    },
+    defaultValue: 'INT',
+    componentProps: {
+      placeholder: '请选择数据类型',
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'data_type',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
+      getPopupContainer: () => document.body,
+    },
+  },
+  {
+    field: FormField.VALUE_RANGE,
+    label: '取值范围',
+    component: 'CustomMinMaxInput',
+    colProps: {
+      span: 18,
+    },
+    ifShow: ({ values }) =>
+      values[FormField.TYPE] === DateTypeEnum.IS_NUMBER_INT ||
+      values[FormField.TYPE] === DateTypeEnum.IS_NUMBER_DOUBLE,
+  },
+  {
+    field: FormField.STEP,
+    label: '步长',
+    component: 'Input',
+    colProps: {
+      span: 18,
+    },
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入步长',
+    },
+    ifShow: ({ values }) =>
+      values[FormField.TYPE] === DateTypeEnum.IS_NUMBER_INT ||
+      values[FormField.TYPE] === DateTypeEnum.IS_NUMBER_DOUBLE,
+  },
+  {
+    field: FormField.UNIT_NAME,
+    label: '单位名称',
+    component: 'Input',
+    show: false,
+  },
+  {
+    field: FormField.UNIT,
+    label: '单位',
+    component: 'ApiSelect',
+    colProps: {
+      span: 9,
+    },
+    componentProps: ({ formActionType }) => {
+      const { setFieldsValue } = formActionType;
+      return {
+        placeholder: '请选择单位',
+        api: findDictItemByCode,
+        params: {
+          dictCode: 'attribute_unit',
+        },
+        labelField: 'itemText',
+        valueField: 'itemValue',
+        onChange(_, record: Record<'label' | 'value', string>) {
+          const { label } = record;
+          setFieldsValue({ [FormField.UNIT_NAME]: label });
+        },
+        getPopupContainer: () => document.body,
+      };
+    },
+    ifShow: ({ values }) =>
+      values[FormField.TYPE] === DateTypeEnum.IS_NUMBER_INT ||
+      values[FormField.TYPE] === DateTypeEnum.IS_NUMBER_DOUBLE,
+    renderComponentContent: () => {
+      return {
+        option: (params: Record<'label' | 'value', string>) => {
+          const { label, value } = params;
+          return h('span', `${label} / ${value}`);
+        },
+      };
+    },
+  },
+  {
+    field: FormField.BOOL_CLOSE,
+    component: 'Input',
+    required: true,
+    label: '0 -',
+    colProps: {
+      span: 18,
+    },
+    componentProps: {
+      placeholder: '如：关',
+    },
+    ifShow: ({ values }) => values[FormField.TYPE] === DateTypeEnum.IS_BOOL,
+  },
+  {
+    field: FormField.BOOL_OPEN,
+    component: 'Input',
+    required: true,
+    label: '1 -',
+    colProps: {
+      span: 18,
+    },
+    componentProps: {
+      placeholder: '如：开',
+    },
+    ifShow: ({ values }) => values[FormField.TYPE] === DateTypeEnum.IS_BOOL,
+  },
+  {
+    field: FormField.LENGTH,
+    component: 'Input',
+    required: true,
+    label: '数据长度',
+    defaultValue: '10240',
+    colProps: {
+      span: 8,
+    },
+    componentProps: {
+      placeholder: '请输入数据长度',
+    },
+    renderComponentContent: () => {
+      return {
+        suffix: () => '字节',
+      };
+    },
+    ifShow: ({ values }) => values[FormField.TYPE] === DateTypeEnum.IS_STRING,
+  },
+  {
+    field: FormField.R_W_FLAG,
+    component: 'ApiRadioGroup',
+    label: '读写类型',
+    required: true,
+    colProps: {
+      span: 24,
+    },
+    defaultValue: 'READ_ONLY',
+    componentProps: {
+      placeholder: '请选择读写类型',
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'read_write_type',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
+    },
+  },
+  {
+    field: FormField.SPECS_LIST,
+    label: 'JSON对象',
+    component: 'StructForm',
+    valueField: 'value',
+    changeEvent: 'update:value',
+    colProps: { span: 24 },
+    ifShow: ({ values }) => values[FormField.TYPE] === DateTypeEnum.IS_STRUCT,
+  },
+  {
+    field: FormField.REFARK,
+    label: '备注',
+    component: 'InputTextArea',
+    componentProps: {
+      rows: 4,
+      maxLength: 100,
+      placeholder: '请输入描述',
+    },
+  },
+];

+import { DateTypeEnum } from './config';
+import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
+import { FormField } from '/@/views/device/profiles/step/cpns/physical/cpns/config';
+
+export enum OpenModalMode {
+  CREATE = 'create',
+  UPDATE = 'update',
+}
+
+export interface OpenModalParams {
+  mode: OpenModalMode;
+  record?: StructRecord;
+}
+
+export interface StructFormValue
+  extends Partial<Record<Exclude<FormField, FormField.VALUE_RANGE | FormField.STRUCT>, string>> {
+  [FormField.TYPE]: DateTypeEnum;
+  [FormField.VALUE_RANGE]?: {
+    [FormField.MIN]: string;
+    [FormField.MAX]: string;
+  };
+  [FormField.STRUCT]: StructRecord[];
+}
+
+export interface StructRecord extends ModelOfMatterParams {
+  id: string;
+}

+import { DateTypeEnum } from './config';
+import { StructFormValue } from './type';
+import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { FunctionType } from '/@/views/device/profiles/step/cpns/physical/cpns/config';
+
+export const validateValueRangeAndStep = (min: number, step: number, max: number) => {
+  const { createMessage } = useMessage();
+  if (min > max) {
+    createMessage.error('最大值必须大于最小值,整数型不能有小数位,单精度有效位为7,双精度为16');
+    throw '最大值必须大于最小值,整数型不能有小数位,单精度有效位为7,双精度为16';
+  }
+
+  if (step > max - min) {
+    createMessage.error('步长不能大于取值范围的差值');
+    throw '步长不能大于取值范围的差值';
+  }
+};
+
+export const validateValueBool = (boolClose, boolOpen) => {
+  const { createMessage } = useMessage();
+
+  if (boolClose == boolOpen) {
+    createMessage.error('布尔值不能相同');
+    throw '布尔值不能相同';
+  }
+};
+
+export const validateValueStruct = (data: []) => {
+  const { createMessage } = useMessage();
+
+  if (data.length === 0) {
+    createMessage.error('struct不能为空');
+    throw 'struct不能为空';
+  }
+};
+
+export function transformFormValue(value: StructFormValue): Partial<ModelOfMatterParams> {
+  const {
+    type,
+    valueRange,
+    step,
+    length = '',
+    boolClose,
+    boolOpen,
+    unit,
+    unitName,
+    functionName,
+    identifier,
+    remark,
+    specsList,
+  } = value;
+  const { min, max } = valueRange! || {};
+  const basic = { functionName, identifier, remark };
+  let functionJson = {} as unknown as ModelOfMatterParams['functionJson'];
+
+  switch (type) {
+    case DateTypeEnum.IS_NUMBER_INT:
+      validateValueRangeAndStep(Number(min), Number(step), Number(max));
+      functionJson = {
+        type,
+        specs: { max, min, step, unit, unitName },
+      };
+      break;
+
+    case DateTypeEnum.IS_NUMBER_DOUBLE:
+      validateValueRangeAndStep(Number(min), Number(step), Number(max));
+      functionJson = {
+        type,
+        specs: { max, min, step, unit, unitName },
+      };
+      break;
+
+    case DateTypeEnum.IS_BOOL:
+      validateValueBool(Number(boolClose), Number(boolOpen));
+      functionJson = {
+        type,
+        specs: {
+          boolOpen: boolOpen,
+          boolClose: boolClose,
+        },
+      };
+      break;
+
+    case DateTypeEnum.IS_STRING:
+      functionJson = {
+        type,
+        specs: { length },
+      };
+      break;
+
+    case DateTypeEnum.IS_STRUCT:
+      functionJson = {
+        type,
+        specsList: specsList! as unknown as ModelOfMatterParams[],
+      };
+      break;
+  }
+  return {
+    ...basic,
+    functionType: FunctionType.PROPERTIES,
+    functionJson,
+  };
+}

@@ -112,9 +112,10 @@ export type ComponentType =
   | 'Render'
   | 'Slider'
   | 'JAddInput'
-  | 'CustomeMinMaxInput'
+  | 'CustomMinMaxInput'
   | 'Rate'
   | 'ColorPicker'
   | 'IconDrawer'
   | 'ApiUpload'
-  | 'ApiSearchSelect';
+  | 'ApiSearchSelect'
+  | 'StructForm';

 <template>
   <BasicDrawer v-bind="$attrs" title="产品详情" @register="register" width="60%">
     <Tabs :animated="true" v-model:activeKey="activeKey" @change="handlePanelChange">
-      <TabPane forceRender key="product" tab="产品">
+      <TabPane key="product" tab="产品">
         <div class="relative">
           <DeviceConfigurationStep :ifShowBtn="false" ref="DevConStRef" />
           <div class="absolute w-full h-full top-0 cursor-not-allowed"></div>
         </div>
       </TabPane>
-      <TabPane forceRender key="transport" tab="传输配置">
+      <TabPane key="transport" tab="传输配置">
         <div class="relative">
           <TransportConfigurationStep :ifShowBtn="false" ref="TransConStRef" />
           <div class="absolute w-full h-full top-0 cursor-not-allowed"></div>
         </div>
       </TabPane>
-      <TabPane forceRender key="modelOfMatter" tab="物模型管理">
-        <PhysicalModelManagementStep />
+      <TabPane key="modelOfMatter" tab="物模型管理">
+        <PhysicalModelManagementStep :record="record" />
       </TabPane>
     </Tabs>
   </BasicDrawer>
@@ -27,14 +27,15 @@
   import PhysicalModelManagementStep from './step/PhysicalModelManagementStep.vue';
   import { ref, unref } from 'vue';
   import { deviceConfigGetDetail } from '/@/api/device/deviceConfigApi';
+  import { DeviceRecord } from '/@/api/device/model/deviceModel';
 
   defineEmits(['register']);
 
   type ActiveKey = 'product' | 'transport' | 'modelOfMatter';
 
-  const activeKey = ref<ActiveKey>('product');
+  const activeKey = ref<ActiveKey>('modelOfMatter');
 
-  const record = ref<Recordable>({});
+  const record = ref<DeviceRecord>({} as unknown as DeviceRecord);
 
   const DevConStRef = ref<InstanceType<typeof DeviceConfigurationStep>>();
   const TransConStRef = ref<InstanceType<typeof TransportConfigurationStep>>();
@@ -47,7 +48,7 @@
     unref(TransConStRef)?.setFormData(res);
   };
 
-  const [register, {}] = useDrawerInner(async (data: Recordable) => {
+  const [register, {}] = useDrawerInner(async (data: { record: DeviceRecord }) => {
     activeKey.value = 'product';
     record.value = await deviceConfigGetDetail(data.record.id);
     setDeviceConfFormData(unref(record));

@@ -5,6 +5,7 @@ import { MessageEnum } from '/@/enums/messageEnum';
 import { numberRule } from '/@/utils/rules';
 
 import { deviceConfigGetRuleChain } from '/@/api/device/deviceConfigApi';
+import { FormField, FunctionType } from './step/cpns/physical/cpns/config';
 
 export const steps = [
   {
@@ -17,49 +18,36 @@ export const steps = [
   },
 ];
 
+export const formatFunctionType: Record<FunctionType, string> = {
+  [FunctionType.PROPERTIES]: '属性',
+  [FunctionType.EVENTS]: '事件',
+  [FunctionType.SERVICE]: '事件',
+};
+
 export const physicalColumn: BasicColumn[] = [
   {
     title: '功能类型',
-    dataIndex: 'dType',
+    dataIndex: FormField.FUNCTION_TYPE,
     width: 90,
+    format: (text: FunctionType) => {
+      return formatFunctionType[text];
+    },
   },
   {
     title: '功能名称',
-    dataIndex: 'name',
+    dataIndex: FormField.FUNCTION_NAME,
     width: 90,
   },
   {
     title: '标识符',
-    dataIndex: 'type',
+    dataIndex: FormField.IDENTIFIER,
     width: 90,
   },
   {
     title: '数据类型',
-    dataIndex: 'transportType',
+    dataIndex: 'functionJson.type',
     width: 100,
   },
-  // {
-  //   title: '单位',
-  //   dataIndex: 'description1',
-  //   width: 90,
-  // },
-  // {
-  //   title: '读写类型',
-  //   dataIndex: 'default',
-  //   width: 60,
-  //   customRender: ({ record }) => {
-  //     const status = record.actionStatus;
-  //     const enable = status === 'SUCCESS' ? '读写' : '只读';
-  //     const color = enable === '读写' ? 'blue' : 'green';
-  //     const text = enable === '读写' ? '读写' : '只读';
-  //     return h(Tag, { color }, () => text);
-  //   },
-  // },
-  // {
-  //   title: '创建人',
-  //   dataIndex: 'description',
-  //   width: 80,
-  // },
   {
     title: '创建时间',
     dataIndex: 'createTime',
@@ -409,130 +397,3 @@ export const formSchema: FormSchema[] = [
     },
   },
 ];
-
-export const mockData: any = async () => {
-  const res = await [
-    {
-      dType: 'events',
-      name: '亮度百分比',
-      type: 'Brightness',
-      transportType: 'int32(整数型)',
-      description1: '饱和度/aw',
-      default: '1',
-      actionStatus: 'SUCCESS',
-      description: 'cheche',
-      createTime: '2022-10-20 10:24:22',
-    },
-    {
-      dType: 'service',
-      name: '运行状态',
-      type: 'RunningState',
-      transportType: 'bool(布尔型)',
-      description1: '',
-      default: '1',
-      actionStatus: 'FA',
-      description: 'cheche',
-      createTime: '2022-10-20 10:24:22',
-    },
-    {
-      dType: 'attr',
-      name: '设备运行状态',
-      type: 'E_Status_UP',
-      transportType: 'text(字符串)',
-      description1: '',
-      default: '1',
-      actionStatus: 'D',
-      description: 'cheche',
-      createTime: '2022-10-20 10:24:22',
-    },
-    {
-      dType: 'attr',
-      name: '过流告警使能',
-      type: 'OverCurrentEnable',
-      transportType: 'struct(结构体)',
-      description1: '',
-      default: '1',
-      actionStatus: 'SUCCESS',
-      description: 'cheche',
-      createTime: '2022-10-20 10:24:22',
-    },
-    {
-      dType: 'events',
-      name: '变频器运行状态1',
-      type: 'Brightness',
-      transportType: 'int32(整数型)',
-      description1: '转每分钟/turn/m',
-      default: '1',
-      actionStatus: 'Fa',
-      description: 'cheche',
-      createTime: '2022-10-20 10:24:22',
-    },
-    {
-      dType: 'service',
-      name: '产品序列号',
-      type: 'SerialNo',
-      transportType: 'text(字符串)',
-      description1: '',
-      default: '1',
-      actionStatus: 'FA',
-      description: 'cheche',
-      createTime: '2022-10-20 10:24:22',
-    },
-    {
-      dType: 'service',
-      name: '音量百分比',
-      type: 'Volume',
-      transportType: 'int32(整数型)',
-      description1: '分贝/db',
-      default: '1',
-      actionStatus: 'SUCCESS',
-      description: 'cheche',
-      createTime: '2022-10-20 10:24:22',
-    },
-    {
-      dType: 'attr',
-      name: '易释放氰化物',
-      type: 'easy_release_cyanide',
-      transportType: 'double(双精度浮点型)',
-      description1: '毫克每升/mg/L',
-      default: '1',
-      actionStatus: 'SUCCESS',
-      description: 'cheche',
-      createTime: '2022-10-20 10:24:22',
-    },
-    {
-      dType: 'attr',
-      name: '湿度',
-      type: 'Humidity',
-      transportType: 'float(单精度浮点型)',
-      description1: '相对湿度/%RH',
-      default: '1',
-      actionStatus: 'SUCCESS',
-      description: 'cheche',
-      createTime: '2022-10-20 10:24:22',
-    },
-    {
-      dType: 'attr',
-      name: '设备固件版本',
-      type: 'FirmwareVersion',
-      transportType: 'text(字符串)',
-      description1: '',
-      default: '1',
-      actionStatus: 'SUCCESS',
-      description: 'cheche',
-      createTime: '2022-10-20 10:24:22',
-    },
-    {
-      dType: 'events',
-      name: '用电量',
-      type: 'PowerConsumption',
-      transportType: 'float(单精度浮点型)',
-      description1: '千瓦时/kW.h',
-      default: '1',
-      actionStatus: 'F',
-      description: 'cheche',
-      createTime: '2022-10-20 10:24:22',
-    },
-  ];
-  return res;
-};

@@ -99,7 +99,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref, nextTick, onUnmounted } from 'vue';
+  import { ref, nextTick, onUnmounted, onMounted } from 'vue';
   import { BasicTable, TableImg, useTable, TableAction, BasicColumn } from '/@/components/Table';
   import { columns, searchFormSchema, defaultObj } from './device.profile.data';
   import { useMessage } from '/@/hooks/web/useMessage';
@@ -258,6 +258,7 @@
   }
 
   const [registerDrawer, { openDrawer }] = useDrawer();
+  onMounted(() => openDrawer(true));
   //详情
   function handleDetailView(record: Recordable) {
     openDrawer(true, { record });

@@ -8,7 +8,7 @@
       <template #toolbar>
         <div class="flex-auto">
           <div class="mb-2">
-            <a-alert type="info" show-icon>
+            <Alert type="info" show-icon>
               <template #message>
                 <span v-if="!isShowBtn">
                   当前展示的是已发布到线上的功能定义,如需修改,请点击
@@ -22,15 +22,15 @@
                 </span>
                 <span v-if="isShowBtn"> 您正在编辑的是草稿,需点击发布后,物模型才会正式生效. </span>
               </template>
-            </a-alert>
+            </Alert>
           </div>
           <div class="flex justify-between items-end">
             <div class="flex gap-2">
               <Authority value="">
-                <a-button v-if="isShowBtn" type="primary" @click="handleCreateOrEdit(null)">
+                <Button v-if="isShowBtn" type="primary" @click="handleCreateOrEdit">
                   新增物模型
-                </a-button>
-                <a-button type="primary" @click="handleOpenTsl"> 物模型TSL </a-button>
+                </Button>
+                <Button type="primary" @click="handleOpenTsl"> 物模型TSL </Button>
               </Authority>
             </div>
             <div class="flex gap-2">
@@ -41,25 +41,25 @@
                   cancel-text="取消"
                   @confirm="handleEmit"
                 >
-                  <a-button v-if="isShowBtn" type="primary"> 发布上线 </a-button>
+                  <Button v-if="isShowBtn" type="primary"> 发布上线 </Button>
                 </Popconfirm>
-                <a-button v-if="isShowBtn" class="!bg-gray-200" type="text" @click="handleReturn">
+                <Button v-if="isShowBtn" class="!bg-gray-200" type="text" @click="handleReturn">
                   返回
-                </a-button>
+                </Button>
                 <Popconfirm
                   title="您确定要批量删除数据"
                   ok-text="确定"
                   cancel-text="取消"
                   @confirm="handleDeleteOrBatchDelete(null)"
                 >
-                  <a-button
+                  <Button
                     style="display: none"
                     type="primary"
                     color="error"
                     :disabled="hasBatchDelete"
                   >
                     批量删除
-                  </a-button>
+                  </Button>
                 </Popconfirm>
               </Authority>
             </div>
@@ -97,8 +97,12 @@
         />
       </template>
     </BasicTable>
-    <PhysicalModelModal @register="registerModal" @success="handleSuccess" />
-    <PhysicalModelTsl @register="registerModalTsl" />
+    <PhysicalModelModal
+      :record="$props.record"
+      @register="registerModal"
+      @success="handleSuccess"
+    />
+    <PhysicalModelTsl :record="$props.record" @register="registerModalTsl" />
   </div>
 </template>
 <script lang="ts" setup>
@@ -107,29 +111,32 @@
   import { useModal } from '/@/components/Modal';
   import { physicalColumn } from '../device.profile.data';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
-  import { deleteReportManage } from '/@/api/report/reportManager';
   import { Authority } from '/@/components/Authority';
-  // import { mockData } from '/@/api/device/deviceConfigApi';
   import PhysicalModelModal from './cpns/physical/PhysicalModelModal.vue';
   import PhysicalModelTsl from './cpns/physical/PhysicalModelTsl.vue';
-  import { Popconfirm } from 'ant-design-vue';
+  import { Popconfirm, Button, Alert } from 'ant-design-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { mockData } from '../device.profile.data';
-
+  import { DeviceRecord } from '/@/api/device/model/deviceModel';
+  import { deleteModel, getModelList } from '/@/api/device/modelOfMatter';
+  import { OpenModelOfMatterModelParams, OpenModelMode } from './cpns/physical/types';
+  import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
   defineEmits(['register']);
+
+  defineProps<{
+    record: DeviceRecord;
+  }>();
+
   const { createMessage } = useMessage();
   const isShowBtn = ref(false);
   const [registerModal, { openModal }] = useModal();
   const [registerModalTsl, { openModal: openModalTsl }] = useModal();
 
   const [registerTable, { reload, setProps }] = useTable({
-    // api: deviceConfigGetQuery,
-    api: mockData,
+    api: getModelList,
     columns: physicalColumn,
     showIndexColumn: false,
     clickToRowSelect: false,
     useSearchForm: false,
-    // rowKey: 'id',
     showTableSetting: true,
     bordered: true,
     actionColumn: {
@@ -140,16 +147,18 @@
       fixed: 'right',
     },
   });
+
   // 刷新
   const handleSuccess = () => {
     reload();
   };
 
   const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
-    deleteReportManage,
+    deleteModel,
     handleSuccess,
     setProps
   );
+
   selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
     // Demo:status为1的选择框禁用
     if (record.status === 1) {
@@ -158,38 +167,36 @@
       return { disabled: false };
     }
   };
-  const handleViewDetail = (record: Recordable | null) => {
+
+  const handleViewDetail = (record: ModelOfMatterParams) => {
     if (record) {
       openModal(true, {
-        isUpdate: true,
         record,
-        isView: true,
-        isText: 'view',
-      });
+        mode: OpenModelMode.VIEW,
+      } as OpenModelOfMatterModelParams);
     }
   };
+
   // 新增或编辑
-  const handleCreateOrEdit = (record: Recordable | null) => {
+  const handleCreateOrEdit = (record?: ModelOfMatterParams) => {
     if (record) {
       openModal(true, {
-        isUpdate: false,
+        mode: OpenModelMode.UPDATE,
         record,
-        isView: false,
-        isText: 'edit',
-      });
+      } as OpenModelOfMatterModelParams);
     } else {
       openModal(true, {
-        isUpdate: true,
-        isView: false,
-        isText: 'add',
-      });
+        mode: OpenModelMode.CREATE,
+      } as OpenModelOfMatterModelParams);
     }
   };
+
   const handleOpenTsl = () => {
     openModalTsl(true, {
       isUpdate: true,
     });
   };
+
   const handleEditPhysicalModel = () => (isShowBtn.value = true);
 
   const handleReturn = () => (isShowBtn.value = false);

@@ -8,160 +8,138 @@
       @ok="handleSubmit"
       @cancel="handleCancel"
     >
-      <div v-if="isViewDetail">
-        <Attribute v-show="activeKey === '1'" ref="AttrRef" />
-        <Service v-show="activeKey === '2'" ref="ServiceRef" />
-        <Events v-show="activeKey === '3'" ref="EventsRef" />
-      </div>
-      <div v-if="!isViewDetail">
-        <div>
+      <div>
+        <div v-if="openModalMode === OpenModelMode.CREATE">
           <Typography>
             <TypographyParagraph>
-              <blockquote style="background: #f2f2f2">{{ blockContent }}</blockquote>
+              <blockquote class="bg-gray-100">{{ blockContent }}</blockquote>
             </TypographyParagraph>
           </Typography>
         </div>
-        <Tabs type="card" v-model:activeKey="activeKey" :size="size">
-          <TabPane :disabled="attrDisable" forceRender key="1" tab="属性">
-            <Attribute v-show="activeKey === '1'" ref="AttrRef" />
-          </TabPane>
-          <TabPane :disabled="serveiceDisable" forceRender key="2" tab="服务">
-            <Service v-show="activeKey === '2'" ref="ServiceRef" />
-          </TabPane>
-          <TabPane
-            :disabled="eventDisable"
-            forceRender
-            key="3"
-            v-show="activeKey === '3'"
-            tab="事件"
-          >
-            <Events v-show="activeKey === '3'" ref="EventsRef" />
-          </TabPane>
+        <Tabs
+          v-if="openModalMode === OpenModelMode.CREATE"
+          type="card"
+          v-model:activeKey="activeKey"
+          :size="size"
+        >
+          <TabPane :key="FunctionType.PROPERTIES" tab="属性" />
+          <TabPane :key="FunctionType.SERVICE" tab="服务" />
+          <TabPane :key="FunctionType.EVENTS" tab="事件" />
         </Tabs>
+        <Attribute v-show="activeKey === FunctionType.PROPERTIES" ref="AttrRef" />
+        <Service v-show="activeKey === FunctionType.SERVICE" ref="ServiceRef" />
+        <Events v-show="activeKey === FunctionType.EVENTS" ref="EventsRef" />
       </div>
     </BasicModal>
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref, unref, reactive, nextTick } from 'vue';
+  import { ref, unref } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { Tabs, TabPane, Typography, TypographyParagraph } from 'ant-design-vue';
   import Attribute from './cpns/Attribute.vue';
   import Service from './cpns/Service.vue';
   import Events from './cpns/Events.vue';
-  import { mockData } from '../physical/cpns/components/mock';
+  import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
+  import { createModel, updateModel } from '/@/api/device/modelOfMatter';
+  import { DeviceRecord } from '/@/api/device/model/deviceModel';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { OpenModelMode, OpenModelOfMatterModelParams } from './types/index';
+  import { FunctionType } from './cpns/config';
+  import { StructRecord } from '/@/components/Form/src/externalCompns/components/StructForm/type';
+
+  const emit = defineEmits(['register', 'success']);
+
+  const props = defineProps<{
+    record: DeviceRecord;
+  }>();
 
-  defineEmits(['register']);
-  const attrDisable = ref(false);
-  const serveiceDisable = ref(false);
-  const eventDisable = ref(false);
   const blockContent = `属性一般是设备的运行状态，如当前温度等；服务是设备可被调用的方法，支持定义参数，如执行某项任务；事件则是设备上报的
 通知，如告警，需要被及时处理。`;
-  const activeKey = ref('1');
+  const activeKey = ref<FunctionType>(FunctionType.PROPERTIES);
   const size = ref('small');
   const AttrRef = ref<InstanceType<typeof Attribute>>();
   const ServiceRef = ref<InstanceType<typeof Service>>();
   const EventsRef = ref<InstanceType<typeof Events>>();
-  const isUpdate = ref(false);
-  const isViewDetail = ref('');
-  const isText = ref('');
-  const dType = ref('');
-  const allData: any = reactive({
-    properties: [],
-    events: [],
-    services: [],
-    productKey: '',
-    _ppk: {},
-  });
+  const openModalMode = ref<OpenModelMode>(OpenModelMode.CREATE);
+
+  const functionType = ref<FunctionType>();
+  const { createMessage } = useMessage();
+
+  const setAttrFormData = (data: StructRecord) => AttrRef.value?.setFormData(data);
+  const setServiceFormData = (data) => ServiceRef.value?.setFormData(data);
+  const setEventsFormData = (data) => EventsRef.value?.setFormData(data);
 
-  const setAttrFormData = (data: {}) => AttrRef.value?.setFormData(data);
-  const setServiceFormData = (data: {}) => ServiceRef.value?.setFormData(data);
-  const setEventsFormData = (data: {}) => EventsRef.value?.setFormData(data);
   const enums = {
-    attr: setAttrFormData,
-    service: setServiceFormData,
-    events: setEventsFormData,
+    [FunctionType.PROPERTIES]: setAttrFormData,
+    [FunctionType.SERVICE]: setServiceFormData,
+    [FunctionType.EVENTS]: setEventsFormData,
   };
-  function action(val, data) {
-    let F = enums[val];
-    F(data);
+
+  function setFormData(type: FunctionType, value: StructRecord) {
+    const setFn = enums[type];
+    setFn(value);
   }
-  const dynamicData = (t, a, s, e) => {
-    switch (t) {
-      case 'attr':
-        activeKey.value = '1';
-        action(t, a);
-        attrDisable.value = false;
-        serveiceDisable.value = true;
-        eventDisable.value = true;
-        break;
-      case 'service':
-        activeKey.value = '2';
-        action(t, s);
-        attrDisable.value = true;
-        serveiceDisable.value = false;
-        eventDisable.value = true;
-        break;
-      case 'events':
-        activeKey.value = '3';
-        action(t, e);
-        attrDisable.value = true;
-        serveiceDisable.value = true;
-        eventDisable.value = false;
-        break;
-    }
-  };
-  const [register, { closeModal, setModalProps }] = useModalInner(async (data) => {
-    setModalProps({ loading: true });
-    handleCancel(false);
-    isUpdate.value = data.isUpdate;
-    isViewDetail.value = data.isView;
-    isText.value = data.isText;
-    dType.value = data.record?.dType;
-    if (!unref(isViewDetail)) {
-      const title = !unref(isUpdate) ? '编辑物模型' : '新增物模型';
-      if (!unref(isUpdate)) {
-        nextTick(() => {
-          dynamicData(dType.value, mockData.properties, mockData.services, mockData.events);
-        });
+
+  const [register, { closeModal, setModalProps }] = useModalInner(
+    async (data: OpenModelOfMatterModelParams) => {
+      const { mode, record } = data;
+      openModalMode.value = mode;
+      if (record) {
+        functionType.value = data.record.functionType;
+        activeKey.value = data.record.functionType;
+        setFormData(record.functionType, record as unknown as StructRecord);
+      }
+      if (unref(openModalMode) === OpenModelMode.VIEW) {
+        setModalProps({ showOkBtn: false, showCancelBtn: false, title: '查看物模型' });
+        // setFormData(functionType.value, record);
+      } else {
+        const title = unref(openModalMode) === OpenModelMode.UPDATE ? '编辑物模型' : '新增物模型';
+        if (OpenModelMode.UPDATE) {
+          // setFormData(functionType.value, record);
+        }
+        setModalProps({ title, showOkBtn: true, showCancelBtn: true });
       }
-      setModalProps({ title, showOkBtn: true, showCancelBtn: true });
-    } else {
-      setModalProps({ showOkBtn: false, showCancelBtn: false, title: '查看物模型' });
-      nextTick(() => {
-        dynamicData(dType.value, mockData.properties, mockData.services, mockData.events);
-      });
     }
-    setModalProps({ loading: false });
-  });
+  );
+
   const handleCancel = (flag) => {
     AttrRef.value?.resetFormData();
     ServiceRef.value?.resetFormData();
     EventsRef.value?.resetFormData();
-    activeKey.value = '1';
-    allData.properties = [];
-    allData.events = [];
-    allData.services = [];
-    attrDisable.value = false;
-    serveiceDisable.value = false;
-    eventDisable.value = false;
+    activeKey.value = FunctionType.PROPERTIES;
     if (flag) {
       closeModal();
     }
   };
+
   const handleSubmit = async () => {
-    if (activeKey.value == '1') {
-      const valueAttr = await AttrRef.value?.getFormData();
-      allData.properties.push(valueAttr);
-    } else if (activeKey.value == '2') {
-      const valueService = await ServiceRef.value?.getFormData();
-      allData.services.push(valueService);
-    } else {
-      const valueEvents = await EventsRef.value?.getFormData();
-      allData.events.push(valueEvents);
+    try {
+      setModalProps({ loading: false, okButtonProps: { loading: true } });
+
+      let params: Partial<ModelOfMatterParams>;
+      if (activeKey.value == FunctionType.PROPERTIES) {
+        params = (await AttrRef.value?.getFormData()) || {};
+      } else if (activeKey.value == FunctionType.SERVICE) {
+        params = await ServiceRef.value?.getFormData();
+      } else {
+        params = await EventsRef.value?.getFormData();
+      }
+      params.deviceProfileId = props.record.id;
+      if (unref(openModalMode) === OpenModelMode.CREATE) {
+        await createModel(params);
+        createMessage.success('创建成功');
+      } else {
+        params.id = props.record.id;
+        await updateModel(params);
+        createMessage.success('修改成功');
+      }
+      closeModal();
+      emit('success');
+    } catch (error) {
+    } finally {
+      setModalProps({ loading: false, okButtonProps: { loading: false } });
     }
-    console.log('搜集值', allData);
-    closeModal();
   };
 </script>
 

 <template>
   <div>
-    <BasicForm @register="register">
-      <template #outputParamSlot>
-        <div>
-          <template v-for="(item, index) in outputParamData" :key="item">
-            <span style="display: none">{{ item + index }}</span>
-            <InputParamItem
-              :title="item.name"
-              :item="item"
-              class="mt-4"
-              :index="item.id"
-              :ref="dynamicBindRef.outputParamItemRef"
-              @delete="deleteOutParItem"
-              @edit="editOutParItem"
-            />
-          </template>
-          <div style="display: flex" :class="{ 'mt-2': outputParamData.length > 0 }">
-            <span class="add-style">+</span>
-            <span class="add-style" @click="handleAddOutParam">增加参数</span>
-          </div>
-        </div>
-      </template>
-    </BasicForm>
-    <AddParamsModal @register="registerModal" @data="getData" />
+    <BasicForm @register="register" />
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref, unref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { attrSchemas } from './config';
-  import { useModal } from '/@/components/Modal';
-  import InputParamItem from './components/InputParamItem.vue';
-  import AddParamsModal from './components/AddParamsModal.vue';
-  import { validateValueStruct } from '../hook/useValidateParital';
-  import { useChangeTypeGetTypeForm } from '../hook/useTypeGetForm';
-  import { buildUUID } from '/@/utils/uuid';
+  import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
+  import { formSchemas } from '/@/components/Form/src/externalCompns/components/StructForm/config';
+  import { transformFormValue } from '/@/components/Form/src/externalCompns/components/StructForm/util';
+  import {
+    StructFormValue,
+    StructRecord,
+  } from '/@/components/Form/src/externalCompns/components/StructForm/type';
 
-  const outputParamData: any = ref([]);
-  const dynamicBindRef = {
-    outputParamItemRef: ref([]),
-  };
-
-  const [registerModal, { openModal }] = useModal();
-
-  const [register, { validate, setFieldsValue, resetFields }] = useForm({
+  const [register, { validate, resetFields, setFieldsValue }] = useForm({
     labelWidth: 100,
-    schemas: attrSchemas,
+    schemas: formSchemas,
     actionColOptions: {
       span: 14,
     },
@@ -54,112 +24,38 @@
     showActionButtonGroup: false,
   });
 
-  const getData = (d, f) => {
-    if (f == 'output') {
-      if (d.id !== null) {
-        const findIndex = unref(outputParamData).findIndex((f) => f.id == d.id);
-        if (findIndex !== -1) unref(outputParamData).splice(findIndex, 1, d);
-      } else {
-        unref(outputParamData).push({ ...d, id: buildUUID() });
-      }
-    }
-  };
-
-  const handleAddOutParam = () => {
-    openModal(true, {
-      isUpdate: true,
-      flag: 'output',
-      excludeStruct: true,
-    });
-  };
-
-  const deleteOutParItem = (index) => {
-    unref(outputParamData).splice(index, 1);
-  };
-
-  const editOutParItem = (item) => {
-    openModal(true, {
-      isUpdate: false,
-      record: item,
-      flag: 'output',
-      excludeStruct: true,
-    });
-  };
-
-  const setTypeData = (T, D) => {
-    if (T === 'INT' || T === 'DOUBLE' || T === 'TEXT') {
-      return {
-        ...D?.dataSpecs,
-        valueRange: D?.dataSpecs,
-      };
-    } else if (T === 'BOOL') {
-      return {
-        boolClose: D?.dataSpecsList[0]?.name,
-        boolOpen: D?.dataSpecsList[1]?.name,
-      };
-    }
-  };
-
-  //回显数据
-  const setFormData = (v) => {
-    setFieldsValue({ ...v[0] });
-    setFieldsValue(setTypeData(v[0].dataType, v[0]));
-    const { dataSpecsList } = v[0];
-    if (dataSpecsList !== undefined) {
-      outputParamData.value = [...new Array(dataSpecsList.length).keys()];
-      outputParamData.value = dataSpecsList;
-    }
-  };
+  async function getFormData(): Promise<Partial<ModelOfMatterParams>> {
+    const _values = (await validate()) as StructFormValue;
+    if (!_values) return {};
+    let value = transformFormValue(_values);
+    return value;
+  }
 
-  //获取结构体数据
-  const getStructList = () => {
-    const val = unref(dynamicBindRef.outputParamItemRef)?.map((item: any) => item.getFormData());
-    return val;
+  const resetFormData = () => {
+    resetFields();
   };
 
-  const getBoolOrStructData = (T, S, B) => {
-    if (T === 'STRUCT') {
-      return S;
-    } else {
-      return B;
-    }
-  };
+  const setFormData = (record: StructRecord) => {
+    const { functionJson } = record as StructRecord;
+    const { specs = {} } = functionJson || ({} as StructRecord['functionJson']);
 
-  async function getFormData() {
-    const values = await validate();
-    if (!values) return;
-    const dataSpecsList = getStructList();
-    if (values.dataType === 'STRUCT') {
-      validateValueStruct(dataSpecsList as any);
-    }
-    const dataSpecs = useChangeTypeGetTypeForm(values.dataType, values);
-    const dataSpecsListBool = useChangeTypeGetTypeForm(values.dataType, values);
-    const { valueRange, step, unit, outputParam, ...value } = values;
-    const none = {
-      ...outputParam,
-      ...step,
-      ...unit,
-      ...valueRange,
-    };
-    console.log(none);
-    return {
-      ...value,
-      ...{ dataSpecs },
-      ...{
-        dataSpecsList: getBoolOrStructData(values.dataType, dataSpecsList, dataSpecsListBool),
+    const value = {
+      ...record,
+      ...functionJson,
+      ...specs,
+      valueRange: {
+        min: specs.min,
+        max: specs.max,
       },
     };
-  }
 
-  const resetFormData = () => {
-    resetFields();
-    outputParamData.value = [];
+    setFieldsValue(value);
   };
 
   defineExpose({
-    setFormData,
     resetFormData,
     getFormData,
+    setFormData,
   });
 </script>
 <style lang="less" scoped>

@@ -3,20 +3,20 @@
     <BasicForm @register="registerForm">
       <template #structSlot>
         <div>
-          <template v-for="(item, index) in outputParamData" :key="item">
-            <span style="display: none">{{ item }}</span>
+          <template v-for="item in outputParamData" :key="item.id">
+            <span class="hidden">{{ item }}</span>
             <InputParamItem
-              :title="item.name"
               :item="item"
               class="mt-4"
-              :index="index"
               :ref="dynamicBindRef.outputParamItemRef"
               @delete="deleteOutParItem"
               @edit="editOutParItem"
             />
           </template>
-          <div style="display: flex" :class="{ 'mt-2': outputParamData.length > 0 }">
-            <span class="add-style">+</span>
+          <div class="flex" :class="{ 'mt-2': outputParamData.length > 0 }">
+            <span class="add-style">
+              <PlusOutlined />
+            </span>
             <span class="add-style" @click="handleAddOutParam">增加参数</span>
           </div>
         </div>
@@ -28,21 +28,28 @@
 <script lang="ts" setup>
   import { ref, unref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { addParamsSchemas } from '../config';
+  import { addParamsSchemas, FormField } from '../config';
   import { useModal } from '/@/components/Modal';
   import InputParamItem from './InputParamItem.vue';
   import AddParamsModal from './AddParamsModal.vue';
   import { buildUUID } from '/@/utils/uuid';
-  import { useChangeTypeGetTypeForm, useUpdateFormExcludeStruct } from '../../hook/useTypeGetForm';
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import { FunctionJson, ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
+  import { transformFormValue } from '/@/components/Form/src/externalCompns/components/StructForm/util';
+  import { StructFormValue } from '/@/components/Form/src/externalCompns/components/StructForm/type';
+  type OutputParam = FunctionJson & { id: string };
 
   defineEmits(['register']);
-  const outputParamData: any = ref([]);
+
+  const outputParamData = ref<OutputParam[]>([]);
+
   const dynamicBindRef = {
     outputParamItemRef: ref([]),
   };
+
   const [registerModal, { openModal }] = useModal();
 
-  const [registerForm, { validate, setFieldsValue, resetFields, updateSchema }] = useForm({
+  const [registerForm, { validate, resetFields, updateSchema }] = useForm({
     labelWidth: 100,
     schemas: addParamsSchemas,
     actionColOptions: {
@@ -53,15 +60,8 @@
     showActionButtonGroup: false,
   });
 
-  const getData = (d, f) => {
-    if (f == 'output') {
-      if (d.id !== null) {
-        const findIndex = unref(outputParamData).findIndex((f) => f.id == d.id);
-        if (findIndex !== -1) unref(outputParamData).splice(findIndex, 1, d);
-      } else {
-        unref(outputParamData).push({ ...d, id: buildUUID() });
-      }
-    }
+  const getData = (value: FunctionJson) => {
+    unref(outputParamData).push({ ...value, id: buildUUID() });
   };
 
   const handleAddOutParam = () => {
@@ -72,11 +72,12 @@
     });
   };
 
-  const deleteOutParItem = (index) => {
-    unref(outputParamData).splice(index, 1);
+  const deleteOutParItem = (value: OutputParam) => {
+    const index = unref(outputParamData).findIndex((item) => item.id === value.id);
+    ~index && unref(outputParamData).splice(index, 1);
   };
 
-  const editOutParItem = (item) => {
+  const editOutParItem = (item: FunctionJson) => {
     openModal(true, {
       isUpdate: false,
       record: item,
@@ -85,98 +86,26 @@
     });
   };
 
-  const updateFormExcludeStruct = (flag) => useUpdateFormExcludeStruct(flag, updateSchema);
-
-  const getOutputStructList = () =>
-    unref(dynamicBindRef.outputParamItemRef)?.map((item: any) => item.getFormData());
-
-  const getBoolOrStruct = (T, S, B) => {
-    if (T === 'STRUCT') {
-      return S;
-    } else if (T === 'INT' || T === 'DOUBLE' || T === 'TEXT') {
-      return null;
-    } else {
-      return B;
-    }
-  };
-
-  const getIntOrText = (T, D) => {
-    if (T === 'STRUCT') {
-      return null;
-    } else if (T === 'INT' || T === 'DOUBLE' || T === 'TEXT') {
-      return D;
-    }
-  };
-
-  const getFormData = async () => {
-    const values = await validate();
-    if (!values) return;
-    const outputParams = getOutputStructList();
-    outputParams.forEach((f) => {
-      f.dataType = 'STRUCT';
-      f.childDataType = values.dataType;
-      f.childName = values.name;
+  const updateFormExcludeStruct = () => {
+    const options = useUpdateFormExcludeStruct();
+    updateSchema({
+      field: FormField.TYPE,
+      componentProps: { options },
     });
-    const dataSpecs = useChangeTypeGetTypeForm(values.dataType, values);
-    const dataSpecsList = useChangeTypeGetTypeForm(values.dataType, values);
-    const { boolClose, boolOpen, step, unit, valueRange, ...value } = values;
-    const none = {
-      ...boolClose,
-      ...boolOpen,
-      ...step,
-      ...unit,
-      ...valueRange,
-    };
-    console.log(none);
-    return {
-      ...value,
-      ...{
-        dataSpecs: getIntOrText(values.dataType, dataSpecs),
-      },
-      // ...{
-      //   childSpecsDTO: getIntOrText(values.dataType, dataSpecs),
-      // },
-      ...{
-        dataSpecsList: getBoolOrStruct(values.dataType, outputParams, dataSpecsList),
-      },
-      // ...{ childEnumSpecsDTO: getBoolOrStruct(values.dataType, outputParams, dataSpecsList) },
-      // ...{
-      //   childDataType: values.dataType,
-      //   childName: values.name,
-      // },
-    };
   };
 
-  const setFormData = (v) => {
-    setFieldsValue(v);
-    setFieldsValue({
-      ...v.dataSpecs,
-      valueRange: v.dataSpecs,
-    });
+  const getFormData = async (): Promise<Partial<ModelOfMatterParams>> => {
     try {
-      setFieldsValue({
-        boolClose: v.dataType == 'BOOL' ? v.dataSpecsList[0].name : '',
-        boolOpen: v.dataType == 'BOOL' ? v.dataSpecsList[1].name : '',
-      });
-    } catch (e) {
-      console.log(e);
-    }
-    const { dataSpecsList, dataType, childDataType } = v;
-    if (childDataType == 'BOOL') {
-      setFieldsValue({
-        dataType: childDataType,
-        boolClose: dataSpecsList[0].name,
-        boolOpen: dataSpecsList[1].name,
-      });
-    }
-    try {
-      if (dataType == 'BOOL' || dataType == 'STRUCT') {
-        outputParamData.value = [...new Array(dataSpecsList.length).keys()];
-        outputParamData.value = dataSpecsList;
-      }
-    } catch (e) {
-      console.log(e);
-    }
+      const values = (await validate()) as StructFormValue;
+      if (!values) return {} as unknown as ModelOfMatterParams;
+      const functionJson = transformFormValue(values);
+      return functionJson;
+    } catch (error) {}
+    return {} as unknown as ModelOfMatterParams;
+  };
+
+  const setFormData = (value: FunctionJson) => {
+    setFormData(value);
   };
 
   const resetFormData = () => {

@@ -17,7 +17,6 @@
   import { ref, computed, reactive } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import AddParamForm from './AddParamForm.vue';
-  import { validateValueStruct } from '../../hook/useValidateParital';
 
   const emits = defineEmits(['register', 'data']);
   const setEditData: any = reactive({
@@ -29,9 +28,9 @@
   const excludeStruct = ref(false);
   const getTitle = computed(() => (!isUpdate.value ? '编辑参数' : '新增参数'));
 
-  const [register, { closeModal, setModalProps }] = useModalInner(async (data) => {
+  const [register, { setModalProps }] = useModalInner(async (data) => {
     setModalProps({ loading: true });
-    handleCancel(false);
+
     isUpdate.value = data.isUpdate;
     isFlag.value = data.flag;
     excludeStruct.value = data.excludeStruct;
@@ -45,29 +44,15 @@
     }
   });
 
-  const handleCancel = (flag) => {
+  const handleCancel = () => {
     AddParamFormRef.value?.resetFormData();
-    if (flag) {
-      closeModal();
-    }
   };
 
   const handleSubmit = async () => {
     const value = await AddParamFormRef.value?.getFormData();
     if (!value) return;
-    if (value.dataType === 'STRUCT') {
-      validateValueStruct(value.dataSpecsList as any);
-    }
-    emits(
-      'data',
-      {
-        ...value,
-        ...{ id: !isUpdate.value ? setEditData.getEditData.id : null },
-        ...{ index: !isUpdate.value ? setEditData.getEditData.index : null },
-      },
-      isFlag.value
-    );
-    handleCancel(true);
+    emits('data', value);
+    handleCancel();
   };
 </script>
 <style lang="less" scope></style>

 <template>
   <div>
-    <a-card :title="`参数名称：${title}`" style="width: 540px; margin-top: -5px">
+    <a-card :title="`参数名称：${item.id}`" style="width: 540px; margin-top: -5px">
       <template #extra>
         <div style="display: flex; align-items: center">
-          <span style="color: #0170cc; cursor: pointer" @click="handleEdit(item, index)">编辑</span>
+          <span style="color: #0170cc; cursor: pointer" @click="handleEdit">编辑</span>
           <a-divider type="vertical" style="height: 12px; background-color: #d8d8d8" />
-          <span style="color: #0170cc; cursor: pointer" class="ml-1" @click="handleDelete(index)"
+          <span style="color: #0170cc; cursor: pointer" class="ml-1" @click="handleDelete"
             >删除</span
           >
         </div>
@@ -14,33 +14,26 @@
   </div>
 </template>
 <script lang="ts" setup>
+  import { FunctionJson } from '/@/api/device/model/modelOfMatterModel';
+
   const emit = defineEmits(['delete', 'edit']);
+
+  type ItemRecrod = FunctionJson & { id: string };
+
   const props = defineProps({
-    index: {
-      type: Number,
-      required: true,
-    },
-    title: {
-      type: String,
-      default: '',
-    },
     item: {
-      type: Object,
+      type: Object as PropType<ItemRecrod>,
       required: true,
       default: () => {},
     },
   });
 
-  const handleDelete = (index) => {
-    emit('delete', index);
+  const handleDelete = () => {
+    emit('delete', props.item);
   };
 
-  const handleEdit = (item, index) => {
-    const value = {
-      ...item,
-      ...{ index },
-    };
-    emit('edit', value);
+  const handleEdit = () => {
+    emit('edit', props.item);
   };
 
   const getFormData = () => {

 import { FormSchema } from '/@/components/Table';
 import { findDictItemByCode } from '/@/api/system/dict';
 
+export enum FormField {
+  FUNCTION_NAME = 'functionName',
+  FUNCTION_TYPE = 'functionType',
+  FUNCTION_JSON = 'functionJson',
+  IDENTIFIER = 'identifier',
+  TYPE = 'type',
+  REFARK = 'remark',
+  MIN = 'min',
+  MAX = 'max',
+  UNIT = 'unit',
+  UNIT_NAME = 'unitName',
+  STEP = 'step',
+  VALUE_RANGE = 'valueRange',
+  BOOL_CLOSE = 'boolClose',
+  BOOL_OPEN = 'boolOpen',
+  LENGTH = 'length',
+  R_W_FLAG = 'rwFlag',
+  SPECS_LIST = 'specsList',
+  CALL_TYPE = 'callType',
+  INPUT_PARAM = 'inputParam',
+  EVENT_TYPE = 'eventType',
+
+  STRUCT = 'struct',
+}
+
+export enum FunctionType {
+  PROPERTIES = 'properties',
+  EVENTS = 'events',
+  SERVICE = 'services',
+}
+
+/**
+ * 新增参数 动态显示表单
+ */
+export enum DateTypeEnum {
+  IS_NUMBER_INT = 'INT',
+  IS_NUMBER_DOUBLE = 'DOUBLE',
+  IS_STRING = 'TEXT',
+  IS_STRUCT = 'STRUCT',
+  IS_BOOL = 'BOOL',
+}
+
+const isNumber = (type: string) => {
+  return type === DateTypeEnum.IS_NUMBER_INT || type === DateTypeEnum.IS_NUMBER_DOUBLE;
+};
+
+const isString = (type: string) => {
+  return type === DateTypeEnum.IS_STRING;
+};
+const isStruct = (type: string) => {
+  return type === DateTypeEnum.IS_STRUCT;
+};
+
+const isBool = (type: string) => {
+  return type === DateTypeEnum.IS_BOOL;
+};
+
 export const defaultTslContent = {
   schema: 'https://iotx-tsl.oss-ap-southeast-1.aliyuncs.com/schema.json',
   profile: {
@@ -24,180 +81,9 @@ export const defaultTslContent = {
   ],
 };
 
-export const attrSchemas: FormSchema[] = [
-  {
-    field: 'name',
-    label: '功能名称',
-    required: true,
-    component: 'Input',
-    colProps: {
-      span: 18,
-    },
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入功能名称',
-    },
-  },
-  {
-    field: 'identifier',
-    label: '标识符',
-    required: true,
-    component: 'Input',
-    colProps: {
-      span: 18,
-    },
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入标识符',
-    },
-  },
-  {
-    field: 'dataType',
-    label: '数据类型',
-    required: true,
-    component: 'ApiSelect',
-    colProps: {
-      span: 9,
-    },
-    defaultValue: 'INT',
-    componentProps: {
-      placeholder: '请选择数据类型',
-      api: findDictItemByCode,
-      params: {
-        dictCode: 'data_type',
-      },
-      labelField: 'itemText',
-      valueField: 'itemValue',
-    },
-  },
-  {
-    field: 'valueRange',
-    label: '取值范围',
-    component: 'CustomeMinMaxInput',
-    colProps: {
-      span: 18,
-    },
-    ifShow: ({ values }) => isNumber(values.dataType),
-  },
-  {
-    field: 'step',
-    label: '步长',
-    component: 'Input',
-    colProps: {
-      span: 18,
-    },
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入步长',
-    },
-    ifShow: ({ values }) => isNumber(values.dataType),
-  },
-  {
-    field: 'unit',
-    label: '单位',
-    component: 'ApiSelect',
-    colProps: {
-      span: 9,
-    },
-    componentProps: {
-      placeholder: '请选择单位',
-      api: findDictItemByCode,
-      params: {
-        dictCode: 'attribute_unit',
-      },
-      labelField: 'itemText',
-      valueField: 'itemValue',
-    },
-    ifShow: ({ values }) => isNumber(values.dataType),
-  },
-  {
-    field: 'boolClose',
-    component: 'Input',
-    required: true,
-    label: '0 -',
-    colProps: {
-      span: 18,
-    },
-    componentProps: {
-      placeholder: '如：关',
-    },
-    ifShow: ({ values }) => isBool(values.dataType),
-  },
-  {
-    field: 'boolOpen',
-    component: 'Input',
-    required: true,
-    label: '1 -',
-    colProps: {
-      span: 18,
-    },
-    componentProps: {
-      placeholder: '如：开',
-    },
-    ifShow: ({ values }) => isBool(values.dataType),
-  },
-  {
-    field: 'length',
-    component: 'Input',
-    required: true,
-    label: '数据长度',
-    defaultValue: '10240',
-    colProps: {
-      span: 8,
-    },
-    componentProps: {
-      placeholder: '请输入数据长度',
-    },
-    renderComponentContent: () => {
-      return {
-        suffix: () => '字节',
-      };
-    },
-    ifShow: ({ values }) => isString(values.dataType),
-  },
-  {
-    field: 'rwFlag',
-    component: 'ApiRadioGroup',
-    label: '读写类型',
-    required: true,
-    colProps: {
-      span: 24,
-    },
-    defaultValue: 'READ_ONLY',
-    componentProps: {
-      placeholder: '请选择读写类型',
-      api: findDictItemByCode,
-      params: {
-        dictCode: 'read_write_type',
-      },
-      labelField: 'itemText',
-      valueField: 'itemValue',
-    },
-  },
-  {
-    field: 'outputParam',
-    label: 'JSON 对象',
-    component: 'Input',
-    // required: true,
-    slot: 'outputParamSlot',
-    colProps: { span: 24 },
-    ifShow: ({ values }) => isStruct(values.dataType),
-  },
-  {
-    label: '描述',
-    field: 'description',
-    component: 'InputTextArea',
-    componentProps: {
-      rows: 6,
-      maxLength: 100,
-      placeholder: '请输入描述',
-    },
-  },
-];
-
 export const serviceSchemas: FormSchema[] = [
   {
-    field: 'serviceName',
+    field: FormField.FUNCTION_NAME,
     label: '功能名称',
     required: true,
     component: 'Input',
@@ -210,7 +96,7 @@ export const serviceSchemas: FormSchema[] = [
     },
   },
   {
-    field: 'identifier',
+    field: FormField.IDENTIFIER,
     label: '标识符',
     required: true,
     component: 'Input',
@@ -223,7 +109,7 @@ export const serviceSchemas: FormSchema[] = [
     },
   },
   {
-    field: 'callType',
+    field: FormField.CALL_TYPE,
     component: 'ApiRadioGroup',
     label: '调用方式',
     required: true,
@@ -242,22 +128,22 @@ export const serviceSchemas: FormSchema[] = [
     },
   },
   {
-    field: 'inputParam',
+    field: FormField.INPUT_PARAM,
     label: '输入参数',
     component: 'Input',
     slot: 'inputParamSlot',
     colProps: { span: 24 },
   },
   {
-    field: 'outputParam',
+    field: FormField.SPECS_LIST,
     label: '输出参数',
     component: 'Input',
     slot: 'outputParamSlot',
     colProps: { span: 24 },
   },
   {
-    label: '描述',
-    field: 'description',
+    field: FormField.REFARK,
+    label: '备注',
     component: 'InputTextArea',
     componentProps: {
       rows: 6,
@@ -269,7 +155,7 @@ export const serviceSchemas: FormSchema[] = [
 
 export const eventSchemas: FormSchema[] = [
   {
-    field: 'eventName',
+    field: FormField.FUNCTION_NAME,
     label: '功能名称',
     required: true,
     component: 'Input',
@@ -282,7 +168,7 @@ export const eventSchemas: FormSchema[] = [
     },
   },
   {
-    field: 'identifier',
+    field: FormField.IDENTIFIER,
     label: '标识符',
     required: true,
     component: 'Input',
@@ -295,7 +181,7 @@ export const eventSchemas: FormSchema[] = [
     },
   },
   {
-    field: 'eventType',
+    field: FormField.EVENT_TYPE,
     component: 'ApiRadioGroup',
     label: '事件类型',
     required: true,
@@ -314,15 +200,15 @@ export const eventSchemas: FormSchema[] = [
     },
   },
   {
-    field: 'outputParam',
+    field: FormField.SPECS_LIST,
     label: '输出参数',
     component: 'Input',
     slot: 'outputParamSlot',
     colProps: { span: 24 },
   },
   {
-    label: '描述',
-    field: 'description',
+    field: FormField.REFARK,
+    label: '备注',
     component: 'InputTextArea',
     componentProps: {
       rows: 6,
@@ -332,34 +218,9 @@ export const eventSchemas: FormSchema[] = [
   },
 ];
 
-/**
- * 新增参数 动态显示表单
- */
-enum DateTypeEnum {
-  IS_NUMBER_INT = 'INT',
-  IS_NUMBER_DOUBLE = 'DOUBLE',
-  IS_STRING = 'TEXT',
-  IS_STRUCT = 'STRUCT',
-  IS_BOOL = 'BOOL',
-}
-const isNumber = (type: string) => {
-  return type === DateTypeEnum.IS_NUMBER_INT || type === DateTypeEnum.IS_NUMBER_DOUBLE;
-};
-
-const isString = (type: string) => {
-  return type === DateTypeEnum.IS_STRING;
-};
-const isStruct = (type: string) => {
-  return type === DateTypeEnum.IS_STRUCT;
-};
-
-const isBool = (type: string) => {
-  return type === DateTypeEnum.IS_BOOL;
-};
-
 export const addParamsSchemas: FormSchema[] = [
   {
-    field: 'name',
+    field: FormField.FUNCTION_NAME,
     label: '参数名称',
     required: true,
     component: 'Input',
@@ -372,7 +233,7 @@ export const addParamsSchemas: FormSchema[] = [
     },
   },
   {
-    field: 'identifier',
+    field: FormField.IDENTIFIER,
     label: '标识符',
     required: true,
     component: 'Input',
@@ -385,7 +246,7 @@ export const addParamsSchemas: FormSchema[] = [
     },
   },
   {
-    field: 'dataType',
+    field: FormField.TYPE,
     label: '数据类型',
     required: true,
     component: 'ApiSelect',
@@ -404,17 +265,16 @@ export const addParamsSchemas: FormSchema[] = [
     },
   },
   {
-    field: 'structSlot',
+    field: FormField.STRUCT,
     label: 'JSON 对象',
     component: 'Input',
-    slot: 'structSlot',
     colProps: {
       span: 23,
     },
-    ifShow: ({ values }) => isStruct(values.dataType),
+    ifShow: ({ values }) => isStruct(values[FormField.TYPE]),
   },
   {
-    field: 'boolClose',
+    field: FormField.BOOL_CLOSE,
     component: 'Input',
     required: true,
     label: '0 -',
@@ -424,10 +284,10 @@ export const addParamsSchemas: FormSchema[] = [
     componentProps: {
       placeholder: '如：关',
     },
-    ifShow: ({ values }) => isBool(values.dataType),
+    ifShow: ({ values }) => isBool(values[FormField.TYPE]),
   },
   {
-    field: 'boolOpen',
+    field: FormField.BOOL_OPEN,
     component: 'Input',
     required: true,
     label: '1 -',
@@ -437,10 +297,10 @@ export const addParamsSchemas: FormSchema[] = [
     componentProps: {
       placeholder: '如：开',
     },
-    ifShow: ({ values }) => isBool(values.dataType),
+    ifShow: ({ values }) => isBool(values[FormField.TYPE]),
   },
   {
-    field: 'length',
+    field: FormField.LENGTH,
     component: 'Input',
     required: true,
     label: '数据长度',
@@ -456,19 +316,19 @@ export const addParamsSchemas: FormSchema[] = [
         suffix: () => '字节',
       };
     },
-    ifShow: ({ values }) => isString(values.dataType),
+    ifShow: ({ values }) => isString(values[FormField.TYPE]),
   },
   {
-    field: 'valueRange',
+    field: FormField.VALUE_RANGE,
     label: '取值范围',
-    component: 'CustomeMinMaxInput',
+    component: 'CustomMinMaxInput',
     colProps: {
       span: 23,
     },
-    ifShow: ({ values }) => isNumber(values.dataType),
+    ifShow: ({ values }) => isNumber(values[FormField.TYPE]),
   },
   {
-    field: 'step',
+    field: FormField.STEP,
     label: '步长',
     component: 'Input',
     colProps: {
@@ -478,10 +338,10 @@ export const addParamsSchemas: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入步长',
     },
-    ifShow: ({ values }) => isNumber(values.dataType),
+    ifShow: ({ values }) => isNumber(values[FormField.TYPE]),
   },
   {
-    field: 'unit',
+    field: FormField.UNIT,
     label: '单位',
     component: 'ApiSelect',
     colProps: {
@@ -496,6 +356,6 @@ export const addParamsSchemas: FormSchema[] = [
       labelField: 'itemText',
       valueField: 'itemValue',
     },
-    ifShow: ({ values }) => isNumber(values.dataType),
+    ifShow: ({ values }) => isNumber(values[FormField.TYPE]),
   },
 ];

-import { validateValueBool, validateValueRangeAndStep } from './useValidateParital';
-import { findDictItemByCode } from '/@/api/system/dict';
-
-///根据不同数据类型得到不同表单数据
-type TForm = {
-  dataType: string;
-  max?: string;
-  min?: string;
-  step?: string;
-  unit?: string;
-  boolClose?: string;
-  boolOpen?: string;
-  length?: string;
-  valueRange?: {
-    min: string;
-    max: string;
-  };
-};
-export const useChangeTypeGetTypeForm = (type, options: TForm) => {
-  switch (type) {
-    //INT和DOUBLE收集表单一样
-    case 'INT':
-      validateValueRangeAndStep(
-        Number(options?.valueRange?.min),
-        Number(options?.step),
-        Number(options?.valueRange?.max)
-      );
-      return {
-        dataType: options?.dataType,
-        max: options?.valueRange?.max,
-        min: options?.valueRange?.min,
-        step: options?.step,
-        unit: options?.unit,
-      };
-    case 'DOUBLE':
-      validateValueRangeAndStep(
-        Number(options?.valueRange?.min),
-        Number(options?.step),
-        Number(options?.valueRange?.max)
-      );
-      return {
-        dataType: options?.dataType,
-        max: options?.valueRange?.max,
-        min: options?.valueRange?.min,
-        step: options?.step,
-        unit: options?.unit,
-      };
-    case 'BOOL':
-      validateValueBool(Number(options?.boolClose), Number(options?.boolOpen));
-      return [
-        {
-          dataType: options?.dataType,
-          name: options?.boolClose,
-          value: '0',
-        },
-        {
-          dataType: options?.dataType,
-          name: options?.boolOpen,
-          value: '1',
-        },
-      ];
-    case 'TEXT':
-      return {
-        dataType: options?.dataType,
-        length: options?.length,
-      };
-  }
-};
-
-//是否排除结构体
-export const useUpdateFormExcludeStruct = async (F, U) => {
-  const res: any = await findDictItemByCode({ dictCode: 'data_type' });
-  const optionTrue = res
-    .map((m) => {
-      if (F) {
-        if (m.itemValue !== 'STRUCT') {
-          return {
-            value: m.itemValue,
-            label: m.itemText,
-          };
-        }
-      } else {
-        return {
-          value: m.itemValue,
-          label: m.itemText,
-        };
-      }
-    })
-    .filter(Boolean);
-  U({
-    field: 'dataType',
-    componentProps: {
-      options: optionTrue,
-    },
-  });
-};

-/**
- * 校验部分字段
- */
-import { useMessage } from '/@/hooks/web/useMessage';
-const { createMessage } = useMessage();
-
-export const validateValueRangeAndStep = (min, step, max) => {
-  if (min > max) {
-    createMessage.error('最大值必须大于最小值，整数型不能有小数位，单精度有效位为7，双精度为16');
-    throw '最大值必须大于最小值，整数型不能有小数位，单精度有效位为7，双精度为16';
-  }
-  if (step > max - min) {
-    createMessage.error('步长不能大于取值范围的差值');
-    throw '步长不能大于取值范围的差值';
-  }
-};
-
-export const validateValueBool = (boolClose, boolOpen) => {
-  if (boolClose == boolOpen) {
-    createMessage.error('布尔值不能相同');
-    throw '布尔值不能相同';
-  }
-};
-
-export const validateValueStruct = (data: []) => {
-  if (data.length === 0) {
-    createMessage.error('struct不能为空');
-    throw 'struct不能为空';
-  }
-};

+import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
+
+export enum OpenModelMode {
+  UPDATE = 'update',
+  CREATE = 'create',
+  VIEW = 'view',
+}
+
+export interface OpenModelOfMatterModelParams {
+  mode: OpenModelMode;
+  record: ModelOfMatterParams;
+}