diff --git a/jeecgboot-vue3/package.json b/jeecgboot-vue3/package.json index 051e694b0..d01fe33b4 100644 --- a/jeecgboot-vue3/package.json +++ b/jeecgboot-vue3/package.json @@ -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" }, diff --git a/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useColumns.ts b/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useColumns.ts index bd5669d95..75af95a81 100644 --- a/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useColumns.ts +++ b/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useColumns.ts @@ -28,7 +28,9 @@ export function useColumns(props: JVxeTableProps, data: JVxeDataProps, methods: // update-begin--author:liaozhiyang---date:20250403---for:【issues/7812】linkageConfig改变了,vxetable没更新 // linkageConfig变化时也需要执行 const linkageConfig = toRaw(props.linkageConfig); - console.log(linkageConfig); + if (linkageConfig) { + // console.log(linkageConfig); + } // update-end--author:liaozhiyang---date:20250403---for:【issues/7812】linkageConfig改变了,vxetable没更新 let columns: JVxeColumn[] = []; if (isArray(props.columns)) { diff --git a/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useData.ts b/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useData.ts index f532e4954..38f3f2938 100644 --- a/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useData.ts +++ b/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useData.ts @@ -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---for:【TV360X-327】vxetable警告 - // 高亮hover的行 - highlightHoverRow: true, // --- 【issues/209】自带的tooltip会错位,所以替换成原生的title --- // 溢出隐藏并显示tooltip @@ -43,6 +43,7 @@ export function useData(props: JVxeTableProps): JVxeDataProps { expandConfig: { iconClose: 'vxe-icon-arrow-right', iconOpen: 'vxe-icon-arrow-down', + ...props.expandConfig, }, // 虚拟滚动配置,y轴大于xx条数据时启用虚拟滚动 scrollY: { diff --git a/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useDragSort.ts b/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useDragSort.ts index 0a0a2edea..59af3a29b 100644 --- a/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useDragSort.ts +++ b/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useDragSort.ts @@ -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', diff --git a/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useMethods.ts b/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useMethods.ts index 279296bda..e046f6e90 100644 --- a/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useMethods.ts +++ b/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useMethods.ts @@ -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---for:【TV360X-1404】vxetable警告 // 激活最后一行的编辑模式 - xTable.setEditRow(result.rows[result.rows.length - 1]); + xTable.setEditRow(result.rows[result.rows.length - 1], true); // -update-end--author:liaozhiyang---date:20240619---for:【TV360X-1404】vxetable警告 } 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---for:【QQYUN-5133】JVxeTable 行编辑升级 return await xTable.updateData(); } diff --git a/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/install.ts b/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/install.ts index a8ba5e2e6..38e3e8e5f 100644 --- a/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/install.ts +++ b/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/install.ts @@ -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); }