bkui-vue 2.0.1-beta.28.table.1 → 2.0.1-beta.29

package/lib/table/table.less

@@ -149,6 +149,7 @@
             display: flex;
             align-items: center;
             justify-content: center;
+            height: 100%;
           }
 
           &.expand-cell {
@@ -308,20 +309,6 @@
     background-color: var(--background-color);
     height: var(--row-height);
 
-    &.has-group {
-      .is-head-group {
-        border-bottom: 1px solid @table-border-color;
-      }
-
-      th {
-        border-right: 1px solid @table-border-color;
-
-        &.is-last-child {
-          border-right: none;
-        }
-      }
-    }
-
     .col-resize-drag {
       position: absolute;
       top: 0;
@@ -420,9 +407,6 @@
   &.bordered-col {
     .@{bk-prefix}-table-head {
       border-right: 1px solid @table-border-color;
-      .is-head-group {
-        border-bottom: 1px solid @table-border-color;
-      }
     }
     th {
       border-right: 1px solid @table-border-color;

package/lib/table/table.variable.css

@@ -1748,6 +1748,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  height: 100%;
 }
 .bk-table .bk-table-head table th .cell.expand-cell,
 .bk-table .bk-table-body table th .cell.expand-cell,
@@ -1894,15 +1895,6 @@
   background-color: var(--background-color);
   height: var(--row-height);
 }
-.bk-table .bk-table-head.has-group .is-head-group {
-  border-bottom: 1px solid var(--table-border-color);
-}
-.bk-table .bk-table-head.has-group th {
-  border-right: 1px solid var(--table-border-color);
-}
-.bk-table .bk-table-head.has-group th.is-last-child {
-  border-right: none;
-}
 .bk-table .bk-table-head .col-resize-drag {
   position: absolute;
   top: 0;
@@ -1975,9 +1967,6 @@
 .bk-table.bordered-col .bk-table-head {
   border-right: 1px solid var(--table-border-color);
 }
-.bk-table.bordered-col .bk-table-head .is-head-group {
-  border-bottom: 1px solid var(--table-border-color);
-}
 .bk-table.bordered-col th {
   border-right: 1px solid var(--table-border-color);
 }

package/lib/table/utils.d.ts

@@ -6,7 +6,7 @@ import { Column, GroupColumn, ISortPropShape, TablePropTypes } from './props';
  * @param args 如果是函数，传递参数
  * @returns
  */
-export declare const resolvePropVal: (prop: Record<string, unknown>, key: string | string[], args: unknown[]) => any;
+export declare const resolvePropVal: (prop: any, key: string | string[], args: any[]) => any;
 /**
  * 处理Props中的ActiveColumn，解析为统一的数组格式
  * @param props
@@ -159,4 +159,4 @@ export declare const getRawData: (data: any) => any;
  * @param parentVal
  * @returns
  */
-export declare const getNumberOrPercentValue: (val: number | string, parentVal?: number) => number;
+export declare const getNumberOrPercentValue: (val: string | number, parentVal?: number) => number;

package/lib/tree/index.d.ts

@@ -39,7 +39,9 @@ declare const BkTree: {
             default: any;
         };
         async: import("vue-types").VueTypeShape<{
-            callback: (item: any, cb: any) => Promise<any>;
+            callback: (item: any, cb: any) => Promise<string | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+                [key: string]: any;
+            }>>;
             cache: boolean;
             deepAutoOpen?: string;
         }>;
@@ -183,7 +185,9 @@ declare const BkTree: {
             default: any;
         };
         async: import("vue-types").VueTypeShape<{
-            callback: (item: any, cb: any) => Promise<any>;
+            callback: (item: any, cb: any) => Promise<string | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+                [key: string]: any;
+            }>>;
             cache: boolean;
             deepAutoOpen?: string;
         }>;
@@ -353,7 +357,9 @@ declare const BkTree: {
             default: any;
         };
         async: import("vue-types").VueTypeShape<{
-            callback: (item: any, cb: any) => Promise<any>;
+            callback: (item: any, cb: any) => Promise<string | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+                [key: string]: any;
+            }>>;
             cache: boolean;
             deepAutoOpen?: string;
         }>;
@@ -520,7 +526,9 @@ declare const BkTree: {
         default: any;
     };
     async: import("vue-types").VueTypeShape<{
-        callback: (item: any, cb: any) => Promise<any>;
+        callback: (item: any, cb: any) => Promise<string | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+            [key: string]: any;
+        }>>;
         cache: boolean;
         deepAutoOpen?: string;
     }>;

package/lib/tree/index.js

@@ -17367,7 +17367,7 @@ function _slicedToArray(arr, i) {
 ;// 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({ ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["h"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.h, ["nextTick"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.nextTick, ["onMounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onMounted, ["onUnmounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onUnmounted, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["toRef"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRef, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch });
+const external_vue_namespaceObject = external_vue_x({ ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["h"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.h, ["isVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isVNode, ["nextTick"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.nextTick, ["onMounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onMounted, ["onUnmounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onUnmounted, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["toRef"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRef, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch });
 ;// CONCATENATED MODULE: external "../config-provider"
 var config_provider_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var config_provider_y = x => () => x
@@ -18606,7 +18606,7 @@ var use_node_action_this = undefined;
       return val;
     }
     if (_typeof(val) === 'object' && val !== null) {
-      if (val.__v_isVNode) {
+      if ((0,external_vue_namespaceObject.isVNode)(val)) {
         return val;
       }
       var node = val.node,
@@ -18689,7 +18689,7 @@ var use_node_action_this = undefined;
       });
       setNodeAttr(parent, NODE_ATTRIBUTES.IS_CHECKED, isNeedChecked);
       setNodeAttr(parent, NODE_ATTRIBUTES.IS_INDETERMINATE, (getChildNodes(parent) || []).some(function (node) {
-        return !isNodeChecked(node);
+        return !isNodeChecked(node) || isIndeterminate(node);
       }));
       if (!isRootNode(parent)) {
         updateParentChecked(parent, isChecked);

package/lib/tree/props.d.ts

@@ -1,4 +1,4 @@
-import { ExtractPropTypes } from 'vue';
+import { ExtractPropTypes, VNode } from 'vue';
 declare enum TreeSearchMatchEnum {
     FULL = "full",
     FUZZY = "fuzzy"
@@ -7,6 +7,10 @@ declare enum TreeSearchResultEnum {
     LIST = "list",
     TREE = "tree"
 }
+export type TreeNode = {
+    [key: string]: unknown;
+    children: TreeNode[];
+};
 /**
  * Tree Prop: prefixIcon function
  * @param {} isRoot 是否为分跟节点
@@ -15,7 +19,7 @@ declare enum TreeSearchResultEnum {
  * @param {} renderType 当前渲染类型（action: 用来标识当前节点状态，展开 | 收起, node_type：节点类型，文件、文件夹）
  * @param {} item 当前节点数据
  */
-export type IPrefixIcon = (isRoot: boolean, hasChild: boolean, isOpen: boolean, renderType: string, item: any) => any;
+export type IPrefixIcon = (isRoot: boolean, hasChild: boolean, isOpen: boolean, renderType: string, item: TreeNode) => VNode | string;
 export declare const treeProps: {
     /**
      * 渲染列表
@@ -230,17 +234,17 @@ export declare const treeProps: {
     };
 };
 type AsyncOption = {
-    callback: (item: any, cb: any) => Promise<any>;
+    callback: (item: any, cb: any) => Promise<VNode | string>;
     cache: boolean;
     deepAutoOpen?: string;
 };
 export type IIntersectionObserver = {
     enabled: boolean;
-    callback: (node: any, level: number, index: number) => void;
+    callback: (node: TreeNode, level: number, index: number) => void;
 };
 export type SearchOption = {
     value: boolean | number | string;
-    match?: `${TreeSearchMatchEnum}` | Function;
+    match?: ((...args: any[]) => boolean) | `${TreeSearchMatchEnum}`;
     resultType?: `${TreeSearchResultEnum}`;
     showChildNodes?: boolean;
 };

package/lib/tree/tree.d.ts

@@ -44,7 +44,9 @@ declare const _default: import("vue").DefineComponent<{
         default: any;
     };
     async: import("vue-types").VueTypeShape<{
-        callback: (item: any, cb: any) => Promise<any>;
+        callback: (item: any, cb: any) => Promise<string | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+            [key: string]: any;
+        }>>;
         cache: boolean;
         deepAutoOpen?: string;
     }>;
@@ -178,7 +180,9 @@ declare const _default: import("vue").DefineComponent<{
         default: any;
     };
     async: import("vue-types").VueTypeShape<{
-        callback: (item: any, cb: any) => Promise<any>;
+        callback: (item: any, cb: any) => Promise<string | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+            [key: string]: any;
+        }>>;
         cache: boolean;
         deepAutoOpen?: string;
     }>;

package/lib/tree/use-node-action.d.ts

@@ -1,14 +1,14 @@
-import { TreePropTypes } from './props';
+import { TreeNode, TreePropTypes } from './props';
 import { IFlatData } from './util';
 declare const _default: (props: TreePropTypes, ctx: any, flatData: IFlatData, _renderData: any, initOption: any) => {
-    renderTreeNode: (item: any, showTree?: boolean) => JSX.Element;
-    handleTreeNodeClick: (item: any, e: MouseEvent) => void;
+    renderTreeNode: (item: TreeNode, showTree?: boolean) => JSX.Element;
+    handleTreeNodeClick: (item: TreeNode, e: MouseEvent) => void;
     deepAutoOpen: () => void;
     asyncNodeClick: (item: any) => Promise<any>;
-    setNodeAction: (args: any | any[], action: string, value: any) => void;
-    setNodeOpened: (item: any, isOpen?: any, e?: MouseEvent, fireEmit?: boolean) => void;
-    setSelect: (nodes: any, selected?: boolean, autoOpen?: boolean) => void;
-    setOpen: (item: any | any[], isOpen?: boolean, autoOpenParents?: boolean) => void;
-    setNodeAttribute: (node: any, attrName: string | string[], value: (boolean | number | string)[] | boolean | number | string, loopParent?: boolean) => void;
+    setNodeAction: (args: TreeNode | TreeNode[], action: string, value: unknown) => void;
+    setNodeOpened: (item: TreeNode, isOpen?: any, e?: MouseEvent, fireEmit?: boolean) => void;
+    setSelect: (nodes: TreeNode | TreeNode[], selected?: boolean, autoOpen?: boolean) => void;
+    setOpen: (item: TreeNode, isOpen?: boolean, autoOpenParents?: boolean) => void;
+    setNodeAttribute: (node: TreeNode, attrName: string | string[], value: (boolean | number | string)[] | boolean | number | string, loopParent?: boolean) => void;
 };
 export default _default;

package/lib/tree/use-node-attribute.d.ts

@@ -1,45 +1,53 @@
-import { TreePropTypes } from './props';
+import { TreeNode, TreePropTypes } from './props';
 declare const _default: (flatData: {
-    data: any[];
-    schema: WeakMap<Object, any>;
+    data: TreeNode[];
+    schema: WeakMap<TreeNode, unknown>;
 }, props?: TreePropTypes) => {
-    getSchemaVal: (node: any) => any;
-    getNodeAttr: (node: any, attr: string) => any;
-    getNodeId: (node: any) => any;
-    getNodeById: (id: any) => any;
-    getNodeParentId: (node: any) => any;
-    getParentNodeData: (node: any) => any;
+    getSchemaVal: (node: TreeNode) => unknown;
+    getNodeAttr: (node: TreeNode, attr: string) => any;
+    getNodeId: (node: TreeNode) => any;
+    getNodeById: (id: string | unknown) => TreeNode;
+    getNodeParentId: (node: TreeNode) => any;
+    getParentNodeData: (node: TreeNode | string) => any;
     getNodePathById: (id: string) => any;
     getNodeAttrById: (id: string, attr: string) => any;
     getNodeParentIdById: (id: string) => any;
-    getParentNodeAttr: (node: any, attrName: string) => any;
-    getParentNode: (node: any) => any;
-    setNodeAttr: (node: any, attr: string, val: any, id?: any) => void;
-    setNodeAttrById: (id: any, attr: string, val: any) => void;
-    getNodePath: (node: any) => any;
-    isRootNode: (node: any | string) => any;
-    isNodeOpened: (node: any) => any;
-    hasChildNode: (node: any) => any;
-    isItemOpen: (item: any) => any;
-    isNodeChecked: (node: any) => any;
-    isNodeMatched: (node: any) => any;
-    isNodeLoading: (node: any) => any;
-    checkNodeIsOpen: (node: any) => any;
-    getSourceNodeByPath: (path: string, uid?: string) => any;
-    getSourceNodeByUID: (uid: string) => any;
-    isMatchedNode: (node: any) => any;
-    resolveScopedSlotParam: (item: any) => {
+    getParentNodeAttr: (node: TreeNode, attrName: string) => any;
+    getParentNode: (node: TreeNode) => any;
+    setNodeAttr: (node: TreeNode, attr: string, val: unknown, id?: any) => void;
+    setNodeAttrById: (id: unknown, attr: string, val: unknown) => void;
+    getNodePath: (node: TreeNode) => any;
+    isRootNode: (node: TreeNode | string) => any;
+    isNodeOpened: (node: TreeNode) => any;
+    hasChildNode: (node: TreeNode) => any;
+    isItemOpen: (item: TreeNode) => any;
+    isNodeChecked: (node: TreeNode) => any;
+    isNodeMatched: (node: TreeNode) => any;
+    isNodeLoading: (node: TreeNode) => any;
+    checkNodeIsOpen: (node: TreeNode) => any;
+    getSourceNodeByPath: (path: string, uid?: string) => any[];
+    getSourceNodeByUID: (uid: string) => TreeNode;
+    isMatchedNode: (node: TreeNode) => any;
+    resolveScopedSlotParam: (item: TreeNode) => {
         [x: string]: any;
         fullPath: any;
         uuid: any;
         parent: any;
         parentId: any;
     };
-    setTreeNodeLoading: (node: any, value: boolean) => void;
-    extendNodeAttr: (item: any) => any;
-    getChildNodes: (node: any) => any;
-    extendNodeScopedData: (item: any) => {
-        data: any;
+    setTreeNodeLoading: (node: TreeNode, value: boolean) => void;
+    extendNodeAttr: (item: TreeNode) => TreeNode & {
+        __attr__: {
+            [x: string]: any;
+            fullPath: any;
+            uuid: any;
+            parent: any;
+            parentId: any;
+        };
+    };
+    getChildNodes: (node: TreeNode) => TreeNode[];
+    extendNodeScopedData: (item: TreeNode) => {
+        data: TreeNode;
         attributes: {
             [x: string]: any;
             fullPath: any;
@@ -48,12 +56,12 @@ declare const _default: (flatData: {
             parentId: any;
         };
     };
-    getIntersectionResponse: (target: HTMLElement | Record<string, any>) => {
+    getIntersectionResponse: (target: HTMLElement | TreeNode) => {
         level: any;
-        target: HTMLElement | Record<string, any>;
+        target: HTMLElement | TreeNode;
         index: any;
         parent: any;
-        node: HTMLElement | Record<string, any>;
+        node: HTMLElement | TreeNode;
         isRoot: any;
     };
 };

package/package.json

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