From 1026bb8b30397f79b7862da9bf3cb4d02799149d Mon Sep 17 00:00:00 2001 From: shizhongming Date: Thu, 15 Feb 2024 11:30:45 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8-=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81):=20=E7=94=9F?= =?UTF-8?q?=E6=88=90=E4=BB=A3=E7=A0=81=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/base/SmartTableSelect.tsx | 17 +- .../SmartTable/src/types/SmartTableType.ts | 2 +- src/components/registerGlobComp.ts | 2 + .../components/template/TemplateGroup.vue | 7 +- src/modules/codeGenerator/types/index.ts | 8 + .../views/codeCreate/CodeCreateSupport.ts | 11 -- .../views/codeCreate/CodeCreateView.vue | 2 +- .../views/codeCreate/CodeCreateViewOld.vue | 80 -------- .../DatabaseSelect/DatabaseSelect.vue | 2 +- .../PageTableSetting/PageTableSetting.vue | 2 +- .../codeList/components/CodeCreateModal.vue | 33 ++-- .../components/CodeCreatedResultModal.vue | 71 +++++++ .../components/TemplateSelectTable.vue | 179 ++++++++++-------- src/router/helper/routeHelper.ts | 12 +- 14 files changed, 230 insertions(+), 198 deletions(-) create mode 100644 src/modules/codeGenerator/types/index.ts delete mode 100644 src/modules/codeGenerator/views/codeCreate/CodeCreateSupport.ts delete mode 100644 src/modules/codeGenerator/views/codeCreate/CodeCreateViewOld.vue create mode 100644 src/modules/codeGenerator/views/codeList/components/CodeCreatedResultModal.vue diff --git a/src/components/Form/src/smart-boot/components/base/SmartTableSelect.tsx b/src/components/Form/src/smart-boot/components/base/SmartTableSelect.tsx index 2e20ec75d..dfe3ff816 100644 --- a/src/components/Form/src/smart-boot/components/base/SmartTableSelect.tsx +++ b/src/components/Form/src/smart-boot/components/base/SmartTableSelect.tsx @@ -1,6 +1,7 @@ import type { SmartTableProps } from '@/components/SmartTable'; import { defineComponent, ref } from 'vue'; +import { Row, Col } from 'ant-design-vue'; import { propTypes } from '@/utils/propTypes'; import { useModal } from '@/components/Modal'; @@ -11,6 +12,10 @@ import './SmartTableSelect.less'; export default defineComponent({ name: 'SmartTableSelect', + components: { + Row, + Col, + }, props: { // 是否支持多选 multiple: propTypes.bool.def(true), @@ -82,8 +87,8 @@ export default defineComponent({ }; return (
- - + + - - + + {$t('common.button.choose')} - - + + boolean; deleteByCheckbox: () => void; - getCheckboxRecords: (isFull: boolean) => Array; + getCheckboxRecords: (isFull?: boolean) => Array; getRadioRecord: (isFull: boolean) => any; // openAddEditModal: (props?: boolean, data?: T, openOnSet?: boolean) => void diff --git a/src/components/registerGlobComp.ts b/src/components/registerGlobComp.ts index 1e3a99931..f7c396eeb 100644 --- a/src/components/registerGlobComp.ts +++ b/src/components/registerGlobComp.ts @@ -11,6 +11,7 @@ import { Tabs, Switch, Form, + Checkbox, InputNumber, } from 'ant-design-vue'; import VXETable from 'vxe-table'; @@ -46,5 +47,6 @@ export function registerGlobComp(app: App) { .use(Switch) .use(InputNumber) .use(Form) + .use(Checkbox) .use(VXETable); } diff --git a/src/modules/codeGenerator/components/template/TemplateGroup.vue b/src/modules/codeGenerator/components/template/TemplateGroup.vue index e36d5a037..fcfc3327c 100644 --- a/src/modules/codeGenerator/components/template/TemplateGroup.vue +++ b/src/modules/codeGenerator/components/template/TemplateGroup.vue @@ -8,12 +8,13 @@ @cell-click="handleCellClick" > -
+
{{ $t('common.button.add') }} @@ -38,9 +39,11 @@ deleteGroupByIdApi, getGroupByIdApi, } from '../../views/template/CodeTemplateList.api'; + import { propTypes } from '@/utils/propTypes'; const props = defineProps({ tableProps: Object as PropType, + editable: propTypes.bool.def(true), }); const emit = defineEmits(['change']); diff --git a/src/modules/codeGenerator/types/index.ts b/src/modules/codeGenerator/types/index.ts new file mode 100644 index 000000000..5e51cac65 --- /dev/null +++ b/src/modules/codeGenerator/types/index.ts @@ -0,0 +1,8 @@ +export interface CodeCreatedModel { + mainId: number; + className: string; + description?: string; + packages: string; + templateIdList: number[]; + controllerBasePath?: string; +} diff --git a/src/modules/codeGenerator/views/codeCreate/CodeCreateSupport.ts b/src/modules/codeGenerator/views/codeCreate/CodeCreateSupport.ts deleted file mode 100644 index b8105984d..000000000 --- a/src/modules/codeGenerator/views/codeCreate/CodeCreateSupport.ts +++ /dev/null @@ -1,11 +0,0 @@ -/** - * 扩展名类型映射 - */ -export const extensionLanguageMap: any = { - 'text/x-java': 'java', - xml: 'xml', - javascript: 'js', - html: 'html', - 'text/x-vue': 'vue', - typescript: 'ts', -}; diff --git a/src/modules/codeGenerator/views/codeCreate/CodeCreateView.vue b/src/modules/codeGenerator/views/codeCreate/CodeCreateView.vue index 232733d4e..572e8f3fd 100644 --- a/src/modules/codeGenerator/views/codeCreate/CodeCreateView.vue +++ b/src/modules/codeGenerator/views/codeCreate/CodeCreateView.vue @@ -14,9 +14,9 @@ - - diff --git a/src/modules/codeGenerator/views/codeDesign/componenets/DatabaseSelect/DatabaseSelect.vue b/src/modules/codeGenerator/views/codeDesign/componenets/DatabaseSelect/DatabaseSelect.vue index 0f946459c..e5efd7dbf 100644 --- a/src/modules/codeGenerator/views/codeDesign/componenets/DatabaseSelect/DatabaseSelect.vue +++ b/src/modules/codeGenerator/views/codeDesign/componenets/DatabaseSelect/DatabaseSelect.vue @@ -37,7 +37,7 @@ }); data.value = result.map((item: any) => { return { - key: item.id + '', + key: item.id, value: item.connectionName, }; }); diff --git a/src/modules/codeGenerator/views/codeDesign/componenets/PageTableSetting/PageTableSetting.vue b/src/modules/codeGenerator/views/codeDesign/componenets/PageTableSetting/PageTableSetting.vue index 655a15dc0..23ba55486 100644 --- a/src/modules/codeGenerator/views/codeDesign/componenets/PageTableSetting/PageTableSetting.vue +++ b/src/modules/codeGenerator/views/codeDesign/componenets/PageTableSetting/PageTableSetting.vue @@ -15,7 +15,7 @@ + + + diff --git a/src/modules/codeGenerator/views/codeList/components/TemplateSelectTable.vue b/src/modules/codeGenerator/views/codeList/components/TemplateSelectTable.vue index 9ec62684c..a6803e281 100644 --- a/src/modules/codeGenerator/views/codeList/components/TemplateSelectTable.vue +++ b/src/modules/codeGenerator/views/codeList/components/TemplateSelectTable.vue @@ -1,13 +1,14 @@