@titaui/pc 1.10.82-beta.18 → 1.10.82-beta.19

package/lib/components/avatar/name-avatar/index.css

@@ -55,4 +55,5 @@
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   color: #6F7886;
   line-height: 20px;
+  margin-left: 4px;
 }

package/lib/components/avatar/name-avatar/index.js

@@ -58,7 +58,10 @@ var NameAvatar = function NameAvatar(props) {
       onDelUser = props.onDelUser,
       _props$textWidth = props.textWidth,
       textWidth = _props$textWidth === void 0 ? 42 : _props$textWidth,
-      textClass = props.textClass;
+      textClass = props.textClass,
+      renderRightTopCmp = props.renderRightTopCmp,
+      _props$avatarTips = props.avatarTips,
+      avatarTips = _props$avatarTips === void 0 ? '' : _props$avatarTips;
   var hasAvatar = src && !src.match(/default\w*.jpg$/);
 
   var _useState = (0, _react.useState)(false),
@@ -103,7 +106,7 @@ var NameAvatar = function NameAvatar(props) {
       style: {
         width: size.width,
         height: size.width,
-        verticalAlign: "top"
+        verticalAlign: 'top'
       },
       src: src
     });
@@ -120,11 +123,11 @@ var NameAvatar = function NameAvatar(props) {
         }
       }, /*#__PURE__*/_react["default"].createElement("div", {
         style: {
-          display: "inline-block",
+          display: 'inline-block',
           width: "".concat(size.fontSize, "px"),
-          margin: "0 auto",
-          overflow: "hidden",
-          whiteSpace: "nowrap",
+          margin: '0 auto',
+          overflow: 'hidden',
+          whiteSpace: 'nowrap',
           fontSize: "".concat(size.fontSize, "px"),
           lineHeight: "".concat(size.width, "px")
         }
@@ -134,7 +137,7 @@ var NameAvatar = function NameAvatar(props) {
       })));
     }
 
-    var cuttedName = "";
+    var cuttedName = '';
     var cuttedNameLen = 0;
 
     for (var i = 0, lent = name.length; i < lent; i++) {
@@ -167,11 +170,11 @@ var NameAvatar = function NameAvatar(props) {
     className: "titaui-pc-avator__name-avatar-container",
     onMouseEnter: handleMouseEnter,
     onMouseLeave: handleMouseLeave
-  }, /*#__PURE__*/_react["default"].createElement("div", {
+  }, renderRightTopCmp, /*#__PURE__*/_react["default"].createElement("div", {
     onClick: handleDelUser,
     onMouseLeave: handleCloseIconMouseLeave,
     onMouseEnter: handleCloseIconMouseEnter,
-    className: "titaui-pc-avator__delete-wrapper ".concat(canDelUser && mouseIsEnterUser ? "titaui-pc-avator--enter" : ""),
+    className: "titaui-pc-avator__delete-wrapper ".concat(canDelUser && mouseIsEnterUser ? 'titaui-pc-avator--enter' : ''),
     style: {
       left: "".concat(size.width - 14, "px")
     }
@@ -185,7 +188,10 @@ var NameAvatar = function NameAvatar(props) {
     onClick: onClick,
     onMouseEnter: onMouseEnter,
     onMouseLeave: onMouseLeave
-  }, hasAvatar ? renderImgAvatar() : renderTextAvatar()), showNameTips && isNameOverflow ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  }, avatarTips && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+    overlay: avatarTips,
+    placement: "top"
+  }, hasAvatar ? renderImgAvatar() : renderTextAvatar()), !avatarTips && (hasAvatar ? renderImgAvatar() : renderTextAvatar())), showNameTips && isNameOverflow ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     overlay: /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
       name: name,
       id: userId
@@ -194,14 +200,17 @@ var NameAvatar = function NameAvatar(props) {
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "titaui-pc-avator__name ".concat(textClass),
     style: {
-      width: textWidth
+      maxWidth: textWidth
     }
   }, /*#__PURE__*/_react["default"].createElement("span", {
     ref: textRef
-  }, name))) : /*#__PURE__*/_react["default"].createElement("span", {
+  }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+    name: name,
+    id: userId
+  })))) : /*#__PURE__*/_react["default"].createElement("span", {
     className: "titaui-pc-avator__name ".concat(textClass),
     style: {
-      width: textWidth
+      maxWidth: textWidth
     }
   }, /*#__PURE__*/_react["default"].createElement("span", {
     ref: textRef

package/lib/components/drawer/index.css

@@ -48,6 +48,17 @@
   background: linear-gradient(180deg, rgba(191, 199, 213, 0) 0%, #BFC7D5 50%, rgba(240, 242, 245, 0) 100%);
 }
 
+.titaui-drawer-header-status {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 16px;
+  width: 68px;
+  height: 28px;
+  margin-right: 18px;
+  font-size: 12px;
+}
+
 .titaui-drawer-header-action {
   font-size: 18px;
   color: #a4acb9;

package/lib/components/drawer/index.js

@@ -141,6 +141,7 @@ function DrawerHeader(_ref) {
       content = _ref.content,
       style = _ref.style,
       onClose = _ref.onClose,
+      status = _ref.status,
       actionComponent = _ref.actionComponent;
   var drawer = (0, _react.useContext)(DrawerContext);
   var manager = (0, _react.useContext)(_context["default"]);
@@ -170,7 +171,13 @@ function DrawerHeader(_ref) {
     style: {
       flex: 1
     }
-  }), /*#__PURE__*/_react["default"].createElement("div", null, actionComponent), displayActions.map(function (action) {
+  }), /*#__PURE__*/_react["default"].createElement("div", null, actionComponent), status && status.color && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "titaui-drawer-header-status",
+    style: {
+      color: status.color.color,
+      backgroundColor: status.color.bgColor
+    }
+  }, status.title), displayActions.map(function (action) {
     return /*#__PURE__*/_react["default"].createElement(_headerAction["default"], action);
   }), !!collapsedActions.length && /*#__PURE__*/_react["default"].createElement(_headerAction["default"], {
     title: (0, _getLocale.getLocale)('Mod_MoreOperate'),

package/lib/components/e-priority/index.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = _default;
+exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -37,7 +37,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var preCls = "tita-okrdt-tree";
 
-function _default(props) {
+var EPriority = function EPriority(props) {
   var onChange = props.onChange,
       checked = props.checked,
       hasAuth = props.hasAuth,
@@ -50,7 +50,10 @@ function _default(props) {
 
   var onMenuClickHandler = function onMenuClickHandler(name) {
     setLevel(name);
-    onChange && onChange(name);
+
+    if (onChange) {
+      onChange(name);
+    }
   };
 
   (0, _react.useEffect)(function () {
@@ -72,7 +75,7 @@ function _default(props) {
     name: "2"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(preCls, "__e-task-node-priority-p2 ").concat(preCls, "__e-task-node-select-priority"))
-  }), (0, _getLocale.getLocale)("OKR_MyO_E_Butt_Highest")), /*#__PURE__*/_react["default"].createElement(_dropSelector["default"].IconItem, {
+  }), (0, _getLocale.getLocale)("OKR_MyO_E_Butt_High")), /*#__PURE__*/_react["default"].createElement(_dropSelector["default"].IconItem, {
     name: "3"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(preCls, "__e-task-node-priority-p3 ").concat(preCls, "__e-task-node-select-priority"))
@@ -85,4 +88,7 @@ function _default(props) {
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(preCls, "__e-task-node-priority-p5 ").concat(preCls, "__e-task-node-select-priority"))
   }), (0, _getLocale.getLocale)("OKR_MyO_E_Butt_Verylow")));
-}
+};
+
+var _default = EPriority;
+exports["default"] = _default;

package/lib/components/okr-detail/detail-header/constant.js

@@ -0,0 +1,53 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getApproveStatusTextMap = exports.ApproveStatusColor = exports.ApproveStatus = void 0;
+
+var _getLocale = require("../../../utils/getLocale");
+
+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; }
+
+var ApproveStatus;
+exports.ApproveStatus = ApproveStatus;
+
+(function (ApproveStatus) {
+  ApproveStatus[ApproveStatus["None"] = 0] = "None";
+  ApproveStatus[ApproveStatus["WaitCommit"] = 6] = "WaitCommit";
+  ApproveStatus[ApproveStatus["Rejected"] = 3] = "Rejected";
+  ApproveStatus[ApproveStatus["UnderApproval"] = 1] = "UnderApproval";
+  ApproveStatus[ApproveStatus["ApproveAgree"] = 2] = "ApproveAgree";
+  ApproveStatus[ApproveStatus["WithDraw"] = 4] = "WithDraw";
+  ApproveStatus[ApproveStatus["Done"] = 5] = "Done";
+})(ApproveStatus || (exports.ApproveStatus = ApproveStatus = {}));
+
+var getApproveStatusTextMap = function getApproveStatusTextMap(status) {
+  var _ApproveStatusTextMap;
+
+  var ApproveStatusTextMap = (_ApproveStatusTextMap = {}, _defineProperty(_ApproveStatusTextMap, ApproveStatus.WaitCommit, (0, _getLocale.getLocale)('OKR_MyO_Tobesubmitted')), _defineProperty(_ApproveStatusTextMap, ApproveStatus.Rejected, (0, _getLocale.getLocale)('OKR_MyO_Tobesubmitted')), _defineProperty(_ApproveStatusTextMap, ApproveStatus.UnderApproval, (0, _getLocale.getLocale)('Pro_detail_Approval')), _defineProperty(_ApproveStatusTextMap, ApproveStatus.ApproveAgree, ''), _defineProperty(_ApproveStatusTextMap, ApproveStatus.WithDraw, ''), _defineProperty(_ApproveStatusTextMap, ApproveStatus.None, ''), _defineProperty(_ApproveStatusTextMap, ApproveStatus.Done, ''), _ApproveStatusTextMap);
+  return ApproveStatusTextMap[status];
+};
+
+exports.getApproveStatusTextMap = getApproveStatusTextMap;
+
+var ApproveStatusColor = function ApproveStatusColor(status) {
+  var _ApprovalStatusColorM;
+
+  var ApprovalStatusColorMap = (_ApprovalStatusColorM = {}, _defineProperty(_ApprovalStatusColorM, ApproveStatus.WaitCommit, {
+    color: '#F0A326',
+    bgColor: 'rgba(240, 163, 38, 0.1)'
+  }), _defineProperty(_ApprovalStatusColorM, ApproveStatus.Rejected, {
+    color: '#F0A326',
+    bgColor: 'rgba(240, 163, 38, 0.1)'
+  }), _defineProperty(_ApprovalStatusColorM, ApproveStatus.UnderApproval, {
+    color: '#2879FF',
+    bgColor: 'rgba(40, 121, 255, 0.1)'
+  }), _defineProperty(_ApprovalStatusColorM, ApproveStatus.ApproveAgree, {
+    color: '#ffffff',
+    bgColor: '#ffffff'
+  }), _ApprovalStatusColorM);
+  return ApprovalStatusColorMap[status];
+};
+
+exports.ApproveStatusColor = ApproveStatusColor;

package/lib/components/okr-detail/detail-header/index.js

@@ -29,6 +29,8 @@ var _okrShare = _interopRequireDefault(require("../../okr-share"));
 
 var _context7 = require("../context");
 
+var _constant = require("./constant");
+
 var _deleteConfirm = _interopRequireDefault(require("./delete-confirm/delete-confirm"));
 
 var _drawerManager = _interopRequireDefault(require("../../drawer-manager"));
@@ -85,6 +87,7 @@ function OkrDetailHeader(_ref) {
   var loginUserId = window.BSGlobal.loginUserInfo.Id;
   var context = (0, _react.useContext)(_context7.GeneralDataContext);
   var commonContext = (0, _react.useContext)(_context7.CommonContext);
+  var approveStatusColor = (0, _constant.ApproveStatusColor)(detailInfo.applyStatus);
   var changVisiblity = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(workId, visibility) {
       var visibilityScope,
@@ -366,6 +369,7 @@ function OkrDetailHeader(_ref) {
     }
   }
 
+  (0, _react.useEffect)(function () {}, []);
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_drawer["default"].Header, {
     actions: actions,
     actionComponent: /*#__PURE__*/_react["default"].createElement(_wechatBtn["default"], {
@@ -386,7 +390,11 @@ function OkrDetailHeader(_ref) {
           krId: parent.id
         });
       }
-    }, /*#__PURE__*/_react["default"].createElement("span", null, parent.type === 'okr' ? 'O ' : 'KR '), parent.name)) : null
+    }, /*#__PURE__*/_react["default"].createElement("span", null, parent.type === 'okr' ? 'O ' : 'KR '), parent.name)) : null,
+    status: {
+      title: (0, _constant.getApproveStatusTextMap)(detailInfo.applyStatus),
+      color: approveStatusColor
+    }
   }), /*#__PURE__*/_react["default"].createElement(_okrShare["default"], {
     visible: shareVisible,
     onClose: closeShareModal,

package/lib/components/textarea/index.css

@@ -1,4 +1,4 @@
-.inputWrapper {
+.titaui-textArea {
   box-sizing: border-box;
   position: relative;
   min-height: 36px;
@@ -11,15 +11,15 @@
   transition: border 0.2s ease 0.2s, box-shadow 0.2s ease 0.2s;
 }
 
-.inputWrapper.has-error {
+.titaui-textArea.has-error {
   border: 1px solid #f05e5e !important;
 }
 
-.inputWrapper:hover {
+.titaui-textArea:hover {
   border: 1px solid #2879ff;
 }
 
-.inputWrapper > input {
+.titaui-textArea > input {
   flex-grow: 1;
   border: none;
   padding: 0 12px;
@@ -31,19 +31,19 @@
   color: #3f4755;
 }
 
-.inputWrapper > input ::-webkit-input-placeholder {
+.titaui-textArea > input ::-webkit-input-placeholder {
   color: #bfc7d5;
 }
 
-.inputWrapper > input :-ms-input-placeholder {
+.titaui-textArea > input :-ms-input-placeholder {
   color: #bfc7d5;
 }
 
-.inputWrapper > input :-moz-input-placeholder {
+.titaui-textArea > input :-moz-input-placeholder {
   color: #bfc7d5;
 }
 
-.inputWrapper textarea {
+.titaui-textArea textarea {
   flex: 1;
   line-height: 20px;
   min-height: 20px;
@@ -60,32 +60,32 @@
   word-break: break-all;
 }
 
-.inputWrapper textarea ::-webkit-input-placeholder {
+.titaui-textArea textarea ::-webkit-input-placeholder {
   color: #bfc7d5;
 }
 
-.inputWrapper textarea :-ms-input-placeholder {
+.titaui-textArea textarea :-ms-input-placeholder {
   color: #bfc7d5;
 }
 
-.inputWrapper textarea :-moz-input-placeholder {
+.titaui-textArea textarea :-moz-input-placeholder {
   color: #bfc7d5;
 }
 
-.inputWrapper.disabled {
+.titaui-textArea.disabled {
   background-color: rgba(240, 242, 245, 0.4);
   border-color: #f0f2f5;
   color: #bfc7d5;
   cursor: default;
 }
 
-.inputWrapper.disabled > input,
-    .inputWrapper.disabled textarea,
-    .inputWrapper.disabled .tail-wrapper {
+.titaui-textArea.disabled > input,
+    .titaui-textArea.disabled textarea,
+    .titaui-textArea.disabled .tail-wrapper {
   color: #bfc7d5;
 }
 
-.inputWrapper.disabled:hover {
+.titaui-textArea.disabled:hover {
   border-color: #f0f2f5;
 }
 

package/lib/components/textarea/index.js

@@ -61,7 +61,7 @@ var Textarea = function Textarea(p) {
       _onKeyDown = p.onKeyDown,
       others = _objectWithoutProperties(p, _excluded);
 
-  var prefixCls = "inputWrapper";
+  var prefixCls = "titaui-textArea";
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),

package/lib/pages/new-okr-list/list/index.js

@@ -1,13 +1,19 @@
 "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 = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+
+var _context = require("../context");
+
+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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -31,8 +37,19 @@ function List(props) {
       refreshList = props.refreshList,
       replaceOkr = props.replaceOkr;
   var OkrListCmp = props.OkrListCmp;
+
+  var _useContext = (0, _react.useContext)(_context.Context),
+      annualNum = _useContext.annualNum,
+      cycleType = _useContext.cycleType,
+      yqmNum = _useContext.yqmNum;
+
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(OkrListCmp, {
     okrData: okrs,
+    cycle: {
+      annualNum: annualNum,
+      cycleType: cycleType,
+      yqmNum: yqmNum
+    },
     addOkr: function addOkr(okr) {
       setOkrs([].concat(_toConsumableArray(okrs), [okr]));
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.10.82-beta.18",
+  "version": "1.10.82-beta.19",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",