@titaui/pc 1.9.43 → 1.9.44

package/lib/components/communication/ConvertUserName.js

@@ -62,9 +62,8 @@ var ConvertUserName = /*#__PURE__*/function (_PureComponent) {
 
       if (userId) {
         // const iframeBoxUrl = `${getBSGlobal('apiPath')}/u/${getUserInfo().Id}/Home#`;
-        return /*#__PURE__*/_react["default"].createElement("a", {
-          className: (0, _classnames["default"])(className, "titaui-communication__communication-content__user-link"),
-          target: "_blank" // href={`${iframeBoxUrl}${encodeURIComponent("widget/italent?iTalentFrameType=iframe&iTalentFrame=&iTalentFrame=" + encodeURIComponent(getBSGlobal('titaHost') + "/" + getUserInfo().Id + "/PageBuilderForEdit#/view?to_user_id=" + userId))}`}
+        return /*#__PURE__*/_react["default"].createElement("span", {
+          className: (0, _classnames["default"])(className, "titaui-communication__communication-content__user-link") // href={`${iframeBoxUrl}${encodeURIComponent("widget/italent?iTalentFrameType=iframe&iTalentFrame=&iTalentFrame=" + encodeURIComponent(getBSGlobal('titaHost') + "/" + getUserInfo().Id + "/PageBuilderForEdit#/view?to_user_id=" + userId))}`}
 
         }, /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
           name: userName,

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

@@ -24,7 +24,7 @@
   width: 17px;
   height: 17px;
   font-size: 17px;
-  color: #51565d;
+  color: #fff;
   position: absolute;
   right: 3px;
   top: -68px;
@@ -34,6 +34,7 @@
 .tt-stop-taking-model__head {
   margin-top: 18px;
   font-size: 24px;
+  font-weight: 600;
   color: #141C28;
   line-height: 34px;
   letter-spacing: 2px;
@@ -70,3 +71,7 @@
   justify-content: center;
   cursor: pointer;
 }
+
+.tt-stop-taking-model__action:hover {
+  background: #5C8EFF;
+}

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

@@ -76,7 +76,8 @@ 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"),

package/lib/utils/open-data.js

@@ -156,29 +156,31 @@ exports.isPlatform = isPlatform;
 var parseTag = function parseTag(str) {
   var source = window.BSGlobal.tenantInfo.Source,
       ua = navigator.userAgent.toLowerCase();
-  if (source != 860 && ua.indexOf('micromessenger') == -1) return /*#__PURE__*/_react["default"].createElement("span", {
-    dangerouslySetInnerHTML: {
-      '__html': str
-    }
-  });
   var reg = /<\w+[\w\W]*?(userId|departmentId)=["'](\S+?)["'][\w\W]*?>@([\w\W]*?)<\/\w+>/g;
   var strReg = /<\w+[\w\s"'\/=\:\.]*?(?:userId|departmentId)=["']\S+?["'][\w\s"'\/=\:\.]*?>[\w\W]*?<\/\w+?>/;
   var openDatas = [];
-  var matchStr = reg.exec(str);
+  var matchStr = reg.exec(str); // if (source != 860 && ua.indexOf('micromessenger') == -1)
+  //   return <span dangerouslySetInnerHTML={{ '__html': str }} />;
 
   while (matchStr != null) {
-    var OpenDataCompoent = matchStr[1] == 'userId' ? OpenUserName : OpenDepartmentName;
+    var OpenDataCompoent = matchStr[1] == "userId" ? OpenUserName : OpenDepartmentName;
 
     if (!OpenDataCompoent) {
       openDatas.push( /*#__PURE__*/_react["default"].createElement("span", {
         dangerouslySetInnerHTML: {
-          '__html': matchStr[0]
+          __html: matchStr[0]
+        },
+        onClick: function onClick(e) {
+          return e.stopPropagation();
         }
       }));
     } else {
       openDatas.push( /*#__PURE__*/_react["default"].createElement("span", {
         style: {
-          'color': '#1890ff'
+          color: "#1890ff"
+        },
+        onClick: function onClick(e) {
+          return e.stopPropagation();
         }
       }, "@", /*#__PURE__*/_react["default"].createElement(OpenDataCompoent, {
         id: matchStr[2],

package/package.json

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

package/src/components/communication/ConvertUserName.tsx

@@ -14,18 +14,17 @@ export default class ConvertUserName extends PureComponent<Props> {
     if (userId) {
       // const iframeBoxUrl = `${getBSGlobal('apiPath')}/u/${getUserInfo().Id}/Home#`;
       return (
-        <a
+        <span
           className={classNames(
             className,
             "titaui-communication__communication-content__user-link"
           )}
-          target="_blank"
           // href={`${iframeBoxUrl}${encodeURIComponent("widget/italent?iTalentFrameType=iframe&iTalentFrame=&iTalentFrame=" + encodeURIComponent(getBSGlobal('titaHost') + "/" + getUserInfo().Id + "/PageBuilderForEdit#/view?to_user_id=" + userId))}`}
         >
           <span>
             <OpenUserName name={userName} id={userId} />
           </span>
-        </a>
+        </span>
       );
     }
     return <span className={className}>{userName}</span>;

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

@@ -21,7 +21,7 @@
     width: 17px;
     height: 17px;
     font-size: 17px;
-    color: #51565d; 
+    color: #fff; 
     position: absolute;
     right: 3px;
     top: -68px; 
@@ -31,6 +31,7 @@
   &__head {
     margin-top: 18px;
     font-size: 24px;
+    font-weight: 600;
     color: #141C28;
     line-height: 34px;
     letter-spacing: 2px;
@@ -65,5 +66,8 @@
     align-items: center;
     justify-content: center;
     cursor: pointer;
+    &:hover{
+      background: #5C8EFF;
+    }
   }
 }

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

@@ -39,7 +39,7 @@ function StopTakingModel(): ReactElement {
             </div>
             <div className={`${preCls}__content-line3`}>
             升级时间：
-            <span style={{color:'#2879ff'}}>1.21 (周五) 23:00 - 1.22 (周六) 23:59</span>
+            <span style={{color:'#2879ff',fontWeight:500}}>1.21 (周五) 23:00 - 1.22 (周六) 23:59</span>
             </div>
           </div>
           <div className={`${preCls}__action`} onClick={()=>window.open('https://wiki.tita.com/x/RICeAQ')} >了解详情</div>

package/src/utils/open-data.js

@@ -109,23 +109,31 @@ export const parseTag = (str) => {
   var source = window.BSGlobal.tenantInfo.Source,
     ua = navigator.userAgent.toLowerCase();
 
-  if (source != 860 && ua.indexOf('micromessenger') == -1)
-    return <span dangerouslySetInnerHTML={{ '__html': str }} />;
-
-  const reg = /<\w+[\w\W]*?(userId|departmentId)=["'](\S+?)["'][\w\W]*?>@([\w\W]*?)<\/\w+>/g;
-  const strReg = /<\w+[\w\s"'\/=\:\.]*?(?:userId|departmentId)=["']\S+?["'][\w\s"'\/=\:\.]*?>[\w\W]*?<\/\w+?>/;
+  const reg =
+    /<\w+[\w\W]*?(userId|departmentId)=["'](\S+?)["'][\w\W]*?>@([\w\W]*?)<\/\w+>/g;
+  const strReg =
+    /<\w+[\w\s"'\/=\:\.]*?(?:userId|departmentId)=["']\S+?["'][\w\s"'\/=\:\.]*?>[\w\W]*?<\/\w+?>/;
   const openDatas = [];
   let matchStr = reg.exec(str);
 
+  // if (source != 860 && ua.indexOf('micromessenger') == -1)
+  //   return <span dangerouslySetInnerHTML={{ '__html': str }} />;
+  
   while (matchStr != null) {
-    const OpenDataCompoent = matchStr[1] == 'userId' ? OpenUserName : OpenDepartmentName;
+    const OpenDataCompoent =
+      matchStr[1] == "userId" ? OpenUserName : OpenDepartmentName;
     if (!OpenDataCompoent) {
-      openDatas.push(<span dangerouslySetInnerHTML={{ '__html': matchStr[0] }} />);
+      openDatas.push(
+        <span
+          dangerouslySetInnerHTML={{ __html: matchStr[0] }}
+          onClick={(e) => e.stopPropagation()}
+        />
+      );
     } else {
       openDatas.push(
-        <span style={{ 'color': '#1890ff' }}>
+        <span style={{ color: "#1890ff" }} onClick={(e) => e.stopPropagation()}>
           @<OpenDataCompoent id={matchStr[2]} name={matchStr[3]} />
-        </span>,
+        </span>
       );
     }
     matchStr = reg.exec(str);
@@ -135,12 +143,14 @@ export const parseTag = (str) => {
   const renderData = [];
 
   for (let i = 0; i < commonStrs.length; i++) {
-    renderData.push(<span dangerouslySetInnerHTML={{ __html: commonStrs[i] }} />);
+    renderData.push(
+      <span dangerouslySetInnerHTML={{ __html: commonStrs[i] }} />
+    );
     renderData.push(openDatas[i]);
   }
 
   return renderData;
-}
+};
 
 export const parseString = (str) => {
   //@ts-ignore