pengjunjie/JeecgBoot
1
0
Fork 1
mirror of https://github.com/jeecgboot/JeecgBoot.git synced 2026-02-05 18:15:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into springboot3

Browse Source 
# Conflicts:
#	jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
#	jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java
#	jeecg-module-system/jeecg-system-biz/pom.xml
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTableWhiteListController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/WechatVerifyController.java
#	jeecg-module-system/jeecg-system-start/pom.xml
#	jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml
#	pom.xml
This commit is contained in:
EightMonth
2024-01-08 13:52:33 +08:00
parent ca9a433f3c 6fe8f1d81a
commit cdea05ebb0
141 changed files with 6494 additions and 4012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,6 +131,57 @@
</#if>
</#if>
</#function>
<#-- update-begin---author:chenrui ---date:20231228 for:[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
<#-- ** 高级查询生成(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>
<#-- update-end---author:chenrui ---date:20231228 for:[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
<#-- vue3 获取表单modal的宽度-->

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

@ -37,6 +37,10 @@
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
<!-- 高级查询 -->
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
</template>
<!--操作栏-->
<template #action="{ record }">
@ -71,12 +75,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 +95,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 +141,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 +158,20 @@
const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
// 高级查询配置
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
reload();
}
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
/**
* 新增事件
*/

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

@ -247,11 +247,18 @@ export const formSchema: FormSchema[] = [
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='list_multi'>
component: 'JSelectMultiple',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='checkbox'>
component: 'JCheckbox',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='sel_search'>
component: 'JSearchSelect',
componentProps:{
@ -376,7 +383,16 @@ export const formSchema: FormSchema[] = [
</#if>
];
<#-- update-begin-author:chenrui date:2023-12-28 for:[QQYUN-7527]vue3代码生成默认带上高级查询 -->
// 高级查询数据
export const superQuerySchema = {
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
${superQueryFieldListForVue3(po,po_index)},
</#if>
</#list>
};
<#-- update-end-author:chenrui date:2023-12-28 for:[QQYUN-7527]vue3代码生成默认带上高级查询 -->
/**
* 流程表单调用这个方法获取formSchema

0
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/vue-app/${entityName}Form.vuei → jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/vue-app/${entityName}Form.vue_uniAppi
View File

0
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/vue-app/${entityName}List.vuei → jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/vue-app/${entityName}List.vue_uniAppi
View File

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

@ -101,6 +101,10 @@
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
<!-- 高级查询 -->
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
</template>
<!--操作栏-->
<template #action="{ record }">
@ -137,7 +141,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 +202,21 @@
sm: 20,
});
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
// 高级查询配置
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
searchQuery();
}
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
/**
* 新增事件
*/

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

@ -233,11 +233,18 @@ export const formSchema: FormSchema[] = [
componentProps:{
dictCode: "${form_field_dictCode}"
},
<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#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}"
},
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='sel_search'>
component: 'JSearchSelect',
componentProps:{
@ -361,3 +368,14 @@ export const formSchema: FormSchema[] = [
},
</#if>
];
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
// 高级查询数据
export const superQuerySchema = {
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
${superQueryFieldListForVue3(po,po_index)},
</#if>
</#list>
};
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->

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

@ -43,6 +43,10 @@
<Icon icon="ant-design:down-outlined"></Icon>
</a-button>
</a-dropdown>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
<!-- 高级查询 -->
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
</template>
<!--操作栏-->
<template #action="{ record }">
@ -78,12 +82,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 +96,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 +107,9 @@
title: '${tableVo.ftlDescription}',
columns,
canResize:false,
<#-- update-begin---author:chenrui ---date:20231228 for：[issue/#5658] 树表复选框与展开按钮重叠问题---------- -->
isTreeTable: true,
<#-- update-end---author:chenrui ---date:20231228 for：[issue/#5658] 树表复选框与展开按钮重叠问题---------- -->
formConfig: {
//labelWidth: 120,
schemas: searchFormSchema,
@ -136,10 +144,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 +161,21 @@
const [registerTable, {reload, collapseAll, updateTableDataRecord, findTableDataRecord,getDataSource},{ rowSelection, selectedRowKeys }] = tableContext
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
// 高级查询配置
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
reload();
}
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
/**
* 新增事件
*/

20
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
View File

@ -273,11 +273,18 @@ export const formSchema: FormSchema[] = [
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='list_multi'>
component: 'JSelectMultiple',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='checkbox'>
component: 'JCheckbox',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='sel_search'>
component: 'JSearchSelect',
componentProps:{
@ -405,6 +412,17 @@ export const formSchema: FormSchema[] = [
</#if>
];
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
// 高级查询数据
export const superQuerySchema = {
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
${superQueryFieldListForVue3(po,po_index)},
</#if>
</#list>
};
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
/**
* 流程表单调用这个方法获取formSchema

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

@ -111,6 +111,10 @@
<Icon icon="ant-design:down-outlined"></Icon>
</a-button>
</a-dropdown>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
<!-- 高级查询 -->
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
</template>
<!--操作栏-->
<template #action="{ record }">
@ -148,7 +152,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 +211,21 @@
sm: 20,
});
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
// 高级查询配置
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
reload();
}
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
/**
* 新增事件
*/

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

@ -263,11 +263,18 @@ export const formSchema: FormSchema[] = [
componentProps:{
dictCode: "${form_field_dictCode}"
},
<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#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}"
},
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='sel_search'>
component: 'JSearchSelect',
componentProps:{
@ -394,3 +401,14 @@ export const formSchema: FormSchema[] = [
},
</#if>
];
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
// 高级查询数据
export const superQuerySchema = {
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
${superQueryFieldListForVue3(po,po_index)},
</#if>
</#list>
};
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->

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

@ -37,6 +37,10 @@
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
<!-- 高级查询 -->
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
</template>
<!--操作栏-->
<template #action="{ record }">
@ -81,7 +85,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 +94,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 +108,7 @@
<#if bpm_flag==true>
import { startProcess } from '/@/api/common/api';
</#if>
const queryParam = reactive<any>({});
//注册model
const [registerModal, {openModal}] = useModal();
//注册table数据
@ -145,6 +150,9 @@
width: 120,
fixed:'right'
},
beforeFetch: (params) => {
return Object.assign(params, queryParam);
},
pagination:{
current: 1,
pageSize: 5,
@ -154,6 +162,7 @@
exportConfig: {
name:"${tableVo.ftlDescription}",
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
@ -166,6 +175,22 @@
const mainId = computed(() => (unref(selectedRowKeys).length > 0 ? unref(selectedRowKeys)[0] : ''));
//下发 mainId,子组件接收
provide('mainId', mainId);
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
// 高级查询配置
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
reload();
}
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
/**
* 新增事件
*/

31
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
View File

@ -240,11 +240,18 @@ export const formSchema: FormSchema[] = [
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='list_multi'>
component: 'JSelectMultiple',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='checkbox'>
component: 'JCheckbox',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='sel_search'>
component: 'JSearchSelect',
componentProps:{
@ -507,11 +514,18 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='list_multi'>
component: 'JSelectMultiple',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='checkbox'>
component: 'JCheckbox',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='sel_search'>
component: 'JSearchSelect',
componentProps:{
@ -627,4 +641,15 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
</#if>
</#list>
];
</#list>
</#list>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
// 高级查询数据
export const superQuerySchema = {
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
${superQueryFieldListForVue3(po,po_index)},
</#if>
</#list>
};
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->

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

@ -106,6 +106,10 @@
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
<!-- 高级查询 -->
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
</template>
<!--操作栏-->
<template #action="{ record }">
@ -154,7 +158,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">
@ -173,7 +177,7 @@
import ${sub.entityName}List from './${sub.entityName}List.vue'
</#list>
import { useUserStore } from '/@/store/modules/user';
const formRef = ref();
const queryParam = reactive<any>({});
const checkedKeys = ref<Array<string | number>>([]);
@ -211,7 +215,22 @@
const mainId = computed(() => (unref(selectedRowKeys).length > 0 ? unref(selectedRowKeys)[0] : ''));
//下发 mainId,子组件接收
provide('mainId', mainId);
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
// 高级查询配置
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
reload();
}
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
/**
* 新增事件
*/

39
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
View File

@ -240,11 +240,18 @@ export const formSchema: FormSchema[] = [
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#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}"
},
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='sel_search'>
component: 'JSearchSelect',
componentProps:{
@ -507,11 +514,18 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7583]Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#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}"
},
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7583]Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='sel_search'>
component: 'JSearchSelect',
componentProps:{
@ -627,4 +641,15 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
</#if>
</#list>
];
</#list>
</#list>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
// 高级查询数据
export const superQuerySchema = {
<#list columns as po>
<#if po.isShowList =='Y' && po.fieldName !='id'>
${superQueryFieldListForVue3(po,po_index)},
</#if>
</#list>
};
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->

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

@ -51,6 +51,10 @@
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
<!-- 高级查询 -->
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
</template>
<!--操作栏-->
<template #action="{ record }">
@ -85,7 +89,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 +97,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 +112,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 +159,14 @@
width: 120,
fixed:'right'
},
beforeFetch: (params) => {
return Object.assign(params, queryParam);
},
},
exportConfig: {
name:"${tableVo.ftlDescription}",
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
@ -166,6 +175,22 @@
})
const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
// 高级查询配置
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
reload();
}
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
/**
* 展开事件
* */

43
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
View File

@ -243,11 +243,18 @@ export const formSchema: FormSchema[] = [
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='list_multi'>
component: 'JSelectMultiple',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='checkbox'>
component: 'JCheckbox',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='sel_search'>
component: 'JSearchSelect',
componentProps:{
@ -508,11 +515,18 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='list_multi'>
component: 'JSelectMultiple',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='checkbox'>
component: 'JCheckbox',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='sel_search'>
component: 'JSearchSelect',
componentProps:{
@ -794,6 +808,31 @@ export const ${sub.entityName?uncap_first}JVxeColumns: JVxeColumn[] = [
</#if>
</#list>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
// 高级查询数据
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>
};
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
/**
* 流程表单调用这个方法获取formSchema
* @param param

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

@ -37,6 +37,10 @@
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
<!-- 高级查询 -->
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
</template>
<!--操作栏-->
<template #action="{ record }">
@ -71,12 +75,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 +95,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 +141,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 +158,21 @@
const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
// 高级查询配置
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
reload();
}
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
/**
* 新增事件
*/

45
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
View File

@ -243,11 +243,18 @@ export const formSchema: FormSchema[] = [
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='list_multi'>
component: 'JSelectMultiple',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='checkbox'>
component: 'JCheckbox',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='sel_search'>
component: 'JSearchSelect',
componentProps:{
@ -448,11 +455,18 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='list_multi'>
component: 'JSelectMultiple',
componentProps:{
dictCode:"${form_field_dictCode}"
}
},
<#elseif po.classType=='checkbox'>
component: 'JCheckbox',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='sel_search'>
component: 'JSearchSelect',
componentProps:{
@ -735,6 +749,31 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
</#list>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
// 高级查询数据
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>
};
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
/**
* 流程表单调用这个方法获取formSchema
* @param param

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

@ -105,6 +105,10 @@
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
<!-- 高级查询 -->
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
</template>
<!--操作栏-->
<template #action="{ record }">
@ -144,7 +148,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 +199,21 @@
const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
// 高级查询配置
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
reload();
}
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
/**
* 新增事件
*/

47
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
View File

@ -229,11 +229,18 @@ export const formSchema: FormSchema[] = [
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='list_multi'>
component: 'JSelectMultiple',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='checkbox'>
component: 'JCheckbox',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='sel_search'>
component: 'JSearchSelect',
componentProps:{
@ -425,11 +432,18 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7583]Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='list_multi'>
component: 'JSelectMultiple',
componentProps:{
dictCode:"${form_field_dictCode}"
}
},
<#elseif po.classType=='checkbox'>
component: 'JCheckbox',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7583]Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='sel_search'>
component: 'JSearchSelect',
componentProps:{
@ -709,4 +723,29 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
<#-- 循环子表的列 结束 -->
]
</#if>
</#list>
</#list>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
// 高级查询数据
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>
};
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->

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

@ -37,6 +37,10 @@
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
<!-- 高级查询 -->
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
</template>
<!--操作栏-->
<template #action="{ record }">
@ -71,12 +75,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 +95,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 +141,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 +158,20 @@
const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
// 高级查询配置
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
reload();
}
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
/**
* 新增事件
*/

45
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
View File

@ -240,11 +240,18 @@ export const formSchema: FormSchema[] = [
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='list_multi'>
component: 'JSelectMultiple',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='checkbox'>
component: 'JCheckbox',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='sel_search'>
component: 'JSearchSelect',
componentProps:{
@ -442,11 +449,18 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
<#elseif po.classType=='list_multi'>
component: 'JSelectMultiple',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#elseif po.classType=='checkbox'>
component: 'JCheckbox',
componentProps:{
dictCode:"${form_field_dictCode}"
},
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选----------- -->
<#elseif po.classType=='sel_search'>
component: 'JSearchSelect',
componentProps:{
@ -726,4 +740,29 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
<#-- 循环子表的列 结束 -->
]
</#if>
</#list>
</#list>
<#-- update-begin---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->
// 高级查询数据
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>
};
<#-- update-end---author:chenrui ---date:20231228 for：[QQYUN-7527]vue3代码生成默认带上高级查询---------- -->

30
jeecg-module-system/jeecg-system-biz/src/main/resources/templates/announcement/showContent.ftl
View File

@ -128,8 +128,32 @@
</#if>
</div>
</div>
<div>
${data.msgContent!''}
</div>
<div id="content"></div>
<script>
//update-begin-author:liusq---date:2023-10-30--for: 【QQYUN-6802】查看公告详情，此段端渲染有问题
// 获取富文本内容的容器元素
let contentContainer = document.getElementById('content');
// 富文本内容
let richText = `${data.msgContent!""}`;
if(richText.includes("&lt;") || richText.includes("&gt;")){
richText = richText.replace(/&lt;/g, '<').replace(/&gt;/g, '>');
}
// 将富文本内容插入到容器中
contentContainer.innerHTML = richText;
// 找到所有的iframe元素
let iframes = contentContainer.getElementsByTagName('iframe');
// 动态加载和渲染每个iframe
Array.prototype.forEach.call(iframes, function(iframe) {
iframe.onload = function() {
// iframe加载完成后，调整它的高度以适应内容
iframe.style.width = '100%';
iframe.style.height = iframe.contentWindow.document.body.scrollHeight +'px';
};
iframe.src = iframe.getAttribute('src');
});
//update-end-author:liusq---date:2023-10-30--for: 【QQYUN-6802】查看公告详情，此段端渲染有问题
</script>
</body>
</html>