bkui-vue 2.0.1-beta.33 → 2.0.1-beta.34

package/lib/index.js

@@ -4,5 +4,5 @@ export { default } from './preset';
 export * from './config-provider';
 export * from './directives';
 export * as plugins from './plugins';
-export const version = "2.0.1-beta.33";
+export const version = "2.0.1-beta.34";
 window.__bkui_vue_version__ = version;

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

@@ -20,6 +20,11 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: boolean;
     };
+    isExpandChild: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    } & {
+        default: boolean;
+    };
     headExplain: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
@@ -45,6 +50,11 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: boolean;
     };
+    isExpandChild: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    } & {
+        default: boolean;
+    };
     headExplain: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
@@ -54,6 +64,7 @@ declare const _default: import("vue").DefineComponent<{
     row: any;
     observerResize: boolean;
     isHead: boolean;
+    isExpandChild: boolean;
     headExplain: string;
 }, {}>;
 export default _default;

package/lib/table/index.js

@@ -21667,6 +21667,7 @@ const directives_namespaceObject = directives_x({ ["bkEllipsisInstance"]: () =>
     title: shared_namespaceObject.PropTypes.string.def(undefined),
     observerResize: shared_namespaceObject.PropTypes.bool.def(true),
     isHead: shared_namespaceObject.PropTypes.bool.def(false),
+    isExpandChild: shared_namespaceObject.PropTypes.bool.def(false),
     headExplain: shared_namespaceObject.PropTypes.string,
     resizerWay: (0,external_vue_types_namespaceObject.toType)('ResizerWay', {
       "default": ResizerWay.DEBOUNCE
@@ -21789,6 +21790,9 @@ const directives_namespaceObject = directives_x({ ["bkEllipsisInstance"]: () =>
           };
         }
       }
+      if (props.column.type === 'expand' && !props.isHead && !props.isExpandChild) {
+        disabled = true;
+      }
       return {
         disabled: disabled,
         content: content,
@@ -23310,6 +23314,7 @@ function use_render_isSlot(s) {
               "class": tdCtxClass,
               "column": column,
               "data-id": cellKey,
+              "isExpandChild": isChild,
               "observerResize": props.observerResize,
               "parentSetting": props.showOverflowTooltip,
               "row": row

package/lib/tree/constant.d.ts

@@ -7,7 +7,8 @@ export declare enum EVENTS {
     NODE_DRAG_START = "nodeDragStart",
     NODE_DROP = "nodeDrop",
     NODE_ENTER_VIEW = "nodeEnterView",
-    NODE_EXPAND = "nodeExpand"
+    NODE_EXPAND = "nodeExpand",
+    NODE_SELECTED = "nodeSelected"
 }
 export declare const TreeEmitEventsType: {
     nodeClick: (..._args: any[]) => boolean;
@@ -19,6 +20,7 @@ export declare const TreeEmitEventsType: {
     nodeDragLeave: (..._args: any[]) => boolean;
     nodeDrop: (..._args: any[]) => boolean;
     nodeEnterView: (..._args: any[]) => boolean;
+    nodeSelected: (..._args: any[]) => boolean;
 };
 /**
  * 节点扩展属性

package/lib/tree/index.d.ts

@@ -135,6 +135,7 @@ declare const BkTree: {
         onNodeDrop?: (...args: any[]) => any;
         onNodeEnterView?: (...args: any[]) => any;
         onNodeExpand?: (...args: any[]) => any;
+        onNodeSelected?: (...args: any[]) => any;
     }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
         nodeClick: (..._args: any[]) => boolean;
         nodeCollapse: (..._args: any[]) => boolean;
@@ -145,6 +146,7 @@ declare const BkTree: {
         nodeDragLeave: (..._args: any[]) => boolean;
         nodeDrop: (..._args: any[]) => boolean;
         nodeEnterView: (..._args: any[]) => boolean;
+        nodeSelected: (..._args: any[]) => boolean;
     }, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & Readonly<import("vue").ExtractPropTypes<{
         data: import("vue-types").VueTypeDef<any[]> & {
             default: () => any[];
@@ -281,6 +283,7 @@ declare const BkTree: {
         onNodeDrop?: (...args: any[]) => any;
         onNodeEnterView?: (...args: any[]) => any;
         onNodeExpand?: (...args: any[]) => any;
+        onNodeSelected?: (...args: any[]) => any;
     }, {
         data: any[];
         height: number;
@@ -453,6 +456,7 @@ declare const BkTree: {
         onNodeDrop?: (...args: any[]) => any;
         onNodeEnterView?: (...args: any[]) => any;
         onNodeExpand?: (...args: any[]) => any;
+        onNodeSelected?: (...args: any[]) => any;
     }, () => JSX.Element, {}, {}, {}, {
         data: any[];
         height: number;
@@ -622,6 +626,7 @@ declare const BkTree: {
     onNodeDrop?: (...args: any[]) => any;
     onNodeEnterView?: (...args: any[]) => any;
     onNodeExpand?: (...args: any[]) => any;
+    onNodeSelected?: (...args: any[]) => any;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     nodeClick: (..._args: any[]) => boolean;
     nodeCollapse: (..._args: any[]) => boolean;
@@ -632,6 +637,7 @@ declare const BkTree: {
     nodeDragLeave: (..._args: any[]) => boolean;
     nodeDrop: (..._args: any[]) => boolean;
     nodeEnterView: (..._args: any[]) => boolean;
+    nodeSelected: (..._args: any[]) => boolean;
 }, string, {
     data: any[];
     height: number;

package/lib/tree/index.js

@@ -17463,11 +17463,12 @@ var EVENTS;
   EVENTS["NODE_DROP"] = "nodeDrop";
   EVENTS["NODE_ENTER_VIEW"] = "nodeEnterView";
   EVENTS["NODE_EXPAND"] = "nodeExpand";
+  EVENTS["NODE_SELECTED"] = "nodeSelected";
 })(EVENTS || (EVENTS = {}));
 var EMPTY = function EMPTY() {
   return true;
 };
-var TreeEmitEventsType = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, EVENTS.NODE_CLICK, EMPTY), EVENTS.NODE_COLLAPSE, EMPTY), EVENTS.NODE_EXPAND, EMPTY), EVENTS.NODE_CHECKED, EMPTY), EVENTS.NODE_DRAG_START, EMPTY), EVENTS.NODE_DRAG_OVER, EMPTY), EVENTS.NODE_DRAG_LEAVE, EMPTY), EVENTS.NODE_DROP, EMPTY), EVENTS.NODE_ENTER_VIEW, EMPTY);
+var TreeEmitEventsType = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, EVENTS.NODE_CLICK, EMPTY), EVENTS.NODE_COLLAPSE, EMPTY), EVENTS.NODE_EXPAND, EMPTY), EVENTS.NODE_CHECKED, EMPTY), EVENTS.NODE_DRAG_START, EMPTY), EVENTS.NODE_DRAG_OVER, EMPTY), EVENTS.NODE_DRAG_LEAVE, EMPTY), EVENTS.NODE_DROP, EMPTY), EVENTS.NODE_ENTER_VIEW, EMPTY), EVENTS.NODE_SELECTED, EMPTY);
 /**
  * 节点扩展属性
  */
@@ -18721,8 +18722,8 @@ var use_node_action_this = undefined;
     }
     if (props.checkStrictly) {
       deepUpdateChildNode(item, [NODE_ATTRIBUTES.IS_CHECKED, NODE_ATTRIBUTES.IS_INDETERMINATE], [!!value, false]);
+      updateParentChecked(item, value);
     }
-    updateParentChecked(item, value);
     ctx.emit(EVENTS.NODE_CHECKED, flatData.data.filter(function (t) {
       return isNodeChecked(t);
     }), flatData.data.filter(function (t) {
@@ -18897,6 +18898,10 @@ var use_node_action_this = undefined;
     }
     setNodeAttr(resolvedItem, NODE_ATTRIBUTES.IS_SELECTED, selected);
     selectedNodeId = getNodeId(resolvedItem);
+    ctx.emit(EVENTS.NODE_SELECTED, {
+      selected: selected,
+      node: resolvedItem
+    });
     /**
      * 如果设置了自动展开
      * 判定长度是为了处理异步节点,如果当前设置selected的节点为多级异步节点

package/lib/tree/tree.d.ts

@@ -140,6 +140,7 @@ declare const _default: import("vue").DefineComponent<{
     nodeDragLeave: (..._args: any[]) => boolean;
     nodeDrop: (..._args: any[]) => boolean;
     nodeEnterView: (..._args: any[]) => boolean;
+    nodeSelected: (..._args: any[]) => boolean;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     data: import("vue-types").VueTypeDef<any[]> & {
         default: () => any[];
@@ -276,6 +277,7 @@ declare const _default: import("vue").DefineComponent<{
     onNodeDrop?: (...args: any[]) => any;
     onNodeEnterView?: (...args: any[]) => any;
     onNodeExpand?: (...args: any[]) => any;
+    onNodeSelected?: (...args: any[]) => any;
 }, {
     data: any[];
     height: number;

package/package.json

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