@titaui/pc 1.9.69 → 1.9.70

package/lib/components/create-okr-modal/fields/okr-case.js

@@ -69,7 +69,7 @@ function _default(_ref) {
     onClick: okrCaseClickHandler,
     className: "tu-icon-shoushi"
   }, (0, _getLocale.getLocale)("OKR_MyO_Pop_Butt_AddfromOKR")) : null, okrTemplateEnabled && /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
-    zIndex: 99999,
+    zIndex: 1200,
     noHeadLine: true,
     visible: visible,
     onClose: onCasesCloseHandler,

package/lib/components/okrcase-library/okrcases-components/submitOkr-dialog.js

@@ -100,7 +100,8 @@ function SubmitDialog(props) {
     noCloseIcon: true,
     getContainer: function getContainer() {
       return document.body;
-    }
+    },
+    zIndex: 1200
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "okr-cases-library__submitWindow"
   }, /*#__PURE__*/_react["default"].createElement("img", {

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

@@ -95,14 +95,17 @@ function PhotoCard(props) {
 
   (0, _react.useEffect)(function () {
     (0, _request.getOtherUserInfo)(userId).then(function (res) {
+      var currentUser;
+
       if (res.Code === 1) {
+        currentUser = res.Data;
         setUserInfo(res.Data);
       }
 
-      (0, _request.getAttentionData)(userId).then(function (res) {
+      (0, _request.getAttentionData)().then(function (res) {
         if (res.Code === 1) {
-          res.Data.followerUsers.forEach(function (item) {
-            if (item.userId === userownInfo.Id) {
+          (res.Data || []).forEach(function (item) {
+            if (item.userId === currentUser.userId) {
               setIsAttention(true);
             }
           });

package/lib/components/photo-card/request.apis.js

@@ -7,8 +7,8 @@ exports.postAttention = exports.getVisitData = exports.getOtherUserInfo = export
 
 var _request = require("../../utils/request");
 
-var getAttentionData = function getAttentionData(userId) {
-  return (0, _request.rget)("v1")("follow/getFollowerList?toUserId=".concat(userId));
+var getAttentionData = function getAttentionData() {
+  return (0, _request.rget)("v1")("follow/followerList");
 };
 
 exports.getAttentionData = getAttentionData;

package/lib/pages/aha2021/index.js

@@ -25,8 +25,6 @@ var _pointDemo = _interopRequireDefault(require("../../components/point-demo/poi
 
 var _platform = require("../../utils/platform");
 
-var _topGlobalPrompt = _interopRequireDefault(require("../../components/top-global-prompt"));
-
 require("./index.css");
 
 var _helpers = require("../../utils/helpers");
@@ -35,28 +33,13 @@ var _hrHeader = _interopRequireDefault(require("../../components/hr-header"));
 
 var _hrMessage = _interopRequireDefault(require("../../components/nav-top/components/user-message/hrMessage"));
 
-var _localStorage = require("../../utils/local-storage");
-
 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); }
 
 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 _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."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 var preCls = "titaui-aha-2021";
-var storage = new _localStorage.LocalStorage();
 
 function ContentTemplate(props) {
   var children = props.children,
@@ -81,28 +64,6 @@ function ContentTemplate(props) {
 
 function PageLayout(props) {
   var children = props.children;
-
-  var _useState = (0, _react.useState)(function () {
-    if ((0, _helpers.getTenantInfo)().Source === 964) return false;
-    var stopTaking = storage.getItem("topGlobalCard");
-
-    if (stopTaking !== null && stopTaking !== void 0 && stopTaking.date) {
-      var oldDate = new Date(stopTaking === null || stopTaking === void 0 ? void 0 : stopTaking.date).getDate();
-      var newDate = new Date().getDate();
-
-      if (newDate > oldDate) {
-        return true;
-      }
-
-      return false;
-    }
-
-    return true;
-  }),
-      _useState2 = _slicedToArray(_useState, 2),
-      topCardVisible = _useState2[0],
-      setTopCardVisible = _useState2[1];
-
   var isTrial = window.BSGlobal.tenantAuthentication.Version === 1 && (0, _platform.isOfficialSite)();
   var isTencentHr = window.BSGlobal.tenantInfo.Source === 964;
 
@@ -120,16 +81,12 @@ function PageLayout(props) {
     className: (0, _classnames["default"])(preCls)
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__header"))
-  }, topCardVisible ? /*#__PURE__*/_react["default"].createElement(_topGlobalPrompt["default"], {
-    text: "\u4E3A\u4E86\u7ED9\u60A8\u5E26\u6765\u5B89\u5168\u4E0E\u7A33\u5B9A\u7684\u4F53\u9A8C\uFF0C\u6211\u4EEC\u5C06\u4E8E 1.21 23:00 - 1.22 23:59 \u8FDB\u884C\u505C\u670D\u5347\u7EA7\uFF0C\u8BF7\u60A8\u63D0\u524D\u5B89\u6392\u597D\u5DE5\u4F5C\uFF0C\u611F\u8C22\u60A8\u7684\u652F\u6301\u4E0E\u7406\u89E3\uFF01",
-    link: "https://wiki.tita.com/x/RICeAQ",
-    setTopCardVisible: setTopCardVisible
-  }) : null, (0, _helpers.getTenantInfo)().Source === 964 ? /*#__PURE__*/_react["default"].createElement(_hrHeader["default"], null) : /*#__PURE__*/_react["default"].createElement(_navTop["default"], null)), /*#__PURE__*/_react["default"].createElement("div", {
+  }, (0, _helpers.getTenantInfo)().Source === 964 ? /*#__PURE__*/_react["default"].createElement(_hrHeader["default"], null) : /*#__PURE__*/_react["default"].createElement(_navTop["default"], null)), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__message"))
   }, /*#__PURE__*/_react["default"].createElement(_followerVisitor["default"], null)), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__body")),
     style: {
-      height: "calc(100vh - ".concat(topCardVisible ? 114 : 74, "px)")
+      height: "calc(100vh - ".concat(74, "px)")
     }
   }, children), !isTencentHr && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__help"))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.9.69",
+  "version": "1.9.70",
   "nameCN": "",
   "description": "",
   "main": "src/index.js",

package/src/components/create-okr-modal/fields/okr-case.tsx

@@ -38,7 +38,7 @@ export default function ({ onOkrApply, okrTemplateEnabled }: Props) {
       ) : null}
       {okrTemplateEnabled && (
         <Dialog
-          zIndex={99999}
+          zIndex={1200}
           noHeadLine
           visible={visible}
           onClose={onCasesCloseHandler}

package/src/components/okrcase-library/okrcases-components/submitOkr-dialog.tsx

@@ -44,7 +44,7 @@ export function SubmitDialog(props: Props1) {
   };
 
   return (
-    <Dialog visible={isShowSubmitOkrWindow} noFooter width="480px" destroyOnClose noCloseIcon getContainer={() => document.body}>
+    <Dialog visible={isShowSubmitOkrWindow} noFooter width="480px" destroyOnClose noCloseIcon getContainer={() => document.body} zIndex={1200}>
       <div className="okr-cases-library__submitWindow">
         <img src={require("../image/submit小驴.svg")} />
         <div className="tu-icon-canceled" onClick={() => handleShowSubmitOkrWindow(false)} />

package/src/components/photo-card/index.tsx

@@ -6,7 +6,7 @@ import Tooltip from "../tooltip";
 import ConditionRender from "../condition-render";
 import Avatar from "../../components/avatar";
 import { OpenUserName } from "../../utils/open-data";
-import { getUserInfo } from "../../utils/bs-global";
+import { getBSGlobal, getUserInfo } from "../../utils/bs-global";
 import Card from "./components/card";
 import {
   getAttentionData,
@@ -32,7 +32,6 @@ interface IProps {
 
 function PhotoCard(props: IProps) {
   const { userId, isNameVisible = true } = props;
-
   const [userInfo, setUserInfo] = useState<any>();
   const [isAttention, setIsAttention] = useState(false);
 
@@ -51,13 +50,15 @@ function PhotoCard(props: IProps) {
 
   useEffect(() => {
     getOtherUserInfo(userId).then((res) => {
+      let currentUser;
       if (res.Code === 1) {
+        currentUser = res.Data;
         setUserInfo(res.Data);
       }
-      getAttentionData(userId).then((res) => {
+      getAttentionData().then((res) => {
         if (res.Code === 1) {
-          res.Data.followerUsers.forEach((item) => {
-            if (item.userId === userownInfo.Id) {
+          (res.Data || []).forEach((item) => {
+            if (item.userId === currentUser.userId) {
               setIsAttention(true);
             }
           });

package/src/components/photo-card/request.apis.ts

@@ -1,6 +1,6 @@
 import { rget, rpost } from "../../utils/request";
 
-export const getAttentionData = (userId) => rget("v1")(`follow/getFollowerList?toUserId=${userId}`);
+export const getAttentionData = () => rget("v1")(`follow/followerList`);
 
 export const getVisitData = (userId) => rget("v1")(`okr/okrCyclePageVisitor?toUserId=${userId}`);
 

package/src/pages/aha2021/index.tsx

@@ -1,5 +1,5 @@
 import React, {
-  Children, ReactChild, useEffect, useState,
+  Children, ReactChild, useEffect,
 } from "react";
 import classNames from "classnames";
 import Tooltip from "../../components/tooltip";
@@ -9,15 +9,12 @@ import InvitePeople from "../../components/invite-people";
 import HelpCard from "../../components/help-card";
 import PointDemo from "../../components/point-demo/point-demo";
 import { isOfficialSite } from "../../utils/platform";
-import TopGlobalCard from "../../components/top-global-prompt";
 import "./index.scss";
 import { getTenantInfo } from "../../utils/helpers";
 import HrHeader from "../../components/hr-header";
 import HrMessage from "../../components/nav-top/components/user-message/hrMessage";
-import { LocalStorage } from "../../utils/local-storage";
 
 const preCls = "titaui-aha-2021";
-const storage = new LocalStorage();
 
 function ContentTemplate(props: {
   children: ReactChild,
@@ -50,19 +47,7 @@ function PageLayout(props: {
   children: ReactChild
 }) {
   const { children } = props;
-  const [topCardVisible, setTopCardVisible] = useState(() => {
-    if (getTenantInfo().Source === 964) return false;
-    const stopTaking: any = storage.getItem("topGlobalCard");
-    if (stopTaking?.date) {
-      const oldDate = new Date(stopTaking?.date).getDate();
-      const newDate = new Date().getDate();
-      if (newDate > oldDate) {
-        return true;
-      }
-      return false;
-    }
-    return true;
-  });
+
   const isTrial = window.BSGlobal.tenantAuthentication.Version === 1 && isOfficialSite();
   const isTencentHr = window.BSGlobal.tenantInfo.Source === 964;
 
@@ -82,21 +67,12 @@ function PageLayout(props: {
   return (
     <div className={classNames(preCls)}>
       <div className={classNames(`${preCls}__header`)}>
-        {topCardVisible
-          ? (
-            <TopGlobalCard
-              text="为了给您带来安全与稳定的体验，我们将于 1.21 23:00 - 1.22 23:59 进行停服升级，请您提前安排好工作，感谢您的支持与理解！"
-              link="https://wiki.tita.com/x/RICeAQ"
-              setTopCardVisible={setTopCardVisible}
-            />
-          )
-          : null}
         {getTenantInfo().Source === 964 ? <HrHeader /> : <NavTop />}
       </div>
       <div className={classNames(`${preCls}__message`)}>
         <FollowerVisitor />
       </div>
-      <div className={classNames(`${preCls}__body`)} style={{ height: `calc(100vh - ${topCardVisible ? 114 : 74}px)` }}>
+      <div className={classNames(`${preCls}__body`)} style={{ height: `calc(100vh - ${74}px)` }}>
         {children}
       </div>
       {!isTencentHr && (