@titaui/pc 1.7.29 → 1.7.30

package/lib/components/cascader/index.css

@@ -37,7 +37,7 @@
 
 .titaui-cascader-popup .rc-cascader-menu-item-active {
   background: unset;
-  color: #2879ff;
+  color: #2879ff !important;
 }
 
 .titaui-cascader-popup .rc-cascader-menu-item {

package/lib/components/nav-top/components/user-message/components/inform/inform-item.js

@@ -128,15 +128,18 @@ var Inform = function Inform(props) {
         }
       } else if (item.objUrl) {
         window.open(item.objUrl);
+      } else if (item.objType === _constant.informType.Okr) {
+        var url = item.content.match(/(http[s]?:\/\/([\w-]+.)+([:\d+])?(\/[\w-\.\/\?%&=]*))/g);
+        window.open(url, '_blank');
       } else {
         var reg = /href='.*?(?=')/g;
-        var url = '';
+        var _url = '';
         item.content.replace(reg, function ($0) {
-          url = $0.slice(6);
+          _url = $0.slice(6);
         });
 
-        if (url) {
-          window.open(url, '_blank');
+        if (_url) {
+          window.open(_url, '_blank');
         }
       }
     }

package/lib/components/nav-top/components/user-message/constant.js

@@ -27,7 +27,9 @@ var informType = {
   //查看详情
   "daily": 55,
   //日报月报周报
-  "todayJob": 81 //进入今日工作
+  "todayJob": 81,
+  //进入今日工作
+  "Okr": 0 //Okr
 
 };
 exports.informType = informType;

package/lib/components/weekly-report/board.js

@@ -14,8 +14,15 @@ var preCls = 'weekly-report-card-board';
 function Board(_ref) {
   var percent = _ref.percent;
   return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      position: 'relative',
+      paddingBottom: 1
+    }
+  }, /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls
   }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: preCls + '__cover'
+  }), /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls + '__done'
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls + '__undone',
@@ -36,7 +43,9 @@ function Board(_ref) {
     }
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls + '__center'
-  }, /*#__PURE__*/_react["default"].createElement("div", null, percent, "%")));
+  }, /*#__PURE__*/_react["default"].createElement("div", null, percent, "%"))), /*#__PURE__*/_react["default"].createElement("div", {
+    className: preCls + '__cover--bottom'
+  }));
 }
 
 var _default = Board;

package/lib/components/weekly-report/card.js

@@ -208,7 +208,7 @@ function Card(_ref, ref) {
     percent: Number(data.Complete)
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls + "__comparison"
-  }, data.Increase != '0' ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, "OKR \u5B8C\u6210\u5EA6", /*#__PURE__*/_react["default"].createElement("img", {
+  }, "OKR \u5B8C\u6210\u5EA6", data.Increase != '0' ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, " ", /*#__PURE__*/_react["default"].createElement("img", {
     className: preCls + "__direction",
     src: Number(data.Increase) > 0 ? require("./img/up.png") : require("./img/down.png"),
     alt: ""

package/lib/components/weekly-report/index.css

@@ -5,13 +5,13 @@
 .weekly-report-card-wrapper {
   overflow: hidden;
   width: 336px;
-  height: 548px;
+  height: 534px;
   border-radius: 24px;
 }
 
 .weekly-report-card-wrapper .weekly-report-card-content {
   position: relative;
-  top: -66px;
+  top: -52px;
   left: -20px;
   transform: scale(0.9);
 }
@@ -32,7 +32,7 @@
   align-items: center;
   width: 375px;
   height: 710px;
-  background: linear-gradient(180deg, #B7D5FF 0%, #186FFF 100%);
+  background: linear-gradient(180deg, #B7D5FF 0%, #186FFF 50%);
 }
 
 .weekly-report-card__title {
@@ -55,13 +55,14 @@
   flex-direction: column;
   align-items: center;
   width: 335px;
-  height: 452px;
+  height: 422px;
   background: transparent;
   padding-top: 55px;
   border-radius: 12px;
   background-image: url("./img/body.png");
   background-size: 100% 100%;
   background-position-y: -1px;
+  box-sizing: content-box;
 }
 
 .weekly-report-card__avatar {
@@ -129,17 +130,19 @@
 
 .weekly-report-card-board__done {
   position: absolute;
-  width: 154px;
-  height: 154px;
+  width: 150px;
+  height: 150px;
   border-radius: 50%;
-  background: linear-gradient(360deg, #2879FF 0%, #5B8FF9 50%);
+  background: linear-gradient(90deg, #2879FF 0%, #5B8FF9 50%);
   overflow: hidden;
+  top: 2px;
+  left: 2px;
 }
 
 .weekly-report-card-board__undone {
   position: absolute;
-  left: -3px;
-  bottom: 50%;
+  left: -5px;
+  bottom: 75px;
   width: 160px;
   height: 80px;
   background-color: #eaf1fe;
@@ -147,6 +150,26 @@
   transform: rotate(90deg);
 }
 
+.weekly-report-card-board__cover {
+  width: 154px;
+  height: 154px;
+  position: absolute;
+  border-radius: 50%;
+  box-sizing: border-box;
+  border: 2px solid #fff;
+  z-index: 10;
+}
+
+.weekly-report-card-board__cover--bottom {
+  width: 154px;
+  height: 2px;
+  position: absolute;
+  bottom: 0;
+  box-sizing: border-box;
+  background-color: #FFF;
+  z-index: 10;
+}
+
 .weekly-report-card-board__space {
   position: absolute;
   width: 2px;
@@ -232,7 +255,7 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin-top: 29px;
+  margin-top: 18px;
 }
 
 .weekly-report-card__statistics__item {
@@ -288,16 +311,16 @@
 
 .weekly-report-card__laba {
   position: absolute;
-  left: 0;
-  top: 118px;
+  left: 6px;
+  top: 108px;
   width: 94px;
   height: 65px;
 }
 
 .weekly-report-card__bofang {
   position: absolute;
-  right: 0;
-  top: 130px;
+  right: 4px;
+  top: 124px;
   width: 62px;
   height: 66px;
   z-index: 1;
@@ -327,6 +350,8 @@
   background-color: transparent;
   font-size: 14px;
   color: #FFF;
+  backdrop-filter: blur(2px);
+  background-color: rgba(255, 255, 255, 0.1);
 }
 
 .weekly-report-card__download:hover {

package/lib/components/weekly-report/index.js

@@ -67,7 +67,7 @@ function WeeklyReportPreview(_ref) {
       position: "relative"
     }
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("tu-icon-circle", preCls + "__close"),
+    className: (0, _classnames["default"])(preCls + "__close"),
     onClick: onClose
   }), /*#__PURE__*/_react["default"].createElement("div", {
     style: {
@@ -172,7 +172,7 @@ function WeeklyReportModal(_ref4) {
 
       return (_window3 = window) === null || _window3 === void 0 ? void 0 : (_window3$Talent = _window3.Talent) === null || _window3$Talent === void 0 ? void 0 : _window3$Talent.app.vent.off('open-weekly-report-modal');
     };
-  }, []);
+  }, [visible]);
   (0, _react.useEffect)(function () {
     if (!visible) return;
     var current = new Date();

package/package.json

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

package/src/components/nav-top/components/user-message/components/inform/inform-item.tsx

@@ -96,7 +96,10 @@ const Inform = (props) => {
 				}
 			} else if (item.objUrl) {
 				window.open(item.objUrl);
-			} else {
+			} else if (item.objType === informType.Okr) {
+        let url = item.content.match(/(http[s]?:\/\/([\w-]+.)+([:\d+])?(\/[\w-\.\/\?%&=]*))/g);
+        window.open(url, '_blank');
+      } else {
 				const reg = /href='.*?(?=')/g;
 				let url = '';
 				item.content.replace(reg, ($0) => {

package/src/components/nav-top/components/user-message/constant.ts

@@ -15,6 +15,7 @@ export const informType = {
   "details": 69, //查看详情
   "daily": 55, //日报月报周报
   "todayJob": 81, //进入今日工作
+  "Okr": 0, //Okr
 };
 
 export enum EObjType {
@@ -26,4 +27,5 @@ export enum EObjType {
   MileStone = 27, // 里程碑
   KanBan = 66, // 看板
   Remind = 8,//提醒
+  
 }

package/src/components/weekly-report/board.tsx

@@ -7,7 +7,9 @@ const preCls = 'weekly-report-card-board'
 
 function Board({percent}: Props): ReactElement {
   return (
+    <div style={{position:'relative',paddingBottom:1}}>
     <div className={preCls}>
+      <div className={preCls+'__cover'}/>
       <div className={preCls+'__done'}>
         <div className={preCls+'__undone'}style={{transform:`rotate(${percent/100 * 180}deg)`}}/>
         <div className={preCls+'__space'} style={{transform:'rotate(45deg)'}}/>
@@ -18,6 +20,9 @@ function Board({percent}: Props): ReactElement {
       <div className={preCls+'__center'}>
         <div>{percent}%</div>
       </div>
+      
+    </div>
+    <div className={preCls+'__cover--bottom'}/>
     </div>
   )
 }

package/src/components/weekly-report/card.tsx

@@ -132,17 +132,17 @@ function Card({data}: Props, ref): ReactElement {
         </div>
         <Board percent={Number(data.Complete)} />
         <div className={preCls + "__comparison"}>
-          {
-            data.Increase != '0' ? <>
+         
             OKR 完成度
-            <img
-              className={preCls + "__direction"}
-              src={Number( data.Increase) > 0 ? require("./img/up.png") : require('./img/down.png')}
-              alt=""
-            />
-            <span style={{ color: Number( data.Increase) > 0 ? "#4DC591" : '#F05E5E'}}>{Math.abs(Number(data.Increase))}%</span>
-            </> : ''
-          }
+           {
+             data.Increase != '0' ? <> <img
+             className={preCls + "__direction"}
+             src={Number( data.Increase) > 0 ? require("./img/up.png") : require('./img/down.png')}
+             alt=""
+           />
+           <span style={{ color: Number( data.Increase) > 0 ? "#4DC591" : '#F05E5E'}}>{Math.abs(Number(data.Increase))}%</span></> : ''
+           }
+          
         </div>
         <div className={preCls + "__colleague"}>
           {data.PromptLanguage}

package/src/components/weekly-report/index.scss

@@ -7,11 +7,11 @@
   &-wrapper {
     overflow: hidden;
     width: 336px;
-    height: 548px;
+    height: 534px;
     border-radius: 24px;
     .weekly-report-card-content {
       position: relative;
-      top: -66px;
+      top: -52px;
       left: -20px;
       transform: scale(0.9);
     }
@@ -31,7 +31,7 @@
     align-items: center;
     width: 375px;
     height: 710px;
-    background: linear-gradient(180deg, #B7D5FF 0%, #186FFF 100%);
+    background: linear-gradient(180deg, #B7D5FF 0%, #186FFF 50%);
   }
   &__title {
     width: 220px;
@@ -51,13 +51,14 @@
     flex-direction: column;
     align-items: center;
     width: 335px;
-    height: 452px;
+    height: 422px;
     background: transparent;
     padding-top: 55px;
     border-radius: 12px;
     background-image: url('./img/body.png');
     background-size: 100% 100%;
     background-position-y: -1px;
+    box-sizing: content-box;
   }
   &__avatar {
     position: absolute;
@@ -117,16 +118,18 @@
     position: relative;
     &__done {
       position: absolute;
-      width: 154px;
-      height: 154px;
+      width: 150px;
+      height: 150px;
       border-radius: 50%;
-      background: linear-gradient(360deg, #2879FF 0%, #5B8FF9 50%);
+      background: linear-gradient(90deg, #2879FF 0%, #5B8FF9 50%);
       overflow: hidden;
+      top: 2px;
+      left: 2px;
     }
     &__undone {
       position: absolute;
-      left: -3px;
-      bottom: 50%;
+      left: -5px;
+      bottom: 75px;
       width: 160px;
       height: 80px;
       background-color: rgb(234, 241, 254);
@@ -134,6 +137,24 @@
       transform: rotate(90deg);
       // background: radial-gradient(at bottom center,rgb(234, 241, 254) 0,rgb(234, 241, 254) 77px,transparent 77px);
     }
+    &__cover {
+      width: 154px;
+      height: 154px;
+      position: absolute;
+      border-radius: 50%;
+      box-sizing: border-box;
+      border: 2px solid #fff;
+      z-index: 10;
+    }
+    &__cover--bottom {
+      width: 154px;
+      height: 2px;
+      position: absolute;
+      bottom: 0;
+      box-sizing: border-box;
+      background-color: #FFF;
+      z-index: 10;
+    }
     &__space {
       position: absolute;
       width: 2px;
@@ -212,7 +233,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-top: 29px;
+    margin-top: 18px;
     
     &__item {
       position: relative;
@@ -261,15 +282,15 @@
   }
   &__laba {
     position: absolute;
-    left: 0;
-    top: 118px;
+    left: 6px;
+    top: 108px;
     width: 94px;
     height: 65px;
   }
   &__bofang {
     position: absolute;
-    right: 0;
-    top: 130px;
+    right: 4px;
+    top: 124px;
     width: 62px;
     height: 66px;
     z-index: 1;
@@ -296,6 +317,8 @@
     background-color: transparent;
     font-size: 14px;
     color: #FFF;
+    backdrop-filter: blur(2px);
+    background-color: rgba($color: #FFF, $alpha: .1);
     &:hover{
       background-color: transparent;
     }

package/src/components/weekly-report/index.tsx

@@ -26,7 +26,7 @@ function WeeklyReportPreview({ onShare,onClose,data }) {
 
   return (
     <div style={{ position: "relative"}}>
-      <div className={classnames("tu-icon-circle",preCls + "__close")} onClick={onClose}/>
+      <div className={classnames(preCls + "__close")} onClick={onClose}/>
       <div style={{ position: "absolute", left: "-99999999px" }}>
         <Card data={data} ref={cardRef} />
       </div>
@@ -73,7 +73,7 @@ function WeeklyReportModal({}: Props) {
       setVisible(true)
     })
     return () => window?.Talent?.app.vent.off('open-weekly-report-modal')
-  }, [])
+  }, [visible])
 
   useEffect(()=>{
     if(!visible) return