@gm-pc/react 1.24.9-beta.14 → 1.24.9-beta.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gm-pc/react",
3
- "version": "1.24.9-beta.14",
3
+ "version": "1.24.9-beta.16",
4
4
  "description": "观麦前端基础组件库",
5
5
  "author": "liyatang <liyatang@qq.com>",
6
6
  "homepage": "https://github.com/gmfe/gm-pc#readme",
@@ -24,7 +24,7 @@
24
24
  "dependencies": {
25
25
  "@gm-common/hooks": "^2.10.0",
26
26
  "@gm-common/tool": "^2.10.0",
27
- "@gm-pc/locales": "^1.24.9-beta.14",
27
+ "@gm-pc/locales": "^1.24.9-beta.16",
28
28
  "big.js": "^6.0.1",
29
29
  "classnames": "^2.2.5",
30
30
  "lodash": "^4.17.19",
@@ -48,5 +48,5 @@
48
48
  "react-router-dom": "^5.2.0",
49
49
  "react-window": "^1.8.5"
50
50
  },
51
- "gitHead": "00c9b30ab0b492a57273126591b003ca2f3dce1b"
51
+ "gitHead": "f577bd687fed97c5d31156cc0e2a55db2743b18f"
52
52
  }
@@ -85,7 +85,7 @@ const Left: FC<LeftProps> = ({
85
85
  }
86
86
 
87
87
  return (
88
- <div className='gm-border-right gm-margin-top-0' style={{ width: '70px' }}>
88
+ <div className='gm-border-right gm-margin-top-0' style={{ minWidth: '70px' }}>
89
89
  {list.map((item) => (
90
90
  <div
91
91
  key={item.text}
@@ -3,6 +3,7 @@ import { Select } from '../select'
3
3
  import { Flex } from '../flex'
4
4
  import { PaginationProps } from './types'
5
5
  import _ from 'lodash'
6
+ import { getLocale } from '@gm-pc/locales'
6
7
 
7
8
  function getLimitData(limit: number) {
8
9
  const limitData = [
@@ -29,15 +30,21 @@ const Left: FC<PaginationProps> = ({ paging, onChange }) => {
29
30
 
30
31
  return (
31
32
  <Flex alignCenter>
32
- {need_count && <span>共{count}条记录,&nbsp;</span>}
33
- <span>每页&nbsp;</span>
33
+ {need_count && (
34
+ <span>
35
+ {getLocale('共')}
36
+ {count}
37
+ {getLocale('条记录')},&nbsp;
38
+ </span>
39
+ )}
40
+ <span>{getLocale('每页')}&nbsp;</span>
34
41
  <Select
35
42
  data={getLimitData(limit)}
36
43
  value={limit}
37
44
  onChange={handleChange}
38
45
  style={{ width: '60px' }}
39
46
  />
40
- <span>&nbsp;条</span>
47
+ <span>&nbsp;{getLocale('条')}</span>
41
48
  </Flex>
42
49
  )
43
50
  }
@@ -1,4 +1,5 @@
1
1
  import React, { useState, useEffect, FC, KeyboardEvent, useRef } from 'react'
2
+ import { getLocale } from '@gm-pc/locales'
2
3
  import { InputNumber } from '../input_number'
3
4
  import { Flex } from '../flex'
4
5
  import { PaginationProps } from './types'
@@ -70,7 +71,7 @@ const Right: FC<PaginationProps> = ({ paging, onChange }) => {
70
71
  onKeyDown={handleKeyDown}
71
72
  style={{ width: '40px' }}
72
73
  />
73
- <div className='gm-pagination-right-total-page'>{`/${all}页`}</div>
74
+ <div className='gm-pagination-right-total-page'>{`/${all}${getLocale('页')}`}</div>
74
75
  </Flex>
75
76
  )
76
77
  }