@titaui/pc 1.12.90 → 1.12.91-beta.3

package/lib/components/dynamic/dynamic-item/components/table-row-okr/index.js

@@ -54,7 +54,9 @@ var TableRowOKR = function TableRowOKR(_ref) {
     onClick: handleClickTitle
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: "tu-icon-H5-".concat(isO ? "O" : "KR", "-s ").concat(prefix, "__common-icon")
-  }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _openData.parseString)(text))), !isFirstLevel && /*#__PURE__*/_react["default"].createElement("div", {
+  }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _openData.parseString)(text)), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__common-time")
+  }, "\u7B2C\u4E00\u5B63\u5EA6")), !isFirstLevel && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(prefix, "__kr")),
     onClick: handleClickTitle
   }, /*#__PURE__*/_react["default"].createElement("span", {

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

@@ -36,47 +36,107 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var prefix = "titaui-rich-editor-at";
 
 var RichEditorAt = function RichEditorAt(_ref) {
+  var _users$users;
+
   var _ref$users = _ref.users,
-      users = _ref$users === void 0 ? [] : _ref$users,
+      users = _ref$users === void 0 ? {
+    users: [],
+    departments: [],
+    groups: []
+  } : _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$isOnlySelectUser = _ref.isOnlySelectUser,
+      isOnlySelectUser = _ref$isOnlySelectUser === void 0 ? true : _ref$isOnlySelectUser;
+  console.log(users);
+
+  var _useState = (0, _react.useState)((_users$users = users.users) === null || _users$users === void 0 ? void 0 : _users$users.map(function (item) {
+    return item.user;
+  })),
       _useState2 = _slicedToArray(_useState, 2),
-      seleceUsers = _useState2[0],
+      selectUsers = _useState2[0],
       setSelectUsers = _useState2[1];
 
+  var _useState3 = (0, _react.useState)(users.departments),
+      _useState4 = _slicedToArray(_useState3, 2),
+      selectDepartments = _useState4[0],
+      setSelectDepartments = _useState4[1];
+
+  var _useState5 = (0, _react.useState)(users.groups),
+      _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);
+    console.log(users, 'usersusers');
+    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.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.filter(function (item) {
+      return item.id !== info.id;
+    });
+    setSelectDepartments(newData);
+
+    if (onChange) {
+      onChange(selectUsers, newData, selectGroups);
+    }
+  };
+
+  var handleDeleteGroup = function handleDeleteGroup(info) {
+    var newData = selectGroups.filter(function (item) {
+      return item.id !== info.id;
+    });
+    setSelectGroups(newData);
+
+    if (onChange) {
+      onChange(selectUsers, selectDepartments, newData);
     }
   };
 
   (0, _react.useEffect)(function () {
-    setSelectUsers(users);
+    if (users && users.users && users.users[0].user) {
+      var _users$users2;
+
+      setSelectUsers((_users$users2 = users.users) === null || _users$users2 === void 0 ? void 0 : _users$users2.map(function (item) {
+        return item.user;
+      }));
+    } else {
+      setSelectUsers(users.users);
+    }
+
+    setSelectDepartments(users.departments);
+    setSelectGroups(users.groups);
   }, [users]);
+  console.log(selectUsers, 'selectUsers');
   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 === null || selectUsers === void 0 ? void 0 : selectUsers.map(function (item) {
     return /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__content-user")
     }, /*#__PURE__*/_react["default"].createElement(_components["default"], {
@@ -90,16 +150,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/utils/open-data.js

@@ -111,8 +111,10 @@ function openData(p) {
 
       var ref = (0, _react.useRef)(null);
       (0, _react.useEffect)(function () {
+        var _ref;
+
         //@ts-ignore
-        (window.WWOpenData && window.WWOpenData || window.top.WWOpenData).bind(ref.current);
+        (_ref = window.WWOpenData && window.WWOpenData || window.top.WWOpenData) === null || _ref === void 0 ? void 0 : _ref.bind(ref.current);
         if (!p.id) return;
         var openId = getOpenId(p.id, p.type);
 
@@ -353,7 +355,7 @@ var parseStringV2 = function parseStringV2(str) {
 exports.parseStringV2 = parseStringV2;
 
 var parseOpenDataStringToImg = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(str) {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(str) {
     var font,
         reg,
         strReg,
@@ -427,21 +429,21 @@ var parseOpenDataStringToImg = /*#__PURE__*/function () {
   }));
 
   return function parseOpenDataStringToImg(_x) {
-    return _ref.apply(this, arguments);
+    return _ref2.apply(this, arguments);
   };
 }();
 
 exports.parseOpenDataStringToImg = parseOpenDataStringToImg;
 
 var getCanvasImg = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(id, type, _ref2) {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(id, type, _ref3) {
     var lineHeight, fontSize, fontWeight, color, font, canvas, ctx, name, img, _ctx$measureText, width, actualWidth, src;
 
     return regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            lineHeight = _ref2.lineHeight, fontSize = _ref2.fontSize, fontWeight = _ref2.fontWeight, color = _ref2.color;
+            lineHeight = _ref3.lineHeight, fontSize = _ref3.fontSize, fontWeight = _ref3.fontWeight, color = _ref3.color;
             font = "".concat(fontWeight, " ").concat(fontSize, "px/").concat(lineHeight, "px arial,sans-serif");
             canvas = document.createElement("canvas");
             ctx = canvas.getContext("2d");
@@ -488,7 +490,7 @@ var getCanvasImg = /*#__PURE__*/function () {
   }));
 
   return function getCanvasImg(_x2, _x3, _x4) {
-    return _ref3.apply(this, arguments);
+    return _ref4.apply(this, arguments);
   };
 }();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.12.90",
+  "version": "1.12.91-beta.3",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",