pengjunjie/JeecgBoot
1
0
Fork 1
mirror of https://github.com/jeecgboot/JeecgBoot.git synced 2026-02-03 09:05: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

2
jeecgboot-vue3/src/components/jeecg/JPrompt/hooks/useJPrompt.ts
View File

@ -1,6 +1,7 @@
import type { JPromptProps } from '../typing';
import { render, createVNode, nextTick } from 'vue';
import { error } from '/@/utils/log';
import { getAppContext } from "@/store";
import JPrompt from '../JPrompt.vue';
export function useJPrompt() {
@ -21,6 +22,7 @@ export function useJPrompt() {
document.body.removeChild(box);
},
});
vm.appContext = getAppContext()!;
// 挂载到 body
render(vm, box);
document.body.appendChild(box);

6
jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useJVxeComponent.ts
View File

@ -140,11 +140,15 @@ export function useJVxeComponent(props: JVxeComponent.Props) {
const ctx = { props, context };
// 获取组件增强
const enhanced = getEnhanced(props.type);
let enhanced = getEnhanced(props.type);
watch(
value,
(newValue) => {
// -update-begin--author:liaozhiyang---date:20241210---for：【issues/7497】隐藏某一列后，字典没翻译，恢复后正常
// TODO 先这样修复解决问题，根因后期再看看
enhanced = getEnhanced(props.type);
// -update-end--author:liaozhiyang---date:20241210---for：【issues/7497】隐藏某一列后，字典没翻译，恢复后
// 验证值格式
let getValue = enhanced.getValue(newValue, ctx);
if (newValue !== getValue) {

4
jeecgboot-vue3/src/components/jeecg/JVxeTable/src/style/index.less
View File

@ -77,13 +77,13 @@
.vxe-table {
//.vxe-table--footer-wrapper.body--wrapper,
.vxe-table--body-wrapper.body--wrapper {
overflow-x: hidden;
// overflow-x: hidden;
}
&:hover {
//.vxe-table--footer-wrapper.body--wrapper,
.vxe-table--body-wrapper.body--wrapper {
overflow-x: auto;
// overflow-x: auto;
}
}
}

21
jeecgboot-vue3/src/components/jeecg/OnLine/hooks/usePopBiz.ts
View File

@ -10,6 +10,7 @@ import { useMethods } from '/@/hooks/system/useMethods';
import { importViewsFile, _eval } from '/@/utils';
import {getToken} from "@/utils/auth";
import {replaceUserInfoByExpression} from "@/utils/common/compUtils";
import { isString } from '/@/utils/is';
export function usePopBiz(ob, tableRef?) {
// update-begin--author:liaozhiyang---date:20230811---for：【issues/675】子表字段Popup弹框数据不更新
@ -211,6 +212,15 @@ export function usePopBiz(ob, tableRef?) {
currColumns[a].sortOrder = unref(iSorter).order === 'asc' ? 'ascend' : 'descend';
}
}
// update-begin--author:liaozhiyang---date:20250114---for：【issues/946】popup列宽和在线报表列宽读取配置
currColumns.forEach((item) => {
if (item.fieldWidth != null) {
if (isString(item.fieldWidth) && item.fieldWidth.trim().length == 0) return;
item.width = item.fieldWidth;
delete item.fieldWidth;
}
});
// update-end--author:liaozhiyang---date:20250114---for：【issues/946】popup列宽和在线报表列宽读取配置
if (currColumns[0].key !== 'rowIndex') {
currColumns.unshift({
title: '序号',
@ -258,7 +268,16 @@ export function usePopBiz(ob, tableRef?) {
// href 跳转
const fieldHrefSlotKeysMap = {};
fieldHrefSlots.forEach((item) => (fieldHrefSlotKeysMap[item.slotName] = item));
let currColumns = handleColumnHrefAndDict(metaColumnList, fieldHrefSlotKeysMap);
let currColumns: any = handleColumnHrefAndDict(metaColumnList, fieldHrefSlotKeysMap);
// update-begin--author:liaozhiyang---date:20250114---for：【issues/946】popup列宽和在线报表列宽读取配置
currColumns.forEach((item) => {
if (isString(item.fieldWidth) && item.fieldWidth.trim().length == 0) return;
if (item.fieldWidth != null) {
item.width = item.fieldWidth;
delete item.fieldWidth;
}
});
// update-end--author:liaozhiyang---date:20250114---for：【issues/946】popup列宽和在线报表列宽读取配置
// popup需要序号， 普通列表不需要
if (clickThenCheckFlag === true) {

1
jeecgboot-vue3/src/components/jeecg/OnLine/types/onlineConfig.ts
View File

@ -38,6 +38,7 @@ interface OnlineColumn {
dbType?:string;
//他表字段用
linkField?:string;
fieldExtendJson?:string
}
export { OnlineColumn, HrefSlots };

4
jeecgboot-vue3/src/components/jeecg/captcha/CaptchaModal.vue
View File

@ -76,7 +76,9 @@
*/
async function getCaptchaCode() {
await resetFields();
randCodeData.checkKey = new Date().getTime();
//update-begin---author:chenrui ---date:2025/1/7 for：[QQYUN-10775]验证码可以复用 #7674------------
randCodeData.checkKey = new Date().getTime() + Math.random().toString(36).slice(-4); // 1629428467008;
//update-end---author:chenrui ---date:2025/1/7 for：[QQYUN-10775]验证码可以复用 #7674------------
getCodeInfo(randCodeData.checkKey).then((res) => {
randCodeData.randCodeImage = res;
randCodeData.requestCodeSuccess = true;