@titaui/pc 1.9.81 → 1.9.85

package/lib/components/okr-flow/export-modal/index.js

@@ -119,7 +119,7 @@ var ExportMapModal = function ExportMapModal(props) {
 
               canvas = document.createElement("canvas"); // 创建一个canvas节点
 
-              scale = 10; // 定义任意放大倍数 支持小数   设置成20之后企业微信工作台导出不了
+              scale = 20; // 定义任意放大倍数 支持小数
 
               canvas.width = width * scale; // 定义canvas 宽度 * 缩放
 

package/lib/components/okrcase-library/okrcases-components/submitOkr-dialog.js

@@ -22,6 +22,10 @@ var _form = _interopRequireDefault(require("../../form"));
 
 var _getLocale = require("../../../utils/getLocale");
 
+var _payBackgroundImg = _interopRequireDefault(require("../image/payBackgroundImg.png"));
+
+var _submitLogo = _interopRequireDefault(require("../image/submitLogo.svg"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -48,8 +52,7 @@ var Fields = _form["default"].Fields;
 
 function SubmitDialog(props) {
   var handleShowSubmitOkrWindow = props.handleShowSubmitOkrWindow,
-      isShowSubmitOkrWindow = props.isShowSubmitOkrWindow,
-      allViewAreaRef = props.allViewAreaRef;
+      isShowSubmitOkrWindow = props.isShowSubmitOkrWindow;
 
   var _useState = (0, _react.useState)(""),
       _useState2 = _slicedToArray(_useState, 2),
@@ -79,10 +82,8 @@ function SubmitDialog(props) {
       truonlyFirstErrore: false
     });
 
-    if (err.length) {
-      console.log(err);
-    } else {
-      (0, _network.postSurvey)(body).then(function (res) {
+    if (!err.length) {
+      (0, _network.postSurvey)(body).then(function () {
         _toast["default"].Success("发送成功");
 
         handleShowSubmitOkrWindow(false);
@@ -105,7 +106,8 @@ function SubmitDialog(props) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "okr-cases-library__submitWindow"
   }, /*#__PURE__*/_react["default"].createElement("img", {
-    src: require("../image/submit\u5C0F\u9A74.svg")
+    src: _submitLogo["default"],
+    alt: "submit\u5C0F\u9A74"
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "tu-icon-canceled",
     onClick: function onClick() {
@@ -166,7 +168,7 @@ function PayDialog(props) {
     var tenantType = window.BSGlobal.tenantInfo.tenantType; // 外部注冊賬號使用的產品ID不同
 
     // 外部注冊賬號使用的產品ID不同
-    if (Version == 1 && tenantType == 3) return "D9E059E4-4303-4EE2-9275-AE2FA74BBAA6";
+    if (Version === 1 && tenantType === 3) return "D9E059E4-4303-4EE2-9275-AE2FA74BBAA6";
     return "60AFAD35-5273-4A06-B2F4-9A3193096BE7";
   }),
       _useState10 = _slicedToArray(_useState9, 1),
@@ -205,18 +207,18 @@ function PayDialog(props) {
           Total: 1
         }]
       }).then(function (orderInfo) {
-        var orderId = orderInfo.Id,
+        var Id = orderInfo.Id,
             AliModel = orderInfo.AliModel;
         var PayCode = AliModel.PayCode,
             PayName = AliModel.PayName;
         setPayCode(PayCode);
-        setOrderId(orderId);
+        setOrderId(Id);
         setPayName(PayName);
       });
     });
   }, []); // 点击立即支付后，2分钟内，每个10s，循环获取订单信息
 
-  var loopOrderInfo = function loopOrderInfo(orderId) {
+  var loopOrderInfo = function loopOrderInfo(id) {
     if (getOrderInfoTimers.current === 12) {
       getOrderInfoTimers.current = 1;
     }
@@ -224,13 +226,13 @@ function PayDialog(props) {
     setTimeout(function () {
       // 循环获取订单信息 2 分钟
       if (getOrderInfoTimers.current < 12) {
-        (0, _network.getOkrOrderInfo)(orderId).then(function (res) {
+        (0, _network.getOkrOrderInfo)(id).then(function (res) {
           getOrderInfoTimers.current += 1; // @ts-ignore
 
           var OrderStatus = res.OrderStatus; // 未支付成功重新获取订单
 
-          if (OrderStatus != 2) {
-            loopOrderInfo(orderId);
+          if (OrderStatus !== 2) {
+            loopOrderInfo(id);
           } else {
             // 订单已支付
             _titaUi.Modal.success({
@@ -279,7 +281,8 @@ function PayDialog(props) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "okr-cases-library__payWindow"
   }, /*#__PURE__*/_react["default"].createElement("img", {
-    src: require("../image/\u652F\u4ED8\u80CC\u666F\u6D6E\u51FA.png")
+    src: _payBackgroundImg["default"],
+    alt: "\u652F\u4ED8\u80CC\u666F\u6D6E\u51FA"
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "tu-icon-canceled",
     onClick: function onClick() {
@@ -303,7 +306,7 @@ function PayDialog(props) {
     style: {
       fontSize: "32px"
     }
-  }, "19.8"), "\u5143/\u5E74")), /*#__PURE__*/_react["default"].createElement("a", {
+  }, "29.8"), "\u5143/\u5E74")), /*#__PURE__*/_react["default"].createElement("a", {
     className: "okr-cases-library__payWindow__payButton",
     onClick: function onClick() {
       return loopOrderInfo(orderId);

package/lib/pages/personal-info/components/base-info/index.js

@@ -71,15 +71,17 @@ var BaseInfo = function BaseInfo() {
     setVisible(false);
   };
 
-  var handleSuccessEditBaseInfo = function handleSuccessEditBaseInfo(userInfo) {
-    setUserInfo(_objectSpread({}, userInfo));
+  var handleSuccessEditBaseInfo = function handleSuccessEditBaseInfo(data) {
+    setUserInfo(_objectSpread({}, data));
   };
 
   (0, _react.useEffect)(function () {
     (0, _requestApi.getUserInfoFun)().then(function (resp) {
       if (resp.Code === 1 && resp.Data) {
         setUserInfo(_objectSpread(_objectSpread({}, resp.Data), {}, {
-          position: resp.Data.positionCode
+          position: resp.Data.positionCode,
+          deparmentId: resp.Data.departmentId,
+          deparmentName: resp.Data.departmentName
         }));
       }
     });

package/lib/pages/personal-info/components/edit-base-info/index.js

@@ -50,7 +50,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var Fields = _form["default"].Fields;
 var prefix = "titaui-edit-personal-info";
 
-function EditBaseInfo(props) {
+var EditBaseInfo = function EditBaseInfo(props) {
   var visible = props.visible,
       _onCancel = props.onCancel,
       handleSuccessEditBaseInfo = props.handleSuccessEditBaseInfo,
@@ -62,21 +62,13 @@ function EditBaseInfo(props) {
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
       isDisable = _useState2[0],
-      setIsDisable = _useState2[1];
+      setIsDisable = _useState2[1]; // const [isEdit, setIsEdit] = useState(false);
 
-  var _useState3 = (0, _react.useState)(false),
+
+  var _useState3 = (0, _react.useState)(info),
       _useState4 = _slicedToArray(_useState3, 2),
-      isEdit = _useState4[0],
-      setIsEdit = _useState4[1];
-
-  var _useState5 = (0, _react.useState)({
-    name: "",
-    email: "",
-    mobile: ""
-  }),
-      _useState6 = _slicedToArray(_useState5, 2),
-      userInfo = _useState6[0],
-      setUserInfo = _useState6[1];
+      userInfo = _useState4[0],
+      setUserInfo = _useState4[1];
 
   var handleNameChange = function handleNameChange(value) {
     setUserInfo(_objectSpread(_objectSpread({}, userInfo), {}, {
@@ -87,9 +79,8 @@ function EditBaseInfo(props) {
       setIsDisable(true);
     } else {
       setIsDisable(false);
-    }
+    } // setIsEdit(true);
 
-    setIsEdit(true);
   };
 
   var handlePhoneChange = function handlePhoneChange(value) {
@@ -101,16 +92,14 @@ function EditBaseInfo(props) {
       setIsDisable(true);
     } else {
       setIsDisable(false);
-    }
+    } // setIsEdit(true);
 
-    setIsEdit(true);
   };
 
   var handleEmailChange = function handleEmailChange(value) {
     setUserInfo(_objectSpread(_objectSpread({}, userInfo), {}, {
       email: value || ""
-    }));
-    setIsEdit(true);
+    })); // setIsEdit(true);
   };
 
   var handleSaveUserInfo = function handleSaveUserInfo() {
@@ -138,14 +127,8 @@ function EditBaseInfo(props) {
   };
 
   (0, _react.useEffect)(function () {
-    (0, _requestApi.getUserInfoFun)().then(function (resp) {
-      if (resp.Code === 1 && resp.Data) {
-        setUserInfo(_objectSpread(_objectSpread({}, resp.Data), {}, {
-          position: resp.Data.positionCode
-        }));
-      }
-    });
-  }, []);
+    setUserInfo(info);
+  }, [info]);
   return /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
     visible: visible,
     ref: modalRef,
@@ -233,7 +216,7 @@ function EditBaseInfo(props) {
     }],
     onChange: handleEmailChange
   }))));
-}
+};
 
 var _default = EditBaseInfo;
 exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.9.81",
+  "version": "1.9.85",
   "nameCN": "",
   "description": "",
   "main": "src/index.js",

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

@@ -59,7 +59,7 @@ const ExportMapModal: FC<IProps> = (props: IProps) => {
     const width = okrMapRef.clientWidth; // 获取dom 宽度
     const height = okrMapRef.clientHeight; // 获取dom 高度
     const canvas = document.createElement("canvas"); // 创建一个canvas节点
-    const scale = 10; // 定义任意放大倍数 支持小数   设置成20之后企业微信工作台导出不了
+    const scale = 20; // 定义任意放大倍数 支持小数
     canvas.width = width * scale; // 定义canvas 宽度 * 缩放
     canvas.height = height * scale; // 定义canvas高度 *缩放
     canvas.style.width = `${width}px`;

package/src/components/okrcase-library/okrcases-components/submitOkr-dialog.tsx

@@ -7,16 +7,18 @@ import Toast from "../../toast";
 import Dialog from "../../dialog";
 import Form from "../../form";
 import { getLocale } from "../../../utils/getLocale";
+import img from "../image/payBackgroundImg.png";
+import submitImg from "../image/submitLogo.svg";
 
 const { Fields } = Form;
 
 interface Props1 {
   handleShowSubmitOkrWindow: Function;
   isShowSubmitOkrWindow: boolean;
-  allViewAreaRef: any;
+  // allViewAreaRef: any;
 }
 export function SubmitDialog(props: Props1) {
-  const { handleShowSubmitOkrWindow, isShowSubmitOkrWindow, allViewAreaRef } = props;
+  const { handleShowSubmitOkrWindow, isShowSubmitOkrWindow } = props;
   const [type, setType] = useState("");
   const [job, setJob] = useState("");
   const [scene, setScene] = useState("");
@@ -31,10 +33,8 @@ export function SubmitDialog(props: Props1) {
     };
     // 校验
     const err = formRef.current.verifing({ truonlyFirstErrore: false });
-    if (err.length) {
-      console.log(err);
-    } else {
-      postSurvey(body).then((res) => {
+    if (!err.length) {
+      postSurvey(body).then(() => {
         Toast.Success("发送成功");
         handleShowSubmitOkrWindow(false);
       }).catch(() => {
@@ -46,7 +46,7 @@ export function SubmitDialog(props: Props1) {
   return (
     <Dialog visible={isShowSubmitOkrWindow} noFooter width="480px" destroyOnClose noCloseIcon getContainer={() => document.body} zIndex={1200}>
       <div className="okr-cases-library__submitWindow">
-        <img src={require("../image/submit小驴.svg")} />
+        <img src={submitImg} alt="submit小驴" />
         <div className="tu-icon-canceled" onClick={() => handleShowSubmitOkrWindow(false)} />
         <Form ref={formRef}>
           <Fields.Input
@@ -110,7 +110,7 @@ export function PayDialog(props: Props2) {
     // @ts-ignore
     const { tenantType } = window.BSGlobal.tenantInfo;
     // 外部注冊賬號使用的產品ID不同
-    if (Version == 1 && tenantType == 3) return "D9E059E4-4303-4EE2-9275-AE2FA74BBAA6";
+    if (Version === 1 && tenantType === 3) return "D9E059E4-4303-4EE2-9275-AE2FA74BBAA6";
     return "60AFAD35-5273-4A06-B2F4-9A3193096BE7";
   });
   const [orderId, setOrderId] = useState("");
@@ -134,30 +134,30 @@ export function PayDialog(props: Props2) {
           Total: 1,
         }],
       }).then((orderInfo) => {
-        const { Id: orderId, AliModel } = orderInfo;
+        const { Id, AliModel } = orderInfo;
         const { PayCode, PayName } = AliModel;
         setPayCode(PayCode);
-        setOrderId(orderId);
+        setOrderId(Id);
         setPayName(PayName);
       });
     });
   }, []);
 
   // 点击立即支付后，2分钟内，每个10s，循环获取订单信息
-  const loopOrderInfo = (orderId) => {
+  const loopOrderInfo = (id) => {
     if (getOrderInfoTimers.current === 12) {
       getOrderInfoTimers.current = 1;
     }
     setTimeout(() => {
       // 循环获取订单信息 2 分钟
       if (getOrderInfoTimers.current < 12) {
-        getOkrOrderInfo(orderId).then((res) => {
+        getOkrOrderInfo(id).then((res) => {
           getOrderInfoTimers.current += 1;
           // @ts-ignore
           const { OrderStatus } = res;
           // 未支付成功重新获取订单
-          if (OrderStatus != 2) {
-            loopOrderInfo(orderId);
+          if (OrderStatus !== 2) {
+            loopOrderInfo(id);
           } else {
             // 订单已支付
             Modal.success({
@@ -178,7 +178,7 @@ export function PayDialog(props: Props2) {
   return (
     <Dialog visible={isShowPayWindow} noFooter width="480px" destroyOnClose noCloseIcon getContainer={() => allViewAreaRef.current}>
       <div className="okr-cases-library__payWindow">
-        <img src={require("../image/支付背景浮出.png")} />
+        <img src={img} alt="支付背景浮出" />
         <div className="tu-icon-canceled" onClick={() => handleShowPayWindow(false)} style={{ width: "18px", height: "18px" }} />
         <p className="okr-cases-library__payWindow__head">
           {price}
@@ -192,7 +192,7 @@ export function PayDialog(props: Props2) {
         <div className="okr-cases-library__payWindow__amount">
           应付金额：
           <b>
-            <span style={{ fontSize: "32px" }}>19.8</span>
+            <span style={{ fontSize: "32px" }}>29.8</span>
             元/年
           </b>
         </div>

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;