@titaui/pc 1.12.91-beta.3 → 1.12.93

package/lib/components/dynamic/dynamic-item/components/okr-progress/index.css

@@ -13,7 +13,7 @@
   color: #141c28;
   line-height: 24px;
   display: flex;
-  justify-content: space-between;
+  justify-content: flex-start;
   align-items: center;
 }
 
@@ -68,6 +68,10 @@
   transition: all 0.3s;
 }
 
+.titaui-okr-progress__title-total {
+  margin-left: 8px;
+}
+
 .titaui-okr-progress__table {
   border: 1px solid #dfe3ea;
   border-radius: 12px;

package/lib/components/dynamic/dynamic-item/components/okr-progress/index.js

@@ -55,7 +55,7 @@ var prefix = 'titaui-okr-progress';
 var isImport = false;
 
 var OkrProgress = function OkrProgress(_ref) {
-  var _rowsData$Rows;
+  var _rowsData$Rows, _rowsData$Rows2;
 
   var data = _ref.data,
       reportType = _ref.reportType;
@@ -65,7 +65,7 @@ var OkrProgress = function OkrProgress(_ref) {
       rowsData = _useState2[0],
       setRowsData = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(true),
+  var _useState3 = (0, _react.useState)(false),
       _useState4 = _slicedToArray(_useState3, 2),
       tableVisible = _useState4[0],
       setTableVisible = _useState4[1];
@@ -177,8 +177,10 @@ var OkrProgress = function OkrProgress(_ref) {
     className: (0, _classnames["default"])("".concat(prefix, "__title-arrow"), _defineProperty({}, "".concat(prefix, "__title-arrow--show"), !tableVisible))
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: (0, _classnames["default"])('tu-icon-caret-down', "".concat(prefix, "__title-arrow-icon"), _defineProperty({}, "".concat(prefix, "__title-arrow-icon--rotate"), !tableVisible))
-  }))), renderTitle), /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(prefix, "__table"), _defineProperty({}, "".concat(prefix, "__table--hide"), !tableVisible))
+  }))), renderTitle, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__title-total")
+  }, rowsData === null || rowsData === void 0 ? void 0 : (_rowsData$Rows2 = rowsData.Rows) === null || _rowsData$Rows2 === void 0 ? void 0 : _rowsData$Rows2.length)), tableVisible && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__table")
   }, renderTable));
 };
 

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

@@ -54,9 +54,7 @@ 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)), /*#__PURE__*/_react["default"].createElement("span", {
-    className: "".concat(prefix, "__common-time")
-  }, "\u7B2C\u4E00\u5B63\u5EA6")), !isFirstLevel && /*#__PURE__*/_react["default"].createElement("div", {
+  }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _openData.parseString)(text))), !isFirstLevel && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(prefix, "__kr")),
     onClick: handleClickTitle
   }, /*#__PURE__*/_react["default"].createElement("span", {

package/lib/components/menus/export-modules/appraisal-menus/index.js

@@ -96,7 +96,9 @@ function AppraisalMenus(props) {
         _getQueryString$react = _getQueryString.reactRouterName,
         reactRouterName = _getQueryString$react === void 0 ? '' : _getQueryString$react;
 
-    if (!reactRouterName) {
+    var isAppraisalPage = window.location.hash.indexOf('performance') != -1;
+
+    if (!reactRouterName && isAppraisalPage) {
       window.location.href = newMenus[0].data.href;
     }
   }, [history.location.pathname]); // 判断路由高亮菜单

package/lib/components/menus/export-modules/interview-menus/index.js

@@ -91,7 +91,9 @@ function InterviewMenus(props) {
         _getQueryString$react = _getQueryString.reactRouterName,
         reactRouterName = _getQueryString$react === void 0 ? '' : _getQueryString$react;
 
-    if (!reactRouterName) {
+    var isInterviewPage = window.location.hash.indexOf('interview') != -1;
+
+    if (!reactRouterName && isInterviewPage) {
       window.location.href = newMenus[0].data.href;
     }
   }, [history.location.pathname]);

package/lib/components/menus/export-modules/summary-menus/menus.js

@@ -115,15 +115,14 @@ var summaryMenus = /*#__PURE__*/function () {
       href: "#/enterprise/manage?reactRouterName=daily",
       isShow: isShowManage,
       openBlank: true
-    } // {
-    //   icon: 'yibiao',
-    //   label: locale.menu_summary_dashboard,
-    //   key: PAGE_SUMMARY_DASHBOARD,
-    //   type: MENU_ITEM_NOE,
-    //   href: '#/summary/dashboard',
-    //   isShow: isShowManage,
-    // }
-    ];
+    }, {
+      icon: 'yibiao',
+      label: _i18n.locale.menu_summary_dashboard,
+      key: PAGE_SUMMARY_DASHBOARD,
+      type: _index.MENU_ITEM_NOE,
+      href: '#/summary/dashboard',
+      isShow: props.isShowDept
+    }];
   }
 
   _createClass(summaryMenus, [{

package/lib/components/okr-flow/export-modal/index.js

@@ -458,13 +458,13 @@ var ExportMapModal = function ExportMapModal(props) {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__export"), _defineProperty({}, "".concat(_precls["default"], "__dark"), darkTheme)),
     elements: dataSource,
     nodeTypes: _utils.nodeTypes,
-    minZoom: 0.05,
+    minZoom: 0.04,
     zoomOnScroll: false,
     zoomOnPinch: false,
     zoomOnDoubleClick: false,
     paneMoveable: false,
     style: {
-      height: 446,
+      height: 500,
       width: '100%',
       background: bgColor
     }

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

@@ -36,107 +36,47 @@ 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 ? {
-    users: [],
-    departments: [],
-    groups: []
-  } : _ref$users,
+      users = _ref$users === void 0 ? [] : _ref$users,
       onChange = _ref.onChange,
       _ref$text = _ref.text,
-      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;
-  })),
+      text = _ref$text === void 0 ? "" : _ref$text;
+
+  var _useState = (0, _react.useState)(users),
       _useState2 = _slicedToArray(_useState, 2),
-      selectUsers = _useState2[0],
+      seleceUsers = _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,
-        departments = _ref2.departments,
-        groups = _ref2.groups;
+    var users = _ref2.users;
     setSelectUsers(users);
-    console.log(users, 'usersusers');
-    setSelectDepartments(departments);
-    setSelectGroups(groups);
 
     if (onChange) {
-      onChange(users, departments, groups);
+      onChange(users);
     }
   };
 
   var handleDeleteUser = function handleDeleteUser(info) {
-    var newData = selectUsers.filter(function (user) {
+    var newData = seleceUsers.filter(function (user) {
       return user.userId !== info.userId;
     });
     setSelectUsers(newData);
 
     if (onChange) {
-      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);
+      onChange(newData);
     }
   };
 
   (0, _react.useEffect)(function () {
-    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);
+    setSelectUsers(users);
   }, [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")
-  }, selectUsers === null || selectUsers === void 0 ? void 0 : selectUsers.map(function (item) {
+  }, users.map(function (item) {
     return /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__content-user")
     }, /*#__PURE__*/_react["default"].createElement(_components["default"], {
@@ -150,44 +90,16 @@ 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: isOnlySelectUser,
+    disabledDepartSelect: true,
     panes: {
-      depart: true,
-      group: !isOnlySelectUser,
-      subordinate: !isOnlySelectUser
+      depart: true
     },
     selectNodes: {
-      users: selectUsers,
-      departments: selectDepartments,
-      groups: selectGroups
+      users: seleceUsers
     },
     trigger: /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__import")

package/package.json

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