@titaui/pc 1.7.77 → 1.7.81

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

@@ -17,6 +17,9 @@
   color: #3f4755;
   line-height: 24px;
   cursor: pointer;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .titaui-dynamic-share-to-dynamic__content-quoto {
@@ -27,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/mblog/components/MblogAction.js

@@ -193,6 +193,7 @@ var MblogAction = /*#__PURE__*/function (_PureComponent) {
         tips: this.props.atTipText
       }, /*#__PURE__*/_react["default"].createElement(_UserSelectorPop["default"], {
         ref: "atSelector",
+        stopPropagation: true,
         popExtraClassName: "pull-screen-ignore",
         align: userSelectorPopAlign,
         container: this.context.popContainer,

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

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _bsGlobal = require("../../../../utils/bs-global");
+
 var _popup = _interopRequireDefault(require("../../../popup"));
 
 var _rcOverflow = _interopRequireDefault(require("rc-overflow"));
@@ -53,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),
@@ -66,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);
@@ -88,7 +87,7 @@ var Menu = function Menu(_ref) {
 
   var handleClick = function handleClick() {
     setIsKonw(true);
-    localStorage.setItem("isKonwLearning", "true");
+    localStorage.setItem("isKonwLearning".concat(userId), "".concat(userId));
   };
 
   var popupAlign2 = {
@@ -100,6 +99,18 @@ 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));
+
+    if (isKnow) {
+      setIsKonw(true);
+    }
+  }, []);
+
   var popup = /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__tips")
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -130,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/lib/components/okr-flow/export-modal/index.js

@@ -103,7 +103,7 @@ var ExportMapModal = function ExportMapModal(props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              okrMapRef = document.querySelector(".titaui-okr-flow__export");
+              okrMapRef = document.querySelector(".titaui-okr-flow__export") || document.createElement('div');
               width = okrMapRef.clientWidth; //获取dom 宽度
 
               height = okrMapRef.clientHeight; //获取dom 高度
@@ -155,6 +155,12 @@ var ExportMapModal = function ExportMapModal(props) {
               image.setAttribute("crossOrigin", "anonymous");
 
               image.onload = function () {
+                if (!url.Data.obj) {
+                  _toast["default"].Error('导出失败，请稍后重试', {
+                    canClose: false
+                  });
+                }
+
                 var a = document.createElement("a"); // 生成一个a元素
 
                 var event = new MouseEvent("click"); // 创建一个单击事件
@@ -168,7 +174,7 @@ var ExportMapModal = function ExportMapModal(props) {
                 _toast["default"].Success("导出成功");
 
                 setIsExport(false);
-                onCloseHandler();
+                onCloseHandler && onCloseHandler();
               };
 
               image.src = imgUrl;

package/lib/components/user-selector/request-apis.js

@@ -61,7 +61,8 @@ var getDepartments = function getDepartments(_ref) {
       // 有权时，获取的节点列表可能存在多个根部门
       var firstRootNodes = [];
       var hasGetRootNode = false;
-      var departments = departs.data.Data.departments;
+      var _departs$data$Data$de = departs.data.Data.departments,
+          departments = _departs$data$Data$de === void 0 ? [] : _departs$data$Data$de;
 
       for (var i = 0; i < departments.length; i++) {
         var it = departments[i];
@@ -123,8 +124,10 @@ var getTreeData = function getTreeData(id, opts, resolve) {
     isLoadNodes: isLoadNodes
   }).then(function (res) {
     var _res$Data = res.Data,
-        departments = _res$Data.departments,
-        users = _res$Data.users;
+        _res$Data$departments = _res$Data.departments,
+        departments = _res$Data$departments === void 0 ? [] : _res$Data$departments,
+        _res$Data$users = _res$Data.users,
+        users = _res$Data$users === void 0 ? [] : _res$Data$users;
     var transDeparts = (0, _utils.translateDepartsToTreeNode)(departments || []);
     var transUsers = (0, _utils.translateUsersToTreeNode)(users || [], id);
     resolve && resolve([].concat(_toConsumableArray(transUsers), _toConsumableArray(transDeparts)));

package/lib/components-v1/userSelector/UserSelectorPop.js

@@ -60,7 +60,7 @@ var UserSelectorPop = /*#__PURE__*/function (_PureComponent) {
     }
 
     return _possibleConstructorReturn(_this, (_temp = _this = _super.call.apply(_super, [this].concat(args)), _this.handleShowPop = function (e) {
-      if (_this.props.stopPropagation) {
+      if (_this.props.stopPropagation && !!e) {
         e.stopPropagation();
         e.nativeEvent.stopImmediatePropagation();
       } //@ts-ignore

package/lib/components-v1/userSelector/style.js

@@ -137,7 +137,7 @@ var EmptyText = _styledComponents["default"].p(_templateObject27 || (_templateOb
 
 exports.EmptyText = EmptyText;
 
-var Btn = _styledComponents["default"].a(_templateObject28 || (_templateObject28 = _taggedTemplateLiteral(["\n  display: inline-block;\n  color: #36434d;\n  background-color: #f5f8fa;\n  border-radius: 2px;\n  font-size: 12px;\n  line-height: 20px;\n  padding: 3px 10px;\n  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);\n  transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1), background-color 0.3s;\n  &:hover {\n    color: #36434d;\n    box-shadow: 0 3px 5px rgba(0, 0, 0, 0.3);\n    transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1), background-color 0.3s;\n  }\n"])));
+var Btn = _styledComponents["default"].a(_templateObject28 || (_templateObject28 = _taggedTemplateLiteral(["\n  display: inline-block;\n  color: #36434d;\n  background-color: #f5f8fa;\n  border-radius: 2px;\n  font-size: 12px;\n  line-height: 20px;\n  padding: 3px 10px;\n  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);\n  transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1), background-color 0.3s;\n  cursor:pointer;\n  &:hover {\n    color: #36434d;\n    box-shadow: 0 3px 5px rgba(0, 0, 0, 0.3);\n    transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1), background-color 0.3s;\n  }\n"])));
 
 exports.Btn = Btn;
 

package/lib/pages/okr-map/export-modules/okr-map/okr-map.js

@@ -166,7 +166,7 @@ var _default = function _default(props) {
   var okrPage = (0, _react.useRef)();
   (0, _react.useEffect)(function () {
     (0, _requestApis.checkTenantOkrExist)().then(function (res) {
-      return setExist(res.obj);
+      return setExist(res && res.obj || false);
     });
   }, []);
   (0, _react.useEffect)(function () {

package/package.json

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