bkui-vue 2.1.0-dev-beta.12 → 2.1.0-dev-beta.13

package/lib/index.js

@@ -3,5 +3,5 @@ export * from './hooks';
 export { default } from './preset';
 export * from './config-provider';
 export * from './directives';
-export const version = "2.1.0-dev-beta.12";
+export const version = "2.1.0-dev-beta.13";
 window.__bkui_vue_version__ = version;

package/lib/tree/index.d.ts

@@ -80,6 +80,9 @@ declare const BkTree: {
         dragSortMode: import("vue-types").VueTypeDef<string> & {
             default: string;
         };
+        dragTargetOpenState: import("vue-types").VueTypeDef<string> & {
+            default: string;
+        };
         selectable: import("vue-types").VueTypeDef<any> & {
             default: any;
         };
@@ -191,6 +194,7 @@ declare const BkTree: {
         dragThreshold: number;
         dragSort: boolean;
         dragSortMode: string;
+        dragTargetOpenState: string;
         selectable: any;
         disabledFolderSelectable: boolean;
         showCheckbox: any;
@@ -291,6 +295,9 @@ declare const BkTree: {
         dragSortMode: import("vue-types").VueTypeDef<string> & {
             default: string;
         };
+        dragTargetOpenState: import("vue-types").VueTypeDef<string> & {
+            default: string;
+        };
         selectable: import("vue-types").VueTypeDef<any> & {
             default: any;
         };
@@ -387,6 +394,7 @@ declare const BkTree: {
         dragThreshold: number;
         dragSort: boolean;
         dragSortMode: string;
+        dragTargetOpenState: string;
         selectable: any;
         disabledFolderSelectable: boolean;
         showCheckbox: any;
@@ -484,6 +492,9 @@ declare const BkTree: {
     dragSortMode: import("vue-types").VueTypeDef<string> & {
         default: string;
     };
+    dragTargetOpenState: import("vue-types").VueTypeDef<string> & {
+        default: string;
+    };
     selectable: import("vue-types").VueTypeDef<any> & {
         default: any;
     };
@@ -595,6 +606,7 @@ declare const BkTree: {
     dragThreshold: number;
     dragSort: boolean;
     dragSortMode: string;
+    dragTargetOpenState: string;
     selectable: any;
     disabledFolderSelectable: boolean;
     showCheckbox: any;

package/lib/tree/index.js

@@ -17717,6 +17717,13 @@ var treeProps = {
    * 默认 any
    */
   dragSortMode: shared_namespaceObject.PropTypes.oneOf(['any', 'next']).def('any'),
+  /**
+   * 拖拽添加为子节点后，目标节点的展开状态
+   * - expand: 展开目标节点
+   * - collapse: 收起目标节点
+   * - inherit: 保持目标节点当前展开收起状态
+   */
+  dragTargetOpenState: shared_namespaceObject.PropTypes.oneOf(['expand', 'collapse', 'inherit']).def('inherit'),
   /**
    * 节点是否可以选中
    */
@@ -19563,9 +19570,24 @@ var use_node_action_this = undefined;
     }
     return 'after';
   };
-  var getDropInfo = function getDropInfo(dropPosition) {
+  var getDropInfo = function getDropInfo(draggedId, relatedId, dropPosition) {
+    var draggedData = getSourceNodeByUID(draggedId);
+    var relatedData = getSourceNodeByUID(relatedId);
+    var isSameParent = !!draggedData && !!relatedData && getParentNode(draggedData) === getParentNode(relatedData);
+    if (props.dragSort && isSameParent && dropPosition !== 'inside') {
+      return {
+        dropType: 'sort',
+        willInsertAfter: dropPosition === 'after'
+      };
+    }
+    if (dropPosition === 'inside') {
+      return {
+        dropType: 'child',
+        willInsertAfter: false
+      };
+    }
     return {
-      dropType: dropPosition === 'inside' ? 'child' : props.dragSort ? 'sort' : 'move',
+      dropType: 'move',
       willInsertAfter: dropPosition === 'after'
     };
   };
@@ -19646,7 +19668,11 @@ var use_node_action_this = undefined;
     if (!draggedData || !relatedData || draggedId === relatedId || isDescendantTarget(draggedData, relatedData)) {
       return false;
     }
-    if (dropType === 'sort' && props.dragSortMode === 'next' && getParentNode(draggedData) !== getParentNode(relatedData)) {
+    var isSameParent = getParentNode(draggedData) === getParentNode(relatedData);
+    if (dropType === 'sort' && (!props.dragSort || !isSameParent)) {
+      return false;
+    }
+    if (props.dragSort && props.dragSortMode === 'next' && (dropType !== 'sort' || !isSameParent)) {
       return false;
     }
     return !isDropDisabled(draggedId, relatedId, dropType);
@@ -19682,7 +19708,7 @@ var use_node_action_this = undefined;
     var relatedId = getNodeIdByEl(relatedEl);
     if (!relatedEl || !relatedId) return;
     var dropPosition = getDropPosition(event, relatedEl);
-    var _getDropInfo = getDropInfo(dropPosition),
+    var _getDropInfo = getDropInfo(dragNodeId, relatedId, dropPosition),
       dropType = _getDropInfo.dropType,
       willInsertAfter = _getDropInfo.willInsertAfter;
     var droppable = canDrop(dragNodeId, relatedId, dropType);
@@ -19715,7 +19741,7 @@ var use_node_action_this = undefined;
     event.stopPropagation();
     event.preventDefault();
     var dropPosition = targetEl ? getDropPosition(event, targetEl) : 'inside';
-    var _getDropInfo2 = getDropInfo(dropPosition),
+    var _getDropInfo2 = getDropInfo(dragNodeId, targetId, dropPosition),
       dropType = _getDropInfo2.dropType,
       willInsertAfter = _getDropInfo2.willInsertAfter;
     var sourceNodeData = getSourceNodeByUID(dragNodeId);
@@ -20512,7 +20538,7 @@ var use_tree_init_this = undefined;
     var _useIntersectionObser = use_intersection_observer(props),
       getLastVisibleElement = _useIntersectionObser.getLastVisibleElement,
       intersectionObserver = _useIntersectionObser.intersectionObserver;
-    var collectOpenNodeIds = function collectOpenNodeIds(_payload) {
+    var collectOpenNodeIds = function collectOpenNodeIds() {
       var openNodeIds = new Set();
       flatData.data.forEach(function (node) {
         if (isNodeOpened(node)) {
@@ -20521,17 +20547,57 @@ var use_tree_init_this = undefined;
       });
       return openNodeIds;
     };
-    var restoreOpenNodes = function restoreOpenNodes(openNodeIds) {
-      flatData.data.forEach(function (node) {
-        setNodeAttribute(node, NODE_ATTRIBUTES.IS_OPEN, openNodeIds.has("".concat(getNodeId(node))));
+    var getSourceNodeId = function getSourceNodeId(node) {
+      return "".concat(node === null || node === void 0 ? void 0 : node[props.nodeKey || NODE_ATTRIBUTES.UUID]);
+    };
+    var getSourceChildren = function getSourceChildren(node) {
+      return (node === null || node === void 0 ? void 0 : node[props.children]) || [];
+    };
+    var sourceOpenAttr = NODE_SOURCE_ATTRS[NODE_ATTRIBUTES.IS_OPEN];
+    var _removeOpenState = function removeOpenState(node, openNodeIds) {
+      openNodeIds["delete"](getSourceNodeId(node));
+      getSourceChildren(node).forEach(function (child) {
+        _removeOpenState(child, openNodeIds);
       });
     };
+    var syncDragTargetOpenState = function syncDragTargetOpenState(openNodeIds, payload) {
+      if (payload.trigger !== 'drag' || payload.dropType !== 'child' || !payload.targetNode) {
+        return;
+      }
+      var targetOpenState = props.dragTargetOpenState || 'inherit';
+      if (targetOpenState === 'inherit') {
+        return;
+      }
+      var targetNodeId = getSourceNodeId(payload.targetNode);
+      if (targetOpenState === 'expand') {
+        openNodeIds.add(targetNodeId);
+      }
+      if (targetOpenState === 'collapse') {
+        _removeOpenState(payload.targetNode, openNodeIds);
+      }
+    };
+    var _syncSourceOpenState = function syncSourceOpenState(treeData, openNodeIds) {
+      var parentOpened = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+      treeData.forEach(function (node) {
+        var isOpen = parentOpened && openNodeIds.has(getSourceNodeId(node));
+        if (isOpen || !parentOpened || Object.prototype.hasOwnProperty.call(node, sourceOpenAttr)) {
+          node[sourceOpenAttr] = isOpen;
+        }
+        _syncSourceOpenState(getSourceChildren(node), openNodeIds, isOpen);
+      });
+    };
+    var normalizeDragOpenState = function normalizeDragOpenState(payload) {
+      var openNodeIds = collectOpenNodeIds();
+      syncDragTargetOpenState(openNodeIds, payload);
+      _syncSourceOpenState(payload.data, openNodeIds);
+    };
     var onTreeDataChange = function onTreeDataChange(payload) {
       var _payload$data, _props$onDataChange;
-      var openNodeIds = collectOpenNodeIds(payload);
+      if (payload.trigger === 'drag') {
+        normalizeDragOpenState(payload);
+      }
       treeDataRef.value = (_payload$data = payload.data) !== null && _payload$data !== void 0 ? _payload$data : [];
       rebuildData(treeDataRef.value);
-      restoreOpenNodes(openNodeIds);
       ctx.emit(EVENTS.NODE_DATA_CHANGE, payload);
       (_props$onDataChange = props.onDataChange) === null || _props$onDataChange === void 0 || _props$onDataChange.call(props, payload);
     };

package/lib/tree/props.d.ts

@@ -13,11 +13,19 @@ export type TreeNode = {
 };
 /**
  * 拖拽放置类型
- * - child: 作为目标节点的子节点
- * - move: 作为目标节点的同级节点（非排序模式）
- * - sort: 同父节点下排序（排序模式）
+ * - 同父级节点，落在目标节点前/后：dropType = 'sort'
+ * - 同父级节点，落在目标节点中间作为直接子节点：dropType = 'child'
+ * - 非同父级等其他情况：dropType = 'move'
+ * 非同父级等其他情况：dropType = 'move'
  */
 export type DropType = 'child' | 'move' | 'sort';
+/**
+ * 拖拽添加为子节点后，目标节点的展开状态
+ * - expand: 展开目标节点
+ * - collapse: 收起目标节点
+ * - inherit: 保持目标节点当前展开收起状态
+ */
+export type DragTargetOpenState = 'collapse' | 'expand' | 'inherit';
 export type DisableDropHandler = (data: TreeNode, type: DropType, target: TreeNode) => boolean;
 export type TreeDataChangeTrigger = 'async' | 'drag';
 export type TreeDataChangePayload = {
@@ -217,6 +225,15 @@ export declare const treeProps: {
     dragSortMode: import("vue-types").VueTypeDef<string> & {
         default: string;
     };
+    /**
+     * 拖拽添加为子节点后，目标节点的展开状态
+     * - expand: 展开目标节点
+     * - collapse: 收起目标节点
+     * - inherit: 保持目标节点当前展开收起状态
+     */
+    dragTargetOpenState: import("vue-types").VueTypeDef<string> & {
+        default: string;
+    };
     /**
      * 节点是否可以选中
      */

package/lib/tree/tree.d.ts

@@ -85,6 +85,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     dragSortMode: import("vue-types").VueTypeDef<string> & {
         default: string;
     };
+    dragTargetOpenState: import("vue-types").VueTypeDef<string> & {
+        default: string;
+    };
     selectable: import("vue-types").VueTypeDef<any> & {
         default: any;
     };
@@ -242,6 +245,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     dragSortMode: import("vue-types").VueTypeDef<string> & {
         default: string;
     };
+    dragTargetOpenState: import("vue-types").VueTypeDef<string> & {
+        default: string;
+    };
     selectable: import("vue-types").VueTypeDef<any> & {
         default: any;
     };
@@ -338,6 +344,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     dragThreshold: number;
     dragSort: boolean;
     dragSortMode: string;
+    dragTargetOpenState: string;
     selectable: any;
     disabledFolderSelectable: boolean;
     showCheckbox: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "2.1.0-dev-beta.12",
+  "version": "2.1.0-dev-beta.13",
   "workspaces": [
     "packages/**",
     "scripts/cli",