phx-uikit 1.0.69 → 1.0.70
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/cjs/components/Func/PHXUseQueryDataV3.d.ts +2 -1
- package/dist/cjs/components/Func/PHXUseQueryDataV3.js +24 -8
- package/dist/cjs/components/Func/PHXUseQueryDataV3.js.map +1 -1
- package/dist/esm/components/Func/PHXUseQueryDataV3.d.ts +2 -1
- package/dist/esm/components/Func/PHXUseQueryDataV3.js +24 -8
- package/dist/esm/components/Func/PHXUseQueryDataV3.js.map +1 -1
- package/package.json +1 -2
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
export default function PHXUesQueryDataV3({ dependencies, query, variables, }: {
|
|
1
|
+
export default function PHXUesQueryDataV3({ dependencies, query, variables, requiredFields, }: {
|
|
2
2
|
query: string;
|
|
3
3
|
variables?: any;
|
|
4
4
|
dependencies?: Array<any>;
|
|
5
|
+
requiredFields?: Array<string>;
|
|
5
6
|
}): {
|
|
6
7
|
isLoading: boolean;
|
|
7
8
|
data: any;
|
|
@@ -5,31 +5,47 @@ var react_1 = require("react");
|
|
|
5
5
|
var clientQueryV3_1 = tslib_1.__importDefault(require("./clientQueryV3"));
|
|
6
6
|
function PHXUesQueryDataV3(_a) {
|
|
7
7
|
var _this = this;
|
|
8
|
-
var dependencies = _a.dependencies, query = _a.query, variables = _a.variables;
|
|
8
|
+
var dependencies = _a.dependencies, query = _a.query, variables = _a.variables, requiredFields = _a.requiredFields;
|
|
9
9
|
var _b = (0, react_1.useState)(true), isLoading = _b[0], setIsLoading = _b[1];
|
|
10
10
|
var _c = (0, react_1.useState)(), data = _c[0], setData = _c[1];
|
|
11
11
|
var _d = (0, react_1.useState)(null), error = _d[0], setError = _d[1];
|
|
12
|
+
var isValidVariables = function () {
|
|
13
|
+
// Nếu không có variables, trả về true
|
|
14
|
+
if (!variables)
|
|
15
|
+
return true;
|
|
16
|
+
// Nếu có requiredFields, kiểm tra chỉ các key trong requiredFields
|
|
17
|
+
if (requiredFields) {
|
|
18
|
+
return requiredFields.every(function (key) { return variables[key] !== undefined && variables[key] !== null && variables[key] !== ''; });
|
|
19
|
+
}
|
|
20
|
+
// Nếu không có requiredFields, kiểm tra toàn bộ variables
|
|
21
|
+
return Object.values(variables).every(function (value) { return value !== undefined && value !== null && value !== ''; });
|
|
22
|
+
};
|
|
12
23
|
(0, react_1.useEffect)(function () {
|
|
13
24
|
var fetchData = function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
14
25
|
var response, err_1;
|
|
15
26
|
return tslib_1.__generator(this, function (_a) {
|
|
16
27
|
switch (_a.label) {
|
|
17
28
|
case 0:
|
|
18
|
-
|
|
19
|
-
|
|
29
|
+
if (!isValidVariables()) {
|
|
30
|
+
return [2 /*return*/];
|
|
31
|
+
}
|
|
32
|
+
_a.label = 1;
|
|
20
33
|
case 1:
|
|
34
|
+
_a.trys.push([1, 3, 4, 5]);
|
|
35
|
+
return [4 /*yield*/, (0, clientQueryV3_1["default"])(tslib_1.__assign({ query: query }, (variables && { variables: variables })))];
|
|
36
|
+
case 2:
|
|
21
37
|
response = _a.sent();
|
|
22
38
|
setData(response.data);
|
|
23
|
-
return [3 /*break*/,
|
|
24
|
-
case
|
|
39
|
+
return [3 /*break*/, 5];
|
|
40
|
+
case 3:
|
|
25
41
|
err_1 = _a.sent();
|
|
26
42
|
setError('An error occurred while fetching data.');
|
|
27
43
|
console.error(err_1);
|
|
28
|
-
return [3 /*break*/,
|
|
29
|
-
case
|
|
44
|
+
return [3 /*break*/, 5];
|
|
45
|
+
case 4:
|
|
30
46
|
setIsLoading(false);
|
|
31
47
|
return [7 /*endfinally*/];
|
|
32
|
-
case
|
|
48
|
+
case 5: return [2 /*return*/];
|
|
33
49
|
}
|
|
34
50
|
});
|
|
35
51
|
}); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PHXUseQueryDataV3.js","sourceRoot":"","sources":["../../../../src/components/Func/PHXUseQueryDataV3.ts"],"names":[],"mappings":";;;AAAA,+BAA2C;AAC3C,0EAA8C;AAE9C,SAAwB,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"PHXUseQueryDataV3.js","sourceRoot":"","sources":["../../../../src/components/Func/PHXUseQueryDataV3.ts"],"names":[],"mappings":";;;AAAA,+BAA2C;AAC3C,0EAA8C;AAE9C,SAAwB,iBAAiB,CAAC,EAUzC;IAVD,iBAyDC;QAxDC,YAAY,kBAAA,EACZ,KAAK,WAAA,EACL,SAAS,eAAA,EACT,cAAc,oBAAA;IAOR,IAAA,KAA4B,IAAA,gBAAQ,EAAC,IAAI,CAAC,EAAzC,SAAS,QAAA,EAAE,YAAY,QAAkB,CAAA;IAC1C,IAAA,KAAkB,IAAA,gBAAQ,GAAO,EAAhC,IAAI,QAAA,EAAE,OAAO,QAAmB,CAAA;IACjC,IAAA,KAAoB,IAAA,gBAAQ,EAAgB,IAAI,CAAC,EAAhD,KAAK,QAAA,EAAE,QAAQ,QAAiC,CAAA;IAEvD,IAAM,gBAAgB,GAAG;QACvB,sCAAsC;QACtC,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAA;QAE3B,mEAAmE;QACnE,IAAI,cAAc,EAAE;YAClB,OAAO,cAAc,CAAC,KAAK,CACzB,UAAC,GAAG,IAAK,OAAA,SAAS,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,EAAhF,CAAgF,CAC1F,CAAA;SACF;QAED,0DAA0D;QAC1D,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,EAArD,CAAqD,CAAC,CAAA;IACzG,CAAC,CAAA;IAED,IAAA,iBAAS,EACP;QACE,IAAM,SAAS,GAAG;;;;;wBAChB,IAAI,CAAC,gBAAgB,EAAE,EAAE;4BACvB,sBAAM;yBACP;;;;wBAGkB,qBAAM,IAAA,0BAAgB,qBACrC,KAAK,OAAA,IACF,CAAC,SAAS,IAAI,EAAE,SAAS,WAAA,EAAE,CAAC,EAC/B,EAAA;;wBAHI,QAAQ,GAAG,SAGf;wBACF,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;;;;wBAEtB,QAAQ,CAAC,wCAAwC,CAAC,CAAA;wBAClD,OAAO,CAAC,KAAK,CAAC,KAAG,CAAC,CAAA;;;wBAElB,YAAY,CAAC,KAAK,CAAC,CAAA;;;;;aAEtB,CAAA;QAED,SAAS,EAAE,CAAA;IACb,CAAC,EACD,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,2BAAK,YAAY,QAAE,CAAC,CAAC,EAAE,CACrD,CAAA,CAAC,kCAAkC;IAEpC,OAAO,EAAE,SAAS,WAAA,EAAE,IAAI,MAAA,EAAE,KAAK,OAAA,EAAE,CAAA;AACnC,CAAC;AAzDD,uCAyDC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
export default function PHXUesQueryDataV3({ dependencies, query, variables, }: {
|
|
1
|
+
export default function PHXUesQueryDataV3({ dependencies, query, variables, requiredFields, }: {
|
|
2
2
|
query: string;
|
|
3
3
|
variables?: any;
|
|
4
4
|
dependencies?: Array<any>;
|
|
5
|
+
requiredFields?: Array<string>;
|
|
5
6
|
}): {
|
|
6
7
|
isLoading: boolean;
|
|
7
8
|
data: any;
|
|
@@ -3,31 +3,47 @@ import { useState, useEffect } from 'react';
|
|
|
3
3
|
import PHXClientQueryV3 from './clientQueryV3';
|
|
4
4
|
export default function PHXUesQueryDataV3(_a) {
|
|
5
5
|
var _this = this;
|
|
6
|
-
var dependencies = _a.dependencies, query = _a.query, variables = _a.variables;
|
|
6
|
+
var dependencies = _a.dependencies, query = _a.query, variables = _a.variables, requiredFields = _a.requiredFields;
|
|
7
7
|
var _b = useState(true), isLoading = _b[0], setIsLoading = _b[1];
|
|
8
8
|
var _c = useState(), data = _c[0], setData = _c[1];
|
|
9
9
|
var _d = useState(null), error = _d[0], setError = _d[1];
|
|
10
|
+
var isValidVariables = function () {
|
|
11
|
+
// Nếu không có variables, trả về true
|
|
12
|
+
if (!variables)
|
|
13
|
+
return true;
|
|
14
|
+
// Nếu có requiredFields, kiểm tra chỉ các key trong requiredFields
|
|
15
|
+
if (requiredFields) {
|
|
16
|
+
return requiredFields.every(function (key) { return variables[key] !== undefined && variables[key] !== null && variables[key] !== ''; });
|
|
17
|
+
}
|
|
18
|
+
// Nếu không có requiredFields, kiểm tra toàn bộ variables
|
|
19
|
+
return Object.values(variables).every(function (value) { return value !== undefined && value !== null && value !== ''; });
|
|
20
|
+
};
|
|
10
21
|
useEffect(function () {
|
|
11
22
|
var fetchData = function () { return __awaiter(_this, void 0, void 0, function () {
|
|
12
23
|
var response, err_1;
|
|
13
24
|
return __generator(this, function (_a) {
|
|
14
25
|
switch (_a.label) {
|
|
15
26
|
case 0:
|
|
16
|
-
|
|
17
|
-
|
|
27
|
+
if (!isValidVariables()) {
|
|
28
|
+
return [2 /*return*/];
|
|
29
|
+
}
|
|
30
|
+
_a.label = 1;
|
|
18
31
|
case 1:
|
|
32
|
+
_a.trys.push([1, 3, 4, 5]);
|
|
33
|
+
return [4 /*yield*/, PHXClientQueryV3(__assign({ query: query }, (variables && { variables: variables })))];
|
|
34
|
+
case 2:
|
|
19
35
|
response = _a.sent();
|
|
20
36
|
setData(response.data);
|
|
21
|
-
return [3 /*break*/,
|
|
22
|
-
case
|
|
37
|
+
return [3 /*break*/, 5];
|
|
38
|
+
case 3:
|
|
23
39
|
err_1 = _a.sent();
|
|
24
40
|
setError('An error occurred while fetching data.');
|
|
25
41
|
console.error(err_1);
|
|
26
|
-
return [3 /*break*/,
|
|
27
|
-
case
|
|
42
|
+
return [3 /*break*/, 5];
|
|
43
|
+
case 4:
|
|
28
44
|
setIsLoading(false);
|
|
29
45
|
return [7 /*endfinally*/];
|
|
30
|
-
case
|
|
46
|
+
case 5: return [2 /*return*/];
|
|
31
47
|
}
|
|
32
48
|
});
|
|
33
49
|
}); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PHXUseQueryDataV3.js","sourceRoot":"","sources":["../../../../src/components/Func/PHXUseQueryDataV3.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,gBAAgB,MAAM,iBAAiB,CAAA;AAE9C,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"PHXUseQueryDataV3.js","sourceRoot":"","sources":["../../../../src/components/Func/PHXUseQueryDataV3.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,gBAAgB,MAAM,iBAAiB,CAAA;AAE9C,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EAUzC;IAVD,iBAyDC;QAxDC,YAAY,kBAAA,EACZ,KAAK,WAAA,EACL,SAAS,eAAA,EACT,cAAc,oBAAA;IAOR,IAAA,KAA4B,QAAQ,CAAC,IAAI,CAAC,EAAzC,SAAS,QAAA,EAAE,YAAY,QAAkB,CAAA;IAC1C,IAAA,KAAkB,QAAQ,EAAO,EAAhC,IAAI,QAAA,EAAE,OAAO,QAAmB,CAAA;IACjC,IAAA,KAAoB,QAAQ,CAAgB,IAAI,CAAC,EAAhD,KAAK,QAAA,EAAE,QAAQ,QAAiC,CAAA;IAEvD,IAAM,gBAAgB,GAAG;QACvB,sCAAsC;QACtC,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAA;QAE3B,mEAAmE;QACnE,IAAI,cAAc,EAAE;YAClB,OAAO,cAAc,CAAC,KAAK,CACzB,UAAC,GAAG,IAAK,OAAA,SAAS,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,EAAhF,CAAgF,CAC1F,CAAA;SACF;QAED,0DAA0D;QAC1D,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,EAArD,CAAqD,CAAC,CAAA;IACzG,CAAC,CAAA;IAED,SAAS,CACP;QACE,IAAM,SAAS,GAAG;;;;;wBAChB,IAAI,CAAC,gBAAgB,EAAE,EAAE;4BACvB,sBAAM;yBACP;;;;wBAGkB,qBAAM,gBAAgB,YACrC,KAAK,OAAA,IACF,CAAC,SAAS,IAAI,EAAE,SAAS,WAAA,EAAE,CAAC,EAC/B,EAAA;;wBAHI,QAAQ,GAAG,SAGf;wBACF,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;;;;wBAEtB,QAAQ,CAAC,wCAAwC,CAAC,CAAA;wBAClD,OAAO,CAAC,KAAK,CAAC,KAAG,CAAC,CAAA;;;wBAElB,YAAY,CAAC,KAAK,CAAC,CAAA;;;;;aAEtB,CAAA;QAED,SAAS,EAAE,CAAA;IACb,CAAC,EACD,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,mBAAK,YAAY,QAAE,CAAC,CAAC,EAAE,CACrD,CAAA,CAAC,kCAAkC;IAEpC,OAAO,EAAE,SAAS,WAAA,EAAE,IAAI,MAAA,EAAE,KAAK,OAAA,EAAE,CAAA;AACnC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "phx-uikit",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.70",
|
|
4
4
|
"description": "PHX REACT",
|
|
5
5
|
"main": "./dist/cjs/index.js",
|
|
6
6
|
"module": "./dist/esm/index.js",
|
|
@@ -96,7 +96,6 @@
|
|
|
96
96
|
},
|
|
97
97
|
"dependencies": {
|
|
98
98
|
"axios": "^1.5.0",
|
|
99
|
-
"crypto": "^1.0.1",
|
|
100
99
|
"date-fns": "^2.30.0",
|
|
101
100
|
"recharts": "^2.12.7"
|
|
102
101
|
},
|