bkui-vue 0.0.2-beta.85 → 0.0.2-beta.87

package/lib/directives/index.js

@@ -1291,9 +1291,10 @@ var createInstance = function createInstance(el, binding) {
     handleContentLeave();
     createTimer && clearTimeout(createTimer);
     createTimer = setTimeout(function () {
+      var _targetOptions$conten;
       var targetOptions = resolveOptions(el, binding);
       targetOptions.isShow = true;
-      targetOptions.content = targetOptions.content || el;
+      targetOptions.content = typeof targetOptions.content === 'function' ? targetOptions.content() : (_targetOptions$conten = targetOptions.content) !== null && _targetOptions$conten !== void 0 ? _targetOptions$conten : el;
       targetOptions.allowHtml = true;
       Object.assign(targetOptions, {
         onContentMouseenter: handleContentEnter,

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

@@ -179,7 +179,7 @@ declare const _default: import("vue").DefineComponent<{
 }, unknown, {}, {
     updateColumnDefine(unmounted?: boolean): void;
     updateColumnDefineByParent(): void;
-    updateColumnDefineByIndex(unmounted?: boolean): void;
+    unmountColumn(): void;
 }, 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>;

package/lib/table/index.d.ts

@@ -1337,7 +1337,7 @@ declare const BkTable: {
     }, unknown, {}, {
         updateColumnDefine(unmounted?: boolean): void;
         updateColumnDefineByParent(): void;
-        updateColumnDefineByIndex(unmounted?: boolean): void;
+        unmountColumn(): void;
     }, 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>;

package/lib/table/index.js

@@ -965,8 +965,8 @@ var TableColumnProp = {
   methods: {
     updateColumnDefine: function updateColumnDefine() {
       var unmounted = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-      if (this.$props.index !== undefined && typeof this.$props.index === 'number') {
-        this.updateColumnDefineByIndex(unmounted);
+      if (unmounted) {
+        this.unmountColumn();
         return;
       }
       this.updateColumnDefineByParent();
@@ -978,6 +978,7 @@ var TableColumnProp = {
         var selfVnode = _this._;
         var colList = selfVnode.parent.vnode.children["default"]() || [];
         var sortColumns = [];
+        var index = 0;
         var reduceColumns = function reduceColumns(nodes) {
           if (!Array.isArray(nodes)) {
             return;
@@ -992,11 +993,14 @@ var TableColumnProp = {
             if (((_node$type = node.type) === null || _node$type === void 0 ? void 0 : _node$type.name) === 'TableColumn') {
               var _node$children;
               skipValidateKey0 = Object.hasOwnProperty.call(node.props || {}, 'key');
-              var resolveProp = Object.assign({}, node.props, {
+              var resolveProp = Object.assign({
+                index: index
+              }, node.props, {
                 field: node.props.prop || node.props.field,
                 render: (_node$children = node.children) === null || _node$children === void 0 ? void 0 : _node$children["default"]
               });
               sortColumns.push((0,external_vue_namespaceObject.unref)(resolveProp));
+              index = index + 1;
             }
             if ((_node$children2 = node.children) !== null && _node$children2 !== void 0 && _node$children2.length && skipValidateKey0) {
               reduceColumns(node.children);
@@ -1010,13 +1014,12 @@ var TableColumnProp = {
         this.bkTableCache.queueStack(BK_COLUMN_UPDATE_DEFINE, fn);
       }
     },
-    updateColumnDefineByIndex: function updateColumnDefineByIndex() {
-      var unmounted = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+    unmountColumn: function unmountColumn() {
       var resolveProp = Object.assign({}, this.$props, {
         field: this.$props.prop || this.$props.field,
         render: this.$slots["default"]
       });
-      this.initColumns((0,external_vue_namespaceObject.unref)(resolveProp), unmounted);
+      this.initColumns(resolveProp, true);
     }
   },
   render: function render() {
@@ -3936,48 +3939,31 @@ function use_attributes_objectSpread(target) { for (var i = 1; i < arguments.len
       resolveColumns = column;
     }
     if (!remove) {
-      var needToSort = false;
       resolveColumns.forEach(function (col) {
-        if (col.index !== undefined && col.index >= 0) {
-          needToSort = true;
-          var oldIndex = targetColumns.findIndex(function (tc) {
-            return tc.label === col.label && tc.field === col.field;
-          });
-          if (oldIndex >= 0) {
-            targetColumns.splice(oldIndex, 1);
-          }
-          targetColumns.push(col);
+        var index = targetColumns.findIndex(function (tc) {
+          return tc.label === col.label && tc.field === col.field;
+        });
+        if (index >= 0) {
+          Object.assign(targetColumns[index], col);
         } else {
-          var index = targetColumns.findIndex(function (tc) {
-            return tc.label === col.label && tc.field === col.field;
-          });
-          if (index >= 0) {
-            targetColumns.splice(index, 1, col);
-          } else {
-            targetColumns.push(col);
-          }
+          targetColumns.push(col);
         }
       });
-      if (needToSort) {
-        targetColumns.sort(function (col1, col2) {
-          return col1.index - col2.index;
-        });
-      }
+      targetColumns.sort(function (col1, col2) {
+        return col1.index - col2.index;
+      });
     } else {
       resolveColumns.forEach(function (col) {
         var matchColIndex = targetColumns.findIndex(function (c) {
           return c.label === col.label && c.field === col.field;
         });
-        if (remove) {
-          if (matchColIndex >= 0) {
-            targetColumns.splice(matchColIndex, 1);
-          }
-          return;
+        if (matchColIndex >= 0) {
+          targetColumns.splice(matchColIndex, 1);
         }
       });
     }
     resolvedColumns.length = 0;
-    resolvedColumns.push.apply(resolvedColumns, _toConsumableArray(resolveColumns));
+    resolvedColumns.push.apply(resolvedColumns, _toConsumableArray(targetColumns));
   };
   (0,external_vue_namespaceObject.watch)(function () {
     return [props.columns];
@@ -4415,7 +4401,9 @@ const external_directives_namespaceObject = external_directives_x({ ["bkEllipsis
     var resolveTooltipOption = function resolveTooltipOption() {
       var disabled = true;
       var resizerWay = props.resizerWay;
-      var content = refRoot.value.innerText;
+      var content = function content() {
+        return refRoot.value.innerText;
+      };
       var popoverOption = {};
       var mode = 'auto';
       var watchCellResize = true;
@@ -4426,9 +4414,13 @@ const external_directives_namespaceObject = external_directives_x({ ["bkEllipsis
         disabled = showOverflowTooltip.disabled;
         popoverOption = showOverflowTooltip.popoverOption;
         resizerWay = showOverflowTooltip.resizerWay || 'debounce';
-        content = showOverflowTooltip.content || refRoot.value.innerText;
+        content = function content() {
+          return showOverflowTooltip.content || refRoot.value.innerText;
+        };
         if (typeof showOverflowTooltip.content === 'function') {
-          content = showOverflowTooltip.content(props.column, props.row);
+          content = function content() {
+            return showOverflowTooltip.content(props.column, props.row);
+          };
         }
         watchCellResize = showOverflowTooltip.watchCellResize;
         mode = showOverflowTooltip.mode || 'auto';
@@ -4437,13 +4429,17 @@ const external_directives_namespaceObject = external_directives_x({ ["bkEllipsis
         disabled = Reflect.apply(disabled, _this, [props.column, props.row]);
       }
       if (props.isHead) {
-        var _getEllipsisTarget;
         disabled = false;
         mode = 'auto';
-        content = (_getEllipsisTarget = getEllipsisTarget()) === null || _getEllipsisTarget === void 0 ? void 0 : _getEllipsisTarget.innerHTML;
+        content = function content() {
+          var _getEllipsisTarget;
+          return (_getEllipsisTarget = getEllipsisTarget()) === null || _getEllipsisTarget === void 0 ? void 0 : _getEllipsisTarget.innerHTML;
+        };
         if (props.headExplain) {
           mode = 'static';
-          content = props.headExplain;
+          content = function content() {
+            return props.headExplain;
+          };
         }
       }
       /**
@@ -4453,7 +4449,9 @@ const external_directives_namespaceObject = external_directives_x({ ["bkEllipsis
         disabled = false;
         mode = 'static';
         if (typeof_typeof(props.column.explain) === 'object') {
-          content = resolvePropVal(props.column.explain, 'content', [props.column, props.row]);
+          content = function content() {
+            return resolvePropVal(props.column.explain, 'content', [props.column, props.row]);
+          };
         }
       }
       return {

package/lib/table/table.css

@@ -1012,7 +1012,7 @@
 .bk-table-flex {
   display: flex;
   flex-direction: column;
-  max-height: 100%;
+  max-height: fit-content;
 }
 .bk-table-flex .bk-table-body {
   flex: 1;

package/lib/table/table.less

@@ -18,7 +18,7 @@
   &-flex {
     display: flex;
     flex-direction: column;
-    max-height: 100%;
+    max-height: fit-content;
     .@{bk-prefix}-table-body {
       flex: 1;
       overflow: auto;

package/lib/table/table.variable.css

@@ -1134,7 +1134,7 @@
 .bk-table-flex {
   display: flex;
   flex-direction: column;
-  max-height: 100%;
+  max-height: fit-content;
 }
 .bk-table-flex .bk-table-body {
   flex: 1;

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

@@ -207,7 +207,7 @@ declare const BkTableColumn: {
         }, unknown, {}, {
             updateColumnDefine(unmounted?: boolean): void;
             updateColumnDefineByParent(): void;
-            updateColumnDefineByIndex(unmounted?: boolean): void;
+            unmountColumn(): void;
         }, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
             fixed: boolean | "right" | "left";
             minWidth: string | number;
@@ -364,7 +364,7 @@ declare const BkTableColumn: {
     }> & {} & {
         updateColumnDefine(unmounted?: boolean): void;
         updateColumnDefineByParent(): void;
-        updateColumnDefineByIndex(unmounted?: boolean): void;
+        unmountColumn(): void;
     } & import("vue").ComponentCustomProperties & {};
     __isFragment?: never;
     __isTeleport?: never;
@@ -497,7 +497,7 @@ declare const BkTableColumn: {
 }, unknown, {}, {
     updateColumnDefine(unmounted?: boolean): void;
     updateColumnDefineByParent(): void;
-    updateColumnDefineByIndex(unmounted?: boolean): void;
+    unmountColumn(): void;
 }, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
     fixed: boolean | "right" | "left";
     minWidth: string | number;

package/lib/table-column/index.js

@@ -668,8 +668,8 @@ var TableColumnProp = {
   methods: {
     updateColumnDefine: function updateColumnDefine() {
       var unmounted = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-      if (this.$props.index !== undefined && typeof this.$props.index === 'number') {
-        this.updateColumnDefineByIndex(unmounted);
+      if (unmounted) {
+        this.unmountColumn();
         return;
       }
       this.updateColumnDefineByParent();
@@ -681,6 +681,7 @@ var TableColumnProp = {
         var selfVnode = _this._;
         var colList = selfVnode.parent.vnode.children["default"]() || [];
         var sortColumns = [];
+        var index = 0;
         var reduceColumns = function reduceColumns(nodes) {
           if (!Array.isArray(nodes)) {
             return;
@@ -695,11 +696,14 @@ var TableColumnProp = {
             if (((_node$type = node.type) === null || _node$type === void 0 ? void 0 : _node$type.name) === 'TableColumn') {
               var _node$children;
               skipValidateKey0 = Object.hasOwnProperty.call(node.props || {}, 'key');
-              var resolveProp = Object.assign({}, node.props, {
+              var resolveProp = Object.assign({
+                index: index
+              }, node.props, {
                 field: node.props.prop || node.props.field,
                 render: (_node$children = node.children) === null || _node$children === void 0 ? void 0 : _node$children["default"]
               });
               sortColumns.push((0,external_vue_namespaceObject.unref)(resolveProp));
+              index = index + 1;
             }
             if ((_node$children2 = node.children) !== null && _node$children2 !== void 0 && _node$children2.length && skipValidateKey0) {
               reduceColumns(node.children);
@@ -713,13 +717,12 @@ var TableColumnProp = {
         this.bkTableCache.queueStack(BK_COLUMN_UPDATE_DEFINE, fn);
       }
     },
-    updateColumnDefineByIndex: function updateColumnDefineByIndex() {
-      var unmounted = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+    unmountColumn: function unmountColumn() {
       var resolveProp = Object.assign({}, this.$props, {
         field: this.$props.prop || this.$props.field,
         render: this.$slots["default"]
       });
-      this.initColumns((0,external_vue_namespaceObject.unref)(resolveProp), unmounted);
+      this.initColumns(resolveProp, true);
     }
   },
   render: function render() {

package/lib/upload/index.js

@@ -1945,11 +1945,11 @@ const external_button_namespaceObject = external_button_x({ ["default"]: () => _
         "disabled": disabled.value
       }, {
         "default": function _default() {
-          return [(0,external_vue_namespaceObject.createVNode)(external_icon_namespaceObject.Upload, {
+          return [(0,external_vue_namespaceObject.createVNode)(external_vue_namespaceObject.Fragment, null, [slots["default"] ? slots["default"]() : (0,external_vue_namespaceObject.createVNode)(external_vue_namespaceObject.Fragment, null, [(0,external_vue_namespaceObject.createVNode)(external_icon_namespaceObject.Upload, {
             "class": "".concat(classBlock, "__button-icon")
           }, null), (0,external_vue_namespaceObject.createVNode)("span", {
             "class": "".concat(classBlock, "__button-text")
-          }, [t.value.uploadLabel])];
+          }, [t.value.uploadLabel])])])];
         }
       });
     };

package/lib/upload/upload.type.d.ts

@@ -48,7 +48,7 @@ export interface UploadProgressEvent extends ProgressEvent {
 }
 export interface APIResponse {
     code: number;
-    data: unknown;
+    data: any;
     message?: string;
 }
 export type SuccessResponse = APIResponse | XMLHttpRequestResponseType | unknown;

package/lib/upload/use-file-handler.d.ts

@@ -1,4 +1,4 @@
-import { UploadFile, UploadHanderHooks, UploadProgressEvent, UploadProps, UploadRawFile } from './upload.type';
+import { SuccessResponse, UploadFile, UploadHanderHooks, UploadProgressEvent, UploadProps, UploadRawFile } from './upload.type';
 declare const _default: (props: UploadProps, hooks: UploadHanderHooks) => {
     fileList: import("vue").Ref<{
         name: string;
@@ -15,7 +15,7 @@ declare const _default: (props: UploadProps, hooks: UploadHanderHooks) => {
     handlePreprocess: (file: UploadRawFile) => any;
     handleRemove: (file: UploadFile | UploadRawFile) => Promise<void>;
     handleError: (err: Error, rawFile: UploadRawFile, res?: unknown) => Promise<void>;
-    handleSuccess: (res: unknown, rawFile: UploadRawFile) => Promise<void>;
+    handleSuccess: (res: SuccessResponse, rawFile: UploadRawFile) => Promise<void>;
     handleProgress: (event: UploadProgressEvent, rawFile: UploadRawFile) => Promise<void>;
 };
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "0.0.2-beta.85",
+  "version": "0.0.2-beta.87",
   "workspaces": {
     "packages": [
       "packages/!(**.bak)*",