@titaui/pc 1.6.80 → 1.6.84

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

@@ -13,8 +13,6 @@ var _styledComponents = require("./styledComponents");
 
 var _openData = require("../../utils/open-data");
 
-var _pc = require("@titaui/pc");
-
 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); }
 
 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; }
@@ -134,15 +132,6 @@ var Item = /*#__PURE__*/function (_PureComponent) {
       }
     };
 
-    _this.toOkrDetail = function (e, okrId) {
-      e.stopPropagation();
-      e.nativeEvent.stopImmediatePropagation();
-      var isShowKr = _this.props.isShowKr;
-      isShowKr && _pc.drawerManager.open('okrDetail', {
-        okrId: okrId
-      });
-    };
-
     _this.formatKeywordsFunc = function (str, key) {
       var reg = new RegExp("(" + key + ")", "g");
       var newstr = str.replace(reg, "<span style=\"color: #2879ff;\">".concat(key, "</span>"));
@@ -209,11 +198,9 @@ var Item = /*#__PURE__*/function (_PureComponent) {
       }), /*#__PURE__*/_react["default"].createElement(_styledComponents.Tag, {
         color: colorMap[data.cycleType] || colorMap[4]
       }, this.getCycleText()), /*#__PURE__*/_react["default"].createElement(_styledComponents.WorkNameWrapper, {
-        isShowKr: isShowKr,
-        onClick: function onClick(e) {
-          return _this2.toOkrDetail(e, data.workId);
-        }
+        isShowKr: isShowKr
       }, /*#__PURE__*/_react["default"].createElement(_styledComponents.OkrName, {
+        isKr: false,
         isShowKr: isShowKr,
         dangerouslySetInnerHTML: {
           __html: this.okrData.workName
@@ -234,11 +221,9 @@ var Item = /*#__PURE__*/function (_PureComponent) {
           },
           active: active && item.mileStoneId == (active.workId || active.mileStoneId)
         }), /*#__PURE__*/_react["default"].createElement(_styledComponents.WorkNameWrapper, {
-          isShowKr: isShowKr,
-          onClick: function onClick(e) {
-            return _this2.toOkrDetail(e, data.workId);
-          }
+          isShowKr: isShowKr
         }, /*#__PURE__*/_react["default"].createElement(_styledComponents.OkrName, {
+          isKr: true,
           isShowKr: isShowKr,
           dangerouslySetInnerHTML: {
             __html: "KR".concat(index + 1, "\uFF1A").concat(item.mileStoneName)
@@ -251,11 +236,9 @@ var Item = /*#__PURE__*/function (_PureComponent) {
           },
           active: active && item.mileStoneId == (active.workId || active.mileStoneId)
         }), /*#__PURE__*/_react["default"].createElement(_styledComponents.WorkNameWrapper, {
-          isShowKr: isShowKr,
-          onClick: function onClick(e) {
-            return _this2.toOkrDetail(e, data.workId);
-          }
+          isShowKr: isShowKr
         }, /*#__PURE__*/_react["default"].createElement(_styledComponents.OkrName, {
+          isKr: true,
           isShowKr: isShowKr,
           dangerouslySetInnerHTML: {
             __html: "KR".concat(index + 1, "\uFF1A").concat(item.mileStoneName)

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

@@ -79,10 +79,8 @@ var ItemTop = _styledComponents["default"].div(_templateObject16 || (_templateOb
 
 exports.ItemTop = ItemTop;
 
-var WorkNameWrapper = _styledComponents["default"].div(_templateObject17 || (_templateObject17 = _taggedTemplateLiteral(["\n  flex: 1px;\n  white-space: nowrap;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  cursor: ", ";\n\n  span {\n    transition: color 0.3s ease;\n\n    &:hover {\n      color: ", ";\n    }\n  }\n"])), function (p) {
-  return p.isShowKr ? 'pointer' : 'default';
-}, function (p) {
-  return p.isShowKr ? '#2879ff' : '#33383D';
+var WorkNameWrapper = _styledComponents["default"].div(_templateObject17 || (_templateObject17 = _taggedTemplateLiteral(["\n  flex: 1px;\n  white-space: nowrap;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  cursor: ", ";\n"])), function (p) {
+  return p.isKr ? 'default' : 'pointer';
 });
 
 exports.WorkNameWrapper = WorkNameWrapper;

package/lib/components/drawer/manager/drawerWrapper.js

@@ -114,7 +114,7 @@ var DrawerWrapper = function DrawerWrapper(_ref, ref) {
               setChild(newChild);
 
               if (drawerProps != newDrawerProps) {
-                setDrawerProps(drawerProps);
+                setDrawerProps(newDrawerProps);
               }
 
               _context.next = 12;

package/lib/components/drawer/manager/index.js

@@ -67,7 +67,7 @@ var DrawerManager = /*#__PURE__*/function () {
           var extendedDrawerProps = drawerProps;
 
           if (_this.history.length > 0) {
-            extendedDrawerProps = _objectSpread(_objectSpread({}, _this.history[_this.history.length - 1]), extendedDrawerProps);
+            extendedDrawerProps = _objectSpread(_objectSpread({}, _this.history[_this.history.length - 1].extendedDrawerProps), extendedDrawerProps);
           }
 
           _this.history.push({
@@ -97,12 +97,12 @@ var DrawerManager = /*#__PURE__*/function () {
         var _this$history = _this.history[_this.history.length - 1],
             Component = _this$history.Component,
             props = _this$history.props,
-            drawerProps = _this$history.drawerProps,
+            extendedDrawerProps = _this$history.extendedDrawerProps,
             key = _this$history.key;
 
         _this.drawer.open( /*#__PURE__*/_react["default"].createElement(Component, _extends({
           key: key
-        }, props)), drawerProps);
+        }, props)), extendedDrawerProps);
       } else {
         _this.close();
       }

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];
@@ -106,6 +115,11 @@ var NavTop = function NavTop() {
         return hash.includes(item.href.split("#")[1]);
       });
 
+      if (hash.includes('homepage')) {
+        setActiveMenuId(99999);
+        return;
+      }
+
       if (activeMenu) {
         setActiveMenuId(activeMenu.id);
       } else {
@@ -124,11 +138,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 == 99999), _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/pages/home-page/components/data-list/table/columns/createDate.js

@@ -11,7 +11,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 
 function CreateDate(_ref) {
   var createDate = _ref.createDate;
-  var date = new Date(createDate);
+  var date = new Date(createDate.replace(/-/g, '/').split('T').join(' ').split('.')[0]);
   return /*#__PURE__*/_react["default"].createElement("div", null, createDate ? "".concat(date.getFullYear(), "-").concat(date.getMonth() + 1, "-").concat(date.getDate()) : '-');
 }
 

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

@@ -79,6 +79,7 @@ var HomeDataTable = function HomeDataTable(props) {
       pageSize: pageSize
     }).then(function (res) {
       setIsLoading(false);
+      console.log(res.dataList);
       setTableData(res.dataList);
       setTotal(res.dataTotal);
     })["catch"](function (err) {

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

@@ -5,11 +5,11 @@ 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;
-  var testTime = Date.parse(date1);
+  var handleDate = date.length == 5 ? "".concat(new Date().getFullYear(), "/").concat(date) : date;
+  console.log(handleDate.replace(/-/g, '/').split('T').join(' ').split('.')[0]);
+  var testTime = Date.parse(handleDate.replace(/-/g, '/').split('T').join(' ').split('.')[0]);
   var now = Date.now();
   var diffDay = Math.floor((now - testTime) / (1000 * 60 * 60 * 24));
   return diffDay;
@@ -62,8 +62,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, '/').split('T').join(' ').split('.')[0]);
   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.84",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",