vxe-table 3.5.0-beta.1 → 3.5.0-beta.4

package/lib/index.umd.js

@@ -8430,7 +8430,7 @@ var iconPrefix = 'vxe-icon--';
     //   name: ''
     // },
     // rowConfig: {
-    //   keyField: '_X_ID' // 行数据的唯一主键字段名
+    //   keyField: '_X_ROW_KEY' // 行数据的唯一主键字段名
     // },
     radioConfig: {
       // trigger: 'default'
@@ -8471,7 +8471,7 @@ var iconPrefix = 'vxe-icon--';
       parentField: 'parentId',
       children: 'children',
       hasChild: 'hasChild',
-      mapChildren: '_X_CHILD',
+      mapChildren: '_X_ROW_CHILD',
       indent: 20,
       showIcon: true
     },
@@ -8671,6 +8671,9 @@ var iconPrefix = 'vxe-icon--';
   select: {
     // size: null,
     // transfer: false,
+    // optionConfig: {
+    //   keyField: '_X_OPTION_KEY'
+    // },
     multiCharOverflow: 8
   },
   toolbar: {// size: null,
@@ -8753,7 +8756,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.5.0-beta.1", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.5.0-beta.4", "] ").concat(conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -8959,10 +8962,6 @@ function eqEmptyValue(cellValue) {
 }
 function getFuncText(content) {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(content) ? content() : conf.translate ? conf.translate(content) : content;
-} // 行主键 key
-
-function getRowkey($xetable) {
-  return $xetable.rowOpts.keyField || $xetable.rowId || '_X_ID';
 } // 获取所有的列，排除分组
 
 function getColumnList(columns) {
@@ -8980,12 +8979,6 @@ var UtilTools = {
   getLastZIndex: function getLastZIndex() {
     return lastZindex;
   },
-  getRowkey: getRowkey,
-  // 行主键 value
-  getRowid: function getRowid($xetable, row) {
-    var rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, getRowkey($xetable));
-    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(rowid) ? '' : encodeURIComponent(rowid);
-  },
   getColumnList: getColumnList,
   getClass: function getClass(property, params) {
     return property ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(property) ? property(params) : property : '';
@@ -10032,7 +10025,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.5.0-beta.1",
+  version: "3.5.0-beta.4",
   reg: reg,
   use: use,
   setup: setup,
@@ -10291,7 +10284,7 @@ var es_promise = __webpack_require__("e6cf");
 
 
 
-var dom_getRowid = utils.getRowid;
+var getRowid = utils.getRowid;
 var browse = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.browse();
 var reClsMap = {};
 
@@ -10406,7 +10399,7 @@ var DomTools = {
     var bodyElem = tableBody ? tableBody.$el : null;
 
     if (bodyElem) {
-      var trElem = bodyElem.querySelector("[rowid=\"".concat(dom_getRowid($xetable, row), "\"]"));
+      var trElem = bodyElem.querySelector("[rowid=\"".concat(getRowid($xetable, row), "\"]"));
 
       if (trElem) {
         var bodyHeight = bodyElem.clientHeight;
@@ -10609,6 +10602,15 @@ function restoreScrollListener(scrollElem) {
   if (scrollElem && scrollElem._onscroll) {
     scrollElem.onscroll = scrollElem._onscroll;
   }
+} // 行主键 key
+
+function getRowkey($xetable) {
+  return $xetable.rowOpts.keyField || $xetable.rowId || '_X_ROW_KEY';
+} // 行主键 value
+
+function util_getRowid($xetable, row) {
+  var rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, getRowkey($xetable));
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(rowid) ? '' : encodeURIComponent(rowid);
 }
 
 function getPaddingLeftRightSize(elem) {
@@ -10860,7 +10862,7 @@ function renderLine(h, _vm, $xetable, params) {
       fullAllDataRowIdData = $xetable.fullAllDataRowIdData;
   var slots = column.slots,
       treeNode = column.treeNode;
-  var rowid = utils.getRowid($xetable, row);
+  var rowid = util_getRowid($xetable, row);
   var rest = fullAllDataRowIdData[rowid];
   var rLevel = 0;
   var rIndex = 0;
@@ -11208,7 +11210,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
       };
     }
 
-    var rowid = utils.getRowid($xetable, row);
+    var rowid = util_getRowid($xetable, row);
     var rest = fullAllDataRowIdData[rowid];
     var rowLevel = rest ? rest.level : 0;
     var seq = rest ? rest.seq : -1;
@@ -12930,9 +12932,7 @@ var Cell = {
 
 
 
-var methods_getRowid = utils.getRowid,
-    methods_getRowkey = utils.getRowkey,
-    methods_setCellValue = utils.setCellValue,
+var methods_setCellValue = utils.setCellValue,
     hasChildrenList = utils.hasChildrenList,
     methods_getColumnList = utils.getColumnList;
 var methods_calcHeight = dom.calcHeight,
@@ -12962,8 +12962,7 @@ function eqCellValue(row1, row2, field) {
   }
 
   if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(val1) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isNumber(val1)) {
-    /* eslint-disable eqeqeq */
-    return val1 == val2;
+    return '' + val1 === '' + val2;
   }
 
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isEqual(val1, val2);
@@ -13367,7 +13366,7 @@ var Methods = {
 
     var tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
     tableData.forEach(function (row, $index) {
-      var rowid = methods_getRowid(_this3, row);
+      var rowid = util_getRowid(_this3, row);
       var rest = fullDataRowIdData[rowid];
 
       if (rest) {
@@ -13644,11 +13643,11 @@ var Methods = {
         tableFullTreeData = this.tableFullTreeData;
     var fullDataRowIdData = this.fullDataRowIdData,
         fullAllDataRowIdData = this.fullAllDataRowIdData;
-    var rowkey = methods_getRowkey(this);
+    var rowkey = getRowkey(this);
     var isLazy = treeConfig && treeOpts.lazy;
 
     var handleCache = function handleCache(row, index, items, path, parent, nodes) {
-      var rowid = methods_getRowid(_this10, row);
+      var rowid = util_getRowid(_this10, row);
       var seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
       var level = nodes ? nodes.length - 1 : 0;
 
@@ -13709,13 +13708,13 @@ var Methods = {
     var transform = treeOpts.transform,
         children = treeOpts.children,
         mapChildren = treeOpts.mapChildren;
-    var rest = fullAllDataRowIdData[methods_getRowid(this, row)];
+    var rest = fullAllDataRowIdData[util_getRowid(this, row)];
     var parentLevel = rest ? rest.level : 0;
     return this.createData(childRecords).then(function (rows) {
       if (keepSource) {
-        var rowid = methods_getRowid(_this11, row);
+        var rowid = util_getRowid(_this11, row);
         var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableSourceData, function (item) {
-          return rowid === methods_getRowid(_this11, item);
+          return rowid === util_getRowid(_this11, item);
         }, treeOpts);
 
         if (matchObj) {
@@ -13724,7 +13723,7 @@ var Methods = {
       }
 
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(rows, function (childRow, index, items, path, parent, nodes) {
-        var rowid = methods_getRowid(_this11, childRow);
+        var rowid = util_getRowid(_this11, childRow);
         var rest = {
           row: childRow,
           rowid: rowid,
@@ -13903,7 +13902,7 @@ var Methods = {
     var fullDataRowIdData = this.fullDataRowIdData;
 
     if (row) {
-      var rowid = methods_getRowid(this, row);
+      var rowid = util_getRowid(this, row);
       var rest = fullDataRowIdData[rowid];
 
       if (rest) {
@@ -14004,7 +14003,7 @@ var Methods = {
         treeConfig = this.treeConfig,
         treeOpts = this.treeOpts,
         expandOpts = this.expandOpts;
-    var rowkey = methods_getRowkey(this);
+    var rowkey = getRowkey(this);
     this.tableFullColumn.forEach(function (column) {
       var property = column.property,
           editRender = column.editRender;
@@ -14216,7 +14215,7 @@ var Methods = {
 
     if (keepSource) {
       var oRow, property;
-      var rowid = methods_getRowid(this, row); // 新增的数据不需要检测
+      var rowid = util_getRowid(this, row); // 新增的数据不需要检测
 
       if (!fullDataRowIdData[rowid]) {
         return false;
@@ -14225,7 +14224,7 @@ var Methods = {
       if (treeConfig) {
         var children = treeOpts.children;
         var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableSourceData, function (item) {
-          return rowid === methods_getRowid(_this16, item);
+          return rowid === util_getRowid(_this16, item);
         }, treeOpts);
         row = Object.assign({}, row, _defineProperty({}, children, null));
 
@@ -14615,7 +14614,7 @@ var Methods = {
 
     if (treeConfig) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(afterTreeFullData, function (row, index, items, path) {
-        var rowid = methods_getRowid(_this18, row);
+        var rowid = util_getRowid(_this18, row);
         var allrest = fullAllDataRowIdData[rowid];
         var seq = path.map(function (num, i) {
           return i % 2 === 0 ? Number(num) + 1 : '.';
@@ -14644,7 +14643,7 @@ var Methods = {
       });
     } else {
       afterFullData.forEach(function (row, index) {
-        var rowid = methods_getRowid(_this18, row);
+        var rowid = util_getRowid(_this18, row);
         var allrest = fullAllDataRowIdData[rowid];
         var seq = index + 1;
 
@@ -14683,7 +14682,7 @@ var Methods = {
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(rowOrRowid)) {
         rowid = rowOrRowid;
       } else {
-        rowid = methods_getRowid(this, rowOrRowid);
+        rowid = util_getRowid(this, rowOrRowid);
       }
 
       if (rowid) {
@@ -16857,7 +16856,7 @@ var Methods = {
       if (reserve) {
         if (value) {
           selectRows.forEach(function (row) {
-            checkboxReserveRowMap[methods_getRowid(_this32, row)] = row;
+            checkboxReserveRowMap[util_getRowid(_this32, row)] = row;
           });
         } else {
           afterFullData.forEach(function (row) {
@@ -16989,7 +16988,7 @@ var Methods = {
 
 
     if (radioOpts.reserve && radioReserveRow) {
-      var rowid = methods_getRowid(this, radioReserveRow);
+      var rowid = util_getRowid(this, radioReserveRow);
 
       if (fullDataRowIdData[rowid]) {
         this.setRadioRow(fullDataRowIdData[rowid].row);
@@ -17036,14 +17035,14 @@ var Methods = {
         treeOpts = this.treeOpts;
 
     if (radioOpts.reserve && radioReserveRow) {
-      var rowid = methods_getRowid(this, radioReserveRow);
+      var rowid = util_getRowid(this, radioReserveRow);
 
       if (isFull) {
         if (!fullDataRowIdData[rowid]) {
           return radioReserveRow;
         }
       } else {
-        var rowkey = methods_getRowkey(this);
+        var rowkey = getRowkey(this);
 
         if (treeConfig) {
           var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(afterFullData, function (row) {
@@ -17096,11 +17095,11 @@ var Methods = {
 
       if (treeConfig) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(afterFullData, function (row) {
-          afterFullIdMaps[methods_getRowid(_this33, row)] = 1;
+          afterFullIdMaps[util_getRowid(_this33, row)] = 1;
         }, treeOpts);
       } else {
         afterFullData.forEach(function (row) {
-          afterFullIdMaps[methods_getRowid(_this33, row)] = 1;
+          afterFullIdMaps[util_getRowid(_this33, row)] = 1;
         });
       }
 
@@ -17130,7 +17129,7 @@ var Methods = {
         checkboxOpts = this.checkboxOpts;
 
     if (checkboxOpts.reserve) {
-      var rowid = methods_getRowid(this, row);
+      var rowid = util_getRowid(this, row);
 
       if (checked) {
         checkboxReserveRowMap[rowid] = row;
@@ -17215,7 +17214,7 @@ var Methods = {
       }
 
       if (reserve) {
-        var rowkey = methods_getRowkey(this);
+        var rowkey = getRowkey(this);
         this.radioReserveRow = _defineProperty({}, rowkey, rowid);
       }
     }
@@ -17276,7 +17275,7 @@ var Methods = {
 
     if (rowOpts.isCurrent || this.highlightCurrentRow) {
       if ($el) {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.arrayEach($el.querySelectorAll("[rowid=\"".concat(methods_getRowid(this, row), "\"]")), function (elem) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.arrayEach($el.querySelectorAll("[rowid=\"".concat(util_getRowid(this, row), "\"]")), function (elem) {
           return addClass(elem, 'row--current');
         });
       }
@@ -17349,7 +17348,7 @@ var Methods = {
         afterFullData = this.afterFullData;
 
     if (selectRow) {
-      var rowid = methods_getRowid(this, selectRow);
+      var rowid = util_getRowid(this, selectRow);
 
       if (isFull) {
         if (!fullDataRowIdData[rowid]) {
@@ -17357,7 +17356,7 @@ var Methods = {
         }
       } else {
         if (treeConfig) {
-          var rowkey = methods_getRowkey(this);
+          var rowkey = getRowkey(this);
           var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(afterFullData, function (row) {
             return rowid === external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, rowkey);
           }, treeOpts);
@@ -17385,7 +17384,7 @@ var Methods = {
   },
   setHoverRow: function setHoverRow(row) {
     var $el = this.$el;
-    var rowid = methods_getRowid(this, row);
+    var rowid = util_getRowid(this, row);
     this.clearHoverRow();
 
     if ($el) {
@@ -18104,7 +18103,7 @@ var Methods = {
         expandOpts = this.expandOpts;
 
     if (expandOpts.reserve) {
-      var rowid = methods_getRowid(this, row);
+      var rowid = util_getRowid(this, row);
 
       if (expanded) {
         rowExpandedReserveRowMap[rowid] = row;
@@ -18249,7 +18248,7 @@ var Methods = {
         this.setAllTreeExpand(true);
       } else if (expandRowKeys) {
         var defExpandeds = [];
-        var rowkey = methods_getRowkey(this);
+        var rowkey = getRowkey(this);
         expandRowKeys.forEach(function (rowid) {
           var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableFullData, function (item) {
             return rowid === external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(item, rowkey);
@@ -18518,7 +18517,7 @@ var Methods = {
         treeOpts = this.treeOpts;
 
     if (treeOpts.reserve) {
-      var rowid = methods_getRowid(this, row);
+      var rowid = util_getRowid(this, row);
 
       if (expanded) {
         treeExpandedReserveRowMap[rowid] = row;
@@ -18689,8 +18688,14 @@ var Methods = {
     this.tableColumn = scrollXLoad ? visibleColumn.slice(scrollXStore.startIndex, scrollXStore.endIndex) : visibleColumn.slice(0);
   },
   updateScrollXData: function updateScrollXData() {
-    this.handleTableColumn();
-    this.updateScrollXSpace();
+    var _this49 = this;
+
+    this.tableColumn = [];
+    this.$nextTick(function () {
+      _this49.handleTableColumn();
+
+      _this49.updateScrollXSpace();
+    });
   },
   // 更新横向 X 可视渲染上下剩余空间大小
   updateScrollXSpace: function updateScrollXSpace() {
@@ -18746,8 +18751,14 @@ var Methods = {
     }
   },
   updateScrollYData: function updateScrollYData() {
-    this.handleTableData();
-    this.updateScrollYSpace();
+    var _this50 = this;
+
+    this.tableData = [];
+    this.$nextTick(function () {
+      _this50.handleTableData();
+
+      _this50.updateScrollYSpace();
+    });
   },
   // 更新纵向 Y 可视渲染上下剩余空间大小
   updateScrollYSpace: function updateScrollYSpace() {
@@ -18793,7 +18804,7 @@ var Methods = {
    * @param {Number} scrollTop 上距离
    */
   scrollTo: function scrollTo(scrollLeft, scrollTop) {
-    var _this49 = this;
+    var _this51 = this;
 
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
@@ -18814,7 +18825,7 @@ var Methods = {
     if (this.scrollXLoad || this.scrollYLoad) {
       return new Promise(function (resolve) {
         return setTimeout(function () {
-          return resolve(_this49.$nextTick());
+          return resolve(_this51.$nextTick());
         }, 50);
       });
     }
@@ -18865,7 +18876,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   scrollToTreeRow: function scrollToTreeRow(row) {
-    var _this50 = this;
+    var _this52 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -18880,15 +18891,15 @@ var Methods = {
       if (matchObj) {
         var nodes = matchObj.nodes;
         nodes.forEach(function (row, index) {
-          if (index < nodes.length - 1 && !_this50.isTreeExpandByRow(row)) {
-            rests.push(_this50.setTreeExpand(row, true));
+          if (index < nodes.length - 1 && !_this52.isTreeExpandByRow(row)) {
+            rests.push(_this52.setTreeExpand(row, true));
           }
         });
       }
     }
 
     return Promise.all(rests).then(function () {
-      return dom.rowToVisible(_this50, row);
+      return dom.rowToVisible(_this52, row);
     });
   },
 
@@ -18952,29 +18963,29 @@ var Methods = {
    * 如果单元格配置了校验规则，则会进行校验
    */
   updateStatus: function updateStatus(scope, cellValue) {
-    var _this51 = this;
+    var _this53 = this;
 
     var customVal = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isUndefined(cellValue);
     return this.$nextTick().then(function () {
-      var $refs = _this51.$refs,
-          editRules = _this51.editRules,
-          validStore = _this51.validStore;
+      var $refs = _this53.$refs,
+          editRules = _this53.editRules,
+          validStore = _this53.validStore;
 
       if (scope && $refs.tableBody && editRules) {
         var row = scope.row,
             column = scope.column;
         var type = 'change';
 
-        if (_this51.hasCellRules(type, row, column)) {
-          var cell = _this51.getCell(row, column);
+        if (_this53.hasCellRules(type, row, column)) {
+          var cell = _this53.getCell(row, column);
 
           if (cell) {
-            return _this51.validCellRules(type, row, column, cellValue).then(function () {
+            return _this53.validCellRules(type, row, column, cellValue).then(function () {
               if (customVal && validStore.visible) {
                 methods_setCellValue(row, column, cellValue);
               }
 
-              _this51.clearValidate();
+              _this53.clearValidate();
             }).catch(function (_ref8) {
               var rule = _ref8.rule;
 
@@ -18982,7 +18993,7 @@ var Methods = {
                 methods_setCellValue(row, column, cellValue);
               }
 
-              _this51.showValidTooltip({
+              _this53.showValidTooltip({
                 rule: rule,
                 row: row,
                 column: column,
@@ -19003,7 +19014,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
    */
   setMergeCells: function setMergeCells(merges) {
-    var _this52 = this;
+    var _this54 = this;
 
     if (this.spanMethod) {
       errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -19011,7 +19022,7 @@ var Methods = {
 
     setMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      return _this52.updateCellAreas();
+      return _this54.updateCellAreas();
     });
   },
 
@@ -19020,7 +19031,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
    */
   removeMergeCells: function removeMergeCells(merges) {
-    var _this53 = this;
+    var _this55 = this;
 
     if (this.spanMethod) {
       errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -19028,7 +19039,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      _this53.updateCellAreas();
+      _this55.updateCellAreas();
 
       return rest;
     });
@@ -19052,7 +19063,7 @@ var Methods = {
     this.setMergeFooterItems(this.mergeFooterItems);
   },
   setMergeFooterItems: function setMergeFooterItems(merges) {
-    var _this54 = this;
+    var _this56 = this;
 
     if (this.footerSpanMethod) {
       errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -19060,11 +19071,11 @@ var Methods = {
 
     setMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      return _this54.updateCellAreas();
+      return _this56.updateCellAreas();
     });
   },
   removeMergeFooterItems: function removeMergeFooterItems(merges) {
-    var _this55 = this;
+    var _this57 = this;
 
     if (this.footerSpanMethod) {
       errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -19072,7 +19083,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      _this55.updateCellAreas();
+      _this57.updateCellAreas();
 
       return rest;
     });
@@ -19139,7 +19150,7 @@ var Methods = {
    *************************/
   getCell: function getCell(row, column) {
     var $refs = this.$refs;
-    var rowid = methods_getRowid(this, row);
+    var rowid = util_getRowid(this, row);
     var bodyElem = $refs["".concat(column.fixed || 'table', "Body")] || $refs.tableBody;
 
     if (bodyElem && bodyElem.$el) {
@@ -19344,7 +19355,7 @@ function handleUupdateResize(_vm) {
     height: [Number, String],
     // 表格的最大高度
     maxHeight: [Number, String],
-    // （即将废弃）所有列是否允许拖动列宽调整大小
+    // 已废弃，被 column-config.resizable 替换
     resizable: {
       type: Boolean,
       default: function _default() {
@@ -19416,35 +19427,35 @@ function handleUupdateResize(_vm) {
         return conf.table.showHeader;
       }
     },
-    // （即将废弃）是否要高亮当前选中行
+    // 已废弃，被 row-config.isCurrent 替换
     highlightCurrentRow: {
       type: Boolean,
       default: function _default() {
         return conf.table.highlightCurrentRow;
       }
     },
-    // （即将废弃）鼠标移到行是否要高亮显示
+    // 已废弃，被 row-config.isHover 替换
     highlightHoverRow: {
       type: Boolean,
       default: function _default() {
         return conf.table.highlightHoverRow;
       }
     },
-    // （即将废弃）是否要高亮当前选中列
+    // 已废弃，被 column-config.isCurrent 替换
     highlightCurrentColumn: {
       type: Boolean,
       default: function _default() {
         return conf.table.highlightCurrentColumn;
       }
     },
-    // （即将废弃）鼠标移到列是否要高亮显示
+    // 已废弃，被 column-config.isHover 替换
     highlightHoverColumn: {
       type: Boolean,
       default: function _default() {
         return conf.table.highlightHoverColumn;
       }
     },
-    // （即将废弃）激活单元格编辑时是否高亮显示
+    // 已废弃，直接删除
     highlightCell: Boolean,
     // 是否显示表尾合计
     showFooter: Boolean,
@@ -26384,7 +26395,8 @@ function getOptUniqueId() {
 }
 
 function getOptkey(_vm) {
-  return _vm.optionId || '_X_ID';
+  var optionOpts = _vm.optionOpts;
+  return optionOpts.keyField || _vm.optionId || '_X_OPTION_KEY';
 }
 
 function getOptid(_vm, option) {
@@ -26528,7 +26540,9 @@ function renderOption(h, _vm, list, group) {
       optionKey = _vm.optionKey,
       value = _vm.value,
       multiple = _vm.multiple,
-      currentValue = _vm.currentValue;
+      currentValue = _vm.currentValue,
+      optionOpts = _vm.optionOpts;
+  var useKey = optionOpts.useKey;
   return list.map(function (option, cIndex) {
     var slots = option.slots;
     var isVisible = !isGroup || isOptionVisible(option);
@@ -26537,7 +26551,7 @@ function renderOption(h, _vm, list, group) {
     var optid = getOptid(_vm, option);
     var defaultSlot = slots ? slots.default : null;
     return isVisible ? h('div', {
-      key: optionKey ? optid : cIndex,
+      key: useKey || optionKey ? optid : cIndex,
       class: ['vxe-select-option', option.className, {
         'is--disabled': isDisabled,
         'is--selected': multiple ? value && value.indexOf(optionValue) > -1 : value === optionValue,
@@ -26569,14 +26583,16 @@ function renderOptgroup(h, _vm) {
   var optionKey = _vm.optionKey,
       visibleGroupList = _vm.visibleGroupList,
       groupLabelField = _vm.groupLabelField,
-      groupOptionsField = _vm.groupOptionsField;
+      groupOptionsField = _vm.groupOptionsField,
+      optionOpts = _vm.optionOpts;
+  var useKey = optionOpts.useKey;
   return visibleGroupList.map(function (group, gIndex) {
     var slots = group.slots;
     var optid = getOptid(_vm, group);
     var isGroupDisabled = group.disabled;
     var defaultSlot = slots ? slots.default : null;
     return h('div', {
-      key: optionKey ? optid : gIndex,
+      key: useKey || optionKey ? optid : gIndex,
       class: ['vxe-optgroup', group.className, {
         'is--disabled': isGroupDisabled
       }],
@@ -26636,6 +26652,7 @@ function select_renderOpts(h, _vm) {
     optionProps: Object,
     optionGroups: Array,
     optionGroupProps: Object,
+    optionConfig: Object,
     className: [String, Function],
     size: {
       type: String,
@@ -26644,12 +26661,14 @@ function select_renderOpts(h, _vm) {
       }
     },
     emptyText: String,
+    // 已废弃，被 option-config.keyField 替换
     optionId: {
       type: String,
       default: function _default() {
         return conf.select.optionId;
       }
     },
+    // 已废弃，被 option-config.useKey 替换
     optionKey: Boolean,
     transfer: {
       type: Boolean,
@@ -26702,6 +26721,9 @@ function select_renderOpts(h, _vm) {
     groupOptionsField: function groupOptionsField() {
       return this.groupPropsOpts.options || 'options';
     },
+    optionOpts: function optionOpts() {
+      return Object.assign({}, conf.select.optionConfig, this.optionConfig);
+    },
     isGroup: function isGroup() {
       return this.fullGroupList.some(function (item) {
         return item.options && item.options.length;
@@ -29321,7 +29343,7 @@ function handleFileImport($xetable, file, opts) {
             handleImport($xetable, e.target.result, options);
           };
 
-          reader.readAsText(file, 'UTF-8');
+          reader.readAsText(file, options.encoding || 'UTF-8');
         });
       }
     } else {