@titaui/pc 1.15.84 → 1.15.87

package/lib/components/menus/components/menu-tree/tree-node/index.css

@@ -1,3 +1,7 @@
+.titaui-menus-tree__guide-content {
+  color: #fff;
+}
+
 .titaui-menus-tree__group-name-node {
   display: flex;
   align-items: center;

package/lib/components/menus/components/menu-tree/tree-node/sub-menu-item.js

@@ -1,30 +1,87 @@
 "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"] = _default;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _guideTip = _interopRequireDefault(require("../../../../guide-tip"));
+
+var _requestApis = require("../../../request-apis");
+
 var _precls = _interopRequireDefault(require("../precls"));
 
 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 _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; }
+
 function _default(props) {
   var data = props.data,
       level = props.level;
 
+  var _useState = (0, _react.useState)(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      guideVisible = _useState2[0],
+      setGuideVisible = _useState2[1];
+
   var onNodeClickHandler = function onNodeClickHandler() {
     if (data.href) {
       window.location.href = data.href;
     }
   };
 
+  (0, _react.useEffect)(function () {
+    if (!data.moduleType) return; // 注意要用这个的话要和后端商量类型，也可以换成本地存储
+
+    (0, _requestApis.getUserGuidSetting)(data.moduleType).then(function (res) {
+      setGuideVisible(!res.Data.isHasGuided);
+    });
+  }, []);
+
+  var handleCloseGuide = function handleCloseGuide() {};
+
+  if (data.guideTip) return /*#__PURE__*/_react["default"].createElement(_guideTip["default"], {
+    visible: guideVisible,
+    content: /*#__PURE__*/_react["default"].createElement("span", {
+      className: "".concat(_precls["default"], "__guide-content")
+    }, data.guideTip),
+    popupPlacement: "right",
+    classnames: "".concat(_precls["default"], "__guide"),
+    onClickClose: handleCloseGuide,
+    width: 220
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__sub-menu-item-node")),
+    onClick: onNodeClickHandler,
+    title: ""
+  }, level > 0 && /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__sub-menu-item-node-indent"))
+  }), data.icon && /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__sub-menu-item-node-icon"), data.icon)
+  }), /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__sub-menu-item-node-title"), "noselect")
+  }, props.title)));
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__sub-menu-item-node")),
     onClick: onNodeClickHandler,

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

@@ -93,7 +93,9 @@ var okrMenus = /*#__PURE__*/function () {
         icon: '',
         label: _i18n.locale.menu_participated,
         key: PAGE_MY_PART_OKR,
-        href: '#/okr/manage?relation=2'
+        href: '#/okr/manage?relation=2',
+        guideTip: '「我参与的」频道中可查看目标名称中@我的  OKR',
+        moduleType: 62
       }, {
         icon: '',
         label: _i18n.locale.menu_concerned,

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.removeSummaryFollower = exports.removeFollower = exports.getTongjiUsersData = exports.getSummaryFollowerList = exports.getSubordinates = exports.getShareUsersData = exports.getMyDepartMent = exports.getFollowerList = exports.getDepsAndUsers = exports.addSummaryFollower = exports.addFollower = void 0;
+exports.removeSummaryFollower = exports.removeFollower = exports.getUserGuidSetting = exports.getTongjiUsersData = exports.getSummaryFollowerList = exports.getSubordinates = exports.getShareUsersData = exports.getMyDepartMent = exports.getFollowerList = exports.getDepsAndUsers = exports.addSummaryFollower = exports.addFollower = void 0;
 
 var _axios = _interopRequireDefault(require("axios"));
 
@@ -33,6 +33,12 @@ var requestDomain = function requestDomain() {
   return "".concat(location.protocol, "//www.tita.gift");
 };
 
+var getUserGuidSetting = function getUserGuidSetting(moduleType) {
+  return (0, _request.rpost)("v1")("guidPage/getUserGuidSetting?moduleType=".concat(moduleType));
+};
+
+exports.getUserGuidSetting = getUserGuidSetting;
+
 var getFollowerList = function getFollowerList() {
   return _axios["default"].get("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/follow/followerList")).then(function (res) {
     return res.data.Data;

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

@@ -82,9 +82,9 @@ var BaseInfo = function BaseInfo(_ref) {
       okrInfo = _useContext2.okrInfo,
       setOkrInfo = _useContext2.setOkrInfo;
 
-  var originDesc = decodeURI(encodeURI(okrInfo.description)) === "null" ? "" : decodeURI(encodeURI(okrInfo.description));
+  var originDesc = decodeURI(encodeURI(okrInfo.description)) === 'null' ? '' : decodeURI(encodeURI(okrInfo.description));
 
-  var _useState = (0, _react.useState)(originDesc || ""),
+  var _useState = (0, _react.useState)(originDesc || ''),
       _useState2 = _slicedToArray(_useState, 2),
       originalDesc = _useState2[0],
       setOriginalDesc = _useState2[1];
@@ -148,7 +148,7 @@ var BaseInfo = function BaseInfo(_ref) {
     if (desc.trim().length > 5000) return;
     (0, _requestApis.saveODesc)(okrInfo.workId, desc).then(function (resp) {
       if (resp.Code === 1) {
-        _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
+        _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'), {
           canClose: false
         });
 
@@ -156,7 +156,7 @@ var BaseInfo = function BaseInfo(_ref) {
           description: desc
         }));
       } else {
-        _toast["default"].Error("操作失败", {
+        _toast["default"].Error('操作失败', {
           canClose: false
         });
       }
@@ -165,7 +165,7 @@ var BaseInfo = function BaseInfo(_ref) {
   var handleChangePrincipalUser = (0, _react.useCallback)(function (user) {
     (0, _requestApis.transferPrincipal)(okrInfo.workId, user.email, user.id).then(function (resp) {
       if (resp.Code === 1) {
-        _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
+        _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'), {
           canClose: false
         });
 
@@ -208,7 +208,7 @@ var BaseInfo = function BaseInfo(_ref) {
   var handleChangeClassify = (0, _react.useCallback)(function (classify) {
     (0, _requestApis.updateOClassify)(classify, okrInfo.workId).then(function (resp) {
       if (resp.Code === 1) {
-        _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
+        _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'), {
           canClose: false
         });
 
@@ -232,7 +232,7 @@ var BaseInfo = function BaseInfo(_ref) {
     });
     (0, _requestApis.updateVisibility)(okrInfo.workId, visiableValue, areaUserIds, areaOrgIds, areaGroupIds).then(function (resp) {
       if (resp.Code === 1) {
-        _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
+        _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'), {
           canClose: false
         });
 
@@ -267,15 +267,15 @@ var BaseInfo = function BaseInfo(_ref) {
         Email: "".concat(group.name, ":").concat(group.id, ":group_members_")
       });
     });
-    (0, _requestApis.addUserRelation)(okrInfo.workId, type === "participant" ? 2 : 3, reqData).then(function (resp) {
+    (0, _requestApis.addUserRelation)(okrInfo.workId, type === 'participant' ? 2 : 3, reqData).then(function (resp) {
       if (resp.Code === 1) {
         if (data.userId === loginUser.Id) {
-          setGeneralRoleType(type === "participant" ? 2 : 3);
+          setGeneralRoleType(type === 'participant' ? 2 : 3);
         } else {
           setGeneralRoleType(generalRoleType);
         }
 
-        if (type === "participant") {
+        if (type === 'participant') {
           setParticipant([].concat(_toConsumableArray(participant), _toConsumableArray(resp.Data.map(function (item) {
             return {
               name: item.name,
@@ -304,7 +304,7 @@ var BaseInfo = function BaseInfo(_ref) {
         }
       } else {
         // 不这样添加会导致添加已添加的相关人员时选人组件不会清空上次的选中
-        if (type === "participant") {
+        if (type === 'participant') {
           setParticipant(_toConsumableArray(participant));
         } else {
           setFollowers(_toConsumableArray(followers));
@@ -315,7 +315,7 @@ var BaseInfo = function BaseInfo(_ref) {
         });
       }
     })["catch"](function () {
-      _toast["default"].Error("网络异常", {
+      _toast["default"].Error('网络异常', {
         canClose: false
       });
     });
@@ -347,7 +347,7 @@ var BaseInfo = function BaseInfo(_ref) {
     var userIndex = (0, _util.findUserIndex)(delUserType === 1 ? participant : followers, delUser.id || delUser.userId);
     (0, _requestApis.deleteUser)(delUser.id, okrInfo.workId, delUserType === 1 ? 2 : 3).then(function (resp) {
       if (resp.Code === 1) {
-        _toast["default"].Success((0, _getLocale.getLocale)("Pro_detail_Deletsuccess"), {
+        _toast["default"].Success((0, _getLocale.getLocale)('Pro_detail_Deletsuccess'), {
           canClose: false
         });
 
@@ -387,8 +387,11 @@ var BaseInfo = function BaseInfo(_ref) {
   }, [generalPrincipalUser, okrInfo]); // 判断是否有权限和是否上面可编辑
 
   (0, _react.useEffect)(function () {
-    var inParticipant = (0, _util.findUser)(participant, loginUser.Id);
-    var canEditParticipantAndFollowers = canEditAllInfo || inParticipant;
+    var _okrInfo$authority, _okrInfo$aiteUsers;
+
+    var canEditParticipantAndFollowers = canEditAllInfo || okrInfo.isParticipant || ((_okrInfo$authority = okrInfo.authority) === null || _okrInfo$authority === void 0 ? void 0 : _okrInfo$authority.roleRelation) && okrInfo.authority.roleRelation.roleType === 2 || !!((_okrInfo$aiteUsers = okrInfo.aiteUsers) !== null && _okrInfo$aiteUsers !== void 0 && _okrInfo$aiteUsers.find(function (item) {
+      return (0, _bsGlobal.getUserInfo)().Id == item;
+    }));
     setCanEditPerson(!!canEditParticipantAndFollowers);
   }, [participant, canEditAllInfo]);
   (0, _react.useEffect)(function () {
@@ -431,13 +434,13 @@ var BaseInfo = function BaseInfo(_ref) {
       type: "warning"
     }, /*#__PURE__*/_react["default"].createElement("span", {
       type: "title"
-    }, delUserType === 1 ? (0, _getLocale.getLocale)("OKR_MyO_Err_Delepar") : (0, _getLocale.getLocale)("OKR_MyO_Err_Delefol"), "\uFF1F"), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.CancelButton, {
+    }, delUserType === 1 ? (0, _getLocale.getLocale)('OKR_MyO_Err_Delepar') : (0, _getLocale.getLocale)('OKR_MyO_Err_Delefol'), "\uFF1F"), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.CancelButton, {
       type: "button",
       onClick: cancelDelPerson
-    }, (0, _getLocale.getLocale)("Mod_Cancel")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.WarningButton, {
+    }, (0, _getLocale.getLocale)('Mod_Cancel')), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.WarningButton, {
       type: "button",
       onClick: ensureDelPerson
-    }, (0, _getLocale.getLocale)("Mod_Delete")));
+    }, (0, _getLocale.getLocale)('Mod_Delete')));
   }, [showDialogConfirm, delUserType]);
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", {
     className: "base-info__infos-wrapper"
@@ -456,15 +459,15 @@ 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"], {
+  }, (0, _getLocale.getLocale)('Mod_Participants')), /*#__PURE__*/_react["default"].createElement(_person["default"], {
     users: participant,
     canEdit: canEditPerson,
     onAddUser: handleAddUser,
@@ -473,7 +476,7 @@ var BaseInfo = function BaseInfo(_ref) {
     className: "base-info__person-block"
   }, !canEditFocusPerson && !canEditAllInfo && followers.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_Followers")), /*#__PURE__*/_react["default"].createElement(_person["default"], {
+  }, (0, _getLocale.getLocale)('Mod_Followers')), /*#__PURE__*/_react["default"].createElement(_person["default"], {
     type: "followers",
     users: followers,
     canEdit: canEditFocusPerson,

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

@@ -63,7 +63,7 @@ var RelationTaskModel = _taskRelationModal["default"].RelationTaskModel,
 var baseAuth = new _auth.BaseAuth();
 
 var EKrNode = function EKrNode(props) {
-  var _window, _window$BSGlobal, _window$BSGlobal$Work, _window$BSGlobal$Work2, _okrInfo$authority;
+  var _window, _window$BSGlobal, _window$BSGlobal$Work, _window$BSGlobal$Work2, _okrInfo$authority, _okrInfo$aiteUsers, _data$aiteUsers;
 
   var index = props.index,
       title = props.title,
@@ -92,7 +92,11 @@ 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$aiteUsers = okrInfo.aiteUsers) !== null && _okrInfo$aiteUsers !== void 0 && _okrInfo$aiteUsers.find(function (item) {
+    return (0, _bsGlobal.getUserInfo)().Id == item;
+  })) || !!(data !== null && data !== void 0 && (_data$aiteUsers = data.aiteUsers) !== null && _data$aiteUsers !== void 0 && _data$aiteUsers.find(function (item) {
+    return (0, _bsGlobal.getUserInfo)().Id == item;
+  }));
   var hasRelativeAuth;
 
   if (isOTask) {

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

@@ -41,6 +41,8 @@ var _helpers = require("../../../../../../utils/helpers");
 
 var _getLocale = require("../../../../../../utils/getLocale");
 
+var _bsGlobal = require("../../../../../../utils/bs-global");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -68,6 +70,7 @@ function _default(props) {
       title = props.title,
       data = props.data,
       createUserId = props.createUserId,
+      krAiteUsers = props.krAiteUsers,
       _props$hasProgress = props.hasProgress,
       hasProgress = _props$hasProgress === void 0 ? true : _props$hasProgress,
       _props$hasRelation = props.hasRelation,
@@ -90,7 +93,11 @@ function _default(props) {
   var _useContext2 = (0, _react.useContext)(_context.EListContext),
       refreshEList = _useContext2.refreshEList;
 
-  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.aiteUsers.find(function (item) {
+    return (0, _bsGlobal.getUserInfo)().Id == item;
+  }) || !!(krAiteUsers !== null && krAiteUsers !== void 0 && krAiteUsers.find(function (item) {
+    return (0, _bsGlobal.getUserInfo)().Id == item;
+  }));
   var hasRelativeAuth = new _auth.KRAuth({
     user: data.user,
     createUserId: createUserId

package/lib/components/okr-detail/components/okr-tree/tree-node/e-node/e-task-level2.js

@@ -82,7 +82,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function _default(props) {
-  var _okrInfo$authority;
+  var _okrInfo$authority, _okrInfo$aiteUsers;
 
   var index = props.index,
       title = props.title,
@@ -90,7 +90,8 @@ function _default(props) {
       level = props.level,
       isLeaf = props.isLeaf,
       createUserId = props.createUserId,
-      krUser = props.krUser;
+      krUser = props.krUser,
+      krAiteUsers = props.krAiteUsers;
 
   var _useState = (0, _react.useState)(data.principalUser || {}),
       _useState2 = _slicedToArray(_useState, 2),
@@ -149,7 +150,11 @@ function _default(props) {
     principalUser: okrInfo.principalUser,
     createUserId: okrInfo.createUserId
   }).hasAuth()) && data.status !== 5;
-  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$aiteUsers = okrInfo.aiteUsers) !== null && _okrInfo$aiteUsers !== void 0 && _okrInfo$aiteUsers.find(function (item) {
+    return (0, _bsGlobal.getUserInfo)().Id == item;
+  })) || !!(krAiteUsers !== null && krAiteUsers !== void 0 && krAiteUsers.find(function (item) {
+    return (0, _bsGlobal.getUserInfo)().Id == item;
+  }));
   var hasRelativeAuth = new _auth.KRAuth({
     user: data.user,
     createUserId: createUserId

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

@@ -83,13 +83,14 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 // status=3 已过期 status=2 已完成
 function ETaskNode(props) {
-  var _okrInfo$authority;
+  var _okrInfo$authority, _okrInfo$aiteUsers;
 
   var index = props.index,
       title = props.title,
       data = props.data,
       createUserId = props.createUserId,
       krUser = props.krUser,
+      krAiteUsers = props.krAiteUsers,
       _props$hasProgress = props.hasProgress,
       hasProgress = _props$hasProgress === void 0 ? true : _props$hasProgress,
       _props$hasRelation = props.hasRelation,
@@ -160,7 +161,11 @@ function ETaskNode(props) {
     principalUser: okrInfo.principalUser,
     createUserId: okrInfo.createUserId
   }).hasAuth()) && data.status !== 5;
-  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$aiteUsers = okrInfo.aiteUsers) !== null && _okrInfo$aiteUsers !== void 0 && _okrInfo$aiteUsers.find(function (item) {
+    return (0, _bsGlobal.getUserInfo)().Id == item;
+  })) || !!(krAiteUsers !== null && krAiteUsers !== void 0 && krAiteUsers.find(function (item) {
+    return (0, _bsGlobal.getUserInfo)().Id == item;
+  }));
   var hasRelativeAuth = new _auth.KRAuth({
     user: krUser,
     createUserId: createUserId
@@ -168,6 +173,7 @@ function ETaskNode(props) {
     principalUser: okrInfo.principalUser,
     createUserId: okrInfo.createUserId
   }).hasAuth();
+  console.log(33333, okrInfo.status === 1, hasRelation, hasRelativeAuth, isParticipant, okrInfo.aiteUsers);
 
   var onEditUserHandler = function onEditUserHandler(_ref) {
     var _ref2 = _slicedToArray(_ref, 1),

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

@@ -65,8 +65,11 @@ var addVisibilityButton = function addVisibilityButton(_ref2, actions) {
 };
 
 var addFollowButton = function addFollowButton(_ref3, actions) {
+  var _detailInfo$aiteUsers;
+
   var roleType = _ref3.roleType,
-      onChangeOkrFollow = _ref3.onChangeOkrFollow;
+      onChangeOkrFollow = _ref3.onChangeOkrFollow,
+      detailInfo = _ref3.detailInfo;
 
   // 未开启关注目标功能
   if (!(0, _bsGlobal.getBSGlobal)('OkrAdvancedSetting').KRSetting.TargetFollowers) {
@@ -74,7 +77,9 @@ var addFollowButton = function addFollowButton(_ref3, actions) {
   } // 是负责人或是内部成员不能关注目标
 
 
-  if (roleType === _enums.OkrRole.principal || roleType === _enums.OkrRole.member) {
+  if (roleType === _enums.OkrRole.principal || roleType === _enums.OkrRole.member || !!(detailInfo !== null && detailInfo !== void 0 && (_detailInfo$aiteUsers = detailInfo.aiteUsers) !== null && _detailInfo$aiteUsers !== void 0 && _detailInfo$aiteUsers.find(function (item) {
+    return (0, _bsGlobal.getUserInfo)().Id == item;
+  }))) {
     return;
   } // 已关注目标
 

package/lib/components/okr-detail/e-list/util.js

@@ -44,7 +44,7 @@ var toTree = function toTree(data) {
 
 exports.toTree = toTree;
 
-var getETreeNode = function getETreeNode(tasks, isFirstLevel, createUserId, krUser) {
+var getETreeNode = function getETreeNode(tasks, isFirstLevel, createUserId, krUser, krAiteUsers) {
   // 只有第一级的e为空的时候返回空节点信息
   if ((!tasks || tasks.length === 0) && isFirstLevel) {
     return [{
@@ -70,10 +70,11 @@ var getETreeNode = function getETreeNode(tasks, isFirstLevel, createUserId, krUs
       title: task.taskName,
       nodeType: task.objType == 4 ? "e-project" : isFirstLevel ? "e-task" : "e-task-level2",
       isLeaf: task.children && task.children.length === 0,
-      children: getETreeNode(task.children, false, createUserId, krUser),
+      children: getETreeNode(task.children, false, createUserId, krUser, krAiteUsers),
       data: _objectSpread({}, task),
       createUserId: createUserId,
-      krUser: _objectSpread({}, krUser)
+      krUser: _objectSpread({}, krUser),
+      krAiteUsers: krAiteUsers
     };
   });
 };
@@ -89,7 +90,7 @@ var formatTreeDataToNode = function formatTreeDataToNode(tree, isInitCondition)
         title: item.mileStoneId !== 0 ? item.mileStoneName : (0, _getLocale.getLocale)("OKR_MyO_Butt_Otherexecutions"),
         nodeType: "e-kr",
         isLeaf: false,
-        children: getETreeNode(item.tasks, true, item.createUserId, item.user),
+        children: getETreeNode(item.tasks, true, item.createUserId, item.user, item.aiteUsers),
         data: _objectSpread({}, item),
         isOTask: item.mileStoneId === 0
       };
@@ -105,7 +106,7 @@ var formatTreeDataToNode = function formatTreeDataToNode(tree, isInitCondition)
         title: item.mileStoneId !== 0 ? item.mileStoneName : (0, _getLocale.getLocale)("OKR_MyO_Butt_Otherexecutions"),
         nodeType: "e-kr",
         isLeaf: false,
-        children: getETreeNode(item.tasks, true, item.createUserId, item.user),
+        children: getETreeNode(item.tasks, true, item.createUserId, item.user, item.aiteUsers),
         data: _objectSpread({}, item),
         isOTask: item.mileStoneId === 0
       });

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

@@ -423,14 +423,14 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   [parentOkr, childOkrs, canEditOkr]);
 
   var renderKrs = function renderKrs() {
-    var _classNames;
+    var _classNames, _okrInfo$aiteUsers;
 
     if (!loading && !krs.length && !createKrShow) {
       return /*#__PURE__*/_react["default"].createElement(_empty["default"], {
         onCreateKr: function onCreateKr() {
           return setCreateKrShow(true);
         },
-        canEditOkr: canEditOkr || isInnerUser,
+        canEditOkr: canEditOkr || isInnerUser || okrInfo.isParticipant,
         style: isShowAlignOkr ? {
           padding: '40px 0 24px 0'
         } : {
@@ -449,7 +449,9 @@ 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$aiteUsers = okrInfo.aiteUsers) === null || _okrInfo$aiteUsers === void 0 ? void 0 : _okrInfo$aiteUsers.find(function (item) {
+      return (0, _bsGlobal.getUserInfo)().Id == item;
+    }))) && (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/lib/pages/aha2021/index.js

@@ -93,7 +93,7 @@ function PageLayout(props) {
   var hideNavTop = (0, _hooks["default"])('hideNavTop');
 
   var _useState = (0, _react.useState)(function () {
-    return (0, _moment["default"])().unix() < (0, _moment["default"])('2022-06-18 08:00:00').unix();
+    return (0, _moment["default"])().unix() < (0, _moment["default"])('2022-08-26 08:00:00').unix();
   }),
       _useState2 = _slicedToArray(_useState, 1),
       isShowUpdateTip = _useState2[0];
@@ -117,11 +117,11 @@ function PageLayout(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])(preCls)
-  }, isShowUpdateTip && (0, _helpers.isDingDing)() && /*#__PURE__*/_react["default"].createElement("div", {
+  }, isShowUpdateTip && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__update-tip")
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "tu-icon-tishi update-tip-icon"
-  }), "\u4EB2\u7231\u7684\u7528\u6237\u60A8\u597D\uFF0C\u300C\u603B\u7ED3\u300D\u5C06\u8FDB\u884C\u5168\u65B0\u5347\u7EA7\uFF0C\u5982\u6709\u8349\u7A3F\u8BF7\u53CA\u65F6\u590D\u5236\u8FC1\u79FB\uFF0C\u5982\u9700\u63D0\u4EA4\u8BF7\u5728 6.17 22:00 \u524D\u64CD\u4F5C\uFF0C6.17 23:00-\u6B21\u65E5 8:00 \u8BF7\u6682\u505C\u4F7F\u7528\u603B\u7ED3\uFF0C\u611F\u8C22\u60A8\u7684\u914D\u5408\u4E0E\u7406\u89E3~"), hideNavTop !== 'true' && /*#__PURE__*/_react["default"].createElement("div", {
+  }), "\u4EB2\u7231\u7684\u7528\u6237\u60A8\u597D\uFF0C\u300C\u603B\u7ED3\u300D\u5C06\u4E8E\u4ECA\u665A\u8FDB\u884C\u5347\u7EA7\uFF0C10:30 - 11:00 \u5C06\u6682\u65F6\u5173\u95ED\u603B\u7ED3\u6A21\u5757\uFF0C\u8BF7\u4E8E 8.25 22:00 - \u6B21\u65E5 7:00 \u6682\u505C\u603B\u7ED3\u7684\u7F16\u8F91\u4E0E\u63D0\u4EA4\u64CD\u4F5C\uFF0C\u611F\u8C22\u60A8\u7684\u7406\u89E3\u4E0E\u914D\u5408~"), hideNavTop !== 'true' && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__header"))
   }, (0, _helpers.getTenantInfo)().Source === 964 ? /*#__PURE__*/_react["default"].createElement(_hrHeader["default"], null) : /*#__PURE__*/_react["default"].createElement(_navTop["default"], null)), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__message"))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.15.84",
+  "version": "1.15.87",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",