@faasjs/ant-design 0.0.3-beta.2 → 0.0.3-beta.3
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/index.js +25 -4
- package/dist/index.mjs +25 -4
- package/package.json +2 -2
package/dist/index.js
CHANGED
|
@@ -1014,6 +1014,8 @@ function Table(props) {
|
|
|
1014
1014
|
item.render = (value) => processValue(item, value);
|
|
1015
1015
|
if (!item.onFilter)
|
|
1016
1016
|
item.onFilter = (value, row) => {
|
|
1017
|
+
if (value === null && (0, import_lodash_es6.isNil)(row[item.id]))
|
|
1018
|
+
return true;
|
|
1017
1019
|
if (!row[item.id])
|
|
1018
1020
|
return false;
|
|
1019
1021
|
return row[item.id].toLowerCase().includes(value.toLowerCase());
|
|
@@ -1042,6 +1044,8 @@ function Table(props) {
|
|
|
1042
1044
|
item.render = (value) => processValue(item, value);
|
|
1043
1045
|
if (!item.onFilter)
|
|
1044
1046
|
item.onFilter = (value, row) => {
|
|
1047
|
+
if (value === null && (!row[item.id] || !row[item.id].length))
|
|
1048
|
+
return true;
|
|
1045
1049
|
if (!row[item.id] || !row[item.id].length)
|
|
1046
1050
|
return false;
|
|
1047
1051
|
return row[item.id].some((v) => v.toLowerCase().includes(value.toLowerCase()));
|
|
@@ -1071,7 +1075,11 @@ function Table(props) {
|
|
|
1071
1075
|
if (!item.sorter)
|
|
1072
1076
|
item.sorter = (a, b) => a[item.id] - b[item.id];
|
|
1073
1077
|
if (!item.onFilter)
|
|
1074
|
-
item.onFilter = (value, row) =>
|
|
1078
|
+
item.onFilter = (value, row) => {
|
|
1079
|
+
if (value === null && (0, import_lodash_es6.isNil)(row[item.id]))
|
|
1080
|
+
return true;
|
|
1081
|
+
return value === row[item.id];
|
|
1082
|
+
};
|
|
1075
1083
|
if (!item.filters && item.filterDropdown !== false)
|
|
1076
1084
|
item.filterDropdown = ({
|
|
1077
1085
|
setSelectedKeys,
|
|
@@ -1095,7 +1103,13 @@ function Table(props) {
|
|
|
1095
1103
|
if (!item.render)
|
|
1096
1104
|
item.render = (value) => processValue(item, value).join(", ");
|
|
1097
1105
|
if (!item.onFilter)
|
|
1098
|
-
item.onFilter = (value, row) =>
|
|
1106
|
+
item.onFilter = (value, row) => {
|
|
1107
|
+
if (value === null && (!row[item.id] || !row[item.id].length))
|
|
1108
|
+
return true;
|
|
1109
|
+
if (!row[item.id] || !row[item.id].length)
|
|
1110
|
+
return false;
|
|
1111
|
+
return row[item.id].includes(value);
|
|
1112
|
+
};
|
|
1099
1113
|
if (!item.filters && item.filterDropdown !== false)
|
|
1100
1114
|
item.filterDropdown = ({
|
|
1101
1115
|
setSelectedKeys,
|
|
@@ -1219,7 +1233,11 @@ function Table(props) {
|
|
|
1219
1233
|
if (!item.render)
|
|
1220
1234
|
item.render = (value) => processValue(item, value);
|
|
1221
1235
|
if (!item.onFilter)
|
|
1222
|
-
item.onFilter = (value, row) =>
|
|
1236
|
+
item.onFilter = (value, row) => {
|
|
1237
|
+
if (value === null && (0, import_lodash_es6.isNil)(row[item.id]))
|
|
1238
|
+
return true;
|
|
1239
|
+
return value === row[item.id];
|
|
1240
|
+
};
|
|
1223
1241
|
break;
|
|
1224
1242
|
}
|
|
1225
1243
|
}
|
|
@@ -1236,7 +1254,10 @@ function Table(props) {
|
|
|
1236
1254
|
newColumns[index].filters = (0, import_lodash_es6.uniqBy)(props.dataSource, column.id).map((v) => ({
|
|
1237
1255
|
text: v[column.id],
|
|
1238
1256
|
value: v[column.id]
|
|
1239
|
-
}))
|
|
1257
|
+
})).concat({
|
|
1258
|
+
text: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Blank, {}),
|
|
1259
|
+
value: null
|
|
1260
|
+
});
|
|
1240
1261
|
return newColumns;
|
|
1241
1262
|
});
|
|
1242
1263
|
}
|
package/dist/index.mjs
CHANGED
|
@@ -1017,6 +1017,8 @@ function Table(props) {
|
|
|
1017
1017
|
item.render = (value) => processValue(item, value);
|
|
1018
1018
|
if (!item.onFilter)
|
|
1019
1019
|
item.onFilter = (value, row) => {
|
|
1020
|
+
if (value === null && isNil2(row[item.id]))
|
|
1021
|
+
return true;
|
|
1020
1022
|
if (!row[item.id])
|
|
1021
1023
|
return false;
|
|
1022
1024
|
return row[item.id].toLowerCase().includes(value.toLowerCase());
|
|
@@ -1045,6 +1047,8 @@ function Table(props) {
|
|
|
1045
1047
|
item.render = (value) => processValue(item, value);
|
|
1046
1048
|
if (!item.onFilter)
|
|
1047
1049
|
item.onFilter = (value, row) => {
|
|
1050
|
+
if (value === null && (!row[item.id] || !row[item.id].length))
|
|
1051
|
+
return true;
|
|
1048
1052
|
if (!row[item.id] || !row[item.id].length)
|
|
1049
1053
|
return false;
|
|
1050
1054
|
return row[item.id].some((v) => v.toLowerCase().includes(value.toLowerCase()));
|
|
@@ -1074,7 +1078,11 @@ function Table(props) {
|
|
|
1074
1078
|
if (!item.sorter)
|
|
1075
1079
|
item.sorter = (a, b) => a[item.id] - b[item.id];
|
|
1076
1080
|
if (!item.onFilter)
|
|
1077
|
-
item.onFilter = (value, row) =>
|
|
1081
|
+
item.onFilter = (value, row) => {
|
|
1082
|
+
if (value === null && isNil2(row[item.id]))
|
|
1083
|
+
return true;
|
|
1084
|
+
return value === row[item.id];
|
|
1085
|
+
};
|
|
1078
1086
|
if (!item.filters && item.filterDropdown !== false)
|
|
1079
1087
|
item.filterDropdown = ({
|
|
1080
1088
|
setSelectedKeys,
|
|
@@ -1098,7 +1106,13 @@ function Table(props) {
|
|
|
1098
1106
|
if (!item.render)
|
|
1099
1107
|
item.render = (value) => processValue(item, value).join(", ");
|
|
1100
1108
|
if (!item.onFilter)
|
|
1101
|
-
item.onFilter = (value, row) =>
|
|
1109
|
+
item.onFilter = (value, row) => {
|
|
1110
|
+
if (value === null && (!row[item.id] || !row[item.id].length))
|
|
1111
|
+
return true;
|
|
1112
|
+
if (!row[item.id] || !row[item.id].length)
|
|
1113
|
+
return false;
|
|
1114
|
+
return row[item.id].includes(value);
|
|
1115
|
+
};
|
|
1102
1116
|
if (!item.filters && item.filterDropdown !== false)
|
|
1103
1117
|
item.filterDropdown = ({
|
|
1104
1118
|
setSelectedKeys,
|
|
@@ -1222,7 +1236,11 @@ function Table(props) {
|
|
|
1222
1236
|
if (!item.render)
|
|
1223
1237
|
item.render = (value) => processValue(item, value);
|
|
1224
1238
|
if (!item.onFilter)
|
|
1225
|
-
item.onFilter = (value, row) =>
|
|
1239
|
+
item.onFilter = (value, row) => {
|
|
1240
|
+
if (value === null && isNil2(row[item.id]))
|
|
1241
|
+
return true;
|
|
1242
|
+
return value === row[item.id];
|
|
1243
|
+
};
|
|
1226
1244
|
break;
|
|
1227
1245
|
}
|
|
1228
1246
|
}
|
|
@@ -1239,7 +1257,10 @@ function Table(props) {
|
|
|
1239
1257
|
newColumns[index].filters = uniqBy(props.dataSource, column.id).map((v) => ({
|
|
1240
1258
|
text: v[column.id],
|
|
1241
1259
|
value: v[column.id]
|
|
1242
|
-
}))
|
|
1260
|
+
})).concat({
|
|
1261
|
+
text: /* @__PURE__ */ jsx10(Blank, {}),
|
|
1262
|
+
value: null
|
|
1263
|
+
});
|
|
1243
1264
|
return newColumns;
|
|
1244
1265
|
});
|
|
1245
1266
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@faasjs/ant-design",
|
|
3
|
-
"version": "0.0.3-beta.
|
|
3
|
+
"version": "0.0.3-beta.3",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"module": "dist/index.mjs",
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"lodash-es": "*",
|
|
29
29
|
"react": "*",
|
|
30
30
|
"react-dom": "*",
|
|
31
|
-
"@faasjs/react": "^0.0.3-beta.
|
|
31
|
+
"@faasjs/react": "^0.0.3-beta.3",
|
|
32
32
|
"react-router-dom": "*",
|
|
33
33
|
"dayjs": "*"
|
|
34
34
|
},
|