@titaui/pc 1.9.81 → 1.9.82

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.82",
   "nameCN": "",
   "description": "",
   "main": "src/index.js",

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;