@titaui/pc 1.9.40 → 1.9.44

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/dynamic/online-broadcast/data.ts

@@ -14,18 +14,32 @@ if (source === 860) {
 }
 
 export const onlineBroadcastData = [
+  {
+    hasOnline: true,
+    preContent: '「OKR」支持手动进行目标打分',
+    preHref: 'https://wiki.tita.com/x/GYCeAQ',
+    isNew: true,
+    date: '1/12',
+  },
+  {
+    hasOnline: true,
+    preContent: '「考核」支持批量公布考核结果 ',
+    preHref: 'https://wiki.tita.com/x/L4CeAQ',
+    isNew: true,
+    date: '1/11',
+  },
   {
     hasOnline: true,
     preContent: 'Tita「Learning」 全新上线',
     preHref: 'https://wiki.tita.com/x/doNrAQ',
-    isNew: true,
+    isNew: false,
     date: '12/26',
   },
   {
     hasOnline: true,
     preContent: '「OKR」支持设置子目标权重',
     preHref: 'https://wiki.tita.com/x/mIFrAQ',
-    isNew: true,
+    isNew: false,
     date: '12/18',
   },
   {

package/src/components/hr-header/index.tsx

@@ -79,7 +79,7 @@ function HrHeader({}: Props): ReactElement {
             popupPlacement="bottom"
             popup={
                   <div className='tencent-hr-header-popup'>
-                    {menus.slice(6).map((menu) => (
+                    {menus.slice(5).map((menu) => (
                       <a className='tencent-hr-header-popup__item' href={menu.appUrl}>{menu.appName}</a>
                     ))}
                   </div>

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

@@ -0,0 +1,73 @@
+.tt-stop-taking-model {
+  width: 420px;
+  height: 338px;
+  background: #FFFFFF;
+  box-sizing: border-box;
+  position: relative;
+  padding: 40px;
+  border-radius: 0px 0px 32px 32px;
+  &__background{
+    width: 420px;
+    height: 192px;
+    position: absolute;
+    top: -102px;
+    left: 0;
+    background-image: url('./img/stop-taking.png');
+    background-repeat: no-repeat;
+    background-size: 420px 192px;
+    background-position: 0 0;
+  }
+  &__close{
+    width: 17px;
+    height: 17px;
+    font-size: 17px;
+    color: #fff; 
+    position: absolute;
+    right: 3px;
+    top: -68px; 
+    cursor: pointer;
+  }
+
+  &__head {
+    margin-top: 18px;
+    font-size: 24px;
+    font-weight: 600;
+    color: #141C28;
+    line-height: 34px;
+    letter-spacing: 2px;
+    position: relative;
+    z-index: 2;
+  }
+
+  &__content {
+    margin-top: 12px;
+    font-size: 14px;
+    color: #3F4755;
+    line-height: 22px;
+
+    &-line2{
+      margin-top: 4px;
+    }
+    &-line3{
+      margin-top: 12px;
+    }
+  }
+
+  &__action {
+    margin: 28px auto 0;
+    width: 188px;
+    height: 40px;
+    background: #2879FF;
+    box-shadow: 0px 8px 12px 0px rgba(40, 121, 255, 0.3);
+    border-radius: 20px;
+    font-size: 14px;
+    color: #FFFFFF;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+    &:hover{
+      background: #5C8EFF;
+    }
+  }
+}

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

@@ -0,0 +1,51 @@
+import React, { ReactElement, useState, useCallback } from "react";
+import { Modal } from "tita-ui";
+import { getLocale } from "../../utils/getLocale";
+import { localStorage } from "../../utils/local-storage"
+import "./index.scss";
+
+const preCls = "tt-stop-taking-model";
+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
+    }
+    return true
+  });
+
+  const handleClose = useCallback(() => {
+    setVisible(false);
+    storage.setItem('stopTaking',false)
+  }, []);
+
+  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`}>
+            为了给您带来更好的安全与稳定体验，Tita
+            将在周五晚上进行升级，预计耗时一天，介时将无法使用
+            Tita，请您提前安排好工作，感谢您的支持与理解！
+            </div>
+            <div className={`${preCls}__content-line3`}>
+            升级时间：
+            <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>
+      </div>
+    </Modal>
+  );
+}
+
+export default StopTakingModel;

package/src/index.js

@@ -68,6 +68,7 @@ export { default as TitaChart } from "./components/tita-chart";
 export { default as Tooltip } from "./components/tooltip";
 export { default as TooltipText } from './components/tooltip/tooltip-text';
 export { default as UpdateModal } from "./components/update-modal";
+import { default as StopTakingModal } from "./components/stop-taking-modal"
 export { default as upload } from "./components/upload";
 export { default as Upvote } from "./components/upvote";
 export { default as VersionChangeModal } from "./components/version-change-modal";

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

package/yarn-error.log

@@ -0,0 +1,103 @@
+Arguments: 
+  /usr/local/bin/node /usr/local/bin/yarn
+
+PATH: 
+  /opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin:/opt/homebrew/bin:/opt/homebrew/sbin
+
+Yarn version: 
+  1.22.10
+
+Node version: 
+  12.22.1
+
+Platform: 
+  darwin x64
+
+Trace: 
+  SyntaxError: /Users/yang/tita/titaui-pc/package.json: Unexpected token < in JSON at position 26
+      at JSON.parse (<anonymous>)
+      at /usr/local/lib/node_modules/yarn/lib/cli.js:1625:59
+      at Generator.next (<anonymous>)
+      at step (/usr/local/lib/node_modules/yarn/lib/cli.js:310:30)
+      at /usr/local/lib/node_modules/yarn/lib/cli.js:321:13
+
+npm manifest: 
+  {
+    "name": "@titaui/pc",
+  <<<<<<< HEAD
+    "version": "1.2.22",
+  =======
+    "version": "1.2.13",
+  >>>>>>> master
+    "nameCN": "",
+    "description": "",
+    "main": "src/index.js",
+    "scripts": {
+      "storybook": "start-storybook -p 6006 --no-dll",
+      "start": "dev_server=on webpack-dev-server --disableHostCheck=true --progress --colors  --config webpack-stories.config.js",
+      "build-storybook": "build-storybook --docs --no-dll",
+      "build:es": "babel src -d es --ignore **/__tests__",
+      "build:lib": "cross-env OUTPUT_MODULE=commonjs babel src -d lib --ignore **/__tests__",
+      "build:umd": "webpack --config ./.scripts/webpack.umd.js",
+      "build": "npm run build:lib && npm run build:es && npm run build:umd"
+    },
+    "author": "",
+    "license": "ISC",
+    "devDependencies": {
+      "del": "^6.0.0",
+      "gulp": "^3.x",
+      "gulp-autoprefixer": "^7.0.1",
+      "gulp-babel": "^8.0.0",
+      "gulp-concat": "^2.6.1",
+      "gulp-cssbeautify": "^3.0.0",
+      "gulp-cssnano": "^2.1.3",
+      "gulp-filesize": "0.0.6",
+      "gulp-postcss": "^9.0.0",
+      "gulp-rename": "^2.0.0",
+      "gulp-replace": "^1.0.0",
+      "gulp-sass": "^4.1.0",
+      "gulp-sourcemaps": "^2.6.5",
+      "sass-resources-loader": "^2.2.1"
+    },
+    "dependencies": {
+      "@titaui/dagre": "^0.8.8-pre",
+      "@titaui/rc-tree2": "^4.1.15",
+      "@titaui/rc-trigger": "^5.2.5",
+      "@titaui/react-flow-renderer": "9.5.4",
+      "@titaui/toast": "^1.0.0",
+      "axios": "^0.21.1",
+      "classnames": "^2.2.6",
+      "clone-deep": "^4.0.1",
+      "d3-cloud": "^1.2.5",
+      "dayjs": "^1.10.4",
+      "html2canvas": "^1.0.0-rc.7",
+      "moment": "^2.29.1",
+      "qs": "^6.10.1",
+      "rc-checkbox": "^2.3.2",
+      "rc-dialog": "8.5.2",
+      "rc-drawer": "^4.3.1",
+      "rc-input-number": "^5.0.0",
+      "rc-pagination": "^3.1.6",
+      "rc-queue-anim": "1.4.1",
+      "rc-select": "^12.1.7",
+      "rc-switch": "^3.2.2",
+      "rc-table": "^7.13.2",
+      "rc-tabs": "^11.7.3",
+      "rc-tooltip": "^5.1.1",
+      "rc-tree": "^4.1.5",
+      "rc-trigger": "^5.2.3",
+      "rc-upload": "^4.2.0-alpha.0",
+      "rc-util": "^5.13.1",
+      "react-collapse": "^5.1.0",
+      "react-perfect-scrollbar": "^1.5.2",
+      "url-parse": "^1.5.1",
+      "uuid": "^3.1.0",
+      "wordcloud": "^1.2.2"
+    }
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
+  No lockfile