@titaui/pc 1.9.87 → 1.9.88

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/index.d.ts

@@ -1,5 +1,6 @@
 interface Window {
   BSGlobal: any;
+  WeixinJSBridge?: any;
   Talent: any;
   trackAction?: (actionName?: string) => {};
   getLocale: Function;

package/src/index.js

@@ -20,6 +20,7 @@ export { default as ChangeOkrModal } from "./components/change-okr-modal";
 export { default as CreateOkrModal } from "./components/create-okr-modal";
 export { default as RangePickerPop } from "./components/range-picker-pop";
 export { default as DatePicker } from "./components/date-picker";
+export { default as DemoFree } from "./pages/demo-free";
 export { default as OkrMapPage } from "./pages/okr-map";
 export { default as OkrFlow } from "./components/okr-flow";
 export { default as DropSelector } from "./components/drop-selector";
@@ -87,4 +88,4 @@ export { default as requestApi } from "./utils/request";
 export { default as PointDemo } from "./components/point-demo";
 export { default as Scrollbar } from "./components/scrollbar";
 export { default as WeeklyReport } from "./components/weekly-report";
-export { default as UploadPhotoModal } from "./components/upload-photo-modal";
+export { default as tasUploadPhotoModal } from "./components/upload-photo-modal";

package/src/pages/demo-free/index.tsx

@@ -0,0 +1,15 @@
+import React, { FC } from "react";
+import ErrorBoundary from "../../components/error-boundary";
+import ERROR_LEVEL from "../../utils/error-level";
+
+const prefix = "dynamic-page";
+
+const DemoFree: FC = () => (
+  <ErrorBoundary errorLevel={ERROR_LEVEL.P0}>
+    <div className={prefix}>
+      <div />
+    </div>
+  </ErrorBoundary>
+);
+
+export default DemoFree;

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