@titaui/pc 1.9.49 → 1.9.50

package/src/components/menus/export-modules/okr-menus/menus.ts

@@ -1,5 +1,5 @@
-import { BaseAuth } from "../../../../utils/auth";
-import { locale } from "../../i18n";
+import { BaseAuth } from '../../../../utils/auth';
+import { locale } from '../../i18n';
 import {
   USER_CONCERN_NODE,
   COMPANY_ALL_NODE,
@@ -11,9 +11,9 @@ import {
   FOLLOWER_NODE,
   NO_SUBORDINATES_NODE,
   GROUP_NAME_NODE,
-  MENU_ITEM_NOE,
-} from "../../components/menu-tree/tree-node/index";
-import { isLocal } from "../../../../utils/helpers";
+  MENU_ITEM_NOE
+} from '../../components/menu-tree/tree-node/index';
+import { isLocal } from '../../../../utils/helpers';
 import { getLocale } from "../../../../utils/getLocale";
 
 interface TreeNode {
@@ -41,40 +41,38 @@ export interface OkrMenusInt {
 }
 
 export const defaultRefObject = {
-  menus: [],
-  insertConcern: () => { },
-  insertSubordinates: () => { },
-  getMenus: () => { },
-  setConcernLoading: () => { },
-  setSubordinatesLoading: () => { },
-  addConcerner: () => { },
-  removeConcerner: () => { },
+  'menus': [],
+  'insertConcern': () => { },
+  'insertSubordinates': () => { },
+  'getMenus': () => { },
+  'setConcernLoading': () => { },
+  'setSubordinatesLoading': () => { },
+  'addConcerner': () => { },
+  'removeConcerner': () => { },
   // 'showSubordinateMenu': () => { },
-  USERCONCERN: "",
-  SUBORDINATES: "",
-  MYOKR: "",
-};
+  'USERCONCERN': '',
+  'SUBORDINATES': '',
+  'MYOKR': '',
+}
 
-export const PAGE_MY_OWNER_OKR = "myownerokr";
-export const PAGE_MY_PART_OKR = "mypartokr";
-export const PAGE_MY_TARGET_OKR = "mytargetokr";
-export const PAGE_OKR_MAP = "map";
-export const PAGE_OKR_DASHBOARD = "panzi";
-export const PAGE_OKR_FUNCTION = "panel";
-export const PAGE_OKR_CASES = "cases";
+export const PAGE_MY_OWNER_OKR = 'myownerokr';
+export const PAGE_MY_PART_OKR = 'mypartokr';
+export const PAGE_MY_TARGET_OKR = 'mytargetokr';
+export const PAGE_OKR_MAP = 'map';
+export const PAGE_OKR_DASHBOARD = 'panzi';
+export const PAGE_OKR_FUNCTION = 'panel';
+export const PAGE_OKR_CASES = 'cases';
 
 export default class okrMenus {
-  public menus;
 
+  public menus;
   public COMPANYALL = COMPANY_ALL_NODE;
-
   public USERCONCERN = USER_CONCERN_NODE;
-
-  public MYOKR = "myokr";
-
-  public SUBORDINATES = "subordinates";
+  public MYOKR = 'myokr';
+  public SUBORDINATES = 'subordinates';
 
   constructor() {
+
     let hasDashboardAuth = false;
     const baseAuth = new BaseAuth();
     if (baseAuth.isBoss() || baseAuth.isManager() || baseAuth.isDepartmentLeader()) {
@@ -82,81 +80,81 @@ export default class okrMenus {
     }
 
     this.menus = [{
-      icon: "okr",
-      label: locale.menu_myokr,
-      key: this.MYOKR,
-      href: "",
-      children: [{
-        icon: "",
-        label: locale.menu_responsible,
-        key: PAGE_MY_OWNER_OKR,
-        href: "#/okr/manage?relation=1",
+      'icon': 'okr',
+      'label': locale.menu_myokr,
+      'key': this.MYOKR,
+      'href': '',
+      'children': [{
+        'icon': '',
+        'label': locale.menu_responsible,
+        'key': PAGE_MY_OWNER_OKR,
+        'href': '#/okr/manage?relation=1',
       }, {
-        icon: "",
-        label: locale.menu_participated,
-        key: PAGE_MY_PART_OKR,
-        href: "#/okr/manage?relation=2",
+        'icon': '',
+        'label': locale.menu_participated,
+        'key': PAGE_MY_PART_OKR,
+        'href': '#/okr/manage?relation=2',
       }, {
-        icon: "",
-        label: locale.menu_concerned,
-        key: PAGE_MY_TARGET_OKR,
-        href: "#/okr/manage?relation=3",
-      }],
+        'icon': '',
+        'label': locale.menu_concerned,
+        'key': PAGE_MY_TARGET_OKR,
+        'href': '#/okr/manage?relation=3',
+      }]
     }, {
-      icon: "caidan-xiashu",
-      label: locale.menu_subordinate,
-      key: this.SUBORDINATES,
-      isLeaf: false,
-      children: [],
-      href: "",
-      isShow: window.BSGlobal.loginUserInfo.HasSub,
+      'icon': 'caidan-xiashu',
+      'label': locale.menu_subordinate,
+      'key': this.SUBORDINATES,
+      'isLeaf': false,
+      'children': [],
+      'href': '',
+      'isShow': window.BSGlobal.loginUserInfo.HasSub
     }, {
-      icon: "guanzhu",
-      label: locale.menu_concerned_user,
-      key: this.USERCONCERN,
-      type: this.USERCONCERN,
-      isLeaf: false,
-      children: [],
-      href: "",
+      'icon': 'guanzhu',
+      'label': locale.menu_concerned_user,
+      'key': this.USERCONCERN,
+      'type': this.USERCONCERN,
+      'isLeaf': false,
+      'children': [],
+      'href': ''
     }, {
-      icon: "okr-gongsi-m",
-      label: locale.menu_alldeparment,
-      key: this.COMPANYALL,
-      type: this.COMPANYALL,
-      href: "",
+      'icon': 'okr-gongsi-m',
+      'label': locale.menu_alldeparment,
+      'key': this.COMPANYALL,
+      'type': this.COMPANYALL,
+      'href': '',
     }, {
-      icon: "",
-      label: locale.menu_other,
-      key: "other",
-      type: GROUP_NAME_NODE,
-      href: "",
+      'icon': '',
+      'label': locale.menu_other,
+      'key': 'other',
+      'type': GROUP_NAME_NODE,
+      'href': '',
     }, {
-      icon: "ditu",
-      label: locale.menu_okrmap,
-      key: PAGE_OKR_MAP,
-      type: MENU_ITEM_NOE,
-      href: "#/okr/map",
+      'icon': 'ditu',
+      'label': locale.menu_okrmap,
+      'key': PAGE_OKR_MAP,
+      'type': MENU_ITEM_NOE,
+      'href': '#/okr/map',
     }, {
-      icon: "panel",
-      label: locale.menu_okr_working_method,
-      type: MENU_ITEM_NOE,
-      key: PAGE_OKR_FUNCTION,
-      href: "#/okr/panel",
+      'icon': 'panel',
+      'label': locale.menu_okr_working_method,
+      'type': MENU_ITEM_NOE,
+      'key': PAGE_OKR_FUNCTION,
+      'href': '#/okr/panel',
     }, {
-      icon: "yibiao",
-      label: locale.menu_okrdashboard,
-      key: PAGE_OKR_DASHBOARD,
-      type: MENU_ITEM_NOE,
-      href: "#/okr/chart?iTalentFrameType=iframe&iTalentFrame=%2F%2Fwww.tita.gift%2Fmenuroute%3FmenuId%3D44269%26roleId%3D",
-      isShow: hasDashboardAuth,
+      'icon': 'yibiao',
+      'label': locale.menu_okrdashboard,
+      'key': PAGE_OKR_DASHBOARD,
+      'type': MENU_ITEM_NOE,
+      'href': '#/okr/chart?iTalentFrameType=iframe&iTalentFrame=%2F%2Fwww.tita.gift%2Fmenuroute%3FmenuId%3D44269%26roleId%3D',
+      'isShow': hasDashboardAuth,
     }, {
-      icon: "cases",
-      label: locale.menu_okrcases,
-      type: MENU_ITEM_NOE,
-      key: PAGE_OKR_CASES,
-      href: "#/okr/cases",
-      isShow: !isLocal(),
-    }];
+      'icon': 'cases',
+      'label': locale.menu_okrcases,
+      'type': MENU_ITEM_NOE,
+      'key': PAGE_OKR_CASES,
+      'href': '#/okr/cases',
+      'isShow': !isLocal(),
+    }]
   }
 
   // showSubordinateMenu() {
@@ -180,13 +178,13 @@ export default class okrMenus {
     this.menus[2].children = [];
     if (loading) {
       this.menus[2].children.push({
-        icon: "",
-        label: "loading",
-        key: "loading-concern",
-        type: LOADING_NODE,
-        href: "",
-        data: {},
-      });
+        'icon': '',
+        'label': 'loading',
+        'key': `loading-concern`,
+        'type': LOADING_NODE,
+        'href': '',
+        'data': {}
+      })
     }
   }
 
@@ -194,13 +192,13 @@ export default class okrMenus {
     this.menus[1].children = [];
     if (loading) {
       this.menus[1].children.push({
-        icon: "",
-        label: "loading",
-        key: "loading-subordinates",
-        type: LOADING_NODE,
-        href: "",
-        data: {},
-      });
+        'icon': '',
+        'label': 'loading',
+        'key': `loading-subordinates`,
+        'type': LOADING_NODE,
+        'href': '',
+        'data': {}
+      })
     }
   }
 
@@ -217,13 +215,13 @@ export default class okrMenus {
       const user = users[i];
       if (this.checkConcernExist(user)) continue;
       treeNodeUsers.push({
-        icon: "",
-        label: user.name,
-        key: `concern-${user.userId}`,
-        type: FOLLOWER_NODE,
-        href: "",
-        data: user,
-      });
+        'icon': '',
+        'label': user.name,
+        'key': `concern-${user.userId}`,
+        'type': FOLLOWER_NODE,
+        'href': '',
+        'data': user
+      })
     }
 
     this.menus[2].children = this.menus[2].children.concat(treeNodeUsers);
@@ -233,32 +231,32 @@ export default class okrMenus {
     this.menus[2].children = [];
     if (empty) {
       this.menus[2].children.push({
-        icon: "",
-        label: "empty-concerners",
-        key: "empty-concerners",
-        type: NO_FOLLOWER_NODE,
-        href: "",
-        data: {},
-      });
+        'icon': '',
+        'label': 'empty-concerners',
+        'key': `empty-concerners`,
+        'type': NO_FOLLOWER_NODE,
+        'href': '',
+        'data': {}
+      })
     }
   }
 
   addConcerner(user) {
-    if (this.menus[2].children.length && this.menus[2].children[0].key == "empty-concerners") {
+    if (this.menus[2].children.length && this.menus[2].children[0].key == 'empty-concerners') {
       this.menus[2].children = [];
     }
     this.menus[2].children.push({
-      icon: "",
-      label: user.name,
-      key: `concern-${user.userId}`,
-      type: FOLLOWER_NODE,
-      href: "",
-      data: user,
-    });
+      'icon': '',
+      'label': user.name,
+      'key': `concern-${user.userId}`,
+      'type': FOLLOWER_NODE,
+      'href': '',
+      'data': user
+    })
   }
 
   removeConcerner(user) {
-    const newChildren = [...this.menus[2].children].filter((it) => it.key != `concern-${user.userId}`);
+    const newChildren = [...this.menus[2].children].filter(it => it.key != `concern-${user.userId}`);
     if (!newChildren.length) {
       this.setEmptyConcerners(true);
     } else {
@@ -269,33 +267,33 @@ export default class okrMenus {
   insertSubordinates(users) {
     if (!users || !users.length) {
       this.menus[1].children = [{
-        icon: "",
-        label: "empty-subordinates",
-        key: "empty-subordinates",
-        type: NO_SUBORDINATES_NODE,
-        href: "",
-        data: {},
-      }];
+        'icon': '',
+        'label': 'empty-subordinates',
+        'key': `empty-subordinates`,
+        'type': NO_SUBORDINATES_NODE,
+        'href': '',
+        'data': {}
+      }]
       return;
     }
     const treeNodeUsers: any = [];
     for (let i = 0; i < users.length; i++) {
       const user = users[i];
       treeNodeUsers.push({
-        icon: "",
-        label: user.name,
-        key: `${user.userId}`,
-        type: USER_NODE,
-        href: "",
-        data: user,
-      });
+        'icon': '',
+        'label': user.name,
+        'key': `${user.userId}`,
+        'type': USER_NODE,
+        'href': '',
+        'data': user
+      })
     }
     this.menus[1].children = treeNodeUsers;
   }
 
   getMenus() {
     const menus = this.formateToTreeNodeData(
-      this.menus.filter((it) => (it.isShow === undefined || it.isShow == true)),
+      this.menus.filter(it => (it.isShow === undefined || it.isShow == true))
     );
     return menus;
   }
@@ -306,20 +304,20 @@ export default class okrMenus {
     for (let i = 0; i < menus.length; i++) {
       const menu = menus[i];
 
-      const hasChildren = !!((menu.children && menu.children.length));
+      const hasChildren = (menu.children && menu.children.length) ? true : false;
       const isLeaf = menu.isLeaf !== undefined ? menu.isLeaf : !hasChildren;
 
       let nodeType = menu.type;
       if (!nodeType) nodeType = !isLeaf ? PARENT_MENU_NODE : SUB_MENU_ITEM_NOE;
 
       treeNodes.push({
-        key: `${menu.key}`,
-        title: getLocale(menu.label) ? getLocale(menu.label) : menu.label,
-        data: menu.data || menu,
-        isLeaf,
-        children: this.formateToTreeNodeData(menu.children || [], level + 1, menu.key),
+        'key': `${menu.key}`,
+        'title': getLocale(menu.label) ? getLocale(menu.label) : menu.label,
+        'data': menu.data || menu,
+        'isLeaf': isLeaf,
+        'children': this.formateToTreeNodeData(menu.children || [], level + 1, menu.key),
         nodeType,
-      });
+      })
     }
     return treeNodes;
   }

package/src/components/menus/export-modules/okr-menus/okr-front-menus.tsx

@@ -1,16 +1,14 @@
-import React, {
-  useState, useRef, useEffect, forwardRef, useImperativeHandle,
-} from "react";
+import React, { useState, useRef, useEffect, forwardRef, useImperativeHandle } from "react";
 // import classNames from "classnames";
 // import { ResizeObserver } from '@juggle/resize-observer';
-import ResizeObserver from "resize-observer-polyfill";
+import ResizeObserver from 'resize-observer-polyfill';
 import { flipRefIns } from "../../components/flip-menu-card";
-import Scrollbar from "../../../scrollbar";
+import Scrollbar from '../../../scrollbar';
 import MenuTree from "../../components/menu-tree";
-import { USER_NODE, FOLLOWER_NODE } from "../../components/menu-tree/tree-node/index";
+import { USER_NODE, FOLLOWER_NODE } from '../../components/menu-tree/tree-node/index';
 import OkrMenusData, { OkrMenusInt, defaultRefObject } from "./menus";
 import { OkrMenusContext } from "../../context";
-import MenuHighlight from "./menu-highlight";
+import MenuHighlight from './menu-highlight';
 import {
   getFollowerList,
   getSubordinates,
@@ -30,11 +28,13 @@ interface Props {
 export default forwardRef((props: Props, ref) => {
   const {
     onSelect = () => { },
-    history,
+    history
   } = props;
 
-  const [maxHeight, setMaxHeight] = useState<number>(() => document.body.offsetHeight - 198);
-  const [expandedKeys, setExpandedKeys] = useState(["myokr"]);
+  const [maxHeight, setMaxHeight] = useState<number>(() => {
+    return document.body.offsetHeight - 198;
+  });
+  const [expandedKeys, setExpandedKeys] = useState(['myokr']);
   const [selectedMenuKeys, setSelectedMenuKeys] = useState<string[]>([]);
 
   const flipRef = useRef<flipRefIns>({
@@ -51,16 +51,16 @@ export default forwardRef((props: Props, ref) => {
   // 判断路由高亮菜单
   useEffect(() => {
     const menuHighlight = new MenuHighlight(history);
-    menuHighlight.highlight((menu) => changeHighlightMenu([menu]));
+    menuHighlight.highlight(menu => changeHighlightMenu([menu]));
   }, [
     history.location.pathname,
-    history.location.search,
+    history.location.search
   ]);
 
   const changeHighlightMenu = (menuKeys: string[]) => {
     setSelectedMenuKeys(menuKeys);
     flipRef.current.goback();
-  };
+  }
 
   const onSelectHandler = (selectedKyes, { node }) => {
     const { nodeType, data } = node;
@@ -71,63 +71,69 @@ export default forwardRef((props: Props, ref) => {
     // 处理菜单选中
     if (!selectedKyes.length) return;
     setSelectedMenuKeys(selectedKyes);
-  };
+  }
 
   // 获取关注的人数据列表
-  const getConcerners = () => new Promise((resolve, reject) => {
-    const mdata = okrMenusData.current;
-    // 初始化 Loading
-    mdata.setConcernLoading(true);
-    setMenus(mdata.getMenus());
-    resolve(true);
-    // 获取数据
-    getFollowerList()
-      .then((user) => {
-        mdata.setConcernLoading(false);
-        mdata.insertConcern(user);
-        setMenus(mdata.getMenus());
-      })
-      .catch(reject);
-  });
+  const getConcerners = () => {
+    return new Promise((resolve, reject) => {
+      const mdata = okrMenusData.current;
+      // 初始化 Loading
+      mdata.setConcernLoading(true);
+      setMenus(mdata.getMenus());
+      resolve(true);
+      // 获取数据
+      getFollowerList()
+        .then((user) => {
+          mdata.setConcernLoading(false);
+          mdata.insertConcern(user);
+          setMenus(mdata.getMenus());
+        })
+        .catch(reject);
+    });
+  };
 
   // 获取下属OKR数据列表
-  const getSubordinaters = () => new Promise((resolve, reject) => {
-    const mdata = okrMenusData.current;
-    // 初始化 Loading
-    mdata.setSubordinatesLoading(true);
-    setMenus(mdata.getMenus());
-    resolve(true);
-    // 获取数据
-    getSubordinates(
-      { relationIds: "1,2" },
-      { disabledDottedSubordinatesDig: true },
-    ).then((users) => {
-      mdata.setSubordinatesLoading(false);
-      mdata.insertSubordinates(users);
+  const getSubordinaters = () => {
+    return new Promise((resolve, reject) => {
+      const mdata = okrMenusData.current;
+      // 初始化 Loading
+      mdata.setSubordinatesLoading(true);
       setMenus(mdata.getMenus());
       resolve(true);
-    }).catch(reject);
-  });
+      // 获取数据
+      getSubordinates(
+        { 'relationIds': "1,2" },
+        { 'disabledDottedSubordinatesDig': true }
+      ).then(users => {
+        mdata.setSubordinatesLoading(false);
+        mdata.insertSubordinates(users);
+        setMenus(mdata.getMenus());
+        resolve(true);
+      }).catch(reject);
+    });
+  };
 
-  const onLoadTreeNodeDataHandler = (treeNode) => new Promise((resolve) => {
-    if (treeNode.key == okrMenusData.current.MYOKR) {
-      resolve(true);
-    } else if (treeNode.key == okrMenusData.current.USERCONCERN) {
-      getConcerners()
-        .then(() => resolve(true))
-        .catch(() => resolve(true));
-    } else if (treeNode.key == okrMenusData.current.SUBORDINATES) {
-      getSubordinaters()
-        .then(() => resolve(true))
-        .catch(() => resolve(true));
-    } else {
-      resolve(true);
-    }
-  });
+  const onLoadTreeNodeDataHandler = (treeNode) => {
+    return new Promise((resolve) => {
+      if (treeNode.key == okrMenusData.current.MYOKR) {
+        resolve(true);
+      } else if (treeNode.key == okrMenusData.current.USERCONCERN) {
+        getConcerners()
+          .then(() => resolve(true))
+          .catch(() => resolve(true));
+      } else if (treeNode.key == okrMenusData.current.SUBORDINATES) {
+        getSubordinaters()
+          .then(() => resolve(true))
+          .catch(() => resolve(true));
+      } else {
+        resolve(true);
+      }
+    });
+  };
 
   const onExpandHandler = (expandKeys, { expanded, node }) => {
     setExpandedKeys(expandKeys);
-  };
+  }
 
   const onAddConcerner = (user) => {
     const mdata = okrMenusData.current;
@@ -146,21 +152,21 @@ export default forwardRef((props: Props, ref) => {
   };
 
   useImperativeHandle(ref, () => ({
-    setSelectedMenuKeys,
-  }));
+    setSelectedMenuKeys
+  }))
 
   useEffect(() => {
-    const obs = new ResizeObserver((entries) => {
-      for (const entry of entries) {
+    const obs = new ResizeObserver(entries => {
+      for (let entry of entries) {
         const cr = entry.contentRect;
         setMaxHeight(cr.height - 198);
       }
-    });
+    })
     obs.observe(document.body);
     return () => {
       obs.unobserve(document.body);
-    };
-  }, []);
+    }
+  }, [])
 
   return (
     <OkrMenusContext.Provider
@@ -180,5 +186,5 @@ export default forwardRef((props: Props, ref) => {
         />
       </Scrollbar>
     </OkrMenusContext.Provider>
-  );
-});
+  )
+})

package/src/components/menus/export-modules/okr-menus/subordinate-menus/helper.ts

@@ -1,20 +1,21 @@
 import { ITreeNode } from "../../../types";
-import { USER_NODE } from "../../../components/menu-tree/tree-node/index";
+import { USER_NODE } from '../../../components/menu-tree/tree-node/index'
 
 export const transToTreeNode = (data) => {
-  const res: ITreeNode[] = [];
-  data.forEach((user) => {
-    const node: any = {
-      id: user.userId,
-      title: user.name,
-      key: `${user.userId}`,
-      nodeType: USER_NODE,
-      data: user,
-      isLeaf: !user.hasSubordinates,
-      isFlip: false,
-      pid: user.managerId,
+  let res: ITreeNode[] = [];
+  data.forEach(user => {
+    let node: any = {
+      'id': user.userId,
+      'title': user.name,
+      'key': `${user.userId}`,
+      'nodeType': USER_NODE,
+      'data': user,
+      'isLeaf': !user.hasSubordinates,
+      'isFlip': false,
+      'pid': user.managerId
     };
     res.push(node);
   });
   return res;
-};
+}
+