@titaui/pc 1.9.46 → 1.9.50

package/lib/components/dialog/index.js

@@ -113,7 +113,8 @@ var _default = function _default(props) {
     animation: "slide-fade",
     maskAnimation: "fade",
     maskClosable: false,
-    footer: footer || baseFooter
+    footer: footer || baseFooter,
+    zIndex: 1299
   }, restProps));
 };
 

package/lib/components/okr-detail/base-info/base-info.js

@@ -370,10 +370,12 @@ var BaseInfo = function BaseInfo(_ref) {
   (0, _react.useEffect)(function () {
     (0, _requestApis.getOkrUsers)(okrInfo.workId).then(function (resp) {
       if (resp.Code === 1) {
+        var _data$;
+
         var data = resp.Data;
         setGeneralPrincipalUser((0, _util.formatAvatarInfo)(data[0].users)[0]);
         setParticipant((0, _util.formatAvatarInfo)(data[1].users));
-        setFollowers((0, _util.formatAvatarInfo)(data[2].users));
+        setFollowers((0, _util.formatAvatarInfo)(((_data$ = data[2]) === null || _data$ === void 0 ? void 0 : _data$.users) || []));
       }
     });
   }, []);
@@ -424,6 +426,7 @@ var BaseInfo = function BaseInfo(_ref) {
   }, [generalRoleType, participant, followers]);
   var renderDialogConfirm = (0, _react.useMemo)(function () {
     return /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"], {
+      zIndex: 1200,
       visible: showDialogConfirm,
       type: "warning"
     }, /*#__PURE__*/_react["default"].createElement("span", {

package/lib/components/okr-detail/schedule/components/o-progress/index.js

@@ -260,6 +260,7 @@ var OProgress = function OProgress(_ref) {
   }, [oProgressData]);
   var renderDialogRemind = (0, _react.useMemo)(function () {
     return /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"], {
+      zIndex: 1200,
       visible: showRemindDialogConfirm,
       type: "warning"
     }, /*#__PURE__*/_react["default"].createElement("span", {

package/lib/components/stop-taking-modal/index.js

@@ -36,10 +36,17 @@ var storage = new _localStorage.localStorage();
 
 function StopTakingModel() {
   var _useState = (0, _react.useState)(function () {
-    var bol = storage.getItem('stopTaking');
+    var stopTaking = storage.getItem("stopTaking");
 
-    if (typeof storage.getItem('stopTaking') === 'boolean') {
-      return bol;
+    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;
+      } else {
+        return false;
+      }
     }
 
     return true;
@@ -50,7 +57,10 @@ function StopTakingModel() {
 
   var handleClose = (0, _react.useCallback)(function () {
     setVisible(false);
-    storage.setItem('stopTaking', false);
+    storage.setItem("stopTaking", {
+      bol: false,
+      date: new Date()
+    });
   }, []);
   return /*#__PURE__*/_react["default"].createElement(_titaUi.Modal, {
     visible: visible,
@@ -76,13 +86,13 @@ function StopTakingModel() {
     className: "".concat(preCls, "__content-line3")
   }, "\u5347\u7EA7\u65F6\u95F4\uFF1A", /*#__PURE__*/_react["default"].createElement("span", {
     style: {
-      color: '#2879ff',
+      color: "#2879ff",
       fontWeight: 500
     }
   }, "1.21 (\u5468\u4E94) 23:00 - 1.22 (\u5468\u516D) 23:59"))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__action"),
     onClick: function onClick() {
-      return window.open('https://wiki.tita.com/x/RICeAQ');
+      return window.open("https://wiki.tita.com/x/RICeAQ");
     }
   }, "\u4E86\u89E3\u8BE6\u60C5")));
 }

package/package.json

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

package/src/components/dialog/index.js

@@ -63,6 +63,7 @@ export default props => {
     maskAnimation="fade"
     maskClosable={false}
     footer={footer || baseFooter}
+    zIndex={1299}
     {...restProps}
   />
 }

package/src/components/okr-detail/base-info/base-info.tsx

@@ -317,7 +317,7 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
         const data = resp.Data;
         setGeneralPrincipalUser(formatAvatarInfo(data[0].users)[0]);
         setParticipant(formatAvatarInfo(data[1].users));
-        setFollowers(formatAvatarInfo(data[2].users));
+        setFollowers(formatAvatarInfo(data[2]?.users || []));
       }
     });
   }, []);
@@ -374,7 +374,7 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
 
   const renderDialogConfirm = useMemo(() => {
     return (
-      <DialogConfirm visible={showDialogConfirm} type="warning">
+      <DialogConfirm zIndex={1200} visible={showDialogConfirm} type="warning">
         {/* @ts-ignore */}
         <span type="title">
           {delUserType === 1

package/src/components/okr-detail/schedule/components/o-progress/index.tsx

@@ -160,7 +160,7 @@ const OProgress: FC<IOProgressProps> = ({listData, okrInfo, setUpdateProgress, h
 
   const renderDialogRemind = useMemo(() => {
     return (
-      <DialogConfirm visible={showRemindDialogConfirm} type="warning">
+      <DialogConfirm zIndex={1200} visible={showRemindDialogConfirm} type="warning">
         {/* @ts-ignore */}
         <span type="title">{getLocale('OKR_DR_Pop_Areyousure')}</span>
         {/* @ts-ignore */}

package/src/components/stop-taking-modal/index.tsx

@@ -1,48 +1,61 @@
 import React, { ReactElement, useState, useCallback } from "react";
 import { Modal } from "tita-ui";
 import { getLocale } from "../../utils/getLocale";
-import { localStorage } from "../../utils/local-storage"
+import { localStorage } from "../../utils/local-storage";
 import "./index.scss";
 
 const preCls = "tt-stop-taking-model";
-const storage = new localStorage()
+const storage = new localStorage();
 
 function StopTakingModel(): ReactElement {
   const [visible, setVisible] = useState<any>(() => {
-    const bol = storage.getItem('stopTaking')
-    if(typeof(storage.getItem('stopTaking'))==='boolean'){
-      return bol
+    const stopTaking: any = storage.getItem("stopTaking");
+    if (stopTaking?.date) {
+      const oldDate = new Date(stopTaking?.date).getDate();
+      const newDate = new Date().getDate();
+      if (newDate > oldDate) {
+        return true;
+      } else {
+        return false;
+      }
     }
-    return true
+    return true;
   });
 
   const handleClose = useCallback(() => {
     setVisible(false);
-    storage.setItem('stopTaking',false)
+    storage.setItem("stopTaking", { bol: false, date: new Date() });
   }, []);
 
   return (
     <Modal visible={visible} customContent footer={null} width={420}>
-      
-        <div className={preCls}>
-          <div className={`${preCls}__background`}></div>
-          <span className={`tu-icon-close ${preCls}__close`} onClick={handleClose} ></span>
-          <div className={`${preCls}__head`}>亲爱的用户</div>
-          <div className={`${preCls}__content`}>
-            <div className={`${preCls}__content-line1`}>
-            您好～
-            </div>
-            <div className={`${preCls}__content-line2`}>
+      <div className={preCls}>
+        <div className={`${preCls}__background`}></div>
+        <span
+          className={`tu-icon-close ${preCls}__close`}
+          onClick={handleClose}
+        ></span>
+        <div className={`${preCls}__head`}>亲爱的用户</div>
+        <div className={`${preCls}__content`}>
+          <div className={`${preCls}__content-line1`}>您好～</div>
+          <div className={`${preCls}__content-line2`}>
             为了给您带来更好的安全与稳定体验，Tita
             将在周五晚上进行升级，预计耗时一天，介时将无法使用
             Tita，请您提前安排好工作，感谢您的支持与理解！
-            </div>
-            <div className={`${preCls}__content-line3`}>
+          </div>
+          <div className={`${preCls}__content-line3`}>
             升级时间：
-            <span style={{color:'#2879ff',fontWeight:500}}>1.21 (周五) 23:00 - 1.22 (周六) 23:59</span>
-            </div>
+            <span style={{ color: "#2879ff", fontWeight: 500 }}>
+              1.21 (周五) 23:00 - 1.22 (周六) 23:59
+            </span>
           </div>
-          <div className={`${preCls}__action`} onClick={()=>window.open('https://wiki.tita.com/x/RICeAQ')} >了解详情</div>
+        </div>
+        <div
+          className={`${preCls}__action`}
+          onClick={() => window.open("https://wiki.tita.com/x/RICeAQ")}
+        >
+          了解详情
+        </div>
       </div>
     </Modal>
   );