fix(editor): 修复新增第一个显示条件时会重置表单状态

Tencent · Jul 4, 2024 · eb376b2 · eb376b2
1 parent 1e93e9b
commit eb376b2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/packages/editor/src/fields/DisplayConds.vue b/packages/editor/src/fields/DisplayConds.vue
@@ -8,6 +8,7 @@
     :last-values="lastValues"
     :prop="prop"
     :size="size"
+    @change="changeHandler"
   ></MGroupList>
 </template>
 
@@ -22,6 +23,7 @@ import {
   type GroupListConfig,
   MGroupList,
 } from '@tmagic/form';
+import type { DisplayCond } from '@tmagic/schema';
 
 import type { Services } from '@editor/type';
 import { getCascaderOptionsFromFields } from '@editor/utils';
@@ -30,6 +32,10 @@ defineOptions({
   name: 'm-fields-display-conds',
 });
 
+const emit = defineEmits<{
+  change: [value: DisplayCond[]];
+}>();
+
 const props = withDefaults(
   defineProps<
     FieldProps<{
@@ -93,12 +99,12 @@ const config = computed<GroupListConfig>(() => ({
           type: 'cond-op-select',
           parentFields: parentFields.value,
           label: '条件',
-          width: 100,
+          width: 160,
           name: 'op',
         },
         {
           label: '值',
-          width: 100,
+          width: 160,
           items: [
             {
               name: 'value',
@@ -142,4 +148,8 @@ const config = computed<GroupListConfig>(() => ({
     },
   ],
 }));
+
+const changeHandler = (v: DisplayCond[]) => {
+  emit('change', v);
+};
 </script>
diff --git a/packages/editor/src/type.ts b/packages/editor/src/type.ts
@@ -774,7 +774,7 @@ export type PropsFormValueFunction = (data: { editorService: EditorService }) =>
 export type PartSortableOptions = Omit<Options, 'onStart' | 'onUpdate'>;
 export interface PageBarSortOptions extends PartSortableOptions {
   /** 在onUpdate之后调用 */
-  afterUpdate?: (event: SortableEvent, sortable: Sortable) => void;
+  afterUpdate?: (event: SortableEvent, sortable: Sortable) => void | Promise<void>;
   /** 在onStart之前调用 */
-  beforeStart?: (event: SortableEvent, sortable: Sortable) => void;
+  beforeStart?: (event: SortableEvent, sortable: Sortable) => void | Promise<void>;
 }