@titaui/pc 1.12.26-beta.1 → 1.12.26-beta.4

package/lib/components/avatar/default.js

@@ -96,7 +96,9 @@ var Avatar = function Avatar(props) {
       style: {
         width: size.width,
         height: size.width,
-        verticalAlign: "top"
+        verticalAlign: "top",
+        borderRadius: '50%',
+        overflow: 'hidden'
       },
       src: src
     });
@@ -119,7 +121,8 @@ var Avatar = function Avatar(props) {
           overflow: "hidden",
           whiteSpace: "nowrap",
           fontSize: "".concat(size.fontSize, "px"),
-          lineHeight: "".concat(size.width, "px")
+          lineHeight: "".concat(size.width, "px"),
+          borderRadius: '50%'
         }
       }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
         name: name,

package/lib/components/avatar/index.css

@@ -20,6 +20,8 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  border-radius: 50%;
+  overflow: hidden;
 }
 
 .titaui-pc-avator__delete-wrapper {

package/lib/components/drop-selector/index.js

@@ -23,7 +23,7 @@ require("./index.css");
 var _iconItem = _interopRequireDefault(require("./icon-item"));
 
 var _excluded = ["name", "multi", "children", "onClick", "className"],
-    _excluded2 = ["trigger", "triggerIcon", "destroyPopupOnHide", "popupPlacement", "hideOnChange", "onChange", "canEdit", "popAction", "onPopupVisibleChange"];
+    _excluded2 = ["trigger", "triggerIcon", "destroyPopupOnHide", "popupPlacement", "hideOnChange", "onChange", "canEdit", "popAction", "onPopupVisibleChange", "popupProps"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -142,6 +142,8 @@ function DropSelector(props) {
       _props$popAction = props.popAction,
       popAction = _props$popAction === void 0 ? ['click'] : _props$popAction,
       onPopupVisibleChange = props.onPopupVisibleChange,
+      _props$popupProps = props.popupProps,
+      popupProps = _props$popupProps === void 0 ? {} : _props$popupProps,
       restProps = _objectWithoutProperties(props, _excluded2);
 
   var _useState3 = (0, _react.useState)(false),
@@ -175,16 +177,17 @@ function DropSelector(props) {
     }
   };
 
-  return /*#__PURE__*/_react["default"].createElement(_popup["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_popup["default"], _extends({
     popupVisible: canEdit && realVisible,
     popupPlacement: popupPlacement,
     onPopupVisibleChange: handlePopVisibleChange,
     destroyPopupOnHide: destroyPopupOnHide,
-    action: popAction,
+    action: popAction
+  }, popupProps, {
     popup: /*#__PURE__*/_react["default"].createElement(DropSelectorLayer, _extends({}, restProps, {
       onItemClick: onMenuClickHandler
     }))
-  }, trigger);
+  }), trigger);
 }
 
 DropSelector.IconItem = IconItem;

package/lib/components/dynamic/dynamic-item/components/okr-progress/index.css

@@ -1,3 +1,7 @@
+.titaui-okr-progress {
+  padding: 12px 0;
+}
+
 .titaui-okr-progress__title {
   font-size: 18px;
   font-weight: 600;

package/lib/components/dynamic/dynamic-item/components/okr-progress/index.js

@@ -59,6 +59,7 @@ var OkrProgress = function OkrProgress(_ref) {
       rowsData = _useState2[0],
       setRowsData = _useState2[1];
 
+  var krOrder = 0;
   var renderTable = (0, _react.useMemo)(function () {
     return /*#__PURE__*/_react["default"].createElement("table", null, /*#__PURE__*/_react["default"].createElement("thead", null, /*#__PURE__*/_react["default"].createElement("tr", {
       className: "".concat(prefix, "__table-title")
@@ -78,8 +79,9 @@ var OkrProgress = function OkrProgress(_ref) {
       }
     }, /*#__PURE__*/_react["default"].createElement("i", {
       className: "tu-icon-wiki ".concat(prefix, "__table-title-progress-desc-icon")
-    }))))), /*#__PURE__*/_react["default"].createElement("tbody", null, rowsData && rowsData.Rows.map(function (item) {
+    }))))), /*#__PURE__*/_react["default"].createElement("tbody", null, rowsData && rowsData.Rows.map(function (item, index) {
       if (item.Type === _constant.OkrType.OType) {
+        krOrder = 0;
         return /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement(_tableRowOkr["default"], {
           text: "".concat(item.Name),
           isO: true,
@@ -94,11 +96,13 @@ var OkrProgress = function OkrProgress(_ref) {
           id: item.Id
         })));
       } else if (item.Type === _constant.OkrType.KRType) {
+        krOrder += 1;
         return /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement(_tableRowOkr["default"], {
           text: "".concat(item.Name),
           isO: false,
           isFirstLevel: false,
-          id: item.Id
+          id: item.Id,
+          order: krOrder
         })), /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement(_progress["default"], {
           type: "kr",
           status: _constant.OkrRiskMapping[item.Status],

package/lib/components/dynamic/dynamic-item/components/summary-header/index.js

@@ -364,6 +364,9 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
     onChange: onChangeHandler,
     multi: false,
     visible: selectVisible,
+    popupProps: {
+      zIndex: 1000
+    },
     trigger: /*#__PURE__*/_react["default"].createElement("span", {
       className: (0, _classnames["default"])("".concat(prefix, "-right"), 'tu-icon-more1'),
       onClick: handleShowDropSelector

package/lib/components/dynamic/dynamic-item/components/table-row-o-project/index.css

@@ -5,6 +5,7 @@
   word-break: keep-all;
   white-space: nowrap;
   color: #89919F;
+  padding: 8px 0;
 }
 
 .titaui-dynamic-summary-table-row-o-project:hover {
@@ -22,3 +23,8 @@
   font-size: 12px;
   margin-left: 4px;
 }
+
+.titaui-dynamic-summary-table-row-o-project--disable:hover {
+  cursor: default;
+  color: #89919F;
+}

package/lib/components/dynamic/dynamic-item/components/table-row-o-project/index.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _tooltip = _interopRequireDefault(require("../../../../tooltip"));
 
 var _drawerManager = _interopRequireDefault(require("../../../../drawer-manager"));
@@ -15,36 +17,37 @@ require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var prefix = "titaui-dynamic-summary-table-row-o-project";
+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; }
+
+var prefix = 'titaui-dynamic-summary-table-row-o-project';
 
 var TableRowOProject = function TableRowOProject(_ref) {
-  var id = _ref.id,
-      _ref$isO = _ref.isO,
-      isO = _ref$isO === void 0 ? true : _ref$isO,
-      text = _ref.text,
+  var _classNames2;
+
+  var data = _ref.data,
       _ref$extraClass = _ref.extraClass,
       extraClass = _ref$extraClass === void 0 ? '' : _ref$extraClass;
 
   var handleTitleClick = function handleTitleClick() {
-    if (isO) {
-      _drawerManager["default"].open("okrDetail", {
-        okrId: id
+    if (data.ParentObjType === 62) {
+      _drawerManager["default"].open('okrDetail', {
+        okrId: data.Id
       });
-    } else {
-      window.open(window.location.href.replace(window.location.hash, "#work?iTalentNavCode=tita-work&work_id=".concat(id)));
+    } else if (data.ParentObjType === 4) {
+      window.open(window.location.href.replace(window.location.hash, "#work?iTalentNavCode=tita-work&work_id=".concat(data.Id)));
     }
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, " ").concat(extraClass),
+    className: (0, _classnames["default"])("".concat(prefix, " ").concat(extraClass), _defineProperty({}, "".concat(prefix, "--disable"), data.Id === -1)),
     onClick: handleTitleClick
   }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: "".concat(prefix, "__icon tu-icon-").concat(isO ? "H5-O-s" : "project-s")
+    className: (0, _classnames["default"])("".concat(prefix, "__icon"), (_classNames2 = {}, _defineProperty(_classNames2, "tu-icon-H5-O-s", data.ParentObjType === 62), _defineProperty(_classNames2, "tu-icon-project-s", data.ParentObjType === 4), _classNames2))
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__text")
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     isPercent: true,
-    text: text
+    text: data.Name
   })));
 };
 

package/lib/components/dynamic/dynamic-item/components/task-progress/index.css

@@ -1,5 +1,5 @@
 .titaui-dynamic-summary-task-progress {
-  margin-top: 24px;
+  padding: 12px 0;
 }
 
 .titaui-dynamic-summary-task-progress__title {
@@ -48,7 +48,6 @@
   padding: 0 8px;
   height: 20px;
   display: inline-flex;
-  align-items: center;
   font-size: 12px;
   color: #3f4755;
   line-height: 18px;
@@ -56,9 +55,8 @@
 }
 
 .titaui-dynamic-summary-task-progress__table-row-title-worktime {
+  display: inline-flex;
   margin-left: 4px;
-  display: flex;
-  align-items: center;
   height: 20px;
   padding: 0 8px;
   border-radius: 12px;
@@ -111,6 +109,12 @@
   border-right: 1px solid #dfe3ea;
 }
 
+.titaui-dynamic-summary-task-progress__table table tbody tr td:first-child {
+  overflow: hidden;
+  width: 282px;
+  max-width: 282px;
+}
+
 .titaui-dynamic-summary-task-progress__table table tbody tr td:last-child {
   border-right: unset;
 }

package/lib/components/dynamic/dynamic-item/components/task-progress/index.js

@@ -130,13 +130,11 @@ var TaskProgress = function TaskProgress(_ref) {
         setActiveId(3);
       }
     }
-  }, [data]); // if(data && typeof data === 'string') {
-  //   // debugger
-  //   const
-  //   if(!JSON.parse(data) || !JSON.parse(data).length) {
-  //     return null
-  //   }
-  // }
+  }, [data]);
+
+  if (statusStatistic.done + statusStatistic.doing + statusStatistic.overDue === 0) {
+    return null;
+  }
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix

package/lib/components/dynamic/dynamic-item/components/task-progress/render-row.js

@@ -64,12 +64,9 @@ var RenderRow = function RenderRow(_ref) {
       return /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("td", {
         colSpan: 3
       }, /*#__PURE__*/_react["default"].createElement(_tableRowOProject["default"], {
-        id: item.Id // 6: okr 4: 项目
+        data: item // 6: okr 4: 项目
         ,
-        isO: item.ParentObjType === 6,
-        extraClass: "".concat(prefix, "__table-obj"),
-        text: item.Name,
-        notIcon: item.ParentObjType !== 4 && item.ParentObjType !== 6
+        extraClass: "".concat(prefix, "__table-obj")
       })));
     }
   };

package/lib/components/dynamic/dynamic-item/dynamic-new-report/components/evalute/index.css

@@ -1,7 +1,10 @@
 .titaui-dynamic-summary__evalute-card {
   position: relative;
   width: 100%;
-  background: rgba(240, 163, 38, 0.12);
+  background-color: rgba(240, 163, 38, 0.12);
+  background-size: 82px 100%;
+  background-position: calc(100% - 8px) 8px;
+  background-repeat: no-repeat;
   border-radius: 12px;
   margin-top: 24px;
   padding: 16px 8px 14px 16px;

package/lib/components/dynamic/dynamic-item/dynamic-new-report/components/evalute/index.js

@@ -9,6 +9,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _avatar = _interopRequireDefault(require("../../../../../../components/avatar"));
 
 var _rate = _interopRequireDefault(require("../../../../../rate"));
@@ -17,20 +19,12 @@ var _getLocale = require("../../../../../../utils/getLocale");
 
 var _commentsDialog = _interopRequireDefault(require("../../../../components/comments-dialog"));
 
-var _evaluateBig = _interopRequireDefault(require("./img/evaluate-big.png"));
-
 var _niceSmall = _interopRequireDefault(require("./img/nice-small.png"));
 
-var _niceBig = _interopRequireDefault(require("./img/nice-big.png"));
-
 var _veryGoodSmall = _interopRequireDefault(require("./img/very-good-small.png"));
 
-var _veryGoodBig = _interopRequireDefault(require("./img/very-good-big.png"));
-
 var _comeOnSmall = _interopRequireDefault(require("./img/come-on-small.png"));
 
-var _comeOnBig = _interopRequireDefault(require("./img/come-on-big.png"));
-
 var _veryGoodWrite = _interopRequireDefault(require("./img/very-good-write.png"));
 
 var _niceWrite = _interopRequireDefault(require("./img/nice-write.png"));
@@ -72,37 +66,34 @@ var modalType;
   modalType[modalType["comeOn"] = 3] = "comeOn";
 })(modalType || (modalType = {}));
 
-var getRemarkTypeList = function getRemarkTypeList() {
-  var remarkTypeList = [{
-    id: modalType.veryGood,
-    name: (0, _getLocale.getLocale)("Rep_NewS_Marvelous"),
-    smallImg: _veryGoodSmall["default"],
-    bigImg: _veryGoodBig["default"],
-    bgc: "rgba(240, 163, 38, 0.12)",
-    writeImg: _veryGoodWrite["default"],
-    textColor: "rgba(189, 117, 0, 1)"
-  }, {
-    id: modalType.nice,
-    name: "干的不错",
-    smallImg: _niceSmall["default"],
-    bigImg: _niceBig["default"],
-    bgc: "rgba(255, 171, 103, 0.12)",
-    writeImg: _niceWrite["default"],
-    textColor: "rgba(204, 102, 61, 1)"
-  }, {
-    id: modalType.comeOn,
-    name: (0, _getLocale.getLocale)("Rep_NewS_MakePerEffo"),
-    smallImg: _comeOnSmall["default"],
-    bigImg: _comeOnBig["default"],
-    bgc: "rgba(240, 94, 94, 0.12)",
-    writeImg: _comeOnWrite["default"],
-    textColor: "rgba(214, 25, 0, 1)"
-  }];
-  return remarkTypeList;
-};
+var RemarkTypeList = [{
+  id: modalType.veryGood,
+  name: (0, _getLocale.getLocale)("Rep_NewS_Marvelous"),
+  smallImg: _veryGoodSmall["default"],
+  bgc: "rgba(240, 163, 38, 0.12)",
+  writeImg: _veryGoodWrite["default"],
+  textColor: "rgba(189, 117, 0, 1)",
+  key: "very-good"
+}, {
+  id: modalType.nice,
+  name: "干的不错",
+  smallImg: _niceSmall["default"],
+  bgc: "rgba(255, 171, 103, 0.12)",
+  writeImg: _niceWrite["default"],
+  textColor: "rgba(204, 102, 61, 1)",
+  key: "nice-write"
+}, {
+  id: modalType.comeOn,
+  name: (0, _getLocale.getLocale)("Rep_NewS_MakePerEffo"),
+  smallImg: _comeOnSmall["default"],
+  bgc: "rgba(240, 94, 94, 0.12)",
+  writeImg: _comeOnWrite["default"],
+  textColor: "rgba(214, 25, 0, 1)",
+  key: "come-on"
+}];
 
 var EvaluteCard = function EvaluteCard(props) {
-  var _user$avatar;
+  var _classNames, _user$avatar;
 
   var evaluation = props.evaluation,
       feedId = props.feedId,
@@ -123,8 +114,8 @@ var EvaluteCard = function EvaluteCard(props) {
     bgc: "rgba(240, 163, 38, 0.12)"
   }),
       _useState4 = _slicedToArray(_useState3, 2),
-      evaluateContentBgc = _useState4[0],
-      setEvaluateContentBgc = _useState4[1];
+      evaluateConfig = _useState4[0],
+      setEvaluateConfig = _useState4[1];
 
   var _useState5 = (0, _react.useState)(false),
       _useState6 = _slicedToArray(_useState5, 2),
@@ -148,25 +139,21 @@ var EvaluteCard = function EvaluteCard(props) {
       setCurrentEvalute(evaluation);
 
       if (type === 1) {
-        setEvaluateContentBgc({
+        setEvaluateConfig({
           bgc: "rgba(240, 163, 38, 0.12)"
         });
       } else if (type === 2) {
-        getRemarkTypeList().filter(function (item) {
+        var curTypeConfig = RemarkTypeList.find(function (item) {
           return item.id === Number(value);
-        });
-        setEvaluateContentBgc({
-          bgc: getRemarkTypeList().filter(function (item) {
-            return item.id === Number(value);
-          })[0].bgc
-        });
+        }) || {};
+        setEvaluateConfig(curTypeConfig);
       }
     }
   }, [evaluation]);
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: preCls,
+    className: (0, _classnames["default"])(preCls, (_classNames = {}, _defineProperty(_classNames, "".concat(preCls, "__score"), type === 1), _defineProperty(_classNames, "".concat(preCls, "__").concat(evaluateConfig.key), type === 2), _classNames)),
     style: {
-      background: evaluateContentBgc.bgc
+      backgroundColor: evaluateConfig.bgc
     }
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__head")
@@ -182,27 +169,15 @@ var EvaluteCard = function EvaluteCard(props) {
     disabled: true
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(preCls, "__head-rate")
-  }, "".concat(value).concat((0, _getLocale.getLocale)("Per_Set_Form_Quantifier_Points")))), type === 2 && getRemarkTypeList().map(function (item) {
-    return item.id === Number(value) && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "".concat(preCls, "__head-medal")
-    }, /*#__PURE__*/_react["default"].createElement("img", {
-      src: item.smallImg,
-      className: "".concat(preCls, "__head-medal-img"),
-      alt: ""
-    }), item.name);
-  })), remark && /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(preCls, "__remark")
-  }, remark), type === 1 && /*#__PURE__*/_react["default"].createElement("img", {
-    src: _evaluateBig["default"],
-    className: "".concat(preCls, "__bgc-img"),
+  }, "".concat(value).concat((0, _getLocale.getLocale)("Per_Set_Form_Quantifier_Points")))), type === 2 && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__head-medal")
+  }, /*#__PURE__*/_react["default"].createElement("img", {
+    src: evaluateConfig.smallImg,
+    className: "".concat(preCls, "__head-medal-img"),
     alt: ""
-  }), type === 2 && getRemarkTypeList().map(function (item) {
-    return item.id === Number(value) && /*#__PURE__*/_react["default"].createElement("img", {
-      src: item.bigImg,
-      className: "".concat(preCls, "__bgc-img"),
-      alt: ""
-    });
-  }), canEvaluate && /*#__PURE__*/_react["default"].createElement("div", {
+  }), evaluateConfig.name)), remark && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__remark")
+  }, remark), canEvaluate && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__evalute"),
     onClick: handleClickEvaluate
   }, type === 1 && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("img", {
@@ -212,18 +187,16 @@ var EvaluteCard = function EvaluteCard(props) {
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(preCls, "__evalute-text"),
     onClick: handleClickEvaluate
-  }, "\u4FEE\u6539")), type === 2 && getRemarkTypeList().map(function (item) {
-    return item.id === Number(value) && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("img", {
-      src: item.writeImg,
-      className: "".concat(preCls, "__evalute-img"),
-      alt: ""
-    }), /*#__PURE__*/_react["default"].createElement("span", {
-      className: "".concat(preCls, "__evalute-text"),
-      style: {
-        color: item.textColor
-      }
-    }, "\u4FEE\u6539"));
-  })), /*#__PURE__*/_react["default"].createElement(_commentsDialog["default"], {
+  }, "\u4FEE\u6539")), type === 2 && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("img", {
+    src: evaluateConfig.writeImg,
+    className: "".concat(preCls, "__evalute-img"),
+    alt: ""
+  }), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(preCls, "__evalute-text"),
+    style: {
+      color: evaluateConfig.textColor
+    }
+  }, "\u4FEE\u6539"))), /*#__PURE__*/_react["default"].createElement(_commentsDialog["default"], {
     visible: evaluateVisible,
     feedId: feedId,
     toUserId: publishUser.userId,

package/lib/components/dynamic/dynamic-item/dynamic-new-report/components/remind-user-view/index.css

@@ -1,5 +1,5 @@
 .titaui-dynamic-summary__remind-view {
-  margin-top: 24px;
+  padding: 12px 0;
 }
 
 .titaui-dynamic-summary__remind-view .titaui-pc-avator-container {

package/lib/components/dynamic/dynamic-item/dynamic-new-report/constant.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.dailyContentType = exports.Motion = exports.EEmotionType = void 0;
 
+var _getLocale = require("../../../../utils/getLocale");
+
 var _fighting = _interopRequireDefault(require("./img/fighting.png"));
 
 var _happy = _interopRequireDefault(require("./img/happy.png"));
@@ -28,19 +30,24 @@ exports.EEmotionType = EEmotionType;
 
 var Motion = [{
   id: EEmotionType.Unset,
-  img: ""
+  img: "",
+  tips: ""
 }, {
   id: EEmotionType.Happy,
-  img: _happy["default"]
+  img: _happy["default"],
+  tips: (0, _getLocale.getLocale)("Rep_NewS_HappFly")
 }, {
   id: EEmotionType.Fighting,
-  img: _fighting["default"]
+  img: _fighting["default"],
+  tips: (0, _getLocale.getLocale)("Rep_NewS_HardWorking")
 }, {
   id: EEmotionType.HardToPutWords,
-  img: _longStory["default"]
+  img: _longStory["default"],
+  tips: (0, _getLocale.getLocale)("Rep_NewS_Indescribable")
 }, {
   id: EEmotionType.Stressful,
-  img: _pressure["default"]
+  img: _pressure["default"],
+  tips: (0, _getLocale.getLocale)("Rep_NewS_SoPressure")
 }];
 exports.Motion = Motion;
 var dailyContentType;

package/lib/components/dynamic/dynamic-item/dynamic-new-report/index.css

@@ -11,7 +11,7 @@
 }
 
 .titaui-dynamic-new-report-item__content {
-  margin-left: 82px;
+  margin-left: 80px;
   line-height: 24px;
   word-wrap: break-word;
 }
@@ -21,7 +21,7 @@
   align-items: center;
   justify-content: space-between;
   width: 100%;
-  margin-bottom: 16px;
+  padding-bottom: 4px;
   display: flex;
   overflow: hidden;
 }
@@ -31,60 +31,8 @@
   height: 44px;
 }
 
-.titaui-dynamic-new-report-item__content ul {
-  list-style-type: disc;
-  padding-left: 20px;
-}
-
-.titaui-dynamic-new-report-item__content ol {
-  list-style-type: decimal;
-  padding-left: 20px;
-}
-
-.titaui-dynamic-new-report-item__content li {
-  list-style-type: inherit;
-  margin: 5px 0;
-}
-
-.titaui-dynamic-new-report-item__content table td {
-  padding: 3px 5px;
-  min-width: 50px;
-  height: 20px;
-}
-
-.titaui-dynamic-new-report-item__content p {
-  margin: 5px 0;
-}
-
-.titaui-dynamic-new-report-item__content blockquote {
-  display: block;
-  border-left: 4px solid #e3ecf1;
-  padding: 5px;
-  font-size: 12px;
-}
-
-.titaui-dynamic-new-report-item__content p,
-    .titaui-dynamic-new-report-item__content li {
-  line-height: 1.7;
-}
-
-.titaui-dynamic-new-report-item__content a {
-  word-wrap: break-word;
-  word-break: break-all;
-}
-
-.titaui-dynamic-new-report-item__content pre {
-  padding: 10px;
-  margin: 5px 0px;
-  font-size: 0.8em;
-}
-
-.titaui-dynamic-new-report-item__content pre code {
-  line-height: 1.5;
-}
-
 .titaui-dynamic-new-report-item__upload {
-  margin-top: 24px;
+  margin-top: 16px;
 }
 
 .titaui-dynamic-new-report-item__summary {
@@ -172,7 +120,7 @@
 }
 
 .titaui-dynamic-new-report-item__work {
-  margin-top: 24px;
+  padding: 12px 0;
   font-size: 18px;
   font-weight: 600;
   color: #141c28;

package/lib/components/dynamic/dynamic-item/dynamic-new-report/index.js

@@ -13,6 +13,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _richEditor = _interopRequireWildcard(require("@titaui/rich-editor"));
 
+var _tooltip = _interopRequireDefault(require("../../../tooltip"));
+
 var _context = require("../../context");
 
 var _summaryHeader = _interopRequireDefault(require("../components/summary-header"));
@@ -93,10 +95,10 @@ var DynamicReply = function DynamicReply(_ref) {
       canEvaluate = data.canEvaluate;
   var files = (0, _util.formatAttachments)(attachments);
 
-  var _useState = (0, _react.useState)(""),
+  var _useState = (0, _react.useState)(),
       _useState2 = _slicedToArray(_useState, 2),
-      mindImg = _useState2[0],
-      setMindImg = _useState2[1];
+      motionValue = _useState2[0],
+      setMotionValue = _useState2[1];
 
   var contentRichTextRef = (0, _react.useRef)();
   var workPlanRichTextRef = (0, _react.useRef)();
@@ -143,17 +145,18 @@ var DynamicReply = function DynamicReply(_ref) {
   }, [data, searchKeyWord]);
   (0, _react.useEffect)(function () {
     if (dailyContent) {
-      var _mindData$, _mindData$2;
+      var mindData = dailyContent.find(function (item) {
+        return item.contentType === 1;
+      });
+      if (!(mindData !== null && mindData !== void 0 && mindData.content)) return;
 
-      var mindData = dailyContent.filter(function (item) {
-        return (item === null || item === void 0 ? void 0 : item.contentType) === 1;
+      var motion = _constant.Motion.find(function (item) {
+        var _JSON$parse$SelectedV;
+
+        return item.id === (((_JSON$parse$SelectedV = JSON.parse(mindData.content || "{}").SelectedValues) === null || _JSON$parse$SelectedV === void 0 ? void 0 : _JSON$parse$SelectedV[0]) || 0);
       });
 
-      if (typeof ((_mindData$ = mindData[0]) === null || _mindData$ === void 0 ? void 0 : _mindData$.content) === "string" && ((_mindData$2 = mindData[0]) === null || _mindData$2 === void 0 ? void 0 : _mindData$2.content) !== "") {
-        setMindImg(_constant.Motion.filter(function (item) {
-          return item.id === JSON.parse(mindData[0].content).SelectedValues[0];
-        })[0].img);
-      }
+      setMotionValue(motion);
     }
   }, [dailyContent]);
   return /*#__PURE__*/_react["default"].createElement("div", {
@@ -177,11 +180,17 @@ var DynamicReply = function DynamicReply(_ref) {
     typeBgColor: "rgba(92, 142, 255, 0.5)",
     titleBgColor: "rgba(92, 142, 255, 0.1)",
     contentColor: "#5C8EFF"
-  }), mindImg && /*#__PURE__*/_react["default"].createElement("img", {
-    src: mindImg,
+  }), motionValue && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+    overlay: motionValue.tips,
+    placement: "top",
+    align: {
+      offset: [0, 5]
+    }
+  }, /*#__PURE__*/_react["default"].createElement("img", {
+    src: motionValue.img,
     className: "".concat(prefix, "__content-mind"),
     alt: ""
-  })), dailyContent.map(function (item) {
+  }))), dailyContent.map(function (item) {
     if (item.contentType === _constant.dailyContentType.richText) {
       return item.richContent !== "" && typeof item.richContent === "string" && /*#__PURE__*/_react["default"].createElement("div", {
         className: "".concat(prefix, "__work")

package/lib/components/dynamic/dynamic-item/index.css

@@ -37,7 +37,7 @@
 }
 
 .titaui-dynamic-item__footer {
-  margin: 8px 24px 0 88px;
+  margin: 0 24px 0 88px;
   height: 54px;
   border-radius: 0px 0px 6px 6px;
   display: flex;

package/lib/components/guide-tip/index.css

@@ -1,9 +1,10 @@
 .titaui-pc__guide-tip__popup {
+  position: relative;
   display: flex;
   align-items: flex-start;
-  background: #5C8EFF;
+  background: #5c8eff;
   box-shadow: 0px -4px 12px 0px rgba(127, 145, 180, 0.2);
-  border: 1px solid #FFFFFF;
+  border: 1px solid #ffffff;
   padding: 16px;
   box-sizing: border-box;
   border-radius: 24px;
@@ -46,3 +47,22 @@
   border-top: solid 4px #5c8eff;
   z-index: 99;
 }
+
+.titaui-pc__guide-tip__popup-triangle--bottom {
+  top: -4px;
+  transform: rotate(180deg);
+}
+
+.titaui-pc__guide-tip__popup-triangle--left {
+  top: 50%;
+  margin-top: -4px;
+  left: 100.5%;
+  transform: rotate(-90deg);
+}
+
+.titaui-pc__guide-tip__popup-triangle--right {
+  left: -4px;
+  top: 50%;
+  margin-top: -4px;
+  transform: rotate(90deg);
+}

package/lib/components/guide-tip/index.js

@@ -47,7 +47,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var preCls = 'titaui-pc__guide-tip';
 var GuideTip = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
-  var _useState = (0, _react.useState)(true),
+  var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
       popupVisible = _useState2[0],
       setPopupVisible = _useState2[1];
@@ -94,12 +94,19 @@ var GuideTip = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       text: buttonTitle,
       size: "small"
     }), /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(preCls, "__popup-triangle"))
+      className: (0, _classnames["default"])("".concat(preCls, "__popup-triangle"), "".concat(preCls, "__popup-triangle--").concat(popupPlacement))
     }));
   };
 
   (0, _react.useImperativeHandle)(ref, function () {
-    hideGuideTip: popupRef.current.close();
+    return {
+      showGuideTip: function showGuideTip() {
+        return setPopupVisible(true);
+      },
+      hideGuideTip: function hideGuideTip() {
+        return setPopupVisible(false);
+      }
+    };
   });
   (0, _react.useEffect)(function () {
     if (type === 'time') {

package/lib/components/import-modal/helper.js

@@ -163,7 +163,7 @@ var getCycleDate = function getCycleDate(date) {
   newEndDate.setDate(0);
   return {
     start: "".concat(newStartDate.getFullYear(), "/").concat(newStartDate.getMonth() + 1, "/").concat(newStartDate.getDate()),
-    end: "".concat(newEndDate.getFullYear(), "/").concat(newEndDate.getMonth() + 1, "/").concat(newEndDate.getDate())
+    end: "".concat(newEndDate.getFullYear(), "/").concat(newEndDate.getMonth() + 1, "/").concat(newEndDate.getDate() + 1)
   };
 };
 

package/lib/components/import-modal/tree/okr-tree/index.js

@@ -170,37 +170,27 @@ var OkrTree = function OkrTree(_ref) {
 
   var getTreeNodes = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-      var newQuery, date, _yield$okrSearch, works, total;
+      var _yield$okrSearch, works, total;
 
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              newQuery = query;
-
-              if ((query === null || query === void 0 ? void 0 : query.cycleType) !== '-1') {
-                date = new Date((query === null || query === void 0 ? void 0 : query.endDate) || new Date().valueOf());
-                date.setDate(date.getDate() + 1);
-                newQuery = _objectSpread(_objectSpread({}, query), {}, {
-                  endDate: "".concat(date.getFullYear(), "/").concat(date.getMonth() + 1 >= 10 ? date.getMonth() + 1 : '0' + (date.getMonth() + 1), "/").concat(date.getDate() >= 10 ? date.getDate() : '0' + date.getDate())
-                });
-              }
-
-              _context.next = 4;
+              _context.next = 2;
               return (0, _requestApi.okrSearch)(_objectSpread({
                 pageNum: pageNum,
                 pageSize: pageSize,
                 toUserId: toUserId
-              }, newQuery));
+              }, query));
 
-            case 4:
+            case 2:
               _yield$okrSearch = _context.sent;
               works = _yield$okrSearch.works;
               total = _yield$okrSearch.total;
               setWorks(works || []);
               setTotal(total);
 
-            case 9:
+            case 7:
             case "end":
               return _context.stop();
           }

package/lib/components/menus/export-modules/summary-menus/depart-menus/index.js

@@ -23,18 +23,18 @@ var _index = require("../../../components/menu-tree/tree-node/index");
 
 var _utils = require("../../../utils");
 
-var _bsGlobal = require("../../../../../utils/bs-global.js");
-
 var _precls = _interopRequireDefault(require("../../../precls"));
 
 var _scrollbar = _interopRequireDefault(require("../../../../scrollbar"));
 
+var _helper = require("./helper");
+
+var _auth = require("../../../../../utils/auth");
+
 require("../../../index.css");
 
 require("./index.css");
 
-var _helper = require("./helper");
-
 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); }
@@ -96,9 +96,10 @@ var _default = function _default() {
       _useState12 = _slicedToArray(_useState11, 1),
       itemHeight = _useState12[0];
 
-  var isBoss = (0, _bsGlobal.getUserInfo)().IsBoss;
+  var baseAuth = new _auth.BaseAuth();
+  var showCompanyAll = baseAuth.isBoss() || baseAuth.isAssistant() || baseAuth.isPlanDailyManager();
   (0, _react.useEffect)(function () {
-    if (isBoss) {
+    if (showCompanyAll) {
       window.location.href = '#/summary/manage?departmentName=公司全部&departmentId=0';
 
       var allDepartmentText = window.getLocale && window.getLocale(_i18n.locale.menu_alldeparment) || _i18n.locale.menu_alldeparment;

package/lib/components/picker/components/panels/week-panel/index.css

@@ -24,10 +24,19 @@
   color: #141C28;
 }
 
-.titaui__picker__week--select {
+.titaui__picker__week:hover {
   color: #2879ff;
 }
 
+.titaui__picker__week--current {
+  color: #2879ff;
+}
+
+.titaui__picker__week--select .titaui__picker__week-box {
+  background-color: #2879ff;
+  color: #fff;
+}
+
 .titaui__picker__week-box {
   background: #F6F8FC;
   border-radius: 8px;

package/lib/components/picker/components/panels/week-panel/index.js

@@ -17,6 +17,8 @@ var _weekHead = _interopRequireDefault(require("./week-head"));
 
 var _weekBody = _interopRequireDefault(require("./week-body"));
 
+var _utils2 = require("./utils");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -25,19 +27,26 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 
 var DatePanel = function DatePanel(props) {
   var viewDate = props.viewDate,
-      onViewDateChange = props.onViewDateChange;
+      onViewDateChange = props.onViewDateChange,
+      selectWeekDate = props.selectWeekDate;
   var startDate = viewDate[0];
 
   var onMonthChange = function onMonthChange(diff) {
     if (onViewDateChange) {
-      onViewDateChange((0, _moment["default"])(startDate).add(diff, "M"));
+      if (typeof startDate === 'string') {
+        onViewDateChange((0, _moment["default"])("".concat(new Date(startDate).getFullYear(), "/").concat(new Date(startDate).getMonth() + 1, "/15")).add(diff, "M"));
+      } else {
+        var startYear = (0, _utils2.getWeek)(new Date(startDate))[2];
+        var startMonth = (0, _utils2.getWeek)(new Date(startDate))[1];
+        onViewDateChange((0, _moment["default"])("".concat(startYear, "/").concat(startMonth, "/15")).add(diff, "M")); //日期写死15 是因为这里是控制头部的月的显示，如果日期为归类上一个月的，头部会乱
+      }
     }
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_utils.PickerPanelClass, "__date"))
   }, /*#__PURE__*/_react["default"].createElement(_weekHead["default"], _extends({}, props, {
-    startDate: viewDate[0],
+    startDate: startDate,
     onPrev: function onPrev() {
       return onMonthChange(-1);
     },
@@ -45,7 +54,8 @@ var DatePanel = function DatePanel(props) {
       return onMonthChange(1);
     }
   })), /*#__PURE__*/_react["default"].createElement(_weekBody["default"], _extends({}, props, {
-    startDate: viewDate[0]
+    startDate: viewDate[0],
+    selectWeekDate: selectWeekDate
   })));
 };
 

package/lib/components/picker/components/panels/week-panel/week-body.js

@@ -9,8 +9,6 @@ var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _moment = _interopRequireDefault(require("moment"));
-
 var _utils = require("./utils");
 
 var _utils2 = require("../../../utils");
@@ -27,22 +25,24 @@ var preCls = 'titaui__picker';
 
 var WeekPanelBody = function WeekPanelBody(props) {
   var startDate = props.startDate,
-      onSelect = props.onSelect;
+      onSelect = props.onSelect,
+      selectWeekDate = props.selectWeekDate;
 
   var getCells = function getCells(date) {
     var currentYear = (0, _utils.getWeek)(new Date(new Date()))[2];
     var currentMonth = (0, _utils.getWeek)(new Date(new Date()))[1];
     var currentWeek = (0, _utils.getWeek)(new Date(new Date()))[0];
-    var year = Number((0, _moment["default"])(date).format('YYYY')); //获取年
+    var year = (0, _utils.getWeek)(new Date(new Date(date)))[2]; //获取年
 
-    var month = Number((0, _moment["default"])(date).format('MM'));
-    var dateYear = Number((0, _moment["default"])(date).format('YYYY'));
-    var dateMonth = Number((0, _moment["default"])(date).format('MM'));
+    var month = (0, _utils.getWeek)(new Date(new Date(date)))[1];
+    var selectYear;
+    var selectMonth;
+    var selectWeek;
 
-    if (currentMonth !== dateMonth && dateMonth !== 1) {
-      dateMonth = dateMonth - 1;
-    } else if (currentMonth !== dateMonth && dateMonth === 1) {
-      dateMonth = 12;
+    if (selectWeekDate && typeof selectWeekDate[0] === 'string') {
+      selectYear = (0, _utils.getWeek)(new Date(new Date(selectWeekDate[0])))[2];
+      selectMonth = (0, _utils.getWeek)(new Date(new Date(selectWeekDate[0])))[1];
+      selectWeek = (0, _utils.getWeek)(new Date(new Date(selectWeekDate[0])))[0];
     }
 
     var range = (0, _utils.getPointYearMonthWeeksRange)(year, month);
@@ -51,7 +51,7 @@ var WeekPanelBody = function WeekPanelBody(props) {
       return range.map(function (item, i) {
         return /*#__PURE__*/_react["default"].createElement("tr", {
           key: i,
-          className: (0, _classnames["default"])("".concat(preCls, "__week"), _defineProperty({}, "".concat(preCls, "__week--select"), currentWeek === i + 1))
+          className: (0, _classnames["default"])("".concat(preCls, "__week"), _defineProperty({}, "".concat(preCls, "__week--current"), currentWeek === i + 1 && (0, _utils.getWeek)(new Date("".concat(year, "/").concat(item.startTime)))[2] === currentYear && (0, _utils.getWeek)(new Date("".concat(year, "/").concat(item.startTime)))[1] === currentMonth), _defineProperty({}, "".concat(preCls, "__week--select"), selectWeek === i + 1 && selectYear === (0, _utils.getWeek)(new Date("".concat(year, "/").concat(item.startTime)))[2] && selectMonth === (0, _utils.getWeek)(new Date("".concat(year, "/").concat(item.startTime)))[1]))
         }, /*#__PURE__*/_react["default"].createElement("div", {
           onClick: function onClick() {
             if (onSelect) {
@@ -72,7 +72,7 @@ var WeekPanelBody = function WeekPanelBody(props) {
     className: (0, _classnames["default"])(_utils2.PickerBodyClass)
   }, /*#__PURE__*/_react["default"].createElement("table", {
     className: (0, _classnames["default"])("".concat(_utils2.PickerClass, "-content"))
-  }, /*#__PURE__*/_react["default"].createElement("tbody", null, getCells((0, _moment["default"])(startDate)))));
+  }, /*#__PURE__*/_react["default"].createElement("tbody", null, getCells(startDate))));
 };
 
 var _default = WeekPanelBody;

package/lib/components/picker/components/panels/week-panel/week-head.js

@@ -9,8 +9,6 @@ var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _moment = _interopRequireDefault(require("moment"));
-
 var _getLocale = require("../../../../../utils/getLocale");
 
 var _utils = require("../../../utils");
@@ -26,7 +24,7 @@ function DatePanelHead(props) {
       onPrev = props.onPrev,
       onNext = props.onNext,
       onPanelChange = props.onPanelChange;
-  var yearText = (0, _moment["default"])(startDate).year();
+  var yearText = (0, _utils2.getWeek)(new Date(startDate))[2];
   var monthText = (0, _utils2.getWeek)(new Date(startDate))[1];
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])(_utils.PickerHeadClass)

package/lib/components/picker/picker-panels.js

@@ -65,6 +65,11 @@ var PickerPanels = function PickerPanels(props) {
       viewDate = _useState4[0],
       setViewDate = _useState4[1];
 
+  var _useState5 = (0, _react.useState)(),
+      _useState6 = _slicedToArray(_useState5, 2),
+      selectWeekDate = _useState6[0],
+      setSelectWeekDate = _useState6[1];
+
   var onViewDateChange = function onViewDateChange(date) {
     setViewDate(function () {
       return [date];
@@ -122,9 +127,7 @@ var PickerPanels = function PickerPanels(props) {
   };
 
   var onWeekSelect = function onWeekSelect(date, year) {
-    setViewDate(function () {
-      return date;
-    });
+    setSelectWeekDate(date);
 
     if (onChange) {
       onChange(date);
@@ -197,7 +200,8 @@ var PickerPanels = function PickerPanels(props) {
           onSelect: onSelectChange,
           onViewDateChange: onViewDateChange,
           onPanelChange: onPanelChange,
-          valueTypeIsRange: true
+          valueTypeIsRange: true,
+          selectWeekDate: selectWeekDate
         });
 
       default:
@@ -205,7 +209,12 @@ var PickerPanels = function PickerPanels(props) {
     }
 
     return panel;
-  }, [pickerMode, viewDate]);
+  }, [pickerMode, viewDate, selectWeekDate]);
+  (0, _react.useEffect)(function () {
+    if (typeof value[0] === 'string') {
+      setSelectWeekDate(value);
+    }
+  }, [value]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _utils.PickerClass
   }, renderPanels());

package/lib/components/picker/picker.js

@@ -107,7 +107,7 @@ var Picker = function Picker(props) {
       onClose: onCloseHandler,
       settingType: settingType
     }, restProps));
-  }, [settingType, value]);
+  }, [settingType, value, picker]);
   return /*#__PURE__*/_react["default"].createElement(_context["default"].Provider, {
     value: {
       picker: picker,

package/lib/components/rich-editor-at/index.css

@@ -18,7 +18,7 @@
 .titaui-rich-editor-at__import {
   width: 60px;
   height: 60px;
-  border-radius: 30px;
+  border-radius: 8px;
   border: 1px solid #e9ecf0;
   display: flex;
   align-items: center;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.12.26-beta.1",
+  "version": "1.12.26-beta.4",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",
@@ -78,7 +78,7 @@
     "@titaui/rc-trigger": "5.2.5",
     "@titaui/react-flow-renderer": "9.5.4",
     "@titaui/request": "^1.0.1",
-    "@titaui/rich-editor": "^0.1.50-beta.14",
+    "@titaui/rich-editor": "0.1.50-beta.14",
     "@titaui/toast": "1.0.0",
     "@types/color": "3.0.3",
     "@types/prosemirror-commands": "1.0.4",