Merge pull request #5692 from hoperunChen/fix-QQYUN-7527

fix QQYUN-7527 vue3代码生成默认带上高级查询

README-EN.md

@@ -58,13 +58,12 @@ Download the source code
 | `jeecg-boot`    | SpringBoot background source code (support microservices)      |
 | `jeecgboot-vue3` | Vue3+TS new front-end source code|
 | `jeecg-uniapp` | [APP development framework, a code multi terminal adaptation, and support APP, small program, H5](https://github.com/jeecgboot/jeecg-uniapp) |
-| `jeecg-boot-starter` | [Stater relies on the project to be maintained separately. Click Download](https://gitee.com/jeecg/jeecg-boot-starter) |
+| `SpringBoot3+JDK17`    | [BranchSourceCode](https://github.com/jeecgboot/jeecg-boot/tree/springboot3)  [UpgradeBlog](https://blog.csdn.net/zhangdaiscott/article/details/134805602)        |
 | `More` | [Download more source code](http://jeecg.com/download) |
 
 
 
 
-
 For the project
 -----------------------------------
 Jeecg-Boot low code development platform can be applied in the development of any J2EE project, especially for SAAS projects, enterprise information management system (MIS), internal office system (OA), enterprise resource planning system (ERP), customer relationship management system (CRM), etc. Its semi-intelligent manual Merge development method, Can significantly improve the development efficiency of more than 70%, greatly reduce the development cost.
@@ -94,6 +93,11 @@ Technical documentation
 
 
 
+Thinking
+-----------------------------------
+> We are pursuing the goal of implementing complex business systems without writing code! That has been done so far
+- https://www.qiaoqiaoyun.com
+
 
 Star charts
 -----------------------------------

README.md

@@ -49,16 +49,17 @@ Jeecg-Boot低代码开发平台，可以应用在任何J2EE项目的开发中，
 | Github | [jeecgboot-vue3](https://github.com/jeecgboot/jeecgboot-vue3)   | [jeecg-boot](https://github.com/jeecgboot/jeecg-boot) |
 | 码云 | [jeecgboot-vue3](https://gitee.com/jeecg/jeecgboot-vue3)   | [jeecg-boot](https://gitee.com/jeecg/jeecg-boot) |
 
+> 官方已推出 `SpringBoot3+JDK17版本` [分支源码下载](https://github.com/jeecgboot/jeecg-boot/tree/springboot3)  |  [升级SpringBoot3博客](https://blog.csdn.net/zhangdaiscott/article/details/134805602)
 
 #### 项目说明
 
 | 项目名                | 说明                     | 
 |--------------------|------------------------|
-| `jeecg-boot`    | JAVA后台源码（支持微服务）        |
 | `jeecgboot-vue3` | 前端源码 (Vue3版本) |
+| `jeecg-boot`    | 后端JAVA源码（支持微服务）        |
 | `jeecg-uniapp` | [APP开发框架，一份代码多终端适配，同时支持APP、小程序、H5](https://github.com/jeecgboot/jeecg-uniapp) |
-| `jeecg-boot-starter` | [Stater依赖项目单独维护，点击下载](https://gitee.com/jeecg/jeecg-boot-starter) |
+| `更多开源项目` | [更多底层源码下载](http://jeecg.com/download) |
-| `更多开源项目` | [更多源码下载](http://jeecg.com/download) |
+
 
 
 快速搭建开发环境
@@ -92,6 +93,12 @@ Docker快速启动项目
 > ` 提醒：【QQ群是自助服务群，建议给帮助您解决问题的同学发送指定红包，表示感谢！】 `
 
 
+大龄码农的思考
+-----------------------------------
+> 作为码农年纪大了写不动代码了怎么办？？哎！！
+所以我们团队在追求不写代码也可实现复杂业务系统！目前已经做到了，不信你到敲敲云零代码试试（通过流程串联修改业务数据）
+
+- https://www.qiaoqiaoyun.com
 
 
 技术支持
@@ -104,8 +111,6 @@ Docker快速启动项目
 
 
 
-
-
 VUE2版本专题介绍
 -----------------------------------
 #### 项目介绍 
@@ -462,8 +467,11 @@ Star走势图
    
 ```
 
+### 流程引擎推荐
 
+JeecgBoot企业版本默认集成了activiti和flowable两套方案，大家在使用本开源项目时，如果想进一步集成流程引擎，推荐结合贺波老师的书 [《深入Activiti流程引擎：核心原理与高阶实战》](https://item.m.jd.com/product/13928958.html?gx=RnAomTM2bmCImZxDqYAkVCoIHuIYVqc)
 
+<img src="https://jeecgos.oss-cn-beijing.aliyuncs.com/files/tuijian20231220161656.png" width="25%" height="auto">
 
 
 ### 系统效果

jeecg-boot-base-core/pom.xml

@@ -256,6 +256,15 @@
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
 		</dependency>
+		<!--加载hutool-->
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-crypto</artifactId>
+		</dependency>
 	</dependencies>
 
 </project>

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl

@@ -132,6 +132,56 @@
   </#if>
 </#function>
 
+<#-- ** 高级查询生成(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',">
+    </#if>
+
+    <#-- 特殊类型控件扩展字段 -->
+    <#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>
+
+    <#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]}'">
+            </#if>
+        </#if>
+        <#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("")>
+        </#if>
+        <#assign extAttrs="code: '${po.dictTable?default('')}', orgFields: '${orgField}', destFields: '${po.fieldName}', popupMulti: false,">
+    </#if>
+
+    <#return "${po.fieldName}: {title: '${po.filedComment}',order: ${order},${baseAttrs}${extAttrs}}" >
+</#function>
+
 
 <#-- vue3 获取表单modal的宽度-->
 <#function getModalWidth fieldRowNum>

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 @@
                 <Icon icon="mdi:chevron-down"></Icon>
               </a-button>
         </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
       </template>
        <!--操作栏-->
       <template #action="{ record }">
@@ -71,12 +73,12 @@
 </template>
 
 <script lang="ts" name="${entityPackage}-${entityName?uncap_first}" setup>
-  import {ref, computed, unref} from 'vue';
+  import {ref, reactive, computed, unref} from 'vue';
   import {BasicTable, useTable, TableAction} from '/@/components/Table';
   import {useModal} from '/@/components/Modal';
   import { useListPage } from '/@/hooks/system/useListPage'
   import ${entityName}Modal from './components/${entityName}Modal.vue'
-  import {columns, searchFormSchema} from './${entityName}.data';
+  import {columns, searchFormSchema, superQuerySchema} from './${entityName}.data';
   import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName}.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
   import { useUserStore } from '/@/store/modules/user';
@@ -91,6 +93,7 @@
   <#if bpm_flag==true>
   import { startProcess } from '/@/api/common/api';
   </#if>
+  const queryParam = reactive<any>({});
   const checkedKeys = ref<Array<string | number>>([]);
   const userStore = useUserStore();
   //注册model
@@ -136,10 +139,14 @@
                width: 120,
                fixed:'right'
             },
+            beforeFetch: (params) => {
+              return Object.assign(params, queryParam);
+            },
       },
        exportConfig: {
             name:"${tableVo.ftlDescription}",
             url: getExportUrl,
+            params: queryParam,
           },
           importConfig: {
             url: getImportUrl,
@@ -149,6 +156,20 @@
 
   const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
 
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
+
    /**
     * 新增事件
     */

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}"
      },
@@ -376,6 +381,16 @@ export const formSchema: FormSchema[] = [
 </#if>
 ];
 
+// 高级查询数据
+export const superQuerySchema = {
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  ${superQueryFieldListForVue3(po,po_index)},
+  </#if>
+  </#list>
+};
+
+
 
 
 /**

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei

@@ -101,6 +101,8 @@
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
       </template>
       <!--操作栏-->
       <template #action="{ record }">
@@ -137,7 +139,7 @@
   import { ref, reactive } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
-  import { columns } from './${entityName}.data';
+  import { columns, superQuerySchema } from './${entityName}.data';
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './${entityName}.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
   import ${entityName}Modal from './components/${entityName}Modal.vue'
@@ -198,6 +200,21 @@
     sm: 20,
   });
 
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    searchQuery();
+  }
+
+
   /**
    * 新增事件
    */

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi

@@ -233,10 +233,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',
@@ -361,3 +366,12 @@ export const formSchema: FormSchema[] = [
   },
 </#if>
 ];
+
+// 高级查询数据
+export const superQuerySchema = {
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  ${superQueryFieldListForVue3(po,po_index)},
+  </#if>
+  </#list>
+};

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei

@@ -43,6 +43,8 @@
             <Icon icon="ant-design:down-outlined"></Icon>
           </a-button>
         </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
       </template>
       <!--操作栏-->
       <template #action="{ record }">
@@ -78,12 +80,12 @@
 
 <script lang="ts" name="${entityPackage}-${entityName?uncap_first}" setup>
   //ts语法
-  import {ref, computed, unref, toRaw, nextTick} from 'vue';
+  import {ref, reactive, computed, unref, toRaw, nextTick} from 'vue';
   import {BasicTable, TableAction} from '/@/components/Table';
   import {useModal} from '/@/components/Modal';
   import { useListPage } from '/@/hooks/system/useListPage'
   import ${entityName}Modal from './components/${entityName}Modal.vue';
-  import {columns,searchFormSchema} from './${entityName}.data';
+  import {columns, searchFormSchema, superQuerySchema} from './${entityName}.data';
   import { downloadFile } from '/@/utils/common/renderUtils';
   import {list, delete${entityName}, batchDelete${entityName}, getExportUrl,getImportUrl, getChildList,getChildListBatch} from './${entityName}.api';
   <#if list_need_pca>
@@ -92,6 +94,7 @@
   <#if bpm_flag==true>
   import { startProcess } from '/@/api/common/api';
   </#if>
+  const queryParam = reactive<any>({});
   const expandedRowKeys = ref([]);
   //字典model
   const [registerModal, {openModal}] = useModal();
@@ -102,6 +105,7 @@
          title: '${tableVo.ftlDescription}',
          columns,
          canResize:false,
+         isTreeTable: true,
          formConfig: {
            //labelWidth: 120,
            schemas: searchFormSchema,
@@ -136,10 +140,14 @@
            width: 240,
            fixed:'right'
          },
+         beforeFetch: (params) => {
+           return Object.assign(params, queryParam);
+         },
     },
      exportConfig: {
           name:"${tableVo.ftlDescription}",
           url: getExportUrl,
+          params: queryParam,
         },
         importConfig: {
           url: getImportUrl,
@@ -149,6 +157,19 @@
 
   const [registerTable, {reload, collapseAll, updateTableDataRecord, findTableDataRecord,getDataSource},{ rowSelection, selectedRowKeys }] = tableContext
 
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
   /**
    * 新增事件
    */

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}"
      },
@@ -405,6 +410,15 @@ export const formSchema: FormSchema[] = [
 </#if>
 ];
 
+// 高级查询数据
+export const superQuerySchema = {
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  ${superQueryFieldListForVue3(po,po_index)},
+  </#if>
+  </#list>
+};
+
 
 /**
 * 流程表单调用这个方法获取formSchema

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei

@@ -111,6 +111,8 @@
             <Icon icon="ant-design:down-outlined"></Icon>
           </a-button>
         </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
       </template>
       <!--操作栏-->
       <template #action="{ record }">
@@ -148,7 +150,7 @@
   import { ref, reactive, unref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
-  import { columns } from './${entityName}.data';
+  import { columns, superQuerySchema } from './${entityName}.data';
   import {list, delete${entityName}, batchDelete${entityName}, getExportUrl,getImportUrl, getChildList,getChildListBatch} from './${entityName}.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
   import ${entityName}Modal from './components/${entityName}Modal.vue'
@@ -207,6 +209,19 @@
     sm: 20,
   });
 
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
   /**
    * 新增事件
    */

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',
@@ -394,3 +399,12 @@ export const formSchema: FormSchema[] = [
   },
 </#if>
 ];
+
+// 高级查询数据
+export const superQuerySchema = {
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  ${superQueryFieldListForVue3(po,po_index)},
+  </#if>
+  </#list>
+};

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei

@@ -37,6 +37,8 @@
                 <Icon icon="mdi:chevron-down"></Icon>
               </a-button>
         </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
       </template>
        <!--操作栏-->
       <template #action="{ record }">
@@ -81,7 +83,7 @@
 </template>
 
 <script lang="ts" name="${entityPackage}-${entityName?uncap_first}" setup>
-  import {ref, computed, unref,provide} from 'vue';
+  import {ref, reactive, computed, unref,provide} from 'vue';
   import {BasicTable, useTable, TableAction} from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage'
   import {useModal} from '/@/components/Modal';
@@ -90,7 +92,7 @@
 <#list subTables as sub>
   import ${sub.entityName}List from './${sub.entityName}List.vue'
 </#list>
-  import {columns, searchFormSchema} from './${entityName}.data';
+  import {columns, searchFormSchema, superQuerySchema} from './${entityName}.data';
   import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName}.api';
   import {downloadFile} from '/@/utils/common/renderUtils';
  <#if list_need_pca>
@@ -104,6 +106,7 @@
   <#if bpm_flag==true>
   import { startProcess } from '/@/api/common/api';
   </#if>
+  const queryParam = reactive<any>({});
   //注册model
   const [registerModal, {openModal}] = useModal();
    //注册table数据
@@ -145,6 +148,9 @@
                width: 120,
                fixed:'right'
            },
+           beforeFetch: (params) => {
+             return Object.assign(params, queryParam);
+           },
            pagination:{
                current: 1,
                pageSize: 5,
@@ -154,6 +160,7 @@
         exportConfig: {
             name:"${tableVo.ftlDescription}",
             url: getExportUrl,
+            params: queryParam,
         },
         importConfig: {
             url: getImportUrl,
@@ -166,6 +173,20 @@
   const mainId = computed(() => (unref(selectedRowKeys).length > 0 ? unref(selectedRowKeys)[0] : ''));
   //下发 mainId,子组件接收
   provide('mainId', mainId);
+
+    // 高级查询配置
+    const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
    /**
     * 新增事件
     */

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}"
      },
@@ -628,3 +638,12 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
 </#list>
 ];
 </#list>
+
+// 高级查询数据
+export const superQuerySchema = {
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  ${superQueryFieldListForVue3(po,po_index)},
+  </#if>
+  </#list>
+};

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei

@@ -106,6 +106,8 @@
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
       </template>
       <!--操作栏-->
       <template #action="{ record }">
@@ -154,7 +156,7 @@
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage'
   import ${entityName}Modal from './components/${entityName}Modal.vue'
-  import { columns, searchFormSchema } from './${entityName}.data';
+  import { columns, searchFormSchema, superQuerySchema } from './${entityName}.data';
   import { list, deleteOne, batchDelete, getImportUrl,getExportUrl } from './${entityName}.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
   <#include "/common/form/native/vue3NativeImport.ftl">
@@ -212,6 +214,19 @@
   //下发 mainId,子组件接收
   provide('mainId', mainId);
 
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
   /**
    * 新增事件
    */

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${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}"
      },
@@ -628,3 +638,12 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
 </#list>
 ];
 </#list>
+
+// 高级查询数据
+export const superQuerySchema = {
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  ${superQueryFieldListForVue3(po,po_index)},
+  </#if>
+  </#list>
+};

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei

@@ -51,6 +51,8 @@
                 <Icon icon="mdi:chevron-down"></Icon>
               </a-button>
         </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
       </template>
        <!--操作栏-->
       <template #action="{ record }">
@@ -85,7 +87,7 @@
 </template>
 
 <script lang="ts" name="${entityPackage}-${entityName?uncap_first}" setup>
-  import {ref, computed, unref} from 'vue';
+  import {ref, reactive, computed, unref} from 'vue';
   import {BasicTable, useTable, TableAction} from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage'
   import {useModal} from '/@/components/Modal';
@@ -93,7 +95,7 @@
   <#list subTables as sub>
   import ${sub.entityName}SubTable from './subTables/${sub.entityName}SubTable.vue'
   </#list>
-  import {columns, searchFormSchema} from './${entityName}.data';
+  import {columns, searchFormSchema, superQuerySchema} from './${entityName}.data';
   import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName}.api';
   import {downloadFile} from '/@/utils/common/renderUtils';
   <#if list_need_pca>
@@ -108,6 +110,7 @@
   import { startProcess } from '/@/api/common/api';
   </#if>
   import { useUserStore } from '/@/store/modules/user';
+  const queryParam = reactive<any>({});
    // 展开key
   const expandedRowKeys = ref<any[]>([]);
   //注册model
@@ -154,10 +157,14 @@
                width: 120,
                fixed:'right'
            },
+           beforeFetch: (params) => {
+             return Object.assign(params, queryParam);
+           },
         },
         exportConfig: {
             name:"${tableVo.ftlDescription}",
             url: getExportUrl,
+            params: queryParam,
         },
         importConfig: {
             url: getImportUrl,
@@ -166,9 +173,24 @@
     })
 
   const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+  * 高级查询事件
+  */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
   /**
    * 展开事件
-     * */
+   */
   function handleExpand(expanded, record){
       expandedRowKeys.value=[];
       if (expanded === true) {

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}"
      },
@@ -794,6 +804,29 @@ export const ${sub.entityName?uncap_first}JVxeColumns: JVxeColumn[] = [
 </#if>
 </#list>
 
+// 高级查询数据
+export const superQuerySchema = {
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  ${superQueryFieldListForVue3(po,po_index)},
+  </#if>
+  </#list>
+  //子表高级查询
+  <#list subTables as sub>
+  ${sub.entityName?uncap_first}: {
+    title: '${sub.ftlDescription}',
+    view: 'table',
+    fields: {
+      <#list sub.colums as subCol>
+        <#if subCol.isShowList =='Y' && subCol.fieldName !='id'>
+        ${superQueryFieldListForVue3(subCol,subCol_index)},
+        </#if>
+      </#list>
+    }
+  },
+  </#list>
+};
+
 /**
 * 流程表单调用这个方法获取formSchema
 * @param param

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei

@@ -37,6 +37,8 @@
                 <Icon icon="mdi:chevron-down"></Icon>
               </a-button>
         </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
       </template>
        <!--操作栏-->
       <template #action="{ record }">
@@ -71,12 +73,12 @@
 </template>
 
 <script lang="ts" name="${entityPackage}-${entityName?uncap_first}" setup>
-  import {ref, computed, unref} from 'vue';
+  import {ref, reactive, computed, unref} from 'vue';
   import {BasicTable, useTable, TableAction} from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage'
   import {useModal} from '/@/components/Modal';
   import ${entityName}Modal from './components/${entityName}Modal.vue'
-  import {columns, searchFormSchema} from './${entityName}.data';
+  import {columns, searchFormSchema, superQuerySchema} from './${entityName}.data';
   import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName}.api';
   import {downloadFile} from '/@/utils/common/renderUtils';
   import { useUserStore } from '/@/store/modules/user';
@@ -91,6 +93,7 @@
   <#if bpm_flag==true>
   import { startProcess } from '/@/api/common/api';
   </#if>
+  const queryParam = reactive<any>({});
   const checkedKeys = ref<Array<string | number>>([]);
   const userStore = useUserStore();
   //注册model
@@ -136,10 +139,14 @@
                width: 120,
                fixed:'right'
            },
+           beforeFetch: (params) => {
+             return Object.assign(params, queryParam);
+           },
         },
         exportConfig: {
             name:"${tableVo.ftlDescription}",
             url: getExportUrl,
+            params: queryParam,
         },
         importConfig: {
             url: getImportUrl,
@@ -149,6 +156,19 @@
 
   const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
 
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
    /**
     * 新增事件
     */

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:{
@@ -735,6 +745,30 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
 </#list>
 
 
+// 高级查询数据
+export const superQuerySchema = {
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  ${superQueryFieldListForVue3(po,po_index)},
+  </#if>
+  </#list>
+  //子表高级查询
+  <#list subTables as sub>
+  ${sub.entityName?uncap_first}: {
+    title: '${sub.ftlDescription}',
+    view: 'table',
+    fields: {
+      <#list sub.colums as subCol>
+        <#if subCol.isShowList =='Y' && subCol.fieldName !='id'>
+        ${superQueryFieldListForVue3(subCol,subCol_index)},
+        </#if>
+      </#list>
+    }
+  },
+  </#list>
+};
+
+
 /**
 * 流程表单调用这个方法获取formSchema
 * @param param

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei

@@ -105,6 +105,8 @@
                 <Icon icon="mdi:chevron-down"></Icon>
               </a-button>
         </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
       </template>
        <!--操作栏-->
       <template #action="{ record }">
@@ -144,7 +146,7 @@
   import { useListPage } from '/@/hooks/system/useListPage'
   import {useModal} from '/@/components/Modal';
   import ${entityName}Modal from './components/${entityName}Modal.vue'
-  import {columns, searchFormSchema} from './${entityName}.data';
+  import {columns, searchFormSchema, superQuerySchema} from './${entityName}.data';
   import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName}.api';
   import {downloadFile} from '/@/utils/common/renderUtils';
   <#include "/common/form/native/vue3NativeImport.ftl">
@@ -195,6 +197,19 @@
 
   const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
 
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
    /**
     * 新增事件
     */

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:{
@@ -710,3 +720,26 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
   ]
 </#if>
 </#list>
+
+// 高级查询数据
+export const superQuerySchema = {
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  ${superQueryFieldListForVue3(po,po_index)},
+  </#if>
+  </#list>
+  //子表高级查询
+  <#list subTables as sub>
+  ${sub.entityName?uncap_first}: {
+    title: '${sub.ftlDescription}',
+    view: 'table',
+    fields: {
+      <#list sub.colums as subCol>
+        <#if subCol.isShowList =='Y' && subCol.fieldName !='id'>
+        ${superQueryFieldListForVue3(subCol,subCol_index)},
+        </#if>
+      </#list>
+    }
+  },
+  </#list>
+};

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei

@@ -37,6 +37,8 @@
                 <Icon icon="mdi:chevron-down"></Icon>
               </a-button>
         </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
       </template>
        <!--操作栏-->
       <template #action="{ record }">
@@ -71,12 +73,12 @@
 </template>
 
 <script lang="ts" name="${entityPackage}-${entityName?uncap_first}" setup>
-  import {ref, computed, unref} from 'vue';
+  import {ref, reactive, computed, unref} from 'vue';
   import {BasicTable, useTable, TableAction} from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage'
   import {useModal} from '/@/components/Modal';
   import ${entityName}Modal from './components/${entityName}Modal.vue'
-  import {columns, searchFormSchema} from './${entityName}.data';
+  import {columns, searchFormSchema, superQuerySchema} from './${entityName}.data';
   import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName}.api';
   import {downloadFile} from '/@/utils/common/renderUtils';
   import { useUserStore } from '/@/store/modules/user';
@@ -91,6 +93,7 @@
   <#if bpm_flag==true>
   import { startProcess } from '/@/api/common/api';
   </#if>
+  const queryParam = reactive<any>({});
   const userStore = useUserStore();
   const checkedKeys = ref<Array<string | number>>([]);
   //注册model
@@ -136,10 +139,14 @@
                width: 120,
                fixed:'right'
            },
+           beforeFetch: (params) => {
+             return Object.assign(params, queryParam);
+           },
         },
         exportConfig: {
             name:"${tableVo.ftlDescription}",
             url: getExportUrl,
+            params: queryParam,
         },
         importConfig: {
             url: getImportUrl,
@@ -149,6 +156,19 @@
 
   const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
 
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
    /**
     * 新增事件
     */

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}"
      },
@@ -727,3 +737,27 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
   ]
 </#if>
 </#list>
+
+
+// 高级查询数据
+export const superQuerySchema = {
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  ${superQueryFieldListForVue3(po,po_index)},
+  </#if>
+  </#list>
+  //子表高级查询
+  <#list subTables as sub>
+  ${sub.entityName?uncap_first}: {
+    title: '${sub.ftlDescription}',
+    view: 'table',
+    fields: {
+      <#list sub.colums as subCol>
+        <#if subCol.isShowList =='Y' && subCol.fieldName !='id'>
+        ${superQueryFieldListForVue3(subCol,subCol_index)},
+        </#if>
+      </#list>
+    }
+  },
+  </#list>
+};

jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt

@@ -11,4 +11,7 @@ ${AnsiColor.BRIGHT_BLUE}
 ${AnsiColor.BRIGHT_GREEN}
 Jeecg  Boot Version: 3.6.1
 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
+产品官网： www.jeecg.com
+版权所属： 北京国炬信息技术有限公司
+公司官网： www.guojusoft.com
 ${AnsiColor.BLACK}

pom.xml

@@ -47,7 +47,7 @@
 		<ojdbc6.version>11.2.0.3</ojdbc6.version>
 		<sqljdbc4.version>4.0</sqljdbc4.version>
 		<mysql-connector-java.version>8.0.27</mysql-connector-java.version>
-		<hutool.version>5.3.8</hutool.version>
+		<hutool.version>5.8.23</hutool.version>
 
 		<!-- 持久层 -->
 		<mybatis-plus.version>3.5.3.1</mybatis-plus.version>
@@ -244,7 +244,7 @@
 			<dependency>
 				<groupId>org.jeecgframework.boot</groupId>
 				<artifactId>hibernate-re</artifactId>
-				<version>3.6.0-beta</version>
+				<version>3.6.1</version>
 			</dependency>
 
 			<!--mongon db-->
@@ -323,6 +323,17 @@
 				<artifactId>okhttp</artifactId>
 				<version>4.4.1</version>
 			</dependency>
+			<!-- hutool工具类-->
+			<dependency>
+				<groupId>cn.hutool</groupId>
+				<artifactId>hutool-core</artifactId>
+				<version>${hutool.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>cn.hutool</groupId>
+				<artifactId>hutool-crypto</artifactId>
+				<version>${hutool.version}</version>
+			</dependency>
 			<!--minio-->
 			<dependency>
 				<groupId>io.minio</groupId>