From 4957330c1c44469c752222c2b249e9bc5e4c05a8 Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Fri, 20 Oct 2023 12:07:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E7=94=9F=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=A8=A1=E6=9D=BF=E4=BC=98=E5=8C=96=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=201=E3=80=81=E8=A1=A8=E5=8D=95=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?=E5=B8=A6=E4=B8=8D=E5=87=BA=E6=9D=A5=20issues/5304=202=E3=80=81?= =?UTF-8?q?=E4=B8=80=E5=AF=B9=E5=A4=9Aerp=E9=A3=8E=E6=A0=BC=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=8E=9F=E7=94=9F=E7=94=9F=E6=88=90=20issues/5294=203?= =?UTF-8?q?=E3=80=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=94=99=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/enums/CgformEnum.java | 2 +- .../common/form/native/vue3NativeForm.ftl | 2 +- .../common/form/native/vue3NativeSearch.ftl | 10 +- .../init/native/vue3NativeInitValue.ftl | 11 + .../init/native/vue3NativeMainInitValue.ftl | 11 + .../init/native/vue3NativeSubInitValue.ftl | 11 + .../vue3Native/${entityName}List.vuei | 13 +- .../components/${entityName}Form.vuei | 12 +- .../vue3Native/${entityName}List.vuei | 14 +- .../components/${entityName}Form.vuei | 12 +- .../vue3Native/${entityName}List.vuei | 422 ++++++++++++ .../vue3Native/${entityName}__api.tsi | 139 ++++ .../vue3Native/${entityName}__data.tsi | 630 ++++++++++++++++++ .../vue3Native/${entityName}_menu_insert.sql | 1 + .../vue3Native/[1-n]List.vuei | 240 +++++++ .../components/${entityName}Form.vuei | 218 ++++++ .../components/${entityName}Modal.vuei | 75 +++ .../vue3Native/components/[1-n]Form.vuei | 194 ++++++ .../vue3Native/components/[1-n]Modal.vuei | 77 +++ .../vue3Native/${entityName}List.vuei | 13 +- .../components/${entityName}Form.vuei | 6 +- .../vue3Native/components/[1-n]Form.vuei | 6 +- 22 files changed, 2066 insertions(+), 53 deletions(-) create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeInitValue.ftl create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeMainInitValue.ftl create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeSubInitValue.ftl create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__api.tsi create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}_menu_insert.sql create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/[1-n]List.vuei create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Modal.vuei create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Modal.vuei diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java index 37191ec9..0f7f73c6 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java @@ -28,7 +28,7 @@ public enum CgformEnum { /** * 多表 (erp风格) */ - ERP(2, "erp", "/jeecg/code-template-online", "erp.onetomany", "ERP风格" ,new String[]{"vue3","vue"}), + ERP(2, "erp", "/jeecg/code-template-online", "erp.onetomany", "ERP风格" ,new String[]{"vue3","vue","vue3Native"}), /** * 多表(内嵌子表风格) */ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeForm.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeForm.ftl index c34b0077..95421ca1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeForm.ftl +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeForm.ftl @@ -50,7 +50,7 @@ <#assign need_dept_user = true> disabled<#else>:disabled="disabled"/> <#elseif po.classType =='textarea'> - disabled<#else>:disabled="disabled"/> + disabled<#else>:disabled="disabled"/> <#elseif po.classType=='radio'> <#assign need_select_tag = true> disabled<#else>:disabled="disabled"/> diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl index 41515bf8..8b30eb15 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl @@ -13,8 +13,9 @@ <#assign query_field_dictCode="${po.dictField}"> <#if po.queryMode=='single'> - <#if query_field_no gt 1> - <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1> <#if po.classType=='sel_search'> <#if query_field_no gt 1> <#elseif po.classType=='sel_user'> @@ -64,8 +65,9 @@ <#if query_field_no gt 1> <#if query_field_no gt 1> <#else> - <#if query_field_no gt 1> - <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1> <#if po.classType=='date'> <#if query_field_no gt 1> <#if query_field_no gt 1> ~ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeInitValue.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeInitValue.ftl new file mode 100644 index 00000000..a7b51839 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeInitValue.ftl @@ -0,0 +1,11 @@ +<#list columns as po> + <#if po.isShow == 'Y' && po.fieldName != 'id'> + <#if po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'> + ${po.fieldName}: <#if po.defaultVal??>${po.defaultVal}<#else>undefined, + <#elseif po.fieldDbType=='Blob'> + ${po.fieldName}String: <#if po.defaultVal??>${po.defaultVal}<#else>'', + <#else> + ${po.fieldName}: <#if po.defaultVal??>'${po.defaultVal}'<#else>'', + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeMainInitValue.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeMainInitValue.ftl new file mode 100644 index 00000000..f7c08282 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeMainInitValue.ftl @@ -0,0 +1,11 @@ +<#list columns as po> + <#if po.isShow == 'Y' && po.fieldName != 'id'> + <#if po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'> + ${po.fieldName}: <#if po.defaultVal??>${po.defaultVal}<#else>undefined, + <#elseif po.fieldDbType=='Blob'> + ${po.fieldName}String: <#if po.defaultVal??>${po.defaultVal}<#else>'', + <#else> + ${po.fieldName}: <#if po.defaultVal??>'${po.defaultVal}'<#else>'', + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeSubInitValue.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeSubInitValue.ftl new file mode 100644 index 00000000..1513c444 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeSubInitValue.ftl @@ -0,0 +1,11 @@ +<#list sub.colums as po> + <#if po.isShow == 'Y' && po.fieldName != 'id'> + <#if po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'> + ${po.fieldName}: <#if po.defaultVal??>${po.defaultVal}<#else>undefined, + <#elseif po.fieldDbType=='Blob'> + ${po.fieldName}String: <#if po.defaultVal??>${po.defaultVal}<#else>'', + <#else> + ${po.fieldName}: <#if po.defaultVal??>'${po.defaultVal}'<#else>'', + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei index 643f3d6a..30d965c9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei @@ -1,5 +1,5 @@