@titaui/pc 1.5.83 → 1.5.87

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

@@ -27,6 +27,8 @@ var _conditionRender = _interopRequireDefault(require("../../../components/condi
 
 var _tooltip = require("../../../../tooltip");
 
+var _constant = require("../../../constant");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -66,7 +68,8 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       _data$isTop = data.isTop,
       isTop = _data$isTop === void 0 ? false : _data$isTop,
       _data$isCollect = data.isCollect,
-      isCollect = _data$isCollect === void 0 ? false : _data$isCollect;
+      isCollect = _data$isCollect === void 0 ? false : _data$isCollect,
+      feedType = data.feedType;
 
   var _useState = (0, _react.useState)(isTop),
       _useState2 = _slicedToArray(_useState, 2),
@@ -216,7 +219,9 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       type: "warning"
     }, /*#__PURE__*/_react["default"].createElement("span", {
       type: "title"
-    }, "\u786E\u5B9A\u5220\u9664\u8BE5\u5206\u4EAB\u5417\uFF1F"), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.CancelButton, {
+    }, "\u786E\u5B9A\u5220\u9664\u8BE5", feedType === _constant.EFeedType.Share ? "分享" : "公告", "\u5417\uFF1F"), /*#__PURE__*/_react["default"].createElement("span", {
+      type: "content"
+    }, "\u8BE5", feedType === _constant.EFeedType.Share ? "分享" : "公告", "\u5C06\u88AB\u5220\u9664\u4E0D\u53EF\u6062\u590D\uFF0C\u8BF7\u8C28\u614E\u64CD\u4F5C!"), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.CancelButton, {
       type: "button",
       onClick: cancelDeleteDynamic
     }, "\u53D6\u6D88"), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.WarningButton, {

package/lib/components/dynamic/dynamic-like-ranking/index.css

@@ -45,6 +45,25 @@
   padding: 16px 0 0 0;
 }
 
+.danamic-like-ranking__content-table-empty {
+  margin: 50px auto 40px;
+  width: 160px;
+  height: 116px;
+  background: url("./image/ranking-empty.png") no-repeat;
+  background-size: 160px 116px;
+  position: relative;
+}
+
+.danamic-like-ranking__content-table-empty-text {
+  color: #6f7886;
+  width: 58px;
+  position: absolute;
+  bottom: 10px;
+  left: 0;
+  right: 0;
+  margin: auto;
+}
+
 .danamic-like-ranking__item {
   display: flex;
   justify-content: space-between;

package/lib/components/dynamic/dynamic-like-ranking/index.js

@@ -83,7 +83,6 @@ var DynamicLikeRanking = function DynamicLikeRanking() {
       }
     });
   }, [date]);
-  if (!rankingData || rankingData.length === 0) return null;
 
   var handleLinkToPraiseRaking = function handleLinkToPraiseRaking() {
     var href = window.location.href;
@@ -145,7 +144,11 @@ var DynamicLikeRanking = function DynamicLikeRanking() {
     className: (0, _classnames["default"])("".concat(preCls, "__content"))
   }, TabBar(), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__content-table"))
-  }, rankingData.map(function (item, index) {
+  }, !rankingData || rankingData.length === 0 && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__content-table-empty")
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(preCls, "__content-table-empty-text")
+  }, "\u6682\u65E0\u6392\u884C")), rankingData && rankingData.length > 0 && rankingData.map(function (item, index) {
     return /*#__PURE__*/_react["default"].createElement(_item["default"], {
       userInfo: item,
       key: index

package/lib/components/dynamic/dynamic-topping/index.js

@@ -63,7 +63,7 @@ var DynamicTop = function DynamicTop() {
     className: (0, _classnames["default"])("".concat(preCls, "-header"))
   }, /*#__PURE__*/_react["default"].createElement("img", {
     className: (0, _classnames["default"])("".concat(preCls, "-header-image")),
-    src: require("./image/topIcon.svg")
+    src: require("./image/top-icon.svg")
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(preCls, "-header-text"))
   }, "\u7F6E\u9876\u52A8\u6001")), toppingData.map(function (item, index) {

package/lib/components/dynamic/dynamic-topping/item.js

@@ -17,10 +17,12 @@ var _popup = _interopRequireDefault(require("../../popup"));
 
 var _requestApi = require("./request-api");
 
-require("./index.css");
+var _auth = require("../../../utils/auth");
 
 var _popDownNotification = require("../../pop-down-notification");
 
+require("./index.css");
+
 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); }
@@ -40,6 +42,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var preCls = "danamic-topping-item";
+var dynamicManagerAuth = new _auth.DynamicManagerAuth();
 
 var Item = function Item(_ref) {
   var _ref$data = _ref.data,
@@ -120,7 +123,7 @@ var Item = function Item(_ref) {
 
   }, data.publishUser.name), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "-header-left-time"))
-  }, data.createDate))), /*#__PURE__*/_react["default"].createElement("div", {
+  }, data.createDate))), dynamicManagerAuth.hasAuth() && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "-header-right"))
   }, /*#__PURE__*/_react["default"].createElement(_popup["default"], {
     key: data.feedId,
@@ -129,7 +132,7 @@ var Item = function Item(_ref) {
     className: (0, _classnames["default"])("tu-icon-diot  ".concat(preCls, "-header-right-diot"))
   })))), /*#__PURE__*/_react["default"].createElement("img", {
     className: (0, _classnames["default"])("".concat(preCls, "-mark")),
-    src: require("./image/quotationMark.svg"),
+    src: require("./image/quotation-mark.svg"),
     alt: ""
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "-content"))

package/lib/components/dynamic/dynamic.js

@@ -151,13 +151,10 @@ 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) {
@@ -168,7 +165,12 @@ var Dynamic = function Dynamic() {
 
   var setTabsToPublish = function setTabsToPublish() {
     setActiveFirstLevelTabKey(1004);
-    setActiveSecondLevelTabKey(1007);
+    setActiveSecondLevelTabKey(1018); // @ts-ignore
+
+    var secondTabsArr = tabsInfo.find(function (item) {
+      return item.CodeId === 1004;
+    }).ChildMenus;
+    setSecondTabs(secondTabsArr);
     resetValue();
     setIsChangeConditionLoading(true);
     getDynamicData(true);
@@ -262,12 +264,15 @@ var Dynamic = function Dynamic() {
       if (resp.Code === 1) {
         var data = (0, _util.formatMenu)(resp.Data);
         setTabsInfo(data);
-        setSecondTabs(data[0].ChildMenus);
         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));
+          var secondTabsArr = data.find(function (item) {
+            return item.CodeId === Number(localFirstLevelTabKey);
+          }).ChildMenus;
+          setSecondTabs(secondTabsArr);
         } else {
           setActiveFirstLevelTabKey(data[0].CodeId);
         }
@@ -275,6 +280,7 @@ var Dynamic = function Dynamic() {
         if (localSecondLevelTabKey) {
           setActiveSecondLevelTabKey(Number(localSecondLevelTabKey));
         } else {
+          setSecondTabs(data[0].ChildMenus);
           setActiveSecondLevelTabKey(data[0].ChildMenus[0].CodeId);
         }
       }
@@ -300,6 +306,8 @@ var Dynamic = function Dynamic() {
   }, [searchKeyWord, searchKeyType, searchUser]);
   (0, _react.useEffect)(function () {
     if (!activeSecondLevelTabKey || !activeFirstLevelTabKey) return;
+    sessionStorage.setItem("tita-dynamic-first-level-tab__".concat(loginUser.Id), "".concat(activeFirstLevelTabKey));
+    sessionStorage.setItem("tita-dynamic-second-level-tab__".concat(loginUser.Id), "".concat(activeSecondLevelTabKey));
     resetValue();
     setIsChangeConditionLoading(true);
     getDynamicData(true);

package/lib/components/mblog/style.js

@@ -66,7 +66,7 @@ var IconSpan = _styledComponents["default"].span(_templateObject11 || (_template
 
 exports.IconSpan = IconSpan;
 
-var RightBtnGroupWrapper = _styledComponents["default"].div(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n  height: 100%;\n  display: flex;\n  align-items: center;\n\n  button {\n    min-width: 52px;\n    height: 30px;\n    margin-left: 12px;\n    border-radius: 2px;\n    border: none;\n  }\n"])));
+var RightBtnGroupWrapper = _styledComponents["default"].div(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n  height: 100%;\n  display: flex;\n  align-items: center;\n\n  button {\n    min-width: 90px;\n    height: 32px;\n    box-sizing: border-box;\n    margin-left: 12px;\n    border-radius: 4px;\n    border: none;\n  }\n"])));
 
 exports.RightBtnGroupWrapper = RightBtnGroupWrapper;
 
@@ -78,11 +78,11 @@ var BtnCancel = _styledComponents["default"].button(_templateObject14 || (_templ
 
 exports.BtnCancel = BtnCancel;
 
-var BtnConfirm = _styledComponents["default"].button(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["\n  color: #ffffff;\n  background: #2879FF;\n  white-space: nowrap;\n\n  &.disabled {\n    color: #ADB8C0;\n    background-color: #FAFBFC;\n    cursor: default;\n  }\n"])));
+var BtnConfirm = _styledComponents["default"].button(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["\n  color: #ffffff;\n  background: #2879FF;\n  white-space: nowrap;\n  border-radius: 4px;\n\n  &.disabled {\n    color: #ffffff;\n    background: #93BCFF;\n    cursor: default;\n  }\n"])));
 
 exports.BtnConfirm = BtnConfirm;
 
-var BtnPrivate = _styledComponents["default"].button(_templateObject16 || (_templateObject16 = _taggedTemplateLiteral(["\n  \n  color: #565E66;\n  background: #ffffff;\n  cursor: pointer;\n\n  &.disabled {\n    cursor: not-allowed;\n    .mblog-visiblity-range {\n      color: #A4ACB9;\n    }\n  }\n  .mblog-visiblity-range {\n    display: flex;\n    align-items: center;\n    color: #3F4755;\n  }\n  .range-cont-icon {\n    font-size: 16px;\n    display: inline-block;\n    transform: scale(0.5);\n  }\n"])));
+var BtnPrivate = _styledComponents["default"].button(_templateObject16 || (_templateObject16 = _taggedTemplateLiteral(["\n  \n  color: #565E66;\n  background: #ffffff;\n  cursor: pointer;\n\n  &.disabled {\n    cursor: not-allowed;\n    .mblog-visiblity-range {\n      color: #A4ACB9;\n    }\n  }\n  .mblog-visiblity-range {\n    display: flex;\n    align-items: center;\n    color: #3F4755;\n    justify-content: flex-end;\n  }\n  .range-cont-icon {\n    font-size: 16px;\n    display: inline-block;\n    transform: scale(0.5);\n  }\n"])));
 
 exports.BtnPrivate = BtnPrivate;
 

package/lib/components/tooltip/index.css

@@ -59,3 +59,26 @@
 .error-tooltip.rc-tooltip-placement-right .rc-tooltip-arrow, .error-tooltip.rc-tooltip-placement-rightTop .rc-tooltip-arrow, .error-tooltip.rc-tooltip-placement-rightBottom .rc-tooltip-arrow {
   border-right-color: #fff;
 }
+
+.tita-common-fade-enter {
+  opacity: 0;
+}
+
+.tita-common-fade-enter-active {
+  opacity: 1;
+  transition: opacity 0.5s ease;
+}
+
+.tita-common-fade-leave {
+  opacity: 1;
+}
+
+.tita-common-fade-leave-active {
+  opacity: 0;
+  transition: opacity 0.5s ease;
+}
+
+.tita-common-fade-no-shadow {
+  box-shadow: none;
+  z-index: 999999 !important;
+}

package/lib/components/tooltip/tooltip.js

@@ -23,7 +23,8 @@ var _default = function _default(props) {
     offset: [0, 5]
   } : _props$align;
   return /*#__PURE__*/_react["default"].createElement(_rcTooltip["default"], _extends({}, props, {
-    align: align
+    align: align,
+    transitionName: props.transitionName || 'tita-common-fade'
   }));
 };
 

package/lib/pages/like-ranking/filter-buttons/index.js

@@ -11,8 +11,6 @@ var _department = _interopRequireDefault(require("./department"));
 
 var _timer = _interopRequireDefault(require("./timer"));
 
-var _modular = _interopRequireDefault(require("./modular"));
-
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -31,8 +29,6 @@ var FilterButton = function FilterButton(_ref) {
     setParma: setParma,
     parmas: parmas,
     setType: setType
-  }), /*#__PURE__*/_react["default"].createElement(_modular["default"], {
-    setParma: setParma
   }));
 };
 

package/lib/pages/like-ranking/filter-buttons/modular.js

@@ -58,22 +58,22 @@ var Modular = function Modular(_ref) {
     value: "0",
     label: "全部"
   }, (0, _bsGlobal.hasWebHead)("okr") && {
-    value: "1",
+    value: "101",
     label: "目标"
   }, (0, _bsGlobal.hasWebHead)("okr") && {
-    value: "2",
+    value: "15",
     label: "关键成果"
   }, (0, _bsGlobal.hasWebHead)("project") && {
-    value: "3",
+    value: "10",
     label: "项目"
   }, (0, _bsGlobal.hasWebHead)("task") && {
-    value: "4",
+    value: "20",
     label: "任务"
   }, {
     value: "5",
     label: "总结"
   }, (0, _bsGlobal.hasWebHead)("kaohe") && {
-    value: "6",
+    value: "7",
     label: "绩效考核"
   }];
 

package/lib/pages/like-ranking/filter-buttons/timer.js

@@ -49,7 +49,9 @@ var Timer = function Timer(_ref) {
       endDate: endDate || (0, _formatTime.showMonthLastDay)()
     } // container={container}
 
-  }, /*#__PURE__*/_react["default"].createElement(_searchDropdown["default"], null, "\u65F6\u95F4")));
+  }, /*#__PURE__*/_react["default"].createElement(_searchDropdown["default"], {
+    noRightLine: true
+  }, "\u65F6\u95F4")));
 };
 
 var _default = Timer;

package/lib/utils/format-time.js

@@ -64,7 +64,7 @@ var timeFormat = function timeFormat(NowDate) {
 
   var d = date.getDate(); //日
 
-  return y + "-" + m + "-" + d;
+  return y + "-" + m + "-" + d + " 0:0:0";
 }; // 获取当年第一天
 
 
@@ -95,7 +95,7 @@ var showWeekFirstDay = function showWeekFirstDay() {
 
   var WeekFirstDay = new Date(Nowdate - (weekDay - 1) * 86400000);
   var M = Number(WeekFirstDay.getMonth()) + 1;
-  return WeekFirstDay.getFullYear() + "-" + M + "-" + WeekFirstDay.getDate();
+  return WeekFirstDay.getFullYear() + "-" + M + "-" + WeekFirstDay.getDate() + " 0:0:0";
 }; // 本周最后一天
 
 
@@ -123,7 +123,7 @@ var showNextWeekFirstDay = function showNextWeekFirstDay() {
 
   var WeekLastDay = new Date((WeekFirstDay / 1000 + 7 * 86400) * 1000);
   var M = Number(WeekLastDay.getMonth()) + 1;
-  return WeekLastDay.getFullYear() + "-" + M + "-" + WeekLastDay.getDate();
+  return WeekLastDay.getFullYear() + "-" + M + "-" + WeekLastDay.getDate() + " 0:0:0";
 }; // 本月第一天
 
 
@@ -133,7 +133,7 @@ var showMonthFirstDay = function showMonthFirstDay() {
   var Nowdate = new Date();
   var MonthFirstDay = new Date(Nowdate.getFullYear(), Nowdate.getMonth(), 1);
   var M = Number(MonthFirstDay.getMonth()) + 1;
-  return MonthFirstDay.getFullYear() + "-" + M + "-" + MonthFirstDay.getDate();
+  return MonthFirstDay.getFullYear() + "-" + M + "-" + MonthFirstDay.getDate() + " 0:0:0";
 }; // 本月最后一天
 
 
@@ -155,7 +155,7 @@ var showNextMonthFirstDay = function showNextMonthFirstDay() {
   var Nowdate = new Date();
   var MonthFirstDay = new Date(Nowdate.getFullYear(), Nowdate.getMonth() + 1, 1);
   var M = Number(MonthFirstDay.getMonth()) + 1;
-  return MonthFirstDay.getFullYear() + "-" + M + "-" + MonthFirstDay.getDate();
+  return MonthFirstDay.getFullYear() + "-" + M + "-" + MonthFirstDay.getDate() + " 0:0:0";
 };
 
 exports.showNextMonthFirstDay = showNextMonthFirstDay;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.5.83",
+  "version": "1.5.87",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",