@lemon-fe/components 0.1.13 → 0.1.14
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/Filter/index.js +13 -13
- package/es/Section/index.less +5 -1
- package/es/overrides.less +9 -0
- package/package.json +2 -2
package/es/Filter/index.js
CHANGED
|
@@ -396,17 +396,23 @@ function Filter(props) {
|
|
|
396
396
|
};
|
|
397
397
|
|
|
398
398
|
var _useMemo = useMemo(function () {
|
|
399
|
+
var result = data.filter(function (item) {
|
|
400
|
+
if (activeKeys.has(item.key) && compMap.has(item.type)) {
|
|
401
|
+
return true;
|
|
402
|
+
}
|
|
403
|
+
|
|
404
|
+
return false;
|
|
405
|
+
});
|
|
406
|
+
|
|
399
407
|
if (!width) {
|
|
400
|
-
return [
|
|
408
|
+
return [result, false];
|
|
401
409
|
}
|
|
402
410
|
|
|
403
411
|
var rows = [];
|
|
404
412
|
var currRow = [];
|
|
405
413
|
var value = 0;
|
|
406
|
-
|
|
407
|
-
var
|
|
408
|
-
|
|
409
|
-
var itemWidth = getColStyle(item.colSpan || ((_compMap$get = compMap.get(item.type)) === null || _compMap$get === void 0 ? void 0 : _compMap$get.colSpan)).width;
|
|
414
|
+
result.forEach(function (item) {
|
|
415
|
+
var itemWidth = getColStyle(item.colSpan || compMap.get(item.type).colSpan).width;
|
|
410
416
|
|
|
411
417
|
if (value + itemWidth > width) {
|
|
412
418
|
if (currRow.length > 0) {
|
|
@@ -430,11 +436,11 @@ function Filter(props) {
|
|
|
430
436
|
var visible = rows.length > 2;
|
|
431
437
|
|
|
432
438
|
if (!collapsed || !visible) {
|
|
433
|
-
return [
|
|
439
|
+
return [result, visible];
|
|
434
440
|
}
|
|
435
441
|
|
|
436
442
|
return [[rows[0], rows[rows.length - 1]].flat(), visible];
|
|
437
|
-
}, [data, width, collapsed, simple]),
|
|
443
|
+
}, [data, width, collapsed, simple, activeKeys]),
|
|
438
444
|
_useMemo2 = _slicedToArray(_useMemo, 2),
|
|
439
445
|
cols = _useMemo2[0],
|
|
440
446
|
showCollapse = _useMemo2[1];
|
|
@@ -485,13 +491,7 @@ function Filter(props) {
|
|
|
485
491
|
}), /*#__PURE__*/React.createElement(FormLayout, {
|
|
486
492
|
direction: "row"
|
|
487
493
|
}, cols.map(function (item) {
|
|
488
|
-
var visible = activeKeys.has(item.key);
|
|
489
494
|
var target = compMap.get(item.type);
|
|
490
|
-
|
|
491
|
-
if (!visible || !target) {
|
|
492
|
-
return null;
|
|
493
|
-
}
|
|
494
|
-
|
|
495
495
|
return /*#__PURE__*/React.createElement("div", {
|
|
496
496
|
style: getColStyle(item.colSpan || target.colSpan),
|
|
497
497
|
key: item.key
|
package/es/Section/index.less
CHANGED
|
@@ -66,12 +66,16 @@
|
|
|
66
66
|
& > .ant-tabs-content-holder {
|
|
67
67
|
flex: 1;
|
|
68
68
|
|
|
69
|
-
.ant-tabs-content {
|
|
69
|
+
& > .ant-tabs-content {
|
|
70
70
|
height: 100%;
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
|
|
75
|
+
&-flex > .ant-tabs {
|
|
76
|
+
min-height: 0;
|
|
77
|
+
}
|
|
78
|
+
|
|
75
79
|
&-tab {
|
|
76
80
|
display: inline-flex;
|
|
77
81
|
align-self: flex-start;
|
package/es/overrides.less
CHANGED
|
@@ -4,6 +4,11 @@ a[title='站长统计'] {
|
|
|
4
4
|
|
|
5
5
|
@blue-base: #2357df;
|
|
6
6
|
|
|
7
|
+
::selection {
|
|
8
|
+
color: inherit;
|
|
9
|
+
background: #d3ddf9;
|
|
10
|
+
}
|
|
11
|
+
|
|
7
12
|
/** basic */
|
|
8
13
|
|
|
9
14
|
@height-base: 32px;
|
|
@@ -71,6 +76,10 @@ a[title='站长统计'] {
|
|
|
71
76
|
border-radius: 8px;
|
|
72
77
|
}
|
|
73
78
|
|
|
79
|
+
.ant-modal-header {
|
|
80
|
+
border-radius: 8px 8px 0 0;
|
|
81
|
+
}
|
|
82
|
+
|
|
74
83
|
.ant-modal-confirm {
|
|
75
84
|
.ant-modal-body {
|
|
76
85
|
padding: 0;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lemon-fe/components",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.14",
|
|
4
4
|
"description": "> TODO: description",
|
|
5
5
|
"author": "鲁盛杰 <lusj@cnlemon.net>",
|
|
6
6
|
"homepage": "",
|
|
@@ -41,5 +41,5 @@
|
|
|
41
41
|
"react": "^17.0.2",
|
|
42
42
|
"react-dom": "^17.0.2"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "e3890cdc2b812e3a8af162990eb1dee841f8e32c"
|
|
45
45
|
}
|