Forráskód Böngészése

fix: 修复部分组件没应用本地化

lanjianrong 4 éve
szülő
commit
73daa54721

+ 7 - 1
src/components/Navigation/index.tsx

@@ -6,6 +6,8 @@ import { combinationPath } from '@/utils/util'
 import React, { Component } from 'react'
 import React, { Component } from 'react'
 import { Redirect, Route } from "react-router-dom"
 import { Redirect, Route } from "react-router-dom"
 import * as H from 'history'
 import * as H from 'history'
+import zhCN from 'antd/es/locale/zh_CN'
+import { ConfigProvider } from 'antd'
 class NavigationGuards extends Component<NavigationGuardsProps, any> {
 class NavigationGuards extends Component<NavigationGuardsProps, any> {
   constructor(props: NavigationGuardsProps) {
   constructor(props: NavigationGuardsProps) {
     super(props)
     super(props)
@@ -149,7 +151,9 @@ function LoginHandler(props: { targetRoute: RouteModel, ErrorPage: any }): any {
       <Route path={path} render={
       <Route path={path} render={
         props => (
         props => (
           // noCache ?
           // noCache ?
+          <ConfigProvider locale={zhCN}>
             <targetRoute.component {...props} routeConfig={targetRoute.childRoutes} />
             <targetRoute.component {...props} routeConfig={targetRoute.childRoutes} />
+          </ConfigProvider>
             // (
             // (
             //   <KeepAlive name={path}>
             //   <KeepAlive name={path}>
             //     <targetRoute.component {...props} routeConfig={targetRoute.childRoutes} />
             //     <targetRoute.component {...props} routeConfig={targetRoute.childRoutes} />
@@ -173,7 +177,9 @@ function NotLoginHandler(props: { targetRoute: RouteModel }): any {
   } else {
   } else {
     return <Route path={path} render={
     return <Route path={path} render={
       props => (
       props => (
-        <targetRoute.component {...props} routeConfig={targetRoute.childRoutes} />
+        <ConfigProvider locale={zhCN}>
+          <targetRoute.component {...props} routeConfig={targetRoute.childRoutes} />
+        </ConfigProvider>
       )
       )
     } />
     } />
   }
   }

+ 3 - 5
src/index.tsx

@@ -2,12 +2,10 @@ import React from 'react'
 import ReactDOM from 'react-dom'
 import ReactDOM from 'react-dom'
 import App from './App'
 import App from './App'
 import * as serviceWorker from './serviceWorker'
 import * as serviceWorker from './serviceWorker'
-import zhCN from 'antd/lib/locale/zh_CN'
-import { ConfigProvider } from 'antd'
 ReactDOM.render(
 ReactDOM.render(
-  <ConfigProvider locale={zhCN}>
-      <App />
-  </ConfigProvider>,
+  // <ConfigProvider locale={zhCN}>
+      <App />,
+  // </ConfigProvider>,
   document.getElementById('root')
   document.getElementById('root')
 )
 )
 // If you want your app to work offline and load faster, you can change
 // If you want your app to work offline and load faster, you can change

+ 2 - 1
src/pages/Contract/Content/Income/components/Tabs/File/index.tsx

@@ -3,11 +3,12 @@ import { ContractType } from '@/store/mobx/contract'
 import { apiDelFile, apiGetFileList } from '@/utils/common/api'
 import { apiDelFile, apiGetFileList } from '@/utils/common/api'
 import consts from '@/utils/consts'
 import consts from '@/utils/consts'
 import { dayjsFormat } from '@/utils/util'
 import { dayjsFormat } from '@/utils/util'
-import { Popconfirm } from 'antd'
+import { ConfigProvider, Popconfirm } from 'antd'
 import Table, { ColumnsType } from 'antd/lib/table'
 import Table, { ColumnsType } from 'antd/lib/table'
 import { observer } from 'mobx-react'
 import { observer } from 'mobx-react'
 import React, { useEffect, useState } from 'react'
 import React, { useEffect, useState } from 'react'
 
 
+
 interface iFileState {
 interface iFileState {
   id: string
   id: string
   filename: string
   filename: string

+ 3 - 5
src/pages/Quality/Content/Info/Detail/index.tsx

@@ -17,7 +17,7 @@ import { dayjsFormat } from '@/utils/util'
 import { Button, Input, message, Pagination, Tooltip } from 'antd'
 import { Button, Input, message, Pagination, Tooltip } from 'antd'
 import locale from 'antd/es/date-picker/locale/zh_CN'
 import locale from 'antd/es/date-picker/locale/zh_CN'
 import dayjs from 'dayjs'
 import dayjs from 'dayjs'
-import React, { useEffect, useState, useMemo } from 'react'
+import React, { useEffect, useState } from 'react'
 import { RouteComponentProps } from 'react-router'
 import { RouteComponentProps } from 'react-router'
 import { apiGetQualityDetail, apiResfulQualityAudit } from './api'
 import { apiGetQualityDetail, apiResfulQualityAudit } from './api'
 import AuditModal from './components/Modal'
 import AuditModal from './components/Modal'
@@ -75,9 +75,7 @@ const Detail: React.FC<RouteComponentProps> = props => {
     },
     },
     times: 0
     times: 0
   })
   })
-  const isEdited = useMemo(() => {
-    return !!detail.status
-  }, [ detail.status ])
+  const isEdited = !!detail.status
   useEffect(() => {
   useEffect(() => {
     initData()
     initData()
   }, [ id ])
   }, [ id ])
@@ -469,7 +467,7 @@ const Detail: React.FC<RouteComponentProps> = props => {
                     <Pagination
                     <Pagination
                       current={modalObj.curPage}
                       current={modalObj.curPage}
                       size="small"
                       size="small"
-                      pageSize={consts.PAGE_SIZE}
+                      defaultPageSize={consts.PAGE_SIZE}
                       hideOnSinglePage={true}
                       hideOnSinglePage={true}
                       total={detail.file.total}
                       total={detail.file.total}
                       onChange={(page, pageSize) => fileListChange(page, pageSize)} />
                       onChange={(page, pageSize) => fileListChange(page, pageSize)} />

+ 3 - 4
src/pages/Safe/Content/Info/Detail/index.tsx

@@ -76,9 +76,8 @@ const Detail: React.FC<RouteComponentProps> = props => {
     },
     },
     times: 0
     times: 0
   })
   })
-  const isEdited = useMemo(() => {
-    return !!detail.status
-  }, [ detail.status ])
+
+  const isEdited = !!detail.status
   useEffect(() => {
   useEffect(() => {
     initData()
     initData()
   }, [])
   }, [])
@@ -443,8 +442,8 @@ const Detail: React.FC<RouteComponentProps> = props => {
                     <Pagination
                     <Pagination
                       current={modalObj.curPage}
                       current={modalObj.curPage}
                       size="small"
                       size="small"
-                      pageSize={consts.PAGE_SIZE}
                       hideOnSinglePage={true}
                       hideOnSinglePage={true}
+                      defaultPageSize={consts.PAGE_SIZE}
                       total={detail.file.total}
                       total={detail.file.total}
                       onChange={(page, pageSize) => fileListChange(page, pageSize)} />
                       onChange={(page, pageSize) => fileListChange(page, pageSize)} />
                   </td>
                   </td>