@titaui/pc 1.11.5-beta.4 → 1.11.6

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

@@ -19,6 +19,8 @@ var _actions = require("./actions");
 
 var _confirm = _interopRequireDefault(require("./confirm"));
 
+var _wechatBtn = _interopRequireDefault(require("../../wechat-btn"));
+
 var _toast = _interopRequireDefault(require("../../toast"));
 
 var _requestApis = require("../request-apis");
@@ -109,7 +111,7 @@ function OkrDetailHeader(_ref) {
               }));
 
             case 3:
-              _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
+              _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
 
               context.setGeneralVisibility({
                 visibility: visibility,
@@ -132,229 +134,232 @@ function OkrDetailHeader(_ref) {
     setShareVisible(false);
   }, []);
   var actions = (0, _react.useMemo)(function () {
-    if (!detailInfo) return [];
-    return (0, _actions.getOkrHeadActions)({
-      roleType: context.generalRoleType,
-      principalUser: context.generalPrincipalUser,
-      visibility: context.generalVisibility.visibility,
-      detailInfo: detailInfo,
-      openShareModal: function () {
-        var _openShareModal = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
-          var krss;
-          return regeneratorRuntime.wrap(function _callee2$(_context2) {
-            while (1) {
-              switch (_context2.prev = _context2.next) {
-                case 0:
-                  _context2.next = 2;
-                  return (0, _requestApis.getKrs)({
-                    okrId: detailInfo.workId
-                  });
-
-                case 2:
-                  krss = _context2.sent;
-                  setKrs(krss);
-                  setShareVisible(true);
-
-                case 5:
-                case "end":
-                  return _context2.stop();
+    if (!detailInfo) {
+      return [];
+    } else {
+      return (0, _actions.getOkrHeadActions)({
+        roleType: context.generalRoleType,
+        principalUser: context.generalPrincipalUser,
+        visibility: context.generalVisibility.visibility,
+        detailInfo: detailInfo,
+        openShareModal: function () {
+          var _openShareModal = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+            var krss;
+            return regeneratorRuntime.wrap(function _callee2$(_context2) {
+              while (1) {
+                switch (_context2.prev = _context2.next) {
+                  case 0:
+                    _context2.next = 2;
+                    return (0, _requestApis.getKrs)({
+                      okrId: detailInfo.workId
+                    });
+
+                  case 2:
+                    krss = _context2.sent;
+                    setKrs(krss);
+                    setShareVisible(true);
+
+                  case 5:
+                  case "end":
+                    return _context2.stop();
+                }
               }
-            }
-          }, _callee2);
-        }));
-
-        function openShareModal() {
-          return _openShareModal.apply(this, arguments);
-        }
+            }, _callee2);
+          }));
 
-        return openShareModal;
-      }(),
-      changeVisiblilty: function changeVisiblilty(visibility) {
-        if (visibility === 4) {
-          if (userSelectRef.current) {
-            userSelectRef.current.open();
+          function openShareModal() {
+            return _openShareModal.apply(this, arguments);
           }
 
-          return;
-        }
-
-        changVisiblity(detailInfo.workId, visibility);
-      },
-      onDeleteOkr: function onDeleteOkr(e) {
-        popRef.current.getRef().show(e.target);
-      },
-      onCopyOkr: function onCopyOkr() {
-        // @ts-ignore
-        window.openCopyOkrModal({
-          okrId: detailInfo.workId,
-          okrType: detailInfo.okrType
-        });
-      },
-      onChangeOkrFollow: function () {
-        var _onChangeOkrFollow = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(follow) {
-          var res;
-          return regeneratorRuntime.wrap(function _callee3$(_context3) {
-            while (1) {
-              switch (_context3.prev = _context3.next) {
-                case 0:
-                  _context3.next = 2;
-                  return (0, _confirm["default"])(follow ? (0, _getLocale.getLocale)("OKR_MyO_Err_Focuson") : (0, _getLocale.getLocale)("OKR_MyO_Err_Unfollow"), follow ? (0, _getLocale.getLocale)("OKR_MyO_Err_Payatten") : (0, _getLocale.getLocale)("OKR_MyO_Err_Progress"));
-
-                case 2:
-                  res = _context3.sent;
+          return openShareModal;
+        }(),
+        changeVisiblilty: function changeVisiblilty(visibility) {
+          if (visibility === 4) {
+            if (userSelectRef.current) {
+              userSelectRef.current.open();
+            }
 
-                  if (!res) {
-                    _context3.next = 14;
-                    break;
-                  }
+            return;
+          }
 
-                  if (!follow) {
-                    _context3.next = 9;
+          changVisiblity(detailInfo.workId, visibility);
+        },
+        onDeleteOkr: function onDeleteOkr(e) {
+          popRef.current.getRef().show(e.target);
+        },
+        onCopyOkr: function onCopyOkr() {
+          // @ts-ignore
+          window.openCopyOkrModal({
+            okrId: detailInfo.workId,
+            okrType: detailInfo.okrType
+          });
+        },
+        onChangeOkrFollow: function () {
+          var _onChangeOkrFollow = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(follow) {
+            var res;
+            return regeneratorRuntime.wrap(function _callee3$(_context3) {
+              while (1) {
+                switch (_context3.prev = _context3.next) {
+                  case 0:
+                    _context3.next = 2;
+                    return (0, _confirm["default"])(follow ? (0, _getLocale.getLocale)('OKR_MyO_Err_Focuson') : (0, _getLocale.getLocale)('OKR_MyO_Err_Unfollow'), follow ? (0, _getLocale.getLocale)('OKR_MyO_Err_Payatten') : (0, _getLocale.getLocale)('OKR_MyO_Err_Progress'));
+
+                  case 2:
+                    res = _context3.sent;
+
+                    if (!res) {
+                      _context3.next = 14;
+                      break;
+                    }
+
+                    if (!follow) {
+                      _context3.next = 9;
+                      break;
+                    }
+
+                    _context3.next = 7;
+                    return (0, _requestApis.addUser)(loginUserId, detailInfo.workId, 3);
+
+                  case 7:
+                    _context3.next = 11;
                     break;
-                  }
-
-                  _context3.next = 7;
-                  return (0, _requestApis.addUser)(loginUserId, detailInfo.workId, 3);
 
-                case 7:
-                  _context3.next = 11;
-                  break;
+                  case 9:
+                    _context3.next = 11;
+                    return (0, _requestApis.deleteUser)(loginUserId, detailInfo.workId, 3);
 
-                case 9:
-                  _context3.next = 11;
-                  return (0, _requestApis.deleteUser)(loginUserId, detailInfo.workId, 3);
+                  case 11:
+                    context.setGeneralRoleType(follow ? 3 : 0); // 关注
 
-                case 11:
-                  context.setGeneralRoleType(follow ? 3 : 0); // 关注
+                    _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
 
-                  _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
+                    if (!follow) {
+                      commonContext.refreshAll();
+                    }
 
-                  if (!follow) {
-                    commonContext.refreshAll();
-                  }
-
-                case 14:
-                case "end":
-                  return _context3.stop();
+                  case 14:
+                  case "end":
+                    return _context3.stop();
+                }
               }
-            }
-          }, _callee3);
-        }));
-
-        function onChangeOkrFollow(_x3) {
-          return _onChangeOkrFollow.apply(this, arguments);
-        }
+            }, _callee3);
+          }));
 
-        return onChangeOkrFollow;
-      }(),
-      onFinishOrReOpen: function () {
-        var _onFinishOrReOpen = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(isFinish) {
-          var res;
-          return regeneratorRuntime.wrap(function _callee4$(_context4) {
-            while (1) {
-              switch (_context4.prev = _context4.next) {
-                case 0:
-                  _context4.next = 2;
-                  return (0, _confirm["default"])(isFinish ? (0, _getLocale.getLocale)("OKR_MyO_Areycloseobjective") : (0, _getLocale.getLocale)("OKR_MyO_Err_Restart"));
-
-                case 2:
-                  res = _context4.sent;
-
-                  if (!res) {
-                    _context4.next = 13;
-                    break;
-                  }
+          function onChangeOkrFollow(_x3) {
+            return _onChangeOkrFollow.apply(this, arguments);
+          }
 
-                  if (!isFinish) {
-                    _context4.next = 9;
+          return onChangeOkrFollow;
+        }(),
+        onFinishOrReOpen: function () {
+          var _onFinishOrReOpen = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(isFinish) {
+            var res;
+            return regeneratorRuntime.wrap(function _callee4$(_context4) {
+              while (1) {
+                switch (_context4.prev = _context4.next) {
+                  case 0:
+                    _context4.next = 2;
+                    return (0, _confirm["default"])(isFinish ? (0, _getLocale.getLocale)('OKR_MyO_Areycloseobjective') : (0, _getLocale.getLocale)('OKR_MyO_Err_Restart'));
+
+                  case 2:
+                    res = _context4.sent;
+
+                    if (!res) {
+                      _context4.next = 13;
+                      break;
+                    }
+
+                    if (!isFinish) {
+                      _context4.next = 9;
+                      break;
+                    }
+
+                    _context4.next = 7;
+                    return (0, _requestApis.close)(detailInfo.workId);
+
+                  case 7:
+                    _context4.next = 11;
                     break;
-                  }
-
-                  _context4.next = 7;
-                  return (0, _requestApis.close)(detailInfo.workId);
 
-                case 7:
-                  _context4.next = 11;
-                  break;
+                  case 9:
+                    _context4.next = 11;
+                    return (0, _requestApis.start)(detailInfo.workId);
 
-                case 9:
-                  _context4.next = 11;
-                  return (0, _requestApis.start)(detailInfo.workId);
+                  case 11:
+                    commonContext.refreshAll(); // 刷新
 
-                case 11:
-                  commonContext.refreshAll(); // 刷新
+                    _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
 
-                  _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
-
-                case 13:
-                case "end":
-                  return _context4.stop();
+                  case 13:
+                  case "end":
+                    return _context4.stop();
+                }
               }
-            }
-          }, _callee4);
-        }));
+            }, _callee4);
+          }));
 
-        function onFinishOrReOpen(_x4) {
-          return _onFinishOrReOpen.apply(this, arguments);
-        }
-
-        return onFinishOrReOpen;
-      }(),
-      onQuit: function () {
-        var _onQuit = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
-          var res;
-          return regeneratorRuntime.wrap(function _callee5$(_context5) {
-            while (1) {
-              switch (_context5.prev = _context5.next) {
-                case 0:
-                  _context5.next = 2;
-                  return (0, _confirm["default"])((0, _getLocale.getLocale)("OKR_MyO_Err_Quit"), (0, _getLocale.getLocale)("OKR_MyO_Err_Inchargec"));
-
-                case 2:
-                  res = _context5.sent;
-
-                  if (!res) {
-                    _context5.next = 8;
-                    break;
-                  }
-
-                  _context5.next = 6;
-                  return (0, _requestApis.deleteUser)(loginUserId, detailInfo.workId, 2);
-
-                case 6:
-                  // context.setGeneralRoleType(0)
-                  commonContext.refreshAll(); // 刷新
-
-                  _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
+          function onFinishOrReOpen(_x4) {
+            return _onFinishOrReOpen.apply(this, arguments);
+          }
 
-                case 8:
-                case "end":
-                  return _context5.stop();
+          return onFinishOrReOpen;
+        }(),
+        onQuit: function () {
+          var _onQuit = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
+            var res;
+            return regeneratorRuntime.wrap(function _callee5$(_context5) {
+              while (1) {
+                switch (_context5.prev = _context5.next) {
+                  case 0:
+                    _context5.next = 2;
+                    return (0, _confirm["default"])((0, _getLocale.getLocale)('OKR_MyO_Err_Quit'), (0, _getLocale.getLocale)('OKR_MyO_Err_Inchargec'));
+
+                  case 2:
+                    res = _context5.sent;
+
+                    if (!res) {
+                      _context5.next = 8;
+                      break;
+                    }
+
+                    _context5.next = 6;
+                    return (0, _requestApis.deleteUser)(loginUserId, detailInfo.workId, 2);
+
+                  case 6:
+                    // context.setGeneralRoleType(0)
+                    commonContext.refreshAll(); // 刷新
+
+                    _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
+
+                  case 8:
+                  case "end":
+                    return _context5.stop();
+                }
               }
-            }
-          }, _callee5);
-        }));
+            }, _callee5);
+          }));
 
-        function onQuit() {
-          return _onQuit.apply(this, arguments);
-        }
+          function onQuit() {
+            return _onQuit.apply(this, arguments);
+          }
 
-        return onQuit;
-      }()
-    });
+          return onQuit;
+        }()
+      });
+    }
   }, [detailInfo, context.generalRoleType, context.generalPrincipalUser, context.generalVisibility.visibility]);
   var parent = null;
 
   if (context.generalParent) {
     if (context.generalParent.parentKr) {
       parent = {
-        type: "kr",
+        type: 'kr',
         id: context.generalParent.parentKr.mileStoneId,
         name: context.generalParent.parentKr.mileStoneName
       };
     } else if (context.generalParent.parentOkr) {
       parent = {
-        type: "okr",
+        type: 'okr',
         id: context.generalParent.parentOkr.workId,
         name: context.generalParent.parentOkr.workName
       };
@@ -363,19 +368,25 @@ function OkrDetailHeader(_ref) {
 
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_drawer["default"].Header, {
     actions: actions,
+    actionComponent: /*#__PURE__*/_react["default"].createElement(_wechatBtn["default"], {
+      id: detailInfo.workId,
+      objType: 62,
+      name: detailInfo.workName,
+      principalUser: detailInfo.principalUser
+    }),
     content: parent ? /*#__PURE__*/_react["default"].createElement("span", {
       className: "okr-detail-head-parent"
     }, /*#__PURE__*/_react["default"].createElement("i", {
       className: "tu-icon-liebiao-duiqinubiao"
     }), /*#__PURE__*/_react["default"].createElement("span", {
       onClick: function onClick() {
-        return parent.type === "okr" ? _drawerManager["default"].open("okrDetail", {
+        return parent.type === 'okr' ? _drawerManager["default"].open('okrDetail', {
           okrId: parent.id
-        }) : _drawerManager["default"].open("krDetail", {
+        }) : _drawerManager["default"].open('krDetail', {
           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
   }), /*#__PURE__*/_react["default"].createElement(_okrShare["default"], {
     visible: shareVisible,
     onClose: closeShareModal,
@@ -412,7 +423,7 @@ function OkrDetailHeader(_ref) {
                   });
 
                 case 2:
-                  _toast["default"].Success((0, _getLocale.getLocale)("Pro_detail_Deletsuccess"));
+                  _toast["default"].Success((0, _getLocale.getLocale)('Pro_detail_Deletsuccess'));
 
                   setTimeout(function () {
                     commonContext.refreshAll();
@@ -436,7 +447,7 @@ function OkrDetailHeader(_ref) {
     })
   }, /*#__PURE__*/_react["default"].createElement("span", null)), /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      textAlign: "right",
+      textAlign: 'right',
       height: 0
     }
   }, /*#__PURE__*/_react["default"].createElement(_userSelector["default"], {
@@ -450,9 +461,9 @@ function OkrDetailHeader(_ref) {
     selectNodes: context.generalVisibility.visibilityScope || {},
     trigger: /*#__PURE__*/_react["default"].createElement("div", {
       style: {
-        visibility: "hidden",
+        visibility: 'hidden',
         zIndex: -1,
-        display: "inline-block",
+        display: 'inline-block',
         height: 0
       }
     }, "empty select")

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

@@ -17,6 +17,8 @@ var _header = _interopRequireDefault(require("./components/header"));
 
 var _tabs = _interopRequireWildcard(require("../tabs"));
 
+var _request = require("../../utils/request");
+
 var _tabPanelContent = _interopRequireDefault(require("./components/tab-panel-content"));
 
 var _baseInfo = _interopRequireDefault(require("./base-info"));

package/lib/components/okr-flow/child-node/index.css

@@ -37,7 +37,8 @@
 .titaui-okr-flow--node {
   position: relative;
   padding: 10px 12px;
-  width: 340px;
+  width: 320px;
+  height: 96px;
   background: #ffffff;
   box-shadow: 0px 4px 10px 0px rgba(127, 145, 180, 0.1);
   border-radius: 6px;
@@ -74,57 +75,20 @@
   white-space: unset;
 }
 
-.titaui-okr-flow--node-krs {
-  margin-top: 12px;
-}
-
-.titaui-okr-flow--node-kr {
-  display: flex;
-  line-height: 20px;
-}
-
-.titaui-okr-flow--node-kr-icon {
-  color: rgba(40, 121, 255, 0.6);
-  margin-right: 8px;
-}
-
-.titaui-okr-flow--node-kr-title {
-  flex: 1;
-  font-size: 13px;
-  font-weight: 400;
-  color: #3F4755;
-}
-
-.titaui-okr-flow--node-kr-progress {
-  width: 32px;
-  text-align: right;
-  margin-left: 8px;
-}
-
-.titaui-okr-flow--node-kr-status--normal {
-  color: #2879ff;
-}
-
-.titaui-okr-flow--node-kr-status--risk {
-  color: #f6bd16;
-}
-
-.titaui-okr-flow--node-kr-status--expired {
-  color: #f05e5e;
-}
-
-.titaui-okr-flow--node-kr-status--complete {
-  color: #5ad8a6;
-}
-
 .titaui-okr-flow--node-title {
   max-width: 252px;
+  height: 44px;
   margin-right: 54px;
   margin-bottom: 8px;
-  line-height: 24px;
+  line-height: 22px;
   color: #141c28;
   font-size: 14px;
-  font-weight: 600;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  text-overflow: ellipsis;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
 }
 
 .titaui-okr-flow--node-desp {

package/lib/components/okr-flow/child-node/work-node.js

@@ -71,7 +71,6 @@ function WorkNode(_ref) {
       manualRiskLevel = data.manualRiskLevel,
       progress = data.progress,
       okrClassify = data.okrClassify,
-      Krs = data.Krs,
       cycleType = data.cycleType,
       startDate = data.startDate,
       endDate = data.endDate,
@@ -93,8 +92,6 @@ function WorkNode(_ref) {
       imgWidth = _useState6[0],
       setImgWidth = _useState6[1];
 
-  var bodyr = (0, _react.useRef)();
-
   var getOkrTypeMap = function getOkrTypeMap() {
     return {
       1: (0, _getLocale.getLocale)("OKR_MyO_Pop_Individual"),
@@ -213,13 +210,12 @@ function WorkNode(_ref) {
   }; // 1：正常 2：有风险 3：过期 4:完成 5：过期完成 ,
 
 
-  var riskLevelSuffix = ["normal", "normal", "risk", "expired", "complete", "complete_over", "normal"];
+  var riskLevelSuffix = ["normal", "normal", "risk", "expired", "complete", "complete_over"];
   if (!MapOkrVisible) return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "--node"), "".concat(_precls["default"], "--node__private"))
   });
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(_precls["default"], "--node"), _defineProperty({}, "".concat(_precls["default"], "--node__search"), isSearchRes)),
-    ref: bodyr
+    className: (0, _classnames["default"])("".concat(_precls["default"], "--node"), _defineProperty({}, "".concat(_precls["default"], "--node__search"), isSearchRes))
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "--node-title"))
   }, workName, /*#__PURE__*/_react["default"].createElement(_okrClassify["default"], {
@@ -234,19 +230,7 @@ function WorkNode(_ref) {
     className: (0, _classnames["default"])("".concat(_precls["default"], "--node-type"))
   }, getOkrTypeMap()[okrType])), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "--node-cycle"))
-  }, getCycleTextByType()))), !!(Krs !== null && Krs !== void 0 && Krs.length) && /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(_precls["default"], "--node-krs"))
-  }, Krs.map(function (item, key) {
-    return /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(_precls["default"], "--node-kr"))
-    }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(_precls["default"], "--node-kr-icon"))
-    }, "KR", item.SortNum + 1), /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(_precls["default"], "--node-kr-title"))
-    }, item.mileStoneName), /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(_precls["default"], "--node-kr-progress ").concat(_precls["default"], "--node-kr-status--").concat(riskLevelSuffix[item.riskLevel]))
-    }, item.progress, "%"));
-  })), /*#__PURE__*/_react["default"].createElement("span", {
+  }, getCycleTextByType()))), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "--node-status"), "".concat(_precls["default"], "--node-status__").concat(riskLevelSuffix[manualRiskLevel]))
   }, /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
     text: "".concat(progress, "%"),