wms / wms4_xinxiangweiliang · Commits

Commit 1ca69056e4e94c1805452ef112842e270779c742

Authored by zhangdaiscott
1 parent 2ab92da1

【代码生成器】修复vue3模板引用路径和文件路径大小写不一致的问题

Inline Side-by-side
Showing 16 changed files with 59 additions and 28 deletions
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
  View file @1ca6905
... ... @@ -62,8 +62,8 @@
62 62 import {useModal} from '/@/components/Modal';
63 63 import { useListPage } from '/@/hooks/system/useListPage'
64 64 import ${entityName}Modal from './components/${entityName}Modal.vue'
65   - import {columns, searchFormSchema} from './${entityName?uncap_first}.data';
66   - import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName?uncap_first}.api';
  65 + import {columns, searchFormSchema} from './${entityName}.data';
  66 + import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName}.api';
67 67 <#if list_need_category>
68 68 import { loadCategoryData } from '/@/api/common/api'
69 69 import { getAuthCache, setAuthCache } from '/@/utils/auth';
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
  View file @1ca6905
... ... @@ -8,8 +8,8 @@
8 8 import {ref, computed, unref} from 'vue';
9 9 import {BasicModal, useModalInner} from '/@/components/Modal';
10 10 import {BasicForm, useForm} from '/@/components/Form/index';
11   - import {formSchema} from '../${entityName?uncap_first}.data';
12   - import {saveOrUpdate} from '../${entityName?uncap_first}.api';
  11 + import {formSchema} from '../${entityName}.data';
  12 + import {saveOrUpdate} from '../${entityName}.api';
13 13 // Emits声明
14 14 const emit = defineEmits(['register','success']);
15 15 const isUpdate = ref(true);
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
  View file @1ca6905
... ... @@ -250,7 +250,8 @@ public class ${entityName}Controller {
250 250 MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
251 251 Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
252 252 for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
253   - MultipartFile file = entity.getValue();// 获取上传文件对象
  253 + // 获取上传文件对象
  254 + MultipartFile file = entity.getValue();
254 255 ImportParams params = new ImportParams();
255 256 params.setTitleRows(2);
256 257 params.setHeadRows(1);
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai
  View file @1ca6905
... ... @@ -15,8 +15,20 @@ import org.apache.ibatis.annotations.Param;
15 15 */
16 16 public interface ${subTab.entityName}Mapper extends BaseMapper<${subTab.entityName}> {
17 17  
  18 + /**
  19 + * 通过主表id删除子表数据
  20 + *
  21 + * @param mainId 主表id
  22 + * @return boolean
  23 + */
18 24 public boolean deleteByMainId(@Param("mainId") String mainId);
19   -
  25 +
  26 + /**
  27 + * 通过主表id查询子表数据
  28 + *
  29 + * @param mainId 主表id
  30 + * @return List<${subTab.entityName}>
  31 + */
20 32 public List<${subTab.entityName}> selectByMainId(@Param("mainId") String mainId);
21 33 }
22 34 </#list>
23 35 \ No newline at end of file
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
  View file @1ca6905
... ... @@ -19,23 +19,35 @@ public interface I${entityName}Service extends IService&lt;${entityName}&gt; {
19 19  
20 20 /**
21 21 * 添加一对多
22   - *
  22 + *
  23 + * @param ${entityName?uncap_first}
  24 + <#list subTables as sub>
  25 + * @param ${sub.entityName?uncap_first}List
  26 + </#list>
23 27 */
24 28 public void saveMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) ;
25 29  
26 30 /**
27 31 * 修改一对多
28   - *
  32 + *
  33 + * @param ${entityName?uncap_first}
  34 + <#list subTables as sub>
  35 + * @param ${sub.entityName?uncap_first}List
  36 + </#list>
29 37 */
30 38 public void updateMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>);
31 39  
32 40 /**
33 41 * 删除一对多
  42 + *
  43 + * @param id
34 44 */
35 45 public void delMain (String id);
36 46  
37 47 /**
38 48 * 批量删除一对多
  49 + *
  50 + * @param idList
39 51 */
40 52 public void delBatchMain (Collection<? extends Serializable> idList);
41 53  
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai
  View file @1ca6905
... ... @@ -14,6 +14,12 @@ import java.util.List;
14 14 */
15 15 public interface I${subTab.entityName}Service extends IService<${subTab.entityName}> {
16 16  
  17 + /**
  18 + * 通过主表id查询子表数据
  19 + *
  20 + * @param mainId 主表id
  21 + * @return List<${subTab.entityName}>
  22 + */
17 23 public List<${subTab.entityName}> selectByMainId(String mainId);
18 24 }
19 25 </#list>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
  View file @1ca6905
... ... @@ -7,8 +7,8 @@
7 7 import {ref, computed, unref} from 'vue';
8 8 import {BasicModal, useModalInner} from '/src/components/Modal';
9 9 import {BasicForm, useForm} from '/src/components/Form';
10   - import {formSchema} from '../${entityName?uncap_first}.data';
11   - import {loadTreeData, saveOrUpdateDict} from '../${entityName?uncap_first}.api';
  10 + import {formSchema} from '../${entityName}.data';
  11 + import {loadTreeData, saveOrUpdateDict} from '../${entityName}.api';
12 12 // 获取emit
13 13 const emit = defineEmits(['register', 'success']);
14 14 const isUpdate = ref(true);
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
  View file @1ca6905
... ... @@ -75,8 +75,8 @@
75 75 <#list subTables as sub>
76 76 import ${sub.entityName}List from './${sub.entityName}List.vue'
77 77 </#list>
78   - import {columns, searchFormSchema} from './${entityName?uncap_first}.data';
79   - import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName?uncap_first}.api';
  78 + import {columns, searchFormSchema} from './${entityName}.data';
  79 + import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName}.api';
80 80 <#if list_need_category>
81 81 import { loadCategoryData } from '/@/api/common/api'
82 82 import { getAuthCache, setAuthCache } from '/@/utils/auth';
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
  View file @1ca6905
... ... @@ -8,8 +8,8 @@
8 8 import {ref, computed, unref} from 'vue';
9 9 import {BasicModal, useModalInner} from '/@/components/Modal';
10 10 import {BasicForm, useForm} from '/@/components/Form/index';
11   - import {formSchema} from '../${entityName?uncap_first}.data';
12   - import {saveOrUpdate} from '../${entityName?uncap_first}.api';
  11 + import {formSchema} from '../${entityName}.data';
  12 + import {saveOrUpdate} from '../${entityName}.api';
13 13 // Emits声明
14 14 const emit = defineEmits(['register','success']);
15 15 const isUpdate = ref(true);
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Modal.vuei
  View file @1ca6905
... ... @@ -11,8 +11,8 @@
11 11 import {ref, computed, unref,inject} from 'vue';
12 12 import {BasicModal, useModalInner} from '/@/components/Modal';
13 13 import {BasicForm, useForm} from '/@/components/Form/index';
14   - import {${sub.entityName?uncap_first}FormSchema} from '../${entityName?uncap_first}.data';
15   - import {${sub.entityName?uncap_first}SaveOrUpdate} from '../${entityName?uncap_first}.api';
  14 + import {${sub.entityName?uncap_first}FormSchema} from '../${entityName}.data';
  15 + import {${sub.entityName?uncap_first}SaveOrUpdate} from '../${entityName}.api';
16 16  
17 17 //接收主表id
18 18 const mainId = inject('mainId');
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
  View file @1ca6905
... ... @@ -79,8 +79,8 @@
79 79 <#list subTables as sub>
80 80 import ${sub.entityName}SubTable from './subTables/${sub.entityName}SubTable.vue'
81 81 </#list>
82   - import {columns, searchFormSchema} from './${entityName?uncap_first}.data';
83   - import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName?uncap_first}.api';
  82 + import {columns, searchFormSchema} from './${entityName}.data';
  83 + import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName}.api';
84 84 <#if list_need_category>
85 85 import { loadCategoryData } from '/@/api/common/api'
86 86 import { getAuthCache, setAuthCache } from '/@/utils/auth';
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
  View file @1ca6905
... ... @@ -41,8 +41,8 @@
41 41 import ${sub.entityName}Form from './${sub.entityName}Form.vue'
42 42 </#if>
43 43 </#list>
44   - import {formSchema<#list subTables as sub><#if sub.foreignRelationType =='0'>,${sub.entityName?uncap_first}JVxeColumns</#if></#list>} from '../${entityName?uncap_first}.data';
45   - import {saveOrUpdate<#list subTables as sub>,query${sub.entityName}</#list>} from '../${entityName?uncap_first}.api';
  44 + import {formSchema<#list subTables as sub><#if sub.foreignRelationType =='0'>,${sub.entityName?uncap_first}JVxeColumns</#if></#list>} from '../${entityName}.data';
  45 + import {saveOrUpdate<#list subTables as sub>,query${sub.entityName}</#list>} from '../${entityName}.api';
46 46 import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils'
47 47 // Emits声明
48 48 const emit = defineEmits(['register','success']);
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
  View file @1ca6905
... ... @@ -62,8 +62,8 @@
62 62 import { useListPage } from '/@/hooks/system/useListPage'
63 63 import {useModal} from '/@/components/Modal';
64 64 import ${entityName}Modal from './components/${entityName}Modal.vue'
65   - import {columns, searchFormSchema} from './${entityName?uncap_first}.data';
66   - import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName?uncap_first}.api';
  65 + import {columns, searchFormSchema} from './${entityName}.data';
  66 + import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName}.api';
67 67 <#if list_need_category>
68 68 import { loadCategoryData } from '/@/api/common/api'
69 69 import { getAuthCache, setAuthCache } from '/@/utils/auth';
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
  View file @1ca6905
... ... @@ -41,8 +41,8 @@
41 41 import ${sub.entityName}Form from './${sub.entityName}Form.vue'
42 42 </#if>
43 43 </#list>
44   - import {formSchema<#list subTables as sub><#if sub.foreignRelationType =='0'>,${sub.entityName?uncap_first}Columns</#if></#list>} from '../${entityName?uncap_first}.data';
45   - import {saveOrUpdate<#list subTables as sub>,${sub.entityName?uncap_first}List</#list>} from '../${entityName?uncap_first}.api';
  44 + import {formSchema<#list subTables as sub><#if sub.foreignRelationType =='0'>,${sub.entityName?uncap_first}Columns</#if></#list>} from '../${entityName}.data';
  45 + import {saveOrUpdate<#list subTables as sub>,${sub.entityName?uncap_first}List</#list>} from '../${entityName}.api';
46 46 import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils'
47 47 // Emits声明
48 48 const emit = defineEmits(['register','success']);
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
  View file @1ca6905
... ... @@ -62,8 +62,8 @@
62 62 import { useListPage } from '/@/hooks/system/useListPage'
63 63 import {useModal} from '/@/components/Modal';
64 64 import ${entityName}Modal from './components/${entityName}Modal.vue'
65   - import {columns, searchFormSchema} from './${entityName?uncap_first}.data';
66   - import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName?uncap_first}.api';
  65 + import {columns, searchFormSchema} from './${entityName}.data';
  66 + import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName}.api';
67 67 <#if list_need_category>
68 68 import { loadCategoryData } from '/@/api/common/api'
69 69 import { getAuthCache, setAuthCache } from '/@/utils/auth';
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
  View file @1ca6905
... ... @@ -45,8 +45,8 @@
45 45 import ${sub.entityName}Form from './${sub.entityName}Form.vue'
46 46 </#if>
47 47 </#list>
48   - import {formSchema<#list subTables as sub><#if sub.foreignRelationType =='0'>,${sub.entityName?uncap_first}Columns</#if></#list>} from '../${entityName?uncap_first}.data';
49   - import {saveOrUpdate<#list subTables as sub>,${sub.entityName?uncap_first}List</#list>} from '../${entityName?uncap_first}.api';
  48 + import {formSchema<#list subTables as sub><#if sub.foreignRelationType =='0'>,${sub.entityName?uncap_first}Columns</#if></#list>} from '../${entityName}.data';
  49 + import {saveOrUpdate<#list subTables as sub>,${sub.entityName?uncap_first}List</#list>} from '../${entityName}.api';
50 50 import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils'
51 51 // Emits声明
52 52 const emit = defineEmits(['register','success']);
... ...