bkui-vue 2.0.1-beta.66 → 2.0.1-beta.67

package/lib/input/input.less

@@ -62,7 +62,10 @@
   .placeholder();
 
   &.resizable {
-    resize: both;
+    resize: vertical;
+    >textarea {
+        flex: 1;
+    }
   }
 
   ::-webkit-scrollbar {

package/lib/input/input.variable.css

@@ -610,7 +610,10 @@
   color: var(--light-gray);
 }
 .bk-textarea.resizable {
-  resize: both;
+  resize: vertical;
+}
+.bk-textarea.resizable > textarea {
+  flex: 1;
 }
 .bk-textarea ::-webkit-scrollbar {
   -webkit-appearance: none;

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

@@ -36,6 +36,7 @@ declare const useSettings: (props: TablePropTypes, ctx: SetupContext, columns: U
                     label: string;
                     text?: string;
                     value: string;
+                    tipKey?: string;
                 }[];
                 filterFn?: (...args: any[]) => boolean;
                 match?: import("../props").FullEnum;
@@ -89,6 +90,7 @@ declare const useSettings: (props: TablePropTypes, ctx: SetupContext, columns: U
                         label: string;
                         text?: string;
                         value: string;
+                        tipKey?: string;
                     }[];
                     filterFn?: (...args: any[]) => boolean;
                     match?: import("../props").FullEnum;

package/lib/table/index.js

@@ -17327,7 +17327,7 @@ 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, ["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, ["resolveDirective"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.resolveDirective, ["toRaw"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRaw, ["toRef"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRef, ["unref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.unref, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch, ["withDirectives"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.withDirectives });
 ;// CONCATENATED MODULE: ../../node_modules/@babel/runtime/helpers/esm/typeof.js
 function typeof_typeof(o) {
   "@babel/helpers - typeof";
@@ -21762,7 +21762,7 @@ const exception_less_namespaceObject = exception_less_x({  });
 ;// CONCATENATED MODULE: external "../directives"
 var directives_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var directives_y = x => () => x
-const directives_namespaceObject = directives_x({ ["bkEllipsisInstance"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_directives_45d4776f__.bkEllipsisInstance });
+const directives_namespaceObject = directives_x({ ["bkEllipsisInstance"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_directives_45d4776f__.bkEllipsisInstance, ["bkTooltips"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_directives_45d4776f__.bkTooltips });
 ;// CONCATENATED MODULE: ../../packages/table/src/components/table-cell.tsx
 
 
@@ -22433,12 +22433,16 @@ const input_less_namespaceObject = input_less_x({  });
 
 
 
+
 function _isSlot(s) {
   return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !(0,external_vue_namespaceObject.isVNode)(s);
 }
 var ROW_HEIGHT = 32;
 /* harmony default export */ const head_filter = ((0,external_vue_namespaceObject.defineComponent)({
   name: 'HeadFilter',
+  directives: {
+    bkTooltips: directives_namespaceObject.bkTooltips
+  },
   props: {
     column: IColumnType,
     height: shared_namespaceObject.PropTypes.number.def(ROW_HEIGHT)
@@ -22459,6 +22463,8 @@ var ROW_HEIGHT = 32;
       return (_filter$value$checked = (_filter$value = filter.value) === null || _filter$value === void 0 ? void 0 : _filter$value.checked) !== null && _filter$value$checked !== void 0 ? _filter$value$checked : [];
     });
     var searchValue = (0,external_vue_namespaceObject.ref)('');
+    var filterPopoverRef = (0,external_vue_namespaceObject.ref)();
+    var allTextRef = (0,external_vue_namespaceObject.ref)([]);
     var state = (0,external_vue_namespaceObject.reactive)({
       isOpen: false,
       checked: []
@@ -22555,6 +22561,42 @@ var ROW_HEIGHT = 32;
         text: text
       };
     };
+    var resolveOverflowTips = function resolveOverflowTips(payload) {
+      var _filterPopoverRef$val;
+      var labelRef = allTextRef.value["list-item-".concat(payload.value, "-ref")];
+      var checkBoxLabelRef = (_filterPopoverRef$val = filterPopoverRef.value) === null || _filterPopoverRef$val === void 0 ? void 0 : _filterPopoverRef$val.querySelector('.bk-checkbox-label');
+      if (labelRef && checkBoxLabelRef) {
+        var _filterPopoverRef$val2, _filterPopoverRef$val3;
+        var CHECKBOX_WIDTH = 16;
+        var labelStyles = renderDomStyles(labelRef);
+        var checkBoxLabel = renderDomStyles(checkBoxLabelRef);
+        var filterPopoverStyles = renderDomStyles(filterPopoverRef.value);
+        // 获取每个item项的margin、padding、 border
+        var allTipStyles = (labelRef === null || labelRef === void 0 ? void 0 : labelRef.offsetWidth) + (labelStyles === null || labelStyles === void 0 ? void 0 : labelStyles.borderSize) + (labelStyles === null || labelStyles === void 0 ? void 0 : labelStyles.marginSize) + (labelStyles === null || labelStyles === void 0 ? void 0 : labelStyles.paddingSize) + (filterPopoverStyles === null || filterPopoverStyles === void 0 ? void 0 : filterPopoverStyles.borderSize) + (filterPopoverStyles === null || filterPopoverStyles === void 0 ? void 0 : filterPopoverStyles.marginSize) + (filterPopoverStyles === null || filterPopoverStyles === void 0 ? void 0 : filterPopoverStyles.paddingSize) + (checkBoxLabel === null || checkBoxLabel === void 0 ? void 0 : checkBoxLabel.marginSize) + (checkBoxLabel === null || checkBoxLabel === void 0 ? void 0 : checkBoxLabel.paddingSize);
+        if ((labelRef === null || labelRef === void 0 ? void 0 : labelRef.offsetWidth) > ((_filterPopoverRef$val2 = filterPopoverRef.value) === null || _filterPopoverRef$val2 === void 0 ? void 0 : _filterPopoverRef$val2.offsetWidth) || CHECKBOX_WIDTH + allTipStyles > ((_filterPopoverRef$val3 = filterPopoverRef.value) === null || _filterPopoverRef$val3 === void 0 ? void 0 : _filterPopoverRef$val3.offsetWidth)) {
+          return false;
+        }
+      }
+      return true;
+    };
+    var renderDomStyles = function renderDomStyles(el) {
+      if (!el) {
+        return {
+          paddingSize: 0,
+          borderSize: 0,
+          marginSize: 0
+        };
+      }
+      var styles = getComputedStyle(el);
+      var paddingSize = Number.parseFloat(styles.getPropertyValue('padding-left')) + Number.parseFloat(styles.getPropertyValue('padding-right'));
+      var borderSize = Number.parseFloat(styles.getPropertyValue('border-left-width')) + Number.parseFloat(styles.getPropertyValue('border-right-width'));
+      var marginSize = Number.parseFloat(styles.getPropertyValue('margin-left')) + Number.parseFloat(styles.getPropertyValue('margin-right'));
+      return {
+        paddingSize: paddingSize,
+        borderSize: borderSize,
+        marginSize: marginSize
+      };
+    };
     var _filter$value4 = filter.value,
       btnSave = _filter$value4.btnSave,
       btnReset = _filter$value4.btnReset;
@@ -22611,8 +22653,9 @@ var ROW_HEIGHT = 32;
     var renderFilterList = function renderFilterList(scope) {
       if (scope.data.length) {
         return scope.data.map(function (item) {
-          return (0,external_vue_namespaceObject.createVNode)("div", {
+          return (0,external_vue_namespaceObject.withDirectives)((0,external_vue_namespaceObject.createVNode)("div", {
             "key": item.value,
+            "ref": filterPopoverRef,
             "class": "list-item"
           }, [(0,external_vue_namespaceObject.createVNode)(checkbox_namespaceObject["default"], {
             "checked": state.checked.includes(item.value),
@@ -22624,9 +22667,17 @@ var ROW_HEIGHT = 32;
             }
           }, {
             "default": function _default() {
-              return ["".concat(item.text)];
+              return [(0,external_vue_namespaceObject.createVNode)("span", {
+                "ref": function ref(el) {
+                  return allTextRef.value["list-item-".concat(item.value, "-ref")] = el;
+                }
+              }, ["".concat(item.text)])];
             }
-          })]);
+          })]), [[(0,external_vue_namespaceObject.resolveDirective)("bk-tooltips"), {
+            content: item.tipKey || item.text,
+            placement: 'right',
+            disabled: resolveOverflowTips(item)
+          }]]);
         });
       }
       return (0,external_vue_namespaceObject.createVNode)("div", {

package/lib/table/props.d.ts

@@ -71,6 +71,7 @@ export type IFilterShape = {
         label: string;
         text?: string;
         value: string;
+        tipKey?: string;
     }[];
     filterFn?: (...args: any[]) => boolean;
     match?: FullEnum;

package/lib/table/utils.d.ts

@@ -140,6 +140,7 @@ export declare const resolveColumnFilterProp: (col: Column) => {
         label: string;
         text?: string;
         value: string;
+        tipKey?: string;
     }[];
     filterFn?: (...args: any[]) => boolean;
     match?: import("./props").FullEnum;

package/lib/upload/index.js

@@ -2053,6 +2053,7 @@ var spark_md5_default = /*#__PURE__*/__webpack_require__.n(spark_md5);
  */
 
 
+var errMsg = 'An error occurred during upload';
 function getRes(xhr) {
   var res = xhr.responseText || xhr.response;
   if (!res) {
@@ -2107,11 +2108,15 @@ var ajaxUpload = function ajaxUpload(option) {
     formData.append(option.filename, option.file, option.file.name);
   }
   xhr.addEventListener('error', function () {
-    option.onError(new Error('An error occurred during upload'));
+    var responseText = getRes(xhr);
+    var msg = new Error(responseText || errMsg);
+    option.onError(msg);
+    // option.onError(new Error('An error occurred during upload'));
   });
   xhr.addEventListener('load', function () {
     if (xhr.status < 200 || xhr.status >= 300) {
-      return option.onError(new Error('An error occurred during upload'));
+      var responseText = getRes(xhr);
+      return option.onError(new Error(responseText || errMsg));
     }
     option.onSuccess(getRes(xhr));
   });
@@ -2189,10 +2194,11 @@ var ajaxSliceUpload = /*#__PURE__*/function () {
             req.open(option.method, option.mergeUrl, true);
             req.onreadystatechange = function () {
               if (req.readyState === 4) {
+                var responseText = getRes(req);
                 if (req.status < 200 || req.status >= 300) {
-                  return option.onError(new Error('An error occurred during upload'));
+                  return option.onError(new Error(responseText || errMsg));
                 }
-                option.onSuccess(getRes(req));
+                option.onSuccess(responseText);
               }
             };
             req.onloadend = function () {
@@ -2251,10 +2257,10 @@ var sliceSend = function sliceSend(option, file, blockCount, hash, progressList,
       var xhr = new XMLHttpRequest();
       xhr.onreadystatechange = function () {
         if (xhr.readyState === 4) {
-          var res = getRes(xhr);
+          var responseText = getRes(xhr);
           if (xhr.status < 200 || xhr.status >= 300) {
-            reject(res);
-            option.onError(new Error('An error occurred during upload'));
+            reject(responseText);
+            option.onError(new Error(responseText || errMsg));
           } else {
             resolve('reponseText');
           }
@@ -2332,7 +2338,7 @@ var hashFile = function hashFile(file, chunkSize) {
       }
     };
     fileReader.onerror = function () {
-      reject(new Error('File slcie failed'));
+      reject(new Error('File slice failed'));
     };
     loadNext();
   })["catch"](function (err) {

package/package.json

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