vxe-table 3.5.9-beta.3 → 3.5.9-beta.6

package/lib/index.umd.js

@@ -8808,7 +8808,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.5.9-beta.2", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.5.9-beta.6", "] ").concat(conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -9039,10 +9039,10 @@ var UtilTools = {
     return '' + (value === '' || value === null || value === undefined ? placeholder ? 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) {
@@ -10077,7 +10077,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.5.9-beta.2",
+  version: "3.5.9-beta.6",
   reg: reg,
   use: use,
   setup: setup,
@@ -10297,7 +10297,7 @@ var columnInfo_ColumnInfo = /*#__PURE__*/function () {
   }, {
     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",
@@ -11153,7 +11153,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 = [];
@@ -13066,7 +13066,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;
@@ -13082,7 +13082,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) {
@@ -13335,7 +13335,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) {
@@ -13910,7 +13910,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) : [];
 
@@ -13982,12 +13984,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);
             });
           }
         });
@@ -14284,7 +14297,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;
@@ -14296,10 +14309,10 @@ var Methods = {
         parent: parent
       };
 
-      if (property) {
+      if (field) {
         if (false) {}
 
-        fullColumnFieldData[property] = rest;
+        fullColumnFieldData[field] = rest;
       }
 
       if (!hasFixed && fixed) {
@@ -14514,10 +14527,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) {
@@ -14532,7 +14545,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];
@@ -14681,7 +14694,7 @@ var Methods = {
     } else {
       rows.forEach(function (row) {
         visibleColumn.forEach(function (column) {
-          if (column.property) {
+          if (column.field) {
             methods_setCellValue(row, column, null);
           }
         });
@@ -14751,7 +14764,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;
@@ -14825,20 +14838,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 {
@@ -14916,7 +14929,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;
@@ -14943,8 +14956,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
         });
@@ -14964,7 +14977,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;
@@ -15013,7 +15027,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;
@@ -15071,7 +15085,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
@@ -15212,8 +15227,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;
   },
 
@@ -16664,7 +16680,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) {
@@ -17033,10 +17051,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;
@@ -17059,25 +17077,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;
               });
@@ -17107,7 +17125,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;
@@ -17122,7 +17140,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);
         }
       }
@@ -17217,9 +17235,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);
@@ -17266,7 +17284,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;
@@ -17282,7 +17300,7 @@ var Methods = {
        * 绑定属性方式（高性能，有污染）
        * 必须在行数据存在对应的属性，否则将不响应
        */
-      if (property) {
+      if (checkField) {
         var checkValFn = function checkValFn(row) {
           if (!checkMethod || checkMethod({
             row: row
@@ -17291,7 +17309,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);
           }
         }; // 如果存在选中方法
         // 如果方法成立，则更新值，否则忽略该数据
@@ -17380,7 +17398,7 @@ var Methods = {
         }
       }
 
-      this.selection = property ? [] : beforeSelection.concat(selectRows);
+      this.selection = checkField ? [] : beforeSelection.concat(selectRows);
     }
 
     this.treeIndeterminates = [];
@@ -17686,17 +17704,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);
         });
       }
     }
@@ -18175,21 +18193,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()
       };
@@ -18306,14 +18327,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
         });
@@ -18345,7 +18366,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);
@@ -21456,7 +21478,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);
@@ -21465,7 +21488,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 = [];
@@ -21481,7 +21504,8 @@ var Table = Object.assign(table, {
           if (valueList.length) {
             filterList.push({
               column: column,
-              property: property,
+              field: field,
+              property: field,
               values: valueList,
               datas: dataList
             });
@@ -21504,7 +21528,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) {
@@ -21522,7 +21546,8 @@ var Table = Object.assign(table, {
 
       this.emitEvent('filter-change', {
         column: column,
-        property: property,
+        field: field,
+        property: field,
         values: values,
         datas: datas,
         filters: filterList,
@@ -22417,7 +22442,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) {
@@ -22433,7 +22458,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         }
       }); // 如果绑定了多选属性，则更新状态
 
-      if (!property) {
+      if (!checkField) {
         rows.forEach(function (row) {
           var sIndex = selection.indexOf(row);
 
@@ -22681,20 +22706,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) {
@@ -27218,6 +27243,9 @@ function renderExtraSuffixIcon(h, _vm) {
 
 
 
+
+
+
 function isOptionVisible(option) {
   return option.visible !== false;
 }
@@ -27360,6 +27388,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);
@@ -27396,7 +27433,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() {
@@ -27445,7 +27482,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', conf.icon.SELECT_LOADED]
+    }), h('span', {
+      class: 'vxe-select--search-text'
+    }, conf.i18n('vxe.select.loadingText'))])];
+  }
 
   if (isGroup) {
     if (visibleGroupList.length) {
@@ -27492,6 +27540,10 @@ function select_renderOpts(h, _vm) {
         return conf.select.size || conf.size;
       }
     },
+    filterable: Boolean,
+    filterMethod: Function,
+    remote: Boolean,
+    remoteMethod: Function,
     emptyText: String,
     // 已废弃，被 option-config.keyField 替换
     optionId: {
@@ -27533,13 +27585,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: {
@@ -27577,10 +27633,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) {
@@ -27591,6 +27656,10 @@ function select_renderOpts(h, _vm) {
         }).join(', ');
       }
 
+      if (remote) {
+        return getRemoteSelectLabel(this, value);
+      }
+
       return getSelectLabel(this, value);
     }
   },
@@ -27651,19 +27720,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'
@@ -27698,7 +27769,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: conf.i18n('vxe.select.search'),
+        prefixIcon: 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)]);
@@ -27749,23 +27839,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];
       }
     },
@@ -27800,6 +27924,7 @@ function select_renderOpts(h, _vm) {
       this.hideOptionPanel();
     },
     clearValueEvent: function clearValueEvent(evnt, selectValue) {
+      this.remoteValueList = [];
       this.changeEvent(evnt, selectValue);
       this.$emit('clear', {
         value: selectValue,
@@ -27826,9 +27951,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;
@@ -27845,8 +27971,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();
       }
@@ -27883,6 +28026,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;
 
@@ -27906,7 +28050,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();
 
@@ -27943,6 +28087,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;
@@ -27951,6 +28106,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;
     },
@@ -27988,12 +28184,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) {
@@ -28006,38 +28204,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;
 
@@ -28111,9 +28319,9 @@ function select_renderOpts(h, _vm) {
             }
           }
 
-          _this6.panelStyle = panelStyle;
-          _this6.panelPlacement = panelPlacement;
-          return _this6.$nextTick();
+          _this8.panelStyle = panelStyle;
+          _this8.panelPlacement = panelPlacement;
+          return _this8.$nextTick();
         }
       });
     },
@@ -32756,7 +32964,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
 
       if (editConfig) {
         tableProps.editConfig = Object.assign({}, editConfig, {
-          activeMethod: this.handleActiveMethod
+          beforeEditMethod: this.handleBeforeEditMethod
         });
       }
 
@@ -32943,12 +33151,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;
@@ -36700,6 +36913,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
@@ -37745,6 +37959,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
@@ -39036,6 +39251,8 @@ var Pulldown = Object.assign(pulldown, {
       operError: '发生错误，操作失败！'
     },
     select: {
+      search: '搜索',
+      loadingText: '加载中',
       emptyText: '暂无数据'
     },
     pager: {