fix: exclude id in functionJSON on model of matter page

@@ -4,8 +4,9 @@
 <script lang="ts" setup>
 <script lang="ts" setup>
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { eventSchemas, FunctionType } from './config';
   import { eventSchemas, FunctionType } from './config';
-  import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
+  import { ModelOfMatterParams, StructJSON } from '/@/api/device/model/modelOfMatterModel';
   import { StructFormValue } from '/@/components/Form/src/externalCompns/components/StructForm/type';
   import { StructFormValue } from '/@/components/Form/src/externalCompns/components/StructForm/type';
+  import { excludeIdInStructJSON } from '/@/components/Form/src/externalCompns/components/StructForm/util';
 
 
   const [register, { validate, resetFields, setFieldsValue }] = useForm({
   const [register, { validate, resetFields, setFieldsValue }] = useForm({
     labelWidth: 100,
     labelWidth: 100,
@@ -34,8 +35,13 @@
 
 
   async function getFormData() {
   async function getFormData() {
     const _values = (await validate()) as StructFormValue;
     const _values = (await validate()) as StructFormValue;
-    const { functionName, remark, identifier, outputData, eventType } = _values;
+    const { functionName, remark, identifier, outputData: _outputData, eventType } = _values;
     if (!_values) return {} as unknown as ModelOfMatterParams;
     if (!_values) return {} as unknown as ModelOfMatterParams;
+
+    const outputData = (_outputData as unknown as StructJSON[]).map((item) =>
+      excludeIdInStructJSON(item.dataType!)
+    );
+
     const value = {
     const value = {
       functionName,
       functionName,
       identifier,
       identifier,

@@ -6,8 +6,9 @@
   import { serviceSchemas } from './config';
   import { serviceSchemas } from './config';
   import { FunctionType } from './config';
   import { FunctionType } from './config';
   import { StructFormValue } from '/@/components/Form/src/externalCompns/components/StructForm/type';
   import { StructFormValue } from '/@/components/Form/src/externalCompns/components/StructForm/type';
-  import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
+  import { ModelOfMatterParams, StructJSON } from '/@/api/device/model/modelOfMatterModel';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
+  import { excludeIdInStructJSON } from '/@/components/Form/src/externalCompns/components/StructForm/util';
 
 
   const props = defineProps<{
   const props = defineProps<{
     record: DeviceRecord;
     record: DeviceRecord;
@@ -43,10 +44,24 @@
   //获取数据
   //获取数据
   async function getFormData() {
   async function getFormData() {
     const _values = (await validate()) as StructFormValue;
     const _values = (await validate()) as StructFormValue;
-    const { functionName, remark, identifier, inputData, outputData, serviceCommand, callType } =
-      _values;
+    const {
+      functionName,
+      remark,
+      identifier,
+      inputData: _inputData,
+      outputData: _outputData,
+      serviceCommand,
+      callType,
+    } = _values;
     if (!_values) return {};
     if (!_values) return {};
 
 
+    const outputData = (_outputData as unknown as StructJSON[]).map((item) =>
+      excludeIdInStructJSON(item.dataType!)
+    );
+    const inputData = (_inputData as unknown as StructJSON[]).map((item) =>
+      excludeIdInStructJSON(item.dataType!)
+    );
+
     const value = {
     const value = {
       functionName,
       functionName,
       identifier,
       identifier,

-<template>
-  <div>
-    <BasicForm @register="registerForm">
-      <template #structSlot>
-        <CommomParam
-          ref="CommomParamInParamRef"
-          :isExcludeStruct="true"
-          :isInputParam="true"
-          :inputParamData="inputParamData"
-          @emitAddInParam="handleAddInParam"
-          @emitEditInParam="handleEditInParam"
-          @emitDeletelnParam="handleDelInParam"
-        />
-      </template>
-    </BasicForm>
-    <AddParamsModal @register="registerModal" @data="getData" />
-  </div>
-</template>
-<script lang="ts" setup>
-  import { unref } from 'vue';
-  import { BasicForm, useForm } from '/@/components/Form';
-  import { addParamsSchemas } from '../config';
-  import { useModal } from '/@/components/Modal';
-  import useCommon from '../../hook/useCommon';
-  import AddParamsModal from './AddParamsModal.vue';
-  import CommomParam from './CommomParam.vue';
-  import useDefineVar from '../../hook/useDefineVar';
-
-  defineEmits(['register']);
-
-  const { inputParamData, CommomParamInParamRef } = useDefineVar();
-
-  const { useChangeTypeGetTypeForm, useGetInOrOutData, useUpdateFormExcludeStruct } = useCommon();
-
-  const [registerModal, { openModal }] = useModal();
-
-  const [registerForm, { validate, resetFields, updateSchema }] = useForm({
-    labelWidth: 100,
-    schemas: addParamsSchemas,
-    actionColOptions: {
-      span: 14,
-    },
-    showResetButton: false,
-    submitOnReset: false,
-    showActionButtonGroup: false,
-  });
-
-  const getData = (d, f) => useGetInOrOutData(d, f, unref(inputParamData), []);
-
-  const handleAddInParam = (b, o) => openModal(b, o);
-
-  const handleEditInParam = (b, o) => openModal(b, o);
-
-  const handleDelInParam = (i) => unref(inputParamData).splice(i, 1);
-
-  const updateFormExcludeStruct = (flag) => useUpdateFormExcludeStruct(flag, updateSchema);
-
-  const getOutputStructList = () => CommomParamInParamRef.value?.getInputStructList();
-
-  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.childSpecsDTO = getIntOrText(f.childDataType, f.dataSpecs);
-      f.childEnumSpecsDTO = getBoolOrStruct(f.childDataType, null, f.dataSpecsList);
-    });
-    const dataSpecs = useChangeTypeGetTypeForm(values.dataType, values);
-    const dataSpecsList = useChangeTypeGetTypeForm(values.dataType, values);
-    const { boolClose, boolOpen, step, unit, valueRange, length, ...value } = values;
-    const none = [valueRange, step, unit, boolOpen, boolClose, length]; //没用，防止eslint报未使用变量
-    console.log(none);
-    return {
-      ...{ childName: value.name },
-      ...{ childDataType: value.dataType },
-      ...value,
-      ...{
-        dataSpecs: getIntOrText(values.dataType, dataSpecs),
-      },
-      ...{
-        dataSpecsList: getBoolOrStruct(values.dataType, outputParams, dataSpecsList),
-      },
-    };
-  };
-
-  const setFormData = (v) => {
-    try {
-      setFieldsValue(v);
-      setFieldsValue({
-        ...v.dataSpecs,
-        valueRange: v.dataSpecs,
-      });
-      setFieldsValue({
-        boolClose: v.dataType == 'BOOL' ? v.dataSpecsList[0].name : '',
-        boolOpen: v.dataType == 'BOOL' ? v.dataSpecsList[1].name : '',
-      });
-      const { dataSpecsList, dataType, childDataType } = v;
-      if (childDataType == 'BOOL') {
-        setFieldsValue({
-          dataType: childDataType,
-          boolClose: dataSpecsList[0].name,
-          boolOpen: dataSpecsList[1].name,
-        });
-      }
-      if (dataType == 'BOOL' || dataType == 'STRUCT') {
-        inputParamData.value = [...new Array(dataSpecsList.length).keys()];
-        inputParamData.value = dataSpecsList;
-      }
-    } catch (e) {
-      console.log('AddParamForm error info', e);
-    }
-  };
-
-  const resetFormData = () => {
-    resetFields();
-    inputParamData.value = [];
-  };
-
-  defineExpose({
-    setFormData,
-    getFormData,
-    resetFormData,
-    updateFormExcludeStruct,
-  });
-</script>
-
-<style lang="less" scope>
-  .add-style {
-    color: #0170cc;
-    cursor: pointer;
-  }
-</style>

-<template>
-  <div>
-    <BasicModal
-      :title="getTitle"
-      :maskClosable="false"
-      v-bind="$attrs"
-      width="45rem"
-      @register="register"
-      @ok="handleSubmit"
-      @cancel="handleCancel"
-    >
-      <AddParamForm ref="AddParamFormRef" />
-    </BasicModal>
-  </div>
-</template>
-<script lang="ts" setup>
-  import { ref, computed, reactive } from 'vue';
-  import { BasicModal, useModalInner } from '/@/components/Modal';
-  import AddParamForm from './AddParamForm.vue';
-  import useParitalValid from '../../hook/useParitalValid';
-
-  const emits = defineEmits(['register', 'data']);
-
-  const {} = useParitalValid();
-
-  const setEditData: any = reactive({
-    getEditData: {},
-  });
-
-  const AddParamFormRef = ref<InstanceType<typeof AddParamForm>>();
-
-  const isUpdate = ref(false);
-
-  const isFlag = ref('');
-
-  const excludeStruct = ref(false);
-
-  const getTitle = computed(() => (!isUpdate.value ? '编辑参数' : '新增参数'));
-
-  const [register, { setModalProps }] = useModalInner(async (data) => {
-    setModalProps({ loading: true });
-
-    isUpdate.value = data.isUpdate;
-    isFlag.value = data.flag;
-    excludeStruct.value = data.excludeStruct;
-    !isUpdate.value ? AddParamFormRef.value?.setFormData(data.record) : '';
-    setEditData.getEditData = data.record;
-    setModalProps({ loading: false });
-    if (excludeStruct.value) {
-      AddParamFormRef.value?.updateFormExcludeStruct(true);
-    } else {
-      AddParamFormRef.value?.updateFormExcludeStruct(false);
-    }
-  });
-
-  const handleCancel = () => {
-    AddParamFormRef.value?.resetFormData();
-  };
-
-  const handleSubmit = async () => {
-    const value = await AddParamFormRef.value?.getFormData();
-    if (!value) return;
-    emits('data', value);
-    handleCancel();
-  };
-</script>
-<style lang="less" scope></style>

-<template>
-  <!-- 输入参数 -->
-  <div v-if="isInputParam">
-    <template v-for="(item, index) in inputParamData" :key="item.name">
-      <span style="display: none">{{ item }}</span>
-      <InputParamItem
-        :title="item.name"
-        :item="item"
-        class="mt-4"
-        :index="index"
-        :ref="dynamicBindRef.inputParamItemRef"
-        @delete="deleteInParItem"
-        @edit="editInParItem"
-      />
-    </template>
-    <div style="display: flex" :class="{ 'mt-2': inputParamData.length > 0 }">
-      <span class="add-style">+</span>
-      <span class="add-style" @click="handleAddInParam">增加参数</span>
-    </div>
-  </div>
-  <!-- 输出参数 -->
-  <div v-if="isOutputParam">
-    <template v-for="(item, index) in outputParamData" :key="item.name">
-      <span style="display: none">{{ item + index }}</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>
-      <span class="add-style" @click="handleAddOutParam">增加参数</span>
-    </div>
-  </div>
-</template>
-<script lang="ts" setup>
-  import { ref, unref } from 'vue';
-  import InputParamItem from './InputParamItem.vue';
-
-  const props = defineProps({
-    isExcludeStruct: { type: Boolean, default: true },
-    isInputParam: { type: Boolean, default: false },
-    isOutputParam: { type: Boolean, default: false },
-    inputParamData: {
-      type: Array as PropType<any[]>,
-      default: () => [],
-    },
-    outputParamData: {
-      type: Array as PropType<any[]>,
-      default: () => [],
-    },
-  });
-
-  const emit = defineEmits([
-    'emitAddInParam',
-    'emitEditInParam',
-    'emitDeletelnParam',
-    'emitAddOutParam',
-    'emitEditOutParam',
-    'emitDeleteOutParam',
-  ]);
-
-  const dynamicBindRef = {
-    inputParamItemRef: ref([]),
-    outputParamItemRef: ref([]),
-  };
-
-  const commomAddParamObj = {
-    isUpdate: true,
-    excludeStruct: props.isExcludeStruct ? true : false,
-  };
-
-  const commomEditParamObj = {
-    isUpdate: false,
-    excludeStruct: props.isExcludeStruct ? true : false,
-  };
-
-  const handleAddInParam = () => {
-    emit('emitAddInParam', true, {
-      ...commomAddParamObj,
-      flag: 'input',
-    });
-  };
-
-  const deleteInParItem = (index) => {
-    emit('emitDeletelnParam', index);
-  };
-
-  const editInParItem = (item) => {
-    emit('emitEditInParam', true, {
-      ...commomEditParamObj,
-      record: item,
-      flag: 'input',
-    });
-  };
-
-  const handleAddOutParam = () => {
-    emit('emitAddOutParam', true, {
-      ...commomAddParamObj,
-      flag: 'output',
-    });
-  };
-
-  const deleteOutParItem = (index) => {
-    emit('emitDeleteOutParam', index);
-  };
-
-  const editOutParItem = (item) => {
-    emit('emitEditOutParam', true, {
-      ...commomEditParamObj,
-      record: item,
-      flag: 'output',
-    });
-  };
-
-  const getInputStructList = () =>
-    unref(dynamicBindRef.inputParamItemRef)?.map((item: any) => item.getFormData());
-
-  const getOutputStructList = () =>
-    unref(dynamicBindRef.outputParamItemRef)?.map((item: any) => item.getFormData());
-
-  defineExpose({
-    getInputStructList,
-    getOutputStructList,
-  });
-</script>
-<style lang="less" scoped>
-  .add-style {
-    color: #0170cc;
-    cursor: pointer;
-  }
-</style>

-<template>
-  <div>
-    <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">编辑</span>
-          <a-divider type="vertical" style="height: 12px; background-color: #d8d8d8" />
-          <span style="color: #0170cc; cursor: pointer" class="ml-1" @click="handleDelete"
-            >删除</span
-          >
-        </div>
-      </template>
-    </a-card>
-  </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({
-    item: {
-      type: Object as PropType<ItemRecrod>,
-      required: true,
-      default: () => {},
-    },
-  });
-
-  const handleDelete = () => {
-    emit('delete', props.item);
-  };
-
-  const handleEdit = () => {
-    emit('edit', props.item);
-  };
-
-  const getFormData = () => {
-    return props.item;
-  };
-
-  defineExpose({
-    getFormData,
-  });
-</script>
-<style lang="less" scoped>
-  :deep(.ant-card-body) {
-    display: none !important;
-  }
-</style>