diff --git a/packages/editor/src/fields/DisplayConds.vue b/packages/editor/src/fields/DisplayConds.vue index 865a8701..d8b6e30b 100644 --- a/packages/editor/src/fields/DisplayConds.vue +++ b/packages/editor/src/fields/DisplayConds.vue @@ -67,6 +67,7 @@ const config = computed(() => ({ name: props.name, titlePrefix: props.config.titlePrefix, expandAll: true, + enableToggleMode: false, items: [ { type: 'table', diff --git a/packages/form-schema/src/base.ts b/packages/form-schema/src/base.ts index f10e2307..28427e4a 100644 --- a/packages/form-schema/src/base.ts +++ b/packages/form-schema/src/base.ts @@ -806,7 +806,7 @@ export interface GroupListConfig extends FormItem { }; /** 最大行数 */ max?: number; - beforeAddRow?: (mForm: FormState | undefined, data: any) => boolean | Promise; + beforeAddRow?: (mForm: FormState | undefined, data: any) => boolean; } interface StepItemConfig extends FormItem, ContainerCommonConfig { diff --git a/packages/form/src/containers/GroupList.vue b/packages/form/src/containers/GroupList.vue index 57cf04c8..5fbd5461 100644 --- a/packages/form/src/containers/GroupList.vue +++ b/packages/form/src/containers/GroupList.vue @@ -60,6 +60,7 @@ const props = defineProps<{ prop?: string; size?: string; disabled?: boolean; + showIndex?: boolean; }>(); const emit = defineEmits<{ diff --git a/packages/form/src/containers/TableGroupList.vue b/packages/form/src/containers/TableGroupList.vue index 336570b0..2c406c95 100644 --- a/packages/form/src/containers/TableGroupList.vue +++ b/packages/form/src/containers/TableGroupList.vue @@ -11,12 +11,20 @@ :last-values="lastValues" :prop="prop" :label-width="labelWidth" + :show-index="showIndex" + :sort-key="sortKey" + :sort="sort" @change="onChange" @select="onSelect" @addDiffCount="onAddDiffCount" > @@ -65,6 +73,10 @@ const props = defineProps<{ labelWidth?: string; disabled?: boolean; size?: string; + enableToggleMode?: true; + showIndex?: boolean; + sortKey?: string; + sort?: boolean; }>(); const emit = defineEmits(['change', 'select', 'addDiffCount']); diff --git a/packages/form/src/table/Table.vue b/packages/form/src/table/Table.vue index 016c9efe..ffcf8e03 100644 --- a/packages/form/src/table/Table.vue +++ b/packages/form/src/table/Table.vue @@ -34,7 +34,7 @@
- + (), { prop: '', sortKey: '', - enableToggleMode: true, showIndex: true, lastValues: () => ({}), isCompare: false, diff --git a/packages/form/src/table/type.ts b/packages/form/src/table/type.ts index a870dc69..63b075ad 100644 --- a/packages/form/src/table/type.ts +++ b/packages/form/src/table/type.ts @@ -13,6 +13,5 @@ export interface TableProps { sortKey?: string; text?: string; size?: string; - enableToggleMode?: boolean; showIndex?: boolean; }