From 5a3631c3325308904250e059c73b42b9365d324e Mon Sep 17 00:00:00 2001 From: chenrui Date: Mon, 18 Dec 2023 11:38:30 +0800 Subject: [PATCH 01/30] =?UTF-8?q?fix=20issues=20#5658=20=E6=A0=91=E8=A1=A8?= =?UTF-8?q?=E5=A4=8D=E9=80=89=E6=A1=86=E4=B8=8E=E5=B1=95=E5=BC=80=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=87=8D=E5=8F=A0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei | 1 + 1 file changed, 1 insertion(+) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei index ba1fab0f..0d54af20 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei @@ -102,6 +102,7 @@ title: '${tableVo.ftlDescription}', columns, canResize:false, + isTreeTable: true, formConfig: { //labelWidth: 120, schemas: searchFormSchema, From 82d051f388ccfad3e996d368dca30a4081a4c5fe Mon Sep 17 00:00:00 2001 From: chenrui Date: Mon, 18 Dec 2023 13:53:59 +0800 Subject: [PATCH 02/30] =?UTF-8?q?fix=20QQYUN-7583=20Vue3=E9=A3=8E=E6=A0=BC?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E9=A1=B5=E9=9D=A2=E5=A4=9A=E9=80=89=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E6=B8=B2=E6=9F=93=E6=88=90=E4=BA=86=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vue3/${entityName}__data.tsi | 7 +++++- .../vue3Native/${entityName}__data.tsi | 11 +++++++--- .../vue3/${entityName}__data.tsi | 7 +++++- .../vue3Native/${entityName}__data.tsi | 9 ++++++-- .../vue3/${entityName}__data.tsi | 14 ++++++++++-- .../vue3Native/${entityName}__data.tsi | 22 ++++++++++++++----- .../vue3/${entityName}__data.tsi | 14 ++++++++++-- .../vue3/${entityName}__data.tsi | 16 +++++++++++--- .../vue3Native/${entityName}__data.tsi | 16 +++++++++++--- .../vue3/${entityName}__data.tsi | 14 ++++++++++-- 10 files changed, 105 insertions(+), 25 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi index 3a15c8f4..d411bb8f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi @@ -247,8 +247,13 @@ export const formSchema: FormSchema[] = [ componentProps:{ dictCode:"${form_field_dictCode}" }, - <#elseif po.classType=='list_multi' || po.classType=='checkbox'> + <#elseif po.classType=='list_multi'> component: 'JSelectMultiple', + componentProps:{ + dictCode:"${form_field_dictCode}" + }, + <#elseif po.classType=='checkbox'> + component: 'JCheckbox', componentProps:{ dictCode:"${form_field_dictCode}" }, diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi index d6c1bc8f..43bbe7e8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi @@ -233,11 +233,16 @@ export const formSchema: FormSchema[] = [ componentProps:{ dictCode: "${form_field_dictCode}" }, - <#elseif po.classType=='list_multi' || po.classType=='checkbox'> + <#elseif po.classType=='list_multi'> component: 'JSelectMultiple', componentProps:{ - dictCode: "${form_field_dictCode}" - }, + dictCode:"${form_field_dictCode}" + }, + <#elseif po.classType=='checkbox'> + component: 'JCheckbox', + componentProps:{ + dictCode:"${form_field_dictCode}" + }, <#elseif po.classType=='sel_search'> component: 'JSearchSelect', componentProps:{ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi index dc6dd1af..6bf6ff4c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi @@ -273,8 +273,13 @@ export const formSchema: FormSchema[] = [ componentProps:{ dictCode:"${form_field_dictCode}" }, - <#elseif po.classType=='list_multi' || po.classType=='checkbox'> + <#elseif po.classType=='list_multi'> component: 'JSelectMultiple', + componentProps:{ + dictCode:"${form_field_dictCode}" + }, + <#elseif po.classType=='checkbox'> + component: 'JCheckbox', componentProps:{ dictCode:"${form_field_dictCode}" }, diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi index d2200b0d..a6835116 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi @@ -263,10 +263,15 @@ export const formSchema: FormSchema[] = [ componentProps:{ dictCode: "${form_field_dictCode}" }, - <#elseif po.classType=='list_multi' || po.classType=='checkbox'> + <#elseif po.classType=='list_multi'> component: 'JSelectMultiple', componentProps:{ - dictCode: "${form_field_dictCode}" + dictCode:"${form_field_dictCode}" + }, + <#elseif po.classType=='checkbox'> + component: 'JCheckbox', + componentProps:{ + dictCode:"${form_field_dictCode}" }, <#elseif po.classType=='sel_search'> component: 'JSearchSelect', diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi index 1e4008ba..18fde0d8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi @@ -240,8 +240,13 @@ export const formSchema: FormSchema[] = [ componentProps:{ dictCode:"${form_field_dictCode}" }, - <#elseif po.classType=='list_multi' || po.classType=='checkbox'> + <#elseif po.classType=='list_multi'> component: 'JSelectMultiple', + componentProps:{ + dictCode:"${form_field_dictCode}" + }, + <#elseif po.classType=='checkbox'> + component: 'JCheckbox', componentProps:{ dictCode:"${form_field_dictCode}" }, @@ -507,8 +512,13 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [ componentProps:{ dictCode:"${form_field_dictCode}" }, - <#elseif po.classType=='list_multi' || po.classType=='checkbox'> + <#elseif po.classType=='list_multi'> component: 'JSelectMultiple', + componentProps:{ + dictCode:"${form_field_dictCode}" + }, + <#elseif po.classType=='checkbox'> + component: 'JCheckbox', componentProps:{ dictCode:"${form_field_dictCode}" }, diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi index eed9d3f7..10eb0213 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi @@ -240,11 +240,16 @@ export const formSchema: FormSchema[] = [ componentProps:{ dictCode:"${form_field_dictCode}" }, - <#elseif po.classType=='list_multi' || po.classType=='checkbox'> + <#elseif po.classType=='list_multi'> component: 'JSelectMultiple', componentProps:{ - dictCode:"${form_field_dictCode}" - }, + dictCode:"${form_field_dictCode}" + }, + <#elseif po.classType=='checkbox'> + component: 'JCheckbox', + componentProps:{ + dictCode:"${form_field_dictCode}" + }, <#elseif po.classType=='sel_search'> component: 'JSearchSelect', componentProps:{ @@ -507,11 +512,16 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [ componentProps:{ dictCode:"${form_field_dictCode}" }, - <#elseif po.classType=='list_multi' || po.classType=='checkbox'> + <#elseif po.classType=='list_multi'> component: 'JSelectMultiple', componentProps:{ - dictCode:"${form_field_dictCode}" - }, + dictCode:"${form_field_dictCode}" + }, + <#elseif po.classType=='checkbox'> + component: 'JCheckbox', + componentProps:{ + dictCode:"${form_field_dictCode}" + }, <#elseif po.classType=='sel_search'> component: 'JSearchSelect', componentProps:{ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi index b31d566b..ad0f57b0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi @@ -243,8 +243,13 @@ export const formSchema: FormSchema[] = [ componentProps:{ dictCode:"${form_field_dictCode}" }, - <#elseif po.classType=='list_multi' || po.classType=='checkbox'> + <#elseif po.classType=='list_multi'> component: 'JSelectMultiple', + componentProps:{ + dictCode:"${form_field_dictCode}" + }, + <#elseif po.classType=='checkbox'> + component: 'JCheckbox', componentProps:{ dictCode:"${form_field_dictCode}" }, @@ -508,8 +513,13 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [ componentProps:{ dictCode:"${form_field_dictCode}" }, - <#elseif po.classType=='list_multi' || po.classType=='checkbox'> + <#elseif po.classType=='list_multi'> component: 'JSelectMultiple', + componentProps:{ + dictCode:"${form_field_dictCode}" + }, + <#elseif po.classType=='checkbox'> + component: 'JCheckbox', componentProps:{ dictCode:"${form_field_dictCode}" }, diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi index 99a9e5e9..f1492d4b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi @@ -243,8 +243,13 @@ export const formSchema: FormSchema[] = [ componentProps:{ dictCode:"${form_field_dictCode}" }, - <#elseif po.classType=='list_multi' || po.classType=='checkbox'> + <#elseif po.classType=='list_multi'> component: 'JSelectMultiple', + componentProps:{ + dictCode:"${form_field_dictCode}" + }, + <#elseif po.classType=='checkbox'> + component: 'JCheckbox', componentProps:{ dictCode:"${form_field_dictCode}" }, @@ -448,11 +453,16 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [ componentProps:{ dictCode:"${form_field_dictCode}" }, - <#elseif po.classType=='list_multi' || po.classType=='checkbox'> + <#elseif po.classType=='list_multi'> component: 'JSelectMultiple', componentProps:{ dictCode:"${form_field_dictCode}" - } + }, + <#elseif po.classType=='checkbox'> + component: 'JCheckbox', + componentProps:{ + dictCode:"${form_field_dictCode}" + }, <#elseif po.classType=='sel_search'> component: 'JSearchSelect', componentProps:{ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi index f99c41c4..2610c1db 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi @@ -229,8 +229,13 @@ export const formSchema: FormSchema[] = [ componentProps:{ dictCode:"${form_field_dictCode}" }, - <#elseif po.classType=='list_multi' || po.classType=='checkbox'> + <#elseif po.classType=='list_multi'> component: 'JSelectMultiple', + componentProps:{ + dictCode:"${form_field_dictCode}" + }, + <#elseif po.classType=='checkbox'> + component: 'JCheckbox', componentProps:{ dictCode:"${form_field_dictCode}" }, @@ -425,11 +430,16 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [ componentProps:{ dictCode:"${form_field_dictCode}" }, - <#elseif po.classType=='list_multi' || po.classType=='checkbox'> + <#elseif po.classType=='list_multi'> component: 'JSelectMultiple', componentProps:{ dictCode:"${form_field_dictCode}" - } + }, + <#elseif po.classType=='checkbox'> + component: 'JCheckbox', + componentProps:{ + dictCode:"${form_field_dictCode}" + }, <#elseif po.classType=='sel_search'> component: 'JSearchSelect', componentProps:{ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi index d79ec2e9..e628e85f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi @@ -240,8 +240,13 @@ export const formSchema: FormSchema[] = [ componentProps:{ dictCode:"${form_field_dictCode}" }, - <#elseif po.classType=='list_multi' || po.classType=='checkbox'> + <#elseif po.classType=='list_multi'> component: 'JSelectMultiple', + componentProps:{ + dictCode:"${form_field_dictCode}" + }, + <#elseif po.classType=='checkbox'> + component: 'JCheckbox', componentProps:{ dictCode:"${form_field_dictCode}" }, @@ -442,8 +447,13 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [ componentProps:{ dictCode:"${form_field_dictCode}" }, - <#elseif po.classType=='list_multi' || po.classType=='checkbox'> + <#elseif po.classType=='list_multi'> component: 'JSelectMultiple', + componentProps:{ + dictCode:"${form_field_dictCode}" + }, + <#elseif po.classType=='checkbox'> + component: 'JCheckbox', componentProps:{ dictCode:"${form_field_dictCode}" }, From 090f790df4f8887e9e98595b7fad39fcc90c1c9c Mon Sep 17 00:00:00 2001 From: chenrui Date: Tue, 19 Dec 2023 10:33:08 +0800 Subject: [PATCH 03/30] =?UTF-8?q?fix=20QQYUN-7527=20vue3=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90,=E9=BB=98=E8=AE=A4=E5=B8=A6=E4=B8=8A?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code-template-online/common/utils.ftl | 50 +++++++++++++++++++ .../vue3/${entityName}List.vuei | 25 +++++++++- .../vue3/${entityName}__data.tsi | 10 ++++ .../vue3Native/${entityName}List.vuei | 19 ++++++- .../vue3Native/${entityName}__data.tsi | 9 ++++ .../vue3/${entityName}List.vuei | 24 ++++++++- .../vue3/${entityName}__data.tsi | 9 ++++ .../vue3Native/${entityName}List.vuei | 17 ++++++- .../vue3Native/${entityName}__data.tsi | 9 ++++ .../vue3/${entityName}List.vuei | 25 +++++++++- .../vue3/${entityName}__data.tsi | 11 +++- .../vue3Native/${entityName}List.vuei | 19 ++++++- .../vue3Native/${entityName}__data.tsi | 11 +++- .../vue3/${entityName}List.vuei | 50 +++++++++++++------ .../vue3/${entityName}__data.tsi | 23 +++++++++ .../vue3/${entityName}List.vuei | 24 ++++++++- .../vue3/${entityName}__data.tsi | 24 +++++++++ .../vue3Native/${entityName}List.vuei | 17 ++++++- .../vue3Native/${entityName}__data.tsi | 25 +++++++++- .../vue3/${entityName}List.vuei | 24 ++++++++- .../vue3/${entityName}__data.tsi | 26 +++++++++- 21 files changed, 418 insertions(+), 33 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl index c7c5df6e..375b7e29 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl @@ -132,6 +132,56 @@ +<#-- ** 高级查询生成(Vue3 * --> +<#function superQueryFieldListForVue3(po,order)> + <#-- 字段展示/DB类型 --> + <#assign baseAttrs="view: '${po.classType}', type: 'string',"> + <#if po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'> + <#assign baseAttrs="view: 'number', type: 'number',"> + + + <#-- 特殊类型控件扩展字段 --> + <#assign extAttrs=""> + <#assign dictCode=""> + <#if po.dictTable?default('')?trim?length gt 1 && po.dictText?default('')?trim?length gt 1 && po.dictField?default("")?trim?length gt 1> + <#assign dictCode="dictTable: '${po.dictTable}', dictCode: '${po.dictField}', dictText: '${po.dictText}'"> + <#elseif po.dictField?default("")?trim?length gt 1> + <#assign dictCode="dictCode: '${po.dictField}'"> + + + <#if po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='checkbox'> + <#assign extAttrs="${dictCode},"> + <#elseif po.classType=='cat_tree'> + <#-- 分类字典树 --> + <#assign extAttrs="pcode: '${po.dictField}',"> + <#elseif po.classType=='sel_tree'> + <#-- 自定义树 --> + <#if po.dictText??> + <#-- dictText示例:id,pid,name,has_child --> + <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??> + <#assign extAttrs="dict: '${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}'"> + <#elseif po.dictText?split(',')[1]??> + <#assign extAttrs="pidField: '${po.dictText?split(',')[1]}'"> + <#elseif po.dictText?split(',')[3]??> + <#assign extAttrs="hasChildField: '${po.dictText?split(',')[3]}'"> + + + <#assign extAttrs="${extAttrs}, pidValue: '${po.dictField}',"> + <#elseif po.classType=='popup'> + <#-- popup --> + <#if po.dictText?default("")?trim?length gt 1 && po.dictText?index_of(',') gt 0> + <#-- 如果有多个回填字段,找到popup字段对应的来源字段 --> + <#assign orgFieldIx=po.dictText?split(',')?seq_index_of(po.fieldDbName)> + <#assign orgField=po.dictField?split(',')[orgFieldIx]> + <#else> + <#assign orgField=po.dictField?default("")> + + <#assign extAttrs="code: '${po.dictTable?default('')}', orgFields: '${orgField}', destFields: '${po.fieldName}', popupMulti: false,"> + + + <#return "${po.fieldName}: {title: '${po.filedComment}',order: ${order},${baseAttrs}${extAttrs}}" > + + <#-- vue3 获取表单modal的宽度--> <#function getModalWidth fieldRowNum> diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei index a111cf99..a8bf1b54 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei @@ -37,6 +37,8 @@ + + \ No newline at end of file From fdde84c68a3914fd57c3aaa63c7f7965ca38ef95 Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Fri, 29 Dec 2023 21:14:49 +0800 Subject: [PATCH 15/30] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code-template-online/common/utils.ftl | 15 +++--- .../vue3/${entityName}List.vuei | 6 ++- .../vue3/${entityName}__data.tsi | 7 +-- .../vue3Native/${entityName}List.vuei | 6 ++- .../vue3Native/${entityName}__data.tsi | 4 ++ .../vue3/${entityName}List.vuei | 6 +++ .../vue3/${entityName}__data.tsi | 4 ++ .../vue3Native/${entityName}List.vuei | 4 ++ .../vue3Native/${entityName}__data.tsi | 4 ++ .../vue3/${entityName}List.vuei | 4 ++ .../vue3/${entityName}__data.tsi | 8 ++- .../vue3Native/${entityName}List.vuei | 6 ++- .../vue3Native/${entityName}__data.tsi | 8 ++- .../vue3/${entityName}List.vuei | 51 ++++++++++--------- .../vue3/${entityName}__data.tsi | 6 +++ .../vue3/${entityName}List.vuei | 4 ++ .../vue3/${entityName}__data.tsi | 7 ++- .../vue3Native/${entityName}List.vuei | 4 ++ .../vue3Native/${entityName}__data.tsi | 8 ++- .../vue3/${entityName}List.vuei | 5 +- .../vue3/${entityName}__data.tsi | 9 +++- 21 files changed, 130 insertions(+), 46 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl index 375b7e29..44724746 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl @@ -131,16 +131,16 @@ - +<#-- update-begin---author:chenrui ---date:20231228 for:[QQYUN-7527]vue3代码生成默认带上高级查询---------- --> <#-- ** 高级查询生成(Vue3 * --> <#function superQueryFieldListForVue3(po,order)> - <#-- 字段展示/DB类型 --> +<#-- 字段展示/DB类型 --> <#assign baseAttrs="view: '${po.classType}', type: 'string',"> <#if po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'> <#assign baseAttrs="view: 'number', type: 'number',"> - <#-- 特殊类型控件扩展字段 --> +<#-- 特殊类型控件扩展字段 --> <#assign extAttrs=""> <#assign dictCode=""> <#if po.dictTable?default('')?trim?length gt 1 && po.dictText?default('')?trim?length gt 1 && po.dictField?default("")?trim?length gt 1> @@ -152,12 +152,12 @@ <#if po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='checkbox'> <#assign extAttrs="${dictCode},"> <#elseif po.classType=='cat_tree'> - <#-- 分类字典树 --> + <#-- 分类字典树 --> <#assign extAttrs="pcode: '${po.dictField}',"> <#elseif po.classType=='sel_tree'> - <#-- 自定义树 --> + <#-- 自定义树 --> <#if po.dictText??> - <#-- dictText示例:id,pid,name,has_child --> + <#-- dictText示例:id,pid,name,has_child --> <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??> <#assign extAttrs="dict: '${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}'"> <#elseif po.dictText?split(',')[1]??> @@ -168,7 +168,7 @@ <#assign extAttrs="${extAttrs}, pidValue: '${po.dictField}',"> <#elseif po.classType=='popup'> - <#-- popup --> + <#-- popup --> <#if po.dictText?default("")?trim?length gt 1 && po.dictText?index_of(',') gt 0> <#-- 如果有多个回填字段,找到popup字段对应的来源字段 --> <#assign orgFieldIx=po.dictText?split(',')?seq_index_of(po.fieldDbName)> @@ -181,6 +181,7 @@ <#return "${po.fieldName}: {title: '${po.filedComment}',order: ${order},${baseAttrs}${extAttrs}}" > +<#-- update-end---author:chenrui ---date:20231228 for:[QQYUN-7527]vue3代码生成默认带上高级查询---------- --> <#-- vue3 获取表单modal的宽度--> diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei index a8bf1b54..13d8b162 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei @@ -37,8 +37,10 @@ + <#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- --> + <#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->