@titaui/pc 1.5.79 → 1.5.83

package/lib/components/change-okr/Item.js

@@ -124,7 +124,7 @@ var Item = /*#__PURE__*/function (_PureComponent) {
           return "".concat(data.yqmnum, "\u6708");
 
         case 4:
-          return "".concat(data.yqmnum, "-").concat(data.yqmnum + 1 % 12 || 12, "\u6708");
+          return "".concat(data.yqmnum, "-").concat((data.yqmnum + 1) % 12 || 12, "\u6708");
 
         case 5:
           return data.yqmnum == 1 ? '上半年' : '下半年';

package/lib/components/dynamic/constant.js

@@ -78,6 +78,7 @@ var ObjectType = {
   11: '计划',
   12: '计划表的操作记录',
   62: '目标',
+  65: '关键成果',
   70: '复盘',
   79: '关键成果进展',
   80: '公告',

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

@@ -65,7 +65,7 @@ var getRanking = function getRanking(data) {
 exports.getRanking = getRanking;
 
 var getLeastPariseInfo = function getLeastPariseInfo() {
-  return (0, _request.rget)("v1")("praise/getLeastPariseInfo?count=5");
+  return (0, _request.rget)("v1")("praise/getLeastPariseInfo?count=10");
 };
 
 exports.getLeastPariseInfo = getLeastPariseInfo;

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

@@ -230,7 +230,7 @@ function PersonalInfoComponent() {
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "PersonalInfoComponent-PersonalInfo__fansinfo__attention"
   }, /*#__PURE__*/_react["default"].createElement("img", {
-    src: require("../image/Visits.png")
+    src: require("../image/visits.png")
   }), " ", /*#__PURE__*/_react["default"].createElement("b", null, fansNum), "\u4EBA\u5173\u6CE8"), /*#__PURE__*/_react["default"].createElement("span", {
     className: "PersonalInfoComponent-PersonalInfo__fansinfo__like"
   }, /*#__PURE__*/_react["default"].createElement("img", {

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

@@ -195,7 +195,7 @@ var WorkNode = function WorkNode(_ref) {
         return yqmnum + '月';
 
       case 4:
-        return "".concat(yqmnum, "-").concat(yqmnum + 1 % 12 || 12, "\u6708");
+        return "".concat(yqmnum, "-").concat((yqmnum + 1) % 12 || 12, "\u6708");
 
       case 5:
         return "".concat(yqmnum == 1 ? '上' : '下', "\u534A\u5E74");

package/lib/components/period-selector/common.js

@@ -19,8 +19,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 var dealSelectedPeriodData = function dealSelectedPeriodData(period) {
   var option = {};
-  option.cycleType = period == '-1' ? '-1' : period.substring(0, 1);
-  option.yqmNum = period.substring(2) == '' ? '0' : period.substring(2);
+  option.cycleType = period == "-1" ? "-1" : period.substring(0, 1);
+  option.yqmNum = period.substring(2) == "" ? "0" : period.substring(2);
   return option;
 };
 
@@ -32,8 +32,8 @@ var dealYearsRange = function dealYearsRange(yearsRange, showAllYears) {
   if (yearsRange.length) {
     if (yearsRange.length > 1 && showAllYears) {
       yearsData = [{
-        title: '全部年份',
-        order: ['-1'],
+        title: "全部年份",
+        order: ["-1"],
         checked: false
       }];
     }
@@ -44,15 +44,15 @@ var dealYearsRange = function dealYearsRange(yearsRange, showAllYears) {
     for (var i = startYear; i <= endYear; i++) {
       yearsData.push({
         checked: false,
-        order: [i + ''],
-        title: i + ''
+        order: [i + ""],
+        title: i + ""
       });
     }
   } else {
     var nowYear = new Date().getFullYear();
     yearsData = [{
-      title: nowYear + '',
-      order: [nowYear + ''],
+      title: nowYear + "",
+      order: [nowYear + ""],
       checked: false
     }];
   }
@@ -63,35 +63,35 @@ var dealYearsRange = function dealYearsRange(yearsRange, showAllYears) {
 exports.dealYearsRange = dealYearsRange;
 
 var formatPeriod = function formatPeriod(selected) {
-  if (!selected) return '';
+  if (!selected) return "";
   var quarter = ["", "第一季度", "第二季度", "第三季度", "第四季度"];
   var cycleDate = "";
-  var annualNum = selected.annualNum == '-1' ? "全部年份" : selected.annualNum + '年';
+  var annualNum = selected.annualNum == "-1" ? "全部年份" : selected.annualNum + "年";
 
   switch ("".concat(selected.cycleType)) {
-    case '-1':
+    case "-1":
       cycleDate = "全部周期";
       break;
 
-    case '1':
+    case "1":
       cycleDate = "年度";
       break;
 
-    case '2':
+    case "2":
       // 季度
       cycleDate = quarter[Number(selected.yqmNum)];
       break;
 
-    case '3':
+    case "3":
       cycleDate = selected.yqmNum + "月";
       break;
 
-    case '4':
-      cycleDate = "".concat(selected.yqmNum, " - ").concat(Number(selected.yqmNum) + 1 % 12, "\u6708");
+    case "4":
+      cycleDate = "".concat(selected.yqmNum, " - ").concat((Number(selected.yqmNum) + 1) % 12, "\u6708");
       break;
 
-    case '5':
-      cycleDate = selected.yqmNum == '1' ? '上半年' : '下半年';
+    case "5":
+      cycleDate = selected.yqmNum == "1" ? "上半年" : "下半年";
       break;
 
     default:
@@ -109,7 +109,7 @@ var computeYearIndex = function computeYearIndex(currentYear, yearsData, compute
     return Number(item.title) == currentYear;
   });
 
-  if (computeType == 'add') {
+  if (computeType == "add") {
     newIndex = currentYearIndex + 1;
   } else {
     newIndex = currentYearIndex - 1;
@@ -126,68 +126,66 @@ var getDateRangeByCycle = function getDateRangeByCycle(cycle) {
   if (!cycle) {
     var start = (0, _moment["default"])();
     return {
-      startDate: start.format('YYYY/MM/DD'),
-      endDate: start.add(1, 'M').format('YYYY/MM/DD')
+      startDate: start.format("YYYY/MM/DD"),
+      endDate: start.add(1, "M").format("YYYY/MM/DD")
     };
   }
 
-  ;
-
   switch (cycle.cycleType) {
-    case '1':
+    case "1":
       {
         var _start = (0, _moment["default"])().year(Number(cycle.annualNum)).month(startMonth - 1).date(1);
 
         return {
-          startDate: _start.format('YYYY/MM/DD'),
-          endDate: _start.add(11, 'M').endOf('M').format('YYYY/MM/DD')
+          startDate: _start.format("YYYY/MM/DD"),
+          endDate: _start.add(11, "M").endOf("M").format("YYYY/MM/DD")
         };
       }
 
-    case '2':
+    case "2":
       {
         var yearStart = (0, _moment["default"])().year(Number(cycle.annualNum)).month(startMonth - 1).date(1);
-        var quarterStart = yearStart.add((Number(cycle.yqmNum) - 1) * 3, 'M');
+        var quarterStart = yearStart.add((Number(cycle.yqmNum) - 1) * 3, "M");
         return {
-          startDate: quarterStart.format('YYYY/MM/DD'),
-          endDate: quarterStart.add(2, 'M').endOf('M').format('YYYY/MM/DD')
+          startDate: quarterStart.format("YYYY/MM/DD"),
+          endDate: quarterStart.add(2, "M").endOf("M").format("YYYY/MM/DD")
         };
       }
 
-    case '3':
+    case "3":
       {
         return {
-          startDate: "".concat(cycle.annualNum, "/").concat(Number(cycle.yqmNum) < 10 ? '0' + cycle.yqmNum : cycle.yqmNum, "/01"),
-          endDate: (0, _moment["default"])(cycle.annualNum + '/' + cycle.yqmNum + '/' + 1).add(1, 'month').set('date', 0).format('YYYY/MM/DD')
+          startDate: "".concat(cycle.annualNum, "/").concat(Number(cycle.yqmNum) < 10 ? "0" + cycle.yqmNum : cycle.yqmNum, "/01"),
+          endDate: (0, _moment["default"])(cycle.annualNum + "/" + cycle.yqmNum + "/" + 1).add(1, "month").set("date", 0).format("YYYY/MM/DD")
         };
       }
 
-    case '4':
+    case "4":
       {
         var _start2 = (0, _moment["default"])().year(Number(cycle.annualNum)).month(Number(cycle.yqmNum) - 1).date(1);
 
         return {
-          startDate: _start2.format('YYYY/MM/DD'),
-          endDate: _start2.add(1, 'month').endOf('M').format('YYYY/MM/DD')
+          startDate: _start2.format("YYYY/MM/DD"),
+          endDate: _start2.add(1, "month").endOf("M").format("YYYY/MM/DD")
         };
       }
 
-    case '5':
+    case "5":
       {
         var _start3 = (0, _moment["default"])().year(Number(cycle.annualNum)).month(startMonth - 1).date(1);
 
-        if (cycle.yqmNum == '2') _start3.add(6, 'M');
+        if (cycle.yqmNum == "2") _start3.add(6, "M");
         return {
-          startDate: _start3.format('YYYY/MM/DD'),
-          endDate: _start3.add(5, 'month').endOf('M').format('YYYY/MM/DD')
+          startDate: _start3.format("YYYY/MM/DD"),
+          endDate: _start3.add(5, "month").endOf("M").format("YYYY/MM/DD")
         };
       }
 
     default:
       {
         return {
-          startDate: (0, _moment["default"])().set('year', Number(cycle.annualNum)).format('YYYY/MM/DD'),
-          endDate: (0, _moment["default"])().set('year', Number(cycle.annualNum)).add(30, 'day').format('YYYY/MM/DD')
+          startDate: (0, _moment["default"])().set("year", Number(cycle.annualNum)).format("YYYY/MM/DD"),
+          endDate: (0, _moment["default"])().set("year", Number(cycle.annualNum)).add(30, "day").format("YYYY/MM/DD")
         };
       }
   }
@@ -217,10 +215,18 @@ function getDefalutCycle(setting) {
     };
     return _objectSpread(_objectSpread({}, _cycle2), getDateRangeByCycle(_cycle2, setting.yearStartMonth));
   } else if (setting.isOpenBimonthly) {
+    var month = new Date().getMonth() + 1;
+
+    if (setting.yearStartMonth % 2 == 1) {
+      month = month - (month % 2 == 1 ? 0 : 1);
+    } else {
+      month = month - month % 2 || 12;
+    }
+
     var _cycle3 = {
       annualNum: new Date().getFullYear() + "",
       cycleType: "4",
-      yqmNum: new Date().getMonth() + 1 + ""
+      yqmNum: month + ""
     };
     return _objectSpread(_objectSpread({}, _cycle3), getDateRangeByCycle(_cycle3, setting.yearStartMonth));
   } else if (setting.isOpenHalfYear) {

package/lib/pages/home-page/components/data-list/nav-selector/index.js

@@ -82,7 +82,7 @@ var HomeNavSelector = function HomeNavSelector(props) {
 
       case '4':
         setCycleTime({
-          name: "".concat(yqmNum, "-").concat(Number(yqmNum) + 1 % 12 || 12, "\u6708"),
+          name: "".concat(yqmNum, "-").concat((Number(yqmNum) + 1) % 12 || 12, "\u6708"),
           yearNum: annualNum,
           cycleType: cycleType,
           yqmNum: yqmNum

package/lib/pages/home-page/components/data-list/table/utils-function.js

@@ -68,7 +68,7 @@ var cycleTimeDisplay = function cycleTimeDisplay(cycleType, annualNum, yqmNum) {
       return "".concat(annualNum, "\u5E74 ").concat(yqmNum, "\u6708");
 
     case 4:
-      return "".concat(annualNum, "\u5E74 ").concat(yqmNum, "-").concat(yqmNum + 1 % 12 || 12, "\u6708");
+      return "".concat(annualNum, "\u5E74 ").concat(yqmNum, "-").concat((yqmNum + 1) % 12 || 12, "\u6708");
 
     case 5:
       return "".concat(annualNum, "\u5E74 ").concat(yqmNum == 1 ? '上' : '下', "\u534A\u5E74");

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

@@ -9,8 +9,6 @@ var _react = _interopRequireDefault(require("react"));
 
 var _department = _interopRequireDefault(require("./department"));
 
-var _group = _interopRequireDefault(require("./group"));
-
 var _timer = _interopRequireDefault(require("./timer"));
 
 var _modular = _interopRequireDefault(require("./modular"));
@@ -29,8 +27,6 @@ var FilterButton = function FilterButton(_ref) {
     className: "".concat(preCls)
   }, /*#__PURE__*/_react["default"].createElement(_department["default"], {
     setParma: setParma
-  }), /*#__PURE__*/_react["default"].createElement(_group["default"], {
-    setParma: setParma
   }), /*#__PURE__*/_react["default"].createElement(_timer["default"], {
     setParma: setParma,
     parmas: parmas,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.5.79",
+  "version": "1.5.83",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",
@@ -65,8 +65,8 @@
     "clone-deep": "^4.0.1",
     "color": "^3.2.1",
     "dayjs": "^1.10.4",
-    "html2canvas": "^1.0.0-rc.7",
-    "lottie-web": "^5.7.13",
+    "html2canvas": "1.3.2",
+    "lottie-web": "^5.7.12",
     "moment": "^2.29.1",
     "qs": "^6.10.1",
     "rc-checkbox": "^2.3.2",