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