@gm-pc/react 1.28.1-beta.0 → 1.28.1-beta.1
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.28.1-beta.
|
|
3
|
+
"version": "1.28.1-beta.1",
|
|
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.28.1-beta.
|
|
27
|
+
"@gm-pc/locales": "^1.28.1-beta.1",
|
|
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": "
|
|
51
|
+
"gitHead": "7569ceca52d7946b2d44f48bf2a43f5fcaf7d715"
|
|
52
52
|
}
|
|
@@ -299,6 +299,9 @@ class MoreSelectBase<V extends string | number = string> extends Component<
|
|
|
299
299
|
? flatFilterData.filter((item) => !item.deleted)
|
|
300
300
|
: flatFilterData
|
|
301
301
|
|
|
302
|
+
// 计算总数：availableData + selected，过滤重复值
|
|
303
|
+
const totalCount = _.uniqBy([...availableData, ...selected], 'value').length
|
|
304
|
+
|
|
302
305
|
// 检查是否所有可用数据都被选中
|
|
303
306
|
const allSelected =
|
|
304
307
|
availableData.length > 0 &&
|
|
@@ -341,7 +344,7 @@ class MoreSelectBase<V extends string | number = string> extends Component<
|
|
|
341
344
|
}
|
|
342
345
|
}}
|
|
343
346
|
>
|
|
344
|
-
全选({
|
|
347
|
+
全选({totalCount})
|
|
345
348
|
</Checkbox>
|
|
346
349
|
)}
|
|
347
350
|
{isShowDeletedSwitch && (
|