@titaui/pc 1.10.6-3.beta-10 → 1.10.7-2.beta-1

package/.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-# npm run lint-staged
+npm run lint-staged

package/lib/components/dynamic/dynamic.js

@@ -221,7 +221,10 @@ var Dynamic = function Dynamic() {
         setNoMoreData(resp.Data.isEnd);
 
         if (needResetValue) {
-          setDynamicData(resp.Data.feeds);
+          setDynamicData([]);
+          setTimeout(function () {
+            setDynamicData(resp.Data.feeds);
+          }, 0);
         } else {
           setDynamicData(JSON.parse(JSON.stringify([].concat(_toConsumableArray(dynamicData), _toConsumableArray(resp.Data.feeds)))));
         }

package/lib/components/dynamic/online-broadcast/data.js

@@ -18,10 +18,22 @@ exports.onlineBroadcastData = exports["default"] = void 0;
 //   href = "https://wiki.tita.com/pages/viewpage.action?pageId=15697741";
 // }
 var onlineBroadcastData = [{
+  hasOnline: true,
+  preContent: "「OKR 工作法」体验优化 ",
+  preHref: "https://wiki.tita.com/x/jIOeAQ",
+  isNew: true,
+  date: "3/29"
+}, {
+  hasOnline: true,
+  preContent: "新增「同步钉钉待办」，工作实时掌握",
+  preHref: "https://wiki.tita.com/x/DIOeAQ",
+  isNew: true,
+  date: "3/18"
+}, {
   hasOnline: true,
   preContent: "「考核」支持建立企业指标库",
   preHref: "https://wiki.tita.com/x/vYGeAQ",
-  isNew: true,
+  isNew: false,
   date: "2/17"
 }, {
   hasOnline: true,

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

@@ -5,35 +5,49 @@
   display: flex;
 }
 
+.tita-okrdt-tree__e-kr-node:hover .tita-okrdt-tree__e-kr-node-actions {
+  opacity: 1;
+  transition: all 0.2s linear;
+}
+
+.tita-okrdt-tree__e-kr-node-preicon {
+  display: inline-block;
+  line-height: 18px;
+  color: #2879ff;
+  font-size: 16px;
+}
+
 .tita-okrdt-tree__e-kr-node-prefix {
   display: inline-block;
-  height: 22px;
-  font-size: 14px;
+  height: 18px;
+  font-size: 12px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   color: #2879ff;
-  line-height: 22px;
+  line-height: 18px;
 }
 
 .tita-okrdt-tree__e-kr-node-title {
   display: inline-block;
   margin-left: 4px;
-  height: 22px;
-  font-size: 14px;
+  height: 18px;
+  font-size: 12px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   color: #89919f;
-  line-height: 22px;
+  line-height: 18px;
   width: 100%;
 }
 
 .tita-okrdt-tree__e-kr-node-actions {
   display: inline-block;
+  opacity: 0;
   position: absolute;
   right: 0;
+  transition: all 0.2s linear;
 }
 
 .tita-okrdt-tree__e-kr-node-actions-create {
   height: 18px;
-  font-size: 13px;
+  font-size: 12px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   color: #2879ff;
   line-height: 18px;
@@ -43,7 +57,7 @@
 }
 
 .tita-okrdt-tree__e-kr-node-actions-create:hover {
-  color: #5C8EFF;
+  color: #5c8eff;
 }
 
 .tita-okrdt-tree__e-kr-node-actions-create .tu-icon-add1 {
@@ -52,7 +66,7 @@
 
 .tita-okrdt-tree__e-kr-node-actions-connect {
   height: 18px;
-  font-size: 13px;
+  font-size: 12px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   color: #2879ff;
   line-height: 18px;
@@ -63,11 +77,11 @@
 }
 
 .tita-okrdt-tree__e-kr-node-actions-connect:hover {
-  color: #5C8EFF;
+  color: #5c8eff;
 }
 
 .e-kr-node-layer-icon {
-  color: #89919F;
+  color: #89919f;
 }
 
 .e-kr-node__guanlian-icon {

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

@@ -172,7 +172,9 @@ var EKrNode = function EKrNode(props) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     key: index,
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node"))
-  }, isOTask ? null : /*#__PURE__*/_react["default"].createElement("span", {
+  }, isOTask ? /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("tu-icon-O ".concat(_precls["default"], "__e-kr-node-preicon"))
+  }) : /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-prefix"))
   }, "KR", index + 1), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-title")),

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

@@ -71,7 +71,9 @@ function _default(props) {
       _props$hasProgress = props.hasProgress,
       hasProgress = _props$hasProgress === void 0 ? true : _props$hasProgress,
       _props$hasRelation = props.hasRelation,
-      hasRelation = _props$hasRelation === void 0 ? true : _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),
@@ -146,7 +148,7 @@ function _default(props) {
     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,

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

@@ -95,7 +95,9 @@ function ETaskNode(props) {
       _props$hasRelation = props.hasRelation,
       hasRelation = _props$hasRelation === void 0 ? true : _props$hasRelation,
       _props$isPushScreen = props.isPushScreen,
-      isPushScreen = _props$isPushScreen === void 0 ? false : _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),
@@ -370,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,

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;
 }
 
@@ -171,14 +171,14 @@
   height: 20px;
   font-size: 12px;
   font-weight: 400;
-  color: #F05E5E;
+  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 {
@@ -235,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 {
@@ -254,7 +254,7 @@
   color: #89919f;
   cursor: auto;
   width: 64px;
-  margin-left: 4px;
+  margin-left: 16px;
   margin-right: 4px;
 }
 
@@ -357,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 {
@@ -376,7 +376,7 @@
   color: #89919f;
   cursor: auto;
   width: 64px;
-  margin-left: 4px;
+  margin-left: 16px;
   margin-right: 4px;
 }
 
@@ -398,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;
 }
@@ -408,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/e-list/index.js

@@ -183,13 +183,6 @@ function Elist(props, ref) {
     setTotalDataNum(totalLength);
     setIsEmpty && setIsEmpty(!totalLength);
   }, [krList, oEList]);
-  var krsTree = (0, _react.useCallback)(function (kr) {
-    return /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
-      key: Math.random(),
-      data: [kr],
-      defaultExpandedKeys: expandedKrEs
-    });
-  }, [expandedKrEs, krList]);
   return /*#__PURE__*/_react["default"].createElement(_context.EListContext.Provider, {
     value: {
       refreshEList: function refreshEList() {
@@ -214,11 +207,15 @@ function Elist(props, ref) {
   }, krList.map(function (kr, index) {
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], {
       padding: layoutPadding
-    }, krsTree(kr)), // kr左后一个节点 && 没有 OE 时，不显示横线
+    }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
+      key: Math.random(),
+      data: [kr],
+      defaultExpandedKeys: expandedKrEs
+    })), // kr左后一个节点 && 没有 OE 时，不显示横线
     !(index + 1 == krList.length && oEList.length == 0) && hasdivider && /*#__PURE__*/_react["default"].createElement("div", {
       className: "e__divider"
     }));
-  }), oEList.map(function (kr) {
+  }), !!oEList && !!oEList.length && oEList.map(function (kr) {
     return /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], {
       padding: layoutPadding
     }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {

package/lib/components/okr-flow/root-node/index.js

@@ -102,7 +102,20 @@ function RootNode(props) {
         style: {
           backgroundColor: color
         }
-      }, rootName[0]);
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        style: {
+          height: '24px',
+          width: '12px',
+          overflow: 'hidden',
+          margin: '0px auto'
+        }
+      }, /*#__PURE__*/_react["default"].createElement("img", {
+        src: whiteRootImg,
+        style: {
+          maxWidth: 268
+        },
+        width: imgWidth
+      })));
     }
 
     if (searchType == "depart") {

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

@@ -6,6 +6,7 @@
   display: flex;
   align-items: center;
   position: relative;
+  height: 24px;
 }
 
 .okr-progress-item-wrapper .okr-progress-item-content__icon-state {
@@ -15,7 +16,7 @@
 .okr-progress-item-wrapper .okr-progress-item__percent {
   font-size: 16px;
   font-weight: 600;
-  color: #3F4755;
+  color: #3f4755;
   line-height: 24px;
   margin-left: 12px;
 }
@@ -28,11 +29,11 @@
 }
 
 .okr-progress-item-wrapper .okr-progress-item__percent--advance {
-  color: #5AD8A6;
+  color: #5ad8a6;
 }
 
 .okr-progress-item-wrapper .okr-progress-item__percent--delay {
-  color: #F05E5E;
+  color: #f05e5e;
 }
 
 .okr-progress-item-wrapper .okr-progress-item-content--edit {
@@ -42,7 +43,7 @@
 }
 
 .okr-progress-item-wrapper .okr-progress-item-content--edit:hover {
-  background: #F7F8FA;
+  background: #f7f8fa;
 }
 
 .okr-progress-item-wrapper .okr-progress-item-content__body-wrapper {
@@ -60,7 +61,7 @@
 
 .okr-progress-item-wrapper .okr-progress-item-content__body-wrapper .okr-progress-item-content__body .okr-progress-item__content {
   font-size: 14px;
-  color: #3F4755;
+  color: #3f4755;
   line-height: 22px;
   white-space: pre-wrap;
 }
@@ -73,7 +74,7 @@
 
 .okr-progress-item-wrapper .okr-progress-item__content-bottom {
   font-size: 12px;
-  color: #A4ACB9;
+  color: #a4acb9;
   line-height: 18px;
   margin-top: 6px;
   display: flex;
@@ -88,12 +89,12 @@
 }
 
 .okr-progress-item-wrapper .okr-progress-item__content-bottom .okr-progress-item__bottom-func-btns .okr-progress-item__bottom-btn--edit:hover {
-  color: #2879FF;
+  color: #2879ff;
   cursor: pointer;
 }
 
 .okr-progress-item-wrapper .okr-progress-item__content-bottom .okr-progress-item__bottom-func-btns .okr-progress-item__bottom-btn--delete:hover {
-  color: #F05E5E;
+  color: #f05e5e;
   cursor: pointer;
 }
 
@@ -106,7 +107,7 @@
   display: inline-block;
   width: 1px;
   height: 16px;
-  background: linear-gradient(180deg, rgba(213, 219, 226, 0) 0%, #D5DBE2 49%, rgba(213, 219, 226, 0) 100%);
+  background: linear-gradient(180deg, rgba(213, 219, 226, 0) 0%, #d5dbe2 49%, rgba(213, 219, 226, 0) 100%);
   border-radius: 2px;
 }
 
@@ -129,7 +130,7 @@
   right: 0;
   font-size: 12px;
   font-weight: 400;
-  color: #A4ACB9;
+  color: #a4acb9;
   line-height: 24px;
   padding-right: 16px;
 }

package/lib/components/okr-progress-detail/utils.js

@@ -22,8 +22,8 @@ var getTimeString = function getTimeString(time, nowTime) {
   var timeYear = timeDateObj.getFullYear();
   var timeMonth = timeDateObj.getMonth() + 1;
   var timeDate = timeDateObj.getDate();
-  var timeHours = timeDateObj.getHours();
-  var timeMinutes = timeDateObj.getMinutes();
+  var timeHours = timeDateObj.getHours() < 10 ? "0".concat(timeDateObj.getHours()) : timeDateObj.getHours();
+  var timeMinutes = timeDateObj.getMinutes() < 10 ? "0".concat(timeDateObj.getMinutes()) : timeDateObj.getMinutes();
   var nowMilliSecond = nowTime.getTime();
   var nowYear = nowTime.getFullYear();
   var nowDate = nowTime.getDate();
@@ -56,11 +56,11 @@ var getTimeString = function getTimeString(time, nowTime) {
   if (timeYear === nowYear) {
     var _dateStr = months[timeMonth - 1] + (_getLocale.isEn ? " ".concat(timeDate, " ") : "".concat(timeDate, "\u65E5"));
 
-    return "".concat(_dateStr, " ").concat(timeHours < 10 ? "0".concat(timeHours) : timeHours, ":").concat(timeMinutes < 10 ? "0".concat(timeMinutes) : timeMinutes);
+    return "".concat(_dateStr, " ", "".concat(timeHours, ":").concat(timeMinutes));
   }
 
   var dateStr = (_getLocale.isEn ? "" : "".concat(timeYear, "\u5E74")) + months[timeMonth - 1] + (_getLocale.isEn ? " ".concat(timeDate, " ") : "".concat(timeDate, "\u65E5")) + (_getLocale.isEn ? ",".concat(timeYear) : "");
-  return "".concat(dateStr, " ").concat(timeHours < 10 ? "0".concat(timeHours) : timeHours, ":").concat(timeMinutes < 10 ? "0".concat(timeMinutes) : timeMinutes);
+  return "".concat(dateStr, " ", "".concat(timeHours, ":").concat(timeMinutes));
 };
 
 exports.getTimeString = getTimeString;

package/lib/components/tree/index.css

@@ -37,7 +37,7 @@
   position: absolute;
   width: 100%;
   bottom: 0;
-  content: "";
+  content: '';
   border-bottom: 2px solid #2879ff;
   z-index: 1;
 }
@@ -51,7 +51,7 @@
   position: absolute;
   width: 100%;
   top: 0;
-  content: "";
+  content: '';
   border-top: 2px solid #2879ff;
   z-index: 1;
 }
@@ -61,6 +61,7 @@
   align-items: center;
   line-height: unset;
   overflow: hidden;
+  border-radius: 8px;
 }
 
 .titaui-tree .rc-tree .rc-tree-treenode .rc-tree-node-content-wrapper {

package/lib/pages/new-okr-list/index.js

@@ -214,8 +214,7 @@ var NewOkrList = function NewOkrList(props) {
     if (!relation) {
       request = (0, _requestApi.okrSearch)(params);
     } else {
-      // request = okrList(params);
-      request = (0, _requestApi.okrSearch)(params);
+      request = (0, _requestApi.okrList)(params);
     }
 
     setLoading(true);

package/lib/utils/auth.js

@@ -92,8 +92,10 @@ var OAuth = /*#__PURE__*/function (_BaseAuth) {
   }, {
     key: "isPrincipalUser",
     value: function isPrincipalUser() {
+      var _this$principalUser;
+
       // console.log('o isp', this.userId, this.principalUser.userId)
-      return this.userId == this.principalUser.userId;
+      return this.userId == ((_this$principalUser = this.principalUser) === null || _this$principalUser === void 0 ? void 0 : _this$principalUser.userId);
     } // 有操作OKR的權限
 
   }, {
@@ -139,8 +141,10 @@ var KRAuth = /*#__PURE__*/function (_BaseAuth2) {
   }, {
     key: "isPrincipalUser",
     value: function isPrincipalUser() {
+      var _this$user;
+
       // console.log('kr isp', this.userId, this.user.userId)
-      return this.userId == this.user.userId;
+      return this.userId == ((_this$user = this.user) === null || _this$user === void 0 ? void 0 : _this$user.userId);
     } // 有操作KR的權限
 
   }, {
@@ -178,15 +182,19 @@ var EAuth = /*#__PURE__*/function (_BaseAuth3) {
   _createClass(EAuth, [{
     key: "isCreater",
     value: function isCreater() {
+      var _this$user2;
+
       // console.log('e iscreater', this.userId, this.user.userId)
-      return this.userId == this.user.userId;
+      return this.userId == ((_this$user2 = this.user) === null || _this$user2 === void 0 ? void 0 : _this$user2.userId);
     } // 負責人
 
   }, {
     key: "isPrincipalUser",
     value: function isPrincipalUser() {
+      var _this$principalUser2;
+
       // console.log('e isp', this.userId, this.principalUser.userId)
-      return this.userId == this.principalUser.userId;
+      return this.userId == ((_this$principalUser2 = this.principalUser) === null || _this$principalUser2 === void 0 ? void 0 : _this$principalUser2.userId);
     } // 有操作KR的權限
 
   }, {
@@ -268,7 +276,9 @@ var ChildAuth = /*#__PURE__*/function (_BaseAuth5) {
   _createClass(ChildAuth, [{
     key: "isPrincipalUser",
     value: function isPrincipalUser() {
-      return this.userId == this.principalUser.userId;
+      var _this$principalUser3;
+
+      return this.userId == ((_this$principalUser3 = this.principalUser) === null || _this$principalUser3 === void 0 ? void 0 : _this$principalUser3.userId);
     } // 超管、助理、目标管理员以及目标负责人可以修改此目标下对齐子目标的权重；
 
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.10.63.beta-10",
+  "version": "1.10.72.beta-1",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",