@titaui/pc 1.15.77-beta.2 → 1.15.77-beta.5

package/lib/components/okr-detail/base-info/other-infos/principal/index.js

@@ -176,6 +176,9 @@ var Principal = function Principal(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_avatar["default"].Name, {
     showNameTips: true,
     textWidth: 317,
+    style: {
+      minWidth: '24px'
+    },
     size: {
       width: 24,
       textNum: 1,

package/lib/components/okr-detail/components/okr-tree/tree-node/e-kr-node/index.js

@@ -92,7 +92,7 @@ var EKrNode = function EKrNode(props) {
   var onlySuperCreateWork = (_window = window) === null || _window === void 0 ? void 0 : (_window$BSGlobal = _window.BSGlobal) === null || _window$BSGlobal === void 0 ? void 0 : (_window$BSGlobal$Work = _window$BSGlobal.WorkAdvancedSetting) === null || _window$BSGlobal$Work === void 0 ? void 0 : (_window$BSGlobal$Work2 = _window$BSGlobal$Work.WorkFunctionSetting) === null || _window$BSGlobal$Work2 === void 0 ? void 0 : _window$BSGlobal$Work2.WorkCreate; //开启后，仅超管、目标管理员、老板/助理可创建项目
 
   var canCreateWork = baseAuth.isBoss() || baseAuth.isManager() || baseAuth.isWorkManager() || baseAuth.isAssistant() || !onlySuperCreateWork;
-  var isParticipant = ((_okrInfo$authority = okrInfo.authority) === null || _okrInfo$authority === void 0 ? void 0 : _okrInfo$authority.roleRelation) && okrInfo.authority.roleRelation.roleType === 2;
+  var isParticipant = ((_okrInfo$authority = okrInfo.authority) === null || _okrInfo$authority === void 0 ? void 0 : _okrInfo$authority.roleRelation) && okrInfo.authority.roleRelation.roleType === 2 || okrInfo.isParticipant || data.isParticipant;
   var hasRelativeAuth;
 
   if (isOTask) {

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

@@ -430,7 +430,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         onCreateKr: function onCreateKr() {
           return setCreateKrShow(true);
         },
-        canEditOkr: canEditOkr || isInnerUser,
+        canEditOkr: canEditOkr || isInnerUser || okrInfo.isParticipant,
         style: isShowAlignOkr ? {
           padding: '40px 0 24px 0'
         } : {
@@ -449,7 +449,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       okrInfo: okrInfo,
       draggable: canEditOkr && (okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState) !== _helper.EApproveStatus.UnderApproval,
       onDrop: onOkrItemDropHandler
-    }))), (canEditOkr || isInnerUser) && (0, _helper.getApprovalOkr)(approvalSetting, 'createOkr', okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes) && /*#__PURE__*/_react["default"].createElement("div", {
+    }))), (canEditOkr || isInnerUser || okrInfo.isParticipant) && (0, _helper.getApprovalOkr)(approvalSetting, 'createOkr', okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes) && /*#__PURE__*/_react["default"].createElement("div", {
       ref: wrapperRef,
       className: (0, _classnames["default"])("".concat(preCls, "__addkr"))
     }, /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], null, createKrShow ? /*#__PURE__*/_react["default"].createElement(_createKrItem["default"], {

package/lib/components/okr-detail/schedule/components/o-progress/index.js

@@ -82,10 +82,10 @@ var OProgress = function OProgress(_ref) {
       isPrincipalUser = _useState4[0],
       setIsPrincipalUser = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(new _auth.OAuth({
+  var _useState5 = (0, _react.useState)((new _auth.OAuth({
     principalUser: generalPrincipalUser,
     createUserId: okrInfo.createUserId
-  }).hasAuth() && okrInfo.status !== 2),
+  }).hasAuth() || okrInfo.isParticipant) && okrInfo.status !== 2),
       _useState6 = _slicedToArray(_useState5, 2),
       isCanEditProgress = _useState6[0],
       setIsCanEditProgress = _useState6[1];
@@ -240,10 +240,10 @@ var OProgress = function OProgress(_ref) {
   }, []);
   (0, _react.useEffect)(function () {
     setIsPrincipalUser((0, _util.isPrincipal)(generalPrincipalUser));
-    setIsCanEditProgress(new _auth.OAuth({
+    setIsCanEditProgress((new _auth.OAuth({
       principalUser: generalPrincipalUser,
       createUserId: okrInfo.createUserId
-    }).hasAuth() && okrInfo.status !== 2);
+    }).hasAuth() || okrInfo.isParticipant) && okrInfo.status !== 2);
   }, [generalPrincipalUser]);
   (0, _react.useEffect)(function () {
     // @ts-ignore
@@ -296,14 +296,14 @@ var OProgress = function OProgress(_ref) {
       src: _scheduleEmpty["default"]
     }), /*#__PURE__*/_react["default"].createElement("span", {
       className: "o-progress__empty-text"
-    }, isPrincipalUser ? (0, _getLocale.getLocale)('OKR_MyO_KRP_tochecko') : (0, _getLocale.getLocale)('OKR_MyO_Pr_Text_Nooprogress')), isPrincipalUser && /*#__PURE__*/_react["default"].createElement(_oProgressUpdate["default"], {
+    }, isPrincipalUser ? (0, _getLocale.getLocale)('OKR_MyO_KRP_tochecko') : (0, _getLocale.getLocale)('OKR_MyO_Pr_Text_Nooprogress')), (isPrincipalUser || okrInfo.isParticipant) && /*#__PURE__*/_react["default"].createElement(_oProgressUpdate["default"], {
       okrInfo: okrInfo,
       renderContent: renderUpdateBtn,
       setUpdateData: setUpdateProgress
     }), !isCanEditProgress && /*#__PURE__*/_react["default"].createElement("button", {
       className: "o-progress__empty-button",
       onClick: handleRemindClick
-    }, (0, _getLocale.getLocale)('OKR_MyO_Pr_Butt_Reminder')), isCanEditProgress && !isPrincipalUser && /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("button", {
+    }, (0, _getLocale.getLocale)('OKR_MyO_Pr_Butt_Reminder')), isCanEditProgress && !isPrincipalUser && !okrInfo.isParticipant && /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("button", {
       className: "o-progress__empty-button",
       onClick: handleRemindClick
     }, (0, _getLocale.getLocale)('OKR_MyO_Pr_Butt_Reminder')), /*#__PURE__*/_react["default"].createElement(_oProgressUpdate["default"], {
@@ -313,7 +313,7 @@ var OProgress = function OProgress(_ref) {
     })));
   }, [hasOtherProgress]);
   var renderDefaultRemindCmp = (0, _react.useMemo)(function () {
-    var text = isPrincipalUser ? (0, _auth.hasSuperior)() ? (0, _getLocale.getLocale)('OKR_MyO_Prog_Butt_Remind') : null : (0, _getLocale.getLocale)('OKR_MyO_Pr_Butt_Reminder');
+    var text = isPrincipalUser ? (0, _auth.hasSuperior)() ? (0, _getLocale.getLocale)('OKR_MyO_Prog_Butt_Remind') : null : okrInfo.isParticipant ? '' : (0, _getLocale.getLocale)('OKR_MyO_Pr_Butt_Reminder');
     return /*#__PURE__*/_react["default"].createElement("span", {
       className: "o-progress__func-btn",
       onClick: handleRemindClick

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.15.77-beta.2",
+  "version": "1.15.77-beta.5",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",