@aloudata/aloudata-design 1.10.0 → 1.10.2

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

@@ -96,11 +96,13 @@ var Tree = /*#__PURE__*/React.forwardRef(function (props, ref) {
       keyEntities = nodeProps.context.keyEntities,
       isLeaf = nodeProps.isLeaf;
     var level = ((_keyEntities = keyEntities[eventKey]) === null || _keyEntities === void 0 ? void 0 : _keyEntities.level) || 0;
-    var indentWidth = isLeaf ? TREE_SWITCH_CION_SIZE : 0;
-    indentWidth += level * (TREE_SWITCH_CION_SIZE / 2);
+    var iconSize = size === 'small' ? TREE_SWITCH_CION_SIZE : TREE_SWITCH_LARGE_ICON_SIZE;
+    var indentWidth = isLeaf ? iconSize : 0;
+    indentWidth += level * (iconSize / 2);
     return /*#__PURE__*/React.createElement("span", {
       style: {
-        width: indentWidth
+        width: indentWidth,
+        flexShrink: 0
       }
     });
   };
@@ -121,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/demo/drag/index.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const _default: () => React.JSX.Element;
-export default _default;
+declare const App: React.FC;
+export default App;

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

@@ -1,52 +1,124 @@
-import { App, Tree } from "../../..";
-import React from 'react';
-export default (function () {
-  return /*#__PURE__*/React.createElement(App, null, /*#__PURE__*/React.createElement(Tree, {
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { Tree } from "../../..";
+import React, { useState } from 'react';
+var x = 3;
+var y = 2;
+var z = 1;
+var defaultData = [];
+var generateData = function generateData(_level, _preKey, _tns) {
+  var preKey = _preKey || '0';
+  var tns = _tns || defaultData;
+  var children = [];
+  for (var _i = 0; _i < x; _i++) {
+    var key = "".concat(preKey, "-").concat(_i);
+    tns.push({
+      title: key,
+      key: key
+    });
+    if (_i < y) {
+      children.push(key);
+    }
+  }
+  if (_level < 0) {
+    return tns;
+  }
+  var level = _level - 1;
+  children.forEach(function (key, index) {
+    tns[index].children = [];
+    return generateData(level, key, tns[index].children);
+  });
+};
+generateData(z);
+var App = function App() {
+  var _useState = useState(defaultData),
+    _useState2 = _slicedToArray(_useState, 2),
+    gData = _useState2[0],
+    setGData = _useState2[1];
+  var _useState3 = useState(['0-0', '0-0-0', '0-0-0-0']),
+    _useState4 = _slicedToArray(_useState3, 1),
+    expandedKeys = _useState4[0];
+  var onDragEnter = function onDragEnter(info) {
+    console.log(info);
+    // expandedKeys, set it when controlled is needed
+    // setExpandedKeys(info.expandedKeys)
+  };
+
+  var onDrop = function onDrop(info) {
+    console.log(info);
+    var dropKey = info.node.key;
+    var dragKey = info.dragNode.key;
+    var dropPos = info.node.pos.split('-');
+    var dropPosition = info.dropPosition - Number(dropPos[dropPos.length - 1]);
+    var loop = function loop(data, key, callback) {
+      for (var _i2 = 0; _i2 < data.length; _i2++) {
+        if (data[_i2].key === key) {
+          return callback(data[_i2], _i2, data);
+        }
+        if (data[_i2].children) {
+          loop(data[_i2].children, key, callback);
+        }
+      }
+    };
+    var data = _toConsumableArray(gData);
+
+    // Find dragObject
+    var dragObj;
+    loop(data, dragKey, function (item, index, arr) {
+      arr.splice(index, 1);
+      dragObj = item;
+    });
+    if (!info.dropToGap) {
+      // Drop on the content
+      loop(data, dropKey, function (item) {
+        item.children = item.children || [];
+        // where to insert. New item was inserted to the start of the array in this example, but can be anywhere
+        item.children.unshift(dragObj);
+      });
+    } else if ((info.node.props.children || []).length > 0 &&
+    // Has children
+    info.node.props.expanded &&
+    // Is expanded
+    dropPosition === 1 // On the bottom gap
+    ) {
+      loop(data, dropKey, function (item) {
+        item.children = item.children || [];
+        // where to insert. New item was inserted to the start of the array in this example, but can be anywhere
+        item.children.unshift(dragObj);
+        // in previous version, we use item.children.push(dragObj) to insert the
+        // item to the tail of the children
+      });
+    } else {
+      var ar = [];
+      var _i3;
+      loop(data, dropKey, function (_item, index, arr) {
+        ar = arr;
+        _i3 = index;
+      });
+      if (dropPosition === -1) {
+        ar.splice(_i3, 0, dragObj);
+      } else {
+        ar.splice(_i3 + 1, 0, dragObj);
+      }
+    }
+    setGData(data);
+  };
+  return /*#__PURE__*/React.createElement(Tree, {
+    className: "draggable-tree",
+    defaultExpandedKeys: expandedKeys,
     draggable: true,
-    checkable: true,
-    showTabLeader: true,
-    onSelect: function onSelect(node, s) {
-      console.log('onSelect', node, s);
-    },
-    handlerRender: function handlerRender(node) {
-      return /*#__PURE__*/React.createElement("div", null, node.title, "handler");
-    },
-    titleRender: function titleRender(node) {
-      return /*#__PURE__*/React.createElement("span", null, node.title);
-    },
-    treeData: [{
-      title: 'Parent 1',
-      key: '0-0',
-      checkable: true,
-      children: [{
-        title: 'parent 1-0',
-        key: '0-0-0',
-        selectable: true,
-        children: [{
-          title: 'leaf',
-          selectable: true,
-          key: '0-0-0-0',
-          isLeaf: true
-        }, {
-          title: 'leaf',
-          key: '0-0-0-1',
-          isLeaf: true
-        }]
-      }, {
-        title: 'parent 1-1',
-        key: '0-0-1',
-        disabled: true,
-        selectable: true,
-        children: [{
-          title: /*#__PURE__*/React.createElement("span", {
-            style: {
-              color: '#1890ff'
-            }
-          }, "sss"),
-          key: '0-0-1-0',
-          disabled: true
-        }]
-      }]
-    }]
-  }));
-});
+    blockNode: true,
+    onDragEnter: onDragEnter,
+    onDrop: onDrop,
+    treeData: gData
+  });
+};
+export default App;

package/dist/Tree/style/directory.less

@@ -1,5 +1,5 @@
 // @import '../../style/themes/index';
-@tree-prefix-cls: ~'@{ant-prefix}-tree';
+@tree-prefix-cls: ~'@{ald-prefix}-tree';
 
 .@{tree-prefix-cls}.@{tree-prefix-cls}-directory {
   // ================== TreeNode ==================

package/dist/Tree/style/index.less

@@ -1,6 +1,8 @@
 @import '../../style/index.less';
 @import '../../Checkbox/style/index.less';
 @import './var.less';
+@import './rtl.less';
+@import './mixin.less';
 @import './reset.less';
 @import './checkbox.less';
 
@@ -13,6 +15,10 @@
 @tree-line-height-default: 16px;
 .aldCheckboxFn();
 
+.@{tree-prefix-cls} {
+  .antTreeFn(@tree-prefix-cls);
+}
+
 .ald-tree-treenode {
   display: flex;
   align-items: center;

package/dist/Tree/style/mixin.less

@@ -1,6 +1,6 @@
-@tree-prefix-cls: ~'@{ant-prefix}-tree';
-@select-tree-prefix-cls: ~'@{ant-prefix}-select-tree';
-@tree-motion: ~'@{ant-prefix}-motion-collapse';
+@tree-prefix-cls: ~'@{ald-prefix}-tree';
+@select-tree-prefix-cls: ~'@{ald-prefix}-select-tree';
+@tree-motion: ~'@{ald-prefix}-motion-collapse';
 @tree-node-padding: (@padding-xs / 2);
 // @deprecated: kept for customization usages, recommend using @tree-node-highlight-color instead.
 @tree-node-hightlight-color: inherit;
@@ -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/Tree/style/rtl.less

@@ -1,5 +1,5 @@
-@tree-prefix-cls: ~'@{ant-prefix}-tree';
-@select-tree-prefix-cls: ~'@{ant-prefix}-select-tree';
+@tree-prefix-cls: ~'@{ald-prefix}-tree';
+@select-tree-prefix-cls: ~'@{ald-prefix}-select-tree';
 @tree-node-prefix-cls: ~'@{tree-prefix-cls}-treenode';
 
 .@{tree-prefix-cls} {

package/dist/Tree/style/var.less

@@ -3,7 +3,7 @@
 @item-hover-bg: fade(#fff, 8%);
 @tree-directory-selected-color: #fff;
 @tree-directory-selected-bg: @BG40;
-@tree-title-height: 20px;
+@tree-title-height: 16px;
 @border-color-base: #434343; // base border outline a component
 
 @checkbox-size: 16px;

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

@@ -1,5 +1,5 @@
 .fade-motion(@className, @keyframeName) {
-  @name: ~'@{ant-prefix}-@{className}';
+  @name: ~'@{ald-prefix}-@{className}';
   .make-motion(@name, @keyframeName);
   .@{name}-enter,
   .@{name}-appear {

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

@@ -1,5 +1,5 @@
 .move-motion(@className, @keyframeName) {
-  @name: ~'@{ant-prefix}-@{className}';
+  @name: ~'@{ald-prefix}-@{className}';
   .make-motion(@name, @keyframeName);
   .@{name}-enter,
   .@{name}-appear {

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

@@ -4,8 +4,8 @@
   }
 }
 
-@click-animating-true: ~"[@{ant-prefix}-click-animating='true']";
-@click-animating-with-extra-node-true: ~"[@{ant-prefix}-click-animating-without-extra-node='true']";
+@click-animating-true: ~"[@{ald-prefix}-click-animating='true']";
+@click-animating-with-extra-node-true: ~"[@{ald-prefix}-click-animating-without-extra-node='true']";
 
 @{click-animating-true},
 @{click-animating-with-extra-node-true} {
@@ -20,7 +20,7 @@ html {
 @click-animating-with-extra-node-true-after: ~'@{click-animating-with-extra-node-true}::after';
 
 @{click-animating-with-extra-node-true-after},
-.@{ant-prefix}-click-animating-node {
+.@{ald-prefix}-click-animating-node {
   position: absolute;
   inset: 0;
   display: block;

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

@@ -1,5 +1,5 @@
 .slide-motion(@className, @keyframeName) {
-  @name: ~'@{ant-prefix}-@{className}';
+  @name: ~'@{ald-prefix}-@{className}';
   .make-motion(@name, @keyframeName);
   .@{name}-enter,
   .@{name}-appear {

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

@@ -1,5 +1,5 @@
 .zoom-motion(@className, @keyframeName, @duration: @animation-duration-base) {
-  @name: ~'@{ant-prefix}-@{className}';
+  @name: ~'@{ald-prefix}-@{className}';
   .make-motion(@name, @keyframeName, @duration);
   .@{name}-enter,
   .@{name}-appear {

package/dist/style/index.less

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aloudata/aloudata-design",
-  "version": "1.10.0",
+  "version": "1.10.2",
   "description": "",
   "license": "MIT",
   "module": "dist/index.js",
@@ -65,7 +65,6 @@
     "compare-func": "^2.0.0",
     "memoize-one": "^6.0.0",
     "rc-menu": "^9.8.0",
-    "react-table": "^7.8.0",
     "umi-request": "^1.4.0",
     "zx": "^7.1.1"
   },