Merge branch 'ww' into 'main'

fix: 修复产品详情物模型管理结构体类型能无限嵌套,修复后只能嵌套一层

See merge request yunteng/thingskit-front!492

@@ -179,6 +179,11 @@ export interface DeviceRecord {
   profileId: string;
   alias?: string;
   brand?: string;
+  deviceProfile: {
+    default: boolean;
+    name: string;
+    transportType: string;
+  };
 }
 
 export interface DeviceModelOfMatterAttrs {

@@ -20,9 +20,11 @@
     defineProps<{
       value: ModelOfMatterParams[];
       disabled: boolean;
+      hasStructForm?: boolean;
     }>(),
     {
       value: () => [],
+      hasStructForm: false,
     }
   );
 
@@ -106,6 +108,7 @@
       </div>
     </div>
     <StructFormModel
+      :has-struct-form="$props.hasStructForm!"
       :disabled="$props.disabled"
       @register="registerModal"
       @submit="handleSaveStruct"

@@ -18,13 +18,13 @@
     mode: OpenModalMode.CREATE,
   });
 
-  const props = defineProps<{ disabled: boolean }>();
+  const props = defineProps<{ disabled: boolean; hasStructForm: boolean }>();
 
   const emit = defineEmits(['register', 'submit']);
 
   const [register, { validate, setFieldsValue, setProps }] = useForm({
     labelWidth: 100,
-    schemas: formSchemas,
+    schemas: formSchemas(props.hasStructForm),
     actionColOptions: {
       span: 14,
     },

@@ -27,272 +27,288 @@ export const validateJSON = (_rule, value: ModelOfMatterParams[], _callback) =>
   return Promise.reject('JSON对象不能为空');
 };
 
-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: async (params: Recordable) => {
-        try {
-          const record = await findDictItemByCode(params);
-          return record.filter((item) => item.itemValue !== 'STRUCT');
-        } catch (error) {
-          console.log(error);
-          return [];
-        }
+export const formSchemas = (hasStructForm: boolean): FormSchema[] => {
+  return [
+    {
+      field: FormField.FUNCTION_NAME,
+      label: '功能名称',
+      required: true,
+      component: 'Input',
+      colProps: {
+        span: 18,
       },
-      params: {
-        dictCode: 'data_type',
+      componentProps: {
+        maxLength: 255,
+        placeholder: '请输入功能名称',
       },
-      labelField: 'itemText',
-      valueField: 'itemValue',
-      getPopupContainer: () => document.body,
-    },
-  },
-  {
-    field: FormField.VALUE_RANGE,
-    label: '取值范围',
-    component: 'CustomMinMaxInput',
-    valueField: 'value',
-    changeEvent: 'update:value',
-    colProps: {
-      span: 18,
     },
-    ifShow: ({ values }) =>
-      values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_INT ||
-      values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_DOUBLE,
-    rules: [{ validator: validateValueRange }],
-  },
-  {
-    field: FormField.STEP,
-    label: '步长',
-    component: 'InputNumber',
-    colProps: {
-      span: 18,
-    },
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入步长',
-      min: 1,
-      formatter: (value: number | string) => {
-        return value ? Math.floor(Number(value)) : value;
+    {
+      field: FormField.IDENTIFIER,
+      label: '标识符',
+      required: true,
+      component: 'Input',
+      colProps: {
+        span: 18,
+      },
+      componentProps: {
+        maxLength: 255,
+        placeholder: '请输入标识符',
       },
     },
-    ifShow: ({ values }) =>
-      values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_INT ||
-      values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_DOUBLE,
-    dynamicRules: ({ model }) => {
-      const valueRange = model[FormField.VALUE_RANGE] || {};
-      const { min = 0, max = 0 } = valueRange;
-      const step = model[FormField.STEP];
-      return [
-        {
-          validator: () => {
-            if (step > max - min) {
-              return Promise.reject('步长不能大于取值范围的差值');
+    {
+      field: FormField.TYPE,
+      label: '数据类型',
+      required: true,
+      component: 'ApiSelect',
+      colProps: {
+        span: 9,
+      },
+      defaultValue: 'INT',
+      componentProps: ({ formActionType }) => {
+        const { updateSchema } = formActionType;
+        return {
+          placeholder: '请选择数据类型',
+          api: async (params: Recordable) => {
+            try {
+              const record = await findDictItemByCode(params);
+              return hasStructForm
+                ? record.filter((item) => item.itemValue !== DataTypeEnum.IS_STRUCT)
+                : record;
+            } catch (error) {
+              console.log(error);
+              return [];
             }
-            return Promise.resolve();
           },
-        },
-      ];
-    },
-  },
-  {
-    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: async (params) => {
-          const list = await findDictItemByCode(params);
-          list.map((item) => (item.itemText = `${item.itemText} / ${item.itemValue}`));
-          return list;
-        },
-        params: {
-          dictCode: 'attribute_unit',
-        },
-        labelInValue: true,
-        labelField: 'itemText',
-        valueField: 'itemValue',
-        onChange(_, record: Record<'label' | 'value', string>) {
-          if (record) {
-            const { label } = record;
-            setFieldsValue({ [FormField.UNIT_NAME]: label });
-          }
-        },
-        getPopupContainer: () => document.body,
-        showSearch: true,
-        filterOption: (inputValue: string, option: Record<'label' | 'value', string>) => {
-          let { label, value } = option;
-          label = label.toLowerCase();
-          value = value.toLowerCase();
-          inputValue = inputValue.toLowerCase();
-          return label.includes(inputValue) || value.includes(inputValue);
-        },
-      };
-    },
-    ifShow: ({ values }) =>
-      values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_INT ||
-      values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_DOUBLE,
-  },
-  {
-    field: FormField.BOOL_CLOSE,
-    component: 'Input',
-    required: true,
-    label: '0 -',
-    colProps: {
-      span: 18,
+          params: {
+            dictCode: 'data_type',
+          },
+          labelField: 'itemText',
+          valueField: 'itemValue',
+          getPopupContainer: () => document.body,
+          onChange: (value: string) => {
+            value === DataTypeEnum.IS_STRUCT &&
+              updateSchema({
+                field: FormField.SPECS_LIST,
+                componentProps: {
+                  hasStructForm: true,
+                },
+              });
+          },
+        };
+      },
     },
-    componentProps: {
-      placeholder: '如：关',
+    {
+      field: FormField.VALUE_RANGE,
+      label: '取值范围',
+      component: 'CustomMinMaxInput',
+      valueField: 'value',
+      changeEvent: 'update:value',
+      colProps: {
+        span: 18,
+      },
+      ifShow: ({ values }) =>
+        values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_INT ||
+        values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_DOUBLE,
+      rules: [{ validator: validateValueRange }],
     },
-    defaultValue: '关',
-    ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_BOOL,
-    dynamicRules: ({ model }) => {
-      const close = model[FormField.BOOL_CLOSE];
-      const open = model[FormField.BOOL_OPEN];
-      return [
-        {
-          required: true,
+    {
+      field: FormField.STEP,
+      label: '步长',
+      component: 'InputNumber',
+      colProps: {
+        span: 18,
+      },
+      componentProps: {
+        maxLength: 255,
+        placeholder: '请输入步长',
+        min: 1,
+        formatter: (value: number | string) => {
+          return value ? Math.floor(Number(value)) : value;
         },
-        {
-          validator() {
-            if (open === close) return Promise.reject('布尔值不能相同');
-            return Promise.resolve();
+      },
+      ifShow: ({ values }) =>
+        values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_INT ||
+        values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_DOUBLE,
+      dynamicRules: ({ model }) => {
+        const valueRange = model[FormField.VALUE_RANGE] || {};
+        const { min = 0, max = 0 } = valueRange;
+        const step = model[FormField.STEP];
+        return [
+          {
+            validator: () => {
+              if (step > max - min) {
+                return Promise.reject('步长不能大于取值范围的差值');
+              }
+              return Promise.resolve();
+            },
           },
-        },
-      ];
+        ];
+      },
     },
-  },
-  {
-    field: FormField.BOOL_OPEN,
-    component: 'Input',
-    required: true,
-    label: '1 -',
-    colProps: {
-      span: 18,
+    {
+      field: FormField.UNIT_NAME,
+      label: '单位名称',
+      component: 'Input',
+      show: false,
     },
-    componentProps: {
-      placeholder: '如：开',
+    {
+      field: FormField.UNIT,
+      label: '单位',
+      component: 'ApiSelect',
+      colProps: {
+        span: 9,
+      },
+      componentProps: ({ formActionType }) => {
+        const { setFieldsValue } = formActionType;
+        return {
+          placeholder: '请选择单位',
+          api: async (params) => {
+            const list = await findDictItemByCode(params);
+            list.map((item) => (item.itemText = `${item.itemText} / ${item.itemValue}`));
+            return list;
+          },
+          params: {
+            dictCode: 'attribute_unit',
+          },
+          labelInValue: true,
+          labelField: 'itemText',
+          valueField: 'itemValue',
+          onChange(_, record: Record<'label' | 'value', string>) {
+            if (record) {
+              const { label } = record;
+              setFieldsValue({ [FormField.UNIT_NAME]: label });
+            }
+          },
+          getPopupContainer: () => document.body,
+          showSearch: true,
+          filterOption: (inputValue: string, option: Record<'label' | 'value', string>) => {
+            let { label, value } = option;
+            label = label.toLowerCase();
+            value = value.toLowerCase();
+            inputValue = inputValue.toLowerCase();
+            return label.includes(inputValue) || value.includes(inputValue);
+          },
+        };
+      },
+      ifShow: ({ values }) =>
+        values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_INT ||
+        values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_DOUBLE,
     },
-    defaultValue: '开',
-    ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_BOOL,
-    dynamicRules: ({ model }) => {
-      const close = model[FormField.BOOL_CLOSE];
-      const open = model[FormField.BOOL_OPEN];
-      return [
-        {
-          required: true,
-        },
-        {
-          validator() {
-            if (open === close) return Promise.reject('布尔值不能相同');
-            return Promise.resolve();
+    {
+      field: FormField.BOOL_CLOSE,
+      component: 'Input',
+      required: true,
+      label: '0 -',
+      colProps: {
+        span: 18,
+      },
+      componentProps: {
+        placeholder: '如：关',
+      },
+      defaultValue: '关',
+      ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_BOOL,
+      dynamicRules: ({ model }) => {
+        const close = model[FormField.BOOL_CLOSE];
+        const open = model[FormField.BOOL_OPEN];
+        return [
+          {
+            required: true,
           },
-        },
-      ];
+          {
+            validator() {
+              if (open === close) return Promise.reject('布尔值不能相同');
+              return Promise.resolve();
+            },
+          },
+        ];
+      },
     },
-  },
-  {
-    field: FormField.LENGTH,
-    component: 'Input',
-    required: true,
-    label: '数据长度',
-    defaultValue: '10240',
-    colProps: {
-      span: 8,
+    {
+      field: FormField.BOOL_OPEN,
+      component: 'Input',
+      required: true,
+      label: '1 -',
+      colProps: {
+        span: 18,
+      },
+      componentProps: {
+        placeholder: '如：开',
+      },
+      defaultValue: '开',
+      ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_BOOL,
+      dynamicRules: ({ model }) => {
+        const close = model[FormField.BOOL_CLOSE];
+        const open = model[FormField.BOOL_OPEN];
+        return [
+          {
+            required: true,
+          },
+          {
+            validator() {
+              if (open === close) return Promise.reject('布尔值不能相同');
+              return Promise.resolve();
+            },
+          },
+        ];
+      },
     },
-    componentProps: {
-      placeholder: '请输入数据长度',
+    {
+      field: FormField.LENGTH,
+      component: 'Input',
+      required: true,
+      label: '数据长度',
+      defaultValue: '10240',
+      colProps: {
+        span: 8,
+      },
+      componentProps: {
+        placeholder: '请输入数据长度',
+      },
+      renderComponentContent: () => {
+        return {
+          suffix: () => '字节',
+        };
+      },
+      ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_STRING,
     },
-    renderComponentContent: () => {
-      return {
-        suffix: () => '字节',
-      };
+    {
+      field: FormField.ACCESS_MODE,
+      component: 'ApiRadioGroup',
+      label: '读写类型',
+      required: true,
+      colProps: {
+        span: 24,
+      },
+      defaultValue: 'r',
+      componentProps: {
+        placeholder: '请选择读写类型',
+        api: findDictItemByCode,
+        params: {
+          dictCode: 'read_write_type',
+        },
+        labelField: 'itemText',
+        valueField: 'itemValue',
+      },
     },
-    ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_STRING,
-  },
-  {
-    field: FormField.ACCESS_MODE,
-    component: 'ApiRadioGroup',
-    label: '读写类型',
-    required: true,
-    colProps: {
-      span: 24,
+    {
+      field: FormField.SPECS_LIST,
+      label: 'JSON对象',
+      component: 'StructForm',
+      valueField: 'value',
+      changeEvent: 'update:value',
+      colProps: { span: 24 },
+      ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_STRUCT,
+      rules: [{ required: true, validator: validateJSON }],
     },
-    defaultValue: 'r',
-    componentProps: {
-      placeholder: '请选择读写类型',
-      api: findDictItemByCode,
-      params: {
-        dictCode: 'read_write_type',
+    {
+      field: FormField.REFARK,
+      label: '备注',
+      component: 'InputTextArea',
+      componentProps: {
+        rows: 4,
+        maxLength: 100,
+        placeholder: '请输入描述',
       },
-      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] === DataTypeEnum.IS_STRUCT,
-    rules: [{ required: true, validator: validateJSON }],
-  },
-  {
-    field: FormField.REFARK,
-    label: '备注',
-    component: 'InputTextArea',
-    componentProps: {
-      rows: 4,
-      maxLength: 100,
-      placeholder: '请输入描述',
     },
-  },
-];
+  ];
+};

@@ -714,62 +714,67 @@ export const TokenSchemas: FormSchema[] = [
   },
 ];
 
-export const CommandSchemas: FormSchema[] = [
-  {
-    field: 'commandType',
-    component: 'RadioGroup',
-    label: '下发类型',
-    colProps: {
-      span: 8,
-    },
-    defaultValue: 'OneWay',
-    componentProps: {
-      options: [
-        {
-          label: '单向',
-          value: 'OneWay',
-        },
-        {
-          label: '双向',
-          value: 'TwoWay',
-        },
-      ],
-    },
-  },
-  {
-    field: 'valueType',
-    label: '命令类型',
-    component: 'RadioGroup',
-    defaultValue: 'json',
-    componentProps: () => {
-      return {
+export const CommandSchemas = (transportType: TransportTypeEnum): FormSchema[] => {
+  return [
+    {
+      field: 'commandType',
+      component: 'RadioGroup',
+      label: '下发类型',
+      colProps: {
+        span: 8,
+      },
+      defaultValue: 'OneWay',
+      componentProps: {
         options: [
-          { label: 'JSON', value: 'json' },
-          { label: '字符串', value: 'string' },
+          {
+            label: '单向',
+            value: 'OneWay',
+          },
+          {
+            label: '双向',
+            value: 'TwoWay',
+          },
         ],
-      };
+      },
     },
-  },
-  {
-    field: 'commandText',
-    label: '请输入命令内容',
-    ifShow: ({ model }) => {
-      return model['valueType'] === 'string';
+    {
+      field: 'valueType',
+      label: '命令类型',
+      component: 'RadioGroup',
+      defaultValue: transportType === TransportTypeEnum.TCP ? 'string' : 'json',
+      componentProps: () => {
+        const options: Record<'label' | 'value', string>[] = [];
+        if (transportType === TransportTypeEnum.TCP) {
+          options.push({ label: '字符串', value: 'string' });
+        } else {
+          options.push({ label: 'JSON', value: 'json' });
+        }
+        return {
+          options,
+        };
+      },
     },
-    component: 'InputTextArea',
-    componentProps: {
-      autosize: {
-        minRows: 6,
+    {
+      field: 'commandText',
+      label: '请输入命令内容',
+      ifShow: ({ model }) => {
+        return model['valueType'] === 'string';
+      },
+      component: 'InputTextArea',
+      componentProps: {
+        autosize: {
+          minRows: 6,
+        },
       },
     },
-  },
-  {
-    field: 'commandValue',
-    label: '请输入命令内容',
-    slot: 'commandSlot',
-    component: 'InputTextArea',
-    show: ({ model }) => {
-      return model['valueType'] === 'json';
+    {
+      field: 'commandValue',
+      label: '请输入命令内容',
+      slot: 'commandSlot',
+      component: 'InputTextArea',
+      show: ({ model }) => {
+        return model['valueType'] === 'json';
+      },
     },
-  },
-];
+  ];
+};

@@ -30,6 +30,8 @@
   import 'jsoneditor/dist/jsoneditor.min.css';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   import { Tooltip } from 'ant-design-vue';
+  import { DeviceRecord } from '/@/api/device/model/deviceModel';
+  import { TransportTypeEnum } from '../../../profiles/components/TransportDescript/const';
 
   interface CommandParams {
     additionalInfo: Recordable;
@@ -43,7 +45,7 @@
     components: { BasicForm, Button, QuestionCircleOutlined, Tooltip },
     props: {
       deviceDetail: {
-        type: Object,
+        type: Object as PropType<DeviceRecord>,
         required: true,
       },
     },
@@ -52,9 +54,12 @@
       const { createMessage } = useMessage();
       const jsonData = ref<CommandParams>({} as unknown as CommandParams);
       const disable = ref(false);
+
       const [registerForm, { getFieldsValue, validate, resetFields }] = useForm({
         labelWidth: 100,
-        schemas: CommandSchemas,
+        schemas: CommandSchemas(
+          props.deviceDetail.deviceProfile.transportType as TransportTypeEnum
+        ),
         labelAlign: 'right',
         showSubmitButton: false,
         showResetButton: false,

+import { Tag } from 'ant-design-vue';
+import { h } from 'vue';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { BasicColumn, FormSchema } from '/@/components/Table';
+import { formatToDateTime } from '/@/utils/dateUtil';
+
+enum EventType {
+  ERROR = 'ERROR',
+  INFO = 'INFO',
+  ALERT = 'ALERT',
+}
+
+enum EventTypeColor {
+  ERROR = 'error',
+  INFO = 'warning',
+  ALERT = 'default',
+}
+
+enum EventTypeName {
+  ERROR = '故障',
+  INFO = '信息',
+  ALERT = '告警',
+}
 
 export const columnSchema: BasicColumn[] = [
   {
     title: '时间',
-    dataIndex: 'time',
+    dataIndex: 'eventTime',
+    format(text) {
+      return formatToDateTime(text, 'YYYY-MM-DD HH:mm:ss');
+    },
   },
   {
     title: '标识符',
@@ -18,6 +42,15 @@ export const columnSchema: BasicColumn[] = [
   {
     title: '事件类型',
     dataIndex: 'eventType',
+    customRender({ text }) {
+      return h(
+        Tag,
+        {
+          color: EventTypeColor[text as EventType],
+        },
+        () => EventTypeName[text as EventType]
+      );
+    },
   },
   {
     title: '输出参数',

@@ -29,11 +29,16 @@
       baseColProps: { span: 6 },
       labelWidth: 80,
       schemas: formSchemas,
-      fieldMapToTime: [['dateRange', ['startTime', 'endTime']]],
+      fieldMapToTime: [['dateRange', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
     },
     beforeFetch: (params: EventManageRequest) => {
+      const page = params.page - 1 < 0 ? 0 : params.page - 1;
+      const _params = Object.keys(params)
+        .filter((key) => params[key])
+        .reduce((prev, next) => ({ ...prev, [next]: params[next] }), {});
       return {
-        ...params,
+        ..._params,
+        page,
         startTime: params.startTime ? new Date(params.startTime).getTime() : params.startTime,
         endTime: params.endTime ? new Date(params.endTime).getTime() : params.endTime,
         tbDeviceId: props.tbDeviceId,
@@ -43,22 +48,16 @@
 
   const [registerModal, { openModal }] = useModal();
 
-  const handleViewDetail = () => {
-    outputData.value = JSON.stringify(
-      {
-        test: '123',
-      },
-      null,
-      2
-    );
+  const handleViewDetail = (record: Record<'eventValue', Recordable>) => {
+    outputData.value = JSON.stringify(record.eventValue, null, 2);
     openModal(true);
   };
 </script>
 
 <template>
   <BasicTable class="event-manage-table" @register="register">
-    <template #outputParams>
-      <span class="cursor-pointer text-blue-500" @click="handleViewDetail">
+    <template #outputParams="{ record }">
+      <span class="cursor-pointer text-blue-500" @click="handleViewDetail(record)">
         <EyeOutlined class="svg:text-blue-500" />
         <span class="ml-2">详情</span>
       </span>

@@ -9,15 +9,16 @@
     transfromToStructJSON,
     excludeIdInStructJSON,
   } from '/@/components/Form/src/externalCompns/components/StructForm/util';
-  import { FunctionType, attributeSchema } from './config';
+  import { FunctionType } from './config';
   import { isArray } from 'lodash';
   import { OpenModelMode } from '../types';
+  import { formSchemas } from '/@/components/Form/src/externalCompns/components/StructForm/config';
 
   defineProps<{ openModalMode: OpenModelMode }>();
 
   const [register, { validate, resetFields, setFieldsValue, setProps }] = useForm({
     labelWidth: 100,
-    schemas: attributeSchema,
+    schemas: formSchemas(false),
     actionColOptions: {
       span: 14,
     },

 import { FormSchema } from '/@/components/Table';
 import { findDictItemByCode } from '/@/api/system/dict';
-import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
-
-export const validateValueRange = (_rule, value: Record<'min' | 'max', number>, _callback) => {
-  value = value || {};
-  const { min, max } = value;
-  if (min >= max) {
-    return Promise.reject('最大值小于最小值');
-  }
-  return Promise.resolve();
-};
-
-export const validateJSON = (_rule, value: ModelOfMatterParams[], _callback) => {
-  if (value.length) {
-    return Promise.resolve();
-  }
-  return Promise.reject('JSON对象不能为空');
-};
 
 export enum FormField {
   FUNCTION_NAME = 'functionName',
@@ -375,265 +358,3 @@ export const addParamsSchemas: FormSchema[] = [
     ifShow: ({ values }) => isNumber(values[FormField.TYPE]),
   },
 ];
-
-export const attributeSchema: 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',
-    valueField: 'value',
-    changeEvent: 'update:value',
-    colProps: {
-      span: 18,
-    },
-    ifShow: ({ values }) =>
-      values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_INT ||
-      values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_DOUBLE,
-    rules: [{ validator: validateValueRange }],
-  },
-  {
-    field: FormField.STEP,
-    label: '步长',
-    component: 'InputNumber',
-    colProps: {
-      span: 18,
-    },
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入步长',
-      min: 1,
-      formatter: (value: number | string) => {
-        return value ? Math.floor(Number(value)) : value;
-      },
-    },
-    ifShow: ({ values }) =>
-      values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_INT ||
-      values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_DOUBLE,
-    dynamicRules: ({ model }) => {
-      const valueRange = model[FormField.VALUE_RANGE] || {};
-      const { min = 0, max = 0 } = valueRange;
-      const step = model[FormField.STEP];
-      return [
-        {
-          validator: () => {
-            if (step > max - min) {
-              return Promise.reject('步长不能大于取值范围的差值');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
-  },
-  {
-    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: async (params) => {
-          const list = await findDictItemByCode(params);
-          list.map((item) => (item.itemText = `${item.itemText} / ${item.itemValue}`));
-          return list;
-        },
-        params: {
-          dictCode: 'attribute_unit',
-        },
-        labelInValue: true,
-        labelField: 'itemText',
-        valueField: 'itemValue',
-        onChange(_, record: Record<'label' | 'value', string>) {
-          if (record) {
-            const { label } = record;
-            setFieldsValue({ [FormField.UNIT_NAME]: label });
-          }
-        },
-        getPopupContainer: () => document.body,
-        showSearch: true,
-        filterOption: (inputValue: string, option: Record<'label' | 'value', string>) => {
-          let { label, value } = option;
-          label = label.toLowerCase();
-          value = value.toLowerCase();
-          inputValue = inputValue.toLowerCase();
-          return label.includes(inputValue) || value.includes(inputValue);
-        },
-      };
-    },
-    ifShow: ({ values }) =>
-      values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_INT ||
-      values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_DOUBLE,
-  },
-  {
-    field: FormField.BOOL_CLOSE,
-    component: 'Input',
-    required: true,
-    label: '0 -',
-    colProps: {
-      span: 18,
-    },
-    componentProps: {
-      placeholder: '如：关',
-    },
-    defaultValue: '关',
-    ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_BOOL,
-    dynamicRules: ({ model }) => {
-      const close = model[FormField.BOOL_CLOSE];
-      const open = model[FormField.BOOL_OPEN];
-      return [
-        {
-          required: true,
-        },
-        {
-          validator() {
-            if (open === close) return Promise.reject('布尔值不能相同');
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
-  },
-  {
-    field: FormField.BOOL_OPEN,
-    component: 'Input',
-    required: true,
-    label: '1 -',
-    colProps: {
-      span: 18,
-    },
-    componentProps: {
-      placeholder: '如：开',
-    },
-    defaultValue: '开',
-    ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_BOOL,
-    dynamicRules: ({ model }) => {
-      const close = model[FormField.BOOL_CLOSE];
-      const open = model[FormField.BOOL_OPEN];
-      return [
-        {
-          required: true,
-        },
-        {
-          validator() {
-            if (open === close) return Promise.reject('布尔值不能相同');
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
-  },
-  {
-    field: FormField.LENGTH,
-    component: 'Input',
-    required: true,
-    label: '数据长度',
-    defaultValue: '10240',
-    colProps: {
-      span: 8,
-    },
-    componentProps: {
-      placeholder: '请输入数据长度',
-    },
-    renderComponentContent: () => {
-      return {
-        suffix: () => '字节',
-      };
-    },
-    ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_STRING,
-  },
-  {
-    field: FormField.ACCESS_MODE,
-    component: 'ApiRadioGroup',
-    label: '读写类型',
-    required: true,
-    colProps: {
-      span: 24,
-    },
-    defaultValue: 'r',
-    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] === DataTypeEnum.IS_STRUCT,
-    rules: [{ required: true, validator: validateJSON }],
-  },
-  {
-    field: FormField.REFARK,
-    label: '备注',
-    component: 'InputTextArea',
-    componentProps: {
-      rows: 4,
-      maxLength: 100,
-      placeholder: '请输入描述',
-    },
-  },
-];

@@ -567,11 +567,11 @@
     //TODO fengtao
     orgId.value = newValue;
     //TODO fengtao
+    const data = await getOrganizationAlarmConfig({ organizationId: newValue });
+    alarmConfigList.value = data.map((item) => ({ label: item.name, value: item.id }));
     setFields(skipUnwrap.triggerItemRefs, true);
     setFields(skipUnwrap.conditionItemRefs, true);
     setFields(skipUnwrap.actionItemRefs, true);
-    const data = await getOrganizationAlarmConfig({ organizationId: newValue });
-    alarmConfigList.value = data.map((item) => ({ label: item.name, value: item.id }));
     // setFields(skipUnwrap.actionItemRefs, true);
     // console.log(unref(organizationIdRef));
     // setAlarmConfig(skipUnwrap.actionItemRefs, true);