awing-library 2.1.97-beta → 2.1.98-beta
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.
|
@@ -74,7 +74,6 @@ var DataTable = function (props) {
|
|
|
74
74
|
return;
|
|
75
75
|
if (isError)
|
|
76
76
|
setIsError(function () { return false; });
|
|
77
|
-
console.log("query");
|
|
78
77
|
if (isSelectedTagAll) {
|
|
79
78
|
setIsLoading(function () { return true; });
|
|
80
79
|
getTagAllPlaces()
|
|
@@ -105,7 +104,7 @@ var DataTable = function (props) {
|
|
|
105
104
|
(0, react_1.useEffect)(function () {
|
|
106
105
|
queryData();
|
|
107
106
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
108
|
-
}, [pageIndex, pageSize]);
|
|
107
|
+
}, [pageIndex, pageSize, isSelectedTagAll]);
|
|
109
108
|
var getAllPlaces = function () {
|
|
110
109
|
return getPlacesByFilter((tagSelected === null || tagSelected === void 0 ? void 0 : tagSelected.filterFields) || []);
|
|
111
110
|
};
|
|
@@ -20,8 +20,9 @@ var recoil_1 = require("recoil");
|
|
|
20
20
|
var component_1 = __importDefault(require("./component"));
|
|
21
21
|
var common_1 = require("../common");
|
|
22
22
|
var Enum_1 = require("../Enum");
|
|
23
|
+
var react_1 = require("react");
|
|
23
24
|
var FieldInput = function () {
|
|
24
|
-
var _a = (0, recoil_1.useRecoilState)(Atom_1.isSelectedTagAllState), setIsSelectedTagAll = _a[1];
|
|
25
|
+
var _a = (0, recoil_1.useRecoilState)(Atom_1.isSelectedTagAllState), isSelectedTagAll = _a[0], setIsSelectedTagAll = _a[1];
|
|
25
26
|
var _b = (0, recoil_1.useRecoilState)(Atom_1.tagSelectedState), tagSelected = _b[0], setTagSelected = _b[1];
|
|
26
27
|
var tagsAll = (0, recoil_1.useRecoilValue)(Atom_1.tagsAllState);
|
|
27
28
|
var handleChange = function (newValue, index, isChangeOperator) {
|
|
@@ -55,6 +56,15 @@ var FieldInput = function () {
|
|
|
55
56
|
setTagSelected(tagPrepare);
|
|
56
57
|
}
|
|
57
58
|
};
|
|
58
|
-
|
|
59
|
+
// console.log("defaultTagValue", defaultTagValue)
|
|
60
|
+
var inputFilters = (0, react_1.useMemo)(function () {
|
|
61
|
+
if (isSelectedTagAll) {
|
|
62
|
+
return ((tagSelected === null || tagSelected === void 0 ? void 0 : tagSelected.filterFields) || []).map(function (input, index) {
|
|
63
|
+
return __assign(__assign({}, input), { value: common_1.defaultTagValue[input.type] });
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
return (tagSelected === null || tagSelected === void 0 ? void 0 : tagSelected.filterFields) || [];
|
|
67
|
+
}, [isSelectedTagAll, tagSelected]);
|
|
68
|
+
return ((0, jsx_runtime_1.jsx)(component_1.default, { inputFilters: inputFilters, onChange: handleChange }));
|
|
59
69
|
};
|
|
60
70
|
exports.default = FieldInput;
|
|
@@ -1,6 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
2
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.compareTwoArrayObject = void 0;
|
|
14
|
+
exports.defaultTagValue = exports.compareTwoArrayObject = void 0;
|
|
15
|
+
var Enum_1 = require("./Enum");
|
|
4
16
|
var isEqual = require("lodash/isEqual");
|
|
5
17
|
var compareTwoArrayObject = function (arrObj1, arrObj2) {
|
|
6
18
|
var result = (arrObj1 || []).filter(function (object1) {
|
|
@@ -23,3 +35,17 @@ var compareTwoArrayObject = function (arrObj1, arrObj2) {
|
|
|
23
35
|
return result;
|
|
24
36
|
};
|
|
25
37
|
exports.compareTwoArrayObject = compareTwoArrayObject;
|
|
38
|
+
exports.defaultTagValue = Object.entries(Enum_1.EnumFieldInputType).reduce(function (obj, _a) {
|
|
39
|
+
var _b;
|
|
40
|
+
var key = _a[0], value = _a[1];
|
|
41
|
+
return __assign(__assign({}, obj), (_b = {}, _b[value] = (function () {
|
|
42
|
+
switch (value) {
|
|
43
|
+
case Enum_1.EnumFieldInputType.TEXT:
|
|
44
|
+
return "";
|
|
45
|
+
case Enum_1.EnumFieldInputType.GEO_FENCING:
|
|
46
|
+
return undefined;
|
|
47
|
+
default:
|
|
48
|
+
return [];
|
|
49
|
+
}
|
|
50
|
+
})(), _b));
|
|
51
|
+
}, {});
|