@titaui/pc 1.5.69-beta.2 → 1.5.69-beta.23

package/lib/components/dynamic/dynamic.js

@@ -29,6 +29,10 @@ var _dynamicLiking = _interopRequireDefault(require("./dynamic-liking"));
 
 var _dynamicLoading = _interopRequireDefault(require("./img/dynamic-loading.gif"));
 
+var _conditionRender = _interopRequireDefault(require("./components/condition-render"));
+
+var _util = require("./util");
+
 var _popDownNotification = require("../pop-down-notification");
 
 require("./dynamic.css");
@@ -112,8 +116,8 @@ var Dynamic = function Dynamic() {
 
   var _useState19 = (0, _react.useState)(false),
       _useState20 = _slicedToArray(_useState19, 2),
-      isChangeTabLoading = _useState20[0],
-      setIsChangeTabLoading = _useState20[1];
+      isChangeConditionLoading = _useState20[0],
+      setIsChangeConditionLoading = _useState20[1];
 
   var _useState21 = (0, _react.useState)(-1),
       _useState22 = _slicedToArray(_useState21, 2),
@@ -125,9 +129,19 @@ var Dynamic = function Dynamic() {
       secondTabs = _useState24[0],
       setSecondTabs = _useState24[1];
 
+  var _useState25 = (0, _react.useState)(false),
+      _useState26 = _slicedToArray(_useState25, 2),
+      noMoreData = _useState26[0],
+      setNoMoreData = _useState26[1];
+
+  var _useState27 = (0, _react.useState)(false),
+      _useState28 = _slicedToArray(_useState27, 2),
+      showToTop = _useState28[0],
+      setShowToTop = _useState28[1];
+
   var contentRef = (0, _react.useRef)();
-  var noMoreDataRef = (0, _react.useRef)(false);
   var currentPage = (0, _react.useRef)(1);
+  var loginUser = window.BSGlobal.loginUserInfo;
 
   var changeTabActive = function changeTabActive(key) {
     setActiveFirstLevelTabKey(key); // @ts-ignore
@@ -137,10 +151,13 @@ var Dynamic = function Dynamic() {
     }).ChildMenus;
     setSecondTabs(secondTabsArr);
     setActiveSecondLevelTabKey(secondTabsArr[0].CodeId);
+    sessionStorage.setItem("tita-dynamic-first-level-tab__".concat(loginUser.Id), "".concat(key));
+    sessionStorage.setItem("tita-dynamic-second-level-tab__".concat(loginUser.Id), "".concat(secondTabsArr[0].CodeId));
   };
 
   var handleSubTabsChange = function handleSubTabsChange(key) {
     setActiveSecondLevelTabKey(key);
+    sessionStorage.setItem("tita-dynamic-second-level-tab__".concat(loginUser.Id), "".concat(key));
   };
 
   var handleDeleteFeed = function handleDeleteFeed(feedId) {
@@ -152,29 +169,19 @@ var Dynamic = function Dynamic() {
   var setTabsToPublish = function setTabsToPublish() {
     setActiveFirstLevelTabKey(1004);
     setActiveSecondLevelTabKey(1007);
+    resetValue();
+    setIsChangeConditionLoading(true);
+    getDynamicData(true);
   };
 
-  var getDynamicData = function getDynamicData() {
+  var getDynamicData = function getDynamicData(needResetValue) {
     requestId++;
-    var reqId = requestId; // 滚动加载防止重复请求
-
-    if (isLoadingMore) {
-      return;
-    }
-
-    if (noMoreDataRef.current) {
-      _popDownNotification.Toast.Warning("没有更多数据啦", {
-        canClose: false
-      });
-
-      return;
-    }
-
+    var reqId = requestId;
     setIsLoadingMore(true);
     (0, _requestApi.getDynamicFeedList)({
       PageSize: 20,
       PageNum: currentPage.current,
-      KeyWord: "",
+      KeyWord: searchKeyType === "person" && searchUser ? "UserId:".concat(searchUser.userId) : searchKeyWord,
       ChannelIds: activeFirstLevelTabKey + "." + activeSecondLevelTabKey,
       Domain: "",
       TitaHost: "",
@@ -182,7 +189,7 @@ var Dynamic = function Dynamic() {
     }).then(function (resp) {
       setIsLoading(false);
       setIsLoadingMore(false);
-      setIsChangeTabLoading(false);
+      setIsChangeConditionLoading(false);
       if (requestId !== reqId) return;
 
       if (resp.Code === 1) {
@@ -190,8 +197,17 @@ var Dynamic = function Dynamic() {
           currentPage.current = currentPage.current + 1;
         }
 
-        noMoreDataRef.current = resp.Data.isEnd;
-        setDynamicData([].concat(_toConsumableArray(dynamicData), _toConsumableArray(resp.Data.feeds)));
+        setNoMoreData(resp.Data.isEnd);
+
+        if (needResetValue) {
+          setDynamicData(resp.Data.feeds);
+        } else {
+          setDynamicData(JSON.parse(JSON.stringify([].concat(_toConsumableArray(dynamicData), _toConsumableArray(resp.Data.feeds)))));
+        }
+      } else {
+        _popDownNotification.Toast.Error(resp.Message, {
+          canClose: false
+        });
       }
     });
   };
@@ -200,66 +216,93 @@ var Dynamic = function Dynamic() {
     var contentDom = contentRef.current;
 
     if (contentDom) {
-      // 为了解决列表数据过少右侧内容过多滚动的问题
+      if (contentDom.scrollTop > 0) {
+        setShowToTop(true);
+      } else {
+        setShowToTop(false);
+      } // 为了解决列表数据过少右侧内容过多滚动的问题
+
+
       if (dynamicData.length === 0) {
-        // 48是二级菜单高度，10是二级菜单到列表的间距
+        // 防止出现重复设置高度导致一直能往下滚动的问题
+        if (rightContentHeight > 0) return; // 48是二级菜单高度，10是二级菜单到列表的间距
+
         setRightContentHeight(contentDom.scrollHeight - 48 - 10);
-        contentDom && contentDom.removeEventListener("scroll", handleContentScroll);
       } else {
         setRightContentHeight(-1);
       } // 滚动到距离底部40px之后加载新的数据
 
 
       if (contentDom.scrollHeight - contentDom.scrollTop <= contentDom.offsetHeight) {
-        getDynamicData();
+        // 滚动加载防止重复请求
+        if (noMoreData || isLoadingMore) {
+          return;
+        }
+
+        getDynamicData(false);
       }
     }
   };
 
+  var handleScrollToTop = (0, _react.useCallback)(function () {
+    contentRef.current.scrollTo(0, 0);
+  }, []);
+
   var resetValue = function resetValue() {
-    noMoreDataRef.current = false;
+    contentRef.current.scrollTo(0, 0);
     currentPage.current = 1;
-    setDynamicData([]);
     setIsLoadingMore(false);
+    setNoMoreData(false);
+    setShowToTop(false);
   };
 
   (0, _react.useEffect)(function () {
     setIsLoading(true);
     (0, _requestApi.getMenu)().then(function (resp) {
       if (resp.Code === 1) {
-        var data = resp.Data;
+        var data = (0, _util.formatMenu)(resp.Data);
         setTabsInfo(data);
-        setActiveFirstLevelTabKey(data[0].CodeId);
         setSecondTabs(data[0].ChildMenus);
-        setActiveSecondLevelTabKey(data[0].ChildMenus[0].CodeId);
+        var localFirstLevelTabKey = sessionStorage.getItem("tita-dynamic-first-level-tab__".concat(loginUser.Id));
+        var localSecondLevelTabKey = sessionStorage.getItem("tita-dynamic-second-level-tab__".concat(loginUser.Id));
+
+        if (localFirstLevelTabKey) {
+          setActiveFirstLevelTabKey(Number(localFirstLevelTabKey));
+        } else {
+          setActiveFirstLevelTabKey(data[0].CodeId);
+        }
+
+        if (localSecondLevelTabKey) {
+          setActiveSecondLevelTabKey(Number(localSecondLevelTabKey));
+        } else {
+          setActiveSecondLevelTabKey(data[0].ChildMenus[0].CodeId);
+        }
       }
     });
-    return function () {
-      var dom = document.querySelector(".titaui-dynamic__content");
-      dom && dom.removeEventListener("scroll", handleContentScroll);
-    };
   }, []);
   (0, _react.useEffect)(function () {
-    console.log(searchKeyWord, searchKeyType, searchUser);
+    if (searchKeyWord || searchKeyType || searchUser) {
+      // 搜索跳到全部动态
+      if (searchKeyWord) {
+        setActiveFirstLevelTabKey(1006); // @ts-ignore
+
+        var secondTabsArr = tabsInfo.find(function (item) {
+          return item.CodeId === 1006;
+        }).ChildMenus;
+        setSecondTabs(secondTabsArr);
+        setActiveSecondLevelTabKey(secondTabsArr[0].CodeId);
+      }
 
-    if (searchKeyWord || searchKeyType) {
+      setIsChangeConditionLoading(true);
       resetValue();
-      setActiveFirstLevelTabKey(1006); // 搜索跳到全部动态
-      // @ts-ignore
-
-      var secondTabsArr = tabsInfo.find(function (item) {
-        return item.CodeId === 1006;
-      }).ChildMenus;
-      setSecondTabs(secondTabsArr);
-      setActiveSecondLevelTabKey(secondTabsArr[0].CodeId); // 走搜索接口
-      // getDynamicData();
+      getDynamicData(true);
     }
   }, [searchKeyWord, searchKeyType, searchUser]);
   (0, _react.useEffect)(function () {
     if (!activeSecondLevelTabKey || !activeFirstLevelTabKey) return;
     resetValue();
-    setIsChangeTabLoading(true);
-    getDynamicData();
+    setIsChangeConditionLoading(true);
+    getDynamicData(true);
   }, [activeFirstLevelTabKey, activeSecondLevelTabKey]); // @ts-ignore
 
   window.setTabsToPublish = setTabsToPublish;
@@ -269,16 +312,22 @@ var Dynamic = function Dynamic() {
     }
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
-  }, isLoading ? /*#__PURE__*/_react["default"].createElement("div", {
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    id: "dynamic-top-anchor"
+  }), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    condition: isLoading
+  }, /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "__loading"
   }, /*#__PURE__*/_react["default"].createElement("img", {
     className: prefix + "__loading-img",
     src: _dynamicLoading["default"]
-  })) : null, /*#__PURE__*/_react["default"].createElement("div", {
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "__header"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "__header-tabs"
-  }, tabsInfo && tabsInfo.map(function (item) {
+  }, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    condition: !!tabsInfo
+  }, tabsInfo.map(function (item) {
     return /*#__PURE__*/_react["default"].createElement("span", {
       key: item.CodeId + item.MenuName,
       className: (0, _classnames["default"])(prefix + "__header-tab", _defineProperty({}, prefix + "__header-tab--active", item.CodeId === activeFirstLevelTabKey)),
@@ -286,7 +335,7 @@ var Dynamic = function Dynamic() {
         changeTabActive(item.CodeId);
       }
     }, item.MenuName);
-  })), /*#__PURE__*/_react["default"].createElement("div", {
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "__header-search"
   }, /*#__PURE__*/_react["default"].createElement(_dynamicSearchInput["default"], {
     setSearchUser: setSearchUser,
@@ -302,7 +351,9 @@ var Dynamic = function Dynamic() {
     className: prefix + "__content-left"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "__content-left-tabs"
-  }, secondTabs.length > 0 && secondTabs.map(function (item) {
+  }, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    condition: secondTabs.length > 0
+  }, secondTabs.map(function (item) {
     return /*#__PURE__*/_react["default"].createElement("span", {
       key: item.CodeId + item.MenuName,
       className: (0, _classnames["default"])(prefix + "__content-left-tab", _defineProperty({}, prefix + "__content-left-tab--active", item.CodeId === activeSecondLevelTabKey)),
@@ -310,17 +361,34 @@ var Dynamic = function Dynamic() {
         handleSubTabsChange(item.CodeId);
       }
     }, item.MenuName);
-  })), isChangeTabLoading ? /*#__PURE__*/_react["default"].createElement("div", {
+  }))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    condition: isChangeConditionLoading
+  }, /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "__empty-loading-block"
-  }) : /*#__PURE__*/_react["default"].createElement(_dynamicList["default"], {
+  })), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    condition: !isChangeConditionLoading
+  }, /*#__PURE__*/_react["default"].createElement(_dynamicList["default"], {
     height: rightContentHeight,
     onDeleteFeed: handleDeleteFeed,
     data: dynamicData
-  }), isLoadingMore || isChangeTabLoading ? /*#__PURE__*/_react["default"].createElement("div", {
+  })), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    condition: isLoadingMore || isChangeConditionLoading
+  }, /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "__content-left-loading"
-  }) : null), /*#__PURE__*/_react["default"].createElement("div", {
+  })), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    condition: dynamicData.length > 0 && noMoreData
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: prefix + "__no-more-data"
+  }, "\u6CA1\u6709\u66F4\u591A\u4E86"))), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])(prefix + "__content-right")
-  }, /*#__PURE__*/_react["default"].createElement(_quickOperation["default"], null), /*#__PURE__*/_react["default"].createElement(_dynamicTopping["default"], null), /*#__PURE__*/_react["default"].createElement(_dynamicLikeRanking["default"], null), /*#__PURE__*/_react["default"].createElement(_dynamicLiking["default"], null)))));
+  }, /*#__PURE__*/_react["default"].createElement(_quickOperation["default"], null), /*#__PURE__*/_react["default"].createElement(_dynamicTopping["default"], null), /*#__PURE__*/_react["default"].createElement(_dynamicLikeRanking["default"], null), /*#__PURE__*/_react["default"].createElement(_dynamicLiking["default"], null))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    condition: showToTop
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__go-to-top"),
+    onClick: handleScrollToTop
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__go-to-top-img")
+  })))));
 };
 
 var _default = Dynamic;

package/lib/components/dynamic/img/dynamic-top.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>top</title>
+    <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="关键成果" transform="translate(-1306.000000, -1911.000000)" fill="#141C28">
+            <g id="编组-9" transform="translate(1292.000000, 1897.000000)">
+                <g id="top" transform="translate(14.000000, 14.000000)">
+                    <path d="M12.0142136,5.6 C12.2358884,5.6 12.4365049,5.69016094 12.5813929,5.83581246 C12.640826,5.86963662 12.6972878,5.91247294 12.7485281,5.96371324 L12.7485281,5.96371324 L18.9710678,12.1862529 C19.2834872,12.4986723 19.2834872,13.0052043 18.9710678,13.3176238 C18.6586484,13.6300432 18.1521164,13.6300432 17.839697,13.3176238 L17.839697,13.3176238 L12.8140447,8.292 L12.8142136,20.8 C12.8142136,21.2418278 12.4560414,21.6 12.0142136,21.6 C11.5723858,21.6 11.2142136,21.2418278 11.2142136,20.8 L11.2140447,8.292 L6.18873016,13.3176238 C5.87631073,13.6300432 5.36977875,13.6300432 5.05735931,13.3176238 C4.74493988,13.0052043 4.74493988,12.4986723 5.05735931,12.1862529 L11.279899,5.96371324 C11.3309062,5.91270599 11.3870877,5.87002645 11.4467538,5.83567462 C11.5910041,5.69057405 11.7920315,5.6 12.0142136,5.6 Z" id="形状结合"></path>
+                    <path d="M12,-5.8 C12.4418278,-5.8 12.8,-5.4418278 12.8,-5 L12.8,11.4 C12.8,11.8418278 12.4418278,12.2 12,12.2 C11.5581722,12.2 11.2,11.8418278 11.2,11.4 L11.2,-5 C11.2,-5.4418278 11.5581722,-5.8 12,-5.8 Z" id="矩形" transform="translate(12.000000, 3.200000) rotate(-270.000000) translate(-12.000000, -3.200000) "></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

package/lib/components/dynamic/quick-operation/index.css

@@ -1,13 +1,15 @@
 .titaui-pc-dynamic-quick-operation {
   width: 278px;
   height: 126px;
+  padding: 0 5px;
+  box-sizing: border-box;
   display: flex;
   align-items: center;
   background: #ffffff;
   box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
   border-radius: 12px;
   font-size: 12px;
-  color: #3F4755;
+  color: #3f4755;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
 }
 

package/lib/components/dynamic/quick-operation/index.js

@@ -23,6 +23,8 @@ var _createOkr2 = _interopRequireDefault(require("../../create-okr"));
 
 var _publishDynamicModal = _interopRequireDefault(require("../../publish-dynamic-modal/publish-dynamic-modal"));
 
+var _popDownNotification = require("../../pop-down-notification");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -72,14 +74,22 @@ var DynamicQuickOperation = function DynamicQuickOperation(_ref) {
         'WorkMileStoneId': ''
       }
     }).then(function () {
-      // @ts-ignore 跳到我的发布页签
-      window.setTabsToPublish && window.setTabsToPublish();
+      _popDownNotification.Toast.Success('发布成功', {
+        canClose: false
+      });
+
+      setTimeout(function () {
+        // @ts-ignore 跳到我的发布页签
+        window.setTabsToPublish && window.setTabsToPublish();
+      }, 2000);
     });
   };
 
   var handleAfterSuccess = function handleAfterSuccess() {
-    // @ts-ignore 跳到我的发布页签
-    window.setTabsToPublish && window.setTabsToPublish();
+    setTimeout(function () {
+      // @ts-ignore 跳到我的发布页签
+      window.setTabsToPublish && window.setTabsToPublish();
+    }, 2000);
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/dynamic/request-api.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getDynamicFeedList = exports.getMenu = exports.getPraise = exports.deleteDynamic = exports.cancelCollectDynamic = exports.collectDynamic = exports.cancelTopDynamic = exports.topDynamic = void 0;
+exports.getDynamicFeedList = exports.getMenu = exports.getLeastPariseInfo = exports.getRanking = exports.getPraise = exports.deleteDynamic = exports.cancelCollectDynamic = exports.collectDynamic = exports.cancelTopDynamic = exports.topDynamic = void 0;
 
 var _request = require("../../utils/request");
 
@@ -14,7 +14,7 @@ var topDynamic = function topDynamic(_ref) {
   var feedId = _ref.feedId,
       _ref$titaObj_type = _ref.titaObj_type,
       titaObj_type = _ref$titaObj_type === void 0 ? 2 : _ref$titaObj_type;
-  return (0, _request.rpost)("v2")("/user/feed/Top?feed_id=".concat(feedId, "&titaObj_type=").concat(titaObj_type, "&titaObj_id="));
+  return (0, _request.rpost)("v2")("user/feed/Top?feed_id=".concat(feedId, "&titaObj_type=").concat(titaObj_type, "&titaObj_id="));
 };
 
 exports.topDynamic = topDynamic;
@@ -23,28 +23,28 @@ var cancelTopDynamic = function cancelTopDynamic(_ref2) {
   var feedId = _ref2.feedId,
       _ref2$titaObj_type = _ref2.titaObj_type,
       titaObj_type = _ref2$titaObj_type === void 0 ? 2 : _ref2$titaObj_type;
-  return (0, _request.rdelete)("v2")("/user/feed/CancelTop?feed_id=".concat(feedId, "&titaObj_type=").concat(titaObj_type, "&titaObj_id="));
+  return (0, _request.rdelete)("v2")("user/feed/CancelTop?feed_id=".concat(feedId, "&titaObj_type=").concat(titaObj_type, "&titaObj_id="));
 };
 
 exports.cancelTopDynamic = cancelTopDynamic;
 
 var collectDynamic = function collectDynamic(_ref3) {
   var feedId = _ref3.feedId;
-  return (0, _request.rput)("v2")("/user/feed/Collect?feed_id=".concat(feedId));
+  return (0, _request.rput)("v2")("user/feed/Collect?feed_id=".concat(feedId));
 };
 
 exports.collectDynamic = collectDynamic;
 
 var cancelCollectDynamic = function cancelCollectDynamic(_ref4) {
   var feedId = _ref4.feedId;
-  return (0, _request.rdelete)("v2")("/user/feed/CancelCollect?feed_id=".concat(feedId));
+  return (0, _request.rdelete)("v2")("user/feed/CancelCollect?feed_id=".concat(feedId));
 };
 
 exports.cancelCollectDynamic = cancelCollectDynamic;
 
 var deleteDynamic = function deleteDynamic(_ref5) {
   var feedId = _ref5.feedId;
-  return (0, _request.rdelete)("v2")("/user/feed/Delete?feed_id=".concat(feedId));
+  return (0, _request.rdelete)("v2")("user/feed/Delete?feed_id=".concat(feedId));
 };
 
 exports.deleteDynamic = deleteDynamic;
@@ -57,13 +57,25 @@ var getPraise = function getPraise(_ref6) {
       count = _ref6$count === void 0 ? 5 : _ref6$count,
       _ref6$objType = _ref6.objType,
       objType = _ref6$objType === void 0 ? 10 : _ref6$objType;
-  return (0, _request.rget)("v1")("/praise/get?objId=".concat(objId, "&start=&count=").concat(count, "&objType=").concat(objType));
+  return (0, _request.rget)("v1")("praise/get?objId=".concat(objId, "&start=&count=").concat(count, "&objType=").concat(objType));
 };
 
 exports.getPraise = getPraise;
 
+var getRanking = function getRanking(data) {
+  return (0, _request.rpost)("v1")("praise/getRanking", data);
+};
+
+exports.getRanking = getRanking;
+
+var getLeastPariseInfo = function getLeastPariseInfo() {
+  return (0, _request.rget)("v1")("praise/getLeastPariseInfo?count=5");
+};
+
+exports.getLeastPariseInfo = getLeastPariseInfo;
+
 var getMenu = function getMenu() {
-  return (0, _request.rget)("v2")("/feed/FeedTabMenus");
+  return (0, _request.rget)("v2")("feed/FeedTabMenus");
 };
 
 exports.getMenu = getMenu;

package/lib/components/dynamic/util.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.formatCycleData = exports.getFeedTypeAndTypeColor = exports.getProgressState = void 0;
+exports.formatMenu = exports.formatCycleData = exports.getFeedTypeAndTypeColor = exports.getProgressState = void 0;
 
 var _constant = require("./constant");
 
@@ -43,8 +43,8 @@ var getFeedTypeAndTypeColor = function getFeedTypeAndTypeColor(feedType) {
   }
 
   if (feedType === _constant.EFeedType.Progress) {
-    feedTypeText = "更新";
-    feedTypeColor = "linear-gradient(90deg, #2879FF 0%, #9FBFFF 100%)";
+    feedTypeText = "进展";
+    feedTypeColor = "linear-gradient(90deg, #FFAB67 0%, #FFD5A0 100%)";
   }
 
   if (feedType === _constant.EFeedType.Relative) {
@@ -52,9 +52,29 @@ var getFeedTypeAndTypeColor = function getFeedTypeAndTypeColor(feedType) {
     feedTypeColor = "linear-gradient(270deg, #FFE18B 0%, #F6BD16 100%)";
   }
 
-  if (feedType === _constant.EFeedType.Project || feedType === _constant.EFeedType.Kr || feedType === _constant.EFeedType.Task || feedType === _constant.EFeedType.O) {
-    feedTypeText = "负责";
-    feedTypeColor = "linear-gradient(90deg, #FFAB67 0%, #FFD5A0 100%)";
+  if (feedType === _constant.EFeedType.O) {
+    feedTypeText = 'OKRs';
+    feedTypeColor = 'linear-gradient(90deg, #2879FF 0%, #9FBFFF 100%)';
+  }
+
+  if (feedType === _constant.EFeedType.Kr) {
+    feedTypeText = 'KR';
+    feedTypeColor = 'linear-gradient(90deg, #2879FF 0%, #9FBFFF 100%)';
+  }
+
+  if (feedType === _constant.EFeedType.Project) {
+    feedTypeText = '项目';
+    feedTypeColor = 'linear-gradient(90deg, #624DFF 0%, #CDC7FF 100%)';
+  }
+
+  if (feedType === _constant.EFeedType.MileStone) {
+    feedTypeText = '里程碑';
+    feedTypeColor = 'linear-gradient(90deg, #624DFF 0%, #CDC7FF 100%)';
+  }
+
+  if (feedType === _constant.EFeedType.Task) {
+    feedTypeText = '任务';
+    feedTypeColor = 'linear-gradient(90deg, #BB4DFF 0%, #EAC7FF 100%)';
   }
 
   return {
@@ -103,4 +123,18 @@ var formatCycleData = function formatCycleData(periodParams, isGetCycleRange) {
   return annualNum + '年  ' + cycleDate + "".concat(isGetCycleRange ? ',' + startDate + '~' + endDate : '');
 };
 
-exports.formatCycleData = formatCycleData;
+exports.formatCycleData = formatCycleData;
+
+var formatMenu = function formatMenu(data) {
+  data.sort(function (a, b) {
+    return a.Order - b.Order;
+  });
+  data.forEach(function (item) {
+    item.ChildMenus.sort(function (a, b) {
+      return a.Order - b.Order;
+    });
+  });
+  return data;
+};
+
+exports.formatMenu = formatMenu;

package/lib/components/file-list/components/single-file/index.css

@@ -6,7 +6,7 @@
 .titaui-new-file-list-single-file__file-preview {
   width: 180px;
   height: 180px;
-  border-radius: 2px;
+  border-radius: 8px;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -16,7 +16,7 @@
 .titaui-new-file-list-single-file__file-preview-img {
   width: 180px;
   height: 180px;
-  border-radius: 2px;
+  border-radius: 8px;
 }
 
 .titaui-new-file-list-single-file__file-preview-other-img {
@@ -37,7 +37,7 @@
   width: 180px;
   height: 180px;
   background: rgba(20, 28, 40, 0.3);
-  border-radius: 2px;
+  border-radius: 8px;
   display: flex;
   align-items: center;
   justify-content: center;

package/lib/components/grid-page/personal-info/index.js

@@ -106,16 +106,16 @@ function PersonalInfoComponent() {
     for (var item in loginUserInfo) {
       switch (item) {
         case 'IsBoss':
-          loginUserInfo['IsBoss'] && userRoleList.push('Boss');
+          loginUserInfo['IsBoss'] && userRoleList.push('boss');
           break;
 
         case 'Role':
           loginUserInfo['Role'] === 2 && userRoleList.push('super');
-          loginUserInfo['Role'] === 4 && userRoleList.push('UserManager');
+          loginUserInfo['Role'] === 4 && userRoleList.push('userManager');
           break;
 
         case 'IsTitaFeedSystemManager':
-          loginUserInfo['IsTitaFeedSystemManager'] && userRoleList.push('Assistant');
+          loginUserInfo['IsTitaFeedSystemManager'] && userRoleList.push('assistant');
           break;
       }
     }
@@ -181,7 +181,7 @@ function PersonalInfoComponent() {
     style: {
       filter: avatarUrl ? 'blur(10px)' : 'blur(6px)'
     },
-    src: avatarUrl || require("../image/Default-background.png")
+    src: avatarUrl || require("../image/default-background.png")
   }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "PersonalInfoComponent-PersonalInfo__personInfo",
     ref: toolTipRef

package/lib/components/img-viewer/index.css

@@ -132,7 +132,7 @@
   bottom: 24px;
   width: 216px;
   height: 48px;
-  border-radius: 4px;
+  border-radius: 8px;
   background: #ffffff;
   box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2);
   display: flex;

package/lib/components/mblog/index.js

@@ -175,7 +175,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
 
       _this.setState({
         textareaValue: textareaValue,
-        isAllowSubmit: textareaValue.trim().length > 0 && textareaValue.trim().length <= (_this.props.maxLength || 2000),
+        isAllowSubmit: textareaValue.trim().length > 0 && textareaValue.trim().length <= (_this.props.maxLength || 2000) || successFilesPath.length > 0,
         uploadSuccessFilesPath: successFilesPath,
         dragFilesList: []
       });
@@ -190,7 +190,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
     };
 
     _this.allowSubmit = function (content) {
-      return content.trim().length > 0 && content.trim().length <= _this.props.maxLength;
+      return content.trim().length > 0 && content.trim().length <= _this.props.maxLength || _this.state.uploadSuccessFilesPath.length > 0;
     };
 
     _this.onActionSubmit = function (submitType) {

package/lib/components/mblog/style.js

@@ -13,12 +13,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
-var MBlogBox = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: relative;\n\n  .uploadFile__preview__list {\n    padding-bottom: 10px;\n    background: #ffffff;\n    display: flex;\n    flex-wrap: wrap;\n    max-height: 300px;\n    overflow-y: auto;\n\n    .preview__content {\n      margin-top: 10px;\n      margin-right: 10px;\n      border-radius: 4px;\n    }\n  }\n"]))); // MblogContent
+var MBlogBox = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: relative;\n\n  .uploadFile__preview__list {\n    padding-bottom: 10px;\n    background: #ffffff;\n    display: flex;\n    flex-wrap: wrap;\n    max-height: 300px;\n    overflow-y: auto;\n\n    .preview__content {\n      margin-top: 10px;\n      margin-right: 10px;\n      border-radius: 8px;\n    }\n  }\n"]))); // MblogContent
 
 
 exports.MBlogBox = MBlogBox;
 
-var DivMblogContent = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  padding: 8px 10px 6px;\n  border: 1px solid #E9ECF0;\n  border-radius: 4px;\n  background-color: #fff;\n  position: relative;\n  transition: all .2s ease-in-out;\n  height: 124px;\n  box-sizing: border-box;\n\n  &.input_default-active {\n    box-shadow: 0px 0px 4px 0px rgba(40, 121, 255, 0.3);\n    border-color: #2879ff;\n  }\n"])));
+var DivMblogContent = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  padding: 8px 10px 6px;\n  border: 1px solid #E9ECF0;\n  border-radius: 4px;\n  background-color: #fff;\n  position: relative;\n  transition: all .2s ease-in-out;\n  height: 124px;\n  box-sizing: border-box;\n\n  &.input_default-active {\n    box-shadow: inset 0px 0px 4px 0px rgba(40, 121, 255, 0.3);\n    border-color: #2879ff;\n  }\n"])));
 
 exports.DivMblogContent = DivMblogContent;