From fdde84c68a3914fd57c3aaa63c7f7965ca38ef95 Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Fri, 29 Dec 2023 21:14:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?= =?UTF-8?q?=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代码生成默认带上高级查询---------- -->