@titaui/pc 1.13.10 → 1.15.1

package/lib/components/nav-top/components/user-message/components/inform/inform-item.js

@@ -108,7 +108,7 @@ function Inform(props) {
     } // 处理合并的消息
 
 
-    var isMessageMerging = [83, 94, 95, 96, 97, 98, 99, 100, 131, 136, 13018, 30362].includes(messageType);
+    var isMessageMerging = [83, 94, 95, 96, 97, 98, 99, 100, 131, 136, 180, 13018, 30362].includes(messageType);
 
     if (!isMessageMerging) {
       if (messageType === _constant.informType.details) {
@@ -217,7 +217,7 @@ function Inform(props) {
     } else if (Number(messageType) > 93 && Number(messageType) <= 100) {
       // OKR 仪表盘消息提醒
       notificationType = "okr-dashBoard";
-    } else if (messageType == 131 || messageType == 136) {
+    } else if ([131, 136, 180].includes(Number(messageType))) {
       notificationType = "performance";
       content = item.content;
     }

package/lib/components/nav-top/components/user-message/utils.js

@@ -18,6 +18,8 @@ exports.htmlToText = htmlToText;
 
 var deleteText = function deleteText(text) {
   var last = text.trim().slice(-4);
+  var pattern = /(查看详情|Details)(?!.*\1)/;
+  text = text.replace(pattern, '');
 
   if (last === "查看任务") {
     text = text.trim().slice(0, -4);

package/lib/components/nav-top/index.js

@@ -47,8 +47,6 @@ var _request2 = require("./request.apis");
 
 require("./index.css");
 
-var _excluded = ["hasSetting"];
-
 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); }
@@ -57,10 +55,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -280,7 +274,7 @@ var NavTop = function NavTop() {
 
   var isHasOkr = function isHasOkr() {
     //判断是否安装了OKR
-    var okrIndex = window.BSGlobal.WebHead.AppHead.findIndex(function (item) {
+    var okrIndex = (0, _bsGlobal.getBSGlobal)('WebHead').AppHead.findIndex(function (item) {
       return item.AppId === '113';
     });
 
@@ -292,10 +286,12 @@ var NavTop = function NavTop() {
   };
 
   (0, _react.useEffect)(function () {
-    var version = window.BSGlobal.tenantAuthentication.Version;
+    var version = (0, _bsGlobal.getBSGlobal)('tenantAuthentication').Version;
+    if (localStorage.getItem("cycle_setting_stop_show".concat((0, _bsGlobal.getUserInfo)().Id)) === 'true') return;
+    localStorage.removeItem("OKR_CYCLE_SETTING");
     (0, _request2.getCycleSetting)().then(function (res) {
-      var hasSetting = res.hasSetting,
-          onthers = _objectWithoutProperties(res, _excluded);
+      localStorage.setItem("OKR_CYCLE_SETTING", JSON.stringify(res || {}));
+      var hasSetting = res.hasSetting;
 
       if (version === 1 && isHasOkr() && !hasSetting) {
         setOkrGuideVisible(true);

package/lib/components/picker/range-picker/index.js

@@ -33,7 +33,7 @@ var _picker = _interopRequireDefault(require("../picker"));
 
 var _pickerTrigger = _interopRequireDefault(require("./components/picker-trigger"));
 
-var _excluded = ["onChange", "format", "values", "picker", "children", "popupPlacement", "direction", "onPopupVisibleChange", "visible", "canEmpty"];
+var _excluded = ["onChange", "format", "values", "picker", "children", "popupPlacement", "direction", "onPopupVisibleChange", "visible", "canEmpty", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -72,6 +72,7 @@ var RangePicker = function RangePicker(props) {
       visible = _props$visible === void 0 ? false : _props$visible,
       _props$canEmpty = props.canEmpty,
       canEmpty = _props$canEmpty === void 0 ? true : _props$canEmpty,
+      className = props.className,
       restProps = _objectWithoutProperties(props, _excluded);
 
   var initValues = (0, _react.useCallback)(function () {
@@ -204,7 +205,7 @@ var RangePicker = function RangePicker(props) {
       return !!v;
     }).length !== 2;
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: _utils.PickerRangesClass
+      className: (0, _classnames["default"])(_utils.PickerRangesClass, className)
     }, /*#__PURE__*/_react["default"].createElement(_placeholder["default"], {
       viewDate: viewDate,
       onChange: setViewDate,

package/lib/pages/new-okr-list/index.js

@@ -27,8 +27,6 @@ var _list = _interopRequireDefault(require("./list"));
 
 var _loading = _interopRequireDefault(require("./loading"));
 
-var _initCycleSetting = _interopRequireDefault(require("./init-cycle-setting"));
-
 var _bsGlobal = require("../../utils/bs-global");
 
 var _tools = require("../../utils/tools");
@@ -365,9 +363,7 @@ var NewOkrList = function NewOkrList(props) {
       cycleType: query.cycleType,
       yqmNum: query.yqmNum
     }
-  })), /*#__PURE__*/_react["default"].createElement(_initCycleSetting["default"], {
-    SetCycleModal: SetCycleModal
-  }), !loading && /*#__PURE__*/_react["default"].createElement("div", {
+  })), !loading && /*#__PURE__*/_react["default"].createElement("div", {
     className: "okr-list__check-filter-tips"
   }, (0, _getLocale.getLocale)("OKR_MyO_Text_CanfindOKR"), /*#__PURE__*/_react["default"].createElement("span", {
     className: "okr-list__check-filter-btn",

package/lib/utils/open-data.js

@@ -9,8 +9,6 @@ exports.parseTag = exports.parseStringV2 = exports.parseString = exports.parseOp
 
 var _react = _interopRequireWildcard(require("react"));
 
-var Sentry = _interopRequireWildcard(require("@sentry/browser"));
-
 var _bsGlobal = require("./bs-global");
 
 var _openDataPainter = require("../components/open-data-painter");
@@ -37,6 +35,7 @@ var WX_SOURCE = 860;
 var WX_UA_STR = 'micromessenger';
 var FEISHU_SOURCE = 862;
 var DINGTALK_SOURCE = 861;
+var ignorePIds = [-1, 0, 10000];
 
 var getSource = function getSource() {
   return (0, _bsGlobal.getBSGlobal)('tenantInfo').Source;
@@ -78,7 +77,8 @@ function openData() {
   var _getBSGlobal;
 
   // 企业微信租户 && 非自建应用
-  if (getSource() === WX_SOURCE && ((_getBSGlobal = (0, _bsGlobal.getBSGlobal)('tenantInfo')) === null || _getBSGlobal === void 0 ? void 0 : _getBSGlobal.corpCreateType) !== 2 || getUA().includes(WX_UA_STR)) {
+  if ((getSource() === WX_SOURCE || getUA().includes(WX_UA_STR)) && ((_getBSGlobal = (0, _bsGlobal.getBSGlobal)('tenantInfo')) === null || _getBSGlobal === void 0 ? void 0 : _getBSGlobal.corpCreateType) !== 2 // 2:自建应用
+  ) {
     // 企业微信初始化失败
     // if (!window.WWOpenData && !window.top.WWOpenData) {
     //   return (p) => {
@@ -102,6 +102,34 @@ function openData() {
           pName = p.name,
           pCorpId = p.corpId,
           pType = p.type;
+      (0, _react.useEffect)(function () {
+        var openId = pCorpId || getOpenId(pId, pType);
+
+        if (!openId) {
+          if (pId !== undefined && !ignorePIds.includes(pId)) {
+            try {
+              // BSGlobal
+              var openIds;
+
+              if (pType === 'userName') {
+                openIds = (0, _bsGlobal.getBSGlobal)('openIds');
+              } else if (pType === 'departmentName') {
+                openIds = (0, _bsGlobal.getBSGlobal)('openDepartmentIds');
+              }
+
+              (0, _helpers.errorLog)(1, JSON.stringify({
+                errorType: 'openId 不存在',
+                pName: pName === undefined ? 'undefined' : pName,
+                pId: pId === undefined ? 'undefined' : pId,
+                pType: pType,
+                openIds: openIds
+              }));
+            } catch (e) {
+              console.log(e);
+            }
+          }
+        }
+      }, [pId, pName]);
 
       if (pId === undefined && pCorpId === undefined) {
         return pName || null;
@@ -111,40 +139,21 @@ function openData() {
       var openId = pCorpId || getOpenId(pId, pType);
 
       if (!openId) {
-        if (pId) {
-          try {
-            // BSGlobal
-            var openIds;
-
-            if (pType === 'userName') {
-              openIds = (0, _bsGlobal.getBSGlobal)('openIds');
-            } else if (pType === 'departmentName') {
-              openIds = (0, _bsGlobal.getBSGlobal)('openDepartmentIds');
-            }
-
-            (0, _helpers.errorLog)(1, JSON.stringify({
-              errorType: 'openId 不存在',
-              pName: pName == undefined ? 'undefined' : pName,
-              pId: pId == undefined ? 'undefined' : pId,
-              pType: pType,
-              openIds: openIds
-            }));
-          } catch (e) {
-            console.log(e);
-          }
-
-          Sentry.withScope(function (scope) {
-            scope.setTag('error-level', 'P1');
-            scope.setTag('error-type', '企业微信openData调用失败');
-            scope.setExtra('fail_type', pType);
-            scope.setExtra('p_id', pId);
-            scope.setExtra('p_name', pName);
-            scope.setExtra('corp_id', pCorpId);
-            scope.setExtra('open_id', getOpenId(pId, pType));
-            p.callFunc && scope.setExtra('fail_callFunc', p.callFunc);
-            p.extra && scope.setExtra('fail_extra', p.extra);
-            Sentry.captureException(new Error('企业微信openData调用失败'), scope);
-          });
+        if (pId !== undefined && !ignorePIds.includes(pId)) {// Sentry.withScope((scope) => {
+          //   scope.setTag('error-level', 'P1')
+          //   scope.setTag('error-type', '企业微信openData调用失败')
+          //   scope.setExtra('fail_type', pType)
+          //   scope.setExtra('p_id', pId)
+          //   scope.setExtra('p_name', pName)
+          //   scope.setExtra('corp_id', pCorpId)
+          //   scope.setExtra('open_id', getOpenId(pId, pType))
+          //   p.callFunc && scope.setExtra('fail_callFunc', p.callFunc)
+          //   p.extra && scope.setExtra('fail_extra', p.extra)
+          //   Sentry.captureException(
+          //     new Error('企业微信openData调用失败'),
+          //     scope,
+          //   )
+          // })
         }
 
         return pName || pId || null;
@@ -156,7 +165,7 @@ function openData() {
 
         // @ts-ignore
         (_ref = window.WWOpenData && window.WWOpenData || window.top.WWOpenData) === null || _ref === void 0 ? void 0 : _ref.bind(ref.current);
-      }, []);
+      }, [pId, pName]);
       return /*#__PURE__*/_react["default"].createElement("div", {
         style: {
           display: 'inline',

package/package.json

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