vxe-table 3.8.2 → 3.8.3-beta.0

package/lib/index.umd.js

@@ -11346,7 +11346,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.2", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.3-beta.0", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -13067,7 +13067,7 @@ var setup = config;
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.8.2",
+  version: "3.8.3-beta.0",
   reg: reg,
   use: use,
   setup: setup,
@@ -13110,6 +13110,7 @@ var es_string_fixed = __webpack_require__(4298);
 
 
 
+
 var ColumnInfo = /*#__PURE__*/function () {
   /* eslint-disable @typescript-eslint/no-use-before-define */
   function ColumnInfo($xetable, _vm) {
@@ -13183,9 +13184,18 @@ var ColumnInfo = /*#__PURE__*/function () {
       level: 1,
       rowSpan: 1,
       colSpan: 1,
+      // 数据排序
       order: null,
+      // 用于记录排序类型，升序和倒序
       sortTime: 0,
-      customOrder: 0,
+      // 用于多列的先后顺序
+
+      // 列排序
+      sortNumber: 0,
+      // 用于记录自定义列顺序
+      renderSortNumber: 0,
+      // 用于记录自定义列顺序
+
       renderWidth: 0,
       renderHeight: 0,
       resizeWidth: 0,
@@ -16553,7 +16563,7 @@ var debounceScrollYDuration = browse.msie ? 80 : 20;
 var resizableStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_WIDTH';
 var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
 var fixedStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_FIXED';
-var orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
+var sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
 
 /**
  * 生成行的唯一主键
@@ -17131,7 +17141,7 @@ var Methods = {
     this.collectColumn = collectColumn;
     var tableFullColumn = methods_getColumnList(collectColumn);
     this.tableFullColumn = tableFullColumn;
-    this.cacheColumnMap();
+    this.cacheColumnMap(true);
     this.restoreCustomStorage();
     this.parseColumns().then(function () {
       if (_this9.scrollXLoad) {
@@ -17307,7 +17317,7 @@ var Methods = {
    * 更新数据列的 Map
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
-  cacheColumnMap: function cacheColumnMap() {
+  cacheColumnMap: function cacheColumnMap(isInit) {
     var _this13 = this;
     var tableFullColumn = this.tableFullColumn,
       collectColumn = this.collectColumn,
@@ -17368,6 +17378,9 @@ var Methods = {
       if (fullColumnIdData[colid]) {
         errLog('vxe.error.colRepet', ['colId', colid]);
       }
+      if (isInit) {
+        column.sortNumber = index;
+      }
       fullColumnIdData[colid] = rest;
       fullColumnMap.set(column, rest);
     };
@@ -18298,7 +18311,8 @@ var Methods = {
     var opts = Object.assign({
       visible: true,
       resizable: options === true,
-      fixed: options === true
+      fixed: options === true,
+      sort: options === true
     }, options);
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, function (column) {
       if (opts.resizable) {
@@ -18307,6 +18321,9 @@ var Methods = {
       if (opts.fixed) {
         column.fixed = column.defaultFixed;
       }
+      if (opts.sort) {
+        column.renderSortNumber = column.sortNumber;
+      }
       if (!checkMethod || checkMethod({
         column: column
       })) {
@@ -18324,7 +18341,7 @@ var Methods = {
   handleCustom: function handleCustom() {
     this.saveCustomVisible();
     this.analyColumnWidth();
-    return this.refreshColumn();
+    return this.refreshColumn(true);
   },
   /**
    * 还原自定义列操作状态
@@ -18335,12 +18352,13 @@ var Methods = {
       customConfig = this.customConfig,
       customOpts = this.customOpts;
     var storage = customOpts.storage;
-    var isAllStorage = customOpts.storage === true;
-    var isCustomResizable = isAllStorage || storage && storage.resizable;
-    var isCustomVisible = isAllStorage || storage && storage.visible;
-    var isCustomFixed = storage === true || storage && storage.fixed;
-    var isCustomOrder = storage === true || storage && storage.order;
-    if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomOrder)) {
+    var isAllStorage = storage === true;
+    var storageOpts = isAllStorage ? {} : Object.assign({}, storage || {});
+    var isCustomResizable = isAllStorage || storageOpts.resizable;
+    var isCustomVisible = isAllStorage || storageOpts.visible;
+    var isCustomFixed = isAllStorage || storageOpts.fixed;
+    var isCustomSort = isAllStorage || storageOpts.sort;
+    if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
       var customMap = {};
       if (!id) {
         errLog('vxe.error.reqProp', ['id']);
@@ -18379,18 +18397,23 @@ var Methods = {
         }
       }
       // 自定义顺序
-      if (isCustomOrder) {
-        var columnOrderStorage = getCustomStorageMap(orderStorageKey)[id];
-        if (columnOrderStorage) {
-          // const colOrderSeqs = columnOrderStorage.split(',')
-          // colOrderSeqs.forEach((orderConf) => {
-          //   const [colKey, order] = orderConf.split('|')
-          //   if (customMap[colKey]) {
-          //     customMap[colKey].order = order
-          //   } else {
-          //     customMap[colKey] = { order }
-          //   }
-          // })
+      if (isCustomSort) {
+        var columnSortStorage = getCustomStorageMap(sortStorageKey)[id];
+        if (columnSortStorage) {
+          var colOrderSeqs = columnSortStorage.split(',');
+          colOrderSeqs.forEach(function (orderConf) {
+            var _orderConf$split = orderConf.split('|'),
+              _orderConf$split2 = _slicedToArray(_orderConf$split, 2),
+              colKey = _orderConf$split2[0],
+              sortNumber = _orderConf$split2[1];
+            if (customMap[colKey]) {
+              customMap[colKey].sortNumber = sortNumber;
+            } else {
+              customMap[colKey] = {
+                sortNumber: sortNumber
+              };
+            }
+          });
         }
       }
       if (isCustomVisible) {
@@ -18432,7 +18455,7 @@ var Methods = {
         var visible = _ref5.visible,
           resizeWidth = _ref5.resizeWidth,
           fixed = _ref5.fixed,
-          order = _ref5.order;
+          sortNumber = _ref5.sortNumber;
         var column = keyMap[field];
         if (column) {
           if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(resizeWidth)) {
@@ -18444,8 +18467,8 @@ var Methods = {
           if (fixed) {
             column.fixed = fixed;
           }
-          if (order) {
-            column.colSeq = order;
+          if (sortNumber) {
+            column.colSeq = Number(sortNumber);
           }
         }
       });
@@ -18457,8 +18480,9 @@ var Methods = {
       customConfig = this.customConfig,
       customOpts = this.customOpts;
     var storage = customOpts.storage;
-    var isAllStorage = customOpts.storage === true;
-    var isCustomFixed = isAllStorage || storage && storage.fixed;
+    var isAllStorage = storage === true;
+    var storageOpts = isAllStorage ? {} : Object.assign({}, storage || {});
+    var isCustomFixed = isAllStorage || storageOpts.fixed;
     if (customConfig && isCustomFixed) {
       var columnFixedStorageMap = getCustomStorageMap(fixedStorageKey);
       var colFixeds = [];
@@ -18485,8 +18509,9 @@ var Methods = {
       customOpts = this.customOpts;
     var checkMethod = customOpts.checkMethod,
       storage = customOpts.storage;
-    var isAllStorage = customOpts.storage === true;
-    var isCustomVisible = isAllStorage || storage && storage.visible;
+    var isAllStorage = storage === true;
+    var storageOpts = isAllStorage ? {} : Object.assign({}, storage || {});
+    var isCustomVisible = isAllStorage || storageOpts.visible;
     if (customConfig && isCustomVisible) {
       var columnVisibleStorageMap = getCustomStorageMap(visibleStorageKey);
       var colHides = [];
@@ -18522,8 +18547,9 @@ var Methods = {
       customConfig = this.customConfig,
       customOpts = this.customOpts;
     var storage = customOpts.storage;
-    var isAllStorage = customOpts.storage === true;
-    var isResizable = isAllStorage || storage && storage.resizable;
+    var isAllStorage = storage === true;
+    var storageOpts = isAllStorage ? {} : Object.assign({}, storage || {});
+    var isResizable = isAllStorage || storageOpts.resizable;
     if (customConfig && isResizable) {
       var columnWidthStorageMap = getCustomStorageMap(resizableStorageKey);
       var columnWidthStorage;
@@ -18555,8 +18581,15 @@ var Methods = {
   /**
    * 刷新列配置
    */
-  refreshColumn: function refreshColumn() {
+  refreshColumn: function refreshColumn(resiveOrder) {
     var _this21 = this;
+    if (resiveOrder) {
+      var columnList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(this.collectColumn, 'renderSortNumber');
+      this.collectColumn = columnList;
+      var tableFullColumn = methods_getColumnList(columnList);
+      this.tableFullColumn = tableFullColumn;
+      this.cacheColumnMap();
+    }
     return this.parseColumns().then(function () {
       return _this21.refreshScroll();
     }).then(function () {
@@ -23221,6 +23254,7 @@ function handleUupdateResize(_vm) {
         export: false,
         custom: false
       },
+      customColumnList: [],
       // 刷新列标识，当列筛选被改变时，触发表格刷新数据
       upDataFlag: 0,
       // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
@@ -23494,9 +23528,9 @@ function handleUupdateResize(_vm) {
       return Object.assign({}, conf.table.customConfig, this.customConfig);
     },
     fixedColumnSize: function fixedColumnSize() {
-      var tableFullColumn = this.tableFullColumn;
+      var collectColumn = this.collectColumn;
       var fixedSize = 0;
-      tableFullColumn.forEach(function (column) {
+      collectColumn.forEach(function (column) {
         if (column.fixed) {
           fixedSize++;
         }
@@ -34318,14 +34352,17 @@ var Validator = VxeTableValidatorModule;
 /* harmony default export */ var validator = ((/* unused pure expression or super */ null && (VxeTableValidatorModule)));
 ;// CONCATENATED MODULE: ./packages/custom/src/mixin.js
 
+
 /* harmony default export */ var custom_src_mixin = ({
   methods: {
     _openCustom: function _openCustom() {
       var _this = this;
       var initStore = this.initStore,
-        customStore = this.customStore;
+        customStore = this.customStore,
+        collectColumn = this.collectColumn;
       customStore.visible = true;
       initStore.custom = true;
+      this.customColumnList = collectColumn.slice(0);
       this.checkCustomStatus();
       this.calcMaxHeight();
       return this.$nextTick().then(function () {
@@ -34422,11 +34459,31 @@ var Validator = VxeTableValidatorModule;
 
 
 
+
+
+var panel_formatText = utils.formatText;
+var panel_addClass = dom.addClass,
+  panel_removeClass = dom.removeClass;
+function updateDropHint(_vm, evnt) {
+  var $refs = _vm.$refs;
+  var dragHintEl = $refs.dragHintElemRef;
+  var bodyEl = $refs.bodyElemRef;
+  if (!bodyEl) {
+    return;
+  }
+  if (dragHintEl) {
+    var warpperEl = bodyEl.parentNode;
+    var warpperRect = warpperEl.getBoundingClientRect();
+    dragHintEl.style.display = 'block';
+    dragHintEl.style.top = "".concat(Math.min(warpperEl.clientHeight - warpperEl.scrollTop - dragHintEl.clientHeight, evnt.clientY - warpperRect.y), "px");
+    dragHintEl.style.left = "".concat(Math.min(warpperEl.clientWidth - warpperEl.scrollLeft - dragHintEl.clientWidth - 16, evnt.clientX - warpperRect.x), "px");
+  }
+}
 function renderSimplePanel(h, _vm) {
   var $xetable = _vm.$xetable,
     customStore = _vm.customStore;
   var customOpts = $xetable.customOpts,
-    collectColumn = $xetable.collectColumn,
+    customColumnList = $xetable.customColumnList,
     isMaxFixedColumn = $xetable.isMaxFixedColumn;
   var maxHeight = customStore.maxHeight;
   var checkMethod = customOpts.checkMethod,
@@ -34436,18 +34493,18 @@ function renderSimplePanel(h, _vm) {
   var customWrapperOns = {};
   // hover 触发
   if (trigger === 'hover') {
-    customWrapperOns.onMouseenter = _vm.handleWrapperMouseenterEvent;
-    customWrapperOns.onMouseleave = _vm.handleWrapperMouseleaveEvent;
+    customWrapperOns.mouseenter = _vm.handleWrapperMouseenterEvent;
+    customWrapperOns.mouseleave = _vm.handleWrapperMouseleaveEvent;
   }
-  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, function (column, index, items, path, parent) {
+  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, function (column, index, items, path, parent) {
     var isVisible = visibleMethod ? visibleMethod({
       column: column
     }) : true;
     if (isVisible) {
       var isChecked = column.visible;
       var isIndeterminate = column.halfVisible;
-      var colTitle = utils.formatText(column.getTitle(), 1);
       var isColGroup = column.children && column.children.length;
+      var colTitle = panel_formatText(column.getTitle(), 1);
       var isDisabled = checkMethod ? !checkMethod({
         column: column
       }) : false;
@@ -34457,14 +34514,12 @@ function renderSimplePanel(h, _vm) {
           'is--group': isColGroup
         }]
       }, [h('div', {
+        title: colTitle,
         class: ['vxe-table-custom--checkbox-option', {
           'is--checked': isChecked,
           'is--indeterminate': isIndeterminate,
           'is--disabled': isDisabled
         }],
-        attrs: {
-          title: colTitle
-        },
         on: {
           click: function click() {
             if (!isDisabled) {
@@ -34533,12 +34588,13 @@ function renderSimplePanel(h, _vm) {
     class: ['vxe-checkbox--icon', isAllIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
   }), h('span', {
     class: 'vxe-checkbox--label'
-  }, conf.i18n('vxe.toolbar.customAll'))])])]), h('ul', _objectSpread2({
+  }, conf.i18n('vxe.toolbar.customAll'))])])]), h('ul', {
     class: 'vxe-table-custom--body',
     style: maxHeight ? {
       maxHeight: "".concat(maxHeight, "px")
-    } : {}
-  }, customWrapperOns), colVNs), customOpts.showFooter ? h('div', {
+    } : {},
+    on: customWrapperOns
+  }, colVNs), customOpts.showFooter ? h('div', {
     class: 'vxe-table-custom--footer'
   }, [h('button', {
     class: 'btn--reset',
@@ -34552,41 +34608,59 @@ function renderSimplePanel(h, _vm) {
     }
   }, customOpts.confirmButtonText || conf.i18n('vxe.toolbar.customConfirm'))]) : null]);
 }
-var renderPopupPanel = function renderPopupPanel(h, _vm) {
+function renderPopupPanel(h, _vm) {
   var $xetable = _vm.$xetable,
     customStore = _vm.customStore;
   var customOpts = $xetable.customOpts,
-    collectColumn = $xetable.collectColumn,
+    customColumnList = $xetable.customColumnList,
     isMaxFixedColumn = $xetable.isMaxFixedColumn;
   var checkMethod = customOpts.checkMethod,
     visibleMethod = customOpts.visibleMethod;
   var trVNs = [];
-  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, function (column, index, items, path, parent) {
+  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, function (column, index, items, path, parent) {
     var isVisible = visibleMethod ? visibleMethod({
       column: column
     }) : true;
     if (isVisible) {
       var isChecked = column.visible;
       var isIndeterminate = column.halfVisible;
-      var colTitle = utils.formatText(column.getTitle(), 1);
+      var colTitle = panel_formatText(column.getTitle(), 1);
       var isColGroup = column.children && column.children.length;
       var isDisabled = checkMethod ? !checkMethod({
         column: column
       }) : false;
       trVNs.push(h('tr', {
         key: column.id,
-        class: ["vxe-table-custom-popup--row-level".concat(column.level), {
+        class: ["vxe-table-custom-popup--row level--".concat(column.level), {
           'is--group': isColGroup
-        }]
+        }],
+        attrs: {
+          colid: column.id
+        },
+        on: {
+          dragstart: _vm.sortDragstartEvent,
+          dragend: _vm.sortDragendEvent,
+          dragover: _vm.sortDragoverEvent
+        }
       }, [h('td', {
-        class: 'vxe-table-custom-popup--column-name'
+        class: 'vxe-table-custom-popup--column-item col--sort'
+      }, [column.level === 1 ? h('span', {
+        class: 'vxe-table-custom-popup--column-sort-btn',
+        on: {
+          mousedown: _vm.sortMousedownEvent,
+          mouseup: _vm.sortMouseupEvent
+        }
+      }, [h('i', {
+        class: 'vxe-icon-sort'
+      })]) : null]), h('td', {
+        class: 'vxe-table-custom-popup--column-item col--name'
       }, [h('div', {
         class: 'vxe-table-custom-popup--name',
         attrs: {
           title: colTitle
         }
       }, colTitle)]), h('td', {
-        class: 'vxe-table-custom-popup--column-visiblw'
+        class: 'vxe-table-custom-popup--column-item col--visible'
       }, [h('div', {
         class: ['vxe-table-custom--checkbox-option', {
           'is--checked': isChecked,
@@ -34603,22 +34677,23 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
       }, [h('span', {
         class: ['vxe-checkbox--icon', isIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
       })])]), h('td', {
-        class: 'vxe-table-custom-popup--column-fixed'
+        class: 'vxe-table-custom-popup--column-item col--fixed'
       }, [!parent && customOpts.allowFixed ? h('vxe-radio-group', {
         props: {
           value: column.fixed || '',
-          disabled: isMaxFixedColumn,
           type: 'button',
           size: 'mini',
           options: [{
-            label: '左侧',
-            value: 'left'
+            label: conf.i18n('vxe.custom.setting.fixedLeft'),
+            value: 'left',
+            disabled: isMaxFixedColumn
           }, {
-            label: '不固定',
+            label: conf.i18n('vxe.custom.setting.fixedUnset'),
             value: ''
           }, {
-            label: '右侧',
-            value: 'right'
+            label: conf.i18n('vxe.custom.setting.fixedRight'),
+            value: 'right',
+            disabled: isMaxFixedColumn
           }]
         },
         on: {
@@ -34635,15 +34710,19 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
   return h('vxe-modal', {
     key: 'popup',
     props: {
-      className: 'vxe-table-custom-popup-warpper vxe-table--ignore-clear',
       value: customStore.visible,
       title: conf.i18n('vxe.custom.cstmTitle'),
-      width: 700,
-      maxHeight: 500,
+      className: 'vxe-table-custom-popup-warpper vxe-table--ignore-clear',
+      width: '40vw',
+      minWidth: 500,
+      height: '50vh',
+      minHeight: 300,
       mask: true,
       lockView: true,
       showFooter: true,
-      escClosable: true
+      resize: true,
+      escClosable: true,
+      destroyOnClose: true
     },
     on: {
       input: function input(value) {
@@ -34653,8 +34732,15 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
     scopedSlots: {
       default: function _default() {
         return h('div', {
+          ref: 'bodyElemRef',
           class: 'vxe-table-custom-popup--body'
-        }, [h('table', {}, [h('colgroup', {}, [h('col'), h('col', {
+        }, [h('div', {
+          class: 'vxe-table-custom-popup--table-warpper'
+        }, [h('table', {}, [h('colgroup', {}, [h('col', {
+          style: {
+            width: '60px'
+          }
+        }), h('col'), h('col', {
           style: {
             width: '80px'
           }
@@ -34662,7 +34748,16 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
           style: {
             width: '200px'
           }
-        })]), h('thead', {}, [h('tr', {}, [h('th', {}, '标题'), h('th', {}, '是否显示'), h('th', {}, '是否固定')])]), h('tbody', {}, trVNs)])]);
+        })]), h('thead', {}, [h('tr', {}, [h('th', {}, conf.i18n('vxe.custom.setting.colSort')), h('th', {}, conf.i18n('vxe.custom.setting.colTitle')), h('th', {}, conf.i18n('vxe.custom.setting.colVisible')), h('th', {}, conf.i18n('vxe.custom.setting.colFixed'))])]), h('transition-group', {
+          class: 'vxe-table-custom--body',
+          props: {
+            tag: 'tbody',
+            name: 'vxe-table-custom--flip'
+          }
+        }, trVNs)])]), h('div', {
+          ref: 'dragHintElemRef',
+          class: 'vxe-table-custom-popup--drag-hint'
+        }, conf.i18n('vxe.custom.cstmDragTarget', [_vm.dragColumn ? _vm.dragColumn.getTitle() : '']))]);
       },
       footer: function footer() {
         return h('div', {
@@ -34693,7 +34788,7 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
       }
     }
   });
-};
+}
 /* harmony default export */ var custom_src_panel = ({
   name: 'VxeTableCustomPanel',
   props: {
@@ -34709,6 +34804,11 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
       default: null
     }
   },
+  data: function data() {
+    return {
+      dragColumn: null
+    };
+  },
   computed: {},
   render: function render(h) {
     var $xetable = this.$xetable;
@@ -34756,8 +34856,8 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
     },
     handleOptionCheck: function handleOptionCheck(column) {
       var $xetable = this.$xetable;
-      var collectColumn = $xetable.collectColumn;
-      var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(collectColumn, function (item) {
+      var customColumnList = $xetable.customColumnList;
+      var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(customColumnList, function (item) {
         return item === column;
       });
       if (matchObj && matchObj.parent) {
@@ -34807,12 +34907,12 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
     },
     allCustomEvent: function allCustomEvent() {
       var $xetable = this.$xetable,
-        customStore = this.customStore,
-        collectColumn = this.collectColumn,
-        customOpts = this.customOpts;
+        customStore = this.customStore;
+      var customOpts = $xetable.customOpts,
+        customColumnList = $xetable.customColumnList;
       var checkMethod = customOpts.checkMethod;
       var isAll = !customStore.isAll;
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, function (column) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, function (column) {
         if (!checkMethod || checkMethod({
           column: column
         })) {
@@ -34822,6 +34922,103 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
       });
       customStore.isAll = isAll;
       $xetable.checkCustomStatus();
+    },
+    sortMousedownEvent: function sortMousedownEvent(evnt) {
+      var $xetable = this.$xetable;
+      var btnEl = evnt.currentTarget;
+      var tdEl = btnEl.parentNode;
+      var trEl = tdEl.parentNode;
+      var colid = trEl.getAttribute('colid');
+      var column = $xetable.getColumnById(colid);
+      trEl.draggable = true;
+      this.dragColumn = column;
+      panel_addClass(trEl, 'active--drag-origin');
+    },
+    sortMouseupEvent: function sortMouseupEvent(evnt) {
+      var btnEl = evnt.currentTarget;
+      var tdEl = btnEl.parentNode;
+      var trEl = tdEl.parentNode;
+      var dragHintEl = this.$refs.dragHintElemRef;
+      trEl.draggable = false;
+      this.dragColumn = null;
+      panel_removeClass(trEl, 'active--drag-origin');
+      if (dragHintEl) {
+        dragHintEl.style.display = '';
+      }
+    },
+    sortDragstartEvent: function sortDragstartEvent(evnt) {
+      var img = new Image();
+      if (evnt.dataTransfer) {
+        evnt.dataTransfer.setDragImage(img, 0, 0);
+      }
+    },
+    sortDragendEvent: function sortDragendEvent(evnt) {
+      var $xetable = this.$xetable,
+        prevDropTrEl = this.prevDropTrEl;
+      var customColumnList = $xetable.customColumnList;
+      var trEl = evnt.currentTarget;
+      var dragHintEl = this.$refs.dragHintElemRef;
+      if (prevDropTrEl) {
+        // 判断是否有拖动
+        if (prevDropTrEl !== trEl) {
+          var dragOffset = prevDropTrEl.getAttribute('dragoffset');
+          var colid = trEl.getAttribute('colid');
+          var column = $xetable.getColumnById(colid);
+          if (!column) {
+            return;
+          }
+          var cIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(customColumnList, function (item) {
+            return item.id === column.id;
+          });
+          var targetColid = prevDropTrEl.getAttribute('colid');
+          var targetColumn = $xetable.getColumnById(targetColid);
+          if (!targetColumn) {
+            return;
+          }
+          // 移出源位置
+          customColumnList.splice(cIndex, 1);
+          var tcIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(customColumnList, function (item) {
+            return item.id === targetColumn.id;
+          });
+          // 插新位置
+          customColumnList.splice(tcIndex + (dragOffset === 'bottom' ? 1 : 0), 0, column);
+        }
+        prevDropTrEl.draggable = false;
+        prevDropTrEl.removeAttribute('dragoffset');
+        panel_removeClass(prevDropTrEl, 'active--drag-target');
+      }
+      this.dragColumn = null;
+      trEl.draggable = false;
+      trEl.removeAttribute('dragoffset');
+      if (dragHintEl) {
+        dragHintEl.style.display = '';
+      }
+      panel_removeClass(trEl, 'active--drag-target');
+      panel_removeClass(trEl, 'active--drag-origin');
+      // 更新顺序
+      customColumnList.forEach(function (column, index) {
+        column.renderSortNumber = index;
+      });
+    },
+    sortDragoverEvent: function sortDragoverEvent(evnt) {
+      var $xetable = this.$xetable,
+        prevDropTrEl = this.prevDropTrEl;
+      var trEl = evnt.currentTarget;
+      if (prevDropTrEl !== trEl) {
+        panel_removeClass(prevDropTrEl, 'active--drag-target');
+      }
+      var colid = trEl.getAttribute('colid');
+      var column = $xetable.getColumnById(colid);
+      // 是否移入有效元行
+      if (column && column.level === 1) {
+        evnt.preventDefault();
+        var offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
+        var dragOffset = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
+        panel_addClass(trEl, 'active--drag-target');
+        trEl.setAttribute('dragoffset', dragOffset);
+        this.prevDropTrEl = trEl;
+      }
+      updateDropHint(this, evnt);
     }
   }
 });
@@ -37391,6 +37588,7 @@ var Checkbox = VxeCheckbox;
 
 
 
+
 /* harmony default export */ var src_group = ({
   name: 'VxeCheckboxGroup',
   props: {
@@ -37439,13 +37637,17 @@ var Checkbox = VxeCheckbox;
     },
     valueField: function valueField() {
       return this.propsOpts.value || 'value';
+    },
+    disabledField: function disabledField() {
+      return this.propsOpts.disabled || 'disabled';
     }
   },
   render: function render(h) {
     var $scopedSlots = this.$scopedSlots,
       options = this.options,
       valueField = this.valueField,
-      labelField = this.labelField;
+      labelField = this.labelField,
+      disabledField = this.disabledField;
     var defaultSlot = $scopedSlots.default;
     return h('div', {
       class: 'vxe-checkbox-group'
@@ -37453,7 +37655,8 @@ var Checkbox = VxeCheckbox;
       return h('vxe-checkbox', {
         props: {
           label: item[valueField],
-          content: item[labelField]
+          content: item[labelField],
+          disabled: item[disabledField]
         }
       });
     }) : []);
@@ -37553,6 +37756,9 @@ var Radio = VxeRadio;
     },
     valueField: function valueField() {
       return this.propsOpts.value || 'value';
+    },
+    disabledField: function disabledField() {
+      return this.propsOpts.disabled || 'disabled';
     }
   },
   data: function data() {
@@ -37565,7 +37771,8 @@ var Radio = VxeRadio;
       options = this.options,
       type = this.type,
       valueField = this.valueField,
-      labelField = this.labelField;
+      labelField = this.labelField,
+      disabledField = this.disabledField;
     var defaultSlot = $scopedSlots.default;
     var btnComp = type === 'button' ? 'vxe-radio-button' : 'vxe-radio';
     return h('div', {
@@ -37574,7 +37781,8 @@ var Radio = VxeRadio;
       return h(btnComp, {
         props: {
           label: item[valueField],
-          content: item[labelField]
+          content: item[labelField],
+          disabled: item[disabledField]
         }
       });
     }) : []);
@@ -41339,7 +41547,7 @@ var Pulldown = VxePulldown;
       text: '加载中...'
     },
     error: {
-      groupFixed: '如果使用分组表头，固定列必须按组设置',
+      groupFixed: '如果使用分组表头，冻结列必须按组设置',
       groupMouseRange: '分组表头与 "{0}" 不能同时使用，这可能会出现错误',
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
@@ -41392,7 +41600,7 @@ var Pulldown = VxePulldown;
       customAll: '全部',
       customConfirm: '确认',
       customRestore: '重置',
-      maxFixedCol: '最大固定列的数量不能超过 {0} 个'
+      maxFixedCol: '最大冻结列的数量不能超过 {0} 个'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',
@@ -41427,7 +41635,7 @@ var Pulldown = VxePulldown;
       endPageTitle: '末页'
     },
     alert: {
-      title: '消息提示'
+      title: '系统提示'
     },
     button: {
       confirm: '确认',
@@ -41440,7 +41648,18 @@ var Pulldown = VxePulldown;
       cstmTitle: '列设置',
       cstmRestore: '恢复默认',
       cstmCancel: '取消',
-      cstmConfirm: '确定'
+      cstmConfirm: '确定',
+      cstmConfirmRestore: '请确认是否恢复成默认列配置？',
+      cstmDragTarget: '移动目标：{0}',
+      setting: {
+        colSort: '排序',
+        colTitle: '标题',
+        colVisible: '是否显示',
+        colFixed: '冻结列',
+        fixedLeft: '左侧',
+        fixedUnset: '不设置',
+        fixedRight: '右侧'
+      }
     },
     import: {
       modes: {
@@ -41519,9 +41738,9 @@ var Pulldown = VxePulldown;
       customAll: '全部',
       customConfirm: '确认',
       customRestore: '重置',
-      fixedLeft: '固定在左侧',
-      fixedRight: '固定在右侧',
-      cancelfixed: '取消固定'
+      fixedLeft: '冻结在左侧',
+      fixedRight: '冻结在右侧',
+      cancelfixed: '取消冻结列'
     },
     input: {
       date: {