@titaui/pc 1.6.40 → 1.6.44

package/lib/components/create-okr/index.css

@@ -444,3 +444,9 @@
     transform: translateY(0);
   }
 }
+
+.download-dom--hidden {
+  position: absolute;
+  z-index: -99999;
+  top: -1000%;
+}

package/lib/components/dynamic/new-ui.css

@@ -43,7 +43,6 @@
   overflow: overlay;
   padding: 78px 0 0 0;
   box-sizing: border-box;
-  background: #f0f4fa;
 }
 
 .titaui-new-ui-dynamic__content-left {

package/lib/components/help-card/index.css

@@ -53,7 +53,7 @@
   width: 36px;
   height: 36px;
   background: url("./image/kefu-logo.png");
-  background-size: 34px;
+  background-size: 36px;
   margin-right: 12px;
   border-radius: 50%;
 }
@@ -101,6 +101,7 @@
   background: linear-gradient(90deg, #2879ff 0%, #f6f8fc 100%);
   z-index: -1;
   position: absolute;
+  opacity: 0.5;
   left: 0;
   bottom: 0;
 }

package/lib/components/menus/components/menu-card/index.css

@@ -1,7 +1,6 @@
 .titaui-menus__menu-card {
   position: relative;
   display: flex;
-  max-height: calc(100vh - 72px - 74px);
   min-height: 100px;
   flex-direction: column;
   background: #ffffff;
@@ -10,7 +9,3 @@
   box-sizing: border-box;
   will-change: height;
 }
-
-.titaui-menus__menu-card--trial {
-  max-height: calc(100vh - 164px - 74px);
-}

package/lib/components/menus/components/menu-tree/images/okr-menu/cases.svg

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="240px" height="240px" viewBox="0 0 240 240" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>ditu</title>
-    <g id="ditu" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <rect id="矩形" stroke="#141C28" stroke-width="16" x="138" y="28" width="74" height="74" rx="32"></rect>
-        <rect id="矩形" stroke="#141C28" stroke-width="16" x="28" y="138" width="184" height="74" rx="32"></rect>
-        <rect id="矩形" stroke="#2879FF" stroke-width="16" x="28" y="28" width="74" height="74" rx="32"></rect>
+    <title>OKR-anli</title>
+    <g id="OKR-anli" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M179,30 C196.120827,30 210,43.8791728 210,61 L210,61 L210,179 C210,196.120827 196.120827,210 179,210 C161.879173,210 148,196.120827 148,179 L148,179 L148,61 C148,43.8791728 161.879173,30 179,30 Z M179,46 C170.715729,46 164,52.7157288 164,61 L164,61 L164,179 C164,187.284271 170.715729,194 179,194 C187.284271,194 194,187.284271 194,179 L194,179 L194,61 C194,52.7157288 187.284271,46 179,46 Z M98,30 C115.673112,30 130,44.326888 130,62 L130,62 L130,96 C130,113.673112 115.673112,128 98,128 L98,128 L62,128 C44.326888,128 30,113.673112 30,96 L30,96 L30,62 C30,44.326888 44.326888,30 62,30 L62,30 Z M98,46 L62,46 C53.163444,46 46,53.163444 46,62 L46,62 L46,96 C46,104.836556 53.163444,112 62,112 L62,112 L98,112 C106.836556,112 114,104.836556 114,96 L114,96 L114,62 C114,53.163444 106.836556,46 98,46 L98,46 Z" id="形状结合" fill="#141C28" fill-rule="nonzero"></path>
+        <path d="M43,188 L117,188 C121.418278,188 125,191.581722 125,196 C125,200.418278 121.418278,204 117,204 L43,204 C38.581722,204 35,200.418278 35,196 C35,191.581722 38.581722,188 43,188 Z M117,150 C121.418278,150 125,153.581722 125,158 C125,162.418278 121.418278,166 117,166 L43,166 C38.581722,166 35,162.418278 35,158 C35,153.581722 38.581722,150 43,150 L117,150 Z" id="形状结合" fill="#2879FF"></path>
     </g>
 </svg>

package/lib/components/menus/components/menu-tree/images/okr-menu/panel.svg

@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>切片</title>
-    <g id="整体框架" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g transform="translate(-36.000000, -561.000000)" id="主菜单" stroke-width="1.2">
-            <g transform="translate(16.000000, 74.000000)">
-                <g id="RW-ZX" transform="translate(20.000000, 487.000000)">
-                    <rect id="矩形" stroke="#141C28" x="2.85" y="2.85" width="5.1" height="5.1" rx="2.4"></rect>
-                    <rect id="矩形" stroke="#2879FF" transform="translate(12.600000, 5.400000) rotate(-45.000000) translate(-12.600000, -5.400000) " x="10.275" y="3.075" width="4.65" height="4.65" rx="2.325"></rect>
-                    <rect id="矩形" stroke="#141C28" x="2.85" y="10.05" width="5.1" height="5.1" rx="2.4"></rect>
-                    <rect id="矩形" stroke="#141C28" x="10.05" y="10.05" width="5.1" height="5.1" rx="2.4"></rect>
-                </g>
-            </g>
-        </g>
+<svg width="240px" height="240px" viewBox="0 0 240 240" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>OKR-gongzuofa</title>
+    <g id="OKR-gongzuofa" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M82,126 C99.673112,126 114,140.326888 114,158 L114,178 C114,195.673112 99.673112,210 82,210 L62,210 C44.326888,210 30,195.673112 30,178 L30,158 C30,140.326888 44.326888,126 62,126 L82,126 Z M178,126 C195.673112,126 210,140.326888 210,158 L210,178 C210,195.673112 195.673112,210 178,210 L158,210 C140.326888,210 126,195.673112 126,178 L126,158 C126,140.326888 140.326888,126 158,126 L178,126 Z M82,142 L62,142 C53.2686411,142 46.1707953,148.993901 46.0030364,157.685129 L46,158 L46,178 C46,186.731359 52.993901,193.829205 61.6851293,193.996964 L62,194 L82,194 C90.7313589,194 97.8292047,187.006099 97.9969636,178.314871 L98,178 L98,158 C98,149.268641 91.006099,142.170795 82.3148707,142.003036 L82,142 Z M178,142 L158,142 C149.268641,142 142.170795,148.993901 142.003036,157.685129 L142,158 L142,178 C142,186.731359 148.993901,193.829205 157.685129,193.996964 L158,194 L178,194 C186.731359,194 193.829205,187.006099 193.996964,178.314871 L194,178 L194,158 C194,149.268641 187.006099,142.170795 178.314871,142.003036 L178,142 Z M82,30 C99.673112,30 114,44.326888 114,62 L114,82 C114,99.673112 99.673112,114 82,114 L62,114 C44.326888,114 30,99.673112 30,82 L30,62 C30,44.326888 44.326888,30 62,30 L82,30 Z M82,46 L62,46 C53.2686411,46 46.1707953,52.993901 46.0030364,61.6851293 L46,62 L46,82 C46,90.7313589 52.993901,97.8292047 61.6851293,97.9969636 L62,98 L82,98 C90.7313589,98 97.8292047,91.006099 97.9969636,82.3148707 L98,82 L98,62 C98,53.2686411 91.006099,46.1707953 82.3148707,46.0030364 L82,46 Z" id="形状结合" fill="#141C28" fill-rule="nonzero"></path>
+        <path d="M175,33 C192.673112,33 207,47.326888 207,65 L207,79 C207,96.673112 192.673112,111 175,111 L161,111 C143.326888,111 129,96.673112 129,79 L129,65 C129,47.326888 143.326888,33 161,33 L175,33 Z M175,49 L161,49 C152.268641,49 145.170795,55.993901 145.003036,64.6851293 L145,65 L145,79 C145,87.7313589 151.993901,94.8292047 160.685129,94.9969636 L161,95 L175,95 C183.731359,95 190.829205,88.006099 190.996964,79.3148707 L191,79 L191,65 C191,56.2686411 184.006099,49.1707953 175.314871,49.0030364 L175,49 Z" id="矩形" fill="#2879FF" fill-rule="nonzero" transform="translate(168.000000, 72.000000) rotate(-45.000000) translate(-168.000000, -72.000000) "></path>
     </g>
 </svg>

package/lib/components/menus/components/menu-tree/tree-node/depart/index.css

@@ -29,5 +29,5 @@
 .titaui-menus-tree__depart-node-expand {
   position: absolute;
   right: 8px;
-  top: 14px;
+  top: 12px;
 }

package/lib/components/menus/components/menu-tree/tree-node/user-concern.js

@@ -74,7 +74,7 @@ var _default = function _default(props) {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__user-concern-node-add"), 'noselect'),
     onClick: onAddConcernHandler
   }, /*#__PURE__*/_react["default"].createElement("span", {
-    className: "tu-icon-add"
+    className: "tu-icon-add1"
   })), /*#__PURE__*/_react["default"].createElement(_userSelector.FieldPersonSelector, {
     ref: userRef,
     multiple: false,

package/lib/components/menus/components/search-colleague/index.js

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var Bowser = _interopRequireWildcard(require("bowser"));
+
 var _userSelector = require("../../../user-selector");
 
 var _precls = _interopRequireDefault(require("../../precls"));
@@ -41,6 +43,7 @@ var _default = function _default(props) {
   var _props$placeholder = props.placeholder,
       placeholder = _props$placeholder === void 0 ? "搜索同事" : _props$placeholder,
       onSelect = props.onSelect;
+  var selectorRef = (0, _react.useRef)();
 
   var _useState = (0, _react.useState)(''),
       _useState2 = _slicedToArray(_useState, 2),
@@ -52,7 +55,25 @@ var _default = function _default(props) {
       isActive = _useState4[0],
       setIsActive = _useState4[1];
 
-  var selectorRef = (0, _react.useRef)();
+  var _useState5 = (0, _react.useState)(function () {
+    try {
+      var browser = Bowser.getParser(window.navigator.userAgent);
+      var browserInfo = browser.getBrowser();
+      var name = browserInfo.name;
+
+      if ( // safari 浏览器上兼容选人组件下拉的位置
+      (name || '').toLowerCase() == 'wechat' || (name || '').toLowerCase() == 'safari') {
+        return [140, 2];
+      } else {
+        return [62, 2];
+      }
+    } catch (e) {
+      console.error(e);
+      return [62, 2];
+    }
+  }),
+      _useState6 = _slicedToArray(_useState5, 1),
+      userSelectOffset = _useState6[0];
 
   var handleInputChange = function handleInputChange(e) {
     setSearchVal(e.target.value);
@@ -101,7 +122,7 @@ var _default = function _default(props) {
       'group': false
     },
     popupAlign: {
-      'offset': [62, 2]
+      'offset': userSelectOffset
     }
   }));
 };

package/lib/components/menus/export-modules/okr-menus/depart-menus/index.js

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _resizeObserver = require("@juggle/resize-observer");
+
 var _menuTree = _interopRequireDefault(require("../../../components/menu-tree"));
 
 var _requestApis = require("../../../request-apis");
@@ -154,7 +156,7 @@ var _default = function _default() {
   };
 
   (0, _react.useEffect)(function () {
-    var obs = new ResizeObserver(function (entries) {
+    var obs = new _resizeObserver.ResizeObserver(function (entries) {
       var _iterator = _createForOfIteratorHelper(entries),
           _step;
 

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

@@ -9,6 +9,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _resizeObserver = require("@juggle/resize-observer");
+
 var _scrollbar = _interopRequireDefault(require("../../../scrollbar"));
 
 var _menuTree = _interopRequireDefault(require("../../components/menu-tree"));
@@ -200,7 +202,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     };
   });
   (0, _react.useEffect)(function () {
-    var obs = new ResizeObserver(function (entries) {
+    var obs = new _resizeObserver.ResizeObserver(function (entries) {
       var _iterator = _createForOfIteratorHelper(entries),
           _step;
 

package/lib/components/menus/export-modules/okr-menus/subordinate-menus/index.js

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _resizeObserver = require("@juggle/resize-observer");
+
 var _menuTree = _interopRequireDefault(require("../../../components/menu-tree"));
 
 var _requestApis = require("../../../request-apis");
@@ -137,7 +139,7 @@ var _default = function _default(props) {
   };
 
   (0, _react.useEffect)(function () {
-    var obs = new ResizeObserver(function (entries) {
+    var obs = new _resizeObserver.ResizeObserver(function (entries) {
       var _iterator = _createForOfIteratorHelper(entries),
           _step;
 

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

@@ -25,6 +25,8 @@ var _utils = require("./utils");
 
 require("./index.css");
 
+var _logoWhite = _interopRequireDefault(require("./images/logo-white.png"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 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); }
@@ -43,7 +45,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var Logo = (0, _bsGlobal.getTenantInfo)().Logo;
+// const Logo = getTenantInfo().Logo;
 var preCls = "titaui-nav-top";
 
 var NavTop = function NavTop() {
@@ -86,7 +88,7 @@ var NavTop = function NavTop() {
   }, /*#__PURE__*/_react["default"].createElement("a", {
     className: (0, _classnames["default"])("".concat(preCls, "__left"))
   }, /*#__PURE__*/_react["default"].createElement("img", {
-    src: Logo,
+    src: _logoWhite["default"],
     className: (0, _classnames["default"])("".concat(preCls, "__left-logo"))
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__line"))

package/lib/components/okr-detail/components/header/o-avatar.js

@@ -124,7 +124,7 @@ var OAvatar = function OAvatar(props) {
       userId: generalPrincipalUser.userId,
       name: generalPrincipalUser.name,
       color: generalPrincipalUser.avatar ? generalPrincipalUser.avatar.color : "",
-      src: generalPrincipalUser.avatar ? generalPrincipalUser.avatar.small : "",
+      src: generalPrincipalUser.avatar ? generalPrincipalUser.avatar.original : "",
       nameTips: function nameTips(name) {
         return /*#__PURE__*/_react["default"].createElement("span", null, "\u8D1F\u8D23\u4EBA\uFF1A", name);
       },
@@ -137,7 +137,6 @@ var OAvatar = function OAvatar(props) {
     });
   }
 
-  console.log(generalPrincipalUser);
   return /*#__PURE__*/_react["default"].createElement("span", {
     ref: avatarRef,
     style: {

package/lib/components/okrcase-library/index.css

@@ -58,7 +58,6 @@
   padding-left: 24px;
   height: 50px;
   font-size: 16px;
-  line-height: 50px;
   border: none;
   box-sizing: border-box;
 }

package/lib/components/photo-card/index.js

@@ -105,6 +105,9 @@ var PhotoCard = function PhotoCard(props) {
         }
       });
     });
+    return function () {
+      setIsAttention(false);
+    };
   }, [userId]);
   if (!userInfo) return null;
   return /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/point-demo/point-demo.js

@@ -32,7 +32,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var _default = function _default(props) {
-  var _useState = (0, _react.useState)(true),
+  var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
       visible = _useState2[0],
       setVisible = _useState2[1]; //判断了一天后86400000毫秒之后再次弹窗
@@ -51,15 +51,7 @@ var _default = function _default(props) {
         setTimeout(function () {
           var date = new Date().getTime() + 86400000;
           localStorage.setItem("pointDemoTime", date);
-          var bod = document.querySelector('body');
-          var newDiv = document.createElement('div');
-          newDiv.classList.add('point-demo-model');
-          bod.appendChild(newDiv);
-
-          _reactDom["default"].render( /*#__PURE__*/_react["default"].createElement(_["default"], {
-            visible: visible,
-            setVisible: setVisible
-          }), document.querySelector('.point-demo-model'));
+          setVisible(true);
         }, 30000);
       }
     } else if (!time) {
@@ -67,27 +59,15 @@ var _default = function _default(props) {
         setTimeout(function () {
           var date = new Date().getTime() + 86400000;
           localStorage.setItem("pointDemoTime", date);
-          var bod = document.querySelector('body');
-          var newDiv = document.createElement('div');
-          newDiv.classList.add('point-demo-model');
-          bod.appendChild(newDiv);
-
-          _reactDom["default"].render( /*#__PURE__*/_react["default"].createElement(_["default"], {
-            visible: visible,
-            setVisible: setVisible
-          }), document.querySelector('.point-demo-model'));
+          setVisible(true);
         }, 30000);
       }
     }
-  } // let bod = document.querySelector('body');
-  // let newDiv = document.createElement('div');
-  // newDiv.classList.add('point-demo-model');
-  // bod.appendChild(newDiv);
-  // ReactDOM.render(
-  //   <PointDemo />,
-  //   document.querySelector('.point-demo-model')
-  // )
+  }
 
+  return visible ? /*#__PURE__*/_react["default"].createElement(_["default"], {
+    setVisible: setVisible
+  }) : null;
 };
 
 exports["default"] = _default;

package/lib/pages/aha2021/index.js

@@ -19,6 +19,8 @@ var _invitePeople = _interopRequireDefault(require("../../components/invite-peop
 
 var _helpCard = _interopRequireDefault(require("../../components/help-card"));
 
+var _pointDemo = _interopRequireDefault(require("../../components/point-demo/point-demo"));
+
 var _platform = require("../../utils/platform");
 
 require("./index.css");
@@ -86,7 +88,7 @@ var _default = function _default(props) {
     className: (0, _classnames["default"])("".concat(preCls, "__help"))
   }, /*#__PURE__*/_react["default"].createElement(_helpCard["default"], null)), isTrial && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__invite"))
-  }, /*#__PURE__*/_react["default"].createElement(_invitePeople["default"], null)));
+  }, /*#__PURE__*/_react["default"].createElement(_invitePeople["default"], null)), /*#__PURE__*/_react["default"].createElement(_pointDemo["default"], null));
 };
 
 exports["default"] = _default;

package/lib/pages/new-okr-list/header/index.css

@@ -158,5 +158,5 @@
 }
 
 .tita-okr-list-v2__period-selector {
-  border-radius: 12px;
+  border-radius: 12px !important;
 }

package/lib/pages/new-okr-list/index.css

@@ -3,7 +3,6 @@
   overflow-y: scroll;
   margin-right: -16px;
   padding-right: 16px;
-  background-color: #f0f4fa;
 }
 
 .tita-okr-list-v2__pagination {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.6.40",
+  "version": "1.6.44",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",
@@ -54,6 +54,7 @@
     "sass-resources-loader": "^2.2.1"
   },
   "dependencies": {
+    "bowser": "^2.11.0",
     "@antv/g2plot": "^2.2.11",
     "@juggle/resize-observer": "^3.3.1",
     "@titaui/dagre": "^0.8.8-pre",