@titaui/pc 1.13.2-beta.1 → 1.13.2-beta.12

package/lib/components/rich-editor-at/index.js

@@ -40,43 +40,87 @@ var RichEditorAt = function RichEditorAt(_ref) {
       users = _ref$users === void 0 ? [] : _ref$users,
       onChange = _ref.onChange,
       _ref$text = _ref.text,
-      text = _ref$text === void 0 ? "" : _ref$text;
-
-  var _useState = (0, _react.useState)(users),
+      text = _ref$text === void 0 ? "" : _ref$text,
+      _ref$departments = _ref.departments,
+      departments = _ref$departments === void 0 ? [] : _ref$departments,
+      _ref$groups = _ref.groups,
+      groups = _ref$groups === void 0 ? [] : _ref$groups,
+      _ref$isOnlySelectUser = _ref.isOnlySelectUser,
+      isOnlySelectUser = _ref$isOnlySelectUser === void 0 ? true : _ref$isOnlySelectUser;
+
+  var _useState = (0, _react.useState)(),
       _useState2 = _slicedToArray(_useState, 2),
-      seleceUsers = _useState2[0],
+      selectUsers = _useState2[0],
       setSelectUsers = _useState2[1];
 
+  var _useState3 = (0, _react.useState)(),
+      _useState4 = _slicedToArray(_useState3, 2),
+      selectDepartments = _useState4[0],
+      setSelectDepartments = _useState4[1];
+
+  var _useState5 = (0, _react.useState)(),
+      _useState6 = _slicedToArray(_useState5, 2),
+      selectGroups = _useState6[0],
+      setSelectGroups = _useState6[1];
+
   var handleSelectUser = function handleSelectUser(_ref2) {
-    var users = _ref2.users;
+    var users = _ref2.users,
+        departments = _ref2.departments,
+        groups = _ref2.groups;
     setSelectUsers(users);
+    setSelectDepartments(departments);
+    setSelectGroups(groups);
 
     if (onChange) {
-      onChange(users);
+      onChange(users, departments, groups);
     }
   };
 
   var handleDeleteUser = function handleDeleteUser(info) {
-    var newData = seleceUsers.filter(function (user) {
+    var newData = selectUsers === null || selectUsers === void 0 ? void 0 : selectUsers.filter(function (user) {
       return user.userId !== info.userId;
     });
     setSelectUsers(newData);
 
     if (onChange) {
-      onChange(newData);
+      onChange(newData, selectDepartments, selectGroups);
+    }
+  };
+
+  var handleDeleteDepart = function handleDeleteDepart(info) {
+    var newData = selectDepartments === null || selectDepartments === void 0 ? void 0 : selectDepartments.filter(function (item) {
+      return item.id !== info.id;
+    });
+    setSelectDepartments(newData);
+
+    if (onChange) {
+      onChange(selectUsers, newData, selectGroups);
+    }
+  };
+
+  var handleDeleteGroup = function handleDeleteGroup(info) {
+    var newData = selectGroups === null || selectGroups === void 0 ? void 0 : selectGroups.filter(function (item) {
+      return item.id !== info.id;
+    });
+    setSelectGroups(newData);
+
+    if (onChange) {
+      onChange(selectUsers, selectDepartments, newData);
     }
   };
 
   (0, _react.useEffect)(function () {
     setSelectUsers(users);
-  }, [users]);
+    setSelectDepartments(departments);
+    setSelectGroups(groups);
+  }, [users, departments, groups]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
   }, text && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__title")
   }, text), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
-  }, users.map(function (item) {
+  }, selectUsers && selectUsers.map(function (item) {
     return /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__content-user")
     }, /*#__PURE__*/_react["default"].createElement(_components["default"], {
@@ -90,16 +134,44 @@ var RichEditorAt = function RichEditorAt(_ref) {
       },
       color: item.avatar.color
     }));
+  }), selectDepartments && selectDepartments.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement("span", {
+      className: "".concat(prefix, "__content-user")
+    }, /*#__PURE__*/_react["default"].createElement(_components["default"], {
+      showNameTips: true,
+      canDelUser: true,
+      onDelUser: function onDelUser() {
+        return handleDeleteDepart(item);
+      },
+      color: '#3296fa',
+      name: item.name
+    }));
+  }), selectGroups && selectGroups.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement("span", {
+      className: "".concat(prefix, "__content-user")
+    }, /*#__PURE__*/_react["default"].createElement(_components["default"], {
+      showNameTips: true,
+      canDelUser: true,
+      onDelUser: function onDelUser() {
+        return handleDeleteGroup(item);
+      },
+      color: 'rgba(90, 216, 166)',
+      name: item.name
+    }));
   }), /*#__PURE__*/_react["default"].createElement(_userSelector["default"], {
     multiple: true,
     position: "right",
     onOk: handleSelectUser,
-    disabledDepartSelect: true,
+    disabledDepartSelect: isOnlySelectUser,
     panes: {
-      depart: true
+      depart: true,
+      group: !isOnlySelectUser,
+      subordinate: !isOnlySelectUser
     },
     selectNodes: {
-      users: seleceUsers
+      users: selectUsers,
+      departments: selectDepartments,
+      groups: selectGroups
     },
     trigger: /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__import")

package/lib/components/scroll-container/index.js

@@ -23,12 +23,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -65,24 +59,15 @@ var ScrollContainer = /*#__PURE__*/function (_PureComponent) {
 
     _this = _super.call(this, props);
 
-    _this.onEndScroll = function (e) {
-      var _e$target = e.target,
-          clientHeight = _e$target.clientHeight,
-          scrollHeight = _e$target.scrollHeight,
-          scrollTop = _e$target.scrollTop;
-      if (clientHeight + scrollTop === scrollHeight) _this.props.onScrollBottom(e);
+    _this.onEndScroll = function () {
       _this.scrolling = false;
 
       if (!_this.pressed && _this.started) {
-        _this.processEnd(e);
+        _this.processEnd();
       }
     };
 
     _this.onScroll = function (e) {
-      var _e$target2 = e.target,
-          clientHeight = _e$target2.clientHeight,
-          scrollHeight = _e$target2.scrollHeight,
-          scrollTop = _e$target2.scrollTop;
       var container = _this.container.current; // Ignore the internal scrolls
 
       if (container.scrollLeft !== _this.scrollLeft || container.scrollTop !== _this.scrollTop) {
@@ -90,13 +75,7 @@ var ScrollContainer = /*#__PURE__*/function (_PureComponent) {
 
         _this.processScroll(e);
 
-        _this.onEndScroll({
-          target: {
-            clientHeight: clientHeight,
-            scrollHeight: scrollHeight,
-            scrollTop: scrollTop
-          }
-        });
+        _this.onEndScroll();
       }
     };
 
@@ -372,14 +351,14 @@ var ScrollContainer = /*#__PURE__*/function (_PureComponent) {
     }
   }, {
     key: "processEnd",
-    value: function processEnd(e) {
+    value: function processEnd() {
       var onEndScroll = this.props.onEndScroll;
       var container = this.container.current;
 
       if (container && onEndScroll) {
-        onEndScroll(_objectSpread(_objectSpread({}, e), {}, {
+        onEndScroll({
           external: !this.internal
-        }));
+        });
       }
 
       this.pressed = false;

package/lib/components/search-input/index.js

@@ -58,9 +58,6 @@ function _default(props) {
     height: 30
   }, props.style);
 
-  (0, _react.useEffect)(function () {
-    setValue(props.value);
-  }, [props.value]);
   var inputClassName = focus ? "search-input-focus" : "";
   var iconClassName = focus ? "search-input-icon-focus" : "";
   var clearIconStyle = {