@titaui/pc 1.12.55 → 1.12.57-beta.2

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

@@ -100,7 +100,7 @@ var _default = function _default() {
   var showCompanyAll = baseAuth.isBoss() || baseAuth.isAssistant() || baseAuth.isPlanDailyManager();
   (0, _react.useEffect)(function () {
     if (showCompanyAll) {
-      window.location.href = '#/summary/manage?departmentName=公司全部&departmentId=0';
+      window.location.href = '#/summary/manage?departmentName=公司全部&departmentId=0&modeType=date';
 
       var allDepartmentText = window.getLocale && window.getLocale(_i18n.locale.menu_alldeparment) || _i18n.locale.menu_alldeparment;
 
@@ -124,7 +124,6 @@ var _default = function _default() {
       });
     } else {
       (0, _requestApis.getMyDepartMent)().then(function (res) {
-        location.href = "#/summary/manage?departmentName=".concat(res.Data.departments[0].name, "&departmentId=").concat(res.Data.departments[0].id);
         var rawTreeData = (0, _helper.translateDepartsToTreeNode)(res.Data.departments);
         var rootNode = {
           async: true,
@@ -133,14 +132,20 @@ var _default = function _default() {
             name: '全部管理部门'
           },
           pid: 0,
-          id: rawTreeData[0].id,
+          id: -1,
           key: -1,
+          isLeaf: true,
           nodeType: _index.DEPART_NODE,
           title: '全部管理部门'
         };
 
         if (rawTreeData.length > 1) {
+          location.href = "#/summary/manage?departmentName=".concat(res.Data.departments[0].name, "&departmentId=-1&modeType=date");
           rawTreeData.unshift(rootNode);
+          setSelectedMenuKeys([-1]);
+        } else {
+          location.href = "#/summary/manage?departmentName=".concat(res.Data.departments[0].name, "&departmentId=").concat(res.Data.departments[0].id, "&modeType=date");
+          setSelectedMenuKeys([rawTreeData[0].id]);
         }
 
         setRawTreeData(_toConsumableArray(rawTreeData));

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

@@ -58,7 +58,7 @@ var summaryMenus = /*#__PURE__*/function () {
 
     this.COMPANYALL = _index.COMPANY_ALL_NODE;
     this.SHARE = _index.SHARE_NODE;
-    this.SUBORDINATES = "subordinates";
+    this.SUBORDINATES = _index.SUBORDINATES_NODE;
     this.menus = [{
       icon: "caidan-my",
       label: _i18n.locale.menu_my_summary,
@@ -77,7 +77,7 @@ var summaryMenus = /*#__PURE__*/function () {
       icon: "caidan-xiashu",
       label: _i18n.locale.menu_my_subordinates,
       key: this.SUBORDINATES,
-      type: _index.SUBORDINATES_NODE,
+      type: this.SUBORDINATES,
       isLeaf: false,
       children: [],
       href: "#/summary/subordinates",
@@ -85,8 +85,10 @@ var summaryMenus = /*#__PURE__*/function () {
     }, {
       icon: "caidan-enjoy",
       label: _i18n.locale.menu_my_share,
-      key: PAGE_SUMMARY_SHARE,
-      type: _index.MENU_ITEM_NOE,
+      key: this.SHARE,
+      type: this.SHARE,
+      isLeaf: false,
+      children: [],
       href: "#/summary/share",
       isShow: props.isShowShare
     }, {
@@ -116,10 +118,10 @@ var summaryMenus = /*#__PURE__*/function () {
   _createClass(summaryMenus, [{
     key: "setSubordinatesLoading",
     value: function setSubordinatesLoading(loading) {
-      this.menus[1].children = [];
+      this.menus[2].children = [];
 
       if (loading) {
-        this.menus[1].children.push({
+        this.menus[2].children.push({
           icon: "",
           label: "loading",
           key: "loading-subordinates",
@@ -160,6 +162,53 @@ var summaryMenus = /*#__PURE__*/function () {
 
       this.menus[2].children = treeNodeUsers;
     }
+  }, {
+    key: "setShareLoading",
+    value: function setShareLoading(loading) {
+      this.menus[3].children = [];
+
+      if (loading) {
+        this.menus[3].children.push({
+          icon: "",
+          label: "loading",
+          key: "loading-subordinates",
+          type: _index.LOADING_NODE,
+          href: "",
+          data: {}
+        });
+      }
+    }
+  }, {
+    key: "insertShare",
+    value: function insertShare(users) {
+      if (!users || !users.length) {
+        this.menus[3].children = [{
+          icon: "",
+          label: "empty-subordinates",
+          key: "empty-subordinates",
+          type: _index.NO_SUBORDINATES_NODE,
+          href: "",
+          data: {}
+        }];
+        return;
+      }
+
+      var treeNodeUsers = [];
+
+      for (var i = 0; i < users.length; i++) {
+        var user = users[i];
+        treeNodeUsers.push({
+          icon: "",
+          label: user.name,
+          key: "".concat(user.userId),
+          type: _index.USER_NODE,
+          href: "",
+          data: user
+        });
+      }
+
+      this.menus[3].children = treeNodeUsers;
+    }
   }, {
     key: "getMenus",
     value: function getMenus() {

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

@@ -79,7 +79,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       isShowShare = _useState8[0],
       setIsShowShare = _useState8[1];
 
-  var isShowDepartment = baseAuth.isBoss() || baseAuth.isAssistant() || baseAuth.isPlanDailyManager() || baseAuth.isDepartmentLeader();
+  var isShowDepartment = baseAuth.isBoss() || baseAuth.isAssistant() || baseAuth.isPlanDailyManager() || baseAuth.isDepartmentLeader() || baseAuth.isHrbp();
   var flipRef = (0, _react.useRef)({
     next: function next() {},
     goback: function goback() {}
@@ -145,18 +145,41 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         resolve(true);
       })["catch"](reject);
     });
+  }; // 获取共享我的数据列表
+
+
+  var getShareUsers = function getShareUsers() {
+    return new Promise(function (resolve, reject) {
+      var mdata = summaryMenusData.current; // 初始化 Loading
+
+      mdata.setShareLoading(true);
+      setMenus(mdata.getMenus());
+      resolve(true); // 获取数据
+
+      (0, _requestApis.getShareUsersData)().then(function (users) {
+        console.log(users);
+        mdata.setShareLoading(false);
+        mdata.insertShare(users);
+        setMenus(mdata.getMenus());
+        resolve(true);
+      })["catch"](reject);
+    });
   };
 
   var onLoadTreeNodeDataHandler = function onLoadTreeNodeDataHandler(treeNode) {
     return new Promise(function (resolve) {
-      if (treeNode.key != summaryMenusData.current.SUBORDINATES) {
-        resolve(true);
-      } else if (treeNode.key == summaryMenusData.current.SUBORDINATES) {
+      if (treeNode.key == summaryMenusData.current.SUBORDINATES) {
         getSubordinaters().then(function () {
           return resolve(true);
         })["catch"](function () {
           return resolve(true);
         });
+      } else if (treeNode.key == summaryMenusData.current.SHARE) {
+        getShareUsers().then(function () {
+          return resolve(true);
+        })["catch"](function () {
+          return resolve(true);
+        });
       } else {
         resolve(true);
       }

package/lib/components/menus/request-apis.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.removeFollower = exports.getSubordinates = exports.getMyDepartMent = exports.getFollowerList = exports.getDepsAndUsers = exports.addFollower = void 0;
+exports.removeFollower = exports.getSubordinates = exports.getShareUsersData = exports.getMyDepartMent = exports.getFollowerList = exports.getDepsAndUsers = exports.addFollower = void 0;
 
 var _axios = _interopRequireDefault(require("axios"));
 
@@ -96,6 +96,20 @@ var getSubordinates = function getSubordinates(_ref) {
 
 exports.getSubordinates = getSubordinates;
 
+var getShareUsersData = function getShareUsersData() {
+  return (0, _request.rget)("v1")("summary/getShareUsers?toUserId=".concat(userId)).then(function (res) {
+    var users = [];
+
+    if (res.Code === 1) {
+      users = res.Data;
+    }
+
+    return users;
+  });
+};
+
+exports.getShareUsersData = getShareUsersData;
+
 var addFollower = function addFollower(id) {
   return _axios["default"].post("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/follow/addFollower?followerId=").concat(id), null, {
     headers: {

package/lib/components/nav-top/components/app-center/index.css

@@ -145,6 +145,17 @@
   background-color: rgba(90, 216, 166, 0.1);
 }
 
+.app-center__app-guide .titaui-pc__guide-tip__popup-triangle {
+  left: 18%;
+  bottom: -5px;
+}
+
+.app-center__app-guide-content {
+  font-size: 14px;
+  color: #FFFFFF;
+  line-height: 22px;
+}
+
 .app-center__drawer {
   transform: translateY(54px);
 }

package/lib/components/nav-top/components/app-center/index.js

@@ -13,6 +13,10 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _drawer = _interopRequireDefault(require("../../../drawer"));
 
+var _conditionRender = _interopRequireDefault(require("../../../condition-render"));
+
+var _guideTip = _interopRequireDefault(require("../../../guide-tip"));
+
 var _bookDemo = _interopRequireDefault(require("../../../book-demo"));
 
 var _errorBoundary = _interopRequireDefault(require("../../../error-boundary"));
@@ -21,10 +25,14 @@ var _utils = require("../../utils");
 
 var _errorLevel = _interopRequireDefault(require("../../../../utils/error-level"));
 
+var _helpers = require("../../../../utils/helpers");
+
 require("./index.css");
 
 var _interface = require("./interface");
 
+var _bsGlobal = require("../../../../utils/bs-global");
+
 var _yuyueAward = _interopRequireDefault(require("./images/yuyue-award.png"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -54,6 +62,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var precls = 'app-center';
+var userId = (0, _helpers.getLoginUserInfo)().Id;
 
 var AppCenter = function AppCenter(props) {
   var _props$appCenterVisib = props.appCenterVisible,
@@ -99,10 +108,34 @@ var AppCenter = function AppCenter(props) {
       currentAppId = _useState8[0],
       setCurrentAppId = _useState8[1];
 
+  var _useState9 = (0, _react.useState)(false),
+      _useState10 = _slicedToArray(_useState9, 2),
+      summaryGuideVisible = _useState10[0],
+      setSummaryGuideVisible = _useState10[1];
+
   var bookDemoRef = (0, _react.useRef)();
+
+  var handleCloseSummaryGuide = function handleCloseSummaryGuide() {
+    setSummaryGuideVisible(false);
+    var cacheIsKonw = localStorage.getItem("NewSummaryGuide_".concat(userId));
+
+    if (!cacheIsKonw) {
+      localStorage.setItem("NewSummaryGuide_".concat(userId), "".concat(userId));
+    }
+  };
+
   (0, _react.useEffect)(function () {
     setInit(true);
   }, []);
+  (0, _react.useEffect)(function () {
+    var cacheIsKonw = localStorage.getItem("NewSummaryGuide_".concat(userId));
+
+    if (cacheIsKonw) {
+      setSummaryGuideVisible(false);
+    } else {
+      setSummaryGuideVisible(true);
+    }
+  }, []);
   (0, _react.useEffect)(function () {
     var _apps$find;
 
@@ -160,18 +193,7 @@ var AppCenter = function AppCenter(props) {
     }
   };
 
-  return /*#__PURE__*/_react["default"].createElement(_drawer["default"], {
-    className: "".concat(precls, "__drawer"),
-    placement: "top",
-    onClose: closeAppCenter,
-    visible: appCenterVisible,
-    width: "100%",
-    autoClosable: true
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: precls
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(precls, "__app-list")
-  }, apps.length > 0 && apps.map(function (app) {
+  var renderAppItem = function renderAppItem(app) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(precls, "__app-item ").concat(precls, "__app-item--").concat(app.code),
       onClick: function onClick() {
@@ -186,6 +208,33 @@ var AppCenter = function AppCenter(props) {
     }, app.title), isTrial && /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(precls, "__app-item-sub-title")
     }, app.subTitle)));
+  };
+
+  return /*#__PURE__*/_react["default"].createElement(_drawer["default"], {
+    className: "".concat(precls, "__drawer"),
+    placement: "top",
+    onClose: closeAppCenter,
+    visible: appCenterVisible,
+    width: "100%",
+    autoClosable: true
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: precls
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(precls, "__app-list")
+  }, apps.length > 0 && apps.map(function (app) {
+    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+      condition: app.code === 'summary'
+    }, /*#__PURE__*/_react["default"].createElement(_guideTip["default"], {
+      visible: summaryGuideVisible,
+      content: /*#__PURE__*/_react["default"].createElement("span", {
+        className: "".concat(precls, "__app-guide-content")
+      }, (0, _bsGlobal.hasWebHead)('okr') ? '🎉 总结升级！全新推出 OKR 总结模版，用总结来实现 OKR闭环！' : '总结升级！查看总结与书写总结都更加轻便啦！'),
+      type: 'button',
+      classnames: "".concat(precls, "__app-guide"),
+      onClickClose: handleCloseSummaryGuide
+    }, renderAppItem(app))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+      condition: app.code !== 'summary'
+    }, renderAppItem(app)));
   }), new Array(20).fill(1).map(function () {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(precls, "__app-item-placeholder")

package/lib/components/picker/components/panels/year-panel/index.js

@@ -1,13 +1,11 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
@@ -23,10 +21,6 @@ require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-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 _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 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; }
@@ -35,28 +29,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 _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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 var YearPanel = function YearPanel(props) {
   var onViewDateChange = props.onViewDateChange,
       viewDate = props.viewDate;
-
-  var _useState = (0, _react.useState)(),
-      _useState2 = _slicedToArray(_useState, 2),
-      newViewDate = _useState2[0],
-      setNewViewDate = _useState2[1];
-
-  var yearNumber = (0, _moment["default"])(newViewDate).year();
+  var yearNumber = (0, _moment["default"])(viewDate).year();
 
   var startYear = Math.floor(yearNumber / _utils.YEAR_DECADE_COUNT) * _utils.YEAR_DECADE_COUNT;
 
@@ -64,7 +40,7 @@ var YearPanel = function YearPanel(props) {
 
   var onDecadeYearChange = function onDecadeYearChange(diff) {
     if (onViewDateChange) {
-      onViewDateChange((0, _moment["default"])(newViewDate).add(diff, 'y'));
+      onViewDateChange((0, _moment["default"])(viewDate).add(diff, 'y'));
     }
   };
 
@@ -73,13 +49,6 @@ var YearPanel = function YearPanel(props) {
     endYear: endYear
   }));
 
-  (0, _react.useEffect)(function () {
-    if (typeof viewDate === 'string') {
-      setNewViewDate(viewDate.split('~')[0]);
-    } else {
-      setNewViewDate(viewDate);
-    }
-  }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_utils.PickerPanelClass, "__year"))
   }, /*#__PURE__*/_react["default"].createElement(_yearHead["default"], _extends({}, extendProps, {

package/lib/components/rate/index.css

@@ -30,7 +30,7 @@
   margin: 0;
   padding: 0;
   display: inline-block;
-  margin-right: 8px;
+  margin-right: 4px;
   position: relative;
   transition: all 0.3s;
   color: #dfe3ea;

package/lib/utils/auth.js

@@ -67,6 +67,11 @@ var BaseAuth = /*#__PURE__*/function () {
     value: function isDepartmentLeader() {
       return !this.loginUserInfor.IsBoss && this.loginUserInfor.IsLeader;
     }
+  }, {
+    key: "isHrbp",
+    value: function isHrbp() {
+      return !this.loginUserInfor.IsBoss && this.loginUserInfor.IsHrbp;
+    }
   }, {
     key: "isPlanDailyManager",
     value: function isPlanDailyManager() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.12.55",
+  "version": "1.12.57-beta.2",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",
@@ -78,7 +78,7 @@
     "@titaui/rc-trigger": "5.2.5",
     "@titaui/react-flow-renderer": "9.5.4",
     "@titaui/request": "^1.0.1",
-    "@titaui/rich-editor": "0.1.53",
+    "@titaui/rich-editor": "0.1.56",
     "@titaui/toast": "1.0.0",
     "@types/color": "3.0.3",
     "@types/prosemirror-commands": "1.0.4",