wms / wms4_hh · Commits

Commit 45e5d5363dc1143794d0241f245e74807c482a9b

Authored by zhangdaiscott
1 parent 390814e2

修复vue3代码生成器的一些问题

Inline Side-by-side
Showing 9 changed files with 36 additions and 22 deletions
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
  View file @45e5d53
... ... @@ -30,7 +30,7 @@ export const columns: BasicColumn[] = [
30 30 slots: { customRender: 'fileSlot' },
31 31 <#elseif po.classType=='image'>
32 32 dataIndex: '${po.fieldName}',
33   - customRender:render.renderAvatar,
  33 + customRender:render.renderImage,
34 34 <#elseif po.classType=='switch'>
35 35 dataIndex: '${po.fieldName}',
36 36 <#assign switch_extend_arr=['Y','N']>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
  View file @45e5d53
... ... @@ -9,7 +9,7 @@
9 9 </#if>
10 10 </#list>
11 11 <template>
12   - <div class="p-4">
  12 + <div>
13 13 <!--引用表格-->
14 14 <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand" @fetch-success="onFetchSuccess">
15 15 <!--插槽:table标题-->
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
  View file @45e5d53
... ... @@ -34,7 +34,7 @@ export const columns: BasicColumn[] = [
34 34 slots: { customRender: 'fileSlot' },
35 35 <#elseif po.classType=='image'>
36 36 dataIndex: '${po.fieldName}',
37   - customRender:render.renderAvatar,
  37 + customRender:render.renderImage,
38 38 <#elseif po.classType=='switch'>
39 39 dataIndex: '${po.fieldName}',
40 40 <#assign switch_extend_arr=['Y','N']>
... ... @@ -193,7 +193,15 @@ export const formSchema: FormSchema[] = [
193 193 {
194 194 label: '${po.filedComment}',
195 195 field: '${po.fieldName}',
196   - <#if po.classType =='date'>
  196 + <#if po.fieldDbName == tableVo.extendParams.pidField>
  197 + component: 'JTreeSelect',
  198 + componentProps: {
  199 + dict: "${tableVo.tableName},${tableVo.extendParams.textField},id",
  200 + pidField: "${tableVo.extendParams.pidField}",
  201 + pidValue: "0",
  202 + hasChildField: "${tableVo.extendParams.hasChildren}",
  203 + },
  204 + <#elseif po.classType =='date'>
197 205 component: 'DatePicker',
198 206 <#elseif po.fieldType =='datetime'>
199 207 component: 'DatePicker',
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsi
  View file @45e5d53
... ... @@ -15,8 +15,6 @@ enum Api {
15 15 ${sub.entityName?uncap_first}Edit='/${entityPackage}/${entityName?uncap_first}/edit${sub.entityName}',
16 16 ${sub.entityName?uncap_first}Delete = '/${entityPackage}/${entityName?uncap_first}/delete${sub.entityName}',
17 17 ${sub.entityName?uncap_first}DeleteBatch = '/${entityPackage}/${entityName?uncap_first}/deleteBatch${sub.entityName}',
18   - ${sub.entityName?uncap_first}ExportXlsUrl = '/${entityPackage}/${entityName?uncap_first}/export${sub.entityName}',
19   - ${sub.entityName?uncap_first}ImportUrl = '/${entityPackage}/${entityName?uncap_first}/import${sub.entityName}',
20 18 </#list>
21 19 }
22 20 /**
... ... @@ -110,4 +108,13 @@ export const ${sub.entityName?uncap_first}SaveOrUpdate = (params, isUpdate) =&gt;
110 108 let url = isUpdate ? Api.${sub.entityName?uncap_first}Edit : Api.${sub.entityName?uncap_first}Save;
111 109 return defHttp.post({url: url, params});
112 110 }
  111 +/**
  112 + * 导入
  113 + */
  114 +export const ${sub.entityName?uncap_first}ImportUrl = '/${entityPackage}/${entityName?uncap_first}/import${sub.entityName}'
  115 +
  116 +/**
  117 + * 导出
  118 + */
  119 +export const ${sub.entityName?uncap_first}ExportXlsUrl = '/${entityPackage}/${entityName?uncap_first}/export${sub.entityName}'
113 120 </#list>
114 121 \ No newline at end of file
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
  View file @45e5d53
... ... @@ -30,7 +30,7 @@ export const columns: BasicColumn[] = [
30 30 slots: { customRender: 'fileSlot' },
31 31 <#elseif po.classType=='image'>
32 32 dataIndex: '${po.fieldName}',
33   - customRender:render.renderAvatar,
  33 + customRender:render.renderImage,
34 34 <#elseif po.classType=='switch'>
35 35 dataIndex: '${po.fieldName}',
36 36 <#assign switch_extend_arr=['Y','N']>
... ... @@ -393,7 +393,7 @@ export const ${sub.entityName?uncap_first}Columns: BasicColumn[] = [
393 393 slots: { customRender: 'fileSlot' },
394 394 <#elseif po.classType=='image'>
395 395 dataIndex: '${po.fieldName}',
396   - customRender:render.renderAvatar,
  396 + customRender:render.renderImage,
397 397 <#elseif po.classType=='switch'>
398 398 dataIndex: '${po.fieldName}',
399 399 <#assign switch_extend_arr=['Y','N']>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/[1-n]List.vuei
  View file @45e5d53
... ... @@ -77,10 +77,17 @@
77 77 },
78 78 exportConfig: {
79 79 name: '${sub.ftlDescription}',
80   - url: ${sub.entityName?uncap_first}ExportXlsUrl
  80 + url: ${sub.entityName?uncap_first}ExportXlsUrl,
  81 + params: {
  82 + <#list sub.foreignKeys as key>
  83 + '${key?uncap_first}': mainId
  84 + </#list>
  85 + }
81 86 },
82 87 importConfig: {
83   - url: getImportUrl()
  88 + url: ()=>{
  89 + return ${sub.entityName?uncap_first}ImportUrl + '/' + unref(mainId)
  90 + }
84 91 }
85 92 });
86 93  
... ... @@ -96,14 +103,6 @@
96 103 );
97 104  
98 105 /**
99   - * 导入地址
100   - */
101   - function getImportUrl(){
102   - return ${sub.entityName?uncap_first}ImportUrl+'/'+ unref(mainId)
103   - }
104   -
105   -
106   - /**
107 106 * 新增事件
108 107 */
109 108 function handleCreate() {
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
  View file @45e5d53
... ... @@ -31,7 +31,7 @@ export const columns: BasicColumn[] = [
31 31 slots: { customRender: 'fileSlot' },
32 32 <#elseif po.classType=='image'>
33 33 dataIndex: '${po.fieldName}',
34   - customRender:render.renderAvatar,
  34 + customRender:render.renderImage,
35 35 <#elseif po.classType=='switch'>
36 36 dataIndex: '${po.fieldName}',
37 37 <#assign switch_extend_arr=['Y','N']>
... ... @@ -396,7 +396,7 @@ export const ${sub.entityName?uncap_first}Columns: BasicColumn[] = [
396 396 slots: { customRender: 'fileSlot' },
397 397 <#elseif po.classType=='image'>
398 398 dataIndex: '${po.fieldName}',
399   - customRender:render.renderAvatar,
  399 + customRender:render.renderImage,
400 400 <#elseif po.classType=='switch'>
401 401 dataIndex: '${po.fieldName}',
402 402 <#assign switch_extend_arr=['Y','N']>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
  View file @45e5d53
... ... @@ -31,7 +31,7 @@ export const columns: BasicColumn[] = [
31 31 slots: { customRender: 'fileSlot' },
32 32 <#elseif po.classType=='image'>
33 33 dataIndex: '${po.fieldName}',
34   - customRender:render.renderAvatar,
  34 + customRender:render.renderImage,
35 35 <#elseif po.classType=='switch'>
36 36 dataIndex: '${po.fieldName}',
37 37 <#assign switch_extend_arr=['Y','N']>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
  View file @45e5d53
... ... @@ -31,7 +31,7 @@ export const columns: BasicColumn[] = [
31 31 slots: { customRender: 'fileSlot' },
32 32 <#elseif po.classType=='image'>
33 33 dataIndex: '${po.fieldName}',
34   - customRender:render.renderAvatar,
  34 + customRender:render.renderImage,
35 35 <#elseif po.classType=='switch'>
36 36 dataIndex: '${po.fieldName}',
37 37 <#assign switch_extend_arr=['Y','N']>
... ...