@titaui/pc 1.15.76 → 1.15.77-beta.3

package/lib/components/okr-detail/base-info/base-info.js

@@ -387,8 +387,7 @@ var BaseInfo = function BaseInfo(_ref) {
   }, [generalPrincipalUser, okrInfo]); // 判断是否有权限和是否上面可编辑
 
   (0, _react.useEffect)(function () {
-    var inParticipant = (0, _util.findUser)(participant, loginUser.Id);
-    var canEditParticipantAndFollowers = canEditAllInfo || inParticipant;
+    var canEditParticipantAndFollowers = canEditAllInfo || okrInfo.isParticipant;
     setCanEditPerson(!!canEditParticipantAndFollowers);
   }, [participant, canEditAllInfo]);
   (0, _react.useEffect)(function () {
@@ -456,13 +455,13 @@ var BaseInfo = function BaseInfo(_ref) {
     visiableLimit: generalVisibility.visibilityScope,
     canEdit: canEditAllInfo,
     okrId: okrId
-  })), !canEditPerson && !canEditAllInfo && participant.length === 0 && followers.length === 0 ? null : /*#__PURE__*/_react["default"].createElement("div", {
+  })), !canEditPerson && !okrInfo.isParticipant && !canEditAllInfo && participant.length === 0 && followers.length === 0 ? null : /*#__PURE__*/_react["default"].createElement("div", {
     className: "base-info__divider"
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "base-info__participant-followers-wrapper"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "base-info__person-block"
-  }, !canEditPerson && !canEditAllInfo && participant.length === 0 ? null : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
+  }, !canEditPerson && !canEditAllInfo && !okrInfo.isParticipant && participant.length === 0 ? null : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
     className: "base-info__person-block-title"
   }, (0, _getLocale.getLocale)("Mod_Participants")), /*#__PURE__*/_react["default"].createElement(_person["default"], {
     users: participant,

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/header/index.js

@@ -110,6 +110,8 @@ function Header(props) {
   }, [generalPrincipalUser]);
   var editable = auth && okrInfo.status == 1; // 有权限 && 进行中
 
+  var progressEdit = (auth || okrInfo.isParticipant) && okrInfo.status == 1;
+
   var renderContent = function renderContent(_ref) {
     var onOpenModal = _ref.onOpenModal;
 
@@ -120,7 +122,7 @@ function Header(props) {
       color: okrInfo.status === 2 ? 'linear-gradient(270deg, #BFC7D5, #E1E5EC)' : _utils.OkrRiskMapping[okrInfo.manualRiskLevel].line
     });
 
-    if (!editable) {
+    if (!progressEdit) {
       return /*#__PURE__*/_react["default"].createElement("span", {
         className: "okr-drawer-header__action-progress"
       }, progressCmp, progressGrow !== 0 && /*#__PURE__*/_react["default"].createElement("span", {

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;
   var hasRelativeAuth;
 
   if (isOTask) {

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

@@ -191,6 +191,7 @@ function _default(props) {
       _useState26 = _slicedToArray(_useState25, 1),
       krCanEdit = _useState26[0];
 
+  var progressEdit = okrInfo.isParticipant || data.isParticipant || krCanEdit;
   var mentionInputRef = (0, _react.useRef)();
   (0, _react.useEffect)(function () {
     setKrNameData({
@@ -363,7 +364,7 @@ function _default(props) {
   };
 
   var onPrograssEditHandler = function onPrograssEditHandler() {
-    if (!krCanEdit) return;
+    if (!progressEdit) return;
     setKrModalVsible(true);
   };
 

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/order-have-award/index.js

@@ -68,7 +68,7 @@ var OrderAward = function OrderAward() {
     }
   };
 
-  if (!noshowChangeVersion) return null;
+  if (noshowChangeVersion) return null;
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])('order-have-award'),
     onClick: handlePoint

package/package.json

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