@titaui/pc 1.9.71 → 1.9.75

package/src/pages/new-okr-list/index.tsx

@@ -120,7 +120,7 @@ const NewOkrList: FC<any> = (props: {
       params.showOkrE = 1;
       params.Searchpage = 2;
     }
-    if(departmentId !== 0) {
+    if(departmentId != 0) {
       params.keyWords = ''
     }
     let request;
@@ -234,7 +234,7 @@ const NewOkrList: FC<any> = (props: {
               replaceOkr={replaceOkr}
               isShowPrincple={isShowPrincple}
               isShowPeriod={isShowPeriod}
-              isShowEasyCreate={relation !== 2 && relation !== 3}
+              isShowEasyCreate={relation !== "2" && relation !== "3"}
               openCreateModal={openCreateModal}
             />
             <div className={`${precls}__pagination`}>

package/src/utils/helpers.ts

@@ -10,8 +10,8 @@ export function cssSupport(attr, value) {
 }
 export function getUploadMaxSize() {
   const info = getBSGlobal("tenantInfo");
-  const isDingDing = info.Source == 861;
-  const isDingZhi = window.dingZhiSize && (window.dingZhiSize).indexOf(info.Id) != -1;
+  const isDingDing = info.Source === 861;
+  const isDingZhi = window.dingZhiSize && (window.dingZhiSize).indexOf(info.Id) !== -1;
   if (isDingDing) return 20;
   if (isDingZhi) return 100;
   return 50;
@@ -21,9 +21,11 @@ export function getTenantInfo() {
   return getBSGlobal("tenantInfo");
 }
 
-export const isDingDing = () => getTenantInfo().Source == 861;
+export const isDingDing = () => getTenantInfo().Source === 861;
 
 export const isLocal = () => !!getTenantInfo().isLocal;
+
+export const isTencentHr = () => getTenantInfo().Source === 964;
 export function escapeHtml(str) {
   const htmlEscapes = {
     "&": "&",
@@ -32,6 +34,6 @@ export function escapeHtml(str) {
     """: "\"",
     "'": "'",
   };
-  return str.replace(/(&|<|>|"|')/g, (str) => htmlEscapes[str]);
+  return str.replace(/(&|<|>|"|')/g, (s) => htmlEscapes[s]);
 }
 export const getLoginUserInfo = () => getBSGlobal("loginUserInfo");

package/src/utils/tools.js

@@ -30,7 +30,7 @@ export function htmlDecodeByRegExp(str) {
 }
 
 export function changeQueryString(key, value) {
-  const hash = decodeURIComponent(location.hash);
+  const hash = decodeURIComponent(window.location.hash);
   const queryObject = {};
   const markIndex = hash.indexOf("?");
   // contain query string in fragments
@@ -40,23 +40,23 @@ export function changeQueryString(key, value) {
     const queryString = hash.slice(markIndex + 1);
     const queryArray = queryString.split("&");
     queryArray.forEach((item) => {
-      item = item.split("=");
-      queryObject[item[0]] = item[1];
+      const [tempItem0, tempItem1] = item.split("=");
+      queryObject[tempItem0] = tempItem1;
     });
     queryObject[key] = value;
     const arr = [];
-    for (const name in queryObject) {
+    Object.keys(queryObject).forEach((name) => {
       arr.push(`${name}=${queryObject[name]}`);
-    }
-    location.hash = `${hashName}?${arr.join("&")}`;
+    });
+    window.location.hash = `${hashName}?${arr.join("&")}`;
   } else {
-    location.hash = hash;
+    window.location.hash = hash;
   }
 }
 
 export function getQueryString() {
   // 获取Url上的参数，以{}返回
-  const hash = decodeURIComponent(location.hash);
+  const hash = decodeURIComponent(window.location.hash);
   const queryObject = {};
   const markIndex = hash.indexOf("?");
   // contain query string in fragments
@@ -64,7 +64,7 @@ export function getQueryString() {
     // build query object
     const queryString = hash.slice(markIndex + 1);
     const queryArray = queryString.split("&");
-    for (let i = 0; i < queryArray.length; i++) {
+    for (let i = 0; i < queryArray.length; i += 1) {
       const queryPair = queryArray[i].split("=");
       if (queryPair[0] !== "_k") {
         queryObject[queryPair[0]] = decodeURIComponent(queryPair[1]);
@@ -97,9 +97,8 @@ export const highLightWord = ({
       }
     } else {
       const doms = Array.from(parentDom.childNodes);
-      doms
-        && doms.length > 0
-        && doms.map((dom) => {
+      if (doms && doms.length > 0) {
+        doms.forEach((dom) => {
           // @ts-ignore      1是元素  3是文本节点
           if (dom.nodeType === 3) {
             let match = dom.data.match(reg);
@@ -115,11 +114,12 @@ export const highLightWord = ({
               match = currentDom.data.match(reg);
             }
           } else if (dom.nodeType === 1 && dom.childNodes) {
-            for (let i = 0; i < dom.childNodes.length; i++) {
+            for (let i = 0; i < dom.childNodes.length; i += 1) {
               i += highLightWord({ parentDom: dom.childNodes[i], keyWord });
             }
           }
         });
+      }
     }
   }
 };
@@ -130,22 +130,23 @@ export const unHighLight = ({
   nodeType = "span",
 }) => {
   const doms = parentDom.querySelectorAll(`${nodeType} .${className}`);
-  doms
-    && doms.forEach((dom) => {
+  if (doms) {
+    doms.forEach((dom) => {
       const { parentNode } = dom;
       const { firstChild } = dom;
       parentNode.replaceChild(firstChild, dom);
       parentNode.normalize();
     });
+  }
 };
 
 export const hexToRgba = (hex, opacity = 1) => (
   `rgba(${
-    parseInt(`0x${hex.slice(1, 3)}`)
+    parseInt(`0x${hex.slice(1, 3)}`, 16)
   },${
-    parseInt(`0x${hex.slice(3, 5)}`)
+    parseInt(`0x${hex.slice(3, 5)}`, 16)
   },${
-    parseInt(`0x${hex.slice(5, 7)}`)
+    parseInt(`0x${hex.slice(5, 7)}`, 16)
   },${
     opacity
   })`
@@ -163,13 +164,13 @@ export const getUrlForUserPage = (options) => {
     !configs.userId
     || isDD(true)
     || isFeishu(true)
-    || configs.userType == 2
+    || configs.userType === 2
   ) {
     return "";
   }
 
   const userInfo = window.BSGlobal.loginUserInfo;
-  if (configs.userId == undefined) {
+  if (configs.userId === undefined) {
     configs.userId = userInfo.Id;
   }
   const urlHost = window.BSGlobal.titaHost;
@@ -196,3 +197,30 @@ export const openPage = (url) => {
     window.open(url, "_blank");
   }
 };
+
+// html标签转义
+export function htmlEncodeToHtmlByRegExp(str) {
+  let temp = "";
+  if (str.length === 0) return "";
+  // temp = str.replace(/&/g, "&amp;")
+  temp = str.replace(/</g, "&lt;");
+  temp = temp.replace(/>/g, "&gt;");
+  // temp = temp.replace(/ /g, "&nbsp;")
+  temp = temp.replace(/'/g, "&#39;");
+  temp = temp.replace(/"/g, "&quot;");
+  temp = temp.replace(/\n/g, "<br/>");
+  return temp;
+}
+
+export function htmlDecodeByHtmlRegExp(str) {
+  let temp = "";
+  if (str.length === 0) return "";
+  temp = str.replace(/&amp;/g, "&");
+  temp = temp.replace(/&lt;/g, "<");
+  temp = temp.replace(/&gt;/g, ">");
+  temp = temp.replace(/&nbsp;/g, " ");
+  temp = temp.replace(/&#39;/g, "'");
+  temp = temp.replace(/&quot;/g, "\"");
+  temp = temp.replace(/<br\/>/g, "\n");
+  return temp;
+}

package/yarn-error.log

@@ -1,103 +0,0 @@
-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