Commit abf5fae91a0f3362dd6b6eb39ec3253b018750bf

Authored by 安浩浩
1 parent e68b294e

fix:将API导入路径中的simpleClassName_strikeCase替换为businessName,以确保正确引用API

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/general/views/form.vue.vm
... ... @@ -8,7 +8,7 @@ import { ImageUpload, FileUpload } from "#/components/upload";
8 8 import { message, Tabs, Form, Input, Textarea, Select, RadioGroup, Radio, CheckboxGroup, Checkbox, DatePicker, TreeSelect } from 'ant-design-vue';
9 9 import { DICT_TYPE, getDictOptions } from '#/utils';
10 10 #if($table.templateType == 2)## 树表需要导入这些
11   -import { get${simpleClassName}List } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
  11 +import { get${simpleClassName}List } from '#/api/${table.moduleName}/${table.businessName}';
12 12 import { handleTree } from '@vben/utils'
13 13 #end
14 14 ## 特殊:主子表专属逻辑
... ... @@ -22,7 +22,7 @@ import { handleTree } from '@vben/utils'
22 22  
23 23 import { computed, ref } from 'vue';
24 24 import { $t } from '#/locales';
25   -import { get${simpleClassName}, create${simpleClassName}, update${simpleClassName} } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
  25 +import { get${simpleClassName}, create${simpleClassName}, update${simpleClassName} } from '#/api/${table.moduleName}/${table.businessName}';
26 26  
27 27 const emit = defineEmits(['success']);
28 28  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/data.ts.vm
1 1 import type { VbenFormSchema } from '#/adapter/form';
2 2 import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
3   -import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
  3 +import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${table.businessName}';
4 4  
5 5 import { z } from '#/adapter/form';
  6 +import { getRangePickerDefaultProps } from '#/utils/date';
  7 +import { DICT_TYPE, getDictOptions } from '#/utils/dict';
  8 +
6 9 #if(${table.templateType} == 2)## 树表需要导入这些
7   -import { get${simpleClassName}List } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
  10 +import { get${simpleClassName}List } from '#/api/${table.moduleName}/${table.businessName}';
8 11 import { handleTree } from '@vben/utils';
9 12 #end
10   -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils';
11 13 import { useAccess } from '@vben/access';
12 14  
13 15 const { hasAccessByCodes } = useAccess();
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/form.vue.vm
1 1 <script lang="ts" setup>
2   -import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
  2 +import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${table.businessName}';
3 3  
4 4 import { useVbenModal } from '@vben/common-ui';
5 5 import { message, Tabs, Checkbox, Input, Textarea, Select,RadioGroup,CheckboxGroup, DatePicker } from 'ant-design-vue';
... ... @@ -15,7 +15,7 @@ import { message, Tabs, Checkbox, Input, Textarea, Select,RadioGroup,CheckboxGro
15 15 import { computed, ref } from 'vue';
16 16 import { $t } from '#/locales';
17 17 import { useVbenForm } from '#/adapter/form';
18   -import { get${simpleClassName}, create${simpleClassName}, update${simpleClassName} } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
  18 +import { get${simpleClassName}, create${simpleClassName}, update${simpleClassName} } from '#/api/${table.moduleName}/${table.businessName}';
19 19  
20 20 import { useFormSchema } from '../data';
21 21  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm
1 1 <script lang="ts" setup>
2 2 import type { OnActionClickParams, VxeTableGridOptions } from '#/adapter/vxe-table';
3   -import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
  3 +import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${table.businessName}';
4 4  
5 5 import { Page, useVbenModal } from '@vben/common-ui';
6 6 import { Button, message,Tabs } from 'ant-design-vue';
... ... @@ -20,9 +20,9 @@ import { ref, h } from &#39;vue&#39;;
20 20 import { $t } from '#/locales';
21 21 import { useVbenVxeGrid } from '#/adapter/vxe-table';
22 22 #if (${table.templateType} == 2)## 树表接口
23   -import { get${simpleClassName}List, delete${simpleClassName}, export${simpleClassName} } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
  23 +import { get${simpleClassName}List, delete${simpleClassName}, export${simpleClassName} } from '#/api/${table.moduleName}/${table.businessName}';
24 24 #else## 标准表接口
25   -import { get${simpleClassName}Page, delete${simpleClassName}, export${simpleClassName} } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
  25 +import { get${simpleClassName}Page, delete${simpleClassName}, export${simpleClassName} } from '#/api/${table.moduleName}/${table.businessName}';
26 26 #end
27 27 import { downloadFileFromBlobPart } from '@vben/utils';
28 28  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_erp.vue.vm
... ... @@ -3,7 +3,7 @@
3 3 #set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段
4 4 #set ($subSimpleClassName = $subSimpleClassNames.get($subIndex))
5 5 <script lang="ts" setup>
6   - import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
  6 + import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${table.businessName}';
7 7  
8 8 import { useVbenModal } from '@vben/common-ui';
9 9 import { message } from 'ant-design-vue';
... ... @@ -11,7 +11,7 @@
11 11 import { computed, ref } from 'vue';
12 12 import { $t } from '#/locales';
13 13 import { useVbenForm } from '#/adapter/form';
14   - import { get${subSimpleClassName}, create${subSimpleClassName}, update${subSimpleClassName} } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
  14 + import { get${subSimpleClassName}, create${subSimpleClassName}, update${subSimpleClassName} } from '#/api/${table.moduleName}/${table.businessName}';
15 15  
16 16 import { use${subSimpleClassName}FormSchema } from '../data';
17 17  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_normal.vue.vm
... ... @@ -5,7 +5,7 @@
5 5 #set ($subClassNameVar = $subClassNameVars.get($subIndex))
6 6 #set ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
7 7 <script lang="ts" setup>
8   - import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
  8 + import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${table.businessName}';
9 9  
10 10 import { computed, ref, h, onMounted,watch,nextTick } from 'vue';
11 11 import { $t } from '#/locales';
... ... @@ -17,11 +17,11 @@ import { ImageUpload, FileUpload } from &quot;#/components/upload&quot;;
17 17 import type { OnActionClickParams } from '#/adapter/vxe-table';
18 18 import { useVbenVxeGrid } from '#/adapter/vxe-table';
19 19 import { use${subSimpleClassName}GridEditColumns } from '../data';
20   -import { get${subSimpleClassName}ListBy${SubJoinColumnName} } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
  20 +import { get${subSimpleClassName}ListBy${SubJoinColumnName} } from '#/api/${table.moduleName}/${table.businessName}';
21 21 #else
22 22 import { useVbenForm } from '#/adapter/form';
23 23 import { use${subSimpleClassName}FormSchema } from '../data';
24   -import { get${subSimpleClassName}By${SubJoinColumnName} } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
  24 +import { get${subSimpleClassName}By${SubJoinColumnName} } from '#/api/${table.moduleName}/${table.businessName}';
25 25 #end
26 26  
27 27 const props = defineProps<{
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm
... ... @@ -7,7 +7,7 @@
7 7 #set ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
8 8 <script lang="ts" setup>
9 9 import type { OnActionClickParams, VxeTableGridOptions } from '#/adapter/vxe-table';
10   - import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
  10 + import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${table.businessName}';
11 11  
12 12 #if ($table.templateType == 11) ## erp
13 13 import ${subSimpleClassName}Form from './${subSimpleClassName_strikeCase}-form.vue'
... ... @@ -21,13 +21,13 @@
21 21  
22 22  
23 23 #if ($table.templateType == 11) ## erp
24   - import { delete${subSimpleClassName}, get${subSimpleClassName}Page } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
  24 + import { delete${subSimpleClassName}, get${subSimpleClassName}Page } from '#/api/${table.moduleName}/${table.businessName}';
25 25 import { use${subSimpleClassName}GridFormSchema, use${subSimpleClassName}GridColumns } from '../data';
26 26 #else
27 27 #if ($subTable.subJoinMany) ## 一对多
28   - import { get${subSimpleClassName}ListBy${SubJoinColumnName} } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
  28 + import { get${subSimpleClassName}ListBy${SubJoinColumnName} } from '#/api/${table.moduleName}/${table.businessName}';
29 29 #else
30   - import { get${subSimpleClassName}By${SubJoinColumnName} } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
  30 + import { get${subSimpleClassName}By${SubJoinColumnName} } from '#/api/${table.moduleName}/${table.businessName}';
31 31 #end
32 32 import { use${subSimpleClassName}GridColumns } from '../data';
33 33 #end
... ...