ztxkui 3.7.3 → 3.7.4
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/dist/Demo.js +12 -2
- package/dist/components/EnhanceSelect/index.js +21 -3
- package/package.json +1 -1
package/dist/Demo.js
CHANGED
|
@@ -55,14 +55,24 @@ function Demo() {
|
|
|
55
55
|
}, []);
|
|
56
56
|
return (React.createElement("div", { style: { height: 2000 } },
|
|
57
57
|
React.createElement(Link, { to: "/test" }, "test"),
|
|
58
|
+
React.createElement("div", null,
|
|
59
|
+
React.createElement(EnhanceSelect, { style: selectStyle, list: list, isHandAddItem: true, value: value1, showAll: true, onChange: function (value) {
|
|
60
|
+
console.log(value, typeof value);
|
|
61
|
+
setValue1(value);
|
|
62
|
+
} })),
|
|
63
|
+
React.createElement("div", null,
|
|
64
|
+
React.createElement(EnhanceSelect, { style: selectStyle, list: list, mode: "multiple", isHandAddItem: true, value: value2, showAll: true, onChange: function (value) {
|
|
65
|
+
console.log(value, typeof value);
|
|
66
|
+
setValue2(value);
|
|
67
|
+
} })),
|
|
58
68
|
React.createElement("div", null,
|
|
59
69
|
React.createElement(EnhanceSelect, { style: selectStyle, list: list, isHandAddItem: true, value: value1, onChange: function (value) {
|
|
60
|
-
console.log(value);
|
|
70
|
+
console.log(value, typeof value);
|
|
61
71
|
setValue1(value);
|
|
62
72
|
} })),
|
|
63
73
|
React.createElement("div", null,
|
|
64
74
|
React.createElement(EnhanceSelect, { style: selectStyle, list: list, mode: "multiple", isHandAddItem: true, value: value2, onChange: function (value) {
|
|
65
|
-
console.log(value);
|
|
75
|
+
console.log(value, typeof value);
|
|
66
76
|
setValue2(value);
|
|
67
77
|
} })),
|
|
68
78
|
React.createElement("button", { onClick: function () {
|
|
@@ -629,14 +629,32 @@ function EnhanceSelect(_a) {
|
|
|
629
629
|
// 因为将数据类型转成了字符串，可能导致value的数据类型跟原数据数据类型不一致
|
|
630
630
|
// 这里将value赋值成原数据中的数据
|
|
631
631
|
var __value = value;
|
|
632
|
-
if (
|
|
632
|
+
if (showAll) {
|
|
633
|
+
// 表示选中了全部
|
|
633
634
|
if (Array.isArray(__value) && __value.length > 0) {
|
|
634
|
-
|
|
635
|
+
// 如果最后一个选的是全部 那就是只要全部
|
|
636
|
+
if (__value[__value.length - 1] === '') {
|
|
637
|
+
__value = [''];
|
|
638
|
+
}
|
|
639
|
+
else {
|
|
640
|
+
// 否则 最后一个不是全部，那就去掉全部
|
|
641
|
+
__value = currentData.map(function (item) { return item[key_1]; });
|
|
642
|
+
}
|
|
635
643
|
}
|
|
636
|
-
else if (!Array.isArray(__value) && __value != null) {
|
|
644
|
+
else if (!Array.isArray(__value) && __value != null && currentData) {
|
|
637
645
|
__value = currentData[key_1];
|
|
638
646
|
}
|
|
639
647
|
}
|
|
648
|
+
else {
|
|
649
|
+
if (currentData) {
|
|
650
|
+
if (Array.isArray(__value) && __value.length > 0) {
|
|
651
|
+
__value = currentData.map(function (item) { return item[key_1]; });
|
|
652
|
+
}
|
|
653
|
+
else if (!Array.isArray(__value) && __value != null) {
|
|
654
|
+
__value = currentData[key_1];
|
|
655
|
+
}
|
|
656
|
+
}
|
|
657
|
+
}
|
|
640
658
|
onChange && onChange(__value, option, currentData);
|
|
641
659
|
}
|
|
642
660
|
else {
|