diff --git a/src/modules/smart-code/views/codeDesign/CodeDesignPage.config.ts b/src/modules/smart-code/views/codeDesign/CodeDesignPage.config.ts index 2636b603f..355df4a1a 100644 --- a/src/modules/smart-code/views/codeDesign/CodeDesignPage.config.ts +++ b/src/modules/smart-code/views/codeDesign/CodeDesignPage.config.ts @@ -193,6 +193,7 @@ export const formSchemas = (t: Function): FormSchema[] => { label: t('generator.views.code.title.i18nPrefix'), field: 'i18nPrefix', component: 'Input', + required: true, }, // ------------ 第五行 --------------------- { diff --git a/src/modules/smart-code/views/codeDesign/CodeDesignPage.vue b/src/modules/smart-code/views/codeDesign/CodeDesignPage.vue index 816cc5730..926439964 100644 --- a/src/modules/smart-code/views/codeDesign/CodeDesignPage.vue +++ b/src/modules/smart-code/views/codeDesign/CodeDesignPage.vue @@ -140,7 +140,7 @@ /** * 代码配置页面 */ - const [registerForm, { validate, setFieldsValue }] = useForm({ + const [registerForm, { validateFields, setFieldsValue }] = useForm({ colon: true, schemas: formSchemas(t), showActionButtonGroup: false, @@ -206,7 +206,7 @@ }); const { dbDataLoading, computedTableData, handleSyncTableData, isSyncRef, dbDataRef } = - useLoadDbData(validate); + useLoadDbData(validateFields); const editConfigData = ref({}); const handleRemoveRelateTable = (dataList: any[], index: number) => { @@ -216,7 +216,7 @@ useModal(); const { handleSave, saveLoading, pageTableSettingRef, pageSearchSettingRef, pageFormSettingRef } = - useSaveConfig(t, isSyncRef, validate, dbDataRef, (configId) => { + useSaveConfig(t, isSyncRef, validateFields, dbDataRef, (configId) => { const { fullPath, query, path } = route; console.log(fullPath); router.push({ diff --git a/src/modules/smart-code/views/codeDesign/CodeDesignPageHook.ts b/src/modules/smart-code/views/codeDesign/CodeDesignPageHook.ts index 0323ef3e1..28fdc4e9e 100644 --- a/src/modules/smart-code/views/codeDesign/CodeDesignPageHook.ts +++ b/src/modules/smart-code/views/codeDesign/CodeDesignPageHook.ts @@ -28,7 +28,7 @@ export const useLoadDbData = (validate: Function) => { }); const handleSyncTableData = async () => { - const { connectionId, tableName } = await validate(); + const { connectionId, tableName } = await validate(['connectionId', 'tableName']); try { dbDataLoading.value = true; dbDataRef.value = await queryDbTableApi(connectionId, tableName); diff --git a/src/modules/smart-code/views/codeDesign/componenets/PageTableSetting/PageTableSetting.vue b/src/modules/smart-code/views/codeDesign/componenets/PageTableSetting/PageTableSetting.vue index 23ba55486..7faecff0f 100644 --- a/src/modules/smart-code/views/codeDesign/componenets/PageTableSetting/PageTableSetting.vue +++ b/src/modules/smart-code/views/codeDesign/componenets/PageTableSetting/PageTableSetting.vue @@ -124,7 +124,7 @@ const itemData = { ...item, }; - const tableDataItem = tableDataMap[item.javaProperty]; + const tableDataItem = tableDataMap[item.javaProperty] || {}; copyField.forEach((field) => { itemData[field] = tableDataItem[field]; }); @@ -185,7 +185,6 @@ const tableSortableVue = useVxeTableSortable(tableRef, '.table-drop', data); watch([tableData, editData], () => { data.value = createDataFromTableData(tableData.value, editData); - console.log(data.value); }); onMounted(() => { data.value = createDataFromTableData(tableData.value, editData);