@aloudata/aloudata-design 1.10.1 → 1.10.3

package/dist/MemberPicker/components/PanelWrapper.js

@@ -7,6 +7,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { message } from "../..";
 import ConfigProvider from "../../ConfigProvider";
+import { EUserType } from "../../ConfigProvider/getUserList";
 import { useRequest } from 'ahooks';
 import _ from 'lodash';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
@@ -79,7 +80,10 @@ export var PanelWrapper = function PanelWrapper(_ref) {
     run = _useRequest.run;
   var totalUserList = useMemo(function () {
     var totalUsers = searchUserList.concat(selectedUserList);
-    return _.uniqBy(totalUsers, 'userId');
+    return _.uniqBy(totalUsers, function (data) {
+      if (data.type === EUserType.USER) return data.userId;
+      return data.groupId;
+    });
   }, [searchUserList, selectedUserList]);
   useEffect(function () {
     run();

package/dist/MemberPicker/index.js

@@ -12,6 +12,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useRequest } from 'ahooks';
 import classNames from 'classnames';
+import _ from 'lodash';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import ConfigProvider from "../ConfigProvider";
 import { EUserType } from "../ConfigProvider/getUserList";
@@ -104,7 +105,11 @@ var MemberSelector = function MemberSelector(_ref) {
     loading = _useRequest.loading,
     run = _useRequest.run;
   var totalUserList = useMemo(function () {
-    return searchUserList.concat(selectedUserList);
+    var totalUsers = searchUserList.concat(selectedUserList);
+    return _.uniqBy(totalUsers, function (data) {
+      if (data.type === EUserType.USER) return data.userId;
+      return data.groupId;
+    });
   }, [searchUserList, selectedUserList]);
   useEffect(function () {
     if (!dropdownOpen) return;

package/dist/Tree/Tree.js

@@ -101,7 +101,8 @@ var Tree = /*#__PURE__*/React.forwardRef(function (props, ref) {
     indentWidth += level * (iconSize / 2);
     return /*#__PURE__*/React.createElement("span", {
       style: {
-        width: indentWidth
+        width: indentWidth,
+        flexShrink: 0
       }
     });
   };
@@ -122,7 +123,7 @@ var Tree = /*#__PURE__*/React.forwardRef(function (props, ref) {
     switcherIcon: function switcherIcon(nodeProps) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, renderIndent(nodeProps), renderSwitcherIcon(prefixCls, /*#__PURE__*/React.createElement(ChevronDownLine, {
         size: size === 'small' ? TREE_SWITCH_CION_SIZE : TREE_SWITCH_LARGE_ICON_SIZE,
-        color: theme.NL50
+        color: '#B1B1B1'
       }, "\u5C55\u5F00"), showLine, nodeProps));
     },
     draggable: draggableConfig

package/dist/Tree/style/index.less

@@ -19,6 +19,10 @@
   .antTreeFn(@tree-prefix-cls);
 }
 
+.ald-tree.draggable-tree {
+  padding: 3px 0;
+}
+
 .ald-tree-treenode {
   display: flex;
   align-items: center;

package/dist/Tree/style/mixin.less

@@ -27,18 +27,6 @@
     background-color: @primary-color;
     border-radius: 1px;
     pointer-events: none;
-
-    &::after {
-      position: absolute;
-      top: -3px;
-      left: -6px;
-      width: 8px;
-      height: 8px;
-      background-color: transparent;
-      border: 2px solid @primary-color;
-      border-radius: 50%;
-      content: '';
-    }
   }
 }
 
@@ -74,7 +62,10 @@
 
         &::after {
           position: absolute;
-          inset: 0 0 @tree-node-padding 0;
+          left: 0;
+          top: 0;
+          right: 0;
+          bottom: 0;
           border: 1px solid @primary-color;
           opacity: 0;
           animation: ant-tree-node-fx-do-not-use 0.3s;
@@ -90,9 +81,6 @@
   // ===================== TreeNode =====================
   .@{custom-tree-node-prefix-cls} {
     display: flex;
-    align-items: flex-start;
-    padding: 0 0 @tree-node-padding 0;
-    outline: none;
     // Disabled
     &-disabled {
       // >>> Title
@@ -137,18 +125,6 @@
     }
   }
 
-  // >>> Indent
-  &-indent {
-    align-self: stretch;
-    white-space: nowrap;
-    user-select: none;
-
-    &-unit {
-      display: inline-block;
-      width: @tree-title-height;
-    }
-  }
-
   // >>> Drag Handler
   &-draggable-icon {
     visibility: hidden;
@@ -161,7 +137,6 @@
     position: relative;
     flex: none;
     align-self: stretch;
-    width: @tree-title-height;
     margin: 0;
     line-height: @tree-title-height;
     text-align: center;

package/dist/style/core/motion/fade.less

@@ -11,7 +11,7 @@
   }
 }
 
-.fade-motion(fade, antFade);
+.fade-motion(fade, ant-fade);
 
 @keyframes ald-fade-in {
   0% {

package/dist/style/core/motion/slide.less

@@ -13,10 +13,10 @@
   }
 }
 
-.slide-motion(slide-up, antSlideUp);
-.slide-motion(slide-down, antSlideDown);
-.slide-motion(slide-left, antSlideLeft);
-.slide-motion(slide-right, antSlideRight);
+.slide-motion(slide-up, ald-slide-up);
+.slide-motion(slide-down, ald-slide-down);
+.slide-motion(slide-left, ald-slide-left);
+.slide-motion(slide-right, ald-slide-right);
 
 @keyframes ald-slide-up-in {
   0% {

package/dist/style/core/motion/zoom.less

@@ -17,16 +17,16 @@
 }
 
 // For Modal, Select choosen item
-.zoom-motion(zoom, antZoom);
+.zoom-motion(zoom, ald-zoom);
 // For Popover, Popconfirm, Dropdown
-.zoom-motion(zoom-big, antZoomBig);
+.zoom-motion(zoom-big, ald-zoom-big);
 // For Tooltip
-.zoom-motion(zoom-big-fast, antZoomBig, @animation-duration-fast);
+.zoom-motion(zoom-big-fast, ald-zoom-big, @animation-duration-fast);
 
-.zoom-motion(zoom-up, antZoomUp);
-.zoom-motion(zoom-down, antZoomDown);
-.zoom-motion(zoom-left, antZoomLeft);
-.zoom-motion(zoom-right, antZoomRight);
+.zoom-motion(zoom-up, ald-zoom-up);
+.zoom-motion(zoom-down, ald-zoom-down);
+.zoom-motion(zoom-left, ald-zoom-left);
+.zoom-motion(zoom-right, ald-zoom-right);
 
 @keyframes ald-zoom-in {
   0% {

package/dist/style/index.less

@@ -4,6 +4,7 @@
 @import './themes/default/scrollBar.less';
 @import './themes/default/index.less';
 @ald-prefix: ald;
+@ant-prefix: ant;
 
 body {
   font-family: Inter, 'PingFang SC', SimSun, -apple-system, BlinkMacSystemFont,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aloudata/aloudata-design",
-  "version": "1.10.1",
+  "version": "1.10.3",
   "description": "",
   "license": "MIT",
   "module": "dist/index.js",