@titaui/pc 1.7.34 → 1.7.38

package/lib/components/dynamic/online-broadcast/data.js

@@ -22,16 +22,34 @@ if (source === 860) {
 }
 
 var onlineBroadcastData = [{
+  hasOnline: true,
+  preContent: '「OKR 」每周工作小结推送',
+  preHref: 'https://wiki.tita.com/x/F4FrAQ',
+  isNew: true,
+  date: '12/8'
+}, {
+  hasOnline: true,
+  preContent: '「OKR」新增管理规定，开启全员提醒',
+  preHref: 'https://wiki.tita.com/x/6YBrAQ',
+  isNew: true,
+  date: '12/7'
+}, {
+  hasOnline: true,
+  preContent: '新增「安全水印」，保护企业隐私',
+  preHref: 'https://wiki.tita.com/x/7YBrAQ',
+  isNew: true,
+  date: '12/1'
+}, {
   hasOnline: true,
   preContent: '绩效仪表盘和报表全新推出',
   preHref: 'https://wiki.tita.com/x/GIRBAQ',
-  isNew: true,
+  isNew: false,
   date: '11/17'
 }, {
   hasOnline: true,
   preContent: 'OKR 新版动态升级',
   preHref: 'https://wiki.tita.com/pages/viewpage.action?pageId=23822341',
-  isNew: true,
+  isNew: false,
   date: '10/15'
 }, {
   hasOnline: true,

package/lib/components/form/form-fields/dropdown/index.css

@@ -21,6 +21,7 @@
 .form-field-dropdown--vertical .form-field-dropdown__label {
   width: 56px;
   margin-right: 20px;
+  white-space: nowrap;
 }
 
 .form-field-dropdown--horizontal {

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

@@ -21,6 +21,8 @@ var _constant = require("../../constant");
 
 var _drawerManager = _interopRequireDefault(require("../../../../../drawer-manager"));
 
+var _tools = require("../../../../../../utils/tools");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -69,15 +71,10 @@ var Inform = function Inform(props) {
     if (objType === _constant.EObjType.Remind) {
       window.Talent.app.vent.trigger('global-daily-detail-pull-screen', objId);
       return;
-    } // 日报
-    // if () {
-    // 	// @ts-ignore
-    // 	Talent.app.vent.trigger("global-daily-detail-pull-screen", feedId);
-    // }
-
+    }
 
     if (messageType == 135) {
-      var redisKey = item.content.match(/redisKey=(\S*?)"/g)[1]; // @ts-ignore
+      var redisKey = item.content.match(/redisKey=(\S*?)"/)[1]; // @ts-ignore
 
       Talent.app.vent.trigger("open-weekly-report-modal", redisKey);
       return;
@@ -88,59 +85,54 @@ var Inform = function Inform(props) {
 
     if (!isMessageMerging) {
       if (messageType === _constant.informType.details) {
-        window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#more/taskinfo?Id=").concat(item.objId), '_blank');
-      } else if (item.objId && objType !== 8) {
+        (0, _tools.openPage)("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#more/taskinfo?Id=").concat(item.objId));
+        return;
+      } else if (objId && objType !== 8) {
         window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#work?work_id=").concat(item.objId));
+        return;
       } else if (messageType === _constant.informType.todayJob) {
         window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#plan?tag_id=0&tag_type=0&filter=1"));
-      } else if (messageType === _constant.informType.daily) {
-        var str = item.content.slice(0, 18);
-        var Year = str.slice(4, 8);
-        var Month = '';
-        var Day = '';
-        var Week = '';
-
-        if (isNaN(parseInt(str.charAt(10)))) {
-          Month = str.slice(9, 10);
-          Week = str.slice(12, 13);
-
-          if (isNaN(parseInt(str.charAt(12)))) {
-            Day = str.slice(11, 12);
-          } else {
-            Day = str.slice(11, 13);
+        return;
+      } else if (objType === 0) {
+        var str = item.content.match(/\/\/.*?[\"|\']/gi).join("");
+        var url = str.slice(0, str.length - 1);
+
+        if (url) {
+          if (item.content.indexOf("点击此处下载") !== -1) {
+            window.open(url, '_self');
           }
-        } else {
-          Month = str.slice(9, 11);
-          Week = str.slice(13, 14);
-
-          if (isNaN(parseInt(str.charAt(13)))) {
-            Day = str.slice(12, 13);
-          } else {
-            Day = str.slice(12, 14);
-          }
-        }
 
-        if (str.indexOf('日报') !== -1) {
-          window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#/daily?to_user_id=").concat(_constant.userId, "&group_id=9&tag_type=1&date=").concat(Year, "/").concat(Month, "/").concat(Day, "&tag_id=").concat(parseInt(Month) + 1, "&dailyType=1"));
-        } else if (str.indexOf('月报') !== -1) {
-          window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#/daily?to_user_id=").concat(_constant.userId, "&group_id=9&tag_type=1&date=").concat(Year, "/").concat(Month, "/01&tag_id=").concat(parseInt(Month) + 1, "&dailyType=3"));
-        } else {
-          window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#/daily?to_user_id=").concat(_constant.userId, "&group_id=9&tag_type=1&date=").concat(Year, "/").concat(Month, "/").concat(parseInt(Week) * 7, "&tag_id=").concat(parseInt(Month) + 1, "&dailyType=2"));
+          (0, _tools.openPage)(url);
         }
+
+        return;
       } else if (item.objUrl) {
         window.open(item.objUrl);
-      } else if (item.objType === _constant.informType.Okr) {
-        var url = item.content.match(/(http[s]?:\/\/([\w-]+.)+([:\d+])?(\/[\w-\.\/\?%&=]*))/g);
-        window.open(url, '_blank');
+        return;
+      } else if (objType === _constant.informType.Okr) {
+        var _url = item.content.match(/(http[s]?:\/\/([\w-]+.)+([:\d+])?(\/[\w-\.\/\?%&=]*))/g);
+
+        (0, _tools.openPage)(_url);
+        return;
+      } else if (objType === _constant.informType.okrRemind) {
+        window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#/work?iTalentNavCode=tita-work&work_id=").concat(objId));
+        return;
+      } else if (objType === _constant.informType.plan) {
+        var _str = item.content.match(/\/\/.*?[\"|\']/gi).join("");
+
+        var _url2 = _str.slice(0, _str.length - 1);
+
+        (0, _tools.openPage)(_url2);
       } else {
         var reg = /href='.*?(?=')/g;
-        var _url = '';
+        var _url3 = '';
         item.content.replace(reg, function ($0) {
-          _url = $0.slice(6);
+          _url3 = $0.slice(6);
         });
 
-        if (_url) {
-          window.open(_url, '_blank');
+        if (_url3) {
+          (0, _tools.openPage)(_url3);
+          return;
         }
       }
     }

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

@@ -29,7 +29,10 @@ var informType = {
   //日报月报周报
   "todayJob": 81,
   //进入今日工作
-  "Okr": 0 //Okr
+  "Okr": 0,
+  //Okr
+  "okrRemind": 4,
+  "plan": 11 //计划
 
 };
 exports.informType = informType;

package/lib/components/weekly-report/board.js

@@ -9,42 +9,42 @@ var _react = _interopRequireDefault(require("react"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var preCls = 'weekly-report-card-board';
+var preCls = "weekly-report-card-board";
 
 function Board(_ref) {
   var percent = _ref.percent;
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      position: 'relative',
+      position: "relative",
       paddingBottom: 1
     }
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: preCls + '__cover'
+    className: preCls + "__cover"
   }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: preCls + '__done'
+    className: preCls + "__done"
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: preCls + '__undone',
+    className: preCls + "__undone",
     style: {
-      transform: "rotate(".concat(percent / 100 * 180, "deg)")
+      transform: "rotate(".concat(Math.min(percent, 100) / 100 * 180, "deg)")
     }
   }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: preCls + '__space',
+    className: preCls + "__space",
     style: {
-      transform: 'rotate(45deg)'
+      transform: "rotate(45deg)"
     }
   }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: preCls + '__space'
+    className: preCls + "__space"
   }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: preCls + '__space',
+    className: preCls + "__space",
     style: {
-      transform: 'rotate(-45deg)'
+      transform: "rotate(-45deg)"
     }
   })), /*#__PURE__*/_react["default"].createElement("div", {
-    className: preCls + '__center'
-  }, /*#__PURE__*/_react["default"].createElement("div", null, percent, "%"))), /*#__PURE__*/_react["default"].createElement("div", {
-    className: preCls + '__cover--bottom'
+    className: preCls + "__center"
+  }, /*#__PURE__*/_react["default"].createElement("div", null, Math.min(percent, 999), "%"))), /*#__PURE__*/_react["default"].createElement("div", {
+    className: preCls + "__cover--bottom"
   }));
 }
 

package/lib/components/weekly-report/card.js

@@ -173,6 +173,7 @@ function Card(_ref, ref) {
       }
     };
   }, []);
+  var increase = Number(data.Increase);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls + "-content",
     ref: cardRef
@@ -211,15 +212,15 @@ function Card(_ref, ref) {
     percent: Number(data.Complete)
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls + "__comparison"
-  }, "OKR \u5B8C\u6210\u5EA6", data.Increase != '0' ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, " ", /*#__PURE__*/_react["default"].createElement("img", {
+  }, "OKR \u5B8C\u6210\u5EA6", increase != 0 && !isNaN(increase) ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, " ", /*#__PURE__*/_react["default"].createElement("img", {
     className: preCls + "__direction",
-    src: Number(data.Increase) > 0 ? require("./img/up.png") : require("./img/down.png"),
+    src: increase > 0 ? require("./img/up.png") : require("./img/down.png"),
     alt: ""
   }), /*#__PURE__*/_react["default"].createElement("span", {
     style: {
-      color: Number(data.Increase) > 0 ? "#4DC591" : '#F05E5E'
+      color: increase > 0 ? "#4DC591" : '#F05E5E'
     }
-  }, Math.abs(Number(data.Increase)), "%")) : ''), /*#__PURE__*/_react["default"].createElement("div", {
+  }, Math.abs(increase), "%")) : ''), /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls + "__colleague"
   }, data.PromptLanguage), /*#__PURE__*/_react["default"].createElement(_statistics["default"], {
     data: data

package/lib/utils/tools.js

@@ -8,10 +8,12 @@ exports.getQueryString = getQueryString;
 exports.highLightWord = exports.hexToRgba = exports.getUrlForUserPage = void 0;
 exports.htmlDecodeByRegExp = htmlDecodeByRegExp;
 exports.htmlEncodeByRegExp = htmlEncodeByRegExp;
-exports.unHighLight = void 0;
+exports.unHighLight = exports.openPage = void 0;
 
 var _platform = require("./platform");
 
+var _openData = require("./open-data");
+
 function htmlEncodeByRegExp(str) {
   if (!str) return "";
   var htmlString = {
@@ -206,4 +208,14 @@ var getUrlForUserPage = function getUrlForUserPage(options) {
   return homeCenter;
 };
 
-exports.getUrlForUserPage = getUrlForUserPage;
+exports.getUrlForUserPage = getUrlForUserPage;
+
+var openPage = function openPage(url) {
+  if ((0, _openData.isPlatform)("dd")) {
+    window.open(url, "_self");
+  } else {
+    window.open(url, "_blank");
+  }
+};
+
+exports.openPage = openPage;

package/package.json

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