diff --git a/frontend/src/components/pure/ms-table/useTable.ts b/frontend/src/components/pure/ms-table/useTable.ts index 57903957b7..2c0aa39e46 100644 --- a/frontend/src/components/pure/ms-table/useTable.ts +++ b/frontend/src/components/pure/ms-table/useTable.ts @@ -39,7 +39,7 @@ export default function useTableProps( data: [], // 表格数据 /** * 表格列配置 - * 当showSetting为true时,此配置无效,通过TableStore.initColumn(tableKey: string, column: MsTableColumn)初始化。 + * 当showSetting为true时,此配置无效,通过 await tableStore.initColumn(tableKey: string, column: MsTableColumn)初始化。 * 当showSetting为false时,此配置生效 */ columns: [] as MsTableColumn, diff --git a/frontend/src/layout/page-layout.vue b/frontend/src/layout/page-layout.vue index 003a1d7be5..3fd8d1e628 100644 --- a/frontend/src/layout/page-layout.vue +++ b/frontend/src/layout/page-layout.vue @@ -3,7 +3,9 @@
- + + + diff --git a/frontend/src/views/api-test/index.vue b/frontend/src/views/api-test/index.vue index 25ca0bd0dd..0c27678e03 100644 --- a/frontend/src/views/api-test/index.vue +++ b/frontend/src/views/api-test/index.vue @@ -157,7 +157,7 @@ const tableStore = useTableStore(); - tableStore.initColumn(TableKeyEnum.API_TEST, columns, 'drawer'); + await tableStore.initColumn(TableKeyEnum.API_TEST, columns, 'drawer'); const { propsRes, propsEvent, loadList } = useTable(getTableList, { columns, diff --git a/frontend/src/views/project-management/projectAndPermission/member/index.vue b/frontend/src/views/project-management/projectAndPermission/member/index.vue index e4c514b40c..e2c12dbac0 100644 --- a/frontend/src/views/project-management/projectAndPermission/member/index.vue +++ b/frontend/src/views/project-management/projectAndPermission/member/index.vue @@ -168,7 +168,7 @@ showInTable: true, }, ]; - tableStore.initColumn(TableKeyEnum.PROJECT_MEMBER, columns, 'drawer'); + await tableStore.initColumn(TableKeyEnum.PROJECT_MEMBER, columns, 'drawer'); const tableBatchActions = { baseAction: [ diff --git a/frontend/src/views/setting/organization/member/index.vue b/frontend/src/views/setting/organization/member/index.vue index 7912144fa4..28e304b065 100644 --- a/frontend/src/views/setting/organization/member/index.vue +++ b/frontend/src/views/setting/organization/member/index.vue @@ -204,7 +204,7 @@ showDrag: false, }, ]; - tableStore.initColumn(TableKeyEnum.ORGANIZATION_MEMBER, columns, 'drawer'); + await tableStore.initColumn(TableKeyEnum.ORGANIZATION_MEMBER, columns, 'drawer'); const tableBatchActions = { baseAction: [ diff --git a/frontend/src/views/setting/organization/project/orgProject.vue b/frontend/src/views/setting/organization/project/orgProject.vue index b8d525a02a..763ffd0c86 100644 --- a/frontend/src/views/setting/organization/project/orgProject.vue +++ b/frontend/src/views/setting/organization/project/orgProject.vue @@ -171,7 +171,7 @@ } }; - tableStore.initColumn(TableKeyEnum.ORGANIZATION_PROJECT, organizationColumns, 'drawer'); + await tableStore.initColumn(TableKeyEnum.ORGANIZATION_PROJECT, organizationColumns, 'drawer'); const { propsRes, propsEvent, loadList, setKeyword, setLoadListParams } = useTable( postProjectTableByOrg, diff --git a/frontend/src/views/setting/organization/template/components/fieldSetting.vue b/frontend/src/views/setting/organization/template/components/fieldSetting.vue index ff2342cbf7..1ba1e21cf0 100644 --- a/frontend/src/views/setting/organization/template/components/fieldSetting.vue +++ b/frontend/src/views/setting/organization/template/components/fieldSetting.vue @@ -129,7 +129,7 @@ showDrag: false, }, ]; - tableStore.initColumn(TableKeyEnum.ORGANIZATION_TEMPLATE_FIELD_SETTING, fieldColumns, 'drawer'); + await tableStore.initColumn(TableKeyEnum.ORGANIZATION_TEMPLATE_FIELD_SETTING, fieldColumns, 'drawer'); const { propsRes, propsEvent, loadList, setLoadListParams, setProps } = useTable(getFieldList, { tableKey: TableKeyEnum.ORGANIZATION_TEMPLATE_FIELD_SETTING, diff --git a/frontend/src/views/setting/organization/template/components/templateManagement.vue b/frontend/src/views/setting/organization/template/components/templateManagement.vue index cb6ae0ca98..757d74654d 100644 --- a/frontend/src/views/setting/organization/template/components/templateManagement.vue +++ b/frontend/src/views/setting/organization/template/components/templateManagement.vue @@ -107,7 +107,7 @@ }, ]; - tableStore.initColumn(TableKeyEnum.ORGANIZATION_TEMPLATE_MANAGEMENT, fieldColumns, 'drawer'); + await tableStore.initColumn(TableKeyEnum.ORGANIZATION_TEMPLATE_MANAGEMENT, fieldColumns, 'drawer'); const { propsRes, propsEvent, loadList, setLoadListParams, setProps } = useTable(getOrganizeTemplateList, { tableKey: TableKeyEnum.ORGANIZATION_TEMPLATE_MANAGEMENT, scroll: { x: '1000px' }, diff --git a/frontend/src/views/setting/organization/template/components/templateManagementTable.vue b/frontend/src/views/setting/organization/template/components/templateManagementTable.vue index 15934bfe71..60097b6e55 100644 --- a/frontend/src/views/setting/organization/template/components/templateManagementTable.vue +++ b/frontend/src/views/setting/organization/template/components/templateManagementTable.vue @@ -139,7 +139,7 @@ }; } - tableStore.initColumn(TableKeyEnum.ORGANIZATION_TEMPLATE_MANAGEMENT_FIELD, columns.value, 'drawer'); + await tableStore.initColumn(TableKeyEnum.ORGANIZATION_TEMPLATE_MANAGEMENT_FIELD, columns.value, 'drawer'); const { propsRes, propsEvent, setProps } = useTable(undefined, { tableKey: TableKeyEnum.ORGANIZATION_TEMPLATE_MANAGEMENT_FIELD, scroll: { x: '1800px' }, diff --git a/frontend/src/views/setting/organization/template/components/viewTemplate.vue b/frontend/src/views/setting/organization/template/components/viewTemplate.vue index ffe18ba781..de0d479b3e 100644 --- a/frontend/src/views/setting/organization/template/components/viewTemplate.vue +++ b/frontend/src/views/setting/organization/template/components/viewTemplate.vue @@ -156,7 +156,6 @@ }, ]; - tableStore.initColumn(TableKeyEnum.ORGANIZATION_TEMPLATE_MANAGEMENT_STEP, templateFieldColumns, 'drawer'); const { propsRes, propsEvent, setProps } = useTable(undefined, { tableKey: TableKeyEnum.ORGANIZATION_TEMPLATE_MANAGEMENT_STEP, scroll: { x: '800px' }, @@ -235,15 +234,15 @@ formRules.value = result; } }; + defineExpose({ + getFormRules, + }); onMounted(() => { setProps({ data: [{ id: 1, showStep: false, showExpected: false }] }); getFormRules(); }); - - defineExpose({ - getFormRules, - }); + await tableStore.initColumn(TableKeyEnum.ORGANIZATION_TEMPLATE_MANAGEMENT_STEP, templateFieldColumns, 'drawer');