From 5a3631c3325308904250e059c73b42b9365d324e Mon Sep 17 00:00:00 2001 From: chenrui Date: Mon, 18 Dec 2023 11:38:30 +0800 Subject: [PATCH 1/2] =?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 2/2] =?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}" },