@titaui/pc 1.9.74 → 1.9.78

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

@@ -69,8 +69,9 @@
 
 .danamic-like-ranking__content-table-items {
   display: grid;
-  grid-template-columns: auto auto auto auto;
+  grid-template-columns: auto 28px auto auto;
   grid-row-gap: 16px;
+  margin-left: -8px;
 }
 
 .danamic-like-ranking__item:last-of-type {
@@ -92,10 +93,6 @@
   font-size: 14px;
 }
 
-.danamic-like-ranking__item-avatar {
-  margin-left: 9px;
-}
-
 .danamic-like-ranking__item-avatar .titaui-pc-avator-container {
   display: inline-flex !important;
 }

package/lib/components/dynamic/dynamic.js

@@ -185,9 +185,14 @@ var Dynamic = function Dynamic() {
   };
 
   var handleDeleteFeed = function handleDeleteFeed(feedId) {
-    setDynamicData(_toConsumableArray(dynamicData.filter(function (item) {
+    var newDatas = dynamicData.filter(function (item) {
       return item.feedId !== feedId;
-    })));
+    });
+    setDynamicData([]); // 动画效果如果直接设置新的数据，diff时间会比较长，所以直接清空再赋值，这样不会出现删除时等待长时间空白
+
+    setTimeout(function () {
+      setDynamicData(_toConsumableArray(newDatas));
+    }, 0);
   };
 
   var getDynamicData = function getDynamicData(needResetValue) {

package/lib/components/mblog/style.js

@@ -18,7 +18,7 @@ var MBlogBox = _styledComponents["default"].div(_templateObject || (_templateObj
 
 exports.MBlogBox = MBlogBox;
 
-var DivMblogContent = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  padding: 8px 10px 6px;\n  border: 1px solid #DFE3EA;\n  border-radius: 8px;\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"])));
+var DivMblogContent = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  padding: 8px 10px 6px;\n  border: 1px solid #DFE3EA;\n  border-radius: 8px;\n  background-color: #fff;\n  position: relative;\n  transition: all .2s ease-in-out;\n  height: 200px;\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;
 
@@ -36,7 +36,7 @@ var TextareaWrapper = _styledComponents["default"].div(_templateObject5 || (_tem
 
 exports.TextareaWrapper = TextareaWrapper;
 
-var Textarea = _styledComponents["default"].textarea(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  width: 100%;\n  padding: 0;\n  border: 0 none;\n  background-color: transparent;\n  color: #3F4755;\n  resize: none;\n  word-break: break-all;\n  word-wrap: break-word;\n  height: 86px;\n\n  &.textarea-setheight {\n    visibility: hidden;\n    position: absolute;\n  }\n/* \n  &.private__bg {\n    background: url(", ") no-repeat right top;\n  } */\n"])), require("./assets/lock-radius.png"));
+var Textarea = _styledComponents["default"].textarea(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  width: 100%;\n  padding: 0;\n  border: 0 none;\n  background-color: transparent;\n  color: #3F4755;\n  resize: none;\n  word-break: break-all;\n  word-wrap: break-word;\n  height: 160px;\n\n  &.textarea-setheight {\n    visibility: hidden;\n    position: absolute;\n  }\n"])));
 
 exports.Textarea = Textarea;
 

package/lib/components/okr-flow/export-modal/index.js

@@ -61,7 +61,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function ExportMapModal(props) {
+var ExportMapModal = function ExportMapModal(props) {
   var _props$visible = props.visible,
       visible = _props$visible === void 0 ? false : _props$visible,
       onCloseHandler = props.onCloseHandler,
@@ -89,18 +89,25 @@ function ExportMapModal(props) {
 
   var modalRef = (0, _react.useRef)();
   (0, _react.useEffect)(function () {
-    if ((0, _bsGlobal.isWx)()) {
-      window.WWOpenData && window.WWOpenData.enableCanvasSharing && window.WWOpenData.enableCanvasSharing();
-      window.WWOpenData && window.WWOpenData.initCanvas && window.WWOpenData.initCanvas();
+    if ((0, _bsGlobal.isWx)() && window.WWOpenData) {
+      if (window.WWOpenData.enableCanvasSharing) {
+        window.WWOpenData.enableCanvasSharing();
+      }
+
+      if (window.WWOpenData.initCanvas) {
+        window.WWOpenData.initCanvas();
+      }
     }
   }, []);
   (0, _react.useEffect)(function () {
-    visible && mapInstance && mapInstance.fitView();
+    if (visible && mapInstance) {
+      mapInstance.fitView();
+    }
   }, [visible, mapInstance]);
 
   var downloadImg = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-      var okrMapRef, width, height, canvas, scale, opts, result, imgUrl, url, image;
+      var okrMapRef, width, height, canvas, scale, opts;
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -136,52 +143,66 @@ function ExportMapModal(props) {
 
               };
               _context.next = 12;
-              return (0, _html2canvas["default"])(okrMapRef, opts);
+              return (0, _html2canvas["default"])(okrMapRef, opts).then(function (result) {
+                if ((0, _bsGlobal.isWx)() && window.WWOpenData) {
+                  if (window.WWOpenData.enableCanvasSharing) {
+                    window.WWOpenData.enableCanvasSharing();
+                  }
+
+                  if (window.WWOpenData.initCanvas) {
+                    window.WWOpenData.initCanvas();
+                  }
+                }
 
-            case 12:
-              result = _context.sent;
+                var imgUrl = result.toDataURL("image/png"); // 得到图片的base64编码数据
 
-              if ((0, _bsGlobal.isWx)()) {
-                window.WWOpenData && window.WWOpenData.enableCanvasSharing && window.WWOpenData.enableCanvasSharing();
-                window.WWOpenData && window.WWOpenData.initCanvas && window.WWOpenData.initCanvas();
-              }
+                // 得到图片的base64编码数据
+                (0, _requestApis.getBase64DownloadUrl)(imgUrl.split(",")[1]).then(function (url) {
+                  var image = new Image();
+                  image.setAttribute("crossOrigin", "anonymous");
 
-              imgUrl = result.toDataURL("image/png"); // 得到图片的base64编码数据
+                  image.onload = function () {
+                    if (!url.Data.obj) {
+                      _toast["default"].Error("导出失败，请稍后重试", {
+                        canClose: false
+                      });
+                    }
 
-              _context.next = 17;
-              return (0, _requestApis.getBase64DownloadUrl)(imgUrl.split(",")[1]);
+                    var a = document.createElement("a"); // 生成一个a元素
 
-            case 17:
-              url = _context.sent;
-              image = new Image();
-              image.setAttribute("crossOrigin", "anonymous");
+                    // 生成一个a元素
+                    var event = new MouseEvent("click"); // 创建一个单击事件
 
-              image.onload = function () {
-                if (!url.Data.obj) {
-                  _toast["default"].Error("导出失败，请稍后重试", {
-                    canClose: false
-                  });
-                }
+                    // 创建一个单击事件
+                    a.download = "okr地图"; // 设置图片名称
 
-                var a = document.createElement("a"); // 生成一个a元素
+                    // 设置图片名称
+                    a.href = url.Data.obj; // 将生成的URL设置为a.href属性
 
-                var event = new MouseEvent("click"); // 创建一个单击事件
+                    // 将生成的URL设置为a.href属性
+                    a.dispatchEvent(event); // 触发a的单击事件
 
-                a.download = "okr地图"; // 设置图片名称
+                    // 触发a的单击事件
+                    _toast["default"].Success("导出成功");
 
-                a.href = url.Data.obj; // 将生成的URL设置为a.href属性
+                    setIsExport(false);
 
-                a.dispatchEvent(event); // 触发a的单击事件
-
-                _toast["default"].Success("导出成功");
+                    if (onCloseHandler) {
+                      onCloseHandler();
+                    }
+                  };
 
+                  image.src = imgUrl;
+                });
+              })["catch"](function (err) {
                 setIsExport(false);
-                onCloseHandler && onCloseHandler();
-              };
 
-              image.src = imgUrl;
+                _toast["default"].Error(err, {
+                  canClose: false
+                });
+              });
 
-            case 22:
+            case 12:
             case "end":
               return _context.stop();
           }
@@ -267,7 +288,10 @@ function ExportMapModal(props) {
       background: bgColor
     }
   }))))));
-}
+};
 
+ExportMapModal.defaultProps = {
+  onCloseHandler: function onCloseHandler() {}
+};
 var _default = ExportMapModal;
 exports["default"] = _default;

package/lib/components/okrcase-library/index.css

@@ -140,7 +140,7 @@
 }
 
 .okr-cases-library__navFirst__item-active::after {
-  content: "";
+  content: '';
   position: absolute;
   bottom: -14px;
   left: 0;
@@ -277,6 +277,7 @@
 }
 
 .okr-cases-library__cardList__card__title__btn {
+  font-size: 14px;
   position: absolute;
   right: 15px;
   top: 60px;
@@ -289,6 +290,7 @@
   cursor: pointer;
   opacity: 0;
   transition: all 0.5s;
+  font-weight: 500;
 }
 
 .okr-cases-library__cardList__card__title__btn-show {

package/lib/components/part-notice/index.js

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _localStorage = require("../../utils/local-storage");
 
+var _notAllowData = require("./not-allow-data");
+
 require("./index.css");
 
 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); }
@@ -31,6 +33,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var preCls = "part-notice";
 var storage = new _localStorage.LocalStorage();
+var tenantId = window.BSGlobal.tenantInfo.Id;
 
 var PartNotice = function PartNotice(_ref) {
   var storageName = _ref.storageName,
@@ -69,6 +72,9 @@ var PartNotice = function PartNotice(_ref) {
     window.open(link, "_target");
   };
 
+  if (!_notAllowData.notAllowData.find(function (item) {
+    return item === tenantId;
+  })) return /*#__PURE__*/_react["default"].createElement("span", null);
   if (!visible) return /*#__PURE__*/_react["default"].createElement("span", null);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls)

package/lib/components/part-notice/not-allow-data.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.notAllowData = exports["default"] = void 0;
+var notAllowData = [366131, 307425, 386434, 318995, 516911, 520530, 529247, 283929, 521974, 525553, 524783, 533197, 506389, 541245, 265530, 542555, 322665, 388103, 523558, 521070, 547650, 527324, 543000, 536771, 377798, 548066, 541479, 538509, 509148, 383549, 533456, 395251, 516682, 546877, 521818, 552965, 551336, 518051, 544736, 552455, 534044, 529329, 554018, 518791, 392024, 553462, 504585, 551576, 547861, 504087, 555603, 526408, 536559, 555641, 553800, 553083, 554654, 552158, 542587, 379998, 510788, 553836, 529906, 511358, 551913, 543085, 514568, 397292, 556796, 538802, 546456, 549378, 542520, 560327, 548612, 522327, 555225, 530370, 565991, 547082, 564585, 535986, 502385, 391420, 560552, 558317, 564416, 552974, 318867, 570075, 560793, 565994, 533855, 375844, 549354, 571823, 537982, 528567, 568168, 569066, 515852, 566360, 548969, 553532, 352728, 562259, 521375];
+exports.notAllowData = notAllowData;
+var _default = notAllowData;
+exports["default"] = _default;

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

@@ -23,8 +23,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 = Number(period) === -1 ? "-1" : period.substring(0, 1);
+  option.yqmNum = period.substring(2) === "" ? "0" : period.substring(2);
   return option;
 };
 
@@ -45,7 +45,7 @@ var dealYearsRange = function dealYearsRange(yearsRange, showAllYears) {
     var startYear = yearsRange[0];
     var endYear = yearsRange[yearsRange.length - 1];
 
-    for (var i = startYear; i <= endYear; i++) {
+    for (var i = startYear; i <= endYear; i += 1) {
       yearsData.push({
         checked: false,
         order: ["".concat(i)],
@@ -70,7 +70,7 @@ var formatPeriod = function formatPeriod(selected) {
   if (!selected) return "";
   var quarter = ["", "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_1stQuarter")), "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_2ndQuarter")), "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_3rdQuarter")), "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_4thQuarter"))];
   var cycleDate = "";
-  var annualNum = selected.annualNum == "-1" ? "".concat((0, _getLocale.getLocale)("OKR_MyO_Butt_Allyears")) : "".concat(selected.annualNum).concat(_getLocale.isEn ? "" : "年");
+  var annualNum = Number("".concat(selected.annualNum)) === -1 ? "".concat((0, _getLocale.getLocale)("OKR_MyO_Butt_Allyears")) : "".concat(selected.annualNum).concat(_getLocale.isEn ? "" : "年");
   var month = (0, _constant.getMonth)();
 
   switch ("".concat(selected.cycleType)) {
@@ -96,7 +96,7 @@ var formatPeriod = function formatPeriod(selected) {
       break;
 
     case "5":
-      cycleDate = selected.yqmNum == "1" ? "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Firsthalf")) : "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Secondhalf"));
+      cycleDate = Number("".concat(selected.yqmNum)) === 1 ? "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Firsthalf")) : "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Secondhalf"));
       break;
 
     default:
@@ -111,10 +111,10 @@ exports.formatPeriod = formatPeriod;
 var computeYearIndex = function computeYearIndex(currentYear, yearsData, computeType) {
   var newIndex;
   var currentYearIndex = yearsData.findIndex(function (item) {
-    return Number(item.title) == currentYear;
+    return Number(item.title) === currentYear;
   });
 
-  if (computeType == "add") {
+  if (computeType === "add") {
     newIndex = currentYearIndex + 1;
   } else {
     newIndex = currentYearIndex - 1;
@@ -137,6 +137,14 @@ var getDateRangeByCycle = function getDateRangeByCycle(cycle) {
   }
 
   switch (cycle.cycleType) {
+    case "-1":
+      {
+        return {
+          startDate: "",
+          endDate: ""
+        };
+      }
+
     case "1":
       {
         var _start = (0, _moment["default"])().year(Number(cycle.annualNum)).month(startMonth - 1).date(1);
@@ -179,7 +187,7 @@ var getDateRangeByCycle = function getDateRangeByCycle(cycle) {
       {
         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")
@@ -226,8 +234,8 @@ function getDefalutCycle(setting) {
   if (setting.isOpenBimonthly) {
     var month = new Date().getMonth() + 1;
 
-    if (setting.yearStartMonth % 2 == 1) {
-      month -= month % 2 == 1 ? 0 : 1;
+    if (setting.yearStartMonth % 2 === 1) {
+      month -= month % 2 === 1 ? 0 : 1;
     } else {
       month = month - month % 2 || 12;
     }

package/lib/pages/okr-map/export-modules/okr-map/header/index.css

@@ -3,7 +3,7 @@
   background: #ffffff;
   box-shadow: 0px 0px 8px 0px #e9eef3;
   position: relative;
-  border-bottom: 1px solid #E9ECF0;
+  border-bottom: 1px solid #e9ecf0;
 }
 
 .titapage-okr-map__header__folded {
@@ -68,7 +68,7 @@
 }
 
 .titapage-okr-map__header-theme:hover {
-  color: #2879FF;
+  color: #2879ff;
 }
 
 .titapage-okr-map__header-theme:hover:before {
@@ -113,7 +113,7 @@
 }
 
 .titapage-okr-map__header-action-showkr:hover, .titapage-okr-map__header-action-level:hover {
-  background: #F7F8FA;
+  background: #f7f8fa;
 }
 
 .titapage-okr-map__header-action--show-more {
@@ -125,7 +125,7 @@
   height: 30px;
   line-height: 30px;
   cursor: pointer;
-  color: #3F4755;
+  color: #3f4755;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   font-size: 12px;
 }
@@ -134,7 +134,7 @@
   position: absolute;
   display: inline-block;
   background: url("../../../images/line-down-arrow.svg") transparent no-repeat 50% 50%;
-  content: "";
+  content: '';
   height: 6px;
   width: 10px;
   right: 0;
@@ -151,9 +151,9 @@
 
 .titapage-okr-map__show-more-popup {
   padding: 11px 0;
-  background: #FFFFFF;
+  background: #ffffff;
   box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2);
-  border: 1px solid #E9ECF0;
+  border: 1px solid #e9ecf0;
   border-radius: 2px;
 }
 
@@ -226,7 +226,7 @@
 }
 
 .titapage-okr-map__dark .titapage-okr-map__header .titaui-period-selector button:hover {
-  background: #5c8EFF;
+  background: #5c8eff;
 }
 
 .titapage-okr-map__dark .titapage-okr-map__header .titaui-period-selector .titaui-period-selector__down-arrow {
@@ -262,7 +262,7 @@
 }
 
 .titapage-okr-map__dark .titapage-okr-map__header .titaui-icon-button-list__btn:hover {
-  background-color: #515A69;
+  background-color: #515a69;
 }
 
 .titapage-okr-map__dark .rc-select-selection-item {
@@ -286,7 +286,7 @@
   content: 'i';
   width: 16px;
   height: 16px;
-  background-color: #FFBC00;
+  background-color: #ffbc00;
   color: #fff;
   text-align: center;
   line-height: 16px;
@@ -299,7 +299,8 @@
 .titapage-okr-map--kr-dialog--content {
   font-size: 14px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
-  color: #6F7886;
+  color: #6f7886;
   line-height: 20px;
   padding: 0 32px;
+  display: block;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.9.74",
+  "version": "1.9.78",
   "nameCN": "",
   "description": "",
   "main": "src/index.js",

package/src/components/dynamic/dynamic-like-ranking/index.scss

@@ -66,8 +66,9 @@
       }
       &-items {
         display: grid;
-        grid-template-columns: auto auto auto auto;
+        grid-template-columns: auto 28px auto auto;
         grid-row-gap: 16px;
+        margin-left: -8px;
       }
     }
   }
@@ -93,8 +94,6 @@
     }
 
     &-avatar {
-      margin-left: 9px;
-
       .titaui-pc-avator-container {
         display: inline-flex !important;
       }

package/src/components/dynamic/dynamic.tsx

@@ -80,9 +80,14 @@ const Dynamic: FC = () => {
   };
 
   const handleDeleteFeed = (feedId) => {
-    setDynamicData([
-      ...dynamicData.filter((item: any) => item.feedId !== feedId),
-    ]);
+    const newDatas = dynamicData.filter((item: any) => item.feedId !== feedId);
+    setDynamicData([]);
+    // 动画效果如果直接设置新的数据，diff时间会比较长，所以直接清空再赋值，这样不会出现删除时等待长时间空白
+    setTimeout(() => {
+      setDynamicData([
+        ...newDatas,
+      ]);
+    }, 0);
   };
 
   const getDynamicData = (needResetValue) => {

package/src/components/mblog/style.ts

@@ -26,7 +26,7 @@ export const DivMblogContent = styled.div`
   background-color: #fff;
   position: relative;
   transition: all .2s ease-in-out;
-  height: 124px;
+  height: 200px;
   box-sizing: border-box;
 
   &.input_default-active {
@@ -60,16 +60,12 @@ export const Textarea = styled.textarea`
   resize: none;
   word-break: break-all;
   word-wrap: break-word;
-  height: 86px;
+  height: 160px;
 
   &.textarea-setheight {
     visibility: hidden;
     position: absolute;
   }
-/* 
-  &.private__bg {
-    background: url(${require("./assets/lock-radius.png")}) no-repeat right top;
-  } */
 `;
 
 export const Tips = styled.div`

package/src/components/okr-flow/export-modal/index.tsx

@@ -1,5 +1,5 @@
 import React, {
-  useState, useEffect, useRef, Fragment,
+  useState, useEffect, useRef, FC,
 } from "react";
 import classNames from "classnames";
 import Html2Canvas from "html2canvas";
@@ -25,7 +25,7 @@ interface IProps {
   showkr: boolean;
 }
 
-function ExportMapModal(props: IProps) {
+const ExportMapModal: FC<IProps> = (props: IProps) => {
   const {
     visible = false,
     onCloseHandler,
@@ -39,17 +39,19 @@ function ExportMapModal(props: IProps) {
   const [isExport, setIsExport] = useState(false);
   const modalRef = useRef();
   useEffect(() => {
-    if (isWx()) {
-      window.WWOpenData
-        && window.WWOpenData.enableCanvasSharing
-        && window.WWOpenData.enableCanvasSharing();
-      window.WWOpenData
-        && window.WWOpenData.initCanvas
-        && window.WWOpenData.initCanvas();
+    if (isWx() && window.WWOpenData) {
+      if (window.WWOpenData.enableCanvasSharing) {
+        window.WWOpenData.enableCanvasSharing();
+      }
+      if (window.WWOpenData.initCanvas) {
+        window.WWOpenData.initCanvas();
+      }
     }
   }, []);
   useEffect(() => {
-    visible && mapInstance && mapInstance.fitView();
+    if (visible && mapInstance) {
+      mapInstance.fitView();
+    }
   }, [visible, mapInstance]);
 
   const downloadImg = async () => {
@@ -72,34 +74,41 @@ function ExportMapModal(props: IProps) {
       useCORS: true, // 【重要】开启跨域配置
     };
 
-    const result = await Html2Canvas(okrMapRef, opts);
-    if (isWx()) {
-      window.WWOpenData
-        && window.WWOpenData.enableCanvasSharing
-        && window.WWOpenData.enableCanvasSharing();
-      window.WWOpenData
-        && window.WWOpenData.initCanvas
-        && window.WWOpenData.initCanvas();
-    }
-    const imgUrl = result.toDataURL("image/png"); // 得到图片的base64编码数据
-    const url = await getBase64DownloadUrl(imgUrl.split(",")[1]);
-    const image = new Image();
-
-    image.setAttribute("crossOrigin", "anonymous");
-    image.onload = () => {
-      if (!url.Data.obj) {
-        Toast.Error("导出失败，请稍后重试", { canClose: false });
+    await Html2Canvas(okrMapRef, opts).then((result) => {
+      if (isWx() && window.WWOpenData) {
+        if (window.WWOpenData.enableCanvasSharing) {
+          window.WWOpenData.enableCanvasSharing();
+        }
+        if (window.WWOpenData.initCanvas) {
+          window.WWOpenData.initCanvas();
+        }
       }
-      const a = document.createElement("a"); // 生成一个a元素
-      const event = new MouseEvent("click"); // 创建一个单击事件
-      a.download = "okr地图"; // 设置图片名称
-      a.href = url.Data.obj; // 将生成的URL设置为a.href属性
-      a.dispatchEvent(event); // 触发a的单击事件
-      Toast.Success("导出成功");
+      const imgUrl = result.toDataURL("image/png"); // 得到图片的base64编码数据
+      getBase64DownloadUrl(imgUrl.split(",")[1]).then((url) => {
+        const image = new Image();
+
+        image.setAttribute("crossOrigin", "anonymous");
+        image.onload = () => {
+          if (!url.Data.obj) {
+            Toast.Error("导出失败，请稍后重试", { canClose: false });
+          }
+          const a = document.createElement("a"); // 生成一个a元素
+          const event = new MouseEvent("click"); // 创建一个单击事件
+          a.download = "okr地图"; // 设置图片名称
+          a.href = url.Data.obj; // 将生成的URL设置为a.href属性
+          a.dispatchEvent(event); // 触发a的单击事件
+          Toast.Success("导出成功");
+          setIsExport(false);
+          if (onCloseHandler) {
+            onCloseHandler();
+          }
+        };
+        image.src = imgUrl;
+      });
+    }).catch((err) => {
       setIsExport(false);
-      onCloseHandler && onCloseHandler();
-    };
-    image.src = imgUrl;
+      Toast.Error(err, { canClose: false });
+    });
   };
 
   const confirmHandler = () => {
@@ -178,5 +187,9 @@ function ExportMapModal(props: IProps) {
       </>
     </Dialog>
   );
-}
+};
+
+ExportMapModal.defaultProps = {
+  onCloseHandler: () => {},
+};
 export default ExportMapModal;

package/src/components/okrcase-library/index.scss

@@ -25,7 +25,7 @@
     //     url("./image/head-background-right1.png");
     background-repeat: no-repeat;
     // background-position: center bottom, left bottom, right bottom;
-    background-image: url("./image/head-background.png");
+    background-image: url('./image/head-background.png');
     background-position: center top;
     // &-mask {
     //     height: 100%;
@@ -135,7 +135,7 @@
         position: relative;
         font-weight: 600;
         &::after {
-          content: "";
+          content: '';
           position: absolute;
           bottom: -14px;
           left: 0;
@@ -253,6 +253,7 @@
           font-weight: 600;
         }
         &__btn {
+          font-size: 14px;
           position: absolute;
           right: 15px;
           top: 60px;
@@ -265,6 +266,7 @@
           cursor: pointer;
           opacity: 0;
           transition: all 0.5s;
+          font-weight: 500;
           &-show {
             top: 37px;
             opacity: 1;
@@ -287,12 +289,12 @@
           }
         }
         &-blue {
-          background-image: url("./image/蓝.png");
+          background-image: url('./image/蓝.png');
           background-color: #f4f8ff;
           color: #2879ff;
         }
         &-red {
-          background-image: url("./image/红.png");
+          background-image: url('./image/红.png');
           background-color: rgba(240, 94, 94, 0.1);
           color: #f05e5e;
         }
@@ -415,7 +417,7 @@
       height: 64px;
       box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
       border-radius: 6px;
-      background-image: url("./image/会员背景.png");
+      background-image: url('./image/会员背景.png');
       background-size: 100%;
       background-repeat: no-repeat;
       background-position: center;
@@ -439,7 +441,7 @@
       width: 100%;
       height: 114px;
       background-color: #fff;
-      background-image: url("./image/广告图片.png");
+      background-image: url('./image/广告图片.png');
       background-size: 100%;
       background-repeat: no-repeat;
       background-position: center;
@@ -536,7 +538,7 @@
     flex-direction: column;
     justify-content: start;
     align-items: center;
-    background-image: url("./image/支付背景.svg");
+    background-image: url('./image/支付背景.svg');
     background-repeat: no-repeat;
     background-position: center;
     background-size: 100%;

package/src/components/part-notice/index.tsx

@@ -1,5 +1,6 @@
 import React, { FC, useState, useCallback } from "react";
 import { LocalStorage } from "../../utils/local-storage";
+import { notAllowData } from "./not-allow-data";
 import "./index.scss";
 
 interface Props {
@@ -10,6 +11,7 @@ interface Props {
 
 const preCls = "part-notice";
 const storage = new LocalStorage();
+const tenantId = window.BSGlobal.tenantInfo.Id;
 
 const PartNotice: FC<Props> = ({ storageName, text, link }) => {
   const [visible, setVisible] = useState(() => {
@@ -33,6 +35,7 @@ const PartNotice: FC<Props> = ({ storageName, text, link }) => {
   const handleOpenLink = () => {
     window.open(link, "_target");
   };
+  if (!notAllowData.find((item) => item === tenantId)) return <span />;
   if (!visible) return <span />;
   return (
     <div className={`${preCls}`}>

package/src/components/part-notice/not-allow-data.tsx

@@ -0,0 +1,110 @@
+export const notAllowData = [
+  366131,
+  307425,
+  386434,
+  318995,
+  516911,
+  520530,
+  529247,
+  283929,
+  521974,
+  525553,
+  524783,
+  533197,
+  506389,
+  541245,
+  265530,
+  542555,
+  322665,
+  388103,
+  523558,
+  521070,
+  547650,
+  527324,
+  543000,
+  536771,
+  377798,
+  548066,
+  541479,
+  538509,
+  509148,
+  383549,
+  533456,
+  395251,
+  516682,
+  546877,
+  521818,
+  552965,
+  551336,
+  518051,
+  544736,
+  552455,
+  534044,
+  529329,
+  554018,
+  518791,
+  392024,
+  553462,
+  504585,
+  551576,
+  547861,
+  504087,
+  555603,
+  526408,
+  536559,
+  555641,
+  553800,
+  553083,
+  554654,
+  552158,
+  542587,
+  379998,
+  510788,
+  553836,
+  529906,
+  511358,
+  551913,
+  543085,
+  514568,
+  397292,
+  556796,
+  538802,
+  546456,
+  549378,
+  542520,
+  560327,
+  548612,
+  522327,
+  555225,
+  530370,
+  565991,
+  547082,
+  564585,
+  535986,
+  502385,
+  391420,
+  560552,
+  558317,
+  564416,
+  552974,
+  318867,
+  570075,
+  560793,
+  565994,
+  533855,
+  375844,
+  549354,
+  571823,
+  537982,
+  528567,
+  568168,
+  569066,
+  515852,
+  566360,
+  548969,
+  553532,
+  352728,
+  562259,
+  521375,
+];
+export default notAllowData;

package/src/components/period-selector/common.ts

@@ -5,8 +5,8 @@ import { getMonth } from "../../utils/constant";
 
 export const dealSelectedPeriodData = (period: string) => {
   const option: any = {};
-  option.cycleType = period == "-1" ? "-1" : period.substring(0, 1);
-  option.yqmNum = period.substring(2) == "" ? "0" : period.substring(2);
+  option.cycleType = Number(period) === -1 ? "-1" : period.substring(0, 1);
+  option.yqmNum = period.substring(2) === "" ? "0" : period.substring(2);
   return option;
 };
 
@@ -27,7 +27,7 @@ export const dealYearsRange = (
     }
     const startYear = yearsRange[0];
     const endYear = yearsRange[yearsRange.length - 1];
-    for (let i = startYear; i <= endYear; i++) {
+    for (let i = startYear; i <= endYear; i += 1) {
       yearsData.push({
         checked: false,
         order: [`${i}`],
@@ -51,7 +51,7 @@ export const formatPeriod = (selected: SelectedInterface) => {
   if (!selected) return "";
   const quarter = ["", `${getLocale("OKR_MyO_Pop_1stQuarter")}`, `${getLocale("OKR_MyO_Pop_2ndQuarter")}`, `${getLocale("OKR_MyO_Pop_3rdQuarter")}`, `${getLocale("OKR_MyO_Pop_4thQuarter")}`];
   let cycleDate = "";
-  const annualNum = selected.annualNum == "-1" ? `${getLocale("OKR_MyO_Butt_Allyears")}` : `${selected.annualNum}${isEn ? "" : "年"}`;
+  const annualNum = Number(`${selected.annualNum}`) === -1 ? `${getLocale("OKR_MyO_Butt_Allyears")}` : `${selected.annualNum}${isEn ? "" : "年"}`;
   const month = getMonth();
   switch (`${selected.cycleType}`) {
     case "-1":
@@ -73,7 +73,7 @@ export const formatPeriod = (selected: SelectedInterface) => {
       }`;
       break;
     case "5":
-      cycleDate = selected.yqmNum == "1" ? `${getLocale("OKR_MyO_Pop_Firsthalf")}` : `${getLocale("OKR_MyO_Pop_Secondhalf")}`;
+      cycleDate = Number(`${selected.yqmNum}`) === 1 ? `${getLocale("OKR_MyO_Pop_Firsthalf")}` : `${getLocale("OKR_MyO_Pop_Secondhalf")}`;
       break;
     default:
       cycleDate = `${getLocale("Mod_Customization")}`;
@@ -88,9 +88,9 @@ export const computeYearIndex = (
 ) => {
   let newIndex;
   const currentYearIndex = yearsData.findIndex(
-    (item) => Number(item.title) == currentYear,
+    (item) => Number(item.title) === currentYear,
   );
-  if (computeType == "add") {
+  if (computeType === "add") {
     newIndex = currentYearIndex + 1;
   } else {
     newIndex = currentYearIndex - 1;
@@ -112,6 +112,12 @@ export const getDateRangeByCycle = (cycle: ICycle, startMonth: number = 1) => {
     };
   }
   switch (cycle.cycleType) {
+    case "-1": {
+      return {
+        startDate: "",
+        endDate: "",
+      };
+    }
     case "1": {
       const start = moment()
         .year(Number(cycle.annualNum))
@@ -159,7 +165,7 @@ export const getDateRangeByCycle = (cycle: ICycle, startMonth: number = 1) => {
         .year(Number(cycle.annualNum))
         .month(startMonth - 1)
         .date(1);
-      if (cycle.yqmNum == "2") start.add(6, "M");
+      if (cycle.yqmNum === "2") start.add(6, "M");
       return {
         startDate: start.format("YYYY/MM/DD"),
         endDate: start.add(5, "month").endOf("M").format("YYYY/MM/DD"),
@@ -210,8 +216,8 @@ export function getDefalutCycle(setting) {
     };
   } if (setting.isOpenBimonthly) {
     let month = new Date().getMonth() + 1;
-    if (setting.yearStartMonth % 2 == 1) {
-      month -= (month % 2 == 1 ? 0 : 1);
+    if (setting.yearStartMonth % 2 === 1) {
+      month -= (month % 2 === 1 ? 0 : 1);
     } else {
       month = month - (month % 2) || 12;
     }

package/src/pages/okr-map/export-modules/okr-map/header/index.scss

@@ -1,4 +1,5 @@
-$font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
+$font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica,
+  sans-serif, PingFang SC, Microsoft YaHei;
 
 .titapage-okr-map {
   &__header {
@@ -6,7 +7,7 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
     background: #ffffff;
     box-shadow: 0px 0px 8px 0px #e9eef3;
     position: relative;
-    border-bottom: 1px solid #E9ECF0;
+    border-bottom: 1px solid #e9ecf0;
     &__folded {
       // top: -114px;
       height: 0;
@@ -65,7 +66,7 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
         vertical-align: middle;
       }
       &:hover {
-        color: #2879FF;
+        color: #2879ff;
         &:before {
           background-image: url('../../../images/trigger-hover.svg');
         }
@@ -103,11 +104,11 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
           }
         }
       }
-      &-showkr,&-level {
-
+      &-showkr,
+      &-level {
         padding: 5px 20px;
         &:hover {
-          background: #F7F8FA;
+          background: #f7f8fa;
         }
       }
       &--show-more {
@@ -119,21 +120,22 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
         height: 30px;
         line-height: 30px;
         cursor: pointer;
-        color: #3F4755;
+        color: #3f4755;
         font-family: $font-family;
         font-size: 12px;
         &:after {
           position: absolute;
           display: inline-block;
-          background: url('../../../images/line-down-arrow.svg') transparent no-repeat 50% 50%;
-          content: "";
+          background: url('../../../images/line-down-arrow.svg') transparent
+            no-repeat 50% 50%;
+          content: '';
           height: 6px;
           width: 10px;
           right: 0;
           top: calc(50% - 3px);
         }
       }
-      
+
       &-btns {
         position: absolute;
         vertical-align: middle;
@@ -145,22 +147,24 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
   }
   &__show-more-popup {
     padding: 11px 0;
-    background: #FFFFFF;
+    background: #ffffff;
     box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2);
-    border: 1px solid #E9ECF0;
+    border: 1px solid #e9ecf0;
     border-radius: 2px;
   }
 }
 .titapage-okr-map__dark {
   .titapage-okr-map__content-search {
     &:before {
-      background: url(../../../images/line-down-arrow-dark.svg) transparent no-repeat 50% 50%;
+      background: url(../../../images/line-down-arrow-dark.svg) transparent
+        no-repeat 50% 50%;
       background-size: 100%;
     }
   }
   .tui-select-selector {
     &:before {
-      background: url(../../../images/down-arrow-dark.svg) transparent no-repeat 50% 50%;
+      background: url(../../../images/down-arrow-dark.svg) transparent no-repeat
+        50% 50%;
       background-size: 100%;
     }
   }
@@ -212,7 +216,7 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
           border: none;
           color: #fff;
           &:hover {
-            background: #5c8EFF;
+            background: #5c8eff;
           }
         }
         .titaui-period-selector__down-arrow {
@@ -242,7 +246,7 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
           }
         }
         &:hover {
-          background-color: #515A69;
+          background-color: #515a69;
         }
       }
     }
@@ -261,14 +265,14 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
   top: 0;
   bottom: 0;
 }
-.titapage-okr-map--kr-dialog{
+.titapage-okr-map--kr-dialog {
   &--title {
     &:before {
       display: inline-block;
       content: 'i';
       width: 16px;
       height: 16px;
-      background-color: #FFBC00;
+      background-color: #ffbc00;
       color: #fff;
       text-align: center;
       line-height: 16px;
@@ -281,8 +285,9 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
   &--content {
     font-size: 14px;
     font-family: $font-family;
-    color: #6F7886;
+    color: #6f7886;
     line-height: 20px;
     padding: 0 32px;
+    display: block;
   }
 }