@titaui/pc 1.7.80 → 1.7.81

package/lib/components/dynamic/dynamic-item/dynamic-share-to-dynamic/index.css

@@ -30,6 +30,13 @@
   height: 12px;
 }
 
+.titaui-dynamic-share-to-dynamic__content-title {
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .titaui-dynamic-share-to-dynamic__share {
   box-sizing: border-box;
   height: 104px;

package/lib/components/dynamic/dynamic-item/dynamic-share-to-dynamic/index.js

@@ -55,7 +55,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 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; }
 
-var prefix = "titaui-dynamic-share-to-dynamic";
+var prefix = 'titaui-dynamic-share-to-dynamic';
 var userId = (0, _bsGlobal.getUserInfo)().Id;
 
 var DynamicShare = function DynamicShare(_ref) {
@@ -87,9 +87,9 @@ var DynamicShare = function DynamicShare(_ref) {
 
   var renderDesc = (0, _react.useMemo)(function () {
     return /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
-      className: prefix + "__operate-desc"
+      className: prefix + '__operate-desc'
     }, "\u5206\u4EAB\u4E86\u4E00\u5802\u597D\u8BFE"), /*#__PURE__*/_react["default"].createElement("span", {
-      className: prefix + "-desc-operate-type",
+      className: prefix + '-desc-operate-type',
       style: {
         background: feedTypeColor
       }
@@ -114,11 +114,9 @@ var DynamicShare = function DynamicShare(_ref) {
     });
   }, [data, searchKeyWord]);
   (0, _react.useEffect)(function () {
-    if (data.shareContent !== null) {
-      if (data.shareContent.charAt(0) === "{") {
-        setTitle(JSON.parse(data.shareContent).title);
-        setContent(htmlToText(JSON.parse(data.shareContent).content));
-      }
+    if (data.shareContent && typeof data.shareContent === 'string' && data.shareContent.substr(0, 1) === '{') {
+      setTitle(JSON.parse(data.shareContent).title);
+      setContent(htmlToText(JSON.parse(data.shareContent).content));
     }
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
@@ -130,12 +128,13 @@ var DynamicShare = function DynamicShare(_ref) {
     showTopping: hasDynamicOpereateAuth,
     user: data.publishUser
   }, restProps)), /*#__PURE__*/_react["default"].createElement("div", {
-    className: prefix + "__content"
+    className: prefix + '__content'
   }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("img", {
-    className: (0, _classnames["default"])(prefix + "__content-quoto", prefix + "__content-quoto--left"),
+    className: (0, _classnames["default"])(prefix + '__content-quoto', prefix + '__content-quoto--left'),
     src: _dynamicLeftQuoto["default"]
   })), /*#__PURE__*/_react["default"].createElement("div", {
-    ref: contentRef
+    ref: contentRef,
+    className: "".concat(prefix, "__content-title")
   }, /*#__PURE__*/_react["default"].createElement(_dangerousHtml["default"], {
     htmlText: data.content
   }))), /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -44,7 +44,6 @@ 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 userId = (0, _bsGlobal.getUserInfo)().Id;
 var popupAlign = {
   offset: [0, 5],
   overflow: {
@@ -56,8 +55,7 @@ var popupAlign = {
 
 var Menu = function Menu(_ref) {
   var menus = _ref.menus,
-      activeMenuId = _ref.activeMenuId,
-      isShowTips = _ref.isShowTips;
+      activeMenuId = _ref.activeMenuId;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -69,11 +67,9 @@ var Menu = function Menu(_ref) {
       isKnow = _useState4[0],
       setIsKonw = _useState4[1];
 
-  var containerRef = (0, _react.useRef)(); // @ts-ignore
-
-  var apiPath = BSGlobal.apiPath; // @ts-ignore
-
-  var userId = BSGlobal.loginUserInfo.Id;
+  var containerRef = (0, _react.useRef)();
+  var apiPath = (0, _bsGlobal.getBSGlobal)("apiPath");
+  var userId = (0, _bsGlobal.getUserInfo)().Id;
 
   var handlePopupVisibleChange = function handlePopupVisibleChange(visible) {
     setPopupVisible(visible);
@@ -102,6 +98,11 @@ var Menu = function Menu(_ref) {
     },
     targetOffset: [0, 0]
   };
+
+  var handleClickToLearning = function handleClickToLearning() {
+    window.open("".concat(apiPath, "/").concat(userId, "/eLearningHome#/"), "_self");
+  };
+
   (0, _react.useEffect)(function () {
     var isKnow = localStorage.getItem("isKonwLearning".concat(userId));
 
@@ -140,17 +141,16 @@ var Menu = function Menu(_ref) {
     }, menu.title)), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
       condition: menu.id === 44312
     }, /*#__PURE__*/_react["default"].createElement(_popup["default"], {
-      popupVisible: isShowTips,
+      popupVisible: !isKnow,
       popup: popup,
       mask: false,
       action: ['focus'],
       popupAlign: popupAlign2
-    }, /*#__PURE__*/_react["default"].createElement("a", {
+    }, /*#__PURE__*/_react["default"].createElement("span", {
       className: (0, _classnames["default"])("".concat(prefix, "__menu-show"), _defineProperty({}, "".concat(prefix, "__menu-show--active"), activeMenuId == menu.id)),
-      href: "".concat(apiPath, "/").concat(userId, "/eLearningHome#/"),
-      target: "_self",
       onClick: function onClick() {
-        return handleTracker(menu);
+        handleTracker(menu);
+        handleClickToLearning();
       }
     }, menu.title)), /*#__PURE__*/_react["default"].createElement("img", {
       src: _new["default"],

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

@@ -72,11 +72,6 @@ var NavTop = function NavTop() {
       activeMenuId = _useState4[0],
       setActiveMenuId = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(true),
-      _useState6 = _slicedToArray(_useState5, 2),
-      isShowTips = _useState6[0],
-      setIsShowTips = _useState6[1];
-
   var ua = navigator.userAgent.toLowerCase();
   var showWxInvite = (0, _bsGlobal.getTenantInfo)().mainCorpId && ua.indexOf("micromessenger") != -1;
   var openWxInvite = (0, _react.useCallback)(function () {
@@ -135,11 +130,6 @@ var NavTop = function NavTop() {
   (0, _react.useEffect)(function () {
     handleHashChange();
     window.addEventListener("hashchange", handleHashChange);
-
-    if (!localStorage.getItem("isKonwLearning")) {
-      setIsShowTips(false);
-    }
-
     return function () {
       window.removeEventListener("hashchange", handleHashChange);
     };
@@ -163,8 +153,7 @@ var NavTop = function NavTop() {
     className: (0, _classnames["default"])("".concat(preCls, "__middle"))
   }, /*#__PURE__*/_react["default"].createElement(_menu["default"], {
     menus: menu,
-    activeMenuId: activeMenuId,
-    isShowTips: isShowTips
+    activeMenuId: activeMenuId
   })), showWxInvite && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__invite")),
     onClick: openWxInvite

package/package.json

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