Browse Source

修复接口错误没做处理

xjj 1 năm trước cách đây
mục cha
commit
e0cb10b677

+ 7 - 7
src/app.tsx

@@ -113,13 +113,13 @@ export const request: RequestConfig = {
     (res: any) => {
       const resData = res.data;
       const { code, msg, data } = resData;
-      // if (code !== 200) {
-      //   let error: any = {};
-      //   error.name = 'AjaxError';
-      //   error.info = { code, msg, data };
-      //   // throw error;
-      //   return Promise.reject(error);
-      // }
+      if (code !== 200) {
+        let error: any = {};
+        error.name = 'AjaxError';
+        error.info = { code, msg, data };
+        // throw error;
+        return Promise.reject(error);
+      }
       return res;
     },
   ],

+ 2 - 1
src/components/DDComponents/InnerContactField/index.js

@@ -6,8 +6,9 @@ const { Option } = Select;
 
 function InnerContactField(props) {
   const {
-    initialState: { user },
+    initialState,
   } = useModel('@@initialState');
+  const user = initialState?.user || {}
   const { value, onChange, disabled = false } = props;
   const { userList, run, loading } = useModel('userList');
   useEffect(() => {

+ 2 - 1
src/components/DDComponents/ManufacturerField/index.js

@@ -7,8 +7,9 @@ const { Option } = Select;
 
 function ManufacturerField(props) {
   const {
-    initialState: { user },
+    initialState,
   } = useModel('@@initialState');
+  const user = initialState?.user || {}
   const { value, disabled = false, onChange } = props;
   //供应商列表
   const {

+ 2 - 1
src/components/UserDropdown/index.tsx

@@ -23,8 +23,9 @@ const RenderDropDown = (menu: any) => {
 
 export default function UserDropdown(props: any) {
   const {
-    initialState: { user },
+    initialState,
   } = useModel('@@initialState');
+  const user = initialState?.user || {}
   return (
     <div className={styles.root}>
       <Dropdown placement="top" dropdownRender={(menu) => RenderDropDown(menu)}>

+ 2 - 1
src/pages/ContractManager/component/Modal.jsx

@@ -66,8 +66,9 @@ let isInLine = location.host.includes('work.greentech.com');
 const ContractModal = (props) => {
   const [form] = Form.useForm();
   const {
-    initialState: { user },
+    initialState,
   } = useModel('@@initialState');
+  const user = initialState?.user || {}
   const { userList, run: userListRun } = useModel('userList');
   const { depList, run: depListRun } = useModel('depList');
   const [auditList, setAuditList] = useState([]);

+ 2 - 1
src/pages/ContractManager/index.jsx

@@ -45,8 +45,9 @@ const ConteactManager = (props) => {
     name: '',
   });
   const {
-    initialState: { user },
+    initialState,
   } = useModel('@@initialState');
+  const user = initialState?.user || {}
   const [visible, setVisible] = useState(false);
   const [detail, setDetail] = useState({});
   const [data, setData] = useState([]);

+ 2 - 1
src/pages/FileManagement/index.js

@@ -61,8 +61,9 @@ function FileManagement(props) {
   const [form] = Form.useForm();
   const [modal, contextHolder] = Modal.useModal();
   const {
-    initialState: { user },
+    initialState,
   } = useModel('@@initialState');
+  const user = initialState?.user || {}
   const { userList, run: userListRun } = useModel('userList');
   const [tableData, setTableData] = useState([]);
   const [visible, setVisible] = useState(false);

+ 2 - 1
src/pages/Flow/Audit.js

@@ -18,8 +18,9 @@ function Audit(props) {
   const [tabActiveKey, setTabActiveKey] = useState('1');
   const ref = useRef();
   const {
-    initialState: { user },
+    initialState,
   } = useModel('@@initialState');
+  const user = initialState?.user || {}
   const permission = user?.Permission || {};
 
   const curItem = useMemo(() => {

+ 2 - 1
src/pages/Flow/OaAuditDetail.js

@@ -26,8 +26,9 @@ function OaAuditDetail(props) {
   } = data || {};
   if (OaAuditList) console.log(JSON.stringify(OaAuditList));
   const {
-    initialState: { user },
+    initialState,
   } = useModel('@@initialState');
+  const user = initialState?.user || {}
 
   const getDescription = (node) => {
     let str = node?.AuditRoleInfo

+ 2 - 1
src/pages/ManufacturerMng/ManufacturerList.js

@@ -28,8 +28,9 @@ import {
 function ManufacturerList(props) {
   const { projectId = 1, data } = props;
   const {
-    initialState: { user },
+    initialState,
   } = useModel('@@initialState');
+  const user = initialState?.user || {}
   const [visible, setVisible] = useState(false);
   const [curItem, setCurItem] = useState(null);
   const [formDisabled, setFormDisabled] = useState(false);

+ 2 - 1
src/pages/Profile/apply.js

@@ -33,8 +33,9 @@ const TYPE = {
 };
 function Apply(props) {
   const {
-    initialState: { user },
+    initialState,
   } = useModel('@@initialState');
+  const user = initialState?.user || {}
   const [tabActive, setTabActive] = useState('1');
   const [detail, setDetail] = useState({});
   const [conVisible, setConVisible] = useState(false);

+ 2 - 1
src/pages/Profile/approve.js

@@ -35,8 +35,9 @@ const TYPE = {
 };
 function Approve(props) {
   const {
-    initialState: { user },
+    initialState,
   } = useModel('@@initialState');
+  const user = initialState?.user || {}
   const [tabActive, setTabActive] = useState('1');
   const [detail, setDetail] = useState({});
   const [conVisible, setConVisible] = useState(false);

+ 2 - 1
src/pages/Profile/approved.js

@@ -25,7 +25,8 @@ const TYPE = {
   OA: 2,
 };
 function Approved(props) {
-  const { initialState: { user }  } = useModel('@@initialState');
+  const { initialState  } = useModel('@@initialState');
+  const user = initialState?.user || {}
   // const [tabActive, setTabActive] = useState('1');
   // const [detail, setDetail] = useState({});
   const [conVisible, setConVisible] = useState(false);

+ 2 - 1
src/pages/Profile/index.js

@@ -27,8 +27,9 @@ import PageContent from '@/components/PageContent';
 
 function profile(props) {
   const {
-    initialState: { user },
+    initialState,
   } = useModel('@@initialState');
+  const user = initialState?.user || {}
   const [tabActive, setTabActive] = useState('1');
   const approveFormRef = useRef();
   const applyFormRef = useRef();

+ 2 - 1
src/pages/UserCenter/index.js

@@ -5,8 +5,9 @@ import { useState } from 'react';
 
 const ChangePassWord = () => {
   const {
-    initialState: { user },
+    initialState,
   } = useModel('@@initialState');
+  const user = initialState?.user || {}
   const navigate = useNavigate();
 
   const onFinish = async (values) => {