@titaui/pc 1.9.86 → 1.9.87

package/src/components/change-okr-modal/Item.tsx

@@ -26,9 +26,41 @@ const colorMap = {
   4: "12,192,201",
 };
 
+const formatKeywordsFunc = (str: string, key: string) => {
+  const reg = new RegExp(`(${key})`, "g");
+  const newstr = str.replace(reg, `<span style="color: #2879ff;">${key}</span>`);
+  return newstr;
+};
+
+const unFormatKeywordsFunc = (str: string, key: string) => {
+  const regExpKey = `<span style="color: #2879ff;">${key}</span>`;
+  const reg = new RegExp(`(${regExpKey})`, "g");
+  const newstr = str.replace(reg, key);
+  return newstr;
+};
+
+const htmlToText = (text) => {
+  const div = document.createElement("div");
+  div.innerHTML = text;
+  const newtext = div.innerText || div.textContent;
+  return newtext;
+};
+
+const dealOkrData = (data: OkrData, keyWords: string) => {
+  const newData = data;
+  if (keyWords) {
+    newData.workName = formatKeywordsFunc(data.workName, keyWords);
+    newData.Krs = newData.Krs.map((item) => ({
+      ...item,
+      mileStoneName: formatKeywordsFunc(item.mileStoneName, keyWords),
+    }));
+  }
+  return data;
+};
 export default class Item extends PureComponent<Props, State> {
   // @ts-ignore
   isObjectiveRelevanceKr: boolean = window.BSGlobal.OkrAdvancedSetting.KRSetting.ObjectiveRelevanceKr;
+  // const {data,keywords} = props
 
   constructor(props: Props) {
     super(props);
@@ -45,19 +77,19 @@ export default class Item extends PureComponent<Props, State> {
     this.isExtend();
   }
 
-  onSelect = (e: any, data: any) => {
+  onSelect = (e: any, pdata: any) => {
     e.stopPropagation();
     e.nativeEvent.stopImmediatePropagation();
-    const { keywords } = this.props;
-    const unFormatData = { ...data };
+    const { keywords, onSelect, data } = this.props;
+    const unFormatData = { ...pdata };
     if (keywords) {
       if (unFormatData.workName) {
-        unFormatData.workName = this.unFormatKeywordsFunc(unFormatData.workName, keywords);
+        unFormatData.workName = unFormatKeywordsFunc(unFormatData.workName, keywords);
       } else {
-        unFormatData.mileStoneName = this.unFormatKeywordsFunc(unFormatData.mileStoneName, keywords);
+        unFormatData.mileStoneName = unFormatKeywordsFunc(unFormatData.mileStoneName, keywords);
       }
     }
-    this.props.onSelect({ selectData: unFormatData, okrInfo: this.props.data });
+    onSelect({ selectData: unFormatData, okrInfo: data });
   };
 
   // 判断是否展开KR
@@ -72,13 +104,6 @@ export default class Item extends PureComponent<Props, State> {
     }
   };
 
-  htmlToText = (text) => {
-    const div = document.createElement("div");
-    div.innerHTML = text;
-    const newtext = div.innerText || div.textContent;
-    return newtext;
-  };
-
   getCycleText = () => {
     const { data } = this.props;
     const hzNum = [
@@ -97,35 +122,48 @@ export default class Item extends PureComponent<Props, State> {
     }
   };
 
-  formatKeywordsFunc = (str: string, key: string) => {
-    const reg = new RegExp(`(${key})`, "g");
-    const newstr = str.replace(reg, `<span style="color: #2879ff;">${key}</span>`);
-    return newstr;
-  };
-
-  unFormatKeywordsFunc = (str: string, key: string) => {
-    const regExpKey = `<span style="color: #2879ff;">${key}</span>`;
-    const reg = new RegExp(`(${regExpKey})`, "g");
-    const newstr = str.replace(reg, key);
-    return newstr;
-  };
-
-  dealOkrData = (data: OkrData, keyWords: string) => {
-    const newData = data;
-    if (keyWords) {
-      newData.workName = this.formatKeywordsFunc(data.workName, keyWords);
-      newData.Krs.forEach((item) => {
-        item.mileStoneName = this.formatKeywordsFunc(item.mileStoneName, keyWords);
+  renderItemKr = () => {
+    const {
+      data, active, isShowKr, keywords,
+    } = this.props;
+    const okrData: any = dealOkrData(data, keywords);
+    if (okrData.Krs.length > 0) {
+      return okrData.Krs.map((item: any, index: number) => {
+        if (this.isObjectiveRelevanceKr) {
+          return (
+            <ItemTop key={item.mileStoneId}>
+              <Radio onClick={(e: any) => this.onSelect(e, data.Krs[index])} active={active && item.mileStoneId === (active.workId || active.mileStoneId)} />
+              <WorkNameWrapper isShowKr={isShowKr}>
+                <Tooltip placement="top" overlay={htmlToText(item.mileStoneName)}>
+                  <OkrName isKr isShowKr={isShowKr} dangerouslySetInnerHTML={{ __html: `KR${index + 1}：${item.mileStoneName}` }} />
+                </Tooltip>
+              </WorkNameWrapper>
+            </ItemTop>
+          );
+        } if (active && item.mileStoneId === (active.workId || active.mileStoneId)) {
+          return (
+            <ItemTop key={item.mileStoneId}>
+              <Radio onClick={(e: any) => this.onSelect(e, data.Krs[index])} active={active && item.mileStoneId === (active.workId || active.mileStoneId)} />
+              <WorkNameWrapper isShowKr={isShowKr}>
+                <Tooltip placement="top" overlay={htmlToText(item.mileStoneName)}>
+                  <OkrName isKr isShowKr={isShowKr} dangerouslySetInnerHTML={{ __html: `KR${index + 1}：${item.mileStoneName}` }} />
+                </Tooltip>
+              </WorkNameWrapper>
+            </ItemTop>
+          );
+        }
+        return "";
       });
     }
-    return data;
+    return <span />;
   };
 
-  okrData: any = this.dealOkrData(this.props.data, this.props.keywords);
-
   render() {
-    const { data, active, isShowKr } = this.props;
+    const {
+      data, active, isShowKr, keywords,
+    } = this.props;
     const { isExpand } = this.state;
+    const okrData: any = dealOkrData(data, keywords);
     return (
       <ItemWrapper>
         <ItemObjectiveContainer onClick={() => this.setState({ isExpand: !isExpand })}>
@@ -133,11 +171,11 @@ export default class Item extends PureComponent<Props, State> {
             <Radio onClick={(e: any) => this.onSelect(e, data)} active={active && data.workId === active.workId} />
             <Tag color={colorMap[data.cycleType] || colorMap[4]}>{this.getCycleText()}</Tag>
             <WorkNameWrapper isShowKr={isShowKr}>
-              <Tooltip placement="top" overlay={this.htmlToText(this.okrData.workName)}>
-                <OkrName isKr={false} isShowKr={isShowKr} dangerouslySetInnerHTML={{ __html: this.okrData.workName }} />
+              <Tooltip placement="top" overlay={htmlToText(okrData.workName)}>
+                <OkrName isKr={false} isShowKr={isShowKr} dangerouslySetInnerHTML={{ __html: okrData.workName }} />
               </Tooltip>
             </WorkNameWrapper>
-            {this.isObjectiveRelevanceKr && isShowKr && data.Krs.length > 0 && <span className={`${this.state.isExpand ? "tu-icon-arrow-up" : "tu-icon-arrow-down"}`} />}
+            {this.isObjectiveRelevanceKr && isShowKr && data.Krs.length > 0 && <span className={`${isExpand ? "tu-icon-arrow-up" : "tu-icon-arrow-down"}`} />}
           </ItemTop>
           <ItemBottom>
             {
@@ -162,14 +200,14 @@ export default class Item extends PureComponent<Props, State> {
           </ItemBottom>
         </ItemObjectiveContainer>
         {
-          isShowKr && (this.isObjectiveRelevanceKr || (!this.isObjectiveRelevanceKr && this.okrData.hasSub)) && (
+          isShowKr && (this.isObjectiveRelevanceKr || (!this.isObjectiveRelevanceKr && okrData.hasSub)) && (
             <ItemKrContainer className={`${isExpand ? "slideIn" : "slideOut"}`}>
-              {
-                this.okrData.Krs.length > 0 && this.okrData.Krs.map((item: any, index: number) => (this.isObjectiveRelevanceKr ? (
+              {/* {
+                okrData.Krs.length > 0 && okrData.Krs.map((item: any, index: number) => (this.isObjectiveRelevanceKr ? (
                   <ItemTop key={item.mileStoneId}>
                     <Radio onClick={(e: any) => this.onSelect(e, data.Krs[index])} active={active && item.mileStoneId === (active.workId || active.mileStoneId)} />
                     <WorkNameWrapper isShowKr={isShowKr}>
-                      <Tooltip placement="top" overlay={this.htmlToText(item.mileStoneName)}>
+                      <Tooltip placement="top" overlay={htmlToText(item.mileStoneName)}>
                         <OkrName isKr isShowKr={isShowKr} dangerouslySetInnerHTML={{ __html: `KR${index + 1}：${item.mileStoneName}` }} />
                       </Tooltip>
                     </WorkNameWrapper>
@@ -178,13 +216,14 @@ export default class Item extends PureComponent<Props, State> {
                   <ItemTop key={item.mileStoneId}>
                     <Radio onClick={(e: any) => this.onSelect(e, data.Krs[index])} active={active && item.mileStoneId === (active.workId || active.mileStoneId)} />
                     <WorkNameWrapper isShowKr={isShowKr}>
-                      <Tooltip placement="top" overlay={this.htmlToText(item.mileStoneName)}>
+                      <Tooltip placement="top" overlay={htmlToText(item.mileStoneName)}>
                         <OkrName isKr isShowKr={isShowKr} dangerouslySetInnerHTML={{ __html: `KR${index + 1}：${item.mileStoneName}` }} />
                       </Tooltip>
                     </WorkNameWrapper>
                   </ItemTop>
                 ) : ""))
-              }
+              } */}
+              {this.renderItemKr()}
             </ItemKrContainer>
           )
         }

package/src/components/okr-period-selector/select-cycle.tsx

@@ -66,6 +66,11 @@ export function CreateCycle({
   const [cycleSetting, setCycleSetting] = useState<any>();
 
   useEffect(() => {
+    const settings = localStorage.getItem("OKR_CYCLE_SETTING");
+    if (settings) {
+      setCycleSetting(JSON.parse(settings));
+      return;
+    }
     const url = getApiUrl("okr/cycleSetting");
     taker(url, "GET").then((res) => {
       if (res.Code == 1) {

package/src/pages/new-okr-list/init-cycle-setting.tsx

@@ -1,6 +1,6 @@
-import React, { useEffect, useState } from "react";
-import { getUserInfo } from "../../utils/bs-global";
-import { getCycleSetting } from "./request-api";
+import React, { useEffect, useState } from 'react'
+import { getUserInfo } from '../../utils/bs-global'
+import { getCycleSetting } from './request-api'
 
 function InitCycleSetting(props) {
   const { SetCycleModal } = props;
@@ -8,10 +8,13 @@ function InitCycleSetting(props) {
 
   useEffect(() => {
     if (
-      localStorage.getItem(`cycle_setting_stop_show${getUserInfo().Id}`)
-      == "true"
-    ) return;
+      localStorage.getItem(`cycle_setting_stop_show${getUserInfo().Id}`) ==
+      'true'
+    )
+      return
+    localStorage.removeItem("OKR_CYCLE_SETTING");
     getCycleSetting().then((res) => {
+      localStorage.setItem("OKR_CYCLE_SETTING", JSON.stringify(res?.Data || {}));
       const { hasSetting } = res.Data;
       if (!hasSetting) setVisible(true);
     });
@@ -21,7 +24,7 @@ function InitCycleSetting(props) {
     <SetCycleModal
       visible={visible}
       onCancel={() => setVisible(false)}
-      onRefresh={() => location.reload()}
+      onRefresh={() => window.location.reload()}
     />
   );
 }

package/src/pages/new-okr-list/request-api.ts

@@ -42,9 +42,6 @@ export const okrCrowd = async (param: ListParam) => {
 export const getOkrInfoWithListData = async function (okrId) {
   return rget("v1")(`okr/list/specificOkr?okrId=${okrId}`);
 };
-export const getOkrSetting = async function () {
-  return rget("v1")("okr/cycleSetting").then((res) => res.Data);
-};
 
 export const okrList = async (param: ListParam) => {
   const res = await rpost("v1")(`okr/list?toUserId=${param.toUserId}`, {
@@ -65,12 +62,15 @@ export const visitOkrCyclePag = async function (toUserId) {
 };
 
 export const getCycleSetting = async (): Promise<{
-  hasSetting: boolean;
-  isOpenCustom: boolean;
-  isOpenMonth: boolean;
-  isOpenQuarter: boolean;
-  isOpenYear: boolean;
-  isOpenBimonthly: boolean;
-  isOpenHalfYear: boolean;
-  yearStartMonth: number;
+  Code: number;
+  Data: {
+    hasSetting: boolean;
+    isOpenCustom: boolean;
+    isOpenMonth: boolean;
+    isOpenQuarter: boolean;
+    isOpenYear: boolean;
+    isOpenBimonthly: boolean;
+    isOpenHalfYear: boolean;
+    yearStartMonth: number;
+  }
 }> => rget("v1")("okr/cycleSetting");

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