vxe-table 3.5.9-beta.1 → 3.5.9-beta.12

package/lib/index.umd.js

@@ -8448,7 +8448,7 @@ function _createClass(Constructor, protoProps, staticProps) {
 }
 // CONCATENATED MODULE: ./packages/v-x-e-table/src/conf.js
 var iconPrefix = 'vxe-icon--';
-/* harmony default export */ var conf = ({
+/* harmony default export */ var src_conf = ({
   size: null,
   // 全局尺寸
   zIndex: 999,
@@ -8457,6 +8457,8 @@ var iconPrefix = 'vxe-icon--';
   // 版本号，对于某些带数据缓存的功能有用到，上升版本号可以用于重置数据
   // resizeInterval: 500,
   emptyCell: '　',
+  loadingText: null,
+  // 自定义loading提示内容，如果为null则不显示文本
   table: {
     fit: true,
     showHeader: true,
@@ -8574,6 +8576,8 @@ var iconPrefix = 'vxe-icon--';
     types: {}
   },
   icon: {
+    // loading
+    // LOADING: iconPrefix + 'refresh roll vxe-loading--default-icon',
     // table
     TABLE_SORT_ASC: iconPrefix + 'caret-top',
     TABLE_SORT_DESC: iconPrefix + 'caret-bottom',
@@ -8703,8 +8707,8 @@ var iconPrefix = 'vxe-icon--';
     // parseFormat: 'yyyy-MM-dd HH:mm:ss.SSS',
     // labelFormat: '',
     // valueFormat: '',
-    minDate: new Date(1900, 0, 1),
-    maxDate: new Date(2100, 0, 1),
+    startDate: new Date(1900, 0, 1),
+    endDate: new Date(2100, 0, 1),
     startDay: 1,
     selectDay: 1,
     digits: 2,
@@ -8804,7 +8808,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.5.9-beta.0", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.5.9-beta.11", "] ").concat(src_conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -9009,7 +9013,7 @@ function eqEmptyValue(cellValue) {
   return cellValue === '' || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(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;
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(content) ? content() : src_conf.translate ? src_conf.translate(content) : content;
 } // 获取所有的列，排除分组
 
 function getColumnList(columns) {
@@ -9021,7 +9025,7 @@ function getColumnList(columns) {
 }
 var UtilTools = {
   nextZIndex: function nextZIndex() {
-    lastZindex = conf.zIndex + zindexIndex++;
+    lastZindex = src_conf.zIndex + zindexIndex++;
     return lastZindex;
   },
   getLastZIndex: function getLastZIndex() {
@@ -9032,13 +9036,13 @@ var UtilTools = {
     return property ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(property) ? property(params) : property : '';
   },
   formatText: function formatText(value, placeholder) {
-    return '' + (value === '' || value === null || value === undefined ? placeholder ? conf.emptyCell : '' : value);
+    return '' + (value === '' || value === null || value === undefined ? placeholder ? src_conf.emptyCell : '' : value);
   },
   getCellValue: function getCellValue(row, column) {
-    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, column.property);
+    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, column.field);
   },
   setCellValue: function setCellValue(row, column, value) {
-    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(row, column.property, value);
+    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(row, column.field, value);
   },
   // 组装列配置
   assemColumn: function assemColumn(_vm) {
@@ -9138,7 +9142,7 @@ function getFormatDate(value, props, defaultFormat) {
 }
 
 function getLabelFormatDate(value, props) {
-  return getFormatDate(value, props, conf.i18n("vxe.input.date.labelFormat.".concat(props.type)));
+  return getFormatDate(value, props, src_conf.i18n("vxe.input.date.labelFormat.".concat(props.type)));
 }
 
 function getDefaultComponentName(_ref) {
@@ -9755,7 +9759,7 @@ var renderMap = {
           props = _renderOpts$props2 === void 0 ? {} : _renderOpts$props2;
       var row = params.row,
           column = params.column;
-      var digits = props.digits || conf.input.digits;
+      var digits = props.digits || src_conf.input.digits;
       var cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, column.property);
 
       if (cellValue) {
@@ -9893,12 +9897,23 @@ var renderer = {
     return renderer;
   }
 };
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
+var es_array_includes = __webpack_require__("caad");
+
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
+var es_string_includes = __webpack_require__("2532");
+
 // CONCATENATED MODULE: ./packages/v-x-e-table/src/store.js
 
 
 
 
 
+
+
+
+
+
 /**
  * 创建数据仓库
  */
@@ -9924,10 +9939,11 @@ var store_Store = /*#__PURE__*/function () {
   }, {
     key: "add",
     value: function add(name, render) {
-      // 检测是否覆盖
-      if (false) {}
+      var conf = this.store[name]; // 检测是否覆盖
 
-      this.store[name] = render;
+      if (false) { var confKeys; }
+
+      this.store[name] = conf ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.merge(conf, render) : render;
       return Store;
     }
   }, {
@@ -9968,7 +9984,7 @@ if (false) {}
  */
 
 function setup(options) {
-  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.merge(conf, options);
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.merge(src_conf, options);
 }
 // CONCATENATED MODULE: ./packages/v-x-e-table/index.js
 
@@ -10047,7 +10063,7 @@ var v_x_e_table_VXETableConfig = /*#__PURE__*/function () {
   }, {
     key: "exportTypes",
     get: function get() {
-      return getExportOrImpotType(conf.export.types, 1);
+      return getExportOrImpotType(src_conf.export.types, 1);
     }
     /**
      * 获取所有导入类型
@@ -10056,7 +10072,7 @@ var v_x_e_table_VXETableConfig = /*#__PURE__*/function () {
   }, {
     key: "importTypes",
     get: function get() {
-      return getExportOrImpotType(conf.export.types, 2);
+      return getExportOrImpotType(src_conf.export.types, 2);
     }
   }]);
 
@@ -10065,15 +10081,15 @@ var v_x_e_table_VXETableConfig = /*#__PURE__*/function () {
 
 var v_x_e_table_config = new v_x_e_table_VXETableConfig();
 function t(key, args) {
-  return conf.i18n(key, args);
+  return src_conf.i18n(key, args);
 }
 function _t(key, args) {
-  return key ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toValueString(conf.translate ? conf.translate(key, args) : key) : '';
+  return key ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toValueString(src_conf.translate ? src_conf.translate(key, args) : key) : '';
 }
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.5.9-beta.0",
+  version: "3.5.9-beta.11",
   reg: reg,
   use: use,
   setup: setup,
@@ -10163,12 +10179,6 @@ var es_number_constructor = __webpack_require__("a9e3");
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.map.js
 var es_map = __webpack_require__("4ec9");
 
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
-var es_array_includes = __webpack_require__("caad");
-
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
-var es_string_includes = __webpack_require__("2532");
-
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.fixed.js
 var es_string_fixed = __webpack_require__("c7cd");
 
@@ -10288,12 +10298,12 @@ var columnInfo_ColumnInfo = /*#__PURE__*/function () {
   _createClass(ColumnInfo, [{
     key: "getTitle",
     value: function getTitle() {
-      return getFuncText(this.title || (this.type === 'seq' ? conf.i18n('vxe.table.seqTitle') : ''));
+      return getFuncText(this.title || (this.type === 'seq' ? src_conf.i18n('vxe.table.seqTitle') : ''));
     }
   }, {
     key: "getKey",
     value: function getKey() {
-      return this.property || (this.type ? "type=".concat(this.type) : null);
+      return this.field || (this.type ? "type=".concat(this.type) : null);
     }
   }, {
     key: "update",
@@ -10960,7 +10970,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
       isAllOverflow = $xetable.isAllOverflow,
       allAlign = $xetable.align,
       currentColumn = $xetable.currentColumn,
-      cellClassName = $xetable.cellClassName,
+      allCellClassName = $xetable.cellClassName,
       cellStyle = $xetable.cellStyle,
       mergeList = $xetable.mergeList,
       spanMethod = $xetable.spanMethod,
@@ -10989,6 +10999,9 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   var actived = editStore.actived;
   var scrollYRHeight = sYOpts.rHeight;
   var rowHeight = rowOpts.height;
+  var renderOpts = editRender || cellRender;
+  var compConf = renderOpts ? v_x_e_table.renderer.get(renderOpts.name) : null;
+  var cellClassName = compConf ? compConf.cellClassName : '';
   var showAllTip = tooltipOpts.showAll || tooltipOpts.enabled;
   var columnIndex = $xetable.getColumnIndex(column);
 
@@ -11149,7 +11162,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
 
 
   if (!fixedHiddenColumn && editConfig && (editRender || cellRender) && (editOpts.showStatus || editOpts.showUpdateStatus)) {
-    isDirty = $xetable.isUpdateByRow(row, column.property);
+    isDirty = $xetable.isUpdateByRow(row, column.field);
   }
 
   var tdVNs = [];
@@ -11194,7 +11207,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   }
 
   return h('td', {
-    class: ['vxe-body--column', column.id, (_ref2 = {}, _defineProperty(_ref2, "col--".concat(cellAlign), cellAlign), _defineProperty(_ref2, "col--".concat(type), type), _defineProperty(_ref2, 'col--last', $columnIndex === columns.length - 1), _defineProperty(_ref2, 'col--tree-node', treeNode), _defineProperty(_ref2, 'col--edit', isEdit), _defineProperty(_ref2, 'col--ellipsis', hasEllipsis), _defineProperty(_ref2, 'fixed--hidden', fixedHiddenColumn), _defineProperty(_ref2, 'col--dirty', isDirty), _defineProperty(_ref2, 'col--actived', editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row')), _defineProperty(_ref2, 'col--valid-error', hasValidError), _defineProperty(_ref2, 'col--current', currentColumn === column), _ref2), utils.getClass(className, params), utils.getClass(cellClassName, params)],
+    class: ['vxe-body--column', column.id, (_ref2 = {}, _defineProperty(_ref2, "col--".concat(cellAlign), cellAlign), _defineProperty(_ref2, "col--".concat(type), type), _defineProperty(_ref2, 'col--last', $columnIndex === columns.length - 1), _defineProperty(_ref2, 'col--tree-node', treeNode), _defineProperty(_ref2, 'col--edit', isEdit), _defineProperty(_ref2, 'col--ellipsis', hasEllipsis), _defineProperty(_ref2, 'fixed--hidden', fixedHiddenColumn), _defineProperty(_ref2, 'col--dirty', isDirty), _defineProperty(_ref2, 'col--actived', editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row')), _defineProperty(_ref2, 'col--valid-error', hasValidError), _defineProperty(_ref2, 'col--current', currentColumn === column), _ref2), utils.getClass(cellClassName, params), utils.getClass(className, params), utils.getClass(allCellClassName, params)],
     key: columnKey || columnOpts.useKey ? column.id : $columnIndex,
     attrs: attrs,
     style: Object.assign({
@@ -11509,7 +11522,7 @@ function syncBodyScroll(_vm, fixedType, scrollTop, elem1, elem2) {
           $table: $xetable
         });
       } else {
-        emptyContent = $xetable.emptyText || conf.i18n('vxe.table.emptyText');
+        emptyContent = $xetable.emptyText || src_conf.i18n('vxe.table.emptyText');
       }
     }
 
@@ -11893,6 +11906,7 @@ var convertToRows = function convertToRows(originColumns) {
 
 
 
+
 var cellType = 'header';
 /* harmony default export */ var header = ({
   name: 'VxeTableHeader',
@@ -12226,7 +12240,8 @@ var cellType = 'header';
       document.onmouseup = function (evnt) {
         document.onmousemove = domMousemove;
         document.onmouseup = domMouseup;
-        column.resizeWidth = column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft);
+        var resizeWidth = column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft);
+        column.resizeWidth = resizeWidth;
         resizeBarElem.style.display = 'none';
         $xetable._isResize = false;
         $xetable._lastResizeTime = Date.now();
@@ -12234,7 +12249,9 @@ var cellType = 'header';
         $xetable.recalculate(true).then(function () {
           $xetable.saveCustomResizable();
           $xetable.updateCellAreas();
-          $xetable.emitEvent('resizable-change', params, evnt);
+          $xetable.emitEvent('resizable-change', _objectSpread2(_objectSpread2({}, params), {}, {
+            resizeWidth: resizeWidth
+          }), evnt);
         });
         dom.removeClass($xetable.$el, 'drag--resize');
       };
@@ -12306,7 +12323,7 @@ function eventHandle() {
 
 function eventListener() {
   clearTimeout(resizeTimeout);
-  resizeTimeout = setTimeout(eventHandle, conf.resizeInterval || defaultInterval);
+  resizeTimeout = setTimeout(eventHandle, src_conf.resizeInterval || defaultInterval);
 }
 
 var resize_ResizeObserverPolyfill = /*#__PURE__*/function () {
@@ -12494,7 +12511,7 @@ function renderHelpIcon(h, params) {
       column = params.column;
   var titlePrefix = column.titlePrefix || column.titleHelp;
   return titlePrefix ? [h('i', {
-    class: ['vxe-cell-help-icon', titlePrefix.icon || conf.icon.TABLE_HELP],
+    class: ['vxe-cell-help-icon', titlePrefix.icon || src_conf.icon.TABLE_HELP],
     on: {
       mouseenter: function mouseenter(evnt) {
         $table.triggerHeaderHelpEvent(evnt, params);
@@ -12785,7 +12802,7 @@ var Cell = {
       class: 'vxe-tree--btn-wrapper',
       on: on
     }, [h('i', {
-      class: ['vxe-tree--node-btn', isLazyLoaded ? iconLoaded || conf.icon.TABLE_TREE_LOADED : isAceived ? iconOpen || conf.icon.TABLE_TREE_OPEN : iconClose || conf.icon.TABLE_TREE_CLOSE]
+      class: ['vxe-tree--node-btn', isLazyLoaded ? iconLoaded || src_conf.icon.TABLE_TREE_LOADED : isAceived ? iconOpen || src_conf.icon.TABLE_TREE_OPEN : iconClose || src_conf.icon.TABLE_TREE_CLOSE]
     })])] : null, h('div', {
       class: 'vxe-tree-cell'
     }, cellVNodes)])];
@@ -12956,7 +12973,7 @@ var Cell = {
         'is--indeterminate': isAllCheckboxIndeterminate
       }],
       attrs: {
-        title: conf.i18n('vxe.table.allTitle')
+        title: src_conf.i18n('vxe.table.allTitle')
       },
       on: on
     }, [h('span', {
@@ -13062,7 +13079,7 @@ var Cell = {
         treeIndeterminates = $table.treeIndeterminates;
     var _$table$checkboxOpts2 = $table.checkboxOpts,
         labelField = _$table$checkboxOpts2.labelField,
-        property = _$table$checkboxOpts2.checkField,
+        checkField = _$table$checkboxOpts2.checkField,
         halfField = _$table$checkboxOpts2.halfField,
         checkMethod = _$table$checkboxOpts2.checkMethod,
         visibleMethod = _$table$checkboxOpts2.visibleMethod;
@@ -13078,7 +13095,7 @@ var Cell = {
     var on;
 
     if (!isHidden) {
-      isChecked = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, property);
+      isChecked = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, checkField);
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
@@ -13185,7 +13202,7 @@ var Cell = {
         }
       }
     }, [h('i', {
-      class: ['vxe-table--expand-btn', isLazyLoaded ? iconLoaded || conf.icon.TABLE_EXPAND_LOADED : isAceived ? iconOpen || conf.icon.TABLE_EXPAND_OPEN : iconClose || conf.icon.TABLE_EXPAND_CLOSE]
+      class: ['vxe-table--expand-btn', isLazyLoaded ? iconLoaded || src_conf.icon.TABLE_EXPAND_LOADED : isAceived ? iconOpen || src_conf.icon.TABLE_EXPAND_OPEN : iconClose || src_conf.icon.TABLE_EXPAND_CLOSE]
     })]) : null, defaultSlot || labelField ? h('span', {
       class: 'vxe-table--expand-label'
     }, defaultSlot ? $table.callSlot(defaultSlot, params, h) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, labelField)) : null];
@@ -13257,11 +13274,11 @@ var Cell = {
     return showIcon ? [h('span', {
       class: 'vxe-cell--sort'
     }, [h('i', {
-      class: ['vxe-sort--asc-btn', iconAsc || conf.icon.TABLE_SORT_ASC, {
+      class: ['vxe-sort--asc-btn', iconAsc || src_conf.icon.TABLE_SORT_ASC, {
         'sort--active': column.order === 'asc'
       }],
       attrs: {
-        title: conf.i18n('vxe.table.sortAsc')
+        title: src_conf.i18n('vxe.table.sortAsc')
       },
       on: {
         click: function click(evnt) {
@@ -13269,11 +13286,11 @@ var Cell = {
         }
       }
     }), h('i', {
-      class: ['vxe-sort--desc-btn', iconDesc || conf.icon.TABLE_SORT_DESC, {
+      class: ['vxe-sort--desc-btn', iconDesc || src_conf.icon.TABLE_SORT_DESC, {
         'sort--active': column.order === 'desc'
       }],
       attrs: {
-        title: conf.i18n('vxe.table.sortDesc')
+        title: src_conf.i18n('vxe.table.sortDesc')
       },
       on: {
         click: function click(evnt) {
@@ -13303,9 +13320,9 @@ var Cell = {
         'is--active': filterStore.visible && filterStore.column === column
       }]
     }, [h('i', {
-      class: ['vxe-filter--btn', hasFilter ? iconMatch || conf.icon.TABLE_FILTER_MATCH : iconNone || conf.icon.TABLE_FILTER_NONE],
+      class: ['vxe-filter--btn', hasFilter ? iconMatch || src_conf.icon.TABLE_FILTER_MATCH : iconNone || src_conf.icon.TABLE_FILTER_NONE],
       attrs: {
-        title: conf.i18n('vxe.table.filter')
+        title: src_conf.i18n('vxe.table.filter')
       },
       on: {
         click: function click(evnt) {
@@ -13331,7 +13348,7 @@ var Cell = {
     var isRequired = false;
 
     if (editRules) {
-      var columnRules = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(editRules, params.column.property);
+      var columnRules = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(editRules, column.field);
 
       if (columnRules) {
         isRequired = columnRules.some(function (rule) {
@@ -13343,7 +13360,7 @@ var Cell = {
     return (isEnableConf(editConfig) ? [isRequired && editOpts.showAsterisk ? h('i', {
       class: 'vxe-cell--required-icon'
     }) : null, isEnableConf(editRender) && editOpts.showIcon ? h('i', {
-      class: ['vxe-cell--edit-icon', editOpts.icon || conf.icon.TABLE_EDIT]
+      class: ['vxe-cell--edit-icon', editOpts.icon || src_conf.icon.TABLE_EDIT]
     }) : null] : []).concat(Cell.renderDefaultHeader(h, params)).concat(sortable || remoteSort ? Cell.renderSortIcon(h, params) : []).concat(filters ? Cell.renderFilterIcon(h, params) : []);
   },
   // 行格编辑模式
@@ -13481,7 +13498,7 @@ function getNextSortOrder(_vm, column) {
 }
 
 function getCustomStorageMap(key) {
-  var version = conf.version;
+  var version = src_conf.version;
   var rest = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringJSON(localStorage.getItem(key));
   return rest && rest._v === version ? rest : {
     _v: version
@@ -13615,14 +13632,14 @@ function setMerges(_vm, merges, mList, rowList) {
     var treeConfig = _vm.treeConfig,
         visibleColumn = _vm.visibleColumn;
 
-    if (treeConfig) {
-      throw new Error(utils.getLog('vxe.error.noTree', ['merge-footer-items']));
-    }
-
     if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(merges)) {
       merges = [merges];
     }
 
+    if (treeConfig && merges.length) {
+      errLog('vxe.error.noTree', ['merge-cells | merge-footer-items']);
+    }
+
     merges.forEach(function (item) {
       var row = item.row,
           col = item.col,
@@ -13679,14 +13696,14 @@ function removeMerges(_vm, merges, mList, rowList) {
     var treeConfig = _vm.treeConfig,
         visibleColumn = _vm.visibleColumn;
 
-    if (treeConfig) {
-      throw new Error(utils.getLog('vxe.error.noTree', ['merge-cells']));
-    }
-
     if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(merges)) {
       merges = [merges];
     }
 
+    if (treeConfig && merges.length) {
+      errLog('vxe.error.noTree', ['merge-cells | merge-footer-items']);
+    }
+
     merges.forEach(function (item) {
       var row = item.row,
           col = item.col;
@@ -13906,7 +13923,9 @@ var Methods = {
         scrollXStore = this.scrollXStore,
         lastScrollLeft = this.lastScrollLeft,
         lastScrollTop = this.lastScrollTop,
-        oldScrollYLoad = this.scrollYLoad;
+        oldScrollYLoad = this.scrollYLoad,
+        sXOpts = this.sXOpts,
+        sYOpts = this.sYOpts;
     var treeData = [];
     var fullData = datas ? datas.slice(0) : [];
 
@@ -13978,12 +13997,23 @@ var Methods = {
         _this4.$nextTick().then(function () {
           return _this4.recalculate();
         }).then(function () {
-          // 是否变更虚拟滚动
+          var targetScrollLeft = lastScrollLeft;
+          var targetScrollTop = lastScrollTop; // 是否在更新数据之后自动滚动重置滚动条
+
+          if (sXOpts.scrollToLeftOnChange) {
+            targetScrollLeft = 0;
+          }
+
+          if (sYOpts.scrollToTopOnChange) {
+            targetScrollTop = 0;
+          } // 是否变更虚拟滚动
+
+
           if (oldScrollYLoad === sYLoad) {
-            restoreScrollLocation(_this4, lastScrollLeft, lastScrollTop).then(resolve);
+            restoreScrollLocation(_this4, targetScrollLeft, targetScrollTop).then(resolve);
           } else {
             setTimeout(function () {
-              return restoreScrollLocation(_this4, lastScrollLeft, lastScrollTop).then(resolve);
+              return restoreScrollLocation(_this4, targetScrollLeft, targetScrollTop).then(resolve);
             });
           }
         });
@@ -14280,7 +14310,7 @@ var Methods = {
 
     var handleFunc = function handleFunc(column, index, items, path, parent) {
       var colid = column.id,
-          property = column.property,
+          field = column.field,
           fixed = column.fixed,
           type = column.type,
           treeNode = column.treeNode;
@@ -14292,10 +14322,10 @@ var Methods = {
         parent: parent
       };
 
-      if (property) {
+      if (field) {
         if (false) {}
 
-        fullColumnFieldData[property] = rest;
+        fullColumnFieldData[field] = rest;
       }
 
       if (!hasFixed && fixed) {
@@ -14510,10 +14540,10 @@ var Methods = {
         expandOpts = this.expandOpts;
     var rowkey = getRowkey(this);
     this.tableFullColumn.forEach(function (column) {
-      var property = column.property,
+      var field = column.field,
           editRender = column.editRender;
 
-      if (property && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.has(record, property)) {
+      if (field && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.has(record, field)) {
         var cellValue = null;
 
         if (editRender) {
@@ -14528,7 +14558,7 @@ var Methods = {
           }
         }
 
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(record, property, cellValue);
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(record, field, cellValue);
       }
     });
     var otherFields = [radioOpts.labelField, checkboxOpts.checkField, checkboxOpts.labelField, expandOpts.labelField];
@@ -14628,7 +14658,7 @@ var Methods = {
           var rowIndex = _this15.getRowIndex(row);
 
           if (treeConfig && rowIndex === -1) {
-            throw new Error(utils.getLog('vxe.error.noTree', ['revertData']));
+            errLog('vxe.error.noTree', ['revertData']);
           }
 
           var oRow = tableSourceData[rowIndex];
@@ -14677,7 +14707,7 @@ var Methods = {
     } else {
       rows.forEach(function (row) {
         visibleColumn.forEach(function (column) {
-          if (column.property) {
+          if (column.field) {
             methods_setCellValue(row, column, null);
           }
         });
@@ -14747,7 +14777,7 @@ var Methods = {
         }
 
         for (var index = 0, len = visibleColumn.length; index < len; index++) {
-          property = visibleColumn[index].property;
+          property = visibleColumn[index].field;
 
           if (property && !eqCellValue(oRow, row, property)) {
             return true;
@@ -14821,20 +14851,20 @@ var Methods = {
     var transform = treeOpts.transform,
         children = treeOpts.children,
         mapChildren = treeOpts.mapChildren;
-    var property = checkboxOpts.checkField;
+    var checkField = checkboxOpts.checkField;
     var currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
     var rowList = [];
 
-    if (property) {
+    if (checkField) {
       if (treeConfig) {
         rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.filterTree(currTableData, function (row) {
-          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, property);
+          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, checkField);
         }, {
           children: transform ? mapChildren : children
         });
       } else {
         rowList = currTableData.filter(function (row) {
-          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, property);
+          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, checkField);
         });
       }
     } else {
@@ -14912,7 +14942,7 @@ var Methods = {
     var filterColumns = [];
     var orderColumns = [];
     tableFullColumn.forEach(function (column) {
-      var property = column.property,
+      var field = column.field,
           sortable = column.sortable,
           order = column.order,
           filters = column.filters;
@@ -14939,8 +14969,8 @@ var Methods = {
       if (!allRemoteSort && sortable && order) {
         orderColumns.push({
           column: column,
-          field: column.property,
-          property: property,
+          field: field,
+          property: field,
           order: order,
           sortTime: column.sortTime
         });
@@ -14960,7 +14990,8 @@ var Methods = {
 
           if (valueList.length && !allRemoteFilter) {
             var filterMethod = column.filterMethod,
-                filterRender = column.filterRender;
+                filterRender = column.filterRender,
+                field = column.field;
             var compConf = filterRender ? v_x_e_table.renderer.get(filterRender.name) : null;
             var compFilterMethod = compConf && compConf.renderFilter ? compConf.filterMethod : null;
             var defaultFilterMethod = compConf ? compConf.defaultFilterMethod : null;
@@ -15009,7 +15040,7 @@ var Methods = {
               });
             }
 
-            return valueList.indexOf(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, column.property)) > -1;
+            return valueList.indexOf(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, field)) > -1;
           }
 
           return true;
@@ -15067,7 +15098,8 @@ var Methods = {
           var _sortRests = allSortMethod({
             data: tableData,
             column: firstOrderColumn.column,
-            property: firstOrderColumn.property,
+            property: firstOrderColumn.field,
+            field: firstOrderColumn.field,
             order: firstOrderColumn.order,
             sortList: orderColumns,
             $table: this
@@ -15208,8 +15240,9 @@ var Methods = {
    * 根据行的唯一主键获取行
    * @param {String/Number} rowid 行主键
    */
-  getRowById: function getRowById(rowid) {
+  getRowById: function getRowById(cellValue) {
     var fullDataRowIdData = this.fullDataRowIdData;
+    var rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(cellValue) ? '' : encodeURIComponent(cellValue);
     return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].row : null;
   },
 
@@ -16660,7 +16693,9 @@ var Methods = {
           // 如果是按下非功能键之外允许直接编辑
 
           if (selected.column && selected.row && isEnableConf(selected.column.editRender)) {
-            if (!editOpts.activeMethod || editOpts.activeMethod(_objectSpread2(_objectSpread2({}, selected.args), {}, {
+            var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
+
+            if (!beforeEditMethod || beforeEditMethod(_objectSpread2(_objectSpread2({}, selected.args), {}, {
               $table: _this28
             }))) {
               if (editMethod) {
@@ -17029,10 +17064,10 @@ var Methods = {
     return this.$nextTick();
   },
   isCheckedByCheckboxRow: function isCheckedByCheckboxRow(row) {
-    var property = this.checkboxOpts.checkField;
+    var checkField = this.checkboxOpts.checkField;
 
-    if (property) {
-      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, property);
+    if (checkField) {
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, checkField);
     }
 
     return this.selection.indexOf(row) > -1;
@@ -17055,25 +17090,25 @@ var Methods = {
         treeOpts = this.treeOpts,
         treeIndeterminates = this.treeIndeterminates,
         checkboxOpts = this.checkboxOpts;
-    var property = checkboxOpts.checkField,
+    var checkField = checkboxOpts.checkField,
         checkStrictly = checkboxOpts.checkStrictly,
         checkMethod = checkboxOpts.checkMethod;
 
-    if (property) {
+    if (checkField) {
       if (treeConfig && !checkStrictly) {
         if (value === -1) {
           if (treeIndeterminates.indexOf(row) === -1) {
             treeIndeterminates.push(row);
           }
 
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(row, property, false);
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(row, checkField, false);
         } else {
           // 更新子节点状态
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree([row], function (item) {
             if (row === item || !checkMethod || checkMethod({
               row: item
             })) {
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(item, property, value);
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(item, checkField, value);
               external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(treeIndeterminates, function (half) {
                 return half === item;
               });
@@ -17103,7 +17138,7 @@ var Methods = {
             parentStatus = -1;
           } else {
             var selectItems = matchObj.items.filter(function (item) {
-              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(item, property);
+              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(item, checkField);
             });
             parentStatus = selectItems.filter(function (item) {
               return vItems.indexOf(item) > -1;
@@ -17118,7 +17153,7 @@ var Methods = {
         if (!checkMethod || checkMethod({
           row: row
         })) {
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(row, property, value);
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(row, checkField, value);
           this.handleCheckboxReserveRow(row, value);
         }
       }
@@ -17213,9 +17248,9 @@ var Methods = {
   handleToggleCheckRowEvent: function handleToggleCheckRowEvent(evnt, params) {
     var selection = this.selection,
         checkboxOpts = this.checkboxOpts;
-    var property = checkboxOpts.checkField;
+    var checkField = checkboxOpts.checkField;
     var row = params.row;
-    var value = property ? !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, property) : selection.indexOf(row) === -1;
+    var value = checkField ? !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, checkField) : selection.indexOf(row) === -1;
 
     if (evnt) {
       this.triggerCheckRowEvent(evnt, params, value);
@@ -17262,7 +17297,7 @@ var Methods = {
         selection = this.selection,
         checkboxReserveRowMap = this.checkboxReserveRowMap,
         checkboxOpts = this.checkboxOpts;
-    var property = checkboxOpts.checkField,
+    var checkField = checkboxOpts.checkField,
         reserve = checkboxOpts.reserve,
         checkStrictly = checkboxOpts.checkStrictly,
         checkMethod = checkboxOpts.checkMethod;
@@ -17278,7 +17313,7 @@ var Methods = {
        * 绑定属性方式（高性能，有污染）
        * 必须在行数据存在对应的属性，否则将不响应
        */
-      if (property) {
+      if (checkField) {
         var checkValFn = function checkValFn(row) {
           if (!checkMethod || checkMethod({
             row: row
@@ -17287,7 +17322,7 @@ var Methods = {
               selectRows.push(row);
             }
 
-            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(row, property, value);
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(row, checkField, value);
           }
         }; // 如果存在选中方法
         // 如果方法成立，则更新值，否则忽略该数据
@@ -17376,7 +17411,7 @@ var Methods = {
         }
       }
 
-      this.selection = property ? [] : beforeSelection.concat(selectRows);
+      this.selection = checkField ? [] : beforeSelection.concat(selectRows);
     }
 
     this.treeIndeterminates = [];
@@ -17682,17 +17717,17 @@ var Methods = {
         treeConfig = this.treeConfig,
         treeOpts = this.treeOpts,
         checkboxOpts = this.checkboxOpts;
-    var property = checkboxOpts.checkField,
+    var checkField = checkboxOpts.checkField,
         reserve = checkboxOpts.reserve;
 
-    if (property) {
+    if (checkField) {
       if (treeConfig) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(tableFullData, function (item) {
-          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(item, property, false);
+          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(item, checkField, false);
         }, treeOpts);
       } else {
         tableFullData.forEach(function (item) {
-          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(item, property, false);
+          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(item, checkField, false);
         });
       }
     }
@@ -18171,21 +18206,24 @@ var Methods = {
    */
   triggerSortEvent: function triggerSortEvent(evnt, column, order) {
     var sortOpts = this.sortOpts;
-    var property = column.property;
+    var field = column.field,
+        sortable = column.sortable,
+        remoteSort = column.remoteSort;
 
-    if (column.sortable || column.remoteSort) {
+    if (sortable || remoteSort) {
       if (!order || column.order === order) {
         this.clearSort(sortOpts.multiple ? column : null);
       } else {
         this.sort({
-          field: property,
+          field: field,
           order: order
         });
       }
 
       var params = {
         column: column,
-        property: property,
+        field: field,
+        property: field,
         order: column.order,
         sortList: this.getSortColumns()
       };
@@ -18302,14 +18340,14 @@ var Methods = {
         chronological = _this$sortOpts.chronological;
     var sortList = [];
     this.tableFullColumn.forEach(function (column) {
-      var property = column.property,
+      var field = column.field,
           order = column.order;
 
       if ((column.sortable || column.remoteSort) && order) {
         sortList.push({
           column: column,
-          field: column.property,
-          property: property,
+          field: field,
+          property: field,
           order: order,
           sortTime: column.sortTime
         });
@@ -18341,7 +18379,8 @@ var Methods = {
     if (visible) {
       this.emitEvent('filter-visible', {
         column: column,
-        property: column.property,
+        field: column.field,
+        property: column.field,
         filterList: this.getCheckedFilters(),
         visible: false
       }, null);
@@ -19742,7 +19781,7 @@ var Methods = {
    * Publish methods
    *************************/
   getSetupOptions: function getSetupOptions() {
-    return conf;
+    return src_conf;
   }
 }; // Module methods
 
@@ -19755,6 +19794,42 @@ funcs.forEach(function (name) {
   };
 });
 /* harmony default export */ var methods = (Methods);
+// CONCATENATED MODULE: ./packages/loading/src/loading.js
+
+/* harmony default export */ var src_loading = ({
+  name: 'VxeLoading',
+  props: {
+    loading: Boolean
+  },
+  render: function render(h) {
+    var icon = src_conf.icon.LOADING;
+    var loadingText = src_conf.loadingText;
+    var text = loadingText === null ? loadingText : src_conf.i18n('vxe.loading.text');
+    return h('div', {
+      class: ['vxe-loading', {
+        'is--visible': this.loading
+      }]
+    }, [h('div', {
+      class: 'vxe-loading--chunk'
+    }, [icon ? h('i', {
+      class: icon
+    }) : h('div', {
+      class: 'vxe-loading--spinner'
+    }), text ? h('div', {
+      class: 'vxe-loading--text'
+    }, "".concat(text)) : null])]);
+  }
+});
+// CONCATENATED MODULE: ./packages/loading/index.js
+
+
+
+var Loading = Object.assign(src_loading, {
+  install: function install(Vue) {
+    Vue.component(src_loading.name, src_loading);
+  }
+});
+/* harmony default export */ var packages_loading = (src_loading);
 // CONCATENATED MODULE: ./packages/table/src/table.js
 
 
@@ -19779,6 +19854,7 @@ funcs.forEach(function (name) {
 
 
 
+
 
 
 /**
@@ -19852,7 +19928,7 @@ function renderEmptyContenet(h, _vm) {
     if (renderEmpty) {
       emptyContent = renderEmpty.call(_vm, h, emptyOpts, params);
     } else {
-      emptyContent = getFuncText(_vm.emptyText) || conf.i18n('vxe.table.emptyText');
+      emptyContent = getFuncText(_vm.emptyText) || src_conf.i18n('vxe.table.emptyText');
     }
   }
 
@@ -19883,42 +19959,42 @@ function handleUupdateResize(_vm) {
     resizable: {
       type: Boolean,
       default: function _default() {
-        return conf.table.resizable;
+        return src_conf.table.resizable;
       }
     },
     // 是否带有斑马纹
     stripe: {
       type: Boolean,
       default: function _default() {
-        return conf.table.stripe;
+        return src_conf.table.stripe;
       }
     },
     // 是否带有边框
     border: {
       type: [Boolean, String],
       default: function _default() {
-        return conf.table.border;
+        return src_conf.table.border;
       }
     },
     // 是否圆角边框
     round: {
       type: Boolean,
       default: function _default() {
-        return conf.table.round;
+        return src_conf.table.round;
       }
     },
     // 表格的尺寸
     size: {
       type: String,
       default: function _default() {
-        return conf.table.size || conf.size;
+        return src_conf.table.size || src_conf.size;
       }
     },
     // 列的宽度是否自撑开（可能会被废弃的参数，不要使用）
     fit: {
       type: Boolean,
       default: function _default() {
-        return conf.table.fit;
+        return src_conf.table.fit;
       }
     },
     // 表格是否加载中
@@ -19927,56 +20003,56 @@ function handleUupdateResize(_vm) {
     align: {
       type: String,
       default: function _default() {
-        return conf.table.align;
+        return src_conf.table.align;
       }
     },
     // 所有的表头列的对齐方式
     headerAlign: {
       type: String,
       default: function _default() {
-        return conf.table.headerAlign;
+        return src_conf.table.headerAlign;
       }
     },
     // 所有的表尾列的对齐方式
     footerAlign: {
       type: String,
       default: function _default() {
-        return conf.table.footerAlign;
+        return src_conf.table.footerAlign;
       }
     },
     // 是否显示表头
     showHeader: {
       type: Boolean,
       default: function _default() {
-        return conf.table.showHeader;
+        return src_conf.table.showHeader;
       }
     },
     // 已废弃，被 row-config.isCurrent 替换
     highlightCurrentRow: {
       type: Boolean,
       default: function _default() {
-        return conf.table.highlightCurrentRow;
+        return src_conf.table.highlightCurrentRow;
       }
     },
     // 已废弃，被 row-config.isHover 替换
     highlightHoverRow: {
       type: Boolean,
       default: function _default() {
-        return conf.table.highlightHoverRow;
+        return src_conf.table.highlightHoverRow;
       }
     },
     // 已废弃，被 column-config.isCurrent 替换
     highlightCurrentColumn: {
       type: Boolean,
       default: function _default() {
-        return conf.table.highlightCurrentColumn;
+        return src_conf.table.highlightCurrentColumn;
       }
     },
     // 已废弃，被 column-config.isHover 替换
     highlightHoverColumn: {
       type: Boolean,
       default: function _default() {
-        return conf.table.highlightHoverColumn;
+        return src_conf.table.highlightHoverColumn;
       }
     },
     // 已废弃，直接删除
@@ -20021,21 +20097,21 @@ function handleUupdateResize(_vm) {
     showOverflow: {
       type: [Boolean, String],
       default: function _default() {
-        return conf.table.showOverflow;
+        return src_conf.table.showOverflow;
       }
     },
     // 设置表头所有内容过长时显示为省略号
     showHeaderOverflow: {
       type: [Boolean, String],
       default: function _default() {
-        return conf.table.showHeaderOverflow;
+        return src_conf.table.showHeaderOverflow;
       }
     },
     // 设置表尾所有内容过长时显示为省略号
     showFooterOverflow: {
       type: [Boolean, String],
       default: function _default() {
-        return conf.table.showFooterOverflow;
+        return src_conf.table.showFooterOverflow;
       }
     },
 
@@ -20048,27 +20124,27 @@ function handleUupdateResize(_vm) {
     rowId: {
       type: String,
       default: function _default() {
-        return conf.table.rowId;
+        return src_conf.table.rowId;
       }
     },
     zIndex: Number,
     emptyText: {
       type: String,
       default: function _default() {
-        return conf.table.emptyText;
+        return src_conf.table.emptyText;
       }
     },
     keepSource: {
       type: Boolean,
       default: function _default() {
-        return conf.table.keepSource;
+        return src_conf.table.keepSource;
       }
     },
     // 是否自动监听父容器变化去更新响应式表格宽高
     autoResize: {
       type: Boolean,
       default: function _default() {
-        return conf.table.autoResize;
+        return src_conf.table.autoResize;
       }
     },
     // 是否自动根据状态属性去更新响应式表格宽高
@@ -20133,14 +20209,14 @@ function handleUupdateResize(_vm) {
     animat: {
       type: Boolean,
       default: function _default() {
-        return conf.table.animat;
+        return src_conf.table.animat;
       }
     },
     // （可能会被废弃的参数，不要使用）
     delayHover: {
       type: Number,
       default: function _default() {
-        return conf.table.delayHover;
+        return src_conf.table.delayHover;
       }
     },
     // 额外的参数
@@ -20353,13 +20429,13 @@ function handleUupdateResize(_vm) {
     validOpts: function validOpts() {
       return Object.assign({
         message: 'default'
-      }, conf.table.validConfig, this.validConfig);
+      }, src_conf.table.validConfig, this.validConfig);
     },
     sXOpts: function sXOpts() {
-      return Object.assign({}, conf.table.scrollX, this.scrollX);
+      return Object.assign({}, src_conf.table.scrollX, this.scrollX);
     },
     sYOpts: function sYOpts() {
-      return Object.assign({}, conf.table.scrollY, this.scrollY);
+      return Object.assign({}, src_conf.table.scrollY, this.scrollY);
     },
     rowHeightMaps: function rowHeightMaps() {
       return {
@@ -20370,27 +20446,27 @@ function handleUupdateResize(_vm) {
       };
     },
     columnOpts: function columnOpts() {
-      return Object.assign({}, conf.table.columnConfig, this.columnConfig);
+      return Object.assign({}, src_conf.table.columnConfig, this.columnConfig);
     },
     rowOpts: function rowOpts() {
-      return Object.assign({}, conf.table.rowConfig, this.rowConfig);
+      return Object.assign({}, src_conf.table.rowConfig, this.rowConfig);
     },
     resizableOpts: function resizableOpts() {
-      return Object.assign({}, conf.table.resizableConfig, this.resizableConfig);
+      return Object.assign({}, src_conf.table.resizableConfig, this.resizableConfig);
     },
     seqOpts: function seqOpts() {
       return Object.assign({
         startIndex: 0
-      }, conf.table.seqConfig, this.seqConfig);
+      }, src_conf.table.seqConfig, this.seqConfig);
     },
     radioOpts: function radioOpts() {
-      return Object.assign({}, conf.table.radioConfig, this.radioConfig);
+      return Object.assign({}, src_conf.table.radioConfig, this.radioConfig);
     },
     checkboxOpts: function checkboxOpts() {
-      return Object.assign({}, conf.table.checkboxConfig, this.checkboxConfig);
+      return Object.assign({}, src_conf.table.checkboxConfig, this.checkboxConfig);
     },
     tooltipOpts: function tooltipOpts() {
-      return Object.assign({}, conf.tooltip, conf.table.tooltipConfig, this.tooltipConfig);
+      return Object.assign({}, src_conf.tooltip, src_conf.table.tooltipConfig, this.tooltipConfig);
     },
     tipConfig: function tipConfig() {
       return _objectSpread2(_objectSpread2({}, this.tooltipOpts), this.tooltipStore.currOpts);
@@ -20401,30 +20477,30 @@ function handleUupdateResize(_vm) {
       }, this.tooltipOpts);
     },
     editOpts: function editOpts() {
-      return Object.assign({}, conf.table.editConfig, this.editConfig);
+      return Object.assign({}, src_conf.table.editConfig, this.editConfig);
     },
     sortOpts: function sortOpts() {
       return Object.assign({
         orders: ['asc', 'desc', null]
-      }, conf.table.sortConfig, this.sortConfig);
+      }, src_conf.table.sortConfig, this.sortConfig);
     },
     filterOpts: function filterOpts() {
-      return Object.assign({}, conf.table.filterConfig, this.filterConfig);
+      return Object.assign({}, src_conf.table.filterConfig, this.filterConfig);
     },
     mouseOpts: function mouseOpts() {
-      return Object.assign({}, conf.table.mouseConfig, this.mouseConfig);
+      return Object.assign({}, src_conf.table.mouseConfig, this.mouseConfig);
     },
     areaOpts: function areaOpts() {
-      return Object.assign({}, conf.table.areaConfig, this.areaConfig);
+      return Object.assign({}, src_conf.table.areaConfig, this.areaConfig);
     },
     keyboardOpts: function keyboardOpts() {
-      return Object.assign({}, conf.table.keyboardConfig, this.keyboardConfig);
+      return Object.assign({}, src_conf.table.keyboardConfig, this.keyboardConfig);
     },
     clipOpts: function clipOpts() {
-      return Object.assign({}, conf.table.clipConfig, this.clipConfig);
+      return Object.assign({}, src_conf.table.clipConfig, this.clipConfig);
     },
     fnrOpts: function fnrOpts() {
-      return Object.assign({}, conf.table.fnrConfig, this.fnrConfig);
+      return Object.assign({}, src_conf.table.fnrConfig, this.fnrConfig);
     },
     hasTip: function hasTip() {
       return v_x_e_table._tooltip;
@@ -20445,7 +20521,7 @@ function handleUupdateResize(_vm) {
       return !!((this.contextMenu || this.menuConfig) && isEnableConf(this.ctxMenuOpts) && (this.headerCtxMenu.length || this.bodyCtxMenu.length || this.footerCtxMenu.length));
     },
     ctxMenuOpts: function ctxMenuOpts() {
-      return Object.assign({}, conf.table.menuConfig, this.contextMenu, this.menuConfig);
+      return Object.assign({}, src_conf.table.menuConfig, this.contextMenu, this.menuConfig);
     },
     ctxMenuList: function ctxMenuList() {
       var rest = [];
@@ -20457,28 +20533,28 @@ function handleUupdateResize(_vm) {
       return rest;
     },
     exportOpts: function exportOpts() {
-      return Object.assign({}, conf.table.exportConfig, this.exportConfig);
+      return Object.assign({}, src_conf.table.exportConfig, this.exportConfig);
     },
     importOpts: function importOpts() {
-      return Object.assign({}, conf.table.importConfig, this.importConfig);
+      return Object.assign({}, src_conf.table.importConfig, this.importConfig);
     },
     printOpts: function printOpts() {
-      return Object.assign({}, conf.table.printConfig, this.printConfig);
+      return Object.assign({}, src_conf.table.printConfig, this.printConfig);
     },
     expandOpts: function expandOpts() {
-      return Object.assign({}, conf.table.expandConfig, this.expandConfig);
+      return Object.assign({}, src_conf.table.expandConfig, this.expandConfig);
     },
     treeOpts: function treeOpts() {
-      return Object.assign({}, conf.table.treeConfig, this.treeConfig);
+      return Object.assign({}, src_conf.table.treeConfig, this.treeConfig);
     },
     emptyOpts: function emptyOpts() {
-      return Object.assign({}, conf.table.emptyRender, this.emptyRender);
+      return Object.assign({}, src_conf.table.emptyRender, this.emptyRender);
     },
     cellOffsetWidth: function cellOffsetWidth() {
       return this.border ? Math.max(2, Math.ceil(this.scrollbarWidth / this.tableColumn.length)) : 1;
     },
     customOpts: function customOpts() {
-      return Object.assign({}, conf.table.customConfig, this.customConfig);
+      return Object.assign({}, src_conf.table.customConfig, this.customConfig);
     },
     tableBorder: function tableBorder() {
       var border = this.border;
@@ -20923,13 +20999,12 @@ function handleUupdateResize(_vm) {
     /**
      * 加载中
      */
-    h('div', {
-      class: ['vxe-table--loading vxe-loading', {
-        'is--visible': loading
-      }]
-    }, [h('div', {
-      class: 'vxe-loading--spinner'
-    })]),
+    h(packages_loading, {
+      class: 'vxe-table--loading',
+      props: {
+        loading: loading
+      }
+    }),
     /**
      * 筛选
      */
@@ -21054,11 +21129,16 @@ var Table = Object.assign(table, {
   render: function render(h) {
     var $xetable = this.$parent,
         filterStore = this.filterStore;
-    var column = filterStore.column;
+    var args = filterStore.args,
+        column = filterStore.column;
     var filterRender = column ? column.filterRender : null;
     var compConf = filterRender ? v_x_e_table.renderer.get(filterRender.name) : null;
+    var filterClassName = compConf ? compConf.filterClassName : '';
     return h('div', {
-      class: ['vxe-table--filter-wrapper', 'filter--prevent-default', compConf && compConf.className ? compConf.className : '', {
+      class: ['vxe-table--filter-wrapper', 'filter--prevent-default', compConf && compConf.className ? compConf.className : '', utils.getClass(filterClassName, Object.assign({
+        $panel: this,
+        $table: $xetable
+      }, args)), {
         'is--animat': $xetable.animat,
         'is--multiple': filterStore.multiple,
         'is--active': filterStore.visible
@@ -21104,7 +21184,7 @@ var Table = Object.assign(table, {
           'is--indeterminate': multiple && filterStore.isIndeterminate
         }],
         attrs: {
-          title: conf.i18n(multiple ? 'vxe.table.allTitle' : 'vxe.table.allFilter')
+          title: src_conf.i18n(multiple ? 'vxe.table.allTitle' : 'vxe.table.allFilter')
         },
         on: {
           click: function click(evnt) {
@@ -21119,7 +21199,7 @@ var Table = Object.assign(table, {
         class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
       })] : []).concat([h('span', {
         class: 'vxe-checkbox--label'
-      }, conf.i18n('vxe.table.allFilter'))]))]), h('ul', {
+      }, src_conf.i18n('vxe.table.allFilter'))]))]), h('ul', {
         class: 'vxe-table--filter-body',
         style: maxHeight ? {
           maxHeight: "".concat(maxHeight, "px")
@@ -21168,11 +21248,11 @@ var Table = Object.assign(table, {
         on: {
           click: this.confirmFilter
         }
-      }, conf.i18n('vxe.table.confirmFilter')), h('button', {
+      }, src_conf.i18n('vxe.table.confirmFilter')), h('button', {
         on: {
           click: this.resetFilter
         }
-      }, conf.i18n('vxe.table.resetFilter'))])] : [];
+      }, src_conf.i18n('vxe.table.resetFilter'))])] : [];
     },
     // 全部筛选事件
     filterCheckAllEvent: function filterCheckAllEvent(evnt, value) {
@@ -21416,7 +21496,8 @@ var Table = Object.assign(table, {
 
       this.emitEvent('filter-visible', {
         column: column,
-        property: column.property,
+        field: column.field,
+        property: column.field,
         filterList: this.getCheckedFilters(),
         visible: filterStore.visible
       }, evnt);
@@ -21425,7 +21506,7 @@ var Table = Object.assign(table, {
       var tableFullColumn = this.tableFullColumn;
       var filterList = [];
       tableFullColumn.filter(function (column) {
-        var property = column.property,
+        var field = column.field,
             filters = column.filters;
         var valueList = [];
         var dataList = [];
@@ -21441,7 +21522,8 @@ var Table = Object.assign(table, {
           if (valueList.length) {
             filterList.push({
               column: column,
-              property: property,
+              field: field,
+              property: field,
               values: valueList,
               datas: dataList
             });
@@ -21464,7 +21546,7 @@ var Table = Object.assign(table, {
           oldScrollXLoad = this.scrollXLoad,
           oldScrollYLoad = this.scrollYLoad;
       var column = filterStore.column;
-      var property = column.property;
+      var field = column.field;
       var values = [];
       var datas = [];
       column.filters.forEach(function (item) {
@@ -21482,7 +21564,8 @@ var Table = Object.assign(table, {
 
       this.emitEvent('filter-change', {
         column: column,
-        property: property,
+        field: field,
+        property: field,
         values: values,
         datas: datas,
         filters: filterList,
@@ -22292,7 +22375,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
             }
           } else {
             if (treeConfig) {
-              throw new Error(utils.getLog('vxe.error.noTree', ['insert']));
+              throw new Error(getLog('vxe.error.noTree', ['insert']));
             }
 
             var afIndex = -1; // 如果是可视索引
@@ -22377,7 +22460,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       var actived = editStore.actived,
           removeList = editStore.removeList,
           insertList = editStore.insertList;
-      var property = checkboxOpts.checkField;
+      var checkField = checkboxOpts.checkField;
       var rest = [];
 
       if (!rows) {
@@ -22393,7 +22476,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         }
       }); // 如果绑定了多选属性，则更新状态
 
-      if (!property) {
+      if (!checkField) {
         rows.forEach(function (row) {
           var sIndex = selection.indexOf(row);
 
@@ -22641,20 +22724,20 @@ function insertTreeRow(_vm, newRecords, isAppend) {
           tableColumn = this.tableColumn,
           editConfig = this.editConfig,
           mouseConfig = this.mouseConfig;
-      var mode = editOpts.mode,
-          activeMethod = editOpts.activeMethod;
+      var mode = editOpts.mode;
       var actived = editStore.actived;
       var row = params.row,
           column = params.column;
       var editRender = column.editRender;
       var cell = params.cell = params.cell || this.getCell(row, column);
+      var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
 
       if (isEnableConf(editConfig) && isEnableConf(editRender) && cell) {
         if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
           // 判断是否禁用编辑
           var type = 'edit-disabled';
 
-          if (!activeMethod || activeMethod(_objectSpread2(_objectSpread2({}, params), {}, {
+          if (!beforeEditMethod || beforeEditMethod(_objectSpread2(_objectSpread2({}, params), {}, {
             $table: this
           }))) {
             if (mouseConfig) {
@@ -22853,20 +22936,24 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         var compRender = v_x_e_table.renderer.get(editRender.name);
         var autofocus = editRender.autofocus,
             autoselect = editRender.autoselect;
-        var inputElem; // 如果指定了聚焦 class
+        var inputElem;
+
+        if (!autofocus && compRender) {
+          autofocus = compRender.autofocus;
+        } // 如果指定了聚焦 class
 
-        if (autofocus) {
-          inputElem = cell.querySelector(autofocus);
-        } // 渲染器的聚焦处理
 
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(autofocus)) {
+          inputElem = autofocus.call(this, params);
+        } else if (autofocus) {
+          inputElem = cell.querySelector(autofocus);
 
-        if (!inputElem && compRender && compRender.autofocus) {
-          inputElem = cell.querySelector(compRender.autofocus);
+          if (inputElem) {
+            inputElem.focus();
+          }
         }
 
         if (inputElem) {
-          inputElem.focus();
-
           if (autoselect) {
             inputElem.select();
           } else {
@@ -23157,6 +23244,7 @@ function _slicedToArray(arr, i) {
 
 
 
+
 var allActivedModals = [];
 var msgQueue = [];
 /* harmony default export */ var modal = ({
@@ -23179,7 +23267,7 @@ var msgQueue = [];
     top: {
       type: [Number, String],
       default: function _default() {
-        return conf.modal.top;
+        return src_conf.modal.top;
       }
     },
     position: [String, Object],
@@ -23187,7 +23275,7 @@ var msgQueue = [];
     duration: {
       type: [Number, String],
       default: function _default() {
-        return conf.modal.duration;
+        return src_conf.modal.duration;
       }
     },
     // 请使用 content
@@ -23196,56 +23284,56 @@ var msgQueue = [];
     cancelButtonText: {
       type: String,
       default: function _default() {
-        return conf.modal.cancelButtonText;
+        return src_conf.modal.cancelButtonText;
       }
     },
     confirmButtonText: {
       type: String,
       default: function _default() {
-        return conf.modal.confirmButtonText;
+        return src_conf.modal.confirmButtonText;
       }
     },
     lockView: {
       type: Boolean,
       default: function _default() {
-        return conf.modal.lockView;
+        return src_conf.modal.lockView;
       }
     },
     lockScroll: Boolean,
     mask: {
       type: Boolean,
       default: function _default() {
-        return conf.modal.mask;
+        return src_conf.modal.mask;
       }
     },
     maskClosable: {
       type: Boolean,
       default: function _default() {
-        return conf.modal.maskClosable;
+        return src_conf.modal.maskClosable;
       }
     },
     escClosable: {
       type: Boolean,
       default: function _default() {
-        return conf.modal.escClosable;
+        return src_conf.modal.escClosable;
       }
     },
     resize: {
       type: Boolean,
       default: function _default() {
-        return conf.modal.resize;
+        return src_conf.modal.resize;
       }
     },
     showHeader: {
       type: Boolean,
       default: function _default() {
-        return conf.modal.showHeader;
+        return src_conf.modal.showHeader;
       }
     },
     showFooter: {
       type: Boolean,
       default: function _default() {
-        return conf.modal.showFooter;
+        return src_conf.modal.showFooter;
       }
     },
     showZoom: {
@@ -23255,13 +23343,13 @@ var msgQueue = [];
     showClose: {
       type: Boolean,
       default: function _default() {
-        return conf.modal.showClose;
+        return src_conf.modal.showClose;
       }
     },
     dblclickZoom: {
       type: Boolean,
       default: function _default() {
-        return conf.modal.dblclickZoom;
+        return src_conf.modal.dblclickZoom;
       }
     },
     width: [Number, String],
@@ -23269,81 +23357,81 @@ var msgQueue = [];
     minWidth: {
       type: [Number, String],
       default: function _default() {
-        return conf.modal.minWidth;
+        return src_conf.modal.minWidth;
       }
     },
     minHeight: {
       type: [Number, String],
       default: function _default() {
-        return conf.modal.minHeight;
+        return src_conf.modal.minHeight;
       }
     },
     zIndex: Number,
     marginSize: {
       type: [Number, String],
       default: function _default() {
-        return conf.modal.marginSize;
+        return src_conf.modal.marginSize;
       }
     },
     fullscreen: Boolean,
     draggable: {
       type: Boolean,
       default: function _default() {
-        return conf.modal.draggable;
+        return src_conf.modal.draggable;
       }
     },
     remember: {
       type: Boolean,
       default: function _default() {
-        return conf.modal.remember;
+        return src_conf.modal.remember;
       }
     },
     destroyOnClose: {
       type: Boolean,
       default: function _default() {
-        return conf.modal.destroyOnClose;
+        return src_conf.modal.destroyOnClose;
       }
     },
     showTitleOverflow: {
       type: Boolean,
       default: function _default() {
-        return conf.modal.showTitleOverflow;
+        return src_conf.modal.showTitleOverflow;
       }
     },
     transfer: {
       type: Boolean,
       default: function _default() {
-        return conf.modal.transfer;
+        return src_conf.modal.transfer;
       }
     },
     storage: {
       type: Boolean,
       default: function _default() {
-        return conf.modal.storage;
+        return src_conf.modal.storage;
       }
     },
     storageKey: {
       type: String,
       default: function _default() {
-        return conf.modal.storageKey;
+        return src_conf.modal.storageKey;
       }
     },
     animat: {
       type: Boolean,
       default: function _default() {
-        return conf.modal.animat;
+        return src_conf.modal.animat;
       }
     },
     size: {
       type: String,
       default: function _default() {
-        return conf.modal.size || conf.size;
+        return src_conf.modal.size || src_conf.size;
       }
     },
     beforeHideMethod: {
       type: Function,
       default: function _default() {
-        return conf.modal.beforeHideMethod;
+        return src_conf.modal.beforeHideMethod;
       }
     },
     slots: Object,
@@ -23357,7 +23445,7 @@ var msgQueue = [];
       modalTop: 0,
       modalZindex: 0,
       zoomLocat: null,
-      firstOpen: false
+      firstOpen: true
     };
   },
   computed: {
@@ -23496,18 +23584,18 @@ var msgQueue = [];
       $modal: this
     }, h) : h('span', {
       class: 'vxe-modal--title'
-    }, title ? getFuncText(title) : conf.i18n('vxe.alert.title')), showZoom ? h('i', {
-      class: ['vxe-modal--zoom-btn', 'trigger--btn', zoomLocat ? conf.icon.MODAL_ZOOM_OUT : conf.icon.MODAL_ZOOM_IN],
+    }, title ? getFuncText(title) : src_conf.i18n('vxe.alert.title')), showZoom ? h('i', {
+      class: ['vxe-modal--zoom-btn', 'trigger--btn', zoomLocat ? src_conf.icon.MODAL_ZOOM_OUT : src_conf.icon.MODAL_ZOOM_IN],
       attrs: {
-        title: conf.i18n("vxe.modal.zoom".concat(zoomLocat ? 'Out' : 'In'))
+        title: src_conf.i18n("vxe.modal.zoom".concat(zoomLocat ? 'Out' : 'In'))
       },
       on: {
         click: this.toggleZoomEvent
       }
     }) : _e(), showClose ? h('i', {
-      class: ['vxe-modal--close-btn', 'trigger--btn', conf.icon.MODAL_CLOSE],
+      class: ['vxe-modal--close-btn', 'trigger--btn', src_conf.icon.MODAL_CLOSE],
       attrs: {
-        title: conf.i18n('vxe.modal.close')
+        title: src_conf.i18n('vxe.modal.close')
       },
       on: {
         click: this.closeEvent
@@ -23517,18 +23605,21 @@ var msgQueue = [];
     }, [status ? h('div', {
       class: 'vxe-modal--status-wrapper'
     }, [h('i', {
-      class: ['vxe-modal--status-icon', iconStatus || conf.icon["MODAL_".concat(status).toLocaleUpperCase()]]
+      class: ['vxe-modal--status-icon', iconStatus || src_conf.icon["MODAL_".concat(status).toLocaleUpperCase()]]
     })]) : null, h('div', {
       class: 'vxe-modal--content'
     }, defaultSlot ? !inited || destroyOnClose && !visible ? [] : defaultSlot.call(this, {
       $modal: this
-    }, h) : getFuncText(content)), !isMsg ? h('div', {
-      class: ['vxe-loading', {
-        'is--visible': loading
-      }]
-    }, [h('div', {
-      class: 'vxe-loading--spinner'
-    })]) : null]), showFooter ? h('div', {
+    }, h) : getFuncText(content)),
+    /**
+     * 加载中
+     */
+    !isMsg ? h(packages_loading, {
+      class: 'vxe-modal--loading',
+      props: {
+        loading: loading
+      }
+    }) : null]), showFooter ? h('div', {
       class: 'vxe-modal--footer'
     }, footerSlot ? !inited || destroyOnClose && !visible ? [] : footerSlot.call(this, {
       $modal: this
@@ -23537,7 +23628,7 @@ var msgQueue = [];
       on: {
         click: this.cancelEvent
       }
-    }, this.cancelButtonText || conf.i18n('vxe.button.cancel')) : null, h('vxe-button', {
+    }, this.cancelButtonText || src_conf.i18n('vxe.button.cancel')) : null, h('vxe-button', {
       ref: 'confirmBtn',
       props: {
         status: 'primary'
@@ -23545,7 +23636,7 @@ var msgQueue = [];
       on: {
         click: this.confirmEvent
       }
-    }, this.confirmButtonText || conf.i18n('vxe.button.confirm'))]) : null, !isMsg && resize ? h('span', {
+    }, this.confirmButtonText || src_conf.i18n('vxe.button.confirm'))]) : null, !isMsg && resize ? h('span', {
       class: 'vxe-modal--resize'
     }, ['wl', 'wr', 'swst', 'sest', 'st', 'swlb', 'selb', 'sb'].map(function (type) {
       return h('span', {
@@ -23709,7 +23800,7 @@ var msgQueue = [];
             var firstOpen = _this2.firstOpen,
                 fullscreen = _this2.fullscreen;
 
-            if (!remember || !firstOpen) {
+            if (!remember || firstOpen) {
               _this2.updatePosition().then(function () {
                 setTimeout(function () {
                   return _this2.updatePosition();
@@ -23717,8 +23808,8 @@ var msgQueue = [];
               });
             }
 
-            if (!firstOpen) {
-              _this2.firstOpen = true;
+            if (firstOpen) {
+              _this2.firstOpen = false;
 
               if (_this2.hasPosStorage()) {
                 _this2.restorePosStorage();
@@ -23727,6 +23818,12 @@ var msgQueue = [];
                   return _this2.maximize();
                 });
               }
+            } else {
+              if (fullscreen) {
+                _this2.$nextTick(function () {
+                  return _this2.maximize();
+                });
+              }
             }
           });
         }
@@ -24260,7 +24357,7 @@ var msgQueue = [];
       };
     },
     getStorageMap: function getStorageMap(key) {
-      var version = conf.version;
+      var version = src_conf.version;
       var rest = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringJSON(localStorage.getItem(key));
       return rest && rest._v === version ? rest : {
         _v: version
@@ -24641,7 +24738,7 @@ function renderDateMonthTable(h, _vm) {
             return _vm.dateMouseenterEvent(item);
           }
         }
-      }, renderDateLabel(h, _vm, item, conf.i18n("vxe.input.date.months.m".concat(item.month))));
+      }, renderDateLabel(h, _vm, item, src_conf.i18n("vxe.input.date.months.m".concat(item.month))));
     }));
   }))])];
 }
@@ -24683,7 +24780,7 @@ function renderDateQuarterTable(h, _vm) {
             return _vm.dateMouseenterEvent(item);
           }
         }
-      }, renderDateLabel(h, _vm, item, conf.i18n("vxe.input.date.quarters.q".concat(item.quarter))));
+      }, renderDateLabel(h, _vm, item, src_conf.i18n("vxe.input.date.quarters.q".concat(item.quarter))));
     }));
   }))])];
 }
@@ -24805,7 +24902,7 @@ function renderDatePanel(h, _vm) {
     on: {
       click: _vm.dateConfirmEvent
     }
-  }, conf.i18n('vxe.button.confirm'))]) : null])]), h('div', {
+  }, src_conf.i18n('vxe.button.confirm'))]) : null])]), h('div', {
     class: 'vxe-input--date-picker-body'
   }, renderDateTable(h, _vm))];
 }
@@ -24828,7 +24925,7 @@ function renderTimePanel(h, _vm) {
     on: {
       click: _vm.dateConfirmEvent
     }
-  }, conf.i18n('vxe.button.confirm'))]), h('div', {
+  }, src_conf.i18n('vxe.button.confirm'))]), h('div', {
     ref: 'timeBody',
     class: 'vxe-input--time-picker-body'
   }, [h('ul', {
@@ -24934,7 +25031,7 @@ function renderNumberIcon(h, _vm) {
       mouseleave: _vm.numberStopDown
     }
   }, [h('i', {
-    class: ['vxe-input--number-prev-icon', conf.icon.INPUT_PREV_NUM]
+    class: ['vxe-input--number-prev-icon', src_conf.icon.INPUT_PREV_NUM]
   })]), h('span', {
     class: ['vxe-input--number-next is--next', {
       'is--disabled': _vm.isDisabledSubtractNumber
@@ -24945,7 +25042,7 @@ function renderNumberIcon(h, _vm) {
       mouseleave: _vm.numberStopDown
     }
   }, [h('i', {
-    class: ['vxe-input--number-next-icon', conf.icon.INPUT_NEXT_NUM]
+    class: ['vxe-input--number-next-icon', src_conf.icon.INPUT_NEXT_NUM]
   })])]);
 }
 
@@ -24956,7 +25053,7 @@ function renderDatePickerIcon(h, _vm) {
       click: _vm.datePickerOpenEvent
     }
   }, [h('i', {
-    class: ['vxe-input--date-picker-icon', conf.icon.INPUT_DATE]
+    class: ['vxe-input--date-picker-icon', src_conf.icon.INPUT_DATE]
   })]);
 }
 
@@ -24967,7 +25064,7 @@ function renderSearchIcon(h, _vm) {
       click: _vm.searchEvent
     }
   }, [h('i', {
-    class: ['vxe-input--search-icon', conf.icon.INPUT_SEARCH]
+    class: ['vxe-input--search-icon', src_conf.icon.INPUT_SEARCH]
   })]);
 }
 
@@ -24979,7 +25076,7 @@ function renderPasswordIcon(h, _vm) {
       click: _vm.passwordToggleEvent
     }
   }, [h('i', {
-    class: ['vxe-input--password-icon', showPwd ? conf.icon.INPUT_SHOW_PWD : conf.icon.INPUT_PWD]
+    class: ['vxe-input--password-icon', showPwd ? src_conf.icon.INPUT_SHOW_PWD : src_conf.icon.INPUT_PWD]
   })]);
 }
 
@@ -25026,7 +25123,7 @@ function renderSuffixIcon(h, _vm) {
 
   if (isClearable) {
     icons.push(h('i', {
-      class: ['vxe-input--clear-icon', conf.icon.INPUT_CLEAR]
+      class: ['vxe-input--clear-icon', src_conf.icon.INPUT_CLEAR]
     }));
   }
 
@@ -25086,7 +25183,7 @@ function renderExtraSuffixIcon(h, _vm) {
     clearable: {
       type: Boolean,
       default: function _default() {
-        return conf.input.clearable;
+        return src_conf.input.clearable;
       }
     },
     readonly: Boolean,
@@ -25103,7 +25200,7 @@ function renderExtraSuffixIcon(h, _vm) {
     size: {
       type: String,
       default: function _default() {
-        return conf.input.size || conf.size;
+        return src_conf.input.size || src_conf.size;
       }
     },
     multiple: Boolean,
@@ -25120,55 +25217,57 @@ function renderExtraSuffixIcon(h, _vm) {
     exponential: {
       type: Boolean,
       default: function _default() {
-        return conf.input.exponential;
+        return src_conf.input.exponential;
       }
     },
     // number、integer、float、password
     controls: {
       type: Boolean,
       default: function _default() {
-        return conf.input.controls;
+        return src_conf.input.controls;
       }
     },
     // float
     digits: {
       type: [String, Number],
       default: function _default() {
-        return conf.input.digits;
+        return src_conf.input.digits;
       }
     },
     // date、week、month、year
     dateConfig: Object,
-    minDate: {
+    startDate: {
       type: [String, Number, Date],
       default: function _default() {
-        return conf.input.minDate;
+        return src_conf.input.startDate;
       }
     },
-    maxDate: {
+    endDate: {
       type: [String, Number, Date],
       default: function _default() {
-        return conf.input.maxDate;
+        return src_conf.input.endDate;
       }
     },
+    minDate: [String, Number, Date],
+    maxDate: [String, Number, Date],
     // 已废弃 startWeek，被 startDay 替换
     startWeek: Number,
     startDay: {
       type: [String, Number],
       default: function _default() {
-        return conf.input.startDay;
+        return src_conf.input.startDay;
       }
     },
     labelFormat: {
       type: String,
       default: function _default() {
-        return conf.input.labelFormat;
+        return src_conf.input.labelFormat;
       }
     },
     valueFormat: {
       type: String,
       default: function _default() {
-        return conf.input.valueFormat;
+        return src_conf.input.valueFormat;
       }
     },
     editable: {
@@ -25178,20 +25277,20 @@ function renderExtraSuffixIcon(h, _vm) {
     festivalMethod: {
       type: Function,
       default: function _default() {
-        return conf.input.festivalMethod;
+        return src_conf.input.festivalMethod;
       }
     },
     disabledMethod: {
       type: Function,
       default: function _default() {
-        return conf.input.disabledMethod;
+        return src_conf.input.disabledMethod;
       }
     },
     // week
     selectDay: {
       type: Number,
       default: function _default() {
-        return conf.input.selectDay;
+        return src_conf.input.selectDay;
       }
     },
     prefixIcon: String,
@@ -25200,7 +25299,7 @@ function renderExtraSuffixIcon(h, _vm) {
     transfer: {
       type: Boolean,
       default: function _default() {
-        return conf.input.transfer;
+        return src_conf.input.transfer;
       }
     }
   },
@@ -25267,29 +25366,29 @@ function renderExtraSuffixIcon(h, _vm) {
     },
     isDisabledPrevDateBtn: function isDisabledPrevDateBtn() {
       var selectMonth = this.selectMonth,
-          dateMinTime = this.dateMinTime;
+          dateStartTime = this.dateStartTime;
 
       if (selectMonth) {
-        return selectMonth <= dateMinTime;
+        return selectMonth <= dateStartTime;
       }
 
       return false;
     },
     isDisabledNextDateBtn: function isDisabledNextDateBtn() {
       var selectMonth = this.selectMonth,
-          dateMaxTime = this.dateMaxTime;
+          dateEndTime = this.dateEndTime;
 
       if (selectMonth) {
-        return selectMonth >= dateMaxTime;
+        return selectMonth >= dateEndTime;
       }
 
       return false;
     },
-    dateMinTime: function dateMinTime() {
-      return this.minDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(this.minDate) : null;
+    dateStartTime: function dateStartTime() {
+      return this.startDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(this.startDate) : null;
     },
-    dateMaxTime: function dateMaxTime() {
-      return this.maxDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(this.maxDate) : null;
+    dateEndTime: function dateEndTime() {
+      return this.endDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(this.endDate) : null;
     },
     supportMultiples: function supportMultiples() {
       return ['date', 'week', 'month', 'quarter', 'year'].includes(this.type);
@@ -25361,7 +25460,7 @@ function renderExtraSuffixIcon(h, _vm) {
     },
     dateLabelFormat: function dateLabelFormat() {
       if (this.isDatePickerType) {
-        return this.labelFormat || conf.i18n("vxe.input.date.labelFormat.".concat(this.type));
+        return this.labelFormat || src_conf.i18n("vxe.input.date.labelFormat.".concat(this.type));
       }
 
       return null;
@@ -25384,14 +25483,14 @@ function renderExtraSuffixIcon(h, _vm) {
         }
 
         if (datePanelType === 'quarter') {
-          return conf.i18n('vxe.input.date.quarterLabel', [year]);
+          return src_conf.i18n('vxe.input.date.quarterLabel', [year]);
         } else if (datePanelType === 'month') {
-          return conf.i18n('vxe.input.date.monthLabel', [year]);
+          return src_conf.i18n('vxe.input.date.monthLabel', [year]);
         } else if (datePanelType === 'year') {
           return yearList.length ? "".concat(yearList[0].year, " - ").concat(yearList[yearList.length - 1].year) : '';
         }
 
-        return conf.i18n('vxe.input.date.dayLabel', [year, month ? conf.i18n("vxe.input.date.m".concat(month)) : '-']);
+        return src_conf.i18n('vxe.input.date.dayLabel', [year, month ? src_conf.i18n("vxe.input.date.m".concat(month)) : '-']);
       }
 
       return '';
@@ -25426,7 +25525,7 @@ function renderExtraSuffixIcon(h, _vm) {
         return this.weekDatas.map(function (day) {
           return {
             value: day,
-            label: conf.i18n("vxe.input.date.weeks.w".concat(day))
+            label: src_conf.i18n("vxe.input.date.weeks.w".concat(day))
           };
         });
       }
@@ -25436,7 +25535,7 @@ function renderExtraSuffixIcon(h, _vm) {
     weekHeaders: function weekHeaders() {
       if (this.isDatePickerType) {
         return [{
-          label: conf.i18n('vxe.input.date.weeks.w')
+          label: src_conf.i18n('vxe.input.date.weeks.w')
         }].concat(this.dateHeaders);
       }
 
@@ -25549,10 +25648,10 @@ function renderExtraSuffixIcon(h, _vm) {
         var selMonth = selectMonth.getMonth();
         var selDay = selectMonth.getDay();
         var prevOffsetDate = -weekDatas.indexOf(selDay);
-        var startDate = new Date(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatDay(selectMonth, prevOffsetDate).getTime() + hmsTime);
+        var startDayDate = new Date(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatDay(selectMonth, prevOffsetDate).getTime() + hmsTime);
 
         for (var index = 0; index < 42; index++) {
-          var date = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatDay(startDate, index);
+          var date = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatDay(startDayDate, index);
           var itemFullYear = date.getFullYear();
           var itemMonth = date.getMonth();
           var itemDate = date.getDate();
@@ -26463,7 +26562,10 @@ function renderExtraSuffixIcon(h, _vm) {
       this.dateTimeChangeEvent(evnt);
     },
     dateConfirmEvent: function dateConfirmEvent() {
-      this.dateChange(this.dateValue || this.currentDate);
+      if (this.isDateTimeType || this.multiple) {
+        this.dateChange(this.dateValue || this.currentDate);
+      }
+
       this.hidePanel();
     },
     dateMinuteEvent: function dateMinuteEvent(evnt, item) {
@@ -27053,7 +27155,7 @@ function renderExtraSuffixIcon(h, _vm) {
     size: {
       type: String,
       default: function _default() {
-        return conf.checkbox.size || conf.size;
+        return src_conf.checkbox.size || src_conf.size;
       }
     }
   },
@@ -27168,6 +27270,9 @@ function renderExtraSuffixIcon(h, _vm) {
 
 
 
+
+
+
 function isOptionVisible(option) {
   return option.visible !== false;
 }
@@ -27310,6 +27415,15 @@ function findOption(_vm, optionValue) {
   });
 }
 
+function getRemoteSelectLabel(_vm, value) {
+  var remoteValueList = _vm.remoteValueList;
+  var remoteItem = remoteValueList.find(function (item) {
+    return value === item.key;
+  });
+  var item = remoteItem ? remoteItem.result : null;
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toValueString(item ? item[_vm.labelField] : value);
+}
+
 function getSelectLabel(_vm, value) {
   var item = findOption(_vm, value);
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toValueString(item ? item[_vm.labelField] : value);
@@ -27346,7 +27460,7 @@ function renderOption(h, _vm, list, group) {
         mousedown: _vm.mousedownOptionEvent,
         click: function click(evnt) {
           if (!isDisabled) {
-            _vm.changeOptionEvent(evnt, optionValue);
+            _vm.changeOptionEvent(evnt, optionValue, option);
           }
         },
         mouseenter: function mouseenter() {
@@ -27395,7 +27509,18 @@ function renderOptgroup(h, _vm) {
 function select_renderOpts(h, _vm) {
   var isGroup = _vm.isGroup,
       visibleGroupList = _vm.visibleGroupList,
-      visibleOptionList = _vm.visibleOptionList;
+      visibleOptionList = _vm.visibleOptionList,
+      searchLoading = _vm.searchLoading;
+
+  if (searchLoading) {
+    return [h('div', {
+      class: 'vxe-select--search-loading'
+    }, [h('i', {
+      class: ['vxe-select--search-icon', src_conf.icon.SELECT_LOADED]
+    }), h('span', {
+      class: 'vxe-select--search-text'
+    }, src_conf.i18n('vxe.select.loadingText'))])];
+  }
 
   if (isGroup) {
     if (visibleGroupList.length) {
@@ -27409,7 +27534,7 @@ function select_renderOpts(h, _vm) {
 
   return [h('div', {
     class: 'vxe-select--empty-placeholder'
-  }, _vm.emptyText || conf.i18n('vxe.select.emptyText'))];
+  }, _vm.emptyText || src_conf.i18n('vxe.select.emptyText'))];
 }
 
 /* harmony default export */ var src_select = ({
@@ -27425,7 +27550,7 @@ function select_renderOpts(h, _vm) {
     multiCharOverflow: {
       type: [Number, String],
       default: function _default() {
-        return conf.select.multiCharOverflow;
+        return src_conf.select.multiCharOverflow;
       }
     },
     prefixIcon: String,
@@ -27439,15 +27564,19 @@ function select_renderOpts(h, _vm) {
     size: {
       type: String,
       default: function _default() {
-        return conf.select.size || conf.size;
+        return src_conf.select.size || src_conf.size;
       }
     },
+    filterable: Boolean,
+    filterMethod: Function,
+    remote: Boolean,
+    remoteMethod: Function,
     emptyText: String,
     // 已废弃，被 option-config.keyField 替换
     optionId: {
       type: String,
       default: function _default() {
-        return conf.select.optionId;
+        return src_conf.select.optionId;
       }
     },
     // 已废弃，被 option-config.useKey 替换
@@ -27455,7 +27584,7 @@ function select_renderOpts(h, _vm) {
     transfer: {
       type: Boolean,
       default: function _default() {
-        return conf.select.transfer;
+        return src_conf.select.transfer;
       }
     }
   },
@@ -27483,13 +27612,17 @@ function select_renderOpts(h, _vm) {
       fullOptionList: [],
       visibleGroupList: [],
       visibleOptionList: [],
+      remoteValueList: [],
       panelIndex: 0,
       panelStyle: null,
       panelPlacement: null,
+      currentOption: null,
       currentValue: null,
       visiblePanel: false,
       animatVisible: false,
-      isActivated: false
+      isActivated: false,
+      searchValue: '',
+      searchLoading: false
     };
   },
   computed: {
@@ -27512,7 +27645,7 @@ function select_renderOpts(h, _vm) {
       return this.groupPropsOpts.options || 'options';
     },
     optionOpts: function optionOpts() {
-      return Object.assign({}, conf.select.optionConfig, this.optionConfig);
+      return Object.assign({}, src_conf.select.optionConfig, this.optionConfig);
     },
     isGroup: function isGroup() {
       return this.fullGroupList.some(function (item) {
@@ -27527,10 +27660,19 @@ function select_renderOpts(h, _vm) {
 
       var value = this.value,
           multiple = this.multiple,
+          remote = this.remote,
           multiMaxCharNum = this.multiMaxCharNum;
 
       if (value && multiple) {
-        return (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(value) ? value : [value]).map(function (val) {
+        var vals = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(value) ? value : [value];
+
+        if (remote) {
+          return vals.map(function (val) {
+            return getRemoteSelectLabel(_this, val);
+          }).join(', ');
+        }
+
+        return vals.map(function (val) {
           var label = getSelectLabel(_this, val);
 
           if (multiMaxCharNum > 0 && label.length > multiMaxCharNum) {
@@ -27541,6 +27683,10 @@ function select_renderOpts(h, _vm) {
         }).join(', ');
       }
 
+      if (remote) {
+        return getRemoteSelectLabel(this, value);
+      }
+
       return getSelectLabel(this, value);
     }
   },
@@ -27601,19 +27747,21 @@ function select_renderOpts(h, _vm) {
   render: function render(h) {
     var _ref, _ref2;
 
-    var $scopedSlots = this.$scopedSlots,
+    var _e = this._e,
+        $scopedSlots = this.$scopedSlots,
         vSize = this.vSize,
         className = this.className,
         inited = this.inited,
         isActivated = this.isActivated,
         loading = this.loading,
         disabled = this.disabled,
-        visiblePanel = this.visiblePanel;
+        visiblePanel = this.visiblePanel,
+        filterable = this.filterable;
     var prefixSlot = $scopedSlots.prefix;
     return h('div', {
       class: ['vxe-select', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className({
         $select: this
-      }) : className : '', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, 'is--visivle', visiblePanel), _defineProperty(_ref, 'is--disabled', disabled), _defineProperty(_ref, 'is--loading', loading), _defineProperty(_ref, 'is--active', isActivated), _ref)]
+      }) : className : '', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, 'is--visivle', visiblePanel), _defineProperty(_ref, 'is--disabled', disabled), _defineProperty(_ref, 'is--filter', filterable), _defineProperty(_ref, 'is--loading', loading), _defineProperty(_ref, 'is--active', isActivated), _ref)]
     }, [h('div', {
       class: 'vxe-select-slots',
       ref: 'hideOption'
@@ -27626,7 +27774,7 @@ function select_renderOpts(h, _vm) {
         disabled: disabled,
         type: 'text',
         prefixIcon: this.prefixIcon,
-        suffixIcon: loading ? conf.icon.SELECT_LOADED : visiblePanel ? conf.icon.SELECT_OPEN : conf.icon.SELECT_CLOSE,
+        suffixIcon: loading ? src_conf.icon.SELECT_LOADED : visiblePanel ? src_conf.icon.SELECT_OPEN : src_conf.icon.SELECT_CLOSE,
         value: this.selectLabel
       },
       on: {
@@ -27648,7 +27796,26 @@ function select_renderOpts(h, _vm) {
         placement: this.panelPlacement
       },
       style: this.panelStyle
-    }, inited ? [h('div', {
+    }, inited ? [filterable ? h('div', {
+      class: 'vxe-select-filter--wrapper'
+    }, [h('vxe-input', {
+      ref: 'inpSearch',
+      class: 'vxe-select-filter--input',
+      props: {
+        value: this.searchValue,
+        type: 'text',
+        clearable: true,
+        placeholder: src_conf.i18n('vxe.select.search'),
+        prefixIcon: src_conf.icon.INPUT_SEARCH
+      },
+      on: {
+        modelValue: this.modelSearchEvent,
+        focus: this.focusSearchEvent,
+        keydown: this.keydownSearchEvent,
+        change: this.triggerSearchEvent,
+        search: this.triggerSearchEvent
+      }
+    })]) : _e(), h('div', {
       ref: 'optWrapper',
       class: 'vxe-select-option--wrapper'
     }, select_renderOpts(h, this))] : null)]);
@@ -27699,23 +27866,57 @@ function select_renderOpts(h, _vm) {
     },
 
     /**
-     * 刷新选项，当选项被动态显示/隐藏时可能会用到
+     * 刷新选项，当选项被搜索、动态显示/隐藏时可能会用到
      */
     refreshOption: function refreshOption() {
       var isGroup = this.isGroup,
           fullOptionList = this.fullOptionList,
-          fullGroupList = this.fullGroupList;
+          fullGroupList = this.fullGroupList,
+          filterable = this.filterable,
+          filterMethod = this.filterMethod,
+          searchValue = this.searchValue,
+          labelField = this.labelField,
+          groupLabelField = this.groupLabelField;
 
       if (isGroup) {
-        this.visibleGroupList = fullGroupList.filter(isOptionVisible);
+        if (filterable && filterMethod) {
+          this.visibleGroupList = fullGroupList.filter(function (group) {
+            return isOptionVisible(group) && filterMethod({
+              group: group,
+              option: null,
+              searchValue: searchValue
+            });
+          });
+        } else if (filterable) {
+          this.visibleGroupList = fullGroupList.filter(function (group) {
+            return isOptionVisible(group) && (!searchValue || "".concat(group[groupLabelField]).indexOf(searchValue) > -1);
+          });
+        } else {
+          this.visibleGroupList = fullGroupList.filter(isOptionVisible);
+        }
       } else {
-        this.visibleOptionList = fullOptionList.filter(isOptionVisible);
+        if (filterable && filterMethod) {
+          this.visibleOptionList = fullOptionList.filter(function (option) {
+            return isOptionVisible(option) && filterMethod({
+              group: null,
+              option: option,
+              searchValue: searchValue
+            });
+          });
+        } else if (filterable) {
+          this.visibleOptionList = fullOptionList.filter(function (option) {
+            return isOptionVisible(option) && (!searchValue || "".concat(option[labelField]).indexOf(searchValue) > -1);
+          });
+        } else {
+          this.visibleOptionList = fullOptionList.filter(isOptionVisible);
+        }
       }
 
       return this.$nextTick();
     },
     setCurrentOption: function setCurrentOption(option) {
       if (option) {
+        this.currentOption = option;
         this.currentValue = option[this.valueField];
       }
     },
@@ -27750,6 +27951,7 @@ function select_renderOpts(h, _vm) {
       this.hideOptionPanel();
     },
     clearValueEvent: function clearValueEvent(evnt, selectValue) {
+      this.remoteValueList = [];
       this.changeEvent(evnt, selectValue);
       this.$emit('clear', {
         value: selectValue,
@@ -27776,9 +27978,10 @@ function select_renderOpts(h, _vm) {
         evnt.stopPropagation();
       }
     },
-    changeOptionEvent: function changeOptionEvent(evnt, selectValue) {
+    changeOptionEvent: function changeOptionEvent(evnt, selectValue, option) {
       var value = this.value,
-          multiple = this.multiple;
+          multiple = this.multiple,
+          remoteValueList = this.remoteValueList;
 
       if (multiple) {
         var multipleValue;
@@ -27795,8 +27998,25 @@ function select_renderOpts(h, _vm) {
           multipleValue = [selectValue];
         }
 
+        var remoteItem = remoteValueList.find(function (item) {
+          return item.key === selectValue;
+        });
+
+        if (remoteItem) {
+          remoteItem.result = option;
+        } else {
+          remoteValueList.push({
+            key: selectValue,
+            result: option
+          });
+        }
+
         this.changeEvent(evnt, multipleValue);
       } else {
+        this.remoteValueList = [{
+          key: selectValue,
+          result: option
+        }];
         this.changeEvent(evnt, selectValue);
         this.hideOptionPanel();
       }
@@ -27833,6 +28053,7 @@ function select_renderOpts(h, _vm) {
     handleGlobalKeydownEvent: function handleGlobalKeydownEvent(evnt) {
       var visiblePanel = this.visiblePanel,
           currentValue = this.currentValue,
+          currentOption = this.currentOption,
           clearable = this.clearable,
           disabled = this.disabled;
 
@@ -27856,7 +28077,7 @@ function select_renderOpts(h, _vm) {
           } else if (isEnter) {
             evnt.preventDefault();
             evnt.stopPropagation();
-            this.changeOptionEvent(evnt, currentValue);
+            this.changeOptionEvent(evnt, currentValue, currentOption);
           } else if (isUpArrow || isDwArrow) {
             evnt.preventDefault();
 
@@ -27893,6 +28114,17 @@ function select_renderOpts(h, _vm) {
         this.panelIndex = utils.nextZIndex();
       }
     },
+    handleFocusSearch: function handleFocusSearch() {
+      var _this4 = this;
+
+      if (this.filterable) {
+        this.$nextTick(function () {
+          if (_this4.$refs.inpSearch) {
+            _this4.$refs.inpSearch.focus();
+          }
+        });
+      }
+    },
     focusEvent: function focusEvent() {
       if (!this.disabled) {
         this.isActivated = true;
@@ -27901,6 +28133,47 @@ function select_renderOpts(h, _vm) {
     blurEvent: function blurEvent() {
       this.isActivated = false;
     },
+    modelSearchEvent: function modelSearchEvent(value) {
+      this.searchValue = value;
+    },
+    focusSearchEvent: function focusSearchEvent() {
+      this.isActivated = true;
+    },
+    keydownSearchEvent: function keydownSearchEvent(params) {
+      var $event = params.$event;
+      var isEnter = hasEventKey($event, EVENT_KEYS.ENTER);
+
+      if (isEnter) {
+        $event.preventDefault();
+        $event.stopPropagation();
+      }
+    },
+    triggerSearchEvent: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.debounce(function () {
+      var _this5 = this;
+
+      var remote = this.remote,
+          remoteMethod = this.remoteMethod,
+          searchValue = this.searchValue;
+
+      if (remote && remoteMethod) {
+        this.searchLoading = true;
+        Promise.resolve(remoteMethod({
+          searchValue: searchValue
+        })).then(function () {
+          return _this5.$nextTick();
+        }).catch(function () {
+          return _this5.$nextTick();
+        }).finally(function () {
+          _this5.searchLoading = false;
+
+          _this5.refreshOption();
+        });
+      } else {
+        this.refreshOption();
+      }
+    }, 350, {
+      trailing: true
+    }),
     isPanelVisible: function isPanelVisible() {
       return this.visiblePanel;
     },
@@ -27938,12 +28211,14 @@ function select_renderOpts(h, _vm) {
       }
     },
     showOptionPanel: function showOptionPanel() {
-      var _this4 = this;
+      var _this6 = this;
 
       var loading = this.loading,
-          disabled = this.disabled;
+          disabled = this.disabled,
+          filterable = this.filterable;
 
       if (!loading && !disabled) {
+        this.searchList = this.option;
         clearTimeout(this.hidePanelTimeout);
 
         if (!this.inited) {
@@ -27956,38 +28231,48 @@ function select_renderOpts(h, _vm) {
 
         this.isActivated = true;
         this.animatVisible = true;
+
+        if (filterable) {
+          this.refreshOption();
+        }
+
         setTimeout(function () {
-          var value = _this4.value,
-              multiple = _this4.multiple;
-          var currOption = findOption(_this4, multiple && value ? value[0] : value);
-          _this4.visiblePanel = true;
+          var value = _this6.value,
+              multiple = _this6.multiple;
+          var currOption = findOption(_this6, multiple && value ? value[0] : value);
+          _this6.visiblePanel = true;
 
           if (currOption) {
-            _this4.setCurrentOption(currOption);
+            _this6.setCurrentOption(currOption);
 
-            _this4.scrollToOption(currOption);
+            _this6.scrollToOption(currOption);
           }
+
+          _this6.handleFocusSearch();
         }, 10);
         this.updateZindex();
         this.updatePlacement();
       }
     },
     hideOptionPanel: function hideOptionPanel() {
-      var _this5 = this;
+      var _this7 = this;
 
+      this.searchValue = '';
+      this.searchLoading = false;
       this.visiblePanel = false;
       this.hidePanelTimeout = setTimeout(function () {
-        _this5.animatVisible = false;
+        _this7.animatVisible = false;
+        _this7.searchValue = '';
       }, 350);
     },
     updatePlacement: function updatePlacement() {
-      var _this6 = this;
+      var _this8 = this;
 
       return this.$nextTick().then(function () {
-        var $refs = _this6.$refs,
-            transfer = _this6.transfer,
-            placement = _this6.placement,
-            panelIndex = _this6.panelIndex;
+        var $refs = _this8.$refs,
+            transfer = _this8.transfer,
+            placement = _this8.placement,
+            panelIndex = _this8.panelIndex;
         var targetElem = $refs.input.$el;
         var panelElem = $refs.panel;
 
@@ -28061,9 +28346,9 @@ function select_renderOpts(h, _vm) {
             }
           }
 
-          _this6.panelStyle = panelStyle;
-          _this6.panelPlacement = panelPlacement;
-          return _this6.$nextTick();
+          _this8.panelStyle = panelStyle;
+          _this8.panelPlacement = panelPlacement;
+          return _this8.$nextTick();
         }
       });
     },
@@ -28305,7 +28590,7 @@ Object.keys(option_props).forEach(function (name) {
       res: 'modal',
       props: {
         value: storeData.visible,
-        title: conf.i18n(isPrint ? 'vxe.export.printTitle' : 'vxe.export.expTitle'),
+        title: src_conf.i18n(isPrint ? 'vxe.export.printTitle' : 'vxe.export.expTitle'),
         width: 660,
         mask: true,
         lockView: true,
@@ -28328,20 +28613,20 @@ Object.keys(option_props).forEach(function (name) {
         cellpadding: 0,
         border: 0
       }
-    }, [h('tbody', [[isPrint ? _e() : h('tr', [h('td', conf.i18n('vxe.export.expName')), h('td', [h('vxe-input', {
+    }, [h('tbody', [[isPrint ? _e() : h('tr', [h('td', src_conf.i18n('vxe.export.expName')), h('td', [h('vxe-input', {
       ref: 'filename',
       props: {
         value: defaultOptions.filename,
         type: 'text',
         clearable: true,
-        placeholder: conf.i18n('vxe.export.expNamePlaceholder')
+        placeholder: src_conf.i18n('vxe.export.expNamePlaceholder')
       },
       on: {
         modelValue: function modelValue(value) {
           defaultOptions.filename = value;
         }
       }
-    })])]), isPrint ? _e() : h('tr', [h('td', conf.i18n('vxe.export.expType')), h('td', [h('vxe-select', {
+    })])]), isPrint ? _e() : h('tr', [h('td', src_conf.i18n('vxe.export.expType')), h('td', [h('vxe-select', {
       props: {
         value: defaultOptions.type
       },
@@ -28354,23 +28639,23 @@ Object.keys(option_props).forEach(function (name) {
       return h('vxe-option', {
         props: {
           value: item.value,
-          label: conf.i18n(item.label)
+          label: src_conf.i18n(item.label)
         }
       });
-    }))])]), isPrint || showSheet ? h('tr', [h('td', conf.i18n('vxe.export.expSheetName')), h('td', [h('vxe-input', {
+    }))])]), isPrint || showSheet ? h('tr', [h('td', src_conf.i18n('vxe.export.expSheetName')), h('td', [h('vxe-input', {
       ref: 'sheetname',
       props: {
         value: defaultOptions.sheetName,
         type: 'text',
         clearable: true,
-        placeholder: conf.i18n('vxe.export.expSheetNamePlaceholder')
+        placeholder: src_conf.i18n('vxe.export.expSheetNamePlaceholder')
       },
       on: {
         modelValue: function modelValue(value) {
           defaultOptions.sheetName = value;
         }
       }
-    })])]) : _e(), h('tr', [h('td', conf.i18n('vxe.export.expMode')), h('td', [h('vxe-select', {
+    })])]) : _e(), h('tr', [h('td', src_conf.i18n('vxe.export.expMode')), h('td', [h('vxe-select', {
       props: {
         value: defaultOptions.mode
       },
@@ -28383,10 +28668,10 @@ Object.keys(option_props).forEach(function (name) {
       return h('vxe-option', {
         props: {
           value: item.value,
-          label: conf.i18n(item.label)
+          label: src_conf.i18n(item.label)
         }
       });
-    }))])]), h('tr', [h('td', [conf.i18n('vxe.export.expColumn')]), h('td', [h('div', {
+    }))])]), h('tr', [h('td', [src_conf.i18n('vxe.export.expColumn')]), h('td', [h('div', {
       class: 'vxe-export--panel-column'
     }, [h('ul', {
       class: 'vxe-export--panel-column-header'
@@ -28396,7 +28681,7 @@ Object.keys(option_props).forEach(function (name) {
         'is--indeterminate': isIndeterminate
       }],
       attrs: {
-        title: conf.i18n('vxe.table.allTitle')
+        title: src_conf.i18n('vxe.table.allTitle')
       },
       on: {
         click: this.allColumnEvent
@@ -28409,15 +28694,15 @@ Object.keys(option_props).forEach(function (name) {
       class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
     }), h('span', {
       class: 'vxe-checkbox--label'
-    }, conf.i18n('vxe.export.expCurrentColumn'))])]), h('ul', {
+    }, src_conf.i18n('vxe.export.expCurrentColumn'))])]), h('ul', {
       class: 'vxe-export--panel-column-body'
-    }, cols)])])]), h('tr', [h('td', conf.i18n('vxe.export.expOpts')), h('td', [h('div', {
+    }, cols)])])]), h('tr', [h('td', src_conf.i18n('vxe.export.expOpts')), h('td', [h('div', {
       class: 'vxe-export--panel-option-row'
     }, [h('vxe-checkbox', {
       props: {
         value: isHeader,
-        title: conf.i18n('vxe.export.expHeaderTitle'),
-        content: conf.i18n('vxe.export.expOptHeader')
+        title: src_conf.i18n('vxe.export.expHeaderTitle'),
+        content: src_conf.i18n('vxe.export.expOptHeader')
       },
       on: {
         input: function input(value) {
@@ -28428,8 +28713,8 @@ Object.keys(option_props).forEach(function (name) {
       props: {
         value: defaultOptions.isFooter,
         disabled: !storeData.hasFooter,
-        title: conf.i18n('vxe.export.expFooterTitle'),
-        content: conf.i18n('vxe.export.expOptFooter')
+        title: src_conf.i18n('vxe.export.expFooterTitle'),
+        content: src_conf.i18n('vxe.export.expOptFooter')
       },
       on: {
         input: function input(value) {
@@ -28439,8 +28724,8 @@ Object.keys(option_props).forEach(function (name) {
     }), h('vxe-checkbox', {
       props: {
         value: defaultOptions.original,
-        title: conf.i18n('vxe.export.expOriginalTitle'),
-        content: conf.i18n('vxe.export.expOptOriginal')
+        title: src_conf.i18n('vxe.export.expOriginalTitle'),
+        content: src_conf.i18n('vxe.export.expOptOriginal')
       },
       on: {
         input: function input(value) {
@@ -28453,8 +28738,8 @@ Object.keys(option_props).forEach(function (name) {
       props: {
         value: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
         disabled: !isHeader || !hasColgroup || !supportMerge,
-        title: conf.i18n('vxe.export.expColgroupTitle'),
-        content: conf.i18n('vxe.export.expOptColgroup')
+        title: src_conf.i18n('vxe.export.expColgroupTitle'),
+        content: src_conf.i18n('vxe.export.expOptColgroup')
       },
       on: {
         input: function input(value) {
@@ -28465,8 +28750,8 @@ Object.keys(option_props).forEach(function (name) {
       props: {
         value: hasMerge && supportMerge && checkedAll ? defaultOptions.isMerge : false,
         disabled: !hasMerge || !supportMerge || !checkedAll,
-        title: conf.i18n('vxe.export.expMergeTitle'),
-        content: conf.i18n('vxe.export.expOptMerge')
+        title: src_conf.i18n('vxe.export.expMergeTitle'),
+        content: src_conf.i18n('vxe.export.expOptMerge')
       },
       on: {
         input: function input(value) {
@@ -28477,8 +28762,8 @@ Object.keys(option_props).forEach(function (name) {
       props: {
         value: supportStyle ? defaultOptions.useStyle : false,
         disabled: !supportStyle,
-        title: conf.i18n('vxe.export.expUseStyleTitle'),
-        content: conf.i18n('vxe.export.expOptUseStyle')
+        title: src_conf.i18n('vxe.export.expUseStyleTitle'),
+        content: src_conf.i18n('vxe.export.expOptUseStyle')
       },
       on: {
         input: function input(value) {
@@ -28489,8 +28774,8 @@ Object.keys(option_props).forEach(function (name) {
       props: {
         value: hasTree ? defaultOptions.isAllExpand : false,
         disabled: !hasTree,
-        title: conf.i18n('vxe.export.expAllExpandTitle'),
-        content: conf.i18n('vxe.export.expOptAllExpand')
+        title: src_conf.i18n('vxe.export.expAllExpandTitle'),
+        content: src_conf.i18n('vxe.export.expOptAllExpand')
       },
       on: {
         input: function input(value) {
@@ -28501,7 +28786,7 @@ Object.keys(option_props).forEach(function (name) {
       class: 'vxe-export--panel-btns'
     }, [h('vxe-button', {
       props: {
-        content: conf.i18n('vxe.export.expCancel')
+        content: src_conf.i18n('vxe.export.expCancel')
       },
       on: {
         click: this.cancelEvent
@@ -28510,7 +28795,7 @@ Object.keys(option_props).forEach(function (name) {
       ref: 'confirmBtn',
       props: {
         status: 'primary',
-        content: conf.i18n(isPrint ? 'vxe.export.expPrint' : 'vxe.export.expConfirm')
+        content: src_conf.i18n(isPrint ? 'vxe.export.expPrint' : 'vxe.export.expConfirm')
       },
       on: {
         click: this.confirmEvent
@@ -28647,13 +28932,13 @@ Object.keys(option_props).forEach(function (name) {
     strict: {
       type: Boolean,
       default: function _default() {
-        return conf.radio.strict;
+        return src_conf.radio.strict;
       }
     },
     size: {
       type: String,
       default: function _default() {
-        return conf.radio.size || conf.size;
+        return src_conf.radio.size || src_conf.size;
       }
     }
   },
@@ -28803,7 +29088,7 @@ Object.keys(option_props).forEach(function (name) {
         var selectItem = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.find(typeList, function (item) {
           return type === item.value;
         });
-        return selectItem ? conf.i18n(selectItem.label) : '*.*';
+        return selectItem ? src_conf.i18n(selectItem.label) : '*.*';
       }
 
       return "*.".concat(typeList.map(function (item) {
@@ -28821,7 +29106,7 @@ Object.keys(option_props).forEach(function (name) {
       res: 'modal',
       props: {
         value: storeData.visible,
-        title: conf.i18n('vxe.import.impTitle'),
+        title: src_conf.i18n('vxe.import.impTitle'),
         width: 440,
         mask: true,
         lockView: true,
@@ -28844,13 +29129,13 @@ Object.keys(option_props).forEach(function (name) {
         cellpadding: 0,
         border: 0
       }
-    }, [h('tbody', [h('tr', [h('td', conf.i18n('vxe.import.impFile')), h('td', [hasFile ? h('div', {
+    }, [h('tbody', [h('tr', [h('td', src_conf.i18n('vxe.import.impFile')), h('td', [hasFile ? h('div', {
       class: 'vxe-import-selected--file',
       attrs: {
         title: selectName
       }
     }, [h('span', selectName), h('i', {
-      class: conf.icon.INPUT_CLEAR,
+      class: src_conf.icon.INPUT_CLEAR,
       on: {
         click: this.clearFileEvent
       }
@@ -28863,7 +29148,7 @@ Object.keys(option_props).forEach(function (name) {
       on: {
         click: this.selectFileEvent
       }
-    }, conf.i18n('vxe.import.impSelect'))])]), h('tr', [h('td', conf.i18n('vxe.import.impType')), h('td', parseTypeLabel)]), h('tr', [h('td', conf.i18n('vxe.import.impOpts')), h('td', [h('vxe-radio-group', {
+    }, src_conf.i18n('vxe.import.impSelect'))])]), h('tr', [h('td', src_conf.i18n('vxe.import.impType')), h('td', parseTypeLabel)]), h('tr', [h('td', src_conf.i18n('vxe.import.impOpts')), h('td', [h('vxe-radio-group', {
       props: {
         value: defaultOptions.mode
       },
@@ -28877,14 +29162,14 @@ Object.keys(option_props).forEach(function (name) {
         props: {
           label: item.value
         }
-      }, conf.i18n(item.label));
+      }, src_conf.i18n(item.label));
     }))])])])]), h('div', {
       class: 'vxe-export--panel-btns'
     }, [h('vxe-button', {
       on: {
         click: this.cancelEvent
       }
-    }, conf.i18n('vxe.import.impCancel')), h('vxe-button', {
+    }, src_conf.i18n('vxe.import.impCancel')), h('vxe-button', {
       props: {
         status: 'primary',
         disabled: !hasFile
@@ -28892,7 +29177,7 @@ Object.keys(option_props).forEach(function (name) {
       on: {
         click: this.importEvent
       }
-    }, conf.i18n('vxe.import.impConfirm'))])])]);
+    }, src_conf.i18n('vxe.import.impConfirm'))])])]);
   },
   methods: {
     clearFileEvent: function clearFileEvent() {
@@ -29697,7 +29982,7 @@ function saveLocalFile(options) {
     return Promise.resolve();
   }
 
-  return Promise.reject(new Error(utils.getLog('vxe.error.notExp')));
+  return Promise.reject(new Error(getLog('vxe.error.notExp')));
 }
 
 function downloadFile($xetable, opts, content) {
@@ -29724,7 +30009,7 @@ function downloadFile($xetable, opts, content) {
       if (false) {}
 
       v_x_e_table.modal.message({
-        content: conf.i18n('vxe.table.expSuccess'),
+        content: src_conf.i18n('vxe.table.expSuccess'),
         status: 'success'
       });
     }
@@ -30027,7 +30312,7 @@ function handleImport($xetable, content, opts) {
         if (false) {}
 
         v_x_e_table.modal.message({
-          content: conf.i18n('vxe.table.impSuccess', [rows.length]),
+          content: src_conf.i18n('vxe.table.impSuccess', [rows.length]),
           status: 'success'
         });
       }
@@ -30045,7 +30330,7 @@ function handleImport($xetable, content, opts) {
     if (false) {}
 
     v_x_e_table.modal.message({
-      content: conf.i18n('vxe.error.impFields'),
+      content: src_conf.i18n('vxe.error.impFields'),
       status: 'error'
     });
 
@@ -30072,7 +30357,7 @@ function handleFileImport($xetable, file, opts) {
       if (false) {}
 
       v_x_e_table.modal.message({
-        content: conf.i18n('vxe.error.notType', [type]),
+        content: src_conf.i18n('vxe.error.notType', [type]),
         status: 'error'
       });
     }
@@ -30235,7 +30520,7 @@ function readLocalFile() {
           if (false) {}
 
           v_x_e_table.modal.message({
-            content: conf.i18n('vxe.error.notType', [errType]),
+            content: src_conf.i18n('vxe.error.notType', [errType]),
             status: 'error'
           });
         }
@@ -30609,7 +30894,7 @@ var mixin_convertToRows = function convertToRows(originColumns) {
       opts.colgroups = mixin_convertToRows(groups);
 
       if (!opts.filename) {
-        opts.filename = conf.i18n(opts.original ? 'vxe.table.expOriginFilename' : 'vxe.table.expFilename', [external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toDateString(Date.now(), 'yyyyMMddHHmmss')]);
+        opts.filename = src_conf.i18n(opts.original ? 'vxe.table.expOriginFilename' : 'vxe.table.expFilename', [external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toDateString(Date.now(), 'yyyyMMddHHmmss')]);
       }
 
       if (!opts.sheetName) {
@@ -30786,7 +31071,7 @@ var mixin_convertToRows = function convertToRows(originColumns) {
       if (isTree) {
         if (defOpts.message) {
           v_x_e_table.modal.message({
-            content: conf.i18n('vxe.error.treeNotImp'),
+            content: src_conf.i18n('vxe.error.treeNotImp'),
             status: 'error'
           });
         }
@@ -31591,7 +31876,7 @@ function validErrorRuleValue(rule, val) {
                   cb(validRest);
                   resolve();
                 } else {
-                  if (conf.validToReject === 'obsolete') {
+                  if (src_conf.validToReject === 'obsolete') {
                     // 已废弃，校验失败将不会执行catch
                     reject(validRest);
                   } else {
@@ -32611,7 +32896,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
     size: {
       type: String,
       default: function _default() {
-        return conf.grid.size || conf.size;
+        return src_conf.grid.size || src_conf.size;
       }
     }
   }),
@@ -32632,7 +32917,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
       tZindex: 0,
       tablePage: {
         total: 0,
-        pageSize: 10,
+        pageSize: src_conf.pager.pageSize || 10,
         currentPage: 1
       }
     };
@@ -32642,19 +32927,19 @@ Object.keys(packages_table.methods).forEach(function (name) {
       return this.proxyOpts.message !== false;
     },
     proxyOpts: function proxyOpts() {
-      return Object.assign({}, conf.grid.proxyConfig, this.proxyConfig);
+      return Object.assign({}, src_conf.grid.proxyConfig, this.proxyConfig);
     },
     pagerOpts: function pagerOpts() {
-      return Object.assign({}, conf.grid.pagerConfig, this.pagerConfig);
+      return Object.assign({}, src_conf.grid.pagerConfig, this.pagerConfig);
     },
     formOpts: function formOpts() {
-      return Object.assign({}, conf.grid.formConfig, this.formConfig);
+      return Object.assign({}, src_conf.grid.formConfig, this.formConfig);
     },
     toolbarOpts: function toolbarOpts() {
-      return Object.assign({}, conf.grid.toolbarConfig, this.toolbarConfig || this.toolbar);
+      return Object.assign({}, src_conf.grid.toolbarConfig, this.toolbarConfig || this.toolbar);
     },
     zoomOpts: function zoomOpts() {
-      return Object.assign({}, conf.grid.zoomConfig, this.zoomConfig);
+      return Object.assign({}, src_conf.grid.zoomConfig, this.zoomConfig);
     },
     renderStyle: function renderStyle() {
       return this.isZMax ? {
@@ -32706,7 +32991,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
 
       if (editConfig) {
         tableProps.editConfig = Object.assign({}, editConfig, {
-          activeMethod: this.handleActiveMethod
+          beforeEditMethod: this.handleBeforeEditMethod
         });
       }
 
@@ -32750,6 +33035,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
 
     if (false) {}
 
+    this.initPages();
     GlobalEvent.on(this, 'keydown', this.handleGlobalKeydownEvent);
   },
   mounted: function mounted() {
@@ -32758,7 +33044,6 @@ Object.keys(packages_table.methods).forEach(function (name) {
     }
 
     this.initToolbar();
-    this.initPages();
     this.initProxy();
   },
   destroyed: function destroyed() {
@@ -32893,12 +33178,17 @@ Object.keys(packages_table.methods).forEach(function (name) {
       clss.push(rowClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(rowClassName) ? rowClassName(params) : rowClassName : '');
       return clss;
     },
-    handleActiveMethod: function handleActiveMethod(params) {
+    handleBeforeEditMethod: function handleBeforeEditMethod(params) {
       var editConfig = this.editConfig;
-      var activeMethod = editConfig ? editConfig.activeMethod : null;
-      return this.pendingRecords.indexOf(params.row) === -1 && (!activeMethod || activeMethod(_objectSpread2(_objectSpread2({}, params), {}, {
-        $grid: this
-      })));
+      var beforeEditMethod = editConfig ? editConfig.beforeEditMethod || editConfig.activeMethod : null;
+
+      if (this.pendingRecords.indexOf(params.row) === -1) {
+        return !beforeEditMethod || beforeEditMethod(_objectSpread2(_objectSpread2({}, params), {}, {
+          $grid: this
+        }));
+      }
+
+      return false;
     },
     initToolbar: function initToolbar() {
       var _this3 = this;
@@ -33246,7 +33536,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
 
                   v_x_e_table.modal.message({
                     id: code,
-                    content: conf.i18n('vxe.grid.selectOneRecord'),
+                    content: src_conf.i18n('vxe.grid.selectOneRecord'),
                     status: 'warning'
                   });
                 }
@@ -33349,7 +33639,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
 
                     v_x_e_table.modal.message({
                       id: code,
-                      content: conf.i18n('vxe.grid.dataUnchanged'),
+                      content: src_conf.i18n('vxe.grid.dataUnchanged'),
                       status: 'info'
                     });
                   }
@@ -33388,7 +33678,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
         msg = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(rest, proxyProps.message);
       }
 
-      return msg || conf.i18n(defaultMsg);
+      return msg || src_conf.i18n(defaultMsg);
     },
     handleDeleteRow: function handleDeleteRow(code, alertKey, callback) {
       var selectRecords = this.getCheckboxRecords();
@@ -33397,7 +33687,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
         if (selectRecords.length) {
           return v_x_e_table.modal.confirm({
             id: "cfm_".concat(code),
-            content: conf.i18n(alertKey),
+            content: src_conf.i18n(alertKey),
             escClosable: true
           }).then(function (type) {
             if (type === 'confirm') {
@@ -33410,7 +33700,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
 
           v_x_e_table.modal.message({
             id: "msg_".concat(code),
-            content: conf.i18n('vxe.grid.selectOneRecord'),
+            content: src_conf.i18n('vxe.grid.selectOneRecord'),
             status: 'warning'
           });
         }
@@ -33488,7 +33778,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
 
           v_x_e_table.modal.message({
             id: code,
-            content: conf.i18n('vxe.grid.selectOneRecord'),
+            content: src_conf.i18n('vxe.grid.selectOneRecord'),
             status: 'warning'
           });
         }
@@ -33913,10 +34203,10 @@ function renderCustoms(h, _vm) {
   }, [h('vxe-button', {
     props: {
       circle: true,
-      icon: customOpts.icon || conf.icon.TOOLBAR_TOOLS_CUSTOM
+      icon: customOpts.icon || src_conf.icon.TOOLBAR_TOOLS_CUSTOM
     },
     attrs: {
-      title: conf.i18n('vxe.toolbar.custom')
+      title: src_conf.i18n('vxe.toolbar.custom')
     },
     on: customBtnOns
   }), h('div', {
@@ -33929,7 +34219,7 @@ function renderCustoms(h, _vm) {
       'is--indeterminate': customStore.isIndeterminate
     }],
     attrs: {
-      title: conf.i18n('vxe.table.allTitle')
+      title: src_conf.i18n('vxe.table.allTitle')
     },
     on: {
       click: _vm.allCustomEvent
@@ -33942,7 +34232,7 @@ function renderCustoms(h, _vm) {
     class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
   }), h('span', {
     class: 'vxe-checkbox--label'
-  }, conf.i18n('vxe.toolbar.customAll'))])]), h('ul', {
+  }, src_conf.i18n('vxe.toolbar.customAll'))])]), h('ul', {
     class: 'vxe-custom--body',
     on: customWrapperOns
   }, cols), customOpts.isFooter === false ? null : h('div', {
@@ -33952,12 +34242,12 @@ function renderCustoms(h, _vm) {
     on: {
       click: _vm.confirmCustomEvent
     }
-  }, conf.i18n('vxe.toolbar.customConfirm')), h('button', {
+  }, src_conf.i18n('vxe.toolbar.customConfirm')), h('button', {
     class: 'btn--reset',
     on: {
       click: _vm.resetCustomEvent
     }
-  }, conf.i18n('vxe.toolbar.customRestore'))])])]);
+  }, src_conf.i18n('vxe.toolbar.customRestore'))])])]);
 }
 
 /* harmony default export */ var src_toolbar = ({
@@ -33974,25 +34264,25 @@ function renderCustoms(h, _vm) {
     buttons: {
       type: Array,
       default: function _default() {
-        return conf.toolbar.buttons;
+        return src_conf.toolbar.buttons;
       }
     },
     tools: {
       type: Array,
       default: function _default() {
-        return conf.toolbar.tools;
+        return src_conf.toolbar.tools;
       }
     },
     perfect: {
       type: Boolean,
       default: function _default() {
-        return conf.toolbar.perfect;
+        return src_conf.toolbar.perfect;
       }
     },
     size: {
       type: String,
       default: function _default() {
-        return conf.toolbar.size || conf.size;
+        return src_conf.toolbar.size || src_conf.size;
       }
     },
     className: [String, Function]
@@ -34016,22 +34306,22 @@ function renderCustoms(h, _vm) {
   },
   computed: {
     refreshOpts: function refreshOpts() {
-      return Object.assign({}, conf.toolbar.refresh, this.refresh);
+      return Object.assign({}, src_conf.toolbar.refresh, this.refresh);
     },
     importOpts: function importOpts() {
-      return Object.assign({}, conf.toolbar.import, this.import);
+      return Object.assign({}, src_conf.toolbar.import, this.import);
     },
     exportOpts: function exportOpts() {
-      return Object.assign({}, conf.toolbar.export, this.export);
+      return Object.assign({}, src_conf.toolbar.export, this.export);
     },
     printOpts: function printOpts() {
-      return Object.assign({}, conf.toolbar.print, this.print);
+      return Object.assign({}, src_conf.toolbar.print, this.print);
     },
     zoomOpts: function zoomOpts() {
-      return Object.assign({}, conf.toolbar.zoom, this.zoom);
+      return Object.assign({}, src_conf.toolbar.zoom, this.zoom);
     },
     customOpts: function customOpts() {
-      return Object.assign({}, conf.toolbar.custom, this.custom);
+      return Object.assign({}, src_conf.toolbar.custom, this.custom);
     }
   },
   created: function created() {
@@ -34088,10 +34378,10 @@ function renderCustoms(h, _vm) {
     }, [this.import ? h('vxe-button', {
       props: {
         circle: true,
-        icon: importOpts.icon || conf.icon.TOOLBAR_TOOLS_IMPORT
+        icon: importOpts.icon || src_conf.icon.TOOLBAR_TOOLS_IMPORT
       },
       attrs: {
-        title: conf.i18n('vxe.toolbar.import')
+        title: src_conf.i18n('vxe.toolbar.import')
       },
       on: {
         click: this.importEvent
@@ -34099,10 +34389,10 @@ function renderCustoms(h, _vm) {
     }) : _e(), this.export ? h('vxe-button', {
       props: {
         circle: true,
-        icon: exportOpts.icon || conf.icon.TOOLBAR_TOOLS_EXPORT
+        icon: exportOpts.icon || src_conf.icon.TOOLBAR_TOOLS_EXPORT
       },
       attrs: {
-        title: conf.i18n('vxe.toolbar.export')
+        title: src_conf.i18n('vxe.toolbar.export')
       },
       on: {
         click: this.exportEvent
@@ -34110,10 +34400,10 @@ function renderCustoms(h, _vm) {
     }) : _e(), this.print ? h('vxe-button', {
       props: {
         circle: true,
-        icon: this.printOpts.icon || conf.icon.TOOLBAR_TOOLS_PRINT
+        icon: this.printOpts.icon || src_conf.icon.TOOLBAR_TOOLS_PRINT
       },
       attrs: {
-        title: conf.i18n('vxe.toolbar.print')
+        title: src_conf.i18n('vxe.toolbar.print')
       },
       on: {
         click: this.printEvent
@@ -34121,10 +34411,10 @@ function renderCustoms(h, _vm) {
     }) : _e(), refresh ? h('vxe-button', {
       props: {
         circle: true,
-        icon: this.isRefresh ? refreshOpts.iconLoading || conf.icon.TOOLBAR_TOOLS_REFRESH_LOADING : refreshOpts.icon || conf.icon.TOOLBAR_TOOLS_REFRESH
+        icon: this.isRefresh ? refreshOpts.iconLoading || src_conf.icon.TOOLBAR_TOOLS_REFRESH_LOADING : refreshOpts.icon || src_conf.icon.TOOLBAR_TOOLS_REFRESH
       },
       attrs: {
-        title: conf.i18n('vxe.toolbar.refresh')
+        title: src_conf.i18n('vxe.toolbar.refresh')
       },
       on: {
         click: this.refreshEvent
@@ -34132,10 +34422,10 @@ function renderCustoms(h, _vm) {
     }) : _e(), zoom && $xegrid ? h('vxe-button', {
       props: {
         circle: true,
-        icon: $xegrid.isMaximized() ? zoomOpts.iconOut || conf.icon.TOOLBAR_TOOLS_ZOOM_OUT : zoomOpts.iconIn || conf.icon.TOOLBAR_TOOLS_ZOOM_IN
+        icon: $xegrid.isMaximized() ? zoomOpts.iconOut || src_conf.icon.TOOLBAR_TOOLS_ZOOM_OUT : zoomOpts.iconIn || src_conf.icon.TOOLBAR_TOOLS_ZOOM_IN
       },
       attrs: {
-        title: conf.i18n("vxe.toolbar.zoom".concat($xegrid.isMaximized() ? 'Out' : 'In'))
+        title: src_conf.i18n("vxe.toolbar.zoom".concat($xegrid.isMaximized() ? 'Out' : 'In'))
       },
       on: {
         click: $xegrid.triggerZoomEvent
@@ -34469,14 +34759,14 @@ var Toolbar = Object.assign(src_toolbar, {
     size: {
       type: String,
       default: function _default() {
-        return conf.pager.size || conf.size;
+        return src_conf.pager.size || src_conf.size;
       }
     },
     // 自定义布局
     layouts: {
       type: Array,
       default: function _default() {
-        return conf.pager.layouts || ['PrevJump', 'PrevPage', 'Jump', 'PageCount', 'NextPage', 'NextJump', 'Sizes', 'Total'];
+        return src_conf.pager.layouts || ['PrevJump', 'PrevPage', 'Jump', 'PageCount', 'NextPage', 'NextJump', 'Sizes', 'Total'];
       }
     },
     // 当前页
@@ -34490,7 +34780,7 @@ var Toolbar = Object.assign(src_toolbar, {
     pageSize: {
       type: Number,
       default: function _default() {
-        return conf.pager.pageSize || 10;
+        return src_conf.pager.pageSize || 10;
       }
     },
     // 总条数
@@ -34502,55 +34792,55 @@ var Toolbar = Object.assign(src_toolbar, {
     pagerCount: {
       type: Number,
       default: function _default() {
-        return conf.pager.pagerCount || 7;
+        return src_conf.pager.pagerCount || 7;
       }
     },
     // 每页大小选项列表
     pageSizes: {
       type: Array,
       default: function _default() {
-        return conf.pager.pageSizes || [10, 15, 20, 50, 100];
+        return src_conf.pager.pageSizes || [10, 15, 20, 50, 100];
       }
     },
     // 列对其方式
     align: {
       type: String,
       default: function _default() {
-        return conf.pager.align;
+        return src_conf.pager.align;
       }
     },
     // 带边框
     border: {
       type: Boolean,
       default: function _default() {
-        return conf.pager.border;
+        return src_conf.pager.border;
       }
     },
     // 带背景颜色
     background: {
       type: Boolean,
       default: function _default() {
-        return conf.pager.background;
+        return src_conf.pager.background;
       }
     },
     // 配套的样式
     perfect: {
       type: Boolean,
       default: function _default() {
-        return conf.pager.perfect;
+        return src_conf.pager.perfect;
       }
     },
     // 当只有一页时隐藏
     autoHidden: {
       type: Boolean,
       default: function _default() {
-        return conf.pager.autoHidden;
+        return src_conf.pager.autoHidden;
       }
     },
     transfer: {
       type: Boolean,
       default: function _default() {
-        return conf.pager.transfer;
+        return src_conf.pager.transfer;
       }
     },
     className: [String, Function],
@@ -34598,7 +34888,7 @@ var Toolbar = Object.assign(src_toolbar, {
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isNumber(item)) {
           return {
             value: item,
-            label: "".concat(conf.i18n('vxe.pager.pagesize', [item]))
+            label: "".concat(src_conf.i18n('vxe.pager.pagesize', [item]))
           };
         }
 
@@ -34662,13 +34952,13 @@ var Toolbar = Object.assign(src_toolbar, {
         }],
         attrs: {
           type: 'button',
-          title: conf.i18n('vxe.pager.prevPage')
+          title: src_conf.i18n('vxe.pager.prevPage')
         },
         on: {
           click: this.prevPage
         }
       }, [h('i', {
-        class: ['vxe-pager--btn-icon', this.iconPrevPage || conf.icon.PAGER_PREV_PAGE]
+        class: ['vxe-pager--btn-icon', this.iconPrevPage || src_conf.icon.PAGER_PREV_PAGE]
       })]);
     },
     // 向上翻页
@@ -34680,15 +34970,15 @@ var Toolbar = Object.assign(src_toolbar, {
         }],
         attrs: {
           type: 'button',
-          title: conf.i18n('vxe.pager.prevJump')
+          title: src_conf.i18n('vxe.pager.prevJump')
         },
         on: {
           click: this.prevJump
         }
       }, [tagName ? h('i', {
-        class: ['vxe-pager--jump-more-icon', this.iconJumpMore || conf.icon.PAGER_JUMP_MORE]
+        class: ['vxe-pager--jump-more-icon', this.iconJumpMore || src_conf.icon.PAGER_JUMP_MORE]
       }) : null, h('i', {
-        class: ['vxe-pager--jump-icon', this.iconJumpPrev || conf.icon.PAGER_JUMP_PREV]
+        class: ['vxe-pager--jump-icon', this.iconJumpPrev || src_conf.icon.PAGER_JUMP_PREV]
       })]);
     },
     // number
@@ -34712,15 +35002,15 @@ var Toolbar = Object.assign(src_toolbar, {
         }],
         attrs: {
           type: 'button',
-          title: conf.i18n('vxe.pager.nextJump')
+          title: src_conf.i18n('vxe.pager.nextJump')
         },
         on: {
           click: this.nextJump
         }
       }, [tagName ? h('i', {
-        class: ['vxe-pager--jump-more-icon', this.iconJumpMore || conf.icon.PAGER_JUMP_MORE]
+        class: ['vxe-pager--jump-more-icon', this.iconJumpMore || src_conf.icon.PAGER_JUMP_MORE]
       }) : null, h('i', {
-        class: ['vxe-pager--jump-icon', this.iconJumpNext || conf.icon.PAGER_JUMP_NEXT]
+        class: ['vxe-pager--jump-icon', this.iconJumpNext || src_conf.icon.PAGER_JUMP_NEXT]
       })]);
     },
     // 下一页
@@ -34731,13 +35021,13 @@ var Toolbar = Object.assign(src_toolbar, {
         }],
         attrs: {
           type: 'button',
-          title: conf.i18n('vxe.pager.nextPage')
+          title: src_conf.i18n('vxe.pager.nextPage')
         },
         on: {
           click: this.nextPage
         }
       }, [h('i', {
-        class: ['vxe-pager--btn-icon', this.iconNextPage || conf.icon.PAGER_NEXT_PAGE]
+        class: ['vxe-pager--btn-icon', this.iconNextPage || src_conf.icon.PAGER_NEXT_PAGE]
       })]);
     },
     // sizes
@@ -34771,7 +35061,7 @@ var Toolbar = Object.assign(src_toolbar, {
         class: 'vxe-pager--jump'
       }, [isFull ? h('span', {
         class: 'vxe-pager--goto-text'
-      }, conf.i18n('vxe.pager.goto')) : null, h('input', {
+      }, src_conf.i18n('vxe.pager.goto')) : null, h('input', {
         class: 'vxe-pager--goto',
         domProps: {
           value: this.inpCurrPage
@@ -34787,7 +35077,7 @@ var Toolbar = Object.assign(src_toolbar, {
         }
       }), isFull ? h('span', {
         class: 'vxe-pager--classifier-text'
-      }, conf.i18n('vxe.pager.pageClassifier')) : null]);
+      }, src_conf.i18n('vxe.pager.pageClassifier')) : null]);
     },
     // PageCount
     renderPageCount: function renderPageCount(h) {
@@ -34801,7 +35091,7 @@ var Toolbar = Object.assign(src_toolbar, {
     renderTotal: function renderTotal(h) {
       return h('span', {
         class: 'vxe-pager--total'
-      }, conf.i18n('vxe.pager.total', [this.total]));
+      }, src_conf.i18n('vxe.pager.total', [this.total]));
     },
     // number
     renderPageBtn: function renderPageBtn(h, showJump) {
@@ -34979,7 +35269,7 @@ var Checkbox = Object.assign(src_checkbox, {
     size: {
       type: String,
       default: function _default() {
-        return conf.checkbox.size || conf.size;
+        return src_conf.checkbox.size || src_conf.size;
       }
     }
   },
@@ -35065,13 +35355,13 @@ var Radio = Object.assign(src_radio, {
     strict: {
       type: Boolean,
       default: function _default() {
-        return conf.radioGroup.strict;
+        return src_conf.radioGroup.strict;
       }
     },
     size: {
       type: String,
       default: function _default() {
-        return conf.radioGroup.size || conf.size;
+        return src_conf.radioGroup.size || src_conf.size;
       }
     }
   },
@@ -35142,13 +35432,13 @@ var RadioGroup = Object.assign(radio_src_group, {
     strict: {
       type: Boolean,
       default: function _default() {
-        return conf.radioButton.strict;
+        return src_conf.radioButton.strict;
       }
     },
     size: {
       type: String,
       default: function _default() {
-        return conf.radioButton.size || conf.size;
+        return src_conf.radioButton.size || src_conf.size;
       }
     }
   },
@@ -35320,14 +35610,14 @@ var autoTxtElem;
     resize: {
       type: String,
       default: function _default() {
-        return conf.textarea.resize;
+        return src_conf.textarea.resize;
       }
     },
     className: String,
     size: {
       type: String,
       default: function _default() {
-        return conf.textarea.size || conf.size;
+        return src_conf.textarea.size || src_conf.size;
       }
     }
   },
@@ -35369,7 +35659,7 @@ var autoTxtElem;
       return Object.assign({
         minRows: 1,
         maxRows: 10
-      }, conf.textarea.autosize, this.autosize);
+      }, src_conf.textarea.autosize, this.autosize);
     }
   },
   watch: {
@@ -35593,7 +35883,7 @@ var Textarea = Object.assign(src_textarea, {
     size: {
       type: String,
       default: function _default() {
-        return conf.button.size || conf.size;
+        return src_conf.button.size || src_conf.size;
       }
     },
     name: [String, Number],
@@ -35610,7 +35900,7 @@ var Textarea = Object.assign(src_textarea, {
     transfer: {
       type: Boolean,
       default: function _default() {
-        return conf.button.transfer;
+        return src_conf.button.transfer;
       }
     }
   },
@@ -35693,7 +35983,7 @@ var Textarea = Object.assign(src_textarea, {
         };
       }))
     }, this.renderContent(h).concat([h('i', {
-      class: "vxe-button--dropdown-arrow ".concat(conf.icon.BUTTON_DROPDOWN)
+      class: "vxe-button--dropdown-arrow ".concat(src_conf.icon.BUTTON_DROPDOWN)
     })])), h('div', {
       ref: 'panel',
       class: ['vxe-button--dropdown-panel', (_ref3 = {}, _defineProperty(_ref3, "size--".concat(vSize), vSize), _defineProperty(_ref3, 'animat--leave', animatVisible), _defineProperty(_ref3, 'animat--enter', showPanel), _ref3)],
@@ -35736,8 +36026,12 @@ var Textarea = Object.assign(src_textarea, {
 
       if (loading) {
         contents.push(h('i', {
-          class: ['vxe-button--loading-icon', conf.icon.BUTTON_LOADING]
+          class: ['vxe-button--loading-icon', src_conf.icon.BUTTON_LOADING]
         }));
+      } else if ($scopedSlots.icon) {
+        contents.push(h('span', {
+          class: 'vxe-button--custom-icon'
+        }, $scopedSlots.icon.call(this, {})));
       } else if (icon) {
         contents.push(h('i', {
           class: ['vxe-button--icon', icon]
@@ -35747,7 +36041,7 @@ var Textarea = Object.assign(src_textarea, {
       if ($scopedSlots.default) {
         contents.push(h('span', {
           class: 'vxe-button--content'
-        }, $scopedSlots.default.call(this)));
+        }, $scopedSlots.default.call(this, {})));
       } else if (content) {
         contents.push(h('span', {
           class: 'vxe-button--content'
@@ -36225,19 +36519,19 @@ function tooltip_renderContent(h, _vm) {
     size: {
       type: String,
       default: function _default() {
-        return conf.tooltip.size || conf.size;
+        return src_conf.tooltip.size || src_conf.size;
       }
     },
     trigger: {
       type: String,
       default: function _default() {
-        return conf.tooltip.trigger;
+        return src_conf.tooltip.trigger;
       }
     },
     theme: {
       type: String,
       default: function _default() {
-        return conf.tooltip.theme;
+        return src_conf.tooltip.theme;
       }
     },
     content: {
@@ -36254,13 +36548,13 @@ function tooltip_renderContent(h, _vm) {
     enterDelay: {
       type: Number,
       default: function _default() {
-        return conf.tooltip.enterDelay;
+        return src_conf.tooltip.enterDelay;
       }
     },
     leaveDelay: {
       type: Number,
       default: function _default() {
-        return conf.tooltip.leaveDelay;
+        return src_conf.tooltip.leaveDelay;
       }
     }
   },
@@ -36627,7 +36921,7 @@ function renderPrefixIcon(h, titlePrefix) {
   return h('span', {
     class: 'vxe-form--item-title-prefix'
   }, [h('i', {
-    class: titlePrefix.icon || conf.icon.FORM_PREFIX
+    class: titlePrefix.icon || src_conf.icon.FORM_PREFIX
   })]);
 }
 
@@ -36635,7 +36929,7 @@ function render_renderSuffixIcon(h, titleSuffix) {
   return h('span', {
     class: 'vxe-form--item-title-suffix'
   }, [h('i', {
-    class: titleSuffix.icon || conf.icon.FORM_SUFFIX
+    class: titleSuffix.icon || src_conf.icon.FORM_SUFFIX
   })]);
 }
 
@@ -36650,6 +36944,7 @@ function renderTitle(h, _vm, item) {
   var compConf = isEnableConf(itemRender) ? v_x_e_table.renderer.get(itemRender.name) : null;
   var params = {
     data: data,
+    field: field,
     property: field,
     item: item,
     $form: _vm
@@ -36744,6 +37039,7 @@ var VxeFormConfigItem = {
         titleOverflow = item.titleOverflow,
         children = item.children;
     var compConf = isEnableConf(itemRender) ? v_x_e_table.renderer.get(itemRender.name) : null;
+    var itemClassName = compConf ? compConf.itemClassName : '';
     var span = item.span || $xeform.span;
     var align = item.align || $xeform.align;
     var titleAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
@@ -36819,7 +37115,7 @@ var VxeFormConfigItem = {
       mouseleave: $xeform.handleTitleTipLeaveEvent
     } : {};
     return h('div', {
-      class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : null, className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className(params) : className : '', {
+      class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : null, className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className(params) : className : '', itemClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(itemClassName) ? itemClassName(params) : className : '', {
         'is--title': title,
         'is--colon': titleColon,
         'is--asterisk': titleAsterisk,
@@ -36854,8 +37150,8 @@ var VxeFormConfigItem = {
       }
     }, [h('span', {
       class: 'vxe-form--item-trigger-text'
-    }, collapseAll ? conf.i18n('vxe.form.unfolding') : conf.i18n('vxe.form.folding')), h('i', {
-      class: ['vxe-form--item-trigger-icon', collapseAll ? conf.icon.FORM_FOLDING : conf.icon.FORM_UNFOLDING]
+    }, collapseAll ? src_conf.i18n('vxe.form.unfolding') : src_conf.i18n('vxe.form.folding')), h('i', {
+      class: ['vxe-form--item-trigger-icon', collapseAll ? src_conf.icon.FORM_FOLDING : src_conf.icon.FORM_UNFOLDING]
     })]) : null, errRule && validOpts.showMessage ? h('div', {
       class: 'vxe-form--item-valid',
       style: errRule.maxWidth ? {
@@ -36892,6 +37188,7 @@ var VxeFormConfigItem = {
 
 
 
+
 
 
 var form_Rule = /*#__PURE__*/function () {
@@ -36977,43 +37274,43 @@ function getResetValue(value, resetValue) {
     size: {
       type: String,
       default: function _default() {
-        return conf.form.size || conf.size;
+        return src_conf.form.size || src_conf.size;
       }
     },
     span: {
       type: [String, Number],
       default: function _default() {
-        return conf.form.span;
+        return src_conf.form.span;
       }
     },
     align: {
       type: String,
       default: function _default() {
-        return conf.form.align;
+        return src_conf.form.align;
       }
     },
     titleAlign: {
       type: String,
       default: function _default() {
-        return conf.form.titleAlign;
+        return src_conf.form.titleAlign;
       }
     },
     titleWidth: {
       type: [String, Number],
       default: function _default() {
-        return conf.form.titleWidth;
+        return src_conf.form.titleWidth;
       }
     },
     titleColon: {
       type: Boolean,
       default: function _default() {
-        return conf.form.titleColon;
+        return src_conf.form.titleColon;
       }
     },
     titleAsterisk: {
       type: Boolean,
       default: function _default() {
-        return conf.form.titleAsterisk;
+        return src_conf.form.titleAsterisk;
       }
     },
     titleOverflow: {
@@ -37026,7 +37323,7 @@ function getResetValue(value, resetValue) {
     preventSubmit: {
       type: Boolean,
       default: function _default() {
-        return conf.form.preventSubmit;
+        return src_conf.form.preventSubmit;
       }
     },
     validConfig: Object,
@@ -37034,7 +37331,7 @@ function getResetValue(value, resetValue) {
     customLayout: {
       type: Boolean,
       default: function _default() {
-        return conf.form.customLayout;
+        return src_conf.form.customLayout;
       }
     }
   },
@@ -37060,10 +37357,10 @@ function getResetValue(value, resetValue) {
   },
   computed: {
     validOpts: function validOpts() {
-      return Object.assign({}, conf.form.validConfig, this.validConfig);
+      return Object.assign({}, src_conf.form.validConfig, this.validConfig);
     },
     tooltipOpts: function tooltipOpts() {
-      return Object.assign({}, conf.tooltip, conf.form.tooltipConfig, this.tooltipConfig);
+      return Object.assign({}, src_conf.tooltip, src_conf.form.tooltipConfig, this.tooltipConfig);
     }
   },
   watch: {
@@ -37125,13 +37422,16 @@ function getResetValue(value, resetValue) {
     })), h('div', {
       class: 'vxe-form-slots',
       ref: 'hideItem'
-    }, customLayout ? [] : defaultSlot ? defaultSlot.call(this, h, {}) : []), h('div', {
-      class: ['vxe-loading', {
-        'is--visible': loading
-      }]
-    }, [h('div', {
-      class: 'vxe-loading--spinner'
-    })]),
+    }, customLayout ? [] : defaultSlot ? defaultSlot.call(this, h, {}) : []),
+    /**
+     * 加载中
+     */
+    h(packages_loading, {
+      class: 'vxe-form--loading',
+      props: {
+        loading: loading
+      }
+    }),
     /**
      * 工具提示
      */
@@ -37679,6 +37979,7 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
       className = item.className,
       titleOverflow = item.titleOverflow;
   var compConf = isEnableConf(itemRender) ? v_x_e_table.renderer.get(itemRender.name) : null;
+  var itemClassName = compConf ? compConf.itemClassName : '';
   var span = item.span || _vm.span;
   var align = item.align || _vm.align;
   var titleAlign = item.titleAlign || _vm.titleAlign;
@@ -37691,6 +37992,7 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
   var hasEllipsis = showTitle || showTooltip || showEllipsis;
   var params = {
     data: data,
+    field: field,
     property: field,
     item: item,
     $form: _vm
@@ -37730,7 +38032,7 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
     mouseleave: _vm.handleTitleTipLeaveEvent
   } : {};
   return h('div', {
-    class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : null, className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className(params) : className : '', {
+    class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className(params) : className : '', itemClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(itemClassName) ? itemClassName(params) : itemClassName : '', {
       'is--title': title,
       'is--required': isRequired,
       'is--hidden': visible === false || folding && collapseAll,
@@ -37759,8 +38061,8 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
     }
   }, [h('span', {
     class: 'vxe-form--item-trigger-text'
-  }, collapseAll ? conf.i18n('vxe.form.unfolding') : conf.i18n('vxe.form.folding')), h('i', {
-    class: ['vxe-form--item-trigger-icon', collapseAll ? conf.icon.FORM_FOLDING : conf.icon.FORM_UNFOLDING]
+  }, collapseAll ? src_conf.i18n('vxe.form.unfolding') : src_conf.i18n('vxe.form.folding')), h('i', {
+    class: ['vxe-form--item-trigger-icon', collapseAll ? src_conf.icon.FORM_FOLDING : src_conf.icon.FORM_UNFOLDING]
   })]) : null, errRule && validOpts.showMessage ? h('div', {
     class: 'vxe-form--item-valid',
     style: errRule.maxWidth ? {
@@ -37960,7 +38262,7 @@ var Option = Object.assign(src_option, {
     size: {
       type: String,
       default: function _default() {
-        return conf.switch.size || conf.size;
+        return src_conf.switch.size || src_conf.size;
       }
     },
     openLabel: String,
@@ -38123,6 +38425,7 @@ var Switch = Object.assign(src_switch, {
 
 
 
+
 /* harmony default export */ var src_list = ({
   name: 'VxeList',
   mixins: [size],
@@ -38135,13 +38438,13 @@ var Switch = Object.assign(src_switch, {
     size: {
       type: String,
       default: function _default() {
-        return conf.list.size || conf.size;
+        return src_conf.list.size || src_conf.size;
       }
     },
     autoResize: {
       type: Boolean,
       default: function _default() {
-        return conf.list.autoResize;
+        return src_conf.list.autoResize;
       }
     },
     syncResize: [Boolean, String, Number],
@@ -38157,7 +38460,7 @@ var Switch = Object.assign(src_switch, {
   },
   computed: {
     sYOpts: function sYOpts() {
-      return Object.assign({}, conf.list.scrollY, this.scrollY);
+      return Object.assign({}, src_conf.list.scrollY, this.scrollY);
     },
     styles: function styles() {
       var height = this.height,
@@ -38260,13 +38563,16 @@ var Switch = Object.assign(src_switch, {
     }, $scopedSlots.default ? $scopedSlots.default.call(this, {
       items: items,
       $list: this
-    }, h) : [])]), h('div', {
-      class: ['vxe-list--loading vxe-loading', {
-        'is--visible': loading
-      }]
-    }, [h('div', {
-      class: 'vxe-loading--spinner'
-    })])]);
+    }, h) : [])]),
+    /**
+     * 加载中
+     */
+    h(packages_loading, {
+      class: 'vxe-list--loading',
+      props: {
+        loading: loading
+      }
+    })]);
   },
   methods: {
     getParentElem: function getParentElem() {
@@ -38516,7 +38822,7 @@ var List = Object.assign(src_list, {
     size: {
       type: String,
       default: function _default() {
-        return conf.size;
+        return src_conf.size;
       }
     },
     destroyOnClose: Boolean,
@@ -38829,6 +39135,9 @@ var Pulldown = Object.assign(pulldown, {
 // CONCATENATED MODULE: ./packages/locale/lang/zh-CN.js
 /* harmony default export */ var zh_CN = ({
   vxe: {
+    loading: {
+      text: '加载中'
+    },
     error: {
       groupFixed: '如果使用分组表头，固定列必须按组设置',
       groupMouseRange: '分组表头与 "{0}" 不能同时使用，这可能会出现错误',
@@ -38975,6 +39284,8 @@ var Pulldown = Object.assign(pulldown, {
       operError: '发生错误，操作失败！'
     },
     select: {
+      search: '搜索',
+      loadingText: '加载中',
       emptyText: '暂无数据'
     },
     pager: {