From eb376b261baa0dd6bee1f63c02c4d52fbf93cb41 Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Thu, 4 Jul 2024 15:27:27 +0800
Subject: [PATCH] =?UTF-8?q?fix(editor):=20=E4=BF=AE=E5=A4=8D=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=AC=AC=E4=B8=80=E4=B8=AA=E6=98=BE=E7=A4=BA=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=97=B6=E4=BC=9A=E9=87=8D=E7=BD=AE=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor/src/fields/DisplayConds.vue | 14 ++++++++++++--
 packages/editor/src/type.ts                 |  4 ++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/editor/src/fields/DisplayConds.vue b/packages/editor/src/fields/DisplayConds.vue
index 970aeb56..7a83f116 100644
--- 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
index 6a7c443e..35176a6e 100644
--- 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>;
 }