bkui-vue 0.0.2-beta.90 → 0.0.2-beta.91

package/lib/checkbox/checkbox.d.ts

@@ -80,7 +80,8 @@ declare const _default: import("vue").DefineComponent<{
     resolveClassName: (cls: string) => string;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     'update:modelValue': (value: any) => boolean;
-    change: (value: any) => boolean;
+    change: (value: any, _event?: Event) => boolean;
+    click: (_event: MouseEvent) => true;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
     modelValue: import("vue-types").VueTypeDef<string | number | boolean>;
     label: import("vue-types").VueTypeDef<string | number | boolean>;
@@ -115,7 +116,8 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
 }>> & {
-    onChange?: (value: any) => any;
+    onChange?: (value: any, _event?: Event) => any;
+    onClick?: (_event: MouseEvent) => any;
     "onUpdate:modelValue"?: (value: any) => any;
 }, {
     disabled: boolean;

package/lib/checkbox/index.d.ts

@@ -16,7 +16,8 @@ declare const BkCheckbox: {
             class?: unknown;
             readonly label?: string | number | boolean;
             style?: unknown;
-            onChange?: (value: any) => any;
+            onChange?: (value: any, _event?: Event) => any;
+            onClick?: (_event: MouseEvent) => any;
             ref?: import("vue").VNodeRef;
             key?: string | number | symbol;
             ref_for?: boolean;
@@ -73,7 +74,7 @@ declare const BkCheckbox: {
         }>;
         $root: import("vue").ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, import("vue").ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}, {}, string, {}>, {}, {}>;
         $parent: import("vue").ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, import("vue").ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}, {}, string, {}>, {}, {}>;
-        $emit: ((event: "change", value: any) => void) & ((event: "update:modelValue", value: any) => void);
+        $emit: ((event: "change", value: any, _event?: Event) => void) & ((event: "click", _event: MouseEvent) => void) & ((event: "update:modelValue", value: any) => void);
         $el: any;
         $options: import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<{
             modelValue: import("vue-types").VueTypeDef<string | number | boolean>;
@@ -109,7 +110,8 @@ declare const BkCheckbox: {
                 default: boolean;
             };
         }>> & {
-            onChange?: (value: any) => any;
+            onChange?: (value: any, _event?: Event) => any;
+            onClick?: (_event: MouseEvent) => any;
             "onUpdate:modelValue"?: (value: any) => any;
         }, {
             inputRef: import("vue").Ref<any>;
@@ -124,7 +126,8 @@ declare const BkCheckbox: {
             resolveClassName: (cls: string) => string;
         }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
             'update:modelValue': (value: any) => boolean;
-            change: (value: any) => boolean;
+            change: (value: any, _event?: Event) => boolean;
+            click: (_event: MouseEvent) => true;
         }, string, {
             disabled: boolean;
             size: "default" | "small" | "large";
@@ -188,7 +191,8 @@ declare const BkCheckbox: {
             default: boolean;
         };
     }>> & {
-        onChange?: (value: any) => any;
+        onChange?: (value: any, _event?: Event) => any;
+        onClick?: (_event: MouseEvent) => any;
         "onUpdate:modelValue"?: (value: any) => any;
     } & import("vue").ShallowUnwrapRef<{
         inputRef: import("vue").Ref<any>;
@@ -239,7 +243,8 @@ declare const BkCheckbox: {
         default: boolean;
     };
 }>> & {
-    onChange?: (value: any) => any;
+    onChange?: (value: any, _event?: Event) => any;
+    onClick?: (_event: MouseEvent) => any;
     "onUpdate:modelValue"?: (value: any) => any;
 }, {
     inputRef: import("vue").Ref<any>;
@@ -254,7 +259,8 @@ declare const BkCheckbox: {
     resolveClassName: (cls: string) => string;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     'update:modelValue': (value: any) => boolean;
-    change: (value: any) => boolean;
+    change: (value: any, _event?: Event) => boolean;
+    click: (_event: MouseEvent) => true;
 }, string, {
     disabled: boolean;
     size: "default" | "small" | "large";

package/lib/checkbox/index.js

@@ -207,11 +207,11 @@ var useCheckbox = function useCheckbox() {
     return props.disabled;
   });
   // 触发更新
-  var triggerChange = function triggerChange() {
+  var triggerChange = function triggerChange(event) {
     // 单独使用时状态切换返回 trueLabel、falseLabel
     var nextValue = isChecked.value ? props.trueLabel : props.falseLabel;
     emit('update:modelValue', nextValue);
-    emit('change', nextValue);
+    emit('change', nextValue, event);
     // 更新 checkbox-group
     // 配合 checkbox-group 使用时返回 props.label
     if (isGroup) {
@@ -264,7 +264,7 @@ var useCheckbox = function useCheckbox() {
     }
     var $targetInput = event.target;
     isChecked.value = $targetInput.checked;
-    triggerChange();
+    triggerChange(event);
   };
   (0,external_vue_namespaceObject.onMounted)(function () {
     if (isGroup) {
@@ -337,8 +337,11 @@ var checkboxProps = {
     'update:modelValue': function updateModelValue(value) {
       return value !== undefined;
     },
-    change: function change(value) {
+    change: function change(value, _event) {
       return value !== undefined;
+    },
+    click: function click(_event) {
+      return true;
     }
   },
   setup: function setup(props) {

package/lib/pop-confirm/index.js

@@ -224,14 +224,14 @@ var PopConfirmProps = {
             "theme": "primary"
           }, {
             "default": function _default() {
-              return [t.value.ok];
+              return [props.confirmText || t.value.ok];
             }
           }), (0,external_vue_namespaceObject.createVNode)(external_button_namespaceObject["default"], {
             "onClick": cancel,
             "size": "small"
           }, {
             "default": function _default() {
-              return [t.value.cancel];
+              return [props.cancelText || t.value.cancel];
             }
           })])]);
         }

package/lib/tree/index.js

@@ -1202,7 +1202,10 @@ var use_node_action_this = undefined;
       deepUpdateChildNode(chid, attr, value);
     });
   };
-  var handleNodeItemCheckboxChange = function handleNodeItemCheckboxChange(item, value) {
+  var handleNodeItemCheckboxChange = function handleNodeItemCheckboxChange(item, value, event) {
+    event.preventDefault();
+    event.stopImmediatePropagation();
+    event.stopPropagation();
     setNodeAttr(item, NODE_ATTRIBUTES.IS_CHECKED, !!value);
     deepUpdateChildNode(item, [NODE_ATTRIBUTES.IS_CHECKED, NODE_ATTRIBUTES.IS_INDETERMINATE], [!!value, false]);
     updateParentChecked(item, value);
@@ -1211,6 +1214,7 @@ var use_node_action_this = undefined;
     }), flatData.data.filter(function (t) {
       return isIndeterminate(t);
     }));
+    handleNodeContentClick(item, event);
   };
   var isIndeterminate = function isIndeterminate(item) {
     return isNodeChecked(item) && getNodeAttr(item, NODE_ATTRIBUTES.IS_INDETERMINATE);
@@ -1223,8 +1227,9 @@ var use_node_action_this = undefined;
       "size": "small",
       "modelValue": isNodeChecked(item),
       "indeterminate": isIndeterminate(item),
-      "onChange": function onChange(val) {
-        return handleNodeItemCheckboxChange(item, !!val);
+      "onClick": handleNodeCheckboxClick,
+      "onChange": function onChange(val, event) {
+        return handleNodeItemCheckboxChange(item, !!val, event);
       }
     }, null);
   };
@@ -1320,7 +1325,7 @@ var use_node_action_this = undefined;
   var handleTreeNodeClick = function handleTreeNodeClick(item, e) {
     var isOpen = isItemOpen(item);
     if (isOpen) {
-      setNodeOpened(item, false, e);
+      setNodeOpened(item, false, e, true);
       return;
     }
     /** 如果是异步请求加载 */
@@ -1329,11 +1334,11 @@ var use_node_action_this = undefined;
         registerNextLoop('setNodeOpenedAfterLoading', {
           type: 'once',
           fn: function fn() {
-            return setNodeOpened(item, true, e);
+            return setNodeOpened(item, true, e, true);
           }
         });
       } else {
-        setNodeOpened(item, true, e);
+        setNodeOpened(item, true, e, true);
       }
     });
   };
@@ -1508,6 +1513,10 @@ var use_node_action_this = undefined;
     }
     return extendNodeAttr(item);
   };
+  var handleNodeCheckboxClick = function handleNodeCheckboxClick(event) {
+    event.stopImmediatePropagation();
+    event.stopPropagation();
+  };
   /**
    * 渲染节点函数
    * @param item 当前节点

package/package.json

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