@titaui/pc 1.9.86 → 1.9.90

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/menus/export-modules/demo-menus/index.tsx

@@ -0,0 +1,80 @@
+import React, { useState, useRef, useEffect } from "react";
+import classNames from "classnames";
+import { withRouter } from "react-router";
+// import { ResizeObserver } from '@juggle/resize-observer';
+// import ResizeObserver from "resize-observer-polyfill";
+import FlipCard, { flipRefIns } from "../../components/flip-menu-card";
+import MenuTree from "../../components/menu-tree";
+import Scrollbar from "../../../scrollbar";
+import DemoMenuData, { DemoMenusInt, defaultRefObject } from "./menus";
+import MenuHighlight from "./menu-highlight";
+import preCls from "../../precls";
+import { isEn } from "../../../../utils/getLocale";
+
+interface DemoMenusProps {
+  onSelect: (node: any) => void;
+  history: any;
+}
+const DemoMenus: React.FC<DemoMenusProps> = (props) => {
+  const { onSelect = () => { }, history } = props;
+
+  const menuRef = useRef<any>();
+  const okrMenusData = useRef<DemoMenusInt>(defaultRefObject);
+  const [selectedMenuKeys, setSelectedMenuKeys] = useState<string[]>([]);
+  const [expandedKeys, setExpandedKeys] = useState(["demofree"]);
+  const [menus] = useState(() => {
+    okrMenusData.current = new DemoMenuData();
+    return okrMenusData.current.getMenus();
+  });
+  const flipRef = useRef<flipRefIns>({
+    next: () => { },
+    goback: () => { },
+  });
+  const collapseMenu = (isHide) => {
+    if (isHide) {
+      menuRef.current.style.width = "0px";
+    } else {
+      menuRef.current.style.width = "";
+    }
+  };
+  const onExpandHandler = (expandKeys) => {
+    setExpandedKeys(expandKeys);
+  };
+  // 判断路由高亮菜单
+  useEffect(() => {
+    const menuHighlight = new MenuHighlight(history);
+    menuHighlight.highlight((menu) => setSelectedMenuKeys([menu]));
+  }, [
+    history.location.pathname,
+    history.location.search,
+  ]);
+
+  const onSelectHandler = (selectedKyes, { node }) => {
+    onSelect(node);
+    // 处理菜单选中
+    if (!selectedKyes.length) return;
+    setSelectedMenuKeys(selectedKyes);
+  };
+  return (
+    <div
+      ref={menuRef}
+      className={classNames(preCls, `${preCls}-appraisal-menus`)}
+    >
+      <FlipCard collapseMenu={collapseMenu} ref={flipRef} defaultWidth={isEn ? 210 : 180}>
+        <div className={classNames(`${preCls}-appraisal-menus-tree`)}>
+          <Scrollbar>
+            <MenuTree
+              data={menus}
+              selectedKeys={selectedMenuKeys}
+              expandedKeys={expandedKeys}
+              onExpand={onExpandHandler}
+              onSelect={onSelectHandler}
+            />
+          </Scrollbar>
+        </div>
+        <div />
+      </FlipCard>
+    </div>
+  );
+};
+export default withRouter(DemoMenus);

package/src/components/menus/export-modules/demo-menus/menu-highlight.ts

@@ -0,0 +1,53 @@
+import {
+  PAGE_UNASSIGNED_DEMOFREE,
+  PAGE_ASSIGNED_DEMOFREE,
+  PAGE_RESERVED_DEMOFREE,
+  PAGE_DONE_DEMOFREE,
+  PAGE_IGNORED_DEMOFREE,
+} from "./menus";
+
+export default class {
+  private history: any = null;
+
+  constructor(history: any) {
+    this.history = history;
+  }
+
+  highlight(cb) {
+    if (this.isUnAssigned()) cb(PAGE_UNASSIGNED_DEMOFREE);
+    else if (this.isAssigned()) cb(PAGE_ASSIGNED_DEMOFREE);
+    else if (this.isReserved()) cb(PAGE_RESERVED_DEMOFREE);
+    else if (this.isDone()) cb(PAGE_DONE_DEMOFREE);
+    else if (this.isIgnore()) cb(PAGE_IGNORED_DEMOFREE);
+  }
+
+  isUnAssigned() {
+    const { pathname, search } = this.history.location;
+    return pathname.match(/demofree/)
+      && (!search || search.match(/selected[\s]*?=[\s]*?unassigned/));
+  }
+
+  isAssigned() {
+    const { pathname, search } = this.history.location;
+    return pathname.match(/demofree/)
+      && search.match(/selected[\s]*?=[\s]*?assigned/);
+  }
+
+  isReserved() {
+    const { pathname, search } = this.history.location;
+    return pathname.match(/demofree/)
+      && search.match(/selected[\s]*?=[\s]*?reserved/);
+  }
+
+  isDone() {
+    const { pathname, search } = this.history.location;
+    return pathname.match(/demofree/)
+      && search.match(/selected[\s]*?=[\s]*?done/);
+  }
+
+  isIgnore() {
+    const { pathname, search } = this.history.location;
+    return pathname.match(/demofree/)
+      && search.match(/selected[\s]*?=[\s]*?ignore/);
+  }
+}

package/src/components/menus/export-modules/demo-menus/menus.tsx

@@ -0,0 +1,136 @@
+import { PARENT_MENU_NODE, SUB_MENU_ITEM_NOE } from "../../components/menu-tree/tree-node/index";
+
+interface TreeNode {
+  key: string;
+  title: string;
+  nodeType: string;
+  isLeaf: boolean;
+  data: any;
+  children?: TreeNode[];
+}
+export const defaultRefObject = {
+  menus: [],
+  getMenus: () => { },
+};
+export interface DemoMenusInt {
+  menus: any[];
+  getMenus: Function;
+}
+export const PAGE_UNASSIGNED_DEMOFREE = "unassigned";
+export const PAGE_ASSIGNED_DEMOFREE = "assigned";
+export const PAGE_RESERVED_DEMOFREE = "reserved";
+export const PAGE_DONE_DEMOFREE = "done";
+export const PAGE_IGNORED_DEMOFREE = "ignore";
+export default class DemoMenuData {
+  public menus;
+
+  public isManager;
+
+  constructor() {
+    this.isManager = localStorage.getItem("DEMO_USER_IS_MANAGER") === "1";
+    this.menus = [
+      {
+        icon: "kaohe",
+        label: "任务状态",
+        key: "demofree",
+        href: this.isManager ? "#/demofree/list?selected=unassigned" : "#/demofree/list?selected=assigned",
+        isShow: true,
+        children: [{
+          icon: "",
+          label: "未分配",
+          key: "unassigned",
+          href: "#/demofree/list?selected=unassigned",
+          isShow: this.isManager,
+        }, {
+          icon: "",
+          label: "已分配",
+          key: "assigned",
+          href: "#/demofree/list?selected=assigned",
+          isShow: true,
+        }, {
+          icon: "",
+          label: "已预约",
+          key: "reserved",
+          href: "#/demofree/list?selected=reserved",
+          isShow: true,
+        }, {
+          icon: "",
+          label: "已完成",
+          key: "done",
+          href: "#/demofree/list?selected=done",
+          isShow: true,
+        }, {
+          icon: "",
+          label: "已忽略",
+          key: "ignore",
+          href: "#/demofree/list?selected=ignore",
+          isShow: this.isManager,
+        }],
+      },
+      // {
+      //   icon: "KH-help",
+      //   label: "客户续费情况",
+      //   key: "custom",
+      //   href: "#/custom",
+      //   isShow: true,
+      //   type: MENU_ITEM_NOE,
+      //   children:[{
+      //     icon: "",
+      //     label: "未处理",
+      //     key: "ignore",
+      //     href: "#/demofree/custom?selected=未处理",
+      //     isShow: true,
+      //   },{
+      //     icon: "",
+      //     label: "待定",
+      //     key: "ignore",
+      //     href: "#/demofree/custom?selected=待定",
+      //     isShow: true,
+      //   },{
+      //     icon: "",
+      //     label: "已续费",
+      //     key: "ignore",
+      //     href: "#/demofree/custom?selected=已续费",
+      //     isShow: true,
+      //   },{
+      //     icon: "",
+      //     label: "未续费",
+      //     key: "ignore",
+      //     href: "#/demofree/custom?selected=未续费",
+      //     isShow: true,
+      //   }]
+      // },
+    ];
+  }
+
+  getMenus() {
+    const menus = this.formateToTreeNodeData(this.menus);
+    return menus;
+  }
+
+  formateToTreeNodeData(menus) {
+    const treeNodes: TreeNode[] = [];
+
+    for (let i = 0; i < menus.length; i += 1) {
+      const menu = menus[i];
+      const hasChildren = !!((menu.children && menu.children.length));
+      const isLeaf = menu.isLeaf !== undefined ? menu.isLeaf : !hasChildren;
+
+      let nodeType = menu.type;
+      if (!nodeType) nodeType = !isLeaf ? PARENT_MENU_NODE : SUB_MENU_ITEM_NOE;
+
+      if (menu.isShow) {
+        treeNodes.push({
+          key: `${menu.key}`,
+          title: menu.label,
+          data: menu,
+          isLeaf,
+          children: this.formateToTreeNodeData(menu.children || []),
+          nodeType,
+        });
+      }
+    }
+
+    return treeNodes;
+  }
+}

package/src/components/menus/index.tsx

@@ -4,19 +4,22 @@ import OkrMenus from "./export-modules/okr-menus";
 import AppraisalMenus from "./export-modules/appraisal-menus";
 import ManageMenus from "./export-modules/manage-menus";
 import "./index.scss";
+import DemoMenus from "./export-modules/demo-menus";
 
 const preCls = "titaui-menus";
 
-export default function (props) {
+const Menus = (props: any) => {
   const { type, ...restProps } = props;
 
   const renderMenuByType = () => {
-    if (type == "okr") {
+    if (type === "okr") {
       return <OkrMenus {...restProps} />;
-    } if (type == "appraisal") {
+    } if (type === "appraisal") {
       return <AppraisalMenus {...restProps} />;
-    } if (type == "manage") {
+    } if (type === "manage") {
       return <ManageMenus {...restProps} />;
+    } if (type === "demofree") {
+      return <DemoMenus {...restProps} />;
     }
     return undefined;
   };
@@ -26,4 +29,5 @@ export default function (props) {
       {renderMenuByType()}
     </div>
   );
-}
+};
+export default Menus;

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

@@ -18,3 +18,27 @@ export const getVersionTextMap = () => ({
   [Versions.Professional]: getLocale("Sw_OKREdit"),
   [Versions.Flagship]: getLocale("Sw_Flagship"),
 });
+
+export const DEMO_FREE_MENU_CONFIG = {
+  DataSource: null,
+  appCode: null,
+  appId: 119,
+  children: [],
+  code: "",
+  color: "#F28D49",
+  defaultExpand: false,
+  domain: "",
+  groupId: 0,
+  href: "#demofree/list?selected=assigned",
+  iconName: "",
+  id: 99998,
+  labelName: null,
+  menuPoint: null,
+  orderId: 2000,
+  originUrl: null,
+  signUrl: "",
+  status: 0,
+  tenantId: 0,
+  title: "demofree",
+  type: "hash",
+};

package/src/components/nav-top/index.tsx

@@ -25,12 +25,10 @@ const NavTop: FC = () => {
   const versionInfo = getBSGlobal("tenantAuthentication");
   const [activeMenuId, setActiveMenuId] = useState(-1);
   const ua = navigator.userAgent.toLowerCase();
-  const showWxInvite = getTenantInfo().mainCorpId && ua.indexOf("micromessenger") != -1;
+  const showWxInvite = getTenantInfo().mainCorpId && ua.indexOf("micromessenger") !== -1;
   const openWxInvite = useCallback(() => {
-    // @ts-ignore
-    WeixinJSBridge
-      // @ts-ignore
-      && WeixinJSBridge.invoke(
+    if (window.WeixinJSBridge !== undefined) {
+      window.WeixinJSBridge.invoke(
         "selectPrivilegedContact",
         {
           fromDepartmentId: -1, // 必填，表示打开的通讯录从指定的部门开始展示，-1表示自己所在部门开始, 0表示从最上层开始
@@ -40,7 +38,7 @@ const NavTop: FC = () => {
           // "selectedTickets"["ticket1","ticket2"] // 非必填，已选ticket列表。single模式忽略该参数
         },
         (res) => {
-          if (res.err_msg == "selectPrivilegedContact:ok") {
+          if (res.err_msg === "selectPrivilegedContact:ok") {
             // var selectedUserList = res.result.userList; // 已选的成员列表
             // for (var i = 0; i < selectedUserList.length; i++) {
             //   var openUserId = selectedUserList[i].openUserId; //成员openUserId
@@ -52,7 +50,7 @@ const NavTop: FC = () => {
               .then(() => {
                 Toast.Success("邀请成功");
               })
-              .catch((e) => {
+              .catch(() => {
                 Toast.Error("邀请失败");
               });
           } else {
@@ -60,10 +58,11 @@ const NavTop: FC = () => {
           }
         },
       );
+    }
   }, []);
 
   const handleHashChange = () => {
-    const hash = location.hash.split("?")[0] || "";
+    const hash = window.location.hash.split("?")[0] || "";
     if (hash) {
       const activeMenu = menu.find((item) => hash.includes(item.href.split("#")?.[1]?.split("?")[0]));
       if (hash.includes("homepage")) {
@@ -94,6 +93,7 @@ const NavTop: FC = () => {
         href={hasOKRApp ? "#homepage" : ""}
       >
         <img
+          alt="logo"
           src={Logo}
           className={classNames(`${preCls}__left-logo`, {
             [`${preCls}__left-logo--hover`]: hasOKRApp,
@@ -102,11 +102,12 @@ const NavTop: FC = () => {
         {hasOKRApp && (
           <span
             className={classNames(`${preCls}__left-home`, {
-              [`${preCls}__left-home--active`]: activeMenuId == 99999,
+              [`${preCls}__left-home--active`]: activeMenuId === 99999,
               [`${preCls}__left-home--hover`]: hasOKRApp,
             })}
           >
             <img
+              alt="home-img"
               src={Home}
               className={classNames(`${preCls}__left-home-img`)}
             />

package/src/components/nav-top/request.apis.ts

@@ -2,13 +2,13 @@ import axios from "axios";
 import { rget, rdelete } from "../../utils/request";
 
 // @ts-ignore
-const tenantId = (BSGlobal && BSGlobal.tenantInfo.Id) || 0;
+const tenantId = (window.BSGlobal && window.BSGlobal.tenantInfo.Id) || 0;
 // @ts-ignore
-const userId = (BSGlobal && BSGlobal.loginUserInfo.Id) || 0;
+const userId = (window.BSGlobal && window.BSGlobal.loginUserInfo.Id) || 0;
 
 const requestDomain = () => {
   if (!window.location.hostname.match(/dev/)) return "";
-  return `${location.protocol}//www.tita.gift`;
+  return `${window.location.protocol}//www.tita.gift`;
 };
 
 export const getTodos = (pageNum) => rget("v1")(
@@ -43,8 +43,8 @@ export const getMessages = () => {
     )
     .then((resp: any) => {
       if (resp.code === 401) {
-        location.href = "/Account/Logout";
-        return;
+        window.location.href = "/Account/Logout";
+        return undefined;
       }
       return resp.data;
     })

package/src/components/nav-top/utils.ts

@@ -4,7 +4,7 @@ import defaultLogo from "./images/logo-white.png";
 
 export const getMenus = () => {
   // @ts-ignore
-  const navs: INavType[] = BSGlobal.newNavigation;
+  const navs: INavType[] = window.BSGlobal.newNavigation;
   navs.sort((pre, next) => pre.orderId - next.orderId);
   return navs;
 };
@@ -12,5 +12,18 @@ export const getMenus = () => {
 export const getLogo = () => {
   // 232637ab8a674427a1d6489329035d86_n 是老logo的路径，没法判断是否用户自定义过，所以只能这么硬核
   const tenantInfo = getTenantInfo();
-  return tenantInfo.isNewIndex && /232637ab8a674427a1d6489329035d86_n/g.test(tenantInfo.Logo) || !tenantInfo.Logo ? defaultLogo : tenantInfo.Logo;
+  return ((tenantInfo.isNewIndex && /232637ab8a674427a1d6489329035d86_n/g.test(tenantInfo.Logo)) || !tenantInfo.Logo) ? defaultLogo : tenantInfo.Logo;
+};
+
+export const transMetasToTableData = (dataSource = []) => {
+  const listData: any = [];
+  dataSource.forEach((dataItem: any) => {
+    const data = {};
+    dataItem.forEach((field) => {
+      const { name, value } = field;
+      data[name] = value;
+    });
+    listData.push(data);
+  });
+  return listData;
 };

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) {