bkui-vue 2.0.1-beta.57.table.2 → 2.0.1-beta.58

package/lib/date-picker/index.js

@@ -2686,12 +2686,10 @@ var timeProps = {
     // const parentProvide = injectStrict(timePickerKey);
     var parentProvide = (0,external_vue_namespaceObject.inject)(timePickerKey);
     var timeSpinnerRef = (0,external_vue_namespaceObject.ref)(null);
+    var visibleDate = (0,external_vue_namespaceObject.ref)(src_fecha.format(parentProvide.panelDate, props.format));
     var showSeconds = (0,external_vue_namespaceObject.computed)(function () {
       return !(props.format || '').match(/mm$/);
     });
-    var visibleDate = (0,external_vue_namespaceObject.computed)(function () {
-      return src_fecha.format(parentProvide.panelDate, props.format);
-    });
     var timeSlots = (0,external_vue_namespaceObject.computed)(function () {
       if (!props.value[0]) {
         return [];
@@ -2745,6 +2743,10 @@ var timeProps = {
       var newVal = dates[0] || initTime();
       newVal = new Date(newVal);
       state.date = newVal;
+      parentProvide.panelDate = newVal;
+      visibleDate.value = src_fecha.format(parentProvide.panelDate, props.format);
+    }, {
+      immediate: true
     });
     (0,external_vue_namespaceObject.onMounted)(function () {
       if (parentProvide && parentProvide.parentName === 'DatePanel') {
@@ -5382,7 +5384,7 @@ function time_picker_objectSpread(e) { for (var r = 1; r < arguments.length; r++
     var handleInputChange = function handleInputChange(e) {
       var _props$disabledDate;
       var isArrayValue = props.type.includes('range') || props.multiple;
-      var oldValue = visualValue.value;
+      // const oldValue = visualValue.value;
       var newValue = e.target.value;
       var newDate = parseDate(newValue, props.type, props.multiple, props.format);
       var valueToTest = isArrayValue ? newDate : newDate[0];
@@ -5390,7 +5392,9 @@ function time_picker_objectSpread(e) { for (var r = 1; r < arguments.length; r++
       var isValidDate = newDate.reduce(function (valid, date) {
         return valid && date instanceof Date;
       }, true);
-      if (newValue !== oldValue && !isDisabled && isValidDate) {
+      // 这里不需要进行新旧数据对比是因为input输入的时候visualValue的computed依赖始终是最新的
+      // if (newValue !== oldValue && !isDisabled && isValidDate) {
+      if (!isDisabled && isValidDate) {
         emitChange(props.type);
         state.internalValue = newDate;
       } else {

package/lib/date-picker/panel/time.d.ts

@@ -186,7 +186,7 @@ declare const _default: import("vue").DefineComponent<{
         readonly default: true;
     };
 }, {
-    visibleDate: import("vue").ComputedRef<any>;
+    visibleDate: import("vue").Ref<any>;
     showSeconds: import("vue").ComputedRef<boolean>;
     timeSlots: import("vue").ComputedRef<any[]>;
     disabledHMS: import("vue").ComputedRef<IDisabledHMS>;

package/lib/directives/index.js

@@ -1053,7 +1053,7 @@ function _toConsumableArray(arr) {
 ;// CONCATENATED MODULE: external "vue"
 var external_vue_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var external_vue_y = x => () => x
-const external_vue_namespaceObject = external_vue_x({ ["h"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.h, ["render"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.render });
+const external_vue_namespaceObject = external_vue_x({ ["h"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.h, ["nextTick"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.nextTick, ["render"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.render });
 ;// CONCATENATED MODULE: external "../shared"
 var shared_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var shared_y = x => () => x
@@ -1100,9 +1100,15 @@ var tooltips_nodeList = new WeakMap();
 var tooltips = {
   beforeMount: function beforeMount(el, binding) {
     var opts = getOpts(binding);
-    var trigger = opts.trigger;
+    var trigger = opts.trigger,
+      showOnInit = opts.showOnInit;
     var popper = renderContent(opts);
     var delayTimeout = null;
+    if (showOnInit) {
+      (0,external_vue_namespaceObject.nextTick)(function () {
+        show(el);
+      });
+    }
     if (trigger === 'hover') {
       var hideTimeout = null;
       el.addEventListener('mouseenter', function () {
@@ -1250,7 +1256,6 @@ function createPopperInstance(el, popper) {
     opts = _nodeList$get.opts;
   var placement = opts.placement,
     distance = opts.distance,
-    showOnInit = opts.showOnInit,
     sameWidth = opts.sameWidth;
   var popperInstance = (0,core_namespaceObject.createPopper)(el, popper, {
     placement: placement,
@@ -1275,7 +1280,6 @@ function createPopperInstance(el, popper) {
       }
     }] : []))
   });
-  if (showOnInit) show(el);
   return popperInstance;
 }
 /**

package/lib/index.js

@@ -4,5 +4,5 @@ export { default } from './preset';
 export * from './config-provider';
 export * from './directives';
 export * as plugins from './plugins';
-export const version = "2.0.1-beta.57.table.2";
+export const version = "2.0.1-beta.58";
 window.__bkui_vue_version__ = version;

package/lib/input/index.js

@@ -832,6 +832,7 @@ var inputEmitEventsType = (_inputEmitEventsType = {}, _defineProperty(_definePro
       cls = _ctx$attrs["class"],
       style = _ctx$attrs.style,
       inputAttrs = _objectWithoutProperties(_ctx$attrs, _excluded);
+    var parentRef = (0,external_vue_namespaceObject.ref)();
     var inputRef = (0,external_vue_namespaceObject.ref)();
     var innerInputValue = (0,external_vue_namespaceObject.ref)(typeof props.modelValue === 'undefined' || props.modelValue === null ? {} : {
       value: props.modelValue
@@ -872,7 +873,27 @@ var inputEmitEventsType = (_inputEmitEventsType = {}, _defineProperty(_definePro
         }
       };
     };
+    var dragTextareaResize = function dragTextareaResize() {
+      return function () {
+        var _parentRef$value;
+        // 必须是autosize才能实现拖拽，且设置了maxRows还是会覆盖原有默认高度出现滚动条
+        if (!isTextArea.value || !props.autosize) return;
+        var isElHidden = ((_parentRef$value = parentRef.value) === null || _parentRef$value === void 0 ? void 0 : _parentRef$value.offsetParent) === null;
+        if (!isElHidden) {
+          var _inputRef$value2, _parentRef$value2, _parentRef$value3, _parentRef$value4, _parentRef$value5;
+          (_inputRef$value2 = inputRef.value) === null || _inputRef$value2 === void 0 || (_inputRef$value2 = _inputRef$value2.style) === null || _inputRef$value2 === void 0 || _inputRef$value2.setProperty('height', "".concat((_parentRef$value2 = parentRef.value) === null || _parentRef$value2 === void 0 ? void 0 : _parentRef$value2.offsetHeight, "px"));
+          textareaCalcStyle.value = Object.assign(textareaCalcStyle.value, {
+            height: "".concat((_parentRef$value3 = parentRef.value) === null || _parentRef$value3 === void 0 ? void 0 : _parentRef$value3.offsetHeight, "px")
+          });
+          if (((_parentRef$value4 = parentRef.value) === null || _parentRef$value4 === void 0 ? void 0 : _parentRef$value4.offsetWidth) > ((_parentRef$value5 = parentRef.value) === null || _parentRef$value5 === void 0 || (_parentRef$value5 = _parentRef$value5.parentNode) === null || _parentRef$value5 === void 0 ? void 0 : _parentRef$value5.offsetWidth)) {
+            var _parentRef$value6, _parentRef$value7;
+            (_parentRef$value6 = parentRef.value) === null || _parentRef$value6 === void 0 || (_parentRef$value6 = _parentRef$value6.style) === null || _parentRef$value6 === void 0 || _parentRef$value6.setProperty('width', "".concat((_parentRef$value7 = parentRef.value) === null || _parentRef$value7 === void 0 || (_parentRef$value7 = _parentRef$value7.parentNode) === null || _parentRef$value7 === void 0 ? void 0 : _parentRef$value7.offsetWidth, "px"));
+          }
+        }
+      };
+    };
     var onceInitSizeTextarea = createOnceInitResize(resizeTextarea);
+    var onDragSizeTextarea = dragTextareaResize();
     var suffixCls = getCls('suffix-icon');
     var suffixIconMap = {
       search: function search() {
@@ -965,6 +986,7 @@ var inputEmitEventsType = (_inputEmitEventsType = {}, _defineProperty(_definePro
     });
     var resizeObserver = new ResizeObserver(function () {
       onceInitSizeTextarea();
+      onDragSizeTextarea();
       setOverflow();
     });
     (0,external_vue_namespaceObject.watch)(function () {
@@ -994,7 +1016,8 @@ var inputEmitEventsType = (_inputEmitEventsType = {}, _defineProperty(_definePro
         value: val
       };
       (0,external_vue_namespaceObject.nextTick)(function () {
-        return resizeTextarea();
+        resizeTextarea();
+        onDragSizeTextarea();
       });
       setOverflow();
     });
@@ -1006,8 +1029,8 @@ var inputEmitEventsType = (_inputEmitEventsType = {}, _defineProperty(_definePro
       });
       // Hack: 修复autofocus属性失效问题 原生autofocus属性只在页面加载时生效
       if (Object.prototype.hasOwnProperty.call(ctx.attrs, 'autofocus')) {
-        var _inputRef$value2, _inputRef$value2$focu;
-        (_inputRef$value2 = inputRef.value) === null || _inputRef$value2 === void 0 || (_inputRef$value2$focu = _inputRef$value2.focus) === null || _inputRef$value2$focu === void 0 || _inputRef$value2$focu.call(_inputRef$value2);
+        var _inputRef$value3, _inputRef$value3$focu;
+        (_inputRef$value3 = inputRef.value) === null || _inputRef$value3 === void 0 || (_inputRef$value3$focu = _inputRef$value3.focus) === null || _inputRef$value3$focu === void 0 || _inputRef$value3$focu.call(_inputRef$value3);
       }
     });
     (0,external_vue_namespaceObject.onBeforeUnmount)(function () {
@@ -1024,8 +1047,8 @@ var inputEmitEventsType = (_inputEmitEventsType = {}, _defineProperty(_definePro
       clear: clear
     });
     function detectOverflow() {
-      var _inputRef$value3, _inputRef$value4;
-      return ((_inputRef$value3 = inputRef.value) === null || _inputRef$value3 === void 0 ? void 0 : _inputRef$value3.scrollWidth) > ((_inputRef$value4 = inputRef.value) === null || _inputRef$value4 === void 0 ? void 0 : _inputRef$value4.clientWidth) + 2;
+      var _inputRef$value4, _inputRef$value5;
+      return ((_inputRef$value4 = inputRef.value) === null || _inputRef$value4 === void 0 ? void 0 : _inputRef$value4.scrollWidth) > ((_inputRef$value5 = inputRef.value) === null || _inputRef$value5 === void 0 ? void 0 : _inputRef$value5.clientWidth) + 2;
     }
     function setOverflow() {
       setTimeout(function () {
@@ -1163,6 +1186,7 @@ var inputEmitEventsType = (_inputEmitEventsType = {}, _defineProperty(_definePro
     return function () {
       var _ctx$slots$prefix, _ctx$slots, _ctx$slots$prefix2, _ctx$slots$suffix, _ctx$slots2, _ctx$slots2$suffix;
       return (0,external_vue_namespaceObject.withDirectives)((0,external_vue_namespaceObject.createVNode)("div", {
+        "ref": parentRef,
         "style": style,
         "class": inputCls.value
       }, [(_ctx$slots$prefix = (_ctx$slots = ctx.slots) === null || _ctx$slots === void 0 || (_ctx$slots$prefix2 = _ctx$slots.prefix) === null || _ctx$slots$prefix2 === void 0 ? void 0 : _ctx$slots$prefix2.call(_ctx$slots)) !== null && _ctx$slots$prefix !== void 0 ? _ctx$slots$prefix : props.prefix && (0,external_vue_namespaceObject.createVNode)("div", {

package/lib/pagination/index.js

@@ -515,6 +515,7 @@ const popover_less_namespaceObject = popover_less_x({  });
   var inputRef = (0,external_vue_namespaceObject.ref)(null);
   var isFocused = (0,external_vue_namespaceObject.ref)(false);
   var localCurrent = (0,external_vue_namespaceObject.ref)(1);
+  var isPopoverShow = (0,external_vue_namespaceObject.ref)(false);
   var isPagePreDisabled = (0,external_vue_namespaceObject.computed)(function () {
     return localCurrent.value === 1;
   });
@@ -596,6 +597,7 @@ const popover_less_namespaceObject = popover_less_x({  });
    */
   var handlePageEditorBlur = function handlePageEditorBlur() {
     isFocused.value = false;
+    isPopoverShow.value = false;
     if (inputMemo !== localCurrent.value) {
       localCurrent.value = inputMemo;
     }
@@ -631,6 +633,13 @@ const popover_less_namespaceObject = popover_less_x({  });
     inputMemo = item;
     handlePageEditorBlur();
   };
+  /**
+   * @desc 点击关闭popover事件
+   *  @param { boolean } isShow
+   */
+  var handlePopShow = function handlePopShow(isShow) {
+    isPopoverShow.value = isShow;
+  };
   var _usePrefix = (0,config_provider_namespaceObject.usePrefix)(),
     resolveClassName = _usePrefix.resolveClassName;
   var render = function render() {
@@ -644,9 +653,16 @@ const popover_less_namespaceObject = popover_less_x({  });
       "arrow": false,
       "boundary": "body",
       "disabled": proxy.disabled,
+      "isShow": isPopoverShow.value,
       "placement": "bottom",
       "theme": "light",
-      "trigger": "click"
+      "trigger": "click",
+      "onAfterHidden": function onAfterHidden() {
+        return handlePopShow(false);
+      },
+      "onAfterShow": function onAfterShow() {
+        return handlePopShow(true);
+      }
     }, {
       "default": function _default() {
         return (0,external_vue_namespaceObject.createVNode)("div", {

package/lib/scrollbar/index.js

@@ -1610,12 +1610,8 @@ var BkScrollbar = /*#__PURE__*/function () {
     value: function scrollTo(_ref3) {
       var x = _ref3.x,
         y = _ref3.y;
-      if (y !== undefined && typeof y === 'number') {
-        this.element.scrollTop = y;
-      }
-      if (x !== undefined && typeof x === 'number') {
-        this.element.scrollLeft = x;
-      }
+      this.element.scrollTop = y;
+      this.element.scrollLeft = x;
       update_geometry(this);
     }
     /**

package/lib/table/components/table-column.d.ts

@@ -79,7 +79,7 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: number;
     };
-}, void, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
+}, () => void, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
     label: import("vue-types").VueTypeDef<import("../props").LabelFunctionString>;
     field: import("vue-types").VueTypeDef<import("../props").LabelFunctionString>;
     render: import("vue-types").VueTypeDef<import("../props").RenderFunctionString>;

package/lib/table/hooks/use-layout.d.ts

@@ -6,8 +6,7 @@ declare const _default: (props: TablePropTypes, ctx: any) => {
     renderBody: (list: any, childrend?: any, fixedRows?: any) => JSX.Element;
     renderFooter: (childrend?: any) => JSX.Element;
     renderFixedBottom: () => JSX.Element;
-    getBodyHeight: (height: any) => number;
-    setBodyHeight: (height: number, withHeadFoot?: boolean) => void;
+    setBodyHeight: (height: number) => void;
     setVirtualBodyHeight: (height: number) => void;
     setFootHeight: (height: number) => void;
     setTranslateX: (val: number) => void;

package/lib/table/hooks/use-rows.d.ts

@@ -18,10 +18,9 @@ declare const useRows: (props: TablePropTypes) => {
     getRowSelection: () => any[];
     getRowIndeterminate: () => any;
     getRowCheckedAllValue: () => any;
-    getCurrentPageRowsHeight: () => any;
     changePageRowIndex: (sourceIndex: any, targetIndex: any) => void;
     toggleAllSelection: (value?: boolean) => void;
-    getRowHeight: (row?: any, index?: any, type?: any) => number;
+    getRowHeight: (row?: any, index?: any, type?: any) => any;
     tableRowList: import("vue").Ref<any[]>;
     tableRowSchema: WeakMap<object, any> & Omit<WeakMap<object, any>, keyof WeakMap<any, any>>;
     pageRowList: any[];

package/lib/table/hooks/use-settings.d.ts

@@ -34,6 +34,7 @@ declare const useSettings: (props: TablePropTypes, ctx: SetupContext, columns: U
             filter?: string | boolean | {
                 list: {
                     label: string;
+                    text?: string;
                     value: string;
                 }[];
                 filterFn?: (...args: any[]) => boolean;
@@ -86,6 +87,7 @@ declare const useSettings: (props: TablePropTypes, ctx: SetupContext, columns: U
                 filter?: string | boolean | {
                     list: {
                         label: string;
+                        text?: string;
                         value: string;
                     }[];
                     filterFn?: (...args: any[]) => boolean;

package/lib/table/index.d.ts

@@ -908,7 +908,7 @@ declare const BkTable: {
         } & {
             default: number;
         };
-    }, void, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
+    }, () => void, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
         label: import("vue-types").VueTypeDef<import("./props").LabelFunctionString>;
         field: import("vue-types").VueTypeDef<import("./props").LabelFunctionString>;
         render: import("vue-types").VueTypeDef<import("./props").RenderFunctionString>;

package/lib/table/index.js

@@ -17327,7 +17327,9 @@ function _objectDestructuringEmpty(obj) {
 ;// CONCATENATED MODULE: external "vue"
 var external_vue_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var external_vue_y = x => () => x
-const external_vue_namespaceObject = external_vue_x({ ["Fragment"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Fragment, ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createTextVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["getCurrentInstance"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.getCurrentInstance, ["h"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.h, ["inject"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.inject, ["isProxy"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isProxy, ["isRef"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isRef, ["isVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isVNode, ["mergeProps"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps, ["nextTick"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.nextTick, ["onBeforeUnmount"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onBeforeUnmount, ["onMounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onMounted, ["onUnmounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onUnmounted, ["provide"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.provide, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["toRaw"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRaw, ["toRef"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRef, ["unref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.unref, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch });
+const external_vue_namespaceObject = external_vue_x({ ["Fragment"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Fragment, ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createTextVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["getCurrentInstance"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.getCurrentInstance, ["inject"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.inject, ["isProxy"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isProxy, ["isRef"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isRef, ["isVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isVNode, ["mergeProps"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps, ["nextTick"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.nextTick, ["onBeforeUnmount"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onBeforeUnmount, ["onMounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onMounted, ["onUnmounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onUnmounted, ["provide"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.provide, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["toRaw"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRaw, ["toRef"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRef, ["unref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.unref, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch });
+// EXTERNAL MODULE: ../../node_modules/lodash/lodash.js
+var lodash = __webpack_require__(6635);
 ;// CONCATENATED MODULE: ../../node_modules/@babel/runtime/helpers/esm/typeof.js
 function typeof_typeof(o) {
   "@babel/helpers - typeof";
@@ -17938,8 +17940,6 @@ var tableProps = {
     }
   })
 };
-// EXTERNAL MODULE: ../../node_modules/lodash/lodash.js
-var lodash = __webpack_require__(6635);
 ;// CONCATENATED MODULE: ../../packages/table/src/components/table-column.tsx
 
 /*
@@ -17999,23 +17999,10 @@ var TableColumnProp = {
     _objectDestructuringEmpty(_ref);
     var initTableColumns = (0,external_vue_namespaceObject.inject)(PROVIDE_KEY_INIT_COL, function () {});
     var lastPropsVal = {};
-    var isPropsEqual = function isPropsEqual(sorce, target) {
-      var rawProps = (0,external_vue_namespaceObject.toRaw)(target);
-      var keys = Object.keys(rawProps);
-      return keys.every(function (key) {
-        if (typeof rawProps[key] === 'function') {
-          return sorce[key] !== undefined;
-        }
-        if (key === 'children') {
-          return true;
-        }
-        return (0,lodash.isEqual)(sorce[key], target[key]);
-      });
-    };
     (0,external_vue_namespaceObject.watch)(function () {
       return [props];
     }, function () {
-      if (!isPropsEqual(lastPropsVal, props)) {
+      if (!(0,lodash.isEqual)(lastPropsVal, (0,external_vue_namespaceObject.toRaw)(props))) {
         initTableColumns();
         Object.assign(lastPropsVal, (0,external_vue_namespaceObject.toRaw)(props));
       }
@@ -18026,21 +18013,7 @@ var TableColumnProp = {
     (0,external_vue_namespaceObject.onUnmounted)(function () {
       initTableColumns();
     });
-  },
-  render: function render() {
-    try {
-      var _this$$slots$default, _this$$slots;
-      var renderDefault = (_this$$slots$default = (_this$$slots = this.$slots)["default"]) === null || _this$$slots$default === void 0 ? void 0 : _this$$slots$default.call(_this$$slots, {
-        row: {},
-        column: {},
-        $index: -1
-      });
-      var children = [renderDefault];
-      var vnode = (0,external_vue_namespaceObject.h)('div', children);
-      return vnode;
-    } catch (_unused) {
-      return (0,external_vue_namespaceObject.h)('div', []);
-    }
+    return function () {};
   }
 }));
 ;// CONCATENATED MODULE: ../../packages/table/src/events.ts
@@ -21356,16 +21329,8 @@ function use_layout_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
     }
     return null;
   });
-  var getBodyHeight = function getBodyHeight(height) {
-    return height - headHeight.value - fixedBottomHeight.value - footHeight.value;
-  };
   var setBodyHeight = function setBodyHeight(height) {
-    var withHeadFoot = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-    if (withHeadFoot) {
-      bodyHeight.value = getBodyHeight(height);
-      return;
-    }
-    bodyHeight.value = height;
+    bodyHeight.value = height - headHeight.value - fixedBottomHeight.value - footHeight.value;
   };
   var setVirtualBodyHeight = function setVirtualBodyHeight(height) {
     bodyHeight.value = height;
@@ -21506,7 +21471,6 @@ function use_layout_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
     renderBody: renderBody,
     renderFooter: renderFooter,
     renderFixedBottom: renderFixedBottom,
-    getBodyHeight: getBodyHeight,
     setBodyHeight: setBodyHeight,
     setVirtualBodyHeight: setVirtualBodyHeight,
     setFootHeight: setFootHeight,
@@ -21909,11 +21873,20 @@ const directives_namespaceObject = directives_x({ ["bkEllipsisInstance"]: () =>
        * 当表格中的字段或数据需要做解释说明时，可增加 [下划线] 提示，hover 可查看解释说明的 tooltips
        */
       if (props.column.explain) {
-        disabled = false;
+        // showTooltip默认为false，所以disabled默认为true，当设置showTooltip时才需要展示表格内容是否显示溢出效果
+        var isDisabled = true;
+        if (typeof showOverflowTooltip === 'boolean') {
+          isDisabled = !showOverflowTooltip;
+        }
+        if (typeof_typeof(showOverflowTooltip) === 'object') {
+          isDisabled = showOverflowTooltip.disabled;
+        }
+        disabled = isDisabled;
         mode = 'static';
         if (typeof_typeof(props.column.explain) === 'object') {
+          // 这里需要处理content为空，提供defaultContent
           content = function content() {
-            return resolvePropVal(props.column.explain, 'content', [props.column, props.row]);
+            return resolvePropVal(props.column.explain, 'content', [props.column, props.row]) || defaultContent;
           };
         }
       }
@@ -22436,7 +22409,6 @@ var ROW_HEIGHT = 32;
   },
   emits: ['change', 'filterSave', 'reset'],
   setup: function setup(props, _ref) {
-    var _state$checked;
     var emit = _ref.emit;
     var _usePrefix = (0,config_provider_namespaceObject.usePrefix)(),
       resolveClassName = _usePrefix.resolveClassName;
@@ -22452,16 +22424,16 @@ var ROW_HEIGHT = 32;
     var searchValue = (0,external_vue_namespaceObject.ref)('');
     var state = (0,external_vue_namespaceObject.reactive)({
       isOpen: false,
-      checked: []
+      checked: checked.value
     });
-    (_state$checked = state.checked).push.apply(_state$checked, _toConsumableArray(checked.value));
     (0,external_vue_namespaceObject.watch)(function () {
       return checked;
     }, function () {
-      var _state$checked2;
+      var _state$checked;
       state.checked.length = 0;
       state.checked = [];
-      (_state$checked2 = state.checked).push.apply(_state$checked2, _toConsumableArray(checked.value));
+      (_state$checked = state.checked).push.apply(_state$checked, _toConsumableArray(checked.value));
+      // handleBtnSaveClick();
     }, {
       deep: true
     });
@@ -22485,7 +22457,7 @@ var ROW_HEIGHT = 32;
         list = _filter$value$list === void 0 ? [] : _filter$value$list;
       var filterList = list.filter(function (l) {
         var reg = getRegExp(searchValue.value);
-        return reg.test(l.label) || reg.test(l.value);
+        return reg.test(l.label) || reg.test(l.text) || reg.test(l.value);
       });
       return filterList;
     });
@@ -22495,8 +22467,11 @@ var ROW_HEIGHT = 32;
       return (_filter$value$maxHeig = (_filter$value2 = filter.value) === null || _filter$value2 === void 0 ? void 0 : _filter$value2.maxHeight) !== null && _filter$value$maxHeig !== void 0 ? _filter$value$maxHeig : ROW_HEIGHT * maxLength;
     });
     var height = (0,external_vue_namespaceObject.computed)(function () {
-      var _filter$value3;
-      return ((_filter$value3 = filter.value) === null || _filter$value3 === void 0 ? void 0 : _filter$value3.height) || '100%';
+      var _filter$value3 = filter.value,
+        height = _filter$value3.height,
+        _filter$value3$list = _filter$value3.list,
+        list = _filter$value3$list === void 0 ? [] : _filter$value3$list;
+      return height || list.length * ROW_HEIGHT;
     });
     var minHeight = (0,external_vue_namespaceObject.computed)(function () {
       var defaultMin = ROW_HEIGHT * 2;
@@ -22585,7 +22560,7 @@ var ROW_HEIGHT = 32;
       });
     };
     var handleValueChange = function handleValueChange(val, item) {
-      var _state$checked3;
+      var _state$checked2;
       var setValue = new Set(state.checked);
       if (val) {
         setValue.add(item.value);
@@ -22593,7 +22568,7 @@ var ROW_HEIGHT = 32;
         setValue["delete"](item.value);
       }
       state.checked.length = 0;
-      (_state$checked3 = state.checked).push.apply(_state$checked3, _toConsumableArray(Array.from(setValue)));
+      (_state$checked2 = state.checked).push.apply(_state$checked2, _toConsumableArray(Array.from(setValue)));
       handleFilterChange();
     };
     var renderFilterList = function renderFilterList(scope) {
@@ -24010,11 +23985,6 @@ var useRows = function useRows(props) {
     (_tableRowList$value = tableRowList.value).push.apply(_tableRowList$value, _toConsumableArray(data));
     formatDataSchema();
   };
-  var getCurrentPageRowsHeight = function getCurrentPageRowsHeight() {
-    return pageRowList.reduce(function (out, row) {
-      return out + getRowHeight(row);
-    }, 0);
-  };
   return {
     setRowIndex: setRowIndex,
     setRowExpand: setRowExpand,
@@ -24033,7 +24003,6 @@ var useRows = function useRows(props) {
     getRowSelection: getRowSelection,
     getRowIndeterminate: getRowIndeterminate,
     getRowCheckedAllValue: getRowCheckedAllValue,
-    getCurrentPageRowsHeight: getCurrentPageRowsHeight,
     changePageRowIndex: changePageRowIndex,
     toggleAllSelection: toggleAllSelection,
     getRowHeight: getRowHeight,
@@ -24446,7 +24415,6 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
       setOffsetRight = _useLayout.setOffsetRight,
       setHeaderRowCount = _useLayout.setHeaderRowCount,
       setLineHeight = _useLayout.setLineHeight,
-      getBodyHeight = _useLayout.getBodyHeight,
       refBody = _useLayout.refBody,
       refRoot = _useLayout.refRoot;
     var scrollTo = function scrollTo() {
@@ -24567,7 +24535,6 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
         setBodyHeight(Number("".concat(props.height).replace('px', '')));
       }
     };
-    var scrollTo00 = (0,external_vue_namespaceObject.ref)(false);
     var setTableData = (0,lodash.debounce)(function () {
       var resetScroll = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
       var filterOrderList = getFilterAndSortList();
@@ -24578,15 +24545,10 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
       }
       var renderList = getRenderRowList(filterOrderList);
       rows.setPageRowList(renderList);
-      if (resetScroll) {
-        scrollTo00.value = true;
-      }
       (0,external_vue_namespaceObject.nextTick)(function () {
         setOffsetRight();
-        setRowsBodyHeight();
-        if (scrollTo00.value) {
+        if (resetScroll) {
           scrollTo(0, 0);
-          scrollTo00.value = false;
         }
       });
     }, 64);
@@ -24617,20 +24579,6 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
         observerResizing.value = false;
       });
     });
-    var setRowsBodyHeight = function setRowsBodyHeight() {
-      if (props.height === '100%' || props.height === 'auto') {
-        var rowsHeight = rows.getCurrentPageRowsHeight();
-        var bodyHeight = rowsHeight;
-        if (/^\d+\.?\d*(px)?$/.test("".concat(props.maxHeight))) {
-          var maxHeight = getBodyHeight(Number("".concat(props.maxHeight).replace('px', '')));
-          if (bodyHeight > maxHeight) {
-            setBodyHeight(maxHeight, false);
-            return;
-          }
-        }
-        setBodyHeight(bodyHeight, false);
-      }
-    };
     (0,external_vue_namespaceObject.watch)(function () {
       return [props.columns];
     }, function () {
@@ -24656,19 +24604,12 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
       deep: true
     });
     (0,external_vue_namespaceObject.watch)(function () {
-      return [columns.filterColumns];
+      return [columns.sortColumns, columns.filterColumns];
     }, function () {
       setTableData();
     }, {
       deep: true
     });
-    (0,external_vue_namespaceObject.watch)(function () {
-      return [columns.sortColumns];
-    }, function () {
-      setTableData(false);
-    }, {
-      deep: true
-    });
     (0,external_vue_namespaceObject.watch)(function () {
       return [pagination.isShowPagination.value];
     }, function () {
@@ -24688,20 +24629,10 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
     (0,external_vue_namespaceObject.watch)(function () {
       return [pagination.options.count, pagination.options.limit, pagination.options.current];
     }, function () {
-      setTableData(false);
+      setTableData();
     }, {
       immediate: true
     });
-    var pageListLength = (0,external_vue_namespaceObject.computed)(function () {
-      return rows.pageRowList.length;
-    });
-    (0,external_vue_namespaceObject.watch)(pageListLength, function (val, old) {
-      if (val < old) {
-        var _refBody$value2, _refBody$value2$updat;
-        refBody === null || refBody === void 0 || (_refBody$value2 = refBody.value) === null || _refBody$value2 === void 0 || (_refBody$value2$updat = _refBody$value2.updateScroll) === null || _refBody$value2$updat === void 0 || _refBody$value2$updat.call(_refBody$value2);
-        scrollTo(undefined, 0);
-      }
-    });
     ctx.expose({
       setRowExpand: rows.setRowExpand,
       setAllRowExpand: rows.setAllRowExpand,

package/lib/table/plugins/head-filter.css

@@ -182,6 +182,7 @@
   white-space: nowrap;
   text-overflow: ellipsis;
   overflow: hidden;
+  max-width: calc(100% - 22px);
 }
 .bk-popover.bk-pop2-content.bk-table-head-filter .content-list .content-items .list-item .bk-checkbox {
   margin-left: 0;

package/lib/table/plugins/head-filter.less

@@ -62,6 +62,7 @@
               white-space: nowrap;
               text-overflow: ellipsis;
               overflow: hidden;
+              max-width: calc(100% - 22px);
             }
 
             .@{bk-prefix}-checkbox {

package/lib/table/plugins/head-filter.variable.css

@@ -442,6 +442,7 @@
   white-space: nowrap;
   text-overflow: ellipsis;
   overflow: hidden;
+  max-width: calc(100% - 22px);
 }
 .bk-popover.bk-pop2-content.bk-table-head-filter .content-list .content-items .list-item .bk-checkbox {
   margin-left: 0;

package/lib/table/props.d.ts

@@ -69,6 +69,7 @@ export type ISortPropShape = ISortShape | boolean | string;
 export type IFilterShape = {
     list: {
         label: string;
+        text?: string;
         value: string;
     }[];
     filterFn?: (...args: any[]) => boolean;