bkui-vue 0.0.2-beta.126 → 0.0.2-beta.128

package/lib/pop-confirm/index.d.ts

@@ -10,6 +10,7 @@ declare const BKPopConfirm: {
             theme?: string;
             trigger?: "click" | "hover";
             icon?: string;
+            loading?: boolean;
             confirmText?: string;
             cancelText?: string;
             class?: unknown;
@@ -112,10 +113,28 @@ declare const BKPopConfirm: {
             width: import("vue-types").VueTypeDef<string | number> & {
                 default: string | number;
             };
+            loading: import("vue-types").VueTypeValidableDef<boolean> & {
+                default: boolean;
+            } & {
+                default: boolean;
+            };
         }>> & {
             onConfirm?: (...args: any[]) => any;
             onCancel?: (...args: any[]) => any;
-        }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("cancel" | "confirm")[], string, {
+        }, {
+            popoverRef: any;
+            visible: import("vue").Ref<boolean>;
+            t: import("vue").ComputedRef<{
+                ok: string;
+                cancel: string;
+            }>;
+            icon: string | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+                [key: string]: any;
+            }>[];
+            resolveClassName: (cls: string) => string;
+            ensure: (e: Event) => void;
+            cancel: (e: Event) => void;
+        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("cancel" | "confirm")[], string, {
             title: string;
             width: string | number;
             content: string;
@@ -123,6 +142,7 @@ declare const BKPopConfirm: {
             theme: string;
             trigger: "click" | "hover";
             icon: string;
+            loading: boolean;
             confirmText: string;
             cancelText: string;
         }, {}, string, {}> & {
@@ -185,10 +205,28 @@ declare const BKPopConfirm: {
         width: import("vue-types").VueTypeDef<string | number> & {
             default: string | number;
         };
+        loading: import("vue-types").VueTypeValidableDef<boolean> & {
+            default: boolean;
+        } & {
+            default: boolean;
+        };
     }>> & {
         onConfirm?: (...args: any[]) => any;
         onCancel?: (...args: any[]) => any;
-    } & import("vue").ShallowUnwrapRef<() => JSX.Element> & {} & import("vue").ComponentCustomProperties & {};
+    } & import("vue").ShallowUnwrapRef<{
+        popoverRef: any;
+        visible: import("vue").Ref<boolean>;
+        t: import("vue").ComputedRef<{
+            ok: string;
+            cancel: string;
+        }>;
+        icon: string | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+            [key: string]: any;
+        }>[];
+        resolveClassName: (cls: string) => string;
+        ensure: (e: Event) => void;
+        cancel: (e: Event) => void;
+    }> & {} & import("vue").ComponentCustomProperties & {};
     __isFragment?: never;
     __isTeleport?: never;
     __isSuspense?: never;
@@ -232,10 +270,28 @@ declare const BKPopConfirm: {
     width: import("vue-types").VueTypeDef<string | number> & {
         default: string | number;
     };
+    loading: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    } & {
+        default: boolean;
+    };
 }>> & {
     onConfirm?: (...args: any[]) => any;
     onCancel?: (...args: any[]) => any;
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("cancel" | "confirm")[], "cancel" | "confirm", {
+}, {
+    popoverRef: any;
+    visible: import("vue").Ref<boolean>;
+    t: import("vue").ComputedRef<{
+        ok: string;
+        cancel: string;
+    }>;
+    icon: string | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        [key: string]: any;
+    }>[];
+    resolveClassName: (cls: string) => string;
+    ensure: (e: Event) => void;
+    cancel: (e: Event) => void;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("cancel" | "confirm")[], "cancel" | "confirm", {
     title: string;
     width: string | number;
     content: string;
@@ -243,6 +299,7 @@ declare const BKPopConfirm: {
     theme: string;
     trigger: "click" | "hover";
     icon: string;
+    loading: boolean;
     confirmText: string;
     cancelText: string;
 }, {}, string, {}> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & import("vue").Plugin<any[]>;

package/lib/pop-confirm/index.js

@@ -126,7 +126,8 @@ var PopConfirmProps = {
    * 自定义icon：根据确认框中提示文字的语境来选择 icon的样式，当确认操作存在风险时，可选择带警示的icon来引起用户的注意。
    */
   icon: external_shared_namespaceObject.PropTypes.string.def(''),
-  width: external_shared_namespaceObject.PropTypes.oneOfType([external_shared_namespaceObject.PropTypes.string, external_shared_namespaceObject.PropTypes.number]).def('auto')
+  width: external_shared_namespaceObject.PropTypes.oneOfType([external_shared_namespaceObject.PropTypes.string, external_shared_namespaceObject.PropTypes.number]).def('auto'),
+  loading: external_shared_namespaceObject.PropTypes.bool.def(false)
 };
 /* harmony default export */ const props = (PopConfirmProps);
 ;// CONCATENATED MODULE: ../../packages/pop-confirm/src/pop-confirm.tsx
@@ -193,50 +194,64 @@ var PopConfirmProps = {
     var icon = renderIcon();
     var _usePrefix = (0,external_config_provider_namespaceObject.usePrefix)(),
       resolveClassName = _usePrefix.resolveClassName;
-    return function () {
-      return (0,external_vue_namespaceObject.createVNode)(external_popover_namespaceObject["default"], {
-        "isShow": visible.value,
-        "trigger": props.trigger,
-        "theme": props.theme,
-        "width": props.width,
-        "onAfterShow": function onAfterShow() {
-          return visible.value = true;
-        },
-        "extCls": "".concat(resolveClassName('pop-confirm-box'))
-      }, {
-        "default": function _default() {
-          return slots["default"]();
-        },
-        content: function content() {
-          return (0,external_vue_namespaceObject.createVNode)("div", {
-            "class": "".concat(resolveClassName('pop-confirm'))
-          }, [typeof slots.content === 'function' ? slots.content() : (0,external_vue_namespaceObject.createVNode)(external_vue_namespaceObject.Fragment, null, [props.title ? (0,external_vue_namespaceObject.createVNode)("div", {
-            "class": "".concat(resolveClassName('pop-confirm-title'))
-          }, [icon ? (0,external_vue_namespaceObject.createVNode)("span", {
-            "class": "".concat(resolveClassName('pop-confirm-icon'))
-          }, [icon]) : '', (0,external_vue_namespaceObject.createVNode)("span", null, [props.title])]) : '', (0,external_vue_namespaceObject.createVNode)("div", {
-            "class": "".concat(resolveClassName('pop-confirm-content'))
-          }, [!props.title ? icon : '', props.content])]), (0,external_vue_namespaceObject.createVNode)("div", {
-            "class": "".concat(resolveClassName('pop-confirm-footer'))
-          }, [(0,external_vue_namespaceObject.createVNode)(external_button_namespaceObject["default"], {
-            "onClick": ensure,
-            "size": "small",
-            "theme": "primary"
-          }, {
-            "default": function _default() {
-              return [props.confirmText || t.value.ok];
-            }
-          }), (0,external_vue_namespaceObject.createVNode)(external_button_namespaceObject["default"], {
-            "onClick": cancel,
-            "size": "small"
-          }, {
-            "default": function _default() {
-              return [props.cancelText || t.value.cancel];
-            }
-          })])]);
-        }
-      });
+    var popoverRef = (0,external_vue_namespaceObject.ref)(null);
+    return {
+      popoverRef: popoverRef,
+      visible: visible,
+      t: t,
+      icon: icon,
+      resolveClassName: resolveClassName,
+      ensure: ensure,
+      cancel: cancel
     };
+  },
+  render: function render() {
+    var _this = this;
+    return (0,external_vue_namespaceObject.createVNode)(external_popover_namespaceObject["default"], {
+      "ref": "popoverRef",
+      "isShow": this.visible,
+      "trigger": this.trigger,
+      "theme": this.theme,
+      "width": this.width,
+      "onAfterShow": function onAfterShow() {
+        return _this.visible = true;
+      },
+      "extCls": "".concat(this.resolveClassName('pop-confirm-box'))
+    }, {
+      "default": function _default() {
+        return _this.$slots["default"]();
+      },
+      content: function content() {
+        return (0,external_vue_namespaceObject.createVNode)("div", {
+          "class": "".concat(_this.resolveClassName('pop-confirm'))
+        }, [typeof _this.$slots.content === 'function' ? _this.$slots.content() : (0,external_vue_namespaceObject.createVNode)(external_vue_namespaceObject.Fragment, null, [_this.title ? (0,external_vue_namespaceObject.createVNode)("div", {
+          "class": "".concat(_this.resolveClassName('pop-confirm-title'))
+        }, [_this.icon ? (0,external_vue_namespaceObject.createVNode)("span", {
+          "class": "".concat(_this.resolveClassName('pop-confirm-icon'))
+        }, [_this.icon]) : '', (0,external_vue_namespaceObject.createVNode)("span", null, [_this.title])]) : '', (0,external_vue_namespaceObject.createVNode)("div", {
+          "class": "".concat(_this.resolveClassName('pop-confirm-content'))
+        }, [!_this.title ? _this.icon : '', _this.content])]), (0,external_vue_namespaceObject.createVNode)("div", {
+          "class": "".concat(_this.resolveClassName('pop-confirm-footer'))
+        }, [(0,external_vue_namespaceObject.createVNode)(external_button_namespaceObject["default"], {
+          "onClick": _this.ensure,
+          "size": "small",
+          "theme": "primary",
+          "loading": _this.loading
+        }, {
+          "default": function _default() {
+            return [_this.confirmText || _this.t.ok];
+          }
+        }), (0,external_vue_namespaceObject.createVNode)(external_button_namespaceObject["default"], {
+          "onClick": _this.cancel,
+          "size": "small",
+          "disabled": _this.loading
+        }, {
+          "default": function _default() {
+            return [_this.cancelText || _this.t.cancel];
+          }
+        })])]);
+      }
+    });
   }
 }));
 ;// CONCATENATED MODULE: ../../packages/pop-confirm/src/index.ts

package/lib/pop-confirm/pop-confirm.d.ts

@@ -38,7 +38,25 @@ declare const _default: import("vue").DefineComponent<{
     width: import("vue-types").VueTypeDef<string | number> & {
         default: string | number;
     };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("cancel" | "confirm")[], "cancel" | "confirm", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    loading: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    } & {
+        default: boolean;
+    };
+}, {
+    popoverRef: any;
+    visible: import("vue").Ref<boolean>;
+    t: import("vue").ComputedRef<{
+        ok: string;
+        cancel: string;
+    }>;
+    icon: string | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        [key: string]: any;
+    }>[];
+    resolveClassName: (cls: string) => string;
+    ensure: (e: Event) => void;
+    cancel: (e: Event) => void;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("cancel" | "confirm")[], "cancel" | "confirm", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     trigger: import("vue-types").VueTypeDef<"click" | "hover"> & {
         default: "click" | "hover";
     };
@@ -78,6 +96,11 @@ declare const _default: import("vue").DefineComponent<{
     width: import("vue-types").VueTypeDef<string | number> & {
         default: string | number;
     };
+    loading: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    } & {
+        default: boolean;
+    };
 }>> & {
     onConfirm?: (...args: any[]) => any;
     onCancel?: (...args: any[]) => any;
@@ -89,6 +112,7 @@ declare const _default: import("vue").DefineComponent<{
     theme: string;
     trigger: "click" | "hover";
     icon: string;
+    loading: boolean;
     confirmText: string;
     cancelText: string;
 }, {}>;

package/lib/pop-confirm/props.d.ts

@@ -63,5 +63,10 @@ export declare const PopConfirmProps: {
     width: import("vue-types").VueTypeDef<string | number> & {
         default: string | number;
     };
+    loading: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    } & {
+        default: boolean;
+    };
 };
 export default PopConfirmProps;

package/lib/table/index.js

@@ -4697,9 +4697,7 @@ function _isSlot(s) {
       isShow.value = false;
     };
     var handleSettingClick = function handleSettingClick() {
-      if (localSettings.value.trigger === 'manual') {
-        isShow.value = true;
-      }
+      isShow.value = true;
     };
     var handleCheckAllClick = function handleCheckAllClick(e) {
       e.stopImmediatePropagation();
@@ -5790,18 +5788,20 @@ function use_render_isSlot(s) {
     };
     var _useFixedColumn = use_fixed_column(props, tableResp, head),
       resolveFixedColumnStyle = _useFixedColumn.resolveFixedColumnStyle;
-    var getScrollFix = function getScrollFix() {
-      if (styleRef.value.hasScrollY) {
-        var fixStyle = {
-          width: "".concat(SCROLLY_WIDTH + 2, "px"),
-          right: '-1px'
-        };
-        return (0,external_vue_namespaceObject.createVNode)("th", {
-          "style": fixStyle,
-          "class": "column_fixed"
-        }, null);
-      }
-    };
+    // const getScrollFix = () => {
+    //   if (styleRef.value.hasScrollY) {
+    //     const fixStyle = {
+    //       width: `${SCROLLY_WIDTH + 2}px`,
+    //       right: '-1px',
+    //     };
+    //     return (
+    //       <th
+    //         style={fixStyle}
+    //         class='column_fixed'
+    //       ></th>
+    //     );
+    //   }
+    // };
     return (0,external_vue_namespaceObject.createVNode)(external_vue_namespaceObject.Fragment, null, [(0,external_vue_namespaceObject.createVNode)("thead", {
       "style": rowStyle
     }, [(0,external_vue_namespaceObject.createVNode)(table_row, null, {
@@ -5815,7 +5815,7 @@ function use_render_isSlot(s) {
           });
           var classList = [getHeadColumnClass(column, index), getColumnCustomClass(column), column.align || props.headerAlign || props.align];
           return getTH(classList, headStyle, index);
-        }), getScrollFix()])];
+        })])];
       }
     })])]);
   };

package/lib/table/table.css

@@ -1262,7 +1262,8 @@
 .bk-table .bk-table-head {
   position: relative;
   z-index: 2;
-  transform: translateX(var(--scroll-head-left));
+  scrollbar-gutter: stable;
+  overflow: hidden;
 }
 .bk-table .bk-table-head .col-resize-drag {
   position: absolute;
@@ -1274,6 +1275,9 @@
   background-color: #3785ff;
   transform: translateX(-50%);
 }
+.bk-table .bk-table-head thead {
+  transform: translateX(var(--scroll-head-left));
+}
 .bk-table .bk-table-head .table-head-settings {
   position: absolute;
   top: 0;

package/lib/table/table.less

@@ -308,7 +308,8 @@
   .@{bk-prefix}-table-head {
     position: relative;
     z-index: 2;
-    transform: translateX(var(--scroll-head-left));
+    scrollbar-gutter: stable;
+    overflow: hidden;
 
     .col-resize-drag {
       position: absolute;
@@ -321,6 +322,10 @@
       transform: translateX(-50%);
     }
 
+    thead {
+      transform: translateX(var(--scroll-head-left));
+    }
+
     .table-head-settings {
       position: absolute;
       top: 0;

package/lib/table/table.variable.css

@@ -1385,7 +1385,8 @@
 .bk-table .bk-table-head {
   position: relative;
   z-index: 2;
-  transform: translateX(var(--scroll-head-left));
+  scrollbar-gutter: stable;
+  overflow: hidden;
 }
 .bk-table .bk-table-head .col-resize-drag {
   position: absolute;
@@ -1397,6 +1398,9 @@
   background-color: #3785ff;
   transform: translateX(-50%);
 }
+.bk-table .bk-table-head thead {
+  transform: translateX(var(--scroll-head-left));
+}
 .bk-table .bk-table-head .table-head-settings {
   position: absolute;
   top: 0;

package/package.json

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