@titaui/pc 1.6.80 → 1.6.81

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

@@ -37,11 +37,19 @@
   height: 20px;
 }
 
+.titaui-nav-top__left-home--hover:hover {
+  cursor: pointer;
+}
+
 .titaui-nav-top__left-logo {
   max-width: 120px;
   max-height: 24px;
 }
 
+.titaui-nav-top__left-logo--hover:hover {
+  cursor: pointer;
+}
+
 .titaui-nav-top__line {
   width: 1px;
   min-width: 1px;

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

@@ -19,6 +19,8 @@ var _menu = _interopRequireDefault(require("./components/menu"));
 
 var _userMessage = _interopRequireDefault(require("./components/user-message"));
 
+var _home = _interopRequireDefault(require("./images/home.png"));
+
 var _version = _interopRequireDefault(require("./components/version"));
 
 var _utils = require("./utils");
@@ -39,6 +41,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+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 _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."); }
@@ -52,9 +56,14 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var Logo = (0, _helpers.isLocal)() ? (0, _bsGlobal.getTenantInfo)().Logo : _logoWhite["default"];
+var hasOKRApp = (0, _bsGlobal.getBSGlobal)("newNavigation").find(function (item) {
+  return item.appId === 113;
+});
 var preCls = "titaui-nav-top";
 
 var NavTop = function NavTop() {
+  var _classNames2;
+
   var _useState = (0, _react.useState)((0, _utils.getMenus)()),
       _useState2 = _slicedToArray(_useState, 1),
       menu = _useState2[0];
@@ -124,11 +133,17 @@ var NavTop = function NavTop() {
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls))
   }, /*#__PURE__*/_react["default"].createElement("a", {
-    className: (0, _classnames["default"])("".concat(preCls, "__left"))
+    className: (0, _classnames["default"])("".concat(preCls, "__left")),
+    href: hasOKRApp ? "#homepage" : ""
   }, /*#__PURE__*/_react["default"].createElement("img", {
     src: Logo,
-    className: (0, _classnames["default"])("".concat(preCls, "__left-logo"))
-  })), /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(preCls, "__left-logo"), _defineProperty({}, "".concat(preCls, "__left-logo--hover"), hasOKRApp))
+  }), hasOKRApp && /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(preCls, "__left-home"), (_classNames2 = {}, _defineProperty(_classNames2, "".concat(preCls, "__left-home--active"), activeMenuId == -1), _defineProperty(_classNames2, "".concat(preCls, "__left-home--hover"), hasOKRApp), _classNames2))
+  }, /*#__PURE__*/_react["default"].createElement("img", {
+    src: _home["default"],
+    className: (0, _classnames["default"])("".concat(preCls, "__left-home-img"))
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__line"))
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__middle"))

package/lib/utils/date-test-change.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.testDayChange = exports.testDateDiff = void 0;
 
-// import moment from "moment"
 //精确到日期的检测 date为2021/8/26这样的类型，返回距现在几天
 var testDateDiff = function testDateDiff(date) {
   var date1 = date.length == 5 ? "".concat(new Date().getFullYear(), "/").concat(date) : date;
@@ -62,8 +61,9 @@ var testDateDiff = function testDateDiff(date) {
 exports.testDateDiff = testDateDiff;
 
 var testDayChange = function testDayChange(date) {
-  if (!date) return '暂未';
-  var timeDateObj = new Date(date);
+  if (!date) return '暂未'; // 兼容safari，safari不支持yy-mm-dd格式，支持yy/mm/dd格式
+
+  var timeDateObj = new Date(date.replace(/-/g, '/'));
   var timeMilliSecond = timeDateObj.getTime();
   var timeYear = timeDateObj.getFullYear();
   var timeMonth = timeDateObj.getMonth() + 1;

package/package.json

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