@gmfe/react 2.14.1 → 2.14.2-beta.2
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": "@gmfe/react",
|
|
3
|
-
"version": "2.14.
|
|
3
|
+
"version": "2.14.2-beta.2",
|
|
4
4
|
"description": "",
|
|
5
5
|
"author": "liyatang <liyatang@qq.com>",
|
|
6
6
|
"homepage": "https://github.com/gmfe/gmfe#readme",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"@gm-common/tool": "^1.0.0",
|
|
30
|
-
"@gmfe/locales": "^2.14.
|
|
30
|
+
"@gmfe/locales": "^2.14.2-beta.2",
|
|
31
31
|
"big.js": "^5.2.2",
|
|
32
32
|
"classnames": "^2.2.5",
|
|
33
33
|
"lodash": "^4.17.14",
|
|
@@ -35,5 +35,5 @@
|
|
|
35
35
|
"prop-types": "^15.7.2",
|
|
36
36
|
"react-window": "^1.8.5"
|
|
37
37
|
},
|
|
38
|
-
"gitHead": "
|
|
38
|
+
"gitHead": "569d75446b8100b8afc44cd97fa84de0a8db7280"
|
|
39
39
|
}
|
|
@@ -220,7 +220,7 @@ class Cascader extends React.Component {
|
|
|
220
220
|
const value = []
|
|
221
221
|
if (selected.length > 0) {
|
|
222
222
|
_.each(selected, (v, i) => {
|
|
223
|
-
const match = _.find(i === 0 ? data : value[i - 1]
|
|
223
|
+
const match = _.find(i === 0 ? data : value[i - 1]?.children, val => {
|
|
224
224
|
return v === val.value
|
|
225
225
|
})
|
|
226
226
|
value.push(match)
|
|
@@ -316,7 +316,7 @@ class Cascader extends React.Component {
|
|
|
316
316
|
const value = []
|
|
317
317
|
if (selected.length > 0) {
|
|
318
318
|
_.each(selected, (v, i) => {
|
|
319
|
-
const match = _.find(i === 0 ? data : value[i - 1]
|
|
319
|
+
const match = _.find(i === 0 ? data : value[i - 1]?.children, val => {
|
|
320
320
|
return v === val.value
|
|
321
321
|
})
|
|
322
322
|
value.push(match)
|
|
@@ -326,13 +326,13 @@ class Cascader extends React.Component {
|
|
|
326
326
|
if (!filtrable) {
|
|
327
327
|
return valueRender
|
|
328
328
|
? valueRender(value)
|
|
329
|
-
: _.map(value, v => v
|
|
329
|
+
: _.map(value, v => v?.name).join(',')
|
|
330
330
|
}
|
|
331
331
|
|
|
332
332
|
return filterInput === null
|
|
333
333
|
? valueRender
|
|
334
334
|
? valueRender(value)
|
|
335
|
-
: _.map(value, v => v
|
|
335
|
+
: _.map(value, v => v?.name).join(',')
|
|
336
336
|
: filterInput
|
|
337
337
|
}
|
|
338
338
|
|
|
@@ -346,10 +346,10 @@ class Cascader extends React.Component {
|
|
|
346
346
|
const value = []
|
|
347
347
|
if (selected.length > 0) {
|
|
348
348
|
_.each(selected, (v, i) => {
|
|
349
|
-
const match = _.find(i === 0 ? data : value[i - 1]
|
|
349
|
+
const match = _.find(i === 0 ? data : value[i - 1]?.children, val => {
|
|
350
350
|
return v === val.value
|
|
351
351
|
})
|
|
352
|
-
value.push(match)
|
|
352
|
+
match && value.push(match)
|
|
353
353
|
})
|
|
354
354
|
}
|
|
355
355
|
|