@aloudata/aloudata-design 2.0.0-beta.13 → 2.0.0-beta.14

package/dist/Select/index.js

@@ -393,7 +393,7 @@ var Select = /*#__PURE__*/forwardRef(function (props, ref) {
     bordered: false,
     open: typeof _open === 'boolean' ? _open : isOpen,
     disabled: mergedDisabled,
-    maxTagCount: 1,
+    maxTagCount: type === 'secondary' ? 'responsive' : 1,
     ref: selectRef,
     tagRender: tagRender || defaultTagRender,
     onChange: onChange,
@@ -414,7 +414,6 @@ var Select = /*#__PURE__*/forwardRef(function (props, ref) {
       className: "ald-select-suffix-icon"
     }),
     onDropdownVisibleChange: function onDropdownVisibleChange(open) {
-      console.log(open, 'open');
       setIsOpen(open);
       if (!open) {
         dropDownTimeRef.current = Date.now();

package/dist/Select/style/index.less

@@ -71,7 +71,7 @@
         .ant-select-selection-overflow-item {
           align-items: center;
           line-height: inherit;
-          flex: 1;
+          // flex: 1;
           min-width: 0;
           // height: 100%;
 
@@ -114,11 +114,6 @@
                 height: 16px;
                 padding: 0 var(--alias-spacing-50, 4px);
                 border-radius: var(--alias-radius-100, 8px);
-                background: var(
-                  --alias-colors-bg-accent-blue-subtle-default,
-                  #d4e7fd
-                );
-                color: var(--alias-colors-text-information, #0f59b1);
                 font-size: 12px;
               }
             }
@@ -134,6 +129,17 @@
             white-space: nowrap;
             text-overflow: ellipsis;
             overflow: hidden;
+            // position: relative;;
+
+            &::before {
+              content: '，';
+            }
+          }
+
+          &:first-of-type {
+            .ald-select-multiple-tag-default::before {
+              content: '';
+            }
           }
 
           .ant-select-selection-search-input {

package/dist/Select/style/status.less

@@ -14,6 +14,16 @@
   &.ald-select-multiple .ant-select {
     .ant-select-selector {
       color: var(--alias-colors-text-selected, #126fdd);
+
+      .ant-select-selection-overflow-item-rest {
+        .ant-select-selection-item-content {
+          background: var(
+            --alias-colors-bg-accent-blue-subtle-default,
+            #d4e7fd
+          );
+          color: var(--alias-colors-text-information, #0f59b1);
+        }
+      }
     }
   }
 
@@ -62,6 +72,17 @@
   &.ald-select-secondary {
     .select-color(var(--alias-colors-border-accent-gray-subtle-default, #D1D5DB),var(--alias-colors-bg-skeleton-subtler, #FFF),var(--alias-colors-text-default, #1f2937));
 
+    &.ald-select-multiple .ant-select {
+      .ant-select-selector {
+        .ant-select-selection-overflow-item-rest {
+          .ant-select-selection-item-content {
+            background: transparent;
+            color: var(--alias-colors-text-subtle, #4b5563);
+          }
+        }
+      }
+    }
+
     &.ald-select-fitted {
       .select-color(var(--alias-colors-border-accent-gray-subtle-default, #D1D5DB),var(--alias-colors-bg-skeleton-subtler, #FFF),var(--alias-colors-text-default, #1f2937));
     }

package/dist/Tree/Tree.d.ts

@@ -131,6 +131,7 @@ export interface TreeProps<T extends BasicDataNode = DataNode> extends Omit<RcTr
     titleRender?: (node: T) => React.ReactNode;
     showTabLeader?: boolean;
     handlerRender?: (node: T) => React.ReactNode;
+    highlightFilteredTitle?: boolean;
 }
 declare const Tree: React.ForwardRefExoticComponent<TreeProps<DataNode> & React.RefAttributes<RcTree<DataNode>>>;
 export default Tree;

package/dist/Tree/Tree.js

@@ -9,7 +9,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import classNames from 'classnames';
-import { noop } from 'lodash';
+import { cloneDeep, noop } from 'lodash';
 import RcTree from 'rc-tree';
 import * as React from 'react';
 import { ConfigContext } from "../ConfigProvider";
@@ -18,6 +18,7 @@ import collapseMotion from "../_utils/motion";
 import dropIndicatorRender from "./utils/dropIndicator";
 import renderSwitcherIcon from "./utils/iconUtil";
 var TREE_SWITCH_CION_SIZE = 16;
+var NODE_DISABLE_CLASS_NAME = 'ald-tree-node-disabled';
 
 // [Legacy] Compatible for v3
 
@@ -46,6 +47,7 @@ var Tree = /*#__PURE__*/React.forwardRef(function (props, ref) {
     handlerRender = _props$handlerRender === void 0 ? noop : _props$handlerRender,
     filterTreeNode = props.filterTreeNode,
     treeData = props.treeData,
+    highlightFilteredTitle = props.highlightFilteredTitle,
     _props$motion = props.motion,
     motion = _props$motion === void 0 ? _objectSpread(_objectSpread({}, collapseMotion), {}, {
       motionAppear: false
@@ -111,51 +113,46 @@ var Tree = /*#__PURE__*/React.forwardRef(function (props, ref) {
   };
   var newTreeData = React.useMemo(function () {
     if (!filterTreeNode) return treeData;
-    var processNode = function processNode(node) {
-      // 初始化一个标志来表示是否需要为当前节点及其所有子节点添加className
+    var treeDataClone = cloneDeep(treeData);
+    var shouldNodeDisabled = function shouldNodeDisabled(node) {
+      // 初始化一个标志来表示是否需要为当前节点添加className
       var shouldAddDisabled = true;
-      // 检查当前节点的title是否包含目标字符串，包含则不需要添加className
       if (filterTreeNode(node)) {
         shouldAddDisabled = false;
       }
       if (node.children) {
-        // 遍历当前节点的子节点
-        var _iterator = _createForOfIteratorHelper(node.children),
-          _step;
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var child = _step.value;
-            // 递归调用processNode函数来处理子节点，判断子节点是否需要添加className
-            var childShouldAddDisabled = processNode(child);
-            shouldAddDisabled = shouldAddDisabled && childShouldAddDisabled;
-          }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
-        }
+        // 遍历当前节点的子节点，只要有一个子节点不disable，则该不需要添加className
+        var allChildrenShouldAddDisabled = node.children.reduce(function (pre, child) {
+          return shouldNodeDisabled(child) && pre;
+        }, shouldAddDisabled);
+        shouldAddDisabled = allChildrenShouldAddDisabled;
       }
 
       // 如果shouldAddDisabled为true，就为当前节点添加className
       if (shouldAddDisabled) {
-        node.className = classNames(node.className, 'ald-tree-node-disabled');
+        var _node$className;
+        node.className = (_node$className = node.className) !== null && _node$className !== void 0 && _node$className.includes(NODE_DISABLE_CLASS_NAME) ? node.className : classNames(node.className, NODE_DISABLE_CLASS_NAME);
+      } else {
+        var _node$className2;
+        var reg = /ald-tree-node-disabled/g;
+        (_node$className2 = node.className) === null || _node$className2 === void 0 ? void 0 : _node$className2.replace(reg, ' ');
       }
       return shouldAddDisabled;
     };
-    if (!treeData) return treeData;
-    var _iterator2 = _createForOfIteratorHelper(treeData),
-      _step2;
+    if (!treeDataClone) return treeDataClone;
+    var _iterator = _createForOfIteratorHelper(treeDataClone),
+      _step;
     try {
-      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        var rootNode = _step2.value;
-        processNode(rootNode);
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var rootNode = _step.value;
+        shouldNodeDisabled(rootNode);
       }
     } catch (err) {
-      _iterator2.e(err);
+      _iterator.e(err);
     } finally {
-      _iterator2.f();
+      _iterator.f();
     }
-    return treeData;
+    return treeDataClone;
   }, [filterTreeNode, treeData]);
   var noChildren = React.useMemo(function () {
     if (newTreeData !== null && newTreeData !== void 0 && newTreeData.length) {
@@ -173,7 +170,7 @@ var Tree = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, newProps, {
     prefixCls: prefixCls,
     treeData: newTreeData,
-    className: classNames((_classNames = {}, _defineProperty(_classNames, "".concat(prefixCls, "-icon-hide"), !showIcon), _defineProperty(_classNames, "".concat(prefixCls, "-block-node"), blockNode), _defineProperty(_classNames, "".concat(prefixCls, "-unselectable"), !selectable), _defineProperty(_classNames, "".concat(prefixCls, "-large"), size === 'large'), _defineProperty(_classNames, "".concat(prefixCls, "-rtl"), direction === 'rtl'), _defineProperty(_classNames, 'ald-draggable-tree', draggable), _defineProperty(_classNames, "".concat(prefixCls, "-no-children"), noChildren), _classNames), className),
+    className: classNames((_classNames = {}, _defineProperty(_classNames, "".concat(prefixCls, "-icon-hide"), !showIcon), _defineProperty(_classNames, "".concat(prefixCls, "-block-node"), blockNode), _defineProperty(_classNames, "".concat(prefixCls, "-unselectable"), !selectable), _defineProperty(_classNames, "".concat(prefixCls, "-large"), size === 'large'), _defineProperty(_classNames, "".concat(prefixCls, "-rtl"), direction === 'rtl'), _defineProperty(_classNames, 'ald-draggable-tree', draggable), _defineProperty(_classNames, "".concat(prefixCls, "-no-children"), noChildren), _defineProperty(_classNames, 'ald-tree-highlight-filtered-title', highlightFilteredTitle), _classNames), className),
     direction: direction,
     checkable: checkable ? /*#__PURE__*/React.createElement("span", {
       className: "".concat(prefixCls, "-checkbox-inner")

package/dist/Tree/demo/filter/index.js

@@ -30,6 +30,7 @@ export default (function () {
       }
       return false;
     },
+    highlightFilteredTitle: true,
     expandedKeys: expandedKeys,
     onExpand: function onExpand(keys) {
       setExpandedKeys(keys);

package/dist/Tree/style/index.less

@@ -26,13 +26,15 @@
     padding: 3px 0;
   }
 
-  .ald-tree-treenode.ald-tree-treenode-draggable {
-    .ald-tree-draggable-icon {
-      opacity: 1;
-      cursor: grab;
-
-      &:active {
-        cursor: grabbing;
+  .ald-tree-treenode {
+    &.ald-tree-treenode-draggable {
+      .ald-tree-draggable-icon {
+        opacity: 1;
+        cursor: grab;
+
+        &:active {
+          cursor: grabbing;
+        }
       }
     }
   }
@@ -42,6 +44,15 @@
       display: none;
     }
   }
+
+  &.ald-tree-highlight-filtered-title {
+    .filter-node {
+      .ald-tree-title {
+        font-weight: 500;
+        color: var(--alias-colors-text-danger);
+      }
+    }
+  }
 }
 
 .ald-tree-treenode {

package/dist/Tree/style/mixin.less

@@ -102,10 +102,10 @@
       background: @tree-node-hover-bg;
     }
 
-    &:not(&-disabled).filter-node .@{custom-tree-prefix-cls}-title {
-      font-weight: 500;
-      color: var(--alias-colors-text-danger);
-    }
+    // &:not(&-disabled).filter-node .@{custom-tree-prefix-cls}-title {
+    //   // font-weight: 500;
+    //   // color: var(--alias-colors-text-danger);
+    // }
 
     &-draggable {
       .@{custom-tree-prefix-cls}-draggable-icon {