@titaui/pc 1.10.7 → 1.10.8-2.beta-1

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

@@ -62,12 +62,18 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function _default(props) {
-  var _data$principalUser, _data$principalUser2;
+  var _okrInfo$authority, _data$principalUser, _data$principalUser2;
 
   var index = props.index,
       title = props.title,
       data = props.data,
-      createUserId = props.createUserId;
+      createUserId = props.createUserId,
+      _props$hasProgress = props.hasProgress,
+      hasProgress = _props$hasProgress === void 0 ? true : _props$hasProgress,
+      _props$hasRelation = props.hasRelation,
+      hasRelation = _props$hasRelation === void 0 ? true : _props$hasRelation,
+      _props$hasPrinciple = props.hasPrinciple,
+      hasPrinciple = _props$hasPrinciple === void 0 ? true : _props$hasPrinciple;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -84,7 +90,7 @@ function _default(props) {
   var _useContext2 = (0, _react.useContext)(_context.EListContext),
       refreshEList = _useContext2.refreshEList;
 
-  var isParticipant = 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;
   var hasRelativeAuth = new _auth.KRAuth({
     user: data.user,
     createUserId: createUserId
@@ -120,6 +126,9 @@ function _default(props) {
     window.open(window.location.href.replace(location.hash, "#work?iTalentNavCode=tita-work&work_id=".concat(data.id)));
   };
 
+  var workApplyType = data.workApplyType,
+      workApplyStatus = data.workApplyStatus;
+  var isCreate = (workApplyStatus === 1 || workApplyStatus === 3 || workApplyStatus === 4) && workApplyType === 48;
   return /*#__PURE__*/_react["default"].createElement("div", {
     key: index,
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-project-node"))
@@ -130,12 +139,16 @@ function _default(props) {
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-project-node-title ")),
     onClick: openProjectDetail
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__e-project-node-title-name "))
   }, /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
     text: (0, _helpers.escapeHtml)(title),
     isPercent: true
-  })), /*#__PURE__*/_react["default"].createElement("div", {
+  })), isCreate && /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__e-project-node-title-approvaling"))
+  }, (0, _getLocale.getLocale)('Pro_MyS_Establishment'))), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-project-node-actions"))
-  }, /*#__PURE__*/_react["default"].createElement("span", {
+  }, hasPrinciple && /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-project-node-actions-user"))
   }, /*#__PURE__*/_react["default"].createElement(_avatar["default"].Text, {
     name: data === null || data === void 0 ? void 0 : (_data$principalUser = data.principalUser) === null || _data$principalUser === void 0 ? void 0 : _data$principalUser.name,
@@ -147,7 +160,7 @@ function _default(props) {
   }, /*#__PURE__*/_react["default"].createElement(_statusTime["default"], {
     deadLine: data.deadLine,
     isComplete: data.status === 2
-  })), /*#__PURE__*/_react["default"].createElement("span", {
+  })), hasProgress && /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-project-node-actions-progress ").concat(isGray && "".concat(_precls["default"], "__e-project-node-gray")))
   }, /*#__PURE__*/_react["default"].createElement(_progress["default"].Circle, {
     size: 22,
@@ -158,7 +171,7 @@ function _default(props) {
     linearStartColor: (0, _getProcessColor["default"])(data.riskLevel, "linearStartColor", data.status),
     linearEndColor: (0, _getProcessColor["default"])(data.riskLevel, "linearEndColor", data.status),
     backgroundColor: (0, _getProcessColor["default"])(data.riskLevel, "backgroundColor", data.status)
-  })), okrInfo.status === 1 && (hasRelativeAuth || isParticipant) ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  })), okrInfo.status === 1 && hasRelation && (hasRelativeAuth || isParticipant) ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     overlay: (0, _getLocale.getLocale)("OKR_MyO_Text_Cancel"),
     placement: "top"
   }, /*#__PURE__*/_react["default"].createElement("span", {

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

@@ -82,6 +82,8 @@ 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 index = props.index,
       title = props.title,
       data = props.data,
@@ -147,7 +149,7 @@ function _default(props) {
     principalUser: okrInfo.principalUser,
     createUserId: okrInfo.createUserId
   }).hasAuth()) && data.status !== 5;
-  var isParticipant = 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;
   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,11 +83,21 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 // status=3 已过期 status=2 已完成
 function ETaskNode(props) {
+  var _okrInfo$authority;
+
   var index = props.index,
       title = props.title,
       data = props.data,
       createUserId = props.createUserId,
-      krUser = props.krUser;
+      krUser = props.krUser,
+      _props$hasProgress = props.hasProgress,
+      hasProgress = _props$hasProgress === void 0 ? true : _props$hasProgress,
+      _props$hasRelation = props.hasRelation,
+      hasRelation = _props$hasRelation === void 0 ? true : _props$hasRelation,
+      _props$isPushScreen = props.isPushScreen,
+      isPushScreen = _props$isPushScreen === void 0 ? false : _props$isPushScreen,
+      _props$hasPrinciple = props.hasPrinciple,
+      hasPrinciple = _props$hasPrinciple === void 0 ? true : _props$hasPrinciple;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -150,7 +160,7 @@ function ETaskNode(props) {
     principalUser: okrInfo.principalUser,
     createUserId: okrInfo.createUserId
   }).hasAuth()) && data.status !== 5;
-  var isParticipant = 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;
   var hasRelativeAuth = new _auth.KRAuth({
     user: krUser,
     createUserId: createUserId
@@ -324,7 +334,18 @@ function ETaskNode(props) {
       _drawerManager["default"].close();
     }
 
-    window.open("//".concat(window.location.host).concat(window.location.pathname, "#more/taskinfo?id=").concat(data.taskId));
+    if (isPushScreen) {
+      var _window$Talent, _window$Talent2;
+
+      (_window$Talent = window.Talent) === null || _window$Talent === void 0 ? void 0 : _window$Talent.app.vent.off("global-pull-screen:closed:".concat(data.taskId));
+      (_window$Talent2 = window.Talent) === null || _window$Talent2 === void 0 ? void 0 : _window$Talent2.app.vent.on("global-pull-screen:closed:".concat(data.taskId), function () {
+        refreshEList && refreshEList();
+      }); // 任务：打开推屏
+
+      window.Talent.app.vent.trigger('global-pull-screen', data.taskId, 'task');
+    } else {
+      window.open("//".concat(window.location.host).concat(window.location.pathname, "#more/taskinfo?id=").concat(data.taskId));
+    }
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
@@ -351,7 +372,7 @@ function ETaskNode(props) {
     isPercent: true
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-task-node-actions"))
-  }, /*#__PURE__*/_react["default"].createElement("span", {
+  }, hasPrinciple && /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-task-node-actions-user"))
   }, /*#__PURE__*/_react["default"].createElement(_avatar["default"].Text, {
     name: user === null || user === void 0 ? void 0 : user.name,
@@ -369,7 +390,7 @@ function ETaskNode(props) {
     isLongTerm: dataInfo.isLongTerm,
     isCancel: dataInfo.status === 4,
     isComplete: dataInfo.status === 2
-  })), /*#__PURE__*/_react["default"].createElement("span", {
+  })), hasProgress && /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-task-node-actions-progress ").concat((isGray || isCancel) && "".concat(_precls["default"], "__e-project-node-gray")))
   }, /*#__PURE__*/_react["default"].createElement(_progress["default"].Circle, {
     size: 22,
@@ -380,7 +401,7 @@ function ETaskNode(props) {
     linearStartColor: (0, _getProcessColor["default"])(dataInfo.riskLevel, "linearStartColor", dataInfo.status),
     linearEndColor: (0, _getProcessColor["default"])(dataInfo.riskLevel, "linearEndColor", dataInfo.status),
     backgroundColor: (0, _getProcessColor["default"])(dataInfo.riskLevel, "backgroundColor", dataInfo.status)
-  })), okrInfo.status === 1 && (hasRelativeAuth || isParticipant) ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  })), okrInfo.status === 1 && hasRelation && (hasRelativeAuth || isParticipant) ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     overlay: (0, _getLocale.getLocale)("OKR_MyO_Text_Cancel"),
     placement: "top"
   }, /*#__PURE__*/_react["default"].createElement("span", {

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

@@ -84,13 +84,13 @@
   line-height: 18px;
   display: inline-flex;
   align-items: center;
+  justify-content: flex-end;
   box-sizing: border-box;
   width: 78px;
   height: 26px;
   padding: 4px;
   text-align: left;
   line-height: 26px;
-  margin-left: 16px;
 }
 
 .tita-okrdt-tree__e-task-node-actions-date > span {
@@ -103,7 +103,7 @@
   color: #89919f;
   cursor: auto;
   width: 64px;
-  margin-left: 4px;
+  margin-left: 16px;
   margin-right: 4px;
 }
 
@@ -147,7 +147,7 @@
 }
 
 .tita-okrdt-tree__e-project-node-title {
-  display: inline-block;
+  display: inline-flex;
   font-size: 14px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   color: #3f4755;
@@ -158,8 +158,27 @@
   flex: 1;
 }
 
+.tita-okrdt-tree__e-project-node-title-name {
+  overflow: hidden;
+}
+
+.tita-okrdt-tree__e-project-node-title-approvaling {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 36px;
+  padding: 0 6px;
+  height: 20px;
+  font-size: 12px;
+  font-weight: 400;
+  color: #f05e5e;
+  background: rgba(240, 94, 94, 0.1);
+  border-radius: 10px;
+  margin-left: 8px;
+}
+
 .tita-okrdt-tree__e-project-node-gray {
-  color: #BFC7D5 !important;
+  color: #bfc7d5 !important;
 }
 
 .tita-okrdt-tree__e-project-node-priority {
@@ -216,13 +235,13 @@
   line-height: 18px;
   display: inline-flex;
   align-items: center;
+  justify-content: flex-end;
   box-sizing: border-box;
   width: 78px;
   height: 26px;
   padding: 4px;
   text-align: left;
   line-height: 26px;
-  margin-left: 16px;
 }
 
 .tita-okrdt-tree__e-project-node-actions-date > span {
@@ -235,7 +254,7 @@
   color: #89919f;
   cursor: auto;
   width: 64px;
-  margin-left: 4px;
+  margin-left: 16px;
   margin-right: 4px;
 }
 
@@ -338,13 +357,13 @@
   line-height: 18px;
   display: inline-flex;
   align-items: center;
+  justify-content: flex-end;
   box-sizing: border-box;
   width: 78px;
   height: 26px;
   padding: 4px;
   text-align: left;
   line-height: 26px;
-  margin-left: 16px;
 }
 
 .tita-okrdt-tree__e-task-level2-node-actions-date > span {
@@ -357,7 +376,7 @@
   color: #89919f;
   cursor: auto;
   width: 64px;
-  margin-left: 4px;
+  margin-left: 16px;
   margin-right: 4px;
 }
 
@@ -379,7 +398,7 @@
 .tita-okrdt-tree__e-empty-node {
   font-size: 12px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
-  color: #A4ACB9;
+  color: #a4acb9;
   line-height: 18px;
   padding-left: 12px;
 }
@@ -389,5 +408,5 @@
 }
 
 .e-node-status-icon {
-  color: #89919F;
+  color: #89919f;
 }

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

@@ -332,7 +332,7 @@ function _default(props) {
     editable: krCanEdit,
     onEditUser: onEditUserHandler,
     nameTips: function nameTips(name) {
-      return /*#__PURE__*/_react["default"].createElement("span", null, "\u8D1F\u8D23\u4EBA\uFF1A");
+      return /*#__PURE__*/_react["default"].createElement("span", null, "\u8D1F\u8D23\u4EBA\uFF1A", name);
     }
   })), showKrWeight && /*#__PURE__*/_react["default"].createElement(OkrRowColumn, {
     width: 60,

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

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getOkrHeadActions = getOkrHeadActions;
 
-var _dayjs = _interopRequireDefault(require("dayjs"));
-
 var _bsGlobal = require("../../../utils/bs-global");
 
 var _auth = require("../../../utils/auth");
@@ -15,36 +13,12 @@ var _enums = require("./enums");
 
 var _getLocale = require("../../../utils/getLocale");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 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; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 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 getOkrHeadActions(data) {
-  var actions = [];
-  var auth = new _auth.OAuth({
-    principalUser: data.principalUser,
-    createUserId: data.detailInfo.createUserId
-  });
-
-  var dataWithAuth = _objectSpread(_objectSpread({}, data), {}, {
-    auth: auth
-  });
-
-  addShareButton(dataWithAuth, actions);
-  addVisibilityButton(dataWithAuth, actions);
-  addFollowButton(dataWithAuth, actions);
-  addExitButton(dataWithAuth, actions);
-  addFinishOrReopenButton(dataWithAuth, actions);
-  addCopyButton(dataWithAuth, actions);
-  addDeleteButton(dataWithAuth, actions); // addDetailButton(dataWithAuth,actions)
-
-  return actions;
-}
-
 var addShareButton = function addShareButton(_ref, actions) {
   var openShareModal = _ref.openShareModal;
   actions.push({
@@ -81,10 +55,10 @@ var addVisibilityButton = function addVisibilityButton(_ref2, actions) {
     }
   }];
 
-  var editable = auth.hasAuth() && detailInfo.status == _enums.OkrStatus.inProgress;
+  var editable = auth.hasAuth() && detailInfo.status === _enums.OkrStatus.inProgress;
 
   actions.push({
-    icon: visibility != 1 ? "tu-icon-simi-icon" : "tu-icon-gongkai",
+    icon: visibility !== 1 ? "tu-icon-simi-icon" : "tu-icon-gongkai",
     title: children[visibility - 1].title + (0, _getLocale.getLocale)("OKR_MyO_Text_Visible"),
     children: editable ? children : null
   });
@@ -92,7 +66,6 @@ var addVisibilityButton = function addVisibilityButton(_ref2, actions) {
 
 var addFollowButton = function addFollowButton(_ref3, actions) {
   var roleType = _ref3.roleType,
-      detailInfo = _ref3.detailInfo,
       onChangeOkrFollow = _ref3.onChangeOkrFollow;
 
   // 未开启关注目标功能
@@ -101,12 +74,12 @@ var addFollowButton = function addFollowButton(_ref3, actions) {
   } // 是负责人或是内部成员不能关注目标
 
 
-  if (roleType == _enums.OkrRole.principal || roleType == _enums.OkrRole.member) {
+  if (roleType === _enums.OkrRole.principal || roleType === _enums.OkrRole.member) {
     return;
   } // 已关注目标
 
 
-  if (roleType == _enums.OkrRole.follower) {
+  if (roleType === _enums.OkrRole.follower) {
     actions.push({
       icon: "okr-drawer-header-followed",
       title: (0, _getLocale.getLocale)("OKR_MyO_Butt_Unfollow"),
@@ -131,7 +104,7 @@ var addExitButton = function addExitButton(_ref4, actions) {
   var roleType = _ref4.roleType,
       onQuit = _ref4.onQuit;
 
-  if (roleType == _enums.OkrRole.member) {
+  if (roleType === _enums.OkrRole.member) {
     actions.push({
       icon: "tu-icon-tuichu",
       title: (0, _getLocale.getLocale)("Pro_Admin_pop_Withdraw"),
@@ -146,7 +119,7 @@ var addFinishOrReopenButton = function addFinishOrReopenButton(_ref5, actions) {
       onFinishOrReOpen = _ref5.onFinishOrReOpen;
   if (!auth.hasAuth()) return;
 
-  if (detailInfo.status == _enums.OkrStatus.inProgress) {
+  if (detailInfo.status === _enums.OkrStatus.inProgress) {
     actions.push({
       icon: "tu-icon-liebiao-jieshu",
       title: (0, _getLocale.getLocale)("OKR_MyO_EndObjective"),
@@ -185,16 +158,39 @@ var addDeleteButton = function addDeleteButton(_ref7, actions) {
     title: (0, _getLocale.getLocale)("OKR_MyO_Butt_DeleteO"),
     onClick: onDeleteOkr
   });
-};
+}; // const addDetailButton: ActionDealFunction = ({ detailInfo }, actions) => {
+//   const registerDate = window.BSGlobal.tenantAuthentication.StartDate;
+//   dayjs(registerDate).year() < 2021
+//     && actions.push({
+//       icon: "tu-icon-xiangqing1",
+//       title: "目标详情",
+//       onClick: () => {
+//         window.open(
+//           `${location.pathname}#okr/manage?work_id=${detailInfo.workId}`,
+//         );
+//       },
+//     });
+// };
 
-var addDetailButton = function addDetailButton(_ref8, actions) {
-  var detailInfo = _ref8.detailInfo;
-  var registerDate = window.BSGlobal.tenantAuthentication.StartDate;
-  (0, _dayjs["default"])(registerDate).year() < 2021 && actions.push({
-    icon: "tu-icon-xiangqing1",
-    title: "目标详情",
-    onClick: function onClick() {
-      window.open("".concat(location.pathname, "#okr/manage?work_id=").concat(detailInfo.workId));
-    }
+
+function getOkrHeadActions(data) {
+  var actions = [];
+  var auth = new _auth.OAuth({
+    principalUser: data.principalUser,
+    createUserId: data.detailInfo.createUserId
   });
-};
+
+  var dataWithAuth = _objectSpread(_objectSpread({}, data), {}, {
+    auth: auth
+  });
+
+  addShareButton(dataWithAuth, actions);
+  addVisibilityButton(dataWithAuth, actions);
+  addFollowButton(dataWithAuth, actions);
+  addExitButton(dataWithAuth, actions);
+  addFinishOrReopenButton(dataWithAuth, actions);
+  addCopyButton(dataWithAuth, actions);
+  addDeleteButton(dataWithAuth, actions); // addDetailButton(dataWithAuth,actions)
+
+  return actions;
+}

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

@@ -5,7 +5,7 @@
 .okr-detail-head-parent {
   display: flex;
   align-items: center;
-  color: #89919F;
+  color: #89919f;
 }
 
 .okr-detail-head-parent .tu-icon-liebiao-duiqinubiao {
@@ -23,5 +23,5 @@
 }
 
 .okr-detail-head-parent > span:hover {
-  color: #2879FF;
+  color: #2879ff;
 }