@gm-mobile/c-react 3.9.3-beta.13 → 3.9.3-beta.17

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-mobile/c-react",
3
- "version": "3.9.3-beta.13",
3
+ "version": "3.9.3-beta.17",
4
4
  "description": "> TODO: description",
5
5
  "author": "liyatang <liyatang@qq.com>",
6
6
  "homepage": "https://github.com/gmfe/gm-mobile#readme",
@@ -21,9 +21,9 @@
21
21
  "url": "https://github.com/gmfe/gm-mobile/issues"
22
22
  },
23
23
  "dependencies": {
24
- "@gm-mobile/c-font": "^3.9.3-beta.13",
25
- "@gm-mobile/c-tool": "^3.9.3-beta.13",
26
- "@gm-mobile/locales": "^3.9.3-beta.13"
24
+ "@gm-mobile/c-font": "^3.9.3-beta.17",
25
+ "@gm-mobile/c-tool": "^3.9.3-beta.17",
26
+ "@gm-mobile/locales": "^3.9.3-beta.17"
27
27
  },
28
28
  "peerDependencies": {
29
29
  "@tarojs/components": "3.0.18",
@@ -33,5 +33,5 @@
33
33
  "prop-types": "^15.7.2",
34
34
  "react": "^16.13.1"
35
35
  },
36
- "gitHead": "260949811958376507470cb9357d25f5c0f91350"
36
+ "gitHead": "e78a422ee30327fbfd97136029423ba39c42c613"
37
37
  }
@@ -7,6 +7,14 @@
7
7
  &.m-page-white {
8
8
  background: var(--m-color-bg-white);
9
9
  }
10
+ .m-page-wrapper {
11
+ overflow: auto;
12
+ }
13
+
14
+ .m-page-side {
15
+ overflow-x: hidden;
16
+ overflow: auto;
17
+ }
10
18
 
11
19
  .m-page-content {
12
20
  flex: 1;
@@ -94,9 +94,15 @@ export class TextField extends Component<TextFieldProps, TextFieldState> {
94
94
  !value.endsWith('.') &&
95
95
  ['digit', 'number'].includes(this.props.type || '')
96
96
  ) {
97
+ console.log(value)
97
98
  const float = parseFloat(value.replace(/\D\./g, ''))
98
99
  if (isNaN(float)) {
99
100
  value = ''
101
+ } else if (value.endsWith('.0')) {
102
+ // 处理特殊情况
103
+ if (this.props.fractionDigits === 0) {
104
+ value = value.replace(/\.0$/, '')
105
+ }
100
106
  } else {
101
107
  value = clamp(
102
108
  float,
@@ -226,6 +232,7 @@ export class TextField extends Component<TextFieldProps, TextFieldState> {
226
232
  active: highlight || active,
227
233
  highlight,
228
234
  disabled,
235
+ block,
229
236
  })}
230
237
  width={width}
231
238
  style={style}
@@ -41,6 +41,9 @@
41
41
  background-color: var(--m-color-bg-secondary);
42
42
  }
43
43
  }
44
+ &.block {
45
+ width: 100%;
46
+ }
44
47
  .text-field-placeholder {
45
48
  color: var(--m-color-placeholder);
46
49
  }
@@ -98,13 +98,22 @@
98
98
  }
99
99
 
100
100
  .m-border-radius-circle {
101
- border-radius: 50%!important;
101
+ border-radius: 50% !important;
102
102
  }
103
103
 
104
104
  .m-border-radius-chip {
105
- border-radius: 100px!important;
105
+ border-radius: 100px !important;
106
106
  }
107
107
 
108
108
  .m-border-radius-5 {
109
- border-radius: 5px!important;
109
+ border-radius: 5px !important;
110
110
  }
111
+
112
+ // 生成圆角, .m-border-radius-{1-10}
113
+ .generate-size(@size) when (@size<=10) {
114
+ .m-border-radius-@{size} {
115
+ border-radius: @size * 1px;
116
+ }
117
+ .generate-size(@size + 1);
118
+ }
119
+ .generate-size(0);
@@ -66,6 +66,10 @@
66
66
  text-decoration: line-through;
67
67
  }
68
68
 
69
+ .m-text-normal {
70
+ font-weight: normal;
71
+ }
72
+
69
73
  .m-text-bold {
70
74
  font-weight: bold;
71
75
  }