bkui-vue 2.0.2-beta.6 → 2.0.2-beta.61

package/lib/tree/props.d.ts

@@ -132,6 +132,16 @@ export declare const treeProps: {
     disableDrop: import("vue-types").VueTypeValidableDef<(...args: any[]) => any> & {
         default: (...args: any[]) => any;
     };
+    /**
+     * 拖拽阈值
+     * 用于判断拖拽时鼠标位置与节点的距离
+     * 当鼠标位置与节点的距离大于此值时，才会触发拖拽
+     */
+    dragThreshold: import("vue-types").VueTypeValidableDef<number> & {
+        default: number;
+    } & {
+        default: number;
+    };
     /**
      * 节点拖拽时可交换位置（开启拖拽可交换位置后将不支持改变层级）
      */
@@ -140,6 +150,15 @@ export declare const treeProps: {
     } & {
         default: boolean;
     };
+    /**
+     * 拖拽排序模式
+     * - any: 允许拖拽到任意位置
+     * - next: 只允许拖拽到同级节点的前后位置
+     * 默认 any
+     */
+    dragSortMode: import("vue-types").VueTypeDef<string> & {
+        default: string;
+    };
     /**
      * 节点是否可以选中
      */
@@ -240,6 +259,7 @@ type AsyncOption = {
     callback: (item: any, cb: any) => Promise<VNode | string>;
     cache: boolean;
     deepAutoOpen?: string;
+    trigger?: string[];
 };
 export type IIntersectionObserver = {
     enabled: boolean;

package/lib/tree/tree.css

@@ -257,13 +257,33 @@
 }
 .bk-tree {
   font-size: 14px;
+  position: relative;
 }
 .bk-tree .bk-node-row {
   padding-left: calc(var(--offset-left));
+  position: relative;
 }
 .bk-tree .bk-node-row.is-selected {
   background-color: #ebf2ff;
 }
+.bk-tree .bk-node-row.drop-before::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 1px;
+  background-color: #2196F3;
+}
+.bk-tree .bk-node-row.drop-after::before {
+  content: '';
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 1px;
+  background-color: #2196F3;
+}
 .bk-tree-node {
   position: relative;
   display: flex;
@@ -276,6 +296,20 @@
 .bk-tree-node:not(.is-root) {
   margin-left: calc(var(--depth)*var(--indent));
 }
+.bk-tree-node:not(.is-root).level-line .bk-node-action.empty-child {
+  position: relative;
+}
+.bk-tree-node:not(.is-root).level-line .bk-node-action.empty-child::before {
+  position: absolute;
+  top: calc(50% + 1px);
+  left: 0;
+  right: 0;
+  z-index: 1;
+  height: 0;
+  pointer-events: none;
+  border-bottom: var(--level-line);
+  content: '';
+}
 .bk-tree-node:not(.is-root).level-line::before {
   position: absolute;
   top: calc(50% + 1px);
@@ -309,6 +343,7 @@
 .bk-tree-node .bk-node-action {
   margin-right: 6px;
   color: #979ba5;
+  min-width: 14px;
 }
 .bk-tree-node .bk-tree-icon {
   margin: 0 6px 0 4px;
@@ -319,6 +354,9 @@
   align-items: center;
   min-width: 0;
 }
+.bk-tree-node .bk-node-content .node-check-box {
+  display: inline-flex;
+}
 .bk-tree-node .bk-node-content .bk-checkbox {
   margin: 0;
 }
@@ -340,3 +378,11 @@
 .bk-tree-drop-disabled .bk-tree-node {
   cursor: no-drop;
 }
+.bk-tree .insert-line {
+  position: absolute;
+  height: 2px;
+  background: #2196F3;
+  display: none;
+  pointer-events: none;
+  z-index: 999;
+}

package/lib/tree/tree.d.ts

@@ -49,6 +49,7 @@ declare const _default: import("vue").DefineComponent<{
         }>>;
         cache: boolean;
         deepAutoOpen?: string;
+        trigger?: string[];
     }>;
     offsetLeft: import("vue-types").VueTypeValidableDef<number> & {
         default: number;
@@ -74,11 +75,19 @@ declare const _default: import("vue").DefineComponent<{
     disableDrop: import("vue-types").VueTypeValidableDef<(...args: any[]) => any> & {
         default: (...args: any[]) => any;
     };
+    dragThreshold: import("vue-types").VueTypeValidableDef<number> & {
+        default: number;
+    } & {
+        default: number;
+    };
     dragSort: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
         default: boolean;
     };
+    dragSortMode: import("vue-types").VueTypeDef<string> & {
+        default: string;
+    };
     selectable: import("vue-types").VueTypeDef<any> & {
         default: any;
     };
@@ -138,6 +147,7 @@ declare const _default: import("vue").DefineComponent<{
     nodeDragStart: (..._args: any[]) => boolean;
     nodeDragOver: (..._args: any[]) => boolean;
     nodeDragLeave: (..._args: any[]) => boolean;
+    nodeDragSort: (..._args: any[]) => boolean;
     nodeDrop: (..._args: any[]) => boolean;
     nodeEnterView: (..._args: any[]) => boolean;
     nodeSelected: (..._args: any[]) => boolean;
@@ -186,6 +196,7 @@ declare const _default: import("vue").DefineComponent<{
         }>>;
         cache: boolean;
         deepAutoOpen?: string;
+        trigger?: string[];
     }>;
     offsetLeft: import("vue-types").VueTypeValidableDef<number> & {
         default: number;
@@ -211,11 +222,19 @@ declare const _default: import("vue").DefineComponent<{
     disableDrop: import("vue-types").VueTypeValidableDef<(...args: any[]) => any> & {
         default: (...args: any[]) => any;
     };
+    dragThreshold: import("vue-types").VueTypeValidableDef<number> & {
+        default: number;
+    } & {
+        default: number;
+    };
     dragSort: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
         default: boolean;
     };
+    dragSortMode: import("vue-types").VueTypeDef<string> & {
+        default: string;
+    };
     selectable: import("vue-types").VueTypeDef<any> & {
         default: any;
     };
@@ -273,6 +292,7 @@ declare const _default: import("vue").DefineComponent<{
     onNodeCollapse?: (...args: any[]) => any;
     onNodeDragLeave?: (...args: any[]) => any;
     onNodeDragOver?: (...args: any[]) => any;
+    onNodeDragSort?: (...args: any[]) => any;
     onNodeDragStart?: (...args: any[]) => any;
     onNodeDrop?: (...args: any[]) => any;
     onNodeEnterView?: (...args: any[]) => any;
@@ -296,7 +316,9 @@ declare const _default: import("vue").DefineComponent<{
     virtualRender: boolean;
     disableDrag: (...args: any[]) => any;
     disableDrop: (...args: any[]) => any;
+    dragThreshold: number;
     dragSort: boolean;
+    dragSortMode: string;
     selectable: any;
     disabledFolderSelectable: boolean;
     showCheckbox: any;

package/lib/tree/tree.less

@@ -5,13 +5,38 @@
 
 .@{bk-prefix}-tree {
   font-size: 14px;
+  position: relative;
 
   .@{bk-prefix}-node-row {
     padding-left: calc(var(--offset-left));
+    position: relative;
 
     &.is-selected {
       background-color: #ebf2ff;
     }
+
+    &.drop-before {
+      &::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        height: 1px;
+        background-color: #2196F3;
+      }
+    }
+    &.drop-after {
+      &::before {
+        content: '';
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        height: 1px;
+        background-color: #2196F3;
+      }
+    }
   }
 
   &-node {
@@ -27,6 +52,25 @@
       margin-left: calc(var(--depth)*var(--indent));
 
       &.level-line {
+
+        .@{bk-prefix}-node-action {
+          &.empty-child {
+            position: relative;
+
+            &::before {
+              position: absolute;
+              top: calc(50% + 1px);
+              left: 0;
+              right: 0;
+              z-index: 1;
+              height: 0;
+              pointer-events: none;
+              border-bottom: var(--level-line);
+              content: '';
+            }
+          }
+        }
+
         &::before {
           position: absolute;
           top: calc(50% + 1px);
@@ -47,6 +91,7 @@
       }
     }
 
+
     .node-virtual-line {
       position: absolute;
       top: -12px;
@@ -68,6 +113,7 @@
     .@{bk-prefix}-node-action {
       margin-right: 6px;
       color: #979ba5;
+      min-width: 14px;
     }
 
     .@{bk-prefix}-tree-icon {
@@ -80,6 +126,10 @@
       align-items: center;
       min-width: 0;
 
+      .node-check-box {
+        display: inline-flex;
+      }
+
       .@{bk-prefix}-checkbox {
         margin: 0;
 
@@ -108,7 +158,12 @@
     }
   }
 
-  &-drag-disabled {
-
+  .insert-line {
+    position: absolute;
+    height: 2px;
+    background: #2196F3;
+    display: none;
+    pointer-events: none;
+    z-index: 999;
   }
 }

package/lib/tree/tree.variable.css

@@ -127,6 +127,7 @@
   --search-select-menu-border-color: var(--disable-color);
   --select-active-color: #e1ecff;
   --select-hover-color: #f5f7fa;
+  --sub-title-bg-color: #f5f6fa;
 }
 .bk-F-scroll-x {
   overflow-x: auto;
@@ -387,13 +388,33 @@
 }
 .bk-tree {
   font-size: 14px;
+  position: relative;
 }
 .bk-tree .bk-node-row {
   padding-left: calc(var(--offset-left));
+  position: relative;
 }
 .bk-tree .bk-node-row.is-selected {
   background-color: #ebf2ff;
 }
+.bk-tree .bk-node-row.drop-before::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 1px;
+  background-color: #2196F3;
+}
+.bk-tree .bk-node-row.drop-after::before {
+  content: '';
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 1px;
+  background-color: #2196F3;
+}
 .bk-tree-node {
   position: relative;
   display: flex;
@@ -406,6 +427,20 @@
 .bk-tree-node:not(.is-root) {
   margin-left: calc(var(--depth)*var(--indent));
 }
+.bk-tree-node:not(.is-root).level-line .bk-node-action.empty-child {
+  position: relative;
+}
+.bk-tree-node:not(.is-root).level-line .bk-node-action.empty-child::before {
+  position: absolute;
+  top: calc(50% + 1px);
+  left: 0;
+  right: 0;
+  z-index: 1;
+  height: 0;
+  pointer-events: none;
+  border-bottom: var(--level-line);
+  content: '';
+}
 .bk-tree-node:not(.is-root).level-line::before {
   position: absolute;
   top: calc(50% + 1px);
@@ -439,6 +474,7 @@
 .bk-tree-node .bk-node-action {
   margin-right: 6px;
   color: #979ba5;
+  min-width: 14px;
 }
 .bk-tree-node .bk-tree-icon {
   margin: 0 6px 0 4px;
@@ -449,6 +485,9 @@
   align-items: center;
   min-width: 0;
 }
+.bk-tree-node .bk-node-content .node-check-box {
+  display: inline-flex;
+}
 .bk-tree-node .bk-node-content .bk-checkbox {
   margin: 0;
 }
@@ -470,3 +509,11 @@
 .bk-tree-drop-disabled .bk-tree-node {
   cursor: no-drop;
 }
+.bk-tree .insert-line {
+  position: absolute;
+  height: 2px;
+  background: #2196F3;
+  display: none;
+  pointer-events: none;
+  z-index: 999;
+}

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

@@ -2,12 +2,12 @@ import { TreeNode, TreePropTypes } from './props';
 import { IFlatData } from './util';
 declare const _default: (props: TreePropTypes, ctx: any, flatData: IFlatData, _renderData: any, initOption: any) => {
     renderTreeNode: (item: TreeNode, showTree?: boolean) => JSX.Element;
-    handleTreeNodeClick: (item: TreeNode, e: MouseEvent) => void;
+    handleTreeNodeClick: (item: TreeNode, e: MouseEvent, event?: string) => void;
     deepAutoOpen: () => void;
     asyncNodeClick: (item: TreeNode) => Promise<boolean> | Promise<void | Record<string, unknown>>;
     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, triggerEvent?: boolean) => void;
+    setSelect: (nodes: TreeNode | TreeNode[], selected?: boolean, autoOpen?: boolean, triggerEvent?: boolean, event?: string) => 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;
     isIndeterminate: (item: TreeNode) => any;