@lemon-fe/components 1.4.9-alpha.2 → 1.4.9
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/es/data-grid/index.js +8 -3
- package/es/select/index.js +12 -7
- package/package.json +2 -2
package/es/data-grid/index.js
CHANGED
|
@@ -1146,9 +1146,14 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
|
|
|
1146
1146
|
if (node !== null && node.data !== undefined) {
|
|
1147
1147
|
if (isSummaryRow({
|
|
1148
1148
|
node: node
|
|
1149
|
-
})
|
|
1150
|
-
|
|
1151
|
-
|
|
1149
|
+
})) {
|
|
1150
|
+
if (!field.summary) {
|
|
1151
|
+
return get(node.data, field.id);
|
|
1152
|
+
}
|
|
1153
|
+
if (field.summaryType === 1) {
|
|
1154
|
+
var summary = _this3.getFieldsSummary(_this3.dataSource, _this3.fields);
|
|
1155
|
+
return get(summary, field.id);
|
|
1156
|
+
}
|
|
1152
1157
|
}
|
|
1153
1158
|
var getValue = function getValue(colId) {
|
|
1154
1159
|
var col = columnApi.getColumn(colId);
|
package/es/select/index.js
CHANGED
|
@@ -15,6 +15,17 @@ import Dropdown from "../dropdown";
|
|
|
15
15
|
import Empty from "../empty";
|
|
16
16
|
import Icons from "../icons";
|
|
17
17
|
import { useLocaleReceiver } from "../locale-receiver";
|
|
18
|
+
import { mergeDefaultProps } from "../utils";
|
|
19
|
+
|
|
20
|
+
// 这个必须加,否则部分select的样式会有问题
|
|
21
|
+
mergeDefaultProps(AntdSelect, {
|
|
22
|
+
clearIcon: Icons.Clear,
|
|
23
|
+
notFoundContent: /*#__PURE__*/React.createElement(Empty, {
|
|
24
|
+
imageStyle: {
|
|
25
|
+
height: 60
|
|
26
|
+
}
|
|
27
|
+
})
|
|
28
|
+
});
|
|
18
29
|
function InternalSelect(props, ref) {
|
|
19
30
|
var wrapper = useRef(null);
|
|
20
31
|
var _useContext = useContext(ConfigProvider.ConfigContext),
|
|
@@ -23,17 +34,11 @@ function InternalSelect(props, ref) {
|
|
|
23
34
|
_useLocaleReceiver2 = _slicedToArray(_useLocaleReceiver, 1),
|
|
24
35
|
locale = _useLocaleReceiver2[0];
|
|
25
36
|
var selector = /*#__PURE__*/React.createElement(AntdSelect, _extends({
|
|
26
|
-
notFoundContent: /*#__PURE__*/React.createElement(Empty, {
|
|
27
|
-
imageStyle: {
|
|
28
|
-
height: 60
|
|
29
|
-
}
|
|
30
|
-
}),
|
|
31
37
|
suffixIcon: !props.loading ? /*#__PURE__*/React.createElement(Icons.Down, {
|
|
32
38
|
style: {
|
|
33
39
|
pointerEvents: 'none'
|
|
34
40
|
}
|
|
35
|
-
}) : undefined
|
|
36
|
-
clearIcon: Icons.Clear
|
|
41
|
+
}) : undefined
|
|
37
42
|
}, props, {
|
|
38
43
|
ref: ref
|
|
39
44
|
}));
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lemon-fe/components",
|
|
3
|
-
"version": "1.4.9
|
|
3
|
+
"version": "1.4.9",
|
|
4
4
|
"description": "> TODO: description",
|
|
5
5
|
"homepage": "",
|
|
6
6
|
"license": "MIT",
|
|
@@ -58,5 +58,5 @@
|
|
|
58
58
|
"publishConfig": {
|
|
59
59
|
"registry": "https://registry.npmjs.org"
|
|
60
60
|
},
|
|
61
|
-
"gitHead": "
|
|
61
|
+
"gitHead": "cdb79845cb423e932516831f73a9f77ebbc95d30"
|
|
62
62
|
}
|