@titaui/pc 1.9.77 → 1.9.82

package/src/components/change-okr-modal/styledComponents.ts

@@ -3,7 +3,7 @@ import styled from "styled-components";
 export const Wrapper = styled.div`
   width: 589px;
   height: 488px;
-  margin-top: ${(p: any) => (p.okrPopType == 1 ? 0 : "32px")};
+  margin-top: ${(p: any) => (p.okrPopType === 1 ? 0 : "32px")};
   background: #ffffff;
   box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.2);
   border-radius: 4px;
@@ -230,11 +230,17 @@ export const Tag = styled.div`
   margin: 0 12px 0 9px;
 `;
 export const OkrName = styled.span`
+  display: inline-block
   flex: 1;
-  width: 0;
+  max-width: 400px;
   font-size: 13px;
   font-weight: ${(p: any) => (p.isShowKr ? "normal" : "600")};
   color: #33383d;
+  white-space: nowrap;
+  overflow: hidden;
+  word-break: keep-all;
+  text-overflow: ellipsis;
+  line-height: 1;
 `;
 export const ItemBottom = styled.div`
   padding-left: 102px;
@@ -274,14 +280,14 @@ export const Button = styled.a`
   padding: 0 15px;
   box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.21);
   border-radius: 2px;
-  background-color: ${(p: any) => (p.type != "confirm" ? "#FAFBFC" : p.disabled ? "#E7EEF3" : "#2879FF")};
-  color: ${(p: any) => (p.type != "confirm" ? "#565E66" : "#FFF")};
+  background-color: ${(p: any) => (p.type !== "confirm" ? "#FAFBFC" : p.disabled ? "#E7EEF3" : "#2879FF")};
+  color: ${(p: any) => (p.type !== "confirm" ? "#565E66" : "#FFF")};
   cursor: pointer;
   text-align: center;
   white-space: nowrap;
   line-height: 27px;
   &:hover {
-    color: ${(p: any) => (p.type != "confirm" ? "#565E66" : "#FFF")};
+    color: ${(p: any) => (p.type !== "confirm" ? "#565E66" : "#FFF")};
   }
 `;
 export const KrItemWrapper = styled.div`

package/src/components/okr-flow/export-modal/index.tsx

@@ -1,5 +1,5 @@
 import React, {
-  useState, useEffect, useRef, Fragment,
+  useState, useEffect, useRef, FC,
 } from "react";
 import classNames from "classnames";
 import Html2Canvas from "html2canvas";
@@ -25,7 +25,7 @@ interface IProps {
   showkr: boolean;
 }
 
-function ExportMapModal(props: IProps) {
+const ExportMapModal: FC<IProps> = (props: IProps) => {
   const {
     visible = false,
     onCloseHandler,
@@ -39,17 +39,19 @@ function ExportMapModal(props: IProps) {
   const [isExport, setIsExport] = useState(false);
   const modalRef = useRef();
   useEffect(() => {
-    if (isWx()) {
-      window.WWOpenData
-        && window.WWOpenData.enableCanvasSharing
-        && window.WWOpenData.enableCanvasSharing();
-      window.WWOpenData
-        && window.WWOpenData.initCanvas
-        && window.WWOpenData.initCanvas();
+    if (isWx() && window.WWOpenData) {
+      if (window.WWOpenData.enableCanvasSharing) {
+        window.WWOpenData.enableCanvasSharing();
+      }
+      if (window.WWOpenData.initCanvas) {
+        window.WWOpenData.initCanvas();
+      }
     }
   }, []);
   useEffect(() => {
-    visible && mapInstance && mapInstance.fitView();
+    if (visible && mapInstance) {
+      mapInstance.fitView();
+    }
   }, [visible, mapInstance]);
 
   const downloadImg = async () => {
@@ -57,7 +59,7 @@ function ExportMapModal(props: IProps) {
     const width = okrMapRef.clientWidth; // 获取dom 宽度
     const height = okrMapRef.clientHeight; // 获取dom 高度
     const canvas = document.createElement("canvas"); // 创建一个canvas节点
-    const scale = 20; // 定义任意放大倍数 支持小数
+    const scale = 10; // 定义任意放大倍数 支持小数   设置成20之后企业微信工作台导出不了
     canvas.width = width * scale; // 定义canvas 宽度 * 缩放
     canvas.height = height * scale; // 定义canvas高度 *缩放
     canvas.style.width = `${width}px`;
@@ -72,34 +74,41 @@ function ExportMapModal(props: IProps) {
       useCORS: true, // 【重要】开启跨域配置
     };
 
-    const result = await Html2Canvas(okrMapRef, opts);
-    if (isWx()) {
-      window.WWOpenData
-        && window.WWOpenData.enableCanvasSharing
-        && window.WWOpenData.enableCanvasSharing();
-      window.WWOpenData
-        && window.WWOpenData.initCanvas
-        && window.WWOpenData.initCanvas();
-    }
-    const imgUrl = result.toDataURL("image/png"); // 得到图片的base64编码数据
-    const url = await getBase64DownloadUrl(imgUrl.split(",")[1]);
-    const image = new Image();
-
-    image.setAttribute("crossOrigin", "anonymous");
-    image.onload = () => {
-      if (!url.Data.obj) {
-        Toast.Error("导出失败，请稍后重试", { canClose: false });
+    await Html2Canvas(okrMapRef, opts).then((result) => {
+      if (isWx() && window.WWOpenData) {
+        if (window.WWOpenData.enableCanvasSharing) {
+          window.WWOpenData.enableCanvasSharing();
+        }
+        if (window.WWOpenData.initCanvas) {
+          window.WWOpenData.initCanvas();
+        }
       }
-      const a = document.createElement("a"); // 生成一个a元素
-      const event = new MouseEvent("click"); // 创建一个单击事件
-      a.download = "okr地图"; // 设置图片名称
-      a.href = url.Data.obj; // 将生成的URL设置为a.href属性
-      a.dispatchEvent(event); // 触发a的单击事件
-      Toast.Success("导出成功");
+      const imgUrl = result.toDataURL("image/png"); // 得到图片的base64编码数据
+      getBase64DownloadUrl(imgUrl.split(",")[1]).then((url) => {
+        const image = new Image();
+
+        image.setAttribute("crossOrigin", "anonymous");
+        image.onload = () => {
+          if (!url.Data.obj) {
+            Toast.Error("导出失败，请稍后重试", { canClose: false });
+          }
+          const a = document.createElement("a"); // 生成一个a元素
+          const event = new MouseEvent("click"); // 创建一个单击事件
+          a.download = "okr地图"; // 设置图片名称
+          a.href = url.Data.obj; // 将生成的URL设置为a.href属性
+          a.dispatchEvent(event); // 触发a的单击事件
+          Toast.Success("导出成功");
+          setIsExport(false);
+          if (onCloseHandler) {
+            onCloseHandler();
+          }
+        };
+        image.src = imgUrl;
+      });
+    }).catch((err) => {
       setIsExport(false);
-      onCloseHandler && onCloseHandler();
-    };
-    image.src = imgUrl;
+      Toast.Error(err, { canClose: false });
+    });
   };
 
   const confirmHandler = () => {
@@ -107,7 +116,7 @@ function ExportMapModal(props: IProps) {
       Toast.Warning("正在导出中", { canClose: true });
       return;
     }
-    setIsExport(true);
+    // setIsExport(true);
     downloadImg();
   };
   const fitViewHandler = (instance) => {
@@ -178,5 +187,9 @@ function ExportMapModal(props: IProps) {
       </>
     </Dialog>
   );
-}
+};
+
+ExportMapModal.defaultProps = {
+  onCloseHandler: () => {},
+};
 export default ExportMapModal;

package/src/components/period-selector/common.ts

@@ -5,7 +5,7 @@ import { getMonth } from "../../utils/constant";
 
 export const dealSelectedPeriodData = (period: string) => {
   const option: any = {};
-  option.cycleType = period === "-1" ? "-1" : period.substring(0, 1);
+  option.cycleType = Number(period) === -1 ? "-1" : period.substring(0, 1);
   option.yqmNum = period.substring(2) === "" ? "0" : period.substring(2);
   return option;
 };
@@ -51,7 +51,7 @@ export const formatPeriod = (selected: SelectedInterface) => {
   if (!selected) return "";
   const quarter = ["", `${getLocale("OKR_MyO_Pop_1stQuarter")}`, `${getLocale("OKR_MyO_Pop_2ndQuarter")}`, `${getLocale("OKR_MyO_Pop_3rdQuarter")}`, `${getLocale("OKR_MyO_Pop_4thQuarter")}`];
   let cycleDate = "";
-  const annualNum = selected.annualNum === "-1" ? `${getLocale("OKR_MyO_Butt_Allyears")}` : `${selected.annualNum}${isEn ? "" : "年"}`;
+  const annualNum = Number(`${selected.annualNum}`) === -1 ? `${getLocale("OKR_MyO_Butt_Allyears")}` : `${selected.annualNum}${isEn ? "" : "年"}`;
   const month = getMonth();
   switch (`${selected.cycleType}`) {
     case "-1":
@@ -73,7 +73,7 @@ export const formatPeriod = (selected: SelectedInterface) => {
       }`;
       break;
     case "5":
-      cycleDate = selected.yqmNum === "1" ? `${getLocale("OKR_MyO_Pop_Firsthalf")}` : `${getLocale("OKR_MyO_Pop_Secondhalf")}`;
+      cycleDate = Number(`${selected.yqmNum}`) === 1 ? `${getLocale("OKR_MyO_Pop_Firsthalf")}` : `${getLocale("OKR_MyO_Pop_Secondhalf")}`;
       break;
     default:
       cycleDate = `${getLocale("Mod_Customization")}`;

package/src/pages/personal-info/components/base-info/index.tsx

@@ -25,14 +25,19 @@ const BaseInfo: FC = () => {
     setVisible(false);
   };
 
-  const handleSuccessEditBaseInfo = (userInfo) => {
-    setUserInfo({ ...userInfo });
+  const handleSuccessEditBaseInfo = (data) => {
+    setUserInfo({ ...data });
   };
 
   useEffect(() => {
     getUserInfoFun().then((resp) => {
       if (resp.Code === 1 && resp.Data) {
-        setUserInfo({ ...resp.Data, position: resp.Data.positionCode });
+        setUserInfo({
+          ...resp.Data,
+          position: resp.Data.positionCode,
+          deparmentId: resp.Data.departmentId,
+          deparmentName: resp.Data.departmentName,
+        });
       }
     });
   }, []);

package/src/pages/personal-info/components/edit-base-info/index.tsx

@@ -1,17 +1,26 @@
-import React, { useState, useRef, useEffect } from "react";
+import React, {
+  useState, useRef, useEffect, FC,
+} from "react";
 import Form from "../../../../components/form";
-import { getUserInfoFun, saveUserInfo } from "../../request-api";
+import { saveUserInfo } from "../../request-api";
 import Toast from "../../../../components/toast";
 import Dialog from "../../../../components/dialog";
 import { getLocale } from "../../../../utils/getLocale";
 import { i18nLimitCharacters } from "../../../../utils/i18n-front-translate";
 import "./index.scss";
 
+interface IEditbaseInfoProps {
+  visible: boolean;
+  onCancel: Function;
+  handleSuccessEditBaseInfo: Function;
+  info: any
+}
+
 const { Fields } = Form;
 
 const prefix = "titaui-edit-personal-info";
 
-function EditBaseInfo(props) {
+const EditBaseInfo: FC<IEditbaseInfoProps> = (props) => {
   const {
     visible, onCancel, handleSuccessEditBaseInfo, info,
   } = props;
@@ -21,8 +30,8 @@ function EditBaseInfo(props) {
   const formRef = useRef<any>();
 
   const [isDisable, setIsDisable] = useState(false);
-  const [isEdit, setIsEdit] = useState(false);
-  const [userInfo, setUserInfo] = useState({ name: "", email: "", mobile: "" });
+  // const [isEdit, setIsEdit] = useState(false);
+  const [userInfo, setUserInfo] = useState(info);
 
   const handleNameChange = (value) => {
     setUserInfo({
@@ -34,7 +43,7 @@ function EditBaseInfo(props) {
     } else {
       setIsDisable(false);
     }
-    setIsEdit(true);
+    // setIsEdit(true);
   };
 
   const handlePhoneChange = (value) => {
@@ -47,7 +56,7 @@ function EditBaseInfo(props) {
     } else {
       setIsDisable(false);
     }
-    setIsEdit(true);
+    // setIsEdit(true);
   };
 
   const handleEmailChange = (value) => {
@@ -55,7 +64,7 @@ function EditBaseInfo(props) {
       ...userInfo,
       email: value || "",
     });
-    setIsEdit(true);
+    // setIsEdit(true);
   };
 
   const handleSaveUserInfo = () => {
@@ -75,12 +84,8 @@ function EditBaseInfo(props) {
   };
 
   useEffect(() => {
-    getUserInfoFun().then((resp) => {
-      if (resp.Code === 1 && resp.Data) {
-        setUserInfo({ ...resp.Data, position: resp.Data.positionCode });
-      }
-    });
-  }, []);
+    setUserInfo(info);
+  }, [info]);
 
   return (
     <Dialog
@@ -178,6 +183,6 @@ function EditBaseInfo(props) {
       </div>
     </Dialog>
   );
-}
+};
 
 export default EditBaseInfo;

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