Merge branch 'dev-fix-ww' into 'main_dev'

fix: 产品详情物模型管理编辑无法切换数据类型为结构体

See merge request yunteng/thingskit-front!565

@@ -13,6 +13,7 @@
   import { Divider, Button } from 'ant-design-vue';
   import { Divider, Button } from 'ant-design-vue';
   import { OpenModalMode, OpenModalParams, StructRecord } from './type';
   import { OpenModalMode, OpenModalParams, StructRecord } from './type';
   import { cloneDeep } from 'lodash-es';
   import { cloneDeep } from 'lodash-es';
+  import { isArray } from '/@/utils/is';
 
 
   const emit = defineEmits(['update:value']);
   const emit = defineEmits(['update:value']);
 
 
@@ -30,7 +31,8 @@
 
 
   const getValue = computed<StructRecord[]>(() => {
   const getValue = computed<StructRecord[]>(() => {
     const { value } = props;
     const { value } = props;
-    return value.map((item) => {
+
+    return (isArray(value) ? value : []).map((item) => {
       return {
       return {
         ...(item as StructRecord),
         ...(item as StructRecord),
         ...((item as StructRecord).id ? {} : { id: buildUUID() }),
         ...((item as StructRecord).id ? {} : { id: buildUUID() }),

@@ -65,7 +65,7 @@ export const formSchemas = (hasStructForm: boolean): FormSchema[] => {
       },
       },
       defaultValue: 'INT',
       defaultValue: 'INT',
       componentProps: ({ formActionType }) => {
       componentProps: ({ formActionType }) => {
-        const { updateSchema } = formActionType;
+        const { updateSchema, setFieldsValue } = formActionType;
         return {
         return {
           placeholder: '请选择数据类型',
           placeholder: '请选择数据类型',
           api: async (params: Recordable) => {
           api: async (params: Recordable) => {
@@ -86,13 +86,15 @@ export const formSchemas = (hasStructForm: boolean): FormSchema[] => {
           valueField: 'itemValue',
           valueField: 'itemValue',
           getPopupContainer: () => document.body,
           getPopupContainer: () => document.body,
           onChange: (value: string) => {
           onChange: (value: string) => {
-            value === DataTypeEnum.IS_STRUCT &&
+            if (value == DataTypeEnum.IS_STRUCT) {
               updateSchema({
               updateSchema({
                 field: FormField.SPECS_LIST,
                 field: FormField.SPECS_LIST,
                 componentProps: {
                 componentProps: {
                   hasStructForm: true,
                   hasStructForm: true,
                 },
                 },
               });
               });
+              setFieldsValue({ [FormField.SPECS_LIST]: [] });
+            }
           },
           },
         };
         };
       },
       },

@@ -120,7 +120,12 @@
         setFormData(record.functionType, record as unknown as ModelOfMatterParams);
         setFormData(record.functionType, record as unknown as ModelOfMatterParams);
       }
       }
       if (unref(openModalMode) === OpenModelMode.VIEW) {
       if (unref(openModalMode) === OpenModelMode.VIEW) {
-        setModalProps({ showOkBtn: false, showCancelBtn: false, title: '查看物模型' });
+        setModalProps({
+          showOkBtn: false,
+          showCancelBtn: false,
+          title: '查看物模型',
+          footer: null,
+        });
       } else {
       } else {
         const title = unref(openModalMode) === OpenModelMode.UPDATE ? '编辑物模型' : '新增物模型';
         const title = unref(openModalMode) === OpenModelMode.UPDATE ? '编辑物模型' : '新增物模型';
         setModalProps({ title, showOkBtn: true, showCancelBtn: true });
         setModalProps({ title, showOkBtn: true, showCancelBtn: true });