@titaui/pc 1.12.57-beta.2 → 1.12.60

package/lib/components/guide-tip/index.js

@@ -35,11 +35,6 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 var preCls = 'titaui-pc__guide-tip';
 var GuideTip = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
-  var popupRef = (0, _react.useRef)({
-    open: function open() {},
-    close: function close() {}
-  });
-
   var _props$type = props.type,
       type = _props$type === void 0 ? 'default' : _props$type,
       _props$width = props.width,
@@ -52,13 +47,19 @@ var GuideTip = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       _props$classnames = props.classnames,
       classnames = _props$classnames === void 0 ? "".concat(preCls, "__popup") : _props$classnames,
       content = props.content,
-      onClickClose = props.onClickClose,
+      _props$onClickClose = props.onClickClose,
+      onClickClose = _props$onClickClose === void 0 ? function () {} : _props$onClickClose,
       _props$buttonTitle = props.buttonTitle,
       buttonTitle = _props$buttonTitle === void 0 ? '好哒' : _props$buttonTitle,
       _props$visible = props.visible,
       visible = _props$visible === void 0 ? false : _props$visible,
       restProps = _objectWithoutProperties(props, _excluded);
 
+  var popupRef = (0, _react.useRef)({
+    open: function open() {},
+    close: function close() {}
+  });
+
   var handleCloseGuidePopup = function handleCloseGuidePopup() {
     onClickClose();
     popupRef.current.close();

package/lib/components/menus/components/menu-tree/tree-node/menu-item.js

@@ -21,7 +21,11 @@ function _default(props) {
 
   var onNodeClickHandler = function onNodeClickHandler() {
     if (data.href) {
-      window.location.href = data.href;
+      if (data.openBlank) {
+        window.open(data.href, '_blank');
+      } else {
+        window.location.href = data.href;
+      }
     }
   };
 

package/lib/components/menus/export-modules/demo-menus/menus.js

@@ -21,6 +21,7 @@ var EManagerType;
   EManagerType[EManagerType["Supervisor"] = 2] = "Supervisor";
   EManagerType[EManagerType["ReCharge"] = 3] = "ReCharge";
   EManagerType[EManagerType["DemoFreeReadOnly"] = 4] = "DemoFreeReadOnly";
+  EManagerType[EManagerType["ReadOnlyAll"] = 5] = "ReadOnlyAll";
 })(EManagerType || (EManagerType = {}));
 
 var defaultRefObject = {
@@ -104,7 +105,7 @@ var DemoMenuData = /*#__PURE__*/function () {
       label: "公海资源",
       key: "customer",
       href: "#/demofree/customer/public",
-      isShow: true,
+      isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager,
       children: [{
         icon: "",
         label: "全部客户",
@@ -129,19 +130,19 @@ var DemoMenuData = /*#__PURE__*/function () {
       label: "客户续费",
       key: "recharge",
       href: "#/demofree/recharge",
-      isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager,
+      isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager || this.isManager === EManagerType.ReadOnlyAll,
       children: [{
         icon: "",
         label: "客户",
         key: PAGE_RECHARGE_LIST,
         href: "#/demofree/recharge/list",
-        isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager
+        isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager || this.isManager === EManagerType.ReadOnlyAll
       }, {
         icon: "",
         label: "到期订单",
         key: PAGE_DUEDATE_ORDER,
         href: "#/demofree/recharge/order",
-        isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager
+        isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager || this.isManager === EManagerType.ReadOnlyAll
       }]
     }];
   }

package/lib/components/menus/export-modules/summary-menus/menus.js

@@ -111,7 +111,8 @@ var summaryMenus = /*#__PURE__*/function () {
       key: PAGE_SUMMARY_ROLE,
       type: _index.MENU_ITEM_NOE,
       href: "#/enterprise/manage?reactRouterName=daily",
-      isShow: isShowManage
+      isShow: isShowManage,
+      openBlank: true
     }];
   }
 

package/lib/components/menus/export-modules/summary-menus/summary-front-menus.js

@@ -121,8 +121,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
     onSelect(node); // 处理菜单选中
 
-    if (!selectedKyes.length) return;
-    setSelectedMenuKeys(selectedKyes);
+    if (!selectedKyes.length) return; // setSelectedMenuKeys(selectedKyes) // 为了点总结管理规定的时候不高亮这个菜单，这个菜单新页面打开的，自测没影响，有影响了再说
   }; // 获取下属数据列表
 
 

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

@@ -230,6 +230,7 @@ var AppCenter = function AppCenter(props) {
         className: "".concat(precls, "__app-guide-content")
       }, (0, _bsGlobal.hasWebHead)('okr') ? '🎉 总结升级！全新推出 OKR 总结模版，用总结来实现 OKR闭环！' : '总结升级！查看总结与书写总结都更加轻便啦！'),
       type: 'button',
+      popupPlacement: "bottom",
       classnames: "".concat(precls, "__app-guide"),
       onClickClose: handleCloseSummaryGuide
     }, renderAppItem(app))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {

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

@@ -117,6 +117,17 @@
   position: relative;
 }
 
+.titaui-nav-top-menu__guide .titaui-pc__guide-tip__popup-triangle {
+  top: -5px;
+  transform: rotate(180deg);
+}
+
+.titaui-nav-top-menu__guide-content {
+  font-size: 14px;
+  color: #FFFFFF;
+  line-height: 22px;
+}
+
 .titaui-nav-top-menu__tips {
   position: relative;
 }

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

@@ -21,6 +21,8 @@ var _conditionRender = _interopRequireDefault(require("../../../../components/co
 
 var _useGlobalValue3 = _interopRequireDefault(require("../../useGlobalValue"));
 
+var _guideTip = _interopRequireDefault(require("../../../guide-tip"));
+
 var _new = _interopRequireDefault(require("./img/new.svg"));
 
 require("./index.css");
@@ -45,7 +47,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var prefix = "titaui-nav-top-menu";
+var prefix = 'titaui-nav-top-menu';
 var popupAlign = {
   offset: [0, 5],
   overflow: {
@@ -54,15 +56,7 @@ var popupAlign = {
   },
   targetOffset: [0, 0]
 };
-var NewFeatureGuidePopupAlign = {
-  offset: [104, -5],
-  overflow: {
-    adjustX: true,
-    adjustY: true
-  },
-  targetOffset: [0, 0]
-};
-var NEWMENUS = "#/interview";
+var NEWMENUS = '#summary/my';
 
 var Menu = function Menu(_ref) {
   var menus = _ref.menus,
@@ -70,8 +64,8 @@ var Menu = function Menu(_ref) {
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
-      isKnow = _useState2[0],
-      setIsKonw = _useState2[1];
+      guideVisible = _useState2[0],
+      setGuideVisible = _useState2[1];
 
   var _useState3 = (0, _react.useState)(false),
       _useState4 = _slicedToArray(_useState3, 2),
@@ -83,7 +77,7 @@ var Menu = function Menu(_ref) {
       feedNum = _useGlobalValue2[0];
 
   var containerRef = (0, _react.useRef)();
-  var apiPath = (0, _bsGlobal.getBSGlobal)("apiPath");
+  var apiPath = (0, _bsGlobal.getBSGlobal)('apiPath');
   var userId = (0, _bsGlobal.getUserInfo)().Id;
 
   var handlePopupVisibleChange = function handlePopupVisibleChange(visible) {
@@ -92,52 +86,37 @@ var Menu = function Menu(_ref) {
 
   var handleTracker = function handleTracker(menu) {
     if (window.titaTracker) {
-      window.titaTracker("action").record({
+      window.titaTracker('action').record({
         actionName: "\u5BFC\u822A\u83DC\u5355__".concat(menu.title),
-        actionGroup: "导航菜单",
-        productName: "导航菜单"
+        actionGroup: '导航菜单',
+        productName: '导航菜单'
       });
     }
 
-    if (menu.code === "dynamic" && feedNum > 0) {
+    if (menu.code === 'dynamic' && feedNum > 0) {
       window.location.reload();
     }
   };
 
-  var handleClick = function handleClick() {
-    setIsKonw(true);
-    localStorage.setItem("isNewMenuItem__".concat(userId), "".concat(userId));
+  var handleClickClose = function handleClickClose() {
+    setGuideVisible(false);
+    localStorage.setItem("isKnowNewSummary__".concat(userId), "".concat(userId));
   };
 
   (0, _react.useEffect)(function () {
-    var cacheIsKnow = localStorage.getItem("isNewMenuItem__".concat(userId));
+    var cacheIsKnow = localStorage.getItem("isKnowNewSummary__".concat(userId));
 
     if (cacheIsKnow) {
-      setIsKonw(true);
+      setGuideVisible(false);
+    } else {
+      setGuideVisible(true);
     }
   }, []);
 
-  var popup = /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__tips")
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(prefix, "__tips-box"), _defineProperty({}, "".concat(prefix, "__tips-hide"), isKnow))
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__tips-box-head")
-  }, /*#__PURE__*/_react["default"].createElement("h2", {
-    className: "".concat(prefix, "__tips-box-title")
-  }, "1 : 1 \u9762\u8C08\uFF08\u4E00\u5BF9\u4E00\u9762\u8C08\uFF09\u4E0A\u7EBF\u5566\uFF01"), /*#__PURE__*/_react["default"].createElement("p", {
-    className: "".concat(prefix, "__tips-box-content")
-  }, "\u52A9\u529B\u7ECF\u7406\u548C\u4E0B\u7EA7\u8FDB\u884C\u6301\u7EED\u6C9F\u901A\uFF0C\u4E3A\u4E0D\u540C\u573A\u666F\u63D0\u4F9B\u4E30\u5BCC\u7684\u6C9F\u901A\u6A21\u677F\uFF0C\u5373\u523B\u4E86\u89E3\uFF0CGo~")), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__tips-box-ok"),
-    onClick: handleClick
-  }, "\u597D\u54D2")), /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(prefix, "__tips-triangle"), _defineProperty({}, "".concat(prefix, "__tips-hide"), isKnow))
-  }));
-
   var renderRawItem = function renderRawItem(menu) {
     var href = menu.href;
 
-    if (menu.title === "Learning" || menu.code === "learning") {
+    if (menu.title === 'Learning' || menu.code === 'learning') {
       href = "".concat(apiPath, "/").concat(href);
     }
 
@@ -145,13 +124,17 @@ var Menu = function Menu(_ref) {
       component: "span"
     }, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
       condition: menu.id
-    }, /*#__PURE__*/_react["default"].createElement(_popup["default"], {
-      popupVisible: !isKnow,
-      popup: menu.href === NEWMENUS ? popup : null,
-      mask: false,
-      action: ["focus"],
-      popupAlign: NewFeatureGuidePopupAlign,
-      zIndex: 1000
+    }, menu.href === NEWMENUS && /*#__PURE__*/_react["default"].createElement(_guideTip["default"], {
+      visible: guideVisible,
+      classnames: "".concat(prefix, "__guide"),
+      type: "button",
+      content: /*#__PURE__*/_react["default"].createElement("span", {
+        className: "".concat(prefix, "__guide-content")
+      }, (0, _bsGlobal.hasWebHead)('okr') ? '🎉 总结升级！全新推出 OKR 总结模版，用总结来实现 OKR闭环！' : '总结升级！查看总结与书写总结都更加轻便啦！'),
+      popupAlign: {
+        offset: [0, 140]
+      },
+      onClickClose: handleClickClose
     }, /*#__PURE__*/_react["default"].createElement("a", {
       className: (0, _classnames["default"])("".concat(prefix, "__menu-show"), _defineProperty({}, "".concat(prefix, "__menu-show--active"), activeMenuId === menu.id)),
       href: href,
@@ -159,13 +142,20 @@ var Menu = function Menu(_ref) {
       onClick: function onClick() {
         return handleTracker(menu);
       }
-    }, menu.title, menu.href === "#dynamic" && feedNum > 0 && /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(prefix, "__menu--hasNum"), _defineProperty({}, "".concat(prefix, "__menu--hasNum-active"), activeMenuId === menu.id && menu.href === "#dynamic"))
-    }, feedNum > 100 ? "99+" : feedNum), menu.href === NEWMENUS && /*#__PURE__*/_react["default"].createElement("img", {
+    }, menu.title, /*#__PURE__*/_react["default"].createElement("img", {
       src: _new["default"],
       alt: "",
       className: "".concat(prefix, "__tips-new")
-    })))));
+    }))), menu.href !== NEWMENUS && /*#__PURE__*/_react["default"].createElement("a", {
+      className: (0, _classnames["default"])("".concat(prefix, "__menu-show"), _defineProperty({}, "".concat(prefix, "__menu-show--active"), activeMenuId === menu.id)),
+      href: href,
+      target: "_self",
+      onClick: function onClick() {
+        return handleTracker(menu);
+      }
+    }, menu.title, menu.href === '#dynamic' && feedNum > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+      className: (0, _classnames["default"])("".concat(prefix, "__menu--hasNum"), _defineProperty({}, "".concat(prefix, "__menu--hasNum-active"), activeMenuId === menu.id && menu.href === '#dynamic'))
+    }, feedNum > 100 ? '99+' : feedNum))));
   };
 
   var renderRest = function renderRest(items) {
@@ -179,7 +169,7 @@ var Menu = function Menu(_ref) {
     }, items.map(function (menu) {
       var href = menu.href;
 
-      if (menu.title === "Learning" || menu.code === "learning") {
+      if (menu.title === 'Learning' || menu.code === 'learning') {
         href = "".concat(apiPath, "/").concat(href);
       }
 
@@ -200,7 +190,7 @@ var Menu = function Menu(_ref) {
       popupPlacement: "bottomLeft",
       popupAlign: popupAlign
     }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("tu-icon-diot", "".concat(prefix, "__more-icon"), _defineProperty({}, "".concat(prefix, "__more-icon--active"), isActiveHideMeun))
+      className: (0, _classnames["default"])('tu-icon-diot', "".concat(prefix, "__more-icon"), _defineProperty({}, "".concat(prefix, "__more-icon--active"), isActiveHideMeun))
     }));
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.12.57-beta.2",
+  "version": "1.12.60",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",