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

package/lib/table/table.less

@@ -312,14 +312,6 @@
 
       tbody {
         tr {
-
-          &.stripe-row {
-            background: #fafbfd;
-            td {
-              background-color: #fafbfd;
-            }
-          }
-
           td {
             background-color: #fff;
             border-top: 1px solid @table-bg-color;
@@ -606,6 +598,10 @@
       margin-left: auto;
     }
   }
+
+  .stripe-row {
+    background: #fafbfd;
+  }
 }
 
 .@{bk-prefix}-across-page-popover {

package/lib/table/table.variable.css

@@ -1444,6 +1444,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;
@@ -1913,14 +1914,6 @@
   cursor: pointer;
   background: var(--table-row-active-bg-color);
 }
-.bk-table .bk-table-head table tbody tr.stripe-row,
-.bk-table .bk-table-body table tbody tr.stripe-row {
-  background: #fafbfd;
-}
-.bk-table .bk-table-head table tbody tr.stripe-row td,
-.bk-table .bk-table-body table tbody tr.stripe-row td {
-  background-color: #fafbfd;
-}
 .bk-table .bk-table-head table tbody tr td,
 .bk-table .bk-table-body table tbody tr td {
   background-color: #fff;
@@ -2126,6 +2119,9 @@
 .bk-table .bk-pagination .is-last {
   margin-left: auto;
 }
+.bk-table .stripe-row {
+  background: #fafbfd;
+}
 .bk-across-page-popover {
   padding: 0!important;
 }

package/lib/table/utils.d.ts

@@ -138,6 +138,7 @@ export declare const resolveColumnFilterProp: (col: Column) => {
     enabled: boolean;
     list: {
         label: string;
+        text?: string;
         value: string;
     }[];
     filterFn?: (...args: any[]) => boolean;

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

@@ -38,7 +38,7 @@ declare const BkTableColumn: {
         } & {
             default: number;
         };
-    }>>, void, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & Readonly<import("vue").ExtractPropTypes<{
+    }>>, () => void, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & Readonly<import("vue").ExtractPropTypes<{
         label: import("vue-types").VueTypeDef<import("../table/props").LabelFunctionString>;
         field: import("vue-types").VueTypeDef<import("../table/props").LabelFunctionString>;
         render: import("vue-types").VueTypeDef<import("../table/props").RenderFunctionString>;
@@ -131,7 +131,7 @@ declare const BkTableColumn: {
         } & {
             default: number;
         };
-    }>>, {}, {}, {}, {}, {
+    }>>, () => void, {}, {}, {}, {
         fixed: boolean | "left" | "right";
         resizable: boolean;
         minWidth: string | number;
@@ -182,7 +182,7 @@ declare const BkTableColumn: {
     } & {
         default: number;
     };
-}>>, void, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
+}>>, () => void, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
     fixed: boolean | "left" | "right";
     resizable: boolean;
     minWidth: string | number;

package/lib/table-column/index.js

@@ -17302,7 +17302,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({ ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["h"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.h, ["inject"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.inject, ["onUnmounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onUnmounted, ["toRaw"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRaw, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch });
+const external_vue_namespaceObject = external_vue_x({ ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["inject"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.inject, ["onUnmounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onUnmounted, ["toRaw"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRaw, ["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(o) {
   "@babel/helpers - typeof";
@@ -17913,8 +17915,6 @@ var tableProps = {
     }
   })
 };
-// EXTERNAL MODULE: ../../node_modules/lodash/lodash.js
-var lodash = __webpack_require__(6635);
 ;// CONCATENATED MODULE: ../../packages/table/src/components/table-column.tsx
 
 /*
@@ -17974,23 +17974,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));
       }
@@ -18001,21 +17988,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-column/src/index.ts

package/lib/upload/index.d.ts

@@ -93,7 +93,7 @@ declare const Upload: {
             type: import("vue").PropType<(event: Event) => boolean | void>;
         };
         beforeUpload: {
-            type: import("vue").PropType<(file: import("./upload.type").UploadRawFile) => boolean | Promise<boolean>>;
+            type: import("vue").PropType<(file: import("./upload.type").UploadRawFile, uploadFiles: File[]) => boolean | Promise<boolean>>;
         };
         beforeRemove: {
             type: import("vue").PropType<(file: import("./upload.type").UploadFile, uploadFiles: import("./upload.type").UploadFile[]) => boolean | Promise<boolean>>;
@@ -215,7 +215,7 @@ declare const Upload: {
             type: import("vue").PropType<(event: Event) => boolean | void>;
         };
         beforeUpload: {
-            type: import("vue").PropType<(file: import("./upload.type").UploadRawFile) => boolean | Promise<boolean>>;
+            type: import("vue").PropType<(file: import("./upload.type").UploadRawFile, uploadFiles: File[]) => boolean | Promise<boolean>>;
         };
         beforeRemove: {
             type: import("vue").PropType<(file: import("./upload.type").UploadFile, uploadFiles: import("./upload.type").UploadFile[]) => boolean | Promise<boolean>>;
@@ -367,7 +367,7 @@ declare const Upload: {
             type: import("vue").PropType<(event: Event) => boolean | void>;
         };
         beforeUpload: {
-            type: import("vue").PropType<(file: import("./upload.type").UploadRawFile) => boolean | Promise<boolean>>;
+            type: import("vue").PropType<(file: import("./upload.type").UploadRawFile, uploadFiles: File[]) => boolean | Promise<boolean>>;
         };
         beforeRemove: {
             type: import("vue").PropType<(file: import("./upload.type").UploadFile, uploadFiles: import("./upload.type").UploadFile[]) => boolean | Promise<boolean>>;
@@ -516,7 +516,7 @@ declare const Upload: {
         type: import("vue").PropType<(event: Event) => boolean | void>;
     };
     beforeUpload: {
-        type: import("vue").PropType<(file: import("./upload.type").UploadRawFile) => boolean | Promise<boolean>>;
+        type: import("vue").PropType<(file: import("./upload.type").UploadRawFile, uploadFiles: File[]) => boolean | Promise<boolean>>;
     };
     beforeRemove: {
         type: import("vue").PropType<(file: import("./upload.type").UploadFile, uploadFiles: import("./upload.type").UploadFile[]) => boolean | Promise<boolean>>;

package/lib/upload/index.js

@@ -2727,7 +2727,7 @@ function upload_arrayLikeToArray(arr, len) { if (len == null || len > arr.length
             case 2:
               _context.prev = 2;
               _context.next = 5;
-              return (_props$beforeUpload = props.beforeUpload) === null || _props$beforeUpload === void 0 ? void 0 : _props$beforeUpload.call(props, file);
+              return (_props$beforeUpload = props.beforeUpload) === null || _props$beforeUpload === void 0 ? void 0 : _props$beforeUpload.call(props, file, sendFiles);
             case 5:
               beforeResult = _context.sent;
               _context.next = 11;

package/lib/upload/props.d.ts

@@ -94,7 +94,7 @@ declare const _default: {
         type: PropType<(event: Event) => boolean | void>;
     };
     beforeUpload: {
-        type: PropType<(file: UploadRawFile) => Promise<boolean> | boolean>;
+        type: PropType<(file: UploadRawFile, uploadFiles: File[]) => Promise<boolean> | boolean>;
     };
     beforeRemove: {
         type: PropType<(file: UploadFile, uploadFiles: UploadFile[]) => Promise<boolean> | boolean>;

package/lib/upload/upload.d.ts

@@ -93,7 +93,7 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<(event: Event) => boolean | void>;
     };
     beforeUpload: {
-        type: import("vue").PropType<(file: UploadRawFile) => boolean | Promise<boolean>>;
+        type: import("vue").PropType<(file: UploadRawFile, uploadFiles: File[]) => boolean | Promise<boolean>>;
     };
     beforeRemove: {
         type: import("vue").PropType<(file: UploadFile, uploadFiles: UploadFile[]) => boolean | Promise<boolean>>;
@@ -208,7 +208,7 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<(event: Event) => boolean | void>;
     };
     beforeUpload: {
-        type: import("vue").PropType<(file: UploadRawFile) => boolean | Promise<boolean>>;
+        type: import("vue").PropType<(file: UploadRawFile, uploadFiles: File[]) => boolean | Promise<boolean>>;
     };
     beforeRemove: {
         type: import("vue").PropType<(file: UploadFile, uploadFiles: UploadFile[]) => boolean | Promise<boolean>>;

package/lib/virtual-render/index.js

@@ -17640,10 +17640,6 @@ var virtualRenderProps = _objectSpread({
     init: init,
     instance: instance,
     scrollTo: scrollTo,
-    update: function update() {
-      var _instance2;
-      return (_instance2 = instance) === null || _instance2 === void 0 ? void 0 : _instance2.update();
-    },
     updateScrollHeight: updateScrollHeight
   };
 });
@@ -17806,29 +17802,10 @@ var VisibleRender = /*#__PURE__*/function () {
     this.wrapper = el;
     var throttleDelay = binding.value.throttleDelay;
     this.delay = throttleDelay;
-    this.delegateWrapper = undefined;
   }
   _createClass(VisibleRender, [{
-    key: "scrollHeight",
-    get: function get() {
-      var _this$delegateWrapper, _this$delegateWrapper2, _this$wrapper;
-      return (_this$delegateWrapper = (_this$delegateWrapper2 = this.delegateWrapper) === null || _this$delegateWrapper2 === void 0 ? void 0 : _this$delegateWrapper2.scrollHeight) !== null && _this$delegateWrapper !== void 0 ? _this$delegateWrapper : (_this$wrapper = this.wrapper) === null || _this$wrapper === void 0 ? void 0 : _this$wrapper.scrollHeight;
-    }
-  }, {
-    key: "offsetHeight",
-    get: function get() {
-      var _this$delegateWrapper3, _this$delegateWrapper4, _this$wrapper2;
-      return (_this$delegateWrapper3 = (_this$delegateWrapper4 = this.delegateWrapper) === null || _this$delegateWrapper4 === void 0 ? void 0 : _this$delegateWrapper4.offsetHeight) !== null && _this$delegateWrapper3 !== void 0 ? _this$delegateWrapper3 : (_this$wrapper2 = this.wrapper) === null || _this$wrapper2 === void 0 ? void 0 : _this$wrapper2.offsetHeight;
-    }
-  }, {
-    key: "setDelegateWrapper",
-    value: function setDelegateWrapper(el) {
-      this.delegateWrapper = el;
-    }
-  }, {
     key: "render",
     value: function render(e) {
-      var _this$delegateWrapper5;
       var _this$binding$value = this.binding.value,
         _this$binding$value$l = _this$binding$value.lineHeight,
         lineHeight = _this$binding$value$l === void 0 ? 30 : _this$binding$value$l,
@@ -17840,7 +17817,7 @@ var VisibleRender = /*#__PURE__*/function () {
         var _e$offset, _e$offset$x, _e$offset2;
         var elScrollTop = (_e$offset = e.offset) === null || _e$offset === void 0 ? void 0 : _e$offset.y;
         var elScrollLeft = (_e$offset$x = (_e$offset2 = e.offset) === null || _e$offset2 === void 0 ? void 0 : _e$offset2.x) !== null && _e$offset$x !== void 0 ? _e$offset$x : 0;
-        var bottom = this.scrollHeight - this.offsetHeight - elScrollTop;
+        var bottom = this.wrapper.scrollHeight - this.wrapper.offsetHeight - elScrollTop;
         handleScrollCallback(e, null, null, elScrollTop, elScrollTop, elScrollLeft, {
           bottom: bottom >= 0 ? bottom : 0,
           scrollbar: e
@@ -17860,7 +17837,7 @@ var VisibleRender = /*#__PURE__*/function () {
         groupItemCount: groupItemCount,
         count: count,
         scrollLeft: scrollLeft
-      }, (_this$delegateWrapper5 = this.delegateWrapper) !== null && _this$delegateWrapper5 !== void 0 ? _this$delegateWrapper5 : this.wrapper, e);
+      }, this.wrapper, e);
     }
   }, {
     key: "executeThrottledRender",
@@ -17870,14 +17847,14 @@ var VisibleRender = /*#__PURE__*/function () {
   }, {
     key: "install",
     value: function install() {
-      var _this$wrapper3;
-      (_this$wrapper3 = this.wrapper) === null || _this$wrapper3 === void 0 || _this$wrapper3.addEventListener('scroll', this.executeThrottledRender.bind(this));
+      var _this$wrapper;
+      (_this$wrapper = this.wrapper) === null || _this$wrapper === void 0 || _this$wrapper.addEventListener('scroll', this.executeThrottledRender.bind(this));
     }
   }, {
     key: "uninstall",
     value: function uninstall() {
-      var _this$wrapper4, _this$wrapper4$remove;
-      (_this$wrapper4 = this.wrapper) === null || _this$wrapper4 === void 0 || (_this$wrapper4$remove = _this$wrapper4.removeListener) === null || _this$wrapper4$remove === void 0 || _this$wrapper4$remove.call(_this$wrapper4, 'scroll', this.executeThrottledRender.bind(this));
+      var _this$wrapper2, _this$wrapper2$remove;
+      (_this$wrapper2 = this.wrapper) === null || _this$wrapper2 === void 0 || (_this$wrapper2$remove = _this$wrapper2.removeListener) === null || _this$wrapper2$remove === void 0 || _this$wrapper2$remove.call(_this$wrapper2, 'scroll', this.executeThrottledRender.bind(this));
     }
   }, {
     key: "setBinding",
@@ -18096,23 +18073,11 @@ function virtual_render_objectSpread(e) { for (var r = 1; r < arguments.length;
         rendAsTag = _useTagRender.rendAsTag;
       return rendAsTag;
     }
-    var refRoot = (0,external_vue_namespaceObject.ref)(null);
-    /** 如果有分组状态，计算总行数 */
-    var listLength = (0,external_vue_namespaceObject.ref)(0);
-    /** 实际高度，根据行高和总行数计算出来的实际高度 */
-    var innerHeight = (0,external_vue_namespaceObject.ref)(0);
-    var contentHeight = (0,external_vue_namespaceObject.ref)(0);
-    var virtualRoot = (0,external_vue_namespaceObject.ref)(null);
     var getRowHeightArgs = function getRowHeightArgs(startIndex) {
       var start = startIndex * props.groupItemCount;
       var end = (startIndex + 1) * props.groupItemCount;
-      if (end > listLength.value) {
-        var count = end - start;
-        end = listLength.value;
-        start = end - count;
-      }
       return {
-        index: start,
+        index: startIndex,
         rows: props.list.slice(start, end),
         items: [start, end],
         type: 'virtual'
@@ -18136,11 +18101,17 @@ function virtual_render_objectSpread(e) { for (var r = 1; r < arguments.length;
         scrollbar: props.scrollbar
       };
     });
+    var refRoot = (0,external_vue_namespaceObject.ref)(null);
+    /** 如果有分组状态，计算总行数 */
+    var listLength = (0,external_vue_namespaceObject.ref)(0);
+    /** 实际高度，根据行高和总行数计算出来的实际高度 */
+    var innerHeight = (0,external_vue_namespaceObject.ref)(0);
+    var contentHeight = (0,external_vue_namespaceObject.ref)(0);
+    var virtualRoot = (0,external_vue_namespaceObject.ref)(null);
     var _useScrollbar = use_scrollbar(props),
       init = _useScrollbar.init,
       scrollTo = _useScrollbar.scrollTo,
-      updateScrollHeight = _useScrollbar.updateScrollHeight,
-      update = _useScrollbar.update;
+      updateScrollHeight = _useScrollbar.updateScrollHeight;
     var instance = null;
     var pagination = (0,external_vue_namespaceObject.reactive)({
       startIndex: 0,
@@ -18154,15 +18125,9 @@ function virtual_render_objectSpread(e) { for (var r = 1; r < arguments.length;
       groupItemCount: props.groupItemCount
     });
     var calcList = (0,external_vue_namespaceObject.ref)([]);
-    var getOffsetHeight = function getOffsetHeight() {
-      if (typeof props.height === 'number') {
-        return props.height;
-      }
-      // @ts-ignore
-      return virtualRoot.value.offsetHeight;
-    };
     var getLastPageIndex = function getLastPageIndex() {
-      var elHeight = getOffsetHeight();
+      // @ts-ignore
+      var elHeight = virtualRoot.value.offsetHeight;
       var startIndex = Math.ceil(listLength.value / props.groupItemCount);
       var rowsHeight = 0;
       var lastHeight = 0;
@@ -18271,11 +18236,7 @@ function virtual_render_objectSpread(e) { for (var r = 1; r < arguments.length;
         top: 0
       };
       var el = refRoot.value;
-      var container = typeof props.height === 'number' ? {
-        scrollHeight: innerHeight.value,
-        offsetHeight: props.height
-      } : el;
-      computedVirtualIndex(props.lineHeight, handleScrollCallback, pagination, container, {
+      computedVirtualIndex(props.lineHeight, handleScrollCallback, pagination, el, {
         target: el
       });
     };
@@ -18331,50 +18292,31 @@ function virtual_render_objectSpread(e) { for (var r = 1; r < arguments.length;
     };
     var _useFixTop = use_fix_top(props, scrollTo),
       fixToTop = _useFixTop.fixToTop;
-    var setDelegateEl = function setDelegateEl() {
+    (0,external_vue_namespaceObject.watch)(function () {
+      return [props.list];
+    }, function () {
       var _instance3;
-      var el = refRoot.value;
-      var container = typeof props.height === 'number' ? {
-        scrollHeight: innerHeight.value,
-        offsetHeight: props.height
-      } : el;
-      (_instance3 = instance) === null || _instance3 === void 0 || _instance3.setDelegateWrapper(container);
-    };
-    var updateVirtualInstance = function updateVirtualInstance() {
-      var _instance4;
-      (_instance4 = instance) === null || _instance4 === void 0 || _instance4.setBinding(binding);
+      (_instance3 = instance) === null || _instance3 === void 0 || _instance3.setBinding(binding);
       handleChangeListConfig();
       updateScrollHeight(contentHeight.value);
-      setDelegateEl();
-      update();
       afterListDataReset();
       (0,external_vue_namespaceObject.nextTick)(function () {
-        var _instance5;
-        (_instance5 = instance) === null || _instance5 === void 0 || _instance5.executeThrottledRender.call(instance, {
+        var _instance4;
+        (_instance4 = instance) === null || _instance4 === void 0 || _instance4.executeThrottledRender.call(instance, {
           offset: {
             x: pagination.scrollLeft,
             y: pagination.scrollTop
           }
         });
       });
-    };
-    (0,external_vue_namespaceObject.watch)(function () {
-      return props.height;
-    }, function () {
-      updateVirtualInstance();
-    });
-    (0,external_vue_namespaceObject.watch)(function () {
-      return [props.list, props.list.length];
-    }, function () {
-      updateVirtualInstance();
     }, {
-      immediate: true
+      immediate: true,
+      deep: true
     });
     ctx.expose({
       reset: reset,
       scrollTo: scrollTo,
       fixToTop: fixToTop,
-      updateScroll: update,
       refRoot: refRoot,
       refContent: refRoot
     });

package/lib/virtual-render/use-scrollbar.d.ts

@@ -5,7 +5,6 @@ declare const _default: (props: VirtualRenderProps) => {
     init: (target: Ref<Partial<Element> & Partial<VirtualElement>>) => void;
     instance: BkScrollbar;
     scrollTo: (x: any, y: any) => void;
-    update: () => void;
     updateScrollHeight: (height: number) => void;
 };
 export default _default;

package/lib/virtual-render/v-virtual-render.d.ts

@@ -16,11 +16,7 @@ export declare class VisibleRender {
     private binding;
     private wrapper;
     private delay;
-    private delegateWrapper;
     constructor(binding: any, el: any);
-    get scrollHeight(): any;
-    get offsetHeight(): any;
-    setDelegateWrapper(el: any): void;
     render(e: any): void;
     executeThrottledRender(e: any): void;
     install(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "2.0.1-beta.57.table.1",
+  "version": "2.0.1-beta.58",
   "workspaces": [
     "packages/**",
     "scripts/cli",