vxe-table 4.8.7 → 4.8.9

package/lib/ui/index.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.hooks=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");const version=exports.version="4.8.7",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,minHeight:144,resizeConfig:{refreshDelay:250},radioConfig:{strict:!0},dragConfig:{showRowIcon:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"normal"},columnConfig:{maxFixedSize:4},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0}},sortConfig:{showIcon:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,hooks=exports.hooks=_core.VxeUI.hooks,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.hooks=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");const version=exports.version="4.8.9",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,minHeight:144,resizeConfig:{refreshDelay:250},radioConfig:{strict:!0},dragConfig:{showRowIcon:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"normal"},columnConfig:{maxFixedSize:4},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0}},sortConfig:{showIcon:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,hooks=exports.hooks=_core.VxeUI.hooks,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;

package/lib/ui/src/log.js

@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
 const {
   log
 } = _core.VxeUI;
-const version = `table v${"4.8.7"}`;
+const version = `table v${"4.8.9"}`;
 const warnLog = exports.warnLog = log.create('warn', version);
 const errLog = exports.errLog = log.create('error', version);

package/lib/ui/src/log.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");const log=_core.VxeUI["log"],version="table v4.8.7",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");const log=_core.VxeUI["log"],version="table v4.8.9",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.8.7",
+  "version": "4.8.9",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "vxe-pc-ui": "^4.2.46"
+    "vxe-pc-ui": "^4.2.49"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.11",

package/packages/table/src/body.ts

@@ -548,11 +548,9 @@ export default defineComponent({
           setScrollTop(leftElem, scrollTop)
           setScrollTop(rightElem, scrollTop)
         }
-        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: renderType,
-          fixed: fixedType,
-          scrollTop,
-          scrollLeft
+          fixed: fixedType
         })
       }
       if (xHandleEl) {
@@ -562,11 +560,9 @@ export default defineComponent({
         tableInternalData.lastScrollLeft = scrollLeft
         setScrollLeft(headerElem, scrollLeft)
         setScrollLeft(footerElem, scrollLeft)
-        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: renderType,
-          fixed: fixedType,
-          scrollTop,
-          scrollLeft
+          fixed: fixedType
         })
       }
     }

package/packages/table/src/cell.ts

@@ -71,17 +71,21 @@ function renderCellDragIcon (params: VxeTableDefines.CellRenderBodyParams) {
 }
 
 function renderCellBaseVNs (params: VxeTableDefines.CellRenderBodyParams, content: VxeComponentSlotType | VxeComponentSlotType[]) {
-  const { $table, column } = params
+  const { $table, column, level } = params
   const { dragSort } = column
-  const vns: VxeComponentSlotType[] = XEUtils.isArray(content) ? content : [content]
+  const tableProps = $table.props
+  const { treeConfig } = tableProps
   const { computeRowOpts, computeDragOpts } = $table.getComputeMaps()
   const rowOpts = computeRowOpts.value
   const dragOpts = computeDragOpts.value
   const { showRowIcon, rowVisibleMethod } = dragOpts
+  const vns: VxeComponentSlotType[] = XEUtils.isArray(content) ? content : [content]
   if (dragSort && rowOpts.drag && (showRowIcon && (!rowVisibleMethod || rowVisibleMethod(params)))) {
-    vns.unshift(
-      renderCellDragIcon(params)
-    )
+    if (!treeConfig || !level) {
+      vns.unshift(
+        renderCellDragIcon(params)
+      )
+    }
   }
   return vns
 }

package/packages/table/src/footer.ts

@@ -80,11 +80,9 @@ export default defineComponent({
         tableReactData.lastScrollTime = Date.now()
         setScrollLeft(headerElem, scrollLeft)
         setScrollLeft(bodyElem, scrollLeft)
-        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: renderType,
-          fixed: fixedType,
-          scrollTop,
-          scrollLeft
+          fixed: fixedType
         })
       }
     }

package/packages/table/src/table.ts

@@ -2955,11 +2955,9 @@ export default defineComponent({
       reactData.lastScrollTime = Date.now()
       handleSyncScrollX(scrollLeft)
       $xeTable.triggerScrollXEvent(evnt)
-      $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+      $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
         type: 'table',
-        fixed: '',
-        scrollTop,
-        scrollLeft
+        fixed: ''
       })
     }
 
@@ -2988,11 +2986,9 @@ export default defineComponent({
       reactData.lastScrollTime = Date.now()
       handleSyncScrollY(scrollTop)
       $xeTable.triggerScrollYEvent(evnt)
-      $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+      $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
         type: 'table',
-        fixed: '',
-        scrollTop,
-        scrollLeft
+        fixed: ''
       })
     }
 
@@ -3642,25 +3638,35 @@ export default defineComponent({
        * 设置为固定列
        */
       setColumnFixed (fieldOrColumn, fixed) {
-        const column = handleFieldOrColumn($xeTable, fieldOrColumn)
-        const targetColumn = getRootColumn($xeTable, column as any)
-        const isMaxFixedColumn = computeIsMaxFixedColumn.value
+        let status = false
+        const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn]
         const columnOpts = computeColumnOpts.value
-        if (targetColumn && targetColumn.fixed !== fixed) {
-          // 是否超过最大固定列数量
-          if (!targetColumn.fixed && isMaxFixedColumn) {
-            if (VxeUI.modal) {
-              VxeUI.modal.message({
-                status: 'error',
-                content: getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
-              })
+        const isMaxFixedColumn = computeIsMaxFixedColumn.value
+        for (let i = 0; i < cols.length; i++) {
+          const item = cols[i]
+          const column = handleFieldOrColumn($xeTable, item)
+          const targetColumn = getRootColumn($xeTable, column as any)
+          if (targetColumn && targetColumn.fixed !== fixed) {
+            // 是否超过最大固定列数量
+            if (!targetColumn.fixed && isMaxFixedColumn) {
+              if (VxeUI.modal) {
+                VxeUI.modal.message({
+                  status: 'error',
+                  content: getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
+                })
+              }
+              return nextTick()
+            }
+            XEUtils.eachTree([targetColumn], (column) => {
+              column.fixed = fixed
+            })
+            tablePrivateMethods.saveCustomStore('update:fixed')
+            if (!status) {
+              status = true
             }
-            return nextTick()
           }
-          XEUtils.eachTree([targetColumn], (column) => {
-            column.fixed = fixed
-          })
-          tablePrivateMethods.saveCustomStore('update:fixed')
+        }
+        if (status) {
           return tableMethods.refreshColumn()
         }
         return nextTick()
@@ -3669,13 +3675,22 @@ export default defineComponent({
        * 取消指定固定列
        */
       clearColumnFixed (fieldOrColumn) {
-        const column = handleFieldOrColumn($xeTable, fieldOrColumn)
-        const targetColumn = getRootColumn($xeTable, column as any)
-        if (targetColumn && targetColumn.fixed) {
-          XEUtils.eachTree([targetColumn], (column) => {
-            column.fixed = null
-          })
-          tablePrivateMethods.saveCustomStore('update:fixed')
+        let status = false
+        const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn]
+        cols.forEach(item => {
+          const column = handleFieldOrColumn($xeTable, item)
+          const targetColumn = getRootColumn($xeTable, column as any)
+          if (targetColumn && targetColumn.fixed) {
+            XEUtils.eachTree([targetColumn], (column) => {
+              column.fixed = null
+            })
+            tablePrivateMethods.saveCustomStore('update:fixed')
+            if (!status) {
+              status = true
+            }
+          }
+        })
+        if (status) {
           return tableMethods.refreshColumn()
         }
         return nextTick()
@@ -3684,9 +3699,18 @@ export default defineComponent({
        * 隐藏指定列
        */
       hideColumn (fieldOrColumn) {
-        const column = handleFieldOrColumn($xeTable, fieldOrColumn)
-        if (column && column.visible) {
-          column.visible = false
+        let status = false
+        const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn]
+        cols.forEach(item => {
+          const column = handleFieldOrColumn($xeTable, item)
+          if (column && column.visible) {
+            column.visible = false
+            if (!status) {
+              status = true
+            }
+          }
+        })
+        if (status) {
           return tablePrivateMethods.handleCustom()
         }
         return nextTick()
@@ -3695,25 +3719,43 @@ export default defineComponent({
        * 显示指定列
        */
       showColumn (fieldOrColumn) {
-        const column = handleFieldOrColumn($xeTable, fieldOrColumn)
-        if (column && !column.visible) {
-          column.visible = true
+        let status = false
+        const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn]
+        cols.forEach(item => {
+          const column = handleFieldOrColumn($xeTable, item)
+          if (column && !column.visible) {
+            column.visible = true
+            if (!status) {
+              status = true
+            }
+          }
+        })
+        if (status) {
           return tablePrivateMethods.handleCustom()
         }
         return nextTick()
       },
       setColumnWidth (fieldOrColumn, width) {
-        const column = handleFieldOrColumn($xeTable, fieldOrColumn)
-        if (column) {
-          const colWidth = XEUtils.toInteger(width)
-          let rdWidth = colWidth
-          if (isScale(width)) {
-            const tableBody = refTableBody.value
-            const bodyElem = tableBody ? tableBody.$el as HTMLDivElement : null
-            const bodyWidth = bodyElem ? bodyElem.clientWidth - 1 : 0
-            rdWidth = Math.floor(colWidth * bodyWidth)
-          }
-          column.resizeWidth = rdWidth
+        let status = false
+        const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn]
+        cols.forEach(item => {
+          const column = handleFieldOrColumn($xeTable, item)
+          if (column) {
+            const colWidth = XEUtils.toInteger(width)
+            let rdWidth = colWidth
+            if (isScale(width)) {
+              const tableBody = refTableBody.value
+              const bodyElem = tableBody ? tableBody.$el as HTMLDivElement : null
+              const bodyWidth = bodyElem ? bodyElem.clientWidth - 1 : 0
+              rdWidth = Math.floor(colWidth * bodyWidth)
+            }
+            column.resizeWidth = rdWidth
+            if (!status) {
+              status = true
+            }
+          }
+        })
+        if (status) {
           return tableMethods.refreshColumn()
         }
         return nextTick()
@@ -4668,16 +4710,34 @@ export default defineComponent({
        */
       scrollTo (scrollLeft: number, scrollTop?: number) {
         const tableBody = refTableBody.value
+        const tableHeader = refTableHeader.value
         const tableFooter = refTableFooter.value
+        const leftBody = refTableLeftBody.value
         const rightBody = refTableRightBody.value
         const tableBodyElem = tableBody ? tableBody.$el as HTMLDivElement : null
+        const leftBodyElem = leftBody ? leftBody.$el as HTMLDivElement : null
         const rightBodyElem = rightBody ? rightBody.$el as HTMLDivElement : null
+        const tableHeaderElem = tableHeader ? tableHeader.$el as HTMLDivElement : null
         const tableFooterElem = tableFooter ? tableFooter.$el as HTMLDivElement : null
         if (XEUtils.isNumber(scrollLeft)) {
-          setScrollLeft(tableFooterElem || tableBodyElem, scrollLeft)
+          const xHandleEl = refScrollXHandleElem.value
+          if (xHandleEl) {
+            setScrollLeft(xHandleEl, scrollLeft)
+          } else {
+            setScrollLeft(tableBodyElem, scrollLeft)
+            setScrollLeft(tableHeaderElem, scrollLeft)
+            setScrollLeft(tableFooterElem, scrollLeft)
+          }
         }
         if (XEUtils.isNumber(scrollTop)) {
-          setScrollTop(rightBodyElem || tableBodyElem, scrollTop)
+          const yHandleEl = refScrollYHandleElem.value
+          if (yHandleEl) {
+            setScrollTop(yHandleEl, scrollTop)
+          } else {
+            setScrollTop(tableBodyElem, scrollTop)
+            setScrollTop(leftBodyElem, scrollTop)
+            setScrollTop(rightBodyElem, scrollTop)
+          }
         }
         if (reactData.scrollXLoad || reactData.scrollYLoad) {
           return new Promise(resolve => {
@@ -5531,6 +5591,17 @@ export default defineComponent({
       }
     }
 
+    const updateRowDropOrigin = (row: any) => {
+      const el = refElem.value
+      if (el) {
+        const clss = 'row--drag-origin'
+        const rowid = getRowid($xeTable, row)
+        XEUtils.arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), (elem) => {
+          addClass(elem, clss)
+        })
+      }
+    }
+
     const clearRowDropTarget = () => {
       const el = refElem.value
       if (el) {
@@ -5541,6 +5612,18 @@ export default defineComponent({
       }
     }
 
+    const updateRowDropTarget = (row: any, dragPos: string) => {
+      const el = refElem.value
+      if (el) {
+        const clss = 'row--drag-active-target'
+        const rowid = getRowid($xeTable, row)
+        XEUtils.arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), (elem) => {
+          addClass(elem, clss)
+          elem.setAttribute('drag-pos', dragPos)
+        })
+      }
+    }
+
     const showRowDropTip = (evnt: DragEvent | MouseEvent) => {
       const rdTipEl = refRowDragTipElem.value
       if (!rdTipEl) {
@@ -6646,7 +6729,7 @@ export default defineComponent({
         const treeOpts = computeTreeOpts.value
         const { transform } = treeOpts
         const { dragRow } = reactData
-        const { afterFullData, tableFullData, prevDragRow, prevDragPos } = internalData
+        const { afterFullData, afterTreeFullData, tableFullData, tableFullTreeData, prevDragRow, prevDragPos } = internalData
         if (prevDragRow && dragRow) {
           // 判断是否有拖动
           if (prevDragRow !== dragRow) {
@@ -6663,18 +6746,36 @@ export default defineComponent({
               }
               const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0
 
-              // 移出源位置
-              const oafIndex = $xeTable.findRowIndexOf(afterFullData, dragRow)
-              const otfIndex = $xeTable.findRowIndexOf(tableFullData, dragRow)
-              afterFullData.splice(oafIndex, 1)
-              tableFullData.splice(otfIndex, 1)
-              // 插新位置
-              const pafIndex = $xeTable.findRowIndexOf(afterFullData, prevDragRow)
-              const ptfIndex = $xeTable.findRowIndexOf(tableFullData, prevDragRow)
-              const nafIndex = pafIndex + dragOffsetIndex
-              const ntfIndex = ptfIndex + dragOffsetIndex
-              afterFullData.splice(nafIndex, 0, dragRow)
-              tableFullData.splice(ntfIndex, 0, dragRow)
+              let oafIndex = -1
+              let nafIndex = -1
+              if (treeConfig) {
+                // 移出源位置
+                oafIndex = $xeTable.findRowIndexOf(afterTreeFullData, dragRow)
+                const otfIndex = $xeTable.findRowIndexOf(tableFullTreeData, dragRow)
+                afterTreeFullData.splice(oafIndex, 1)
+                tableFullTreeData.splice(otfIndex, 1)
+
+                // 插新位置
+                const pafIndex = $xeTable.findRowIndexOf(afterTreeFullData, prevDragRow)
+                const ptfIndex = $xeTable.findRowIndexOf(tableFullTreeData, prevDragRow)
+                nafIndex = pafIndex + dragOffsetIndex
+                const ntfIndex = ptfIndex + dragOffsetIndex
+                afterTreeFullData.splice(nafIndex, 0, dragRow)
+                tableFullTreeData.splice(ntfIndex, 0, dragRow)
+              } else {
+                // 移出源位置
+                oafIndex = $xeTable.findRowIndexOf(afterFullData, dragRow)
+                const otfIndex = $xeTable.findRowIndexOf(tableFullData, dragRow)
+                afterFullData.splice(oafIndex, 1)
+                tableFullData.splice(otfIndex, 1)
+                // 插新位置
+                const pafIndex = $xeTable.findRowIndexOf(afterFullData, prevDragRow)
+                const ptfIndex = $xeTable.findRowIndexOf(tableFullData, prevDragRow)
+                nafIndex = pafIndex + dragOffsetIndex
+                const ntfIndex = ptfIndex + dragOffsetIndex
+                afterFullData.splice(nafIndex, 0, dragRow)
+                tableFullData.splice(ntfIndex, 0, dragRow)
+              }
 
               reactData.isDragRowMove = true
               $xeTable.cacheRowMap()
@@ -6724,8 +6825,7 @@ export default defineComponent({
           const { dragRow } = reactData
           const offsetY = evnt.clientY - trEl.getBoundingClientRect().y
           const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom'
-          addClass(trEl, 'row--drag-active-target')
-          trEl.setAttribute('drag-pos', dragPos)
+          updateRowDropTarget(row, dragPos)
           internalData.prevDragRow = row
           internalData.prevDragPos = dragPos
           dispatchEvent('row-dragover', {
@@ -6754,7 +6854,7 @@ export default defineComponent({
         }
         reactData.dragRow = row
         trEl.draggable = true
-        addClass(trEl, 'row--drag-origin')
+        updateRowDropOrigin(row)
         showRowDropTip(evnt)
         updateRowDropTipContent(tdEl)
         dispatchEvent('row-dragstart', params, evnt)
@@ -6771,7 +6871,7 @@ export default defineComponent({
       triggerScrollXEvent () {
         loadScrollXData()
       },
-      handleScrollEvent (evnt, isRollY, isRollX, params) {
+      handleScrollEvent (evnt, isRollY, isRollX, scrollTop, scrollLeft, params) {
         const { highlightHoverRow } = props
         const tableBody = refTableBody.value
         const bodyElem = tableBody ? tableBody.$el as HTMLDivElement : null
@@ -6787,20 +6887,39 @@ export default defineComponent({
         if (tooltip && tooltip.reactData.visible) {
           tooltip.close()
         }
-        if (isRollX) {
-          tablePrivateMethods.checkScrolling()
-        }
         const bodyHeight = bodyElem ? bodyElem.clientHeight : 0
         const bodyWidth = bodyElem ? bodyElem.clientWidth : 0
         const scrollHeight = bodyElem ? bodyElem.scrollHeight : 0
         const scrollWidth = bodyElem ? bodyElem.scrollWidth : 0
+        let isTop = false
+        let isBottom = false
+        let isLeft = false
+        let isRight = false
+        if (isRollX) {
+          isLeft = scrollLeft <= 0
+          if (!isTop) {
+            isRight = scrollLeft + bodyWidth >= scrollWidth
+          }
+          tablePrivateMethods.checkScrolling()
+        } else {
+          isTop = scrollTop <= 0
+          if (!isTop) {
+            isBottom = scrollTop + bodyHeight >= scrollHeight
+          }
+        }
         const evntParams = {
+          scrollTop,
+          scrollLeft,
           bodyHeight,
           bodyWidth,
           scrollHeight,
           scrollWidth,
           isX: isRollX,
           isY: isRollY,
+          isTop,
+          isBottom,
+          isLeft,
+          isRight,
           ...params
         }
         dispatchEvent('scroll', evntParams, evnt)