JVxetable升级到最新版

pull/8358/head
JEECG 2025-05-25 18:09:19 +08:00
parent 78212aa7c0
commit b8b4d3f29d
6 changed files with 21 additions and 8 deletions

View File

@ -78,8 +78,9 @@
"vue-router": "^4.5.0",
"vue-types": "^5.1.3",
"vuedraggable": "^4.1.0",
"vxe-table": "4.6.17",
"vxe-table-plugin-antd": "4.0.7",
"vxe-table": "4.13.31",
"vxe-table-plugin-antd": "4.0.8",
"vxe-pc-ui": "4.6.12",
"xe-utils": "3.5.26",
"xss": "^1.0.15"
},

View File

@ -28,7 +28,9 @@ export function useColumns(props: JVxeTableProps, data: JVxeDataProps, methods:
// update-begin--author:liaozhiyang---date:20250403---forissues/7812linkageConfigvxetable
// linkageConfig
const linkageConfig = toRaw(props.linkageConfig);
console.log(linkageConfig);
if (linkageConfig) {
// console.log(linkageConfig);
}
// update-end--author:liaozhiyang---date:20250403---forissues/7812linkageConfigvxetable
let columns: JVxeColumn[] = [];
if (isArray(props.columns)) {

View File

@ -18,10 +18,10 @@ export function useData(props: JVxeTableProps): JVxeDataProps {
// rowId: props.rowKey,
rowConfig: {
keyField: props.rowKey,
// hover
isHover: true,
},
// update-end--author:liaozhiyang---date:20240607---forTV360X-327vxetable
// hover
highlightHoverRow: true,
// --- issues/209tooltiptitle ---
// tooltip
@ -43,6 +43,7 @@ export function useData(props: JVxeTableProps): JVxeDataProps {
expandConfig: {
iconClose: 'vxe-icon-arrow-right',
iconOpen: 'vxe-icon-arrow-down',
...props.expandConfig,
},
// yxx
scrollY: {

View File

@ -23,7 +23,12 @@ export function useDragSort(props: JVxeTableProps, methods: JVxeTableMethods) {
function createSortable() {
let xTable = methods.getXTable();
// let dom = xTable.$el.querySelector('.vxe-table--fixed-wrapper .vxe-table--body tbody')
let dom = xTable.$el.querySelector('.body--wrapper>.vxe-table--body tbody');
// let dom = xTable.$el.querySelector('.body--wrapper>.vxe-table--body tbody');
let dom = xTable.$el.querySelector('.vxe-table--body-inner-wrapper > .vxe-table--body tbody');
if (!dom) {
console.warn('[JVxeTable] 拖拽排序初始化失败可能是vxe-table升级导致的版本不兼容。');
return;
}
let startChildren = [];
sortable2 = Sortable.create(dom as HTMLElement, {
handle: '.drag-btn',

View File

@ -424,12 +424,13 @@ export function useMethods(props: JVxeTableProps, { emit }, data: JVxeDataProps,
let xTable = getXTable();
let { setActive, index } = options;
index = index === -1 ? index : xTable.internalData.tableFullData[index];
index = index == null ? -1 : index;
//
let result = await xTable.insertAt(rows, index);
if (setActive) {
// -update-begin--author:liaozhiyang---date:20240619---forTV360X-1404vxetable
//
xTable.setEditRow(result.rows[result.rows.length - 1]);
xTable.setEditRow(result.rows[result.rows.length - 1], true);
// -update-end--author:liaozhiyang---date:20240619---forTV360X-1404vxetable
}
await recalcSortNumber();
@ -763,7 +764,7 @@ export function useMethods(props: JVxeTableProps, { emit }, data: JVxeDataProps,
// 4.1.0
//await xTable.updateCache();
// 4.1.1
await xTable.cacheRowMap()
await xTable.cacheRowMap(true)
// update-end--author:liaozhiyang---date:20231011---forQQYUN-5133JVxeTable
return await xTable.updateData();
}

View File

@ -1,8 +1,10 @@
import type { App } from 'vue';
// vxe-table
import 'xe-utils';
import VxeUIAll from 'vxe-pc-ui';
import VXETable /*Grid*/ from 'vxe-table';
import VXETablePluginAntd from 'vxe-table-plugin-antd';
import 'vxe-pc-ui/lib/style.css';
import 'vxe-table/lib/style.css';
import JVxeTable from './JVxeTable';
@ -27,6 +29,7 @@ export function registerJVxeTable(app: App) {
//
registerAllComponent();
//
app.use(VxeUIAll);
app.use(VXETable, VXETableSettings);
app.component('JVxeTable', JVxeTable);
}