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

Merge branch 'master' of https://github.com/zhangdaiscott/jeecg-boot

Browse Source
This commit is contained in:
JEECG
2025-04-07 16:10:29 +08:00
parent e166d916da f743622655
commit beff2a271e
12 changed files with 288 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
jeecgboot-vue3/src/components/Table/src/components/settings/ColumnSetting.vue
View File

@ -188,7 +188,7 @@
const sortableOrder = ref<string[]>();
const localeStore = useLocaleStoreWithOut();
// 列表字段配置缓存
const { saveSetting, resetSetting } = useColumnsCache(
const { saveSetting, resetSetting, getCache } = useColumnsCache(
{
state,
popoverVisible,
@ -204,8 +204,7 @@
watchEffect(() => {
setTimeout(() => {
const columns = table.getColumns();
if (columns.length && !state.isInit) {
if (!state.isInit) {
init();
}
}, 0);
@ -227,7 +226,13 @@
function getColumns() {
const ret: Options[] = [];
table.getColumns({ ignoreIndex: true, ignoreAction: true }).forEach((item) => {
// update-begin--author:liaozhiyang---date:20250403---for：【issues/7996】表格列组件取消所有或者只勾选中间，显示非预期
let t = table.getColumns({ ignoreIndex: true, ignoreAction: true });
if (!t.length) {
t = table.getCacheColumns();
}
// update-end--author:liaozhiyang---date:20250403---for：【issues/7996】表格列组件取消所有或者只勾选中间，显示非预期
t.forEach((item) => {
ret.push({
label: (item.title as string) || (item.customTitle as string),
value: (item.dataIndex || item.title) as string,
@ -237,7 +242,7 @@
return ret;
}
function init() {
async function init() {
const columns = getColumns();
const checkList = table
@ -249,11 +254,22 @@
return item.dataIndex || item.title;
})
.filter(Boolean) as string[];
// update-begin--author:liaozhiyang---date:20250403---for：【issues/7996】表格列组件取消所有或者只勾选中间，显示非预期
const { sortedList = [] } = getCache() || {};
await nextTick();
// update-end--author:liaozhiyang---date:20250403---for：【issues/7996】表格列组件取消所有或者只勾选中间，显示非预期
if (!plainOptions.value.length) {
plainOptions.value = columns;
plainSortOptions.value = columns;
cachePlainOptions.value = columns;
// update-begin--author:liaozhiyang---date:20250403---for：【issues/7996】表格列组件取消所有或者只勾选中间，显示非预期
let tmp = columns;
if (sortedList?.length) {
tmp = columns.sort((prev, next) => {
return sortedList.indexOf(prev.value) - sortedList.indexOf(next.value);
});
}
// update-end--author:liaozhiyang---date:20250403---for：【issues/7996】表格列组件取消所有或者只勾选中间，显示非预期
plainOptions.value = tmp;
plainSortOptions.value = tmp;
cachePlainOptions.value = tmp;
state.defaultCheckList = checkList;
} else {
// const fixedColumns = columns.filter((item) =>
@ -266,6 +282,13 @@
item.fixed = findItem.fixed;
}
});
// update-begin--author:liaozhiyang---date:20250403---for：【issues/7996】表格列组件取消所有或者只勾选中间，显示非预期
if (sortedList?.length) {
plainOptions.value.sort((prev, next) => {
return sortedList.indexOf(prev.value) - sortedList.indexOf(next.value);
});
}
// update-end--author:liaozhiyang---date:20250403---for：【issues/7996】表格列组件取消所有或者只勾选中间，显示非预期
}
state.isInit = true;
state.checkedList = checkList;

1
jeecgboot-vue3/src/components/Table/src/hooks/useColumnsCache.ts
View File

@ -144,5 +144,6 @@ export function useColumnsCache(opt, setColumns, handleColumnFixed) {
return {
saveSetting,
resetSetting,
getCache: () => $ls.get(cacheKey.value),
};
}

7
jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useColumns.ts
View File

@ -1,5 +1,5 @@
import type { JVxeColumn, JVxeDataProps, JVxeTableProps } from '../types';
import { computed, nextTick } from 'vue';
import { computed, nextTick, toRaw } from 'vue';
import { isArray, isEmpty, isPromise } from '/@/utils/is';
import { cloneDeep } from 'lodash-es';
import { JVxeTypePrefix, JVxeTypes } from '../types/JVxeTypes';
@ -25,6 +25,11 @@ export interface HandleArgs {
export function useColumns(props: JVxeTableProps, data: JVxeDataProps, methods: JVxeTableMethods, slots) {
data.vxeColumns = computed(() => {
// update-begin--author:liaozhiyang---date:20250403---for：【issues/7812】linkageConfig改变了，vxetable没更新
// linkageConfig变化时也需要执行
const linkageConfig = toRaw(props.linkageConfig);
console.log(linkageConfig);
// update-end--author:liaozhiyang---date:20250403---for：【issues/7812】linkageConfig改变了，vxetable没更新
let columns: JVxeColumn[] = [];
if (isArray(props.columns)) {
// handle 方法参数