Merge branch 'fix/rule-script-metadata' into 'main_dev'

perf: 修复metadata编辑是顺序变更

See merge request yunteng/thingskit-front!1085

@@ -4,7 +4,6 @@
   import { BasicForm, FormActionType, FormProps, FormSchema } from '/@/components/Form';
   import { BasicForm, FormActionType, FormProps, FormSchema } from '/@/components/Form';
   import { computed, ref, unref, watch } from 'vue';
   import { computed, ref, unref, watch } from 'vue';
   import { buildShortUUID } from '/@/utils/uuid';
   import { buildShortUUID } from '/@/utils/uuid';
-  import { isNullOrUnDef } from '/@/utils/is';
   import { ComponentType } from '/@/components/Form/src/types';
   import { ComponentType } from '/@/components/Form/src/types';
 
 
   enum FormFieldEnum {
   enum FormFieldEnum {
@@ -40,8 +39,6 @@
     }
     }
   );
   );
 
 
-  const emit = defineEmits(['update:value']);
-
   const getPlaceholder = (label = '') => `请输入${label}`;
   const getPlaceholder = (label = '') => `请输入${label}`;
 
 
   const getRules = (label = '') => {
   const getRules = (label = '') => {
@@ -51,7 +48,6 @@
   const mergeComponentProps = (label = '') => {
   const mergeComponentProps = (label = '') => {
     return {
     return {
       placeholder: getPlaceholder(label),
       placeholder: getPlaceholder(label),
-      onBlur: handleOnBlur,
     };
     };
   };
   };
 
 
@@ -77,17 +73,6 @@
     ] as FormSchema[];
     ] as FormSchema[];
   });
   });
 
 
-  const handleOnBlur = () => {
-    const value = getFieldsValue();
-
-    if (
-      unref(list).length === Object.keys(value).length &&
-      Object.values(value).some((item) => isNullOrUnDef(item))
-    )
-      return;
-    emit('update:value', value);
-  };
-
   const list = ref<ListItemType[]>([{ uuid: buildShortUUID() }]);
   const list = ref<ListItemType[]>([{ uuid: buildShortUUID() }]);
 
 
   const formListElRef = ref<Nullable<FormActionType>[]>([]);
   const formListElRef = ref<Nullable<FormActionType>[]>([]);

 <script lang="ts" setup>
 <script lang="ts" setup>
   import { Card, Select, Tag, Form, Button } from 'ant-design-vue';
   import { Card, Select, Tag, Form, Button } from 'ant-design-vue';
-  import { nextTick, ref, toRaw, unref, watch } from 'vue';
+  import { nextTick, ref, unref, watch } from 'vue';
   import { MessageTypesEnum, MessageTypesNameEnum } from '../../../enum/form';
   import { MessageTypesEnum, MessageTypesNameEnum } from '../../../enum/form';
   import { JSONEditor } from '/@/components/CodeEditor';
   import { JSONEditor } from '/@/components/CodeEditor';
   import { Icon } from '/@/components/Icon';
   import { Icon } from '/@/components/Icon';
@@ -82,7 +82,7 @@
     return {
     return {
       msg,
       msg,
       msgType,
       msgType,
-      metadata: toRaw(unref(metadata)),
+      metadata: unref(attributeConfigurationElRef)?.getFieldsValue() || {},
       javascriptFunction,
       javascriptFunction,
     };
     };
   };
   };