pengjunjie/JeecgBoot
1
0
Fork 1
mirror of https://github.com/jeecgboot/JeecgBoot.git synced 2025-12-08 17:12:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

【同步3.7.4版本代码】新增全局布局隐藏配置，优化多个组件的属性和逻辑

Browse Source
This commit is contained in:
JEECG
2025-03-30 19:09:07 +08:00
parent 62daec9c16
commit 502ef2f65d
35 changed files with 1472 additions and 1586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jeecgboot-vue3/src/hooks/setting/index.ts
View File

@ -52,7 +52,20 @@ export const useGlobSetting = (): Readonly<GlobConfig> => {
window['_CONFIG'] = {}
}
// update-begin--author:sunjianlei---date:220250115---for：【QQYUN-10956】配置了自定义前缀，外部连接打不开，需要兼容处理
let domainURL = VITE_GLOB_DOMAIN_URL;
// 如果不是以http(s)开头的，也不是以域名开头的，那么就是拼接当前域名
if (!/^http(s)?/.test(domainURL) && !/^(\/\/)?(.*\.)?.+\..+/.test(domainURL)) {
if (!domainURL.startsWith('/')) {
domainURL = '/' + domainURL;
}
domainURL = window.location.origin + domainURL;
}
// update-end--author:sunjianlei---date:220250115---for：【QQYUN-10956】配置了自定义前缀，外部连接打不开，需要兼容处理
// @ts-ignore
window._CONFIG['domianURL'] = VITE_GLOB_DOMAIN_URL;
window._CONFIG['domianURL'] = domainURL;
return glob as Readonly<GlobConfig>;
};

24
jeecgboot-vue3/src/hooks/system/useListPage.ts
View File

@ -8,6 +8,7 @@ import { useMessage } from '/@/hooks/web/useMessage';
import { useMethods } from '/@/hooks/system/useMethods';
import { useDesign } from '/@/hooks/web/useDesign';
import { filterObj } from '/@/utils/common/compUtils';
import { isFunction } from '@/utils/is';
const { handleExportXls, handleImportXls } = useMethods();
// 定义 useListPage 方法所需参数
@ -24,7 +25,7 @@ interface ListPageOptions {
// 导出文件名
name?: string | (() => string);
//导出参数
params?: object;
params?: object | (() => object);
};
// 导入配置
importConfig?: {
@ -71,23 +72,32 @@ export function useListPage(options: ListPageOptions) {
//update-begin-author:taoyan date:20220507 for: erp代码生成 子表 导出报错，原因未知-
let paramsForm:any = {};
try {
paramsForm = await getForm().validate();
//update-begin-author:liusq---date:2025-03-20--for: [QQYUN-11627]代码生成原生表单，数据导出，前端报错，并且范围参数没有转换 #7962
//当useSearchFor不等于false的时候，才去触发validate
if (options?.tableProps?.useSearchForm !== false) {
paramsForm = await getForm().validate();
console.log('paramsForm', paramsForm);
}
//update-end-author:liusq---date:2025-03-20--for:[QQYUN-11627]代码生成原生表单，数据导出，前端报错，并且范围参数没有转换 #7962
} catch (e) {
console.error(e);
console.warn(e);
}
//update-end-author:taoyan date:20220507 for: erp代码生成 子表 导出报错，原因未知-
//update-begin-author:liusq date:20230410 for:[/issues/409]导出功能没有按排序结果导出,设置导出默认排序，创建时间倒序
if(!paramsForm?.column){
Object.assign(paramsForm,{column:'createTime',order:'desc'});
}
//update-begin-author:liusq date:20230410 for: [/issues/409]导出功能没有按排序结果导出,设置导出默认排序，创建时间倒序
//如果参数不为空，则整合到一起
//update-begin-author:taoyan date:20220507 for: erp代码生成 子表 导出动态设置mainId
if (params) {
Object.keys(params).map((k) => {
let temp = (params as object)[k];
//update-begin-author:liusq---date:2025-03-20--for: [QQYUN-11627]代码生成原生表单，数据导出，前端报错，并且范围参数没有转换 #7962
const realParams = isFunction(params) ? await params() : { ...(params || {}) };
//update-end-author:liusq---date:2025-03-20--for:[QQYUN-11627]代码生成原生表单，数据导出，前端报错，并且范围参数没有转换 #7962
Object.keys(realParams).map((k) => {
let temp = (realParams as object)[k];
if (temp) {
paramsForm[k] = unref(temp);
}