vxe-table 4.2.6-beta.3 → 4.2.6

package/lib/index.umd.js

@@ -8712,8 +8712,8 @@ var GlobalConfig = {
     // 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,
@@ -8805,7 +8805,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("4.2.6-beta.2", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("4.2.6", "] ").concat(conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -9215,7 +9215,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",
@@ -9542,10 +9542,10 @@ function toTreePathSeq(path) {
   }).join('');
 }
 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);
 }
 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);
 }
 function getPropClass(property, params) {
   return property ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(property) ? property(params) : property : '';
@@ -10810,7 +10810,7 @@ var v_x_e_table_config = new v_x_e_table_VXETableConfig();
 var v = 'v4';
 var VXETable = {
   v: v,
-  version: "4.2.6-beta.2",
+  version: "4.2.6",
   setup: setup_setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -11212,7 +11212,8 @@ var tableFilterHook = {
 
         $xetable.dispatchEvent('filter-visible', {
           column: column,
-          property: column.property,
+          field: column.field,
+          property: column.field,
           filterList: $xetable.getCheckedFilters(),
           visible: filterStore.visible
         }, evnt);
@@ -11256,7 +11257,7 @@ var tableFilterHook = {
             oldScrollYLoad = reactData.scrollYLoad;
         var filterOpts = computeFilterOpts.value;
         var column = filterStore.column;
-        var property = column.property;
+        var field = column.field;
         var values = [];
         var datas = [];
         column.filters.forEach(function (item) {
@@ -11274,7 +11275,8 @@ var tableFilterHook = {
 
         $xetable.dispatchEvent('filter-change', {
           column: column,
-          property: property,
+          field: field,
+          property: field,
           values: values,
           datas: datas,
           filters: filterList,
@@ -11390,7 +11392,7 @@ var tableFilterHook = {
         var tableFullColumn = internalData.tableFullColumn;
         var filterList = [];
         tableFullColumn.filter(function (column) {
-          var property = column.property,
+          var field = column.field,
               filters = column.filters;
           var valueList = [];
           var dataList = [];
@@ -11406,7 +11408,8 @@ var tableFilterHook = {
             if (valueList.length) {
               filterList.push({
                 column: column,
-                property: property,
+                field: field,
+                property: field,
                 values: valueList,
                 datas: dataList
               });
@@ -11830,12 +11833,6 @@ var tableMenuHook = {
     menuPrivateMethods = {
       /**
        * 处理菜单的移动
-       * @param evnt
-       * @param ctxMenuStore
-       * @param property
-       * @param hasOper
-       * @param operRest
-       * @param menuList
        */
       moveCtxMenu: function moveCtxMenu(evnt, ctxMenuStore, property, hasOper, operRest, menuList) {
         var selectItem;
@@ -12536,7 +12533,7 @@ var editHook = {
         var actived = editStore.actived,
             removeList = editStore.removeList,
             insertList = editStore.insertList;
-        var property = checkboxOpts.checkField;
+        var checkField = checkboxOpts.checkField;
         var rest = [];
 
         if (!rows) {
@@ -12552,7 +12549,7 @@ var editHook = {
           }
         }); // 如果绑定了多选属性，则更新状态
 
-        if (!property) {
+        if (!checkField) {
           rows.forEach(function (row) {
             var sIndex = $xetable.findRowIndexOf(selection, row);
 
@@ -15146,18 +15143,20 @@ var quarterSize = 8;
       }
     },
     // date、week、month、quarter、year
-    minDate: {
+    startDate: {
       type: [String, Number, Date],
       default: function _default() {
-        return conf.input.minDate;
+        return conf.input.startDate;
       }
     },
-    maxDate: {
+    endDate: {
       type: [String, Number, Date],
       default: function _default() {
-        return conf.input.maxDate;
+        return conf.input.endDate;
       }
     },
+    minDate: [String, Number, Date],
+    maxDate: [String, Number, Date],
     // 已废弃 startWeek，被 startDay 替换
     startWeek: Number,
     startDay: {
@@ -15305,11 +15304,11 @@ var quarterSize = 8;
       var isPawdType = computeIsPawdType.value;
       return props.clearable && (isPawdType || isNumType || isDatePickerType || type === 'text' || type === 'search');
     });
-    var computeDateMinTime = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
-      return props.minDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(props.minDate) : null;
+    var computeDateStartTime = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
+      return props.startDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(props.startDate) : null;
     });
-    var computeDateMaxTime = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
-      return props.maxDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(props.maxDate) : null;
+    var computeDateEndTime = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
+      return props.endDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(props.endDate) : null;
     });
     var computeSupportMultiples = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
       return ['date', 'week', 'month', 'quarter', 'year'].includes(props.type);
@@ -15369,21 +15368,21 @@ var quarterSize = 8;
       return val;
     });
     var computeIsDisabledPrevDateBtn = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
-      var dateMinTime = computeDateMinTime.value;
+      var dateStartTime = computeDateStartTime.value;
       var selectMonth = reactData.selectMonth;
 
-      if (selectMonth && dateMinTime) {
-        return selectMonth <= dateMinTime;
+      if (selectMonth && dateStartTime) {
+        return selectMonth <= dateStartTime;
       }
 
       return false;
     });
     var computeIsDisabledNextDateBtn = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
-      var dateMaxTime = computeDateMaxTime.value;
+      var dateEndTime = computeDateEndTime.value;
       var selectMonth = reactData.selectMonth;
 
-      if (selectMonth && dateMaxTime) {
-        return selectMonth >= dateMaxTime;
+      if (selectMonth && dateEndTime) {
+        return selectMonth >= dateEndTime;
       }
 
       return false;
@@ -15602,10 +15601,10 @@ var quarterSize = 8;
         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() + dateHMSTime);
+        var startDayDate = new Date(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatDay(selectMonth, prevOffsetDate).getTime() + dateHMSTime);
 
         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();
@@ -16599,10 +16598,11 @@ var quarterSize = 8;
     };
 
     var dateConfirmEvent = function dateConfirmEvent() {
-      var type = props.type;
+      var multiple = props.multiple;
       var dateValue = computeDateValue.value;
+      var isDateTimeType = computeIsDateTimeType.value;
 
-      if (type === 'datetime') {
+      if (isDateTimeType || multiple) {
         dateChange(dateValue || reactData.currentDate);
       }
 
@@ -17827,6 +17827,9 @@ var es_string_includes = __webpack_require__("2532");
     return this.renderVN();
   }
 }));
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.finally.js
+var es_promise_finally = __webpack_require__("a79d");
+
 // CONCATENATED MODULE: ./packages/select/src/select.ts
 
 
@@ -17844,6 +17847,10 @@ var es_string_includes = __webpack_require__("2532");
 
 
 
+
+
+
+
 
 function isOptionVisible(option) {
   return option.visible !== false;
@@ -17882,6 +17889,10 @@ function getOptUniqueId() {
         return conf.select.size || conf.size;
       }
     },
+    filterable: Boolean,
+    filterMethod: Function,
+    remote: Boolean,
+    remoteMethod: Function,
     emptyText: String,
     // 已废弃，被 option-config.keyField 替换
     optionId: {
@@ -17914,16 +17925,21 @@ function getOptUniqueId() {
       fullOptionList: [],
       visibleGroupList: [],
       visibleOptionList: [],
+      remoteValueList: [],
       panelIndex: 0,
       panelStyle: {},
       panelPlacement: null,
+      currentOption: null,
       currentValue: null,
       visiblePanel: false,
       animatVisible: false,
-      isActivated: false
+      isActivated: false,
+      searchValue: '',
+      searchLoading: false
     });
     var refElem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])();
     var refInput = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])();
+    var refInpSearch = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])();
     var refOptionWrapper = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])();
     var refOptionPanel = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])();
     var refMaps = {
@@ -18014,6 +18030,16 @@ function getOptUniqueId() {
       });
     };
 
+    var getRemoteSelectLabel = function getRemoteSelectLabel(value) {
+      var remoteValueList = reactData.remoteValueList;
+      var labelField = computeLabelField.value;
+      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[labelField] : value);
+    };
+
     var getSelectLabel = function getSelectLabel(value) {
       var labelField = computeLabelField.value;
       var item = findOption(value);
@@ -18022,11 +18048,20 @@ function getOptUniqueId() {
 
     var computeSelectLabel = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
       var modelValue = props.modelValue,
-          multiple = props.multiple;
+          multiple = props.multiple,
+          remote = props.remote;
       var multiMaxCharNum = computeMultiMaxCharNum.value;
 
       if (modelValue && multiple) {
-        return (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(modelValue) ? modelValue : [modelValue]).map(function (val) {
+        var vals = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(modelValue) ? modelValue : [modelValue];
+
+        if (remote) {
+          return vals.map(function (val) {
+            return getRemoteSelectLabel(val);
+          }).join(', ');
+        }
+
+        return vals.map(function (val) {
           var label = getSelectLabel(val);
 
           if (multiMaxCharNum > 0 && label.length > multiMaxCharNum) {
@@ -18037,6 +18072,10 @@ function getOptUniqueId() {
         }).join(', ');
       }
 
+      if (remote) {
+        return getRemoteSelectLabel(modelValue);
+      }
+
       return getSelectLabel(modelValue);
     });
 
@@ -18055,14 +18094,47 @@ function getOptUniqueId() {
 
 
     var refreshOption = function refreshOption() {
+      var filterable = props.filterable,
+          filterMethod = props.filterMethod;
       var fullOptionList = reactData.fullOptionList,
-          fullGroupList = reactData.fullGroupList;
+          fullGroupList = reactData.fullGroupList,
+          searchValue = reactData.searchValue;
       var isGroup = computeIsGroup.value;
+      var groupLabelField = computeGroupLabelField.value;
+      var labelField = computeLabelField.value;
 
       if (isGroup) {
-        reactData.visibleGroupList = fullGroupList.filter(isOptionVisible);
+        if (filterable && filterMethod) {
+          reactData.visibleGroupList = fullGroupList.filter(function (group) {
+            return isOptionVisible(group) && filterMethod({
+              group: group,
+              option: null,
+              searchValue: searchValue
+            });
+          });
+        } else if (filterable) {
+          reactData.visibleGroupList = fullGroupList.filter(function (group) {
+            return isOptionVisible(group) && (!searchValue || "".concat(group[groupLabelField]).indexOf(searchValue) > -1);
+          });
+        } else {
+          reactData.visibleGroupList = fullGroupList.filter(isOptionVisible);
+        }
       } else {
-        reactData.visibleOptionList = fullOptionList.filter(isOptionVisible);
+        if (filterable && filterMethod) {
+          reactData.visibleOptionList = fullOptionList.filter(function (option) {
+            return isOptionVisible(option) && filterMethod({
+              group: null,
+              option: option,
+              searchValue: searchValue
+            });
+          });
+        } else if (filterable) {
+          reactData.visibleOptionList = fullOptionList.filter(function (option) {
+            return isOptionVisible(option) && (!searchValue || "".concat(option[labelField]).indexOf(searchValue) > -1);
+          });
+        } else {
+          reactData.visibleOptionList = fullOptionList.filter(isOptionVisible);
+        }
       }
 
       return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])();
@@ -18099,6 +18171,7 @@ function getOptUniqueId() {
       var valueField = computeValueField.value;
 
       if (option) {
+        reactData.currentOption = option;
         reactData.currentValue = option[valueField];
       }
     };
@@ -18223,7 +18296,8 @@ function getOptUniqueId() {
 
     var showOptionPanel = function showOptionPanel() {
       var loading = props.loading,
-          disabled = props.disabled;
+          disabled = props.disabled,
+          filterable = props.filterable;
 
       if (!loading && !disabled) {
         clearTimeout(hidePanelTimeout);
@@ -18234,6 +18308,11 @@ function getOptUniqueId() {
 
         reactData.isActivated = true;
         reactData.animatVisible = true;
+
+        if (filterable) {
+          refreshOption();
+        }
+
         setTimeout(function () {
           var modelValue = props.modelValue,
               multiple = props.multiple;
@@ -18244,6 +18323,8 @@ function getOptUniqueId() {
             setCurrentOption(currOption);
             scrollToOption(currOption);
           }
+
+          handleFocusSearch();
         }, 10);
         updateZindex();
         updatePlacement();
@@ -18251,6 +18332,8 @@ function getOptUniqueId() {
     };
 
     var hideOptionPanel = function hideOptionPanel() {
+      reactData.searchValue = '';
+      reactData.searchLoading = false;
       reactData.visiblePanel = false;
       hidePanelTimeout = window.setTimeout(function () {
         reactData.animatVisible = false;
@@ -18271,6 +18354,7 @@ function getOptUniqueId() {
     };
 
     var clearValueEvent = function clearValueEvent(evnt, selectValue) {
+      reactData.remoteValueList = [];
       changeEvent(evnt, selectValue);
       selectMethods.dispatchEvent('clear', {
         value: selectValue
@@ -18282,9 +18366,10 @@ function getOptUniqueId() {
       hideOptionPanel();
     };
 
-    var changeOptionEvent = function changeOptionEvent(evnt, selectValue) {
+    var changeOptionEvent = function changeOptionEvent(evnt, selectValue, option) {
       var modelValue = props.modelValue,
           multiple = props.multiple;
+      var remoteValueList = reactData.remoteValueList;
 
       if (multiple) {
         var multipleValue;
@@ -18301,8 +18386,25 @@ function getOptUniqueId() {
           multipleValue = [selectValue];
         }
 
+        var remoteItem = remoteValueList.find(function (item) {
+          return item.key === selectValue;
+        });
+
+        if (remoteItem) {
+          remoteItem.result = option;
+        } else {
+          remoteValueList.push({
+            key: selectValue,
+            result: option
+          });
+        }
+
         changeEvent(evnt, multipleValue);
       } else {
+        reactData.remoteValueList = [{
+          key: selectValue,
+          result: option
+        }];
         changeEvent(evnt, selectValue);
         hideOptionPanel();
       }
@@ -18441,7 +18543,8 @@ function getOptUniqueId() {
       var clearable = props.clearable,
           disabled = props.disabled;
       var visiblePanel = reactData.visiblePanel,
-          currentValue = reactData.currentValue;
+          currentValue = reactData.currentValue,
+          currentOption = reactData.currentOption;
 
       if (!disabled) {
         var isTab = hasEventKey(evnt, EVENT_KEYS.TAB);
@@ -18462,7 +18565,7 @@ function getOptUniqueId() {
           } else if (isEnter) {
             evnt.preventDefault();
             evnt.stopPropagation();
-            changeOptionEvent(evnt, currentValue);
+            changeOptionEvent(evnt, currentValue, currentOption);
           } else if (isUpArrow || isDwArrow) {
             evnt.preventDefault();
 
@@ -18496,6 +18599,18 @@ function getOptUniqueId() {
       hideOptionPanel();
     };
 
+    var handleFocusSearch = function handleFocusSearch() {
+      if (props.filterable) {
+        Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
+          var inpSearch = refInpSearch.value;
+
+          if (inpSearch) {
+            inpSearch.focus();
+          }
+        });
+      }
+    };
+
     var focusEvent = function focusEvent() {
       if (!props.disabled) {
         reactData.isActivated = true;
@@ -18506,6 +18621,48 @@ function getOptUniqueId() {
       reactData.isActivated = false;
     };
 
+    var modelSearchEvent = function modelSearchEvent(value) {
+      reactData.searchValue = value;
+    };
+
+    var focusSearchEvent = function focusSearchEvent() {
+      reactData.isActivated = true;
+    };
+
+    var keydownSearchEvent = function keydownSearchEvent(params) {
+      var $event = params.$event;
+      var isEnter = hasEventKey($event, EVENT_KEYS.ENTER);
+
+      if (isEnter) {
+        $event.preventDefault();
+        $event.stopPropagation();
+      }
+    };
+
+    var triggerSearchEvent = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.debounce(function () {
+      var remote = props.remote,
+          remoteMethod = props.remoteMethod;
+      var searchValue = reactData.searchValue;
+
+      if (remote && remoteMethod) {
+        reactData.searchLoading = true;
+        Promise.resolve(remoteMethod({
+          searchValue: searchValue
+        })).then(function () {
+          return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])();
+        }).catch(function () {
+          return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])();
+        }).finally(function () {
+          reactData.searchLoading = false;
+          refreshOption();
+        });
+      } else {
+        refreshOption();
+      }
+    }, 350, {
+      trailing: true
+    });
+
     var togglePanelEvent = function togglePanelEvent(params) {
       var $event = params.$event;
       $event.preventDefault();
@@ -18557,7 +18714,7 @@ function getOptUniqueId() {
           },
           onClick: function onClick(evnt) {
             if (!isDisabled) {
-              changeOptionEvent(evnt, optionValue);
+              changeOptionEvent(evnt, optionValue, option);
             }
           },
           onMouseenter: function onMouseenter() {
@@ -18608,9 +18765,20 @@ function getOptUniqueId() {
 
     var renderOpts = function renderOpts() {
       var visibleGroupList = reactData.visibleGroupList,
-          visibleOptionList = reactData.visibleOptionList;
+          visibleOptionList = reactData.visibleOptionList,
+          searchLoading = reactData.searchLoading;
       var isGroup = computeIsGroup.value;
 
+      if (searchLoading) {
+        return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
+          class: 'vxe-select--search-loading'
+        }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('i', {
+          class: ['vxe-select--search-icon', conf.icon.SELECT_LOADED]
+        }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
+          class: 'vxe-select--search-text'
+        }, conf.i18n('vxe.select.loadingText'))])];
+      }
+
       if (isGroup) {
         if (visibleGroupList.length) {
           return renderOptgroup();
@@ -18734,7 +18902,8 @@ function getOptUniqueId() {
       var className = props.className,
           transfer = props.transfer,
           disabled = props.disabled,
-          loading = props.loading;
+          loading = props.loading,
+          filterable = props.filterable;
       var inited = reactData.inited,
           isActivated = reactData.isActivated,
           visiblePanel = reactData.visiblePanel;
@@ -18745,11 +18914,11 @@ function getOptUniqueId() {
         ref: refElem,
         class: ['vxe-select', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className({
           $select: $xeselect
-        }) : 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)]
       }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
         class: 'vxe-select-slots',
         ref: 'hideOption'
-      }, slots.default ? slots.default({}) : []), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])('vxe-input'), {
+      }, slots.default ? slots.default({}) : []), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])(input, {
         ref: refInput,
         clearable: props.clearable,
         placeholder: props.placeholder,
@@ -18776,7 +18945,21 @@ function getOptUniqueId() {
         class: ['vxe-table--ignore-clear vxe-select--panel', (_ref2 = {}, _defineProperty(_ref2, "size--".concat(vSize), vSize), _defineProperty(_ref2, 'is--transfer', transfer), _defineProperty(_ref2, 'animat--leave', !loading && reactData.animatVisible), _defineProperty(_ref2, 'animat--enter', !loading && visiblePanel), _ref2)],
         placement: reactData.panelPlacement,
         style: reactData.panelStyle
-      }, inited ? [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
+      }, inited ? [filterable ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
+        class: 'vxe-select-filter--wrapper'
+      }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])(input, {
+        ref: refInpSearch,
+        class: 'vxe-select-filter--input',
+        modelValue: reactData.searchValue,
+        clearable: true,
+        placeholder: conf.i18n('vxe.select.search'),
+        prefixIcon: conf.icon.INPUT_SEARCH,
+        'onUpdate:modelValue': modelSearchEvent,
+        onFocus: focusSearchEvent,
+        onKeydown: keydownSearchEvent,
+        onChange: triggerSearchEvent,
+        onSearch: triggerSearchEvent
+      })]) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
         ref: refOptionWrapper,
         class: 'vxe-select-option--wrapper'
       }, renderOpts())] : [])])]);
@@ -23625,7 +23808,7 @@ var Cell = {
 
     var checkboxOpts = computeCheckboxOpts.value;
     var labelField = checkboxOpts.labelField,
-        property = checkboxOpts.checkField,
+        checkField = checkboxOpts.checkField,
         halfField = checkboxOpts.halfField,
         checkMethod = checkboxOpts.checkMethod,
         visibleMethod = checkboxOpts.visibleMethod;
@@ -23641,7 +23824,7 @@ var Cell = {
     var ons;
 
     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);
       ons = {
         onClick: function onClick(evnt) {
           if (!isDisabled && isVisible) {
@@ -23899,7 +24082,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) {
@@ -24705,8 +24888,8 @@ var gridComponentEmits = [].concat(_toConsumableArray(emits), ['page-change', 'f
     };
 
     var initPages = function initPages() {
-      var pagerConfig = props.pagerConfig;
       var tablePage = reactData.tablePage;
+      var pagerConfig = props.pagerConfig;
       var pagerOpts = computePagerOpts.value;
       var currentPage = pagerOpts.currentPage,
           pageSize = pagerOpts.pageSize;
@@ -25225,11 +25408,14 @@ var gridComponentEmits = [].concat(_toConsumableArray(emits), ['page-change', 'f
           reactData.formData = formData;
         }
 
-        if (!proxyInited && proxyOpts.autoLoad !== false) {
+        if (!proxyInited) {
           reactData.proxyInited = true;
-          Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
-            return gridMethods.commitProxy('_init');
-          });
+
+          if (proxyOpts.autoLoad !== false) {
+            Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
+              return gridMethods.commitProxy('_init');
+            });
+          }
         }
       }
     };
@@ -25817,14 +26003,14 @@ var gridComponentEmits = [].concat(_toConsumableArray(emits), ['page-change', 'f
       }
     });
     Object(external_commonjs_vue_commonjs2_vue_root_Vue_["watch"])(function () {
-      return props.proxyConfig;
+      return props.pagerConfig;
     }, function () {
-      initProxy();
+      initPages();
     });
     Object(external_commonjs_vue_commonjs2_vue_root_Vue_["watch"])(function () {
-      return props.pagerConfig;
+      return props.proxyConfig;
     }, function () {
-      initPages();
+      initProxy();
     });
 
     var handleGlobalKeydownEvent = function handleGlobalKeydownEvent(evnt) {
@@ -25847,6 +26033,7 @@ var gridComponentEmits = [].concat(_toConsumableArray(emits), ['page-change', 'f
         }
       }
     });
+    initPages();
     Object(external_commonjs_vue_commonjs2_vue_root_Vue_["onMounted"])(function () {
       Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
         var data = props.data,
@@ -25864,14 +26051,15 @@ var gridComponentEmits = [].concat(_toConsumableArray(emits), ['page-change', 'f
         }
 
         initToolbar();
-        initPages();
-        initProxy();
       });
       GlobalEvent.on($xegrid, 'keydown', handleGlobalKeydownEvent);
     });
     Object(external_commonjs_vue_commonjs2_vue_root_Vue_["onUnmounted"])(function () {
       GlobalEvent.off($xegrid, 'keydown');
     });
+    Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
+      initProxy();
+    });
 
     var renderVN = function renderVN() {
       var _ref2;
@@ -28597,6 +28785,7 @@ function renderTitle($xeform, item) {
   var compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null;
   var params = {
     data: data,
+    field: field,
     property: field,
     item: item,
     $form: $xeform
@@ -29743,6 +29932,7 @@ var formItemProps = {
       var itemVisibleMethod = visibleMethod;
       var params = {
         data: data,
+        field: field,
         property: field,
         item: item,
         $form: $xeform
@@ -31182,9 +31372,6 @@ var Pulldown = Object.assign(pulldown, {
 });
 dynamicApp.component(pulldown.name, pulldown);
 /* harmony default export */ var packages_pulldown = (Pulldown);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.finally.js
-var es_promise_finally = __webpack_require__("a79d");
-
 // CONCATENATED MODULE: ./packages/table/src/body.ts
 
 
@@ -31539,7 +31726,7 @@ var lineOffsetSizes = {
 
 
       if (!fixedHiddenColumn && editConfig && (editRender || cellRender) && (editOpts.showStatus || editOpts.showUpdateStatus)) {
-        isDirty = $xetable.isUpdateByRow(row, column.property);
+        isDirty = $xetable.isUpdateByRow(row, column.field);
       }
 
       var tdVNs = [];
@@ -33611,7 +33798,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
 
       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;
@@ -33623,14 +33810,14 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           parent: parent
         };
 
-        if (property) {
+        if (field) {
           if (true) {
-            if (fullColumnFieldData[property]) {
-              warnLog('vxe.error.colRepet', ['field', property]);
+            if (fullColumnFieldData[field]) {
+              warnLog('vxe.error.colRepet', ['field', field]);
             }
           }
 
-          fullColumnFieldData[property] = rest;
+          fullColumnFieldData[field] = rest;
         }
 
         if (!hasFixed && fixed) {
@@ -34032,7 +34219,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         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;
@@ -34059,8 +34246,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           if (!allRemoteSort && sortable && order) {
             orderColumns.push({
               column: column,
-              field: property,
-              property: property,
+              field: field,
+              property: field,
               order: order,
               sortTime: column.sortTime
             });
@@ -34129,7 +34316,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
                 });
               }
 
-              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, column.field)) > -1;
             });
           };
 
@@ -34800,8 +34987,6 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           loadMethod({
             $table: $xetable,
             row: row
-          }).catch(function () {
-            return [];
           }).then(function (childRecords) {
             rest.treeLoaded = true;
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(treeLazyLoadeds, function (item) {
@@ -35097,12 +35282,25 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])().then(function () {
             return tableMethods.recalculate();
           }).then(function () {
-            // 是否变更虚拟滚动
+            var targetScrollLeft = lastScrollLeft;
+            var targetScrollTop = lastScrollTop;
+            var sXOpts = computeSXOpts.value;
+            var sYOpts = computeSYOpts.value; // 是否在更新数据之后自动滚动重置滚动条
+
+            if (sXOpts.scrollToLeftOnChange) {
+              targetScrollLeft = 0;
+            }
+
+            if (sYOpts.scrollToTopOnChange) {
+              targetScrollTop = 0;
+            } // 是否变更虚拟滚动
+
+
             if (oldScrollYLoad === sYLoad) {
-              restoreScrollLocation($xetable, lastScrollLeft, lastScrollTop).then(resolve);
+              restoreScrollLocation($xetable, targetScrollLeft, targetScrollTop).then(resolve);
             } else {
               setTimeout(function () {
-                return restoreScrollLocation($xetable, lastScrollLeft, lastScrollTop).then(resolve);
+                return restoreScrollLocation($xetable, targetScrollLeft, targetScrollTop).then(resolve);
               });
             }
           });
@@ -35983,7 +36181,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         } else {
           rows.forEach(function (row) {
             visibleColumn.forEach(function (column) {
-              if (column.property) {
+              if (column.field) {
                 setCellValue(row, column, null);
               }
             });
@@ -36055,7 +36253,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             }
 
             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;
@@ -36129,20 +36327,20 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         var transform = treeOpts.transform,
             children = treeOpts.children,
             mapChildren = treeOpts.mapChildren;
-        var property = checkboxOpts.checkField;
+        var checkField = checkboxOpts.checkField;
         var rowList = [];
         var currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
 
-        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 {
@@ -36192,8 +36390,9 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
        * 根据行的唯一主键获取行
        * @param {String/Number} rowid 行主键
        */
-      getRowById: function getRowById(rowid) {
+      getRowById: function getRowById(cellValue) {
         var fullDataRowIdData = internalData.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;
       },
 
@@ -36432,10 +36631,10 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       isCheckedByCheckboxRow: function isCheckedByCheckboxRow(row) {
         var selection = reactData.selection;
         var checkboxOpts = computeCheckboxOpts.value;
-        var property = checkboxOpts.checkField;
+        var checkField = 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 $xetable.findRowIndexOf(selection, row) > -1;
@@ -36466,7 +36665,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             checkboxReserveRowMap = internalData.checkboxReserveRowMap;
         var treeOpts = computeTreeOpts.value;
         var checkboxOpts = computeCheckboxOpts.value;
-        var property = checkboxOpts.checkField,
+        var checkField = checkboxOpts.checkField,
             reserve = checkboxOpts.reserve,
             checkStrictly = checkboxOpts.checkStrictly,
             checkMethod = checkboxOpts.checkMethod;
@@ -36482,7 +36681,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
            * 绑定属性方式（高性能，有污染）
            * 必须在行数据存在对应的属性，否则将不响应
            */
-          if (property) {
+          if (checkField) {
             var checkValFn = function checkValFn(row) {
               if (!checkMethod || checkMethod({
                 row: row
@@ -36491,7 +36690,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
                   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);
               }
             }; // 如果存在选中方法
             // 如果方法成立，则更新值，否则忽略该数据
@@ -36580,7 +36779,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             }
           }
 
-          reactData.selection = property ? [] : beforeSelection.concat(selectRows);
+          reactData.selection = checkField ? [] : beforeSelection.concat(selectRows);
         }
 
         reactData.treeIndeterminates = [];
@@ -36698,17 +36897,17 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         var tableFullData = internalData.tableFullData;
         var treeOpts = computeTreeOpts.value;
         var checkboxOpts = computeCheckboxOpts.value;
-        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);
             });
           }
         }
@@ -36961,14 +37160,14 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         var sortList = [];
         var tableFullColumn = internalData.tableFullColumn;
         tableFullColumn.forEach(function (column) {
-          var property = column.property,
+          var field = column.field,
               order = column.order;
 
           if (column.sortable && order) {
             sortList.push({
               column: column,
-              field: property,
-              property: property,
+              field: field,
+              property: field,
               order: order,
               sortTime: column.sortTime
             });
@@ -37000,7 +37199,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         if (visible) {
           $xetable.dispatchEvent('filter-visible', {
             column: column,
-            property: column.property,
+            property: column.field,
+            field: column.field,
             filterList: $xetable.getCheckedFilters(),
             visible: false
           }, null);
@@ -38334,10 +38534,10 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         var checkboxOpts = computeCheckboxOpts.value;
         var rowkey = getRowkey($xetable);
         internalData.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) {
@@ -38352,7 +38552,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
               }
             }
 
-            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];
@@ -38719,25 +38919,25 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         var afterFullData = internalData.afterFullData;
         var treeOpts = computeTreeOpts.value;
         var checkboxOpts = computeCheckboxOpts.value;
-        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 ($xetable.findRowIndexOf(treeIndeterminates, 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 ($xetable.eqRow(item, row) || !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;
                   });
@@ -38766,7 +38966,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
                 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 $xetable.findRowIndexOf(vItems, item) > -1;
@@ -38781,7 +38981,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             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);
               handleCheckboxReserveRow(row, value);
             }
           }
@@ -39144,9 +39344,9 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       handleToggleCheckRowEvent: function handleToggleCheckRowEvent(evnt, params) {
         var selection = reactData.selection;
         var checkboxOpts = computeCheckboxOpts.value;
-        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) : $xetable.findRowIndexOf(selection, row) === -1;
+        var value = checkField ? !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, checkField) : $xetable.findRowIndexOf(selection, row) === -1;
 
         if (evnt) {
           tablePrivateMethods.triggerCheckRowEvent(evnt, params, value);
@@ -39286,21 +39486,23 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
        */
       triggerSortEvent: function triggerSortEvent(evnt, column, order) {
         var sortOpts = computeSortOpts.value;
-        var property = column.property;
+        var field = column.field,
+            sortable = column.sortable;
 
-        if (column.sortable) {
+        if (sortable) {
           if (!order || column.order === order) {
             tableMethods.clearSort(sortOpts.multiple ? column : null);
           } else {
             tableMethods.sort({
-              field: property,
+              field: field,
               order: order
             });
           }
 
           var params = {
             column: column,
-            property: property,
+            field: field,
+            property: field,
             order: column.order,
             sortList: tableMethods.getSortColumns()
           };
@@ -40439,6 +40641,8 @@ dynamicApp.component(table.name, table);
       operError: '发生错误，操作失败！'
     },
     select: {
+      search: '搜索',
+      loadingText: '加载中',
       emptyText: '暂无数据'
     },
     pager: {