ag-common 0.0.228 → 0.0.231
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.
|
@@ -48,6 +48,9 @@ const basecss = (0, styled_components_1.css) `
|
|
|
48
48
|
font-size: inherit;
|
|
49
49
|
font-weight: inherit;
|
|
50
50
|
font-family: inherit;
|
|
51
|
+
&::placeholder {
|
|
52
|
+
color: #bbb;
|
|
53
|
+
}
|
|
51
54
|
`;
|
|
52
55
|
const ValueTextArea = styled_components_1.default.textarea `
|
|
53
56
|
${basecss}
|
|
@@ -103,12 +106,12 @@ const TextEdit = ({ defaultValue = '', defaultEditing, disableEdit = false, plac
|
|
|
103
106
|
setEditingRaw(false);
|
|
104
107
|
}
|
|
105
108
|
});
|
|
106
|
-
const setEditing = (b) => {
|
|
109
|
+
const setEditing = (0, react_1.useCallback)((b) => {
|
|
107
110
|
setEditingRaw(b);
|
|
108
111
|
if (onEditingChange) {
|
|
109
112
|
onEditingChange(b);
|
|
110
113
|
}
|
|
111
|
-
};
|
|
114
|
+
}, [onEditingChange]);
|
|
112
115
|
(0, react_1.useEffect)(() => {
|
|
113
116
|
setValue(defaultValue);
|
|
114
117
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
@@ -117,9 +120,8 @@ const TextEdit = ({ defaultValue = '', defaultEditing, disableEdit = false, plac
|
|
|
117
120
|
if ((defaultEditing === null || defaultEditing === void 0 ? void 0 : defaultEditing.focus) && taref.current) {
|
|
118
121
|
taref.current.focus();
|
|
119
122
|
}
|
|
120
|
-
setEditing(!!defaultEditing);
|
|
121
123
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
122
|
-
}, [
|
|
124
|
+
}, []);
|
|
123
125
|
if (!editing || disableEdit) {
|
|
124
126
|
return (react_1.default.createElement(common_1.ValueBox, Object.assign({}, common_2.noDrag, { className: className, "data-editing": "false", onClick: () => onClickNotEditing === null || onClickNotEditing === void 0 ? void 0 : onClickNotEditing(), "data-pointer": onClickNotEditing ? 'true' : 'false', "data-nogrow": noGrow }, attributes),
|
|
125
127
|
leftContent || null,
|
|
@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.axiosHelper = void 0;
|
|
16
16
|
const log_1 = require("../../common/helpers/log");
|
|
17
17
|
const object_1 = require("../../common/helpers/object");
|
|
18
|
+
const common_1 = require("../../common");
|
|
18
19
|
const axios_1 = __importDefault(require("axios"));
|
|
19
20
|
/**
|
|
20
21
|
*
|
|
@@ -23,11 +24,12 @@ const axios_1 = __importDefault(require("axios"));
|
|
|
23
24
|
*/
|
|
24
25
|
const axiosHelper = ({ verb, url, body, headers, timeout = 30000, retryMax = 0, onStaleAuth, }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
25
26
|
let retry = 0;
|
|
27
|
+
let ret;
|
|
26
28
|
do {
|
|
27
29
|
try {
|
|
28
30
|
const setHeaders = Object.assign({ Accept: 'application/json' }, headers);
|
|
29
31
|
if (verb === 'get') {
|
|
30
|
-
|
|
32
|
+
ret = yield axios_1.default.get(url, {
|
|
31
33
|
headers: setHeaders,
|
|
32
34
|
timeout,
|
|
33
35
|
timeoutErrorMessage: `${url} timeout`,
|
|
@@ -50,7 +52,6 @@ const axiosHelper = ({ verb, url, body, headers, timeout = 30000, retryMax = 0,
|
|
|
50
52
|
axios = axios_1.default.delete;
|
|
51
53
|
noBody = true;
|
|
52
54
|
}
|
|
53
|
-
let ret;
|
|
54
55
|
if (noBody) {
|
|
55
56
|
ret = yield axios(url, {
|
|
56
57
|
headers: setHeaders,
|
|
@@ -81,6 +82,7 @@ const axiosHelper = ({ verb, url, body, headers, timeout = 30000, retryMax = 0,
|
|
|
81
82
|
}
|
|
82
83
|
}
|
|
83
84
|
retry += 1;
|
|
85
|
+
yield (0, common_1.sleep)(1000);
|
|
84
86
|
} while (retry <= retryMax);
|
|
85
87
|
throw new Error('unexpected');
|
|
86
88
|
});
|
|
@@ -13,9 +13,15 @@ exports.useCallOpenApi = void 0;
|
|
|
13
13
|
const cached_1 = require("./cached");
|
|
14
14
|
const direct_1 = require("./direct");
|
|
15
15
|
const react_1 = require("react");
|
|
16
|
-
const defaultState = (p
|
|
16
|
+
const defaultState = (p,
|
|
17
|
+
/**
|
|
18
|
+
* default false
|
|
19
|
+
*/
|
|
20
|
+
noSsr = false) => {
|
|
17
21
|
var _a;
|
|
18
|
-
const cachedData =
|
|
22
|
+
const cachedData = noSsr
|
|
23
|
+
? undefined
|
|
24
|
+
: (_a = (0, cached_1.callOpenApiCachedRaw)(Object.assign(Object.assign({}, p), { onlyCached: true }))) === null || _a === void 0 ? void 0 : _a.data;
|
|
19
25
|
return Object.assign(Object.assign({ data: undefined, url: '', datetime: 0, loadcount: 0, loading: false, reFetch: () => __awaiter(void 0, void 0, void 0, function* () { }), setData: () => { } }, (cachedData && { data: cachedData })), { loaded: !!cachedData });
|
|
20
26
|
};
|
|
21
27
|
/**
|
|
@@ -29,7 +35,7 @@ const useCallOpenApi = (pIn) => {
|
|
|
29
35
|
(0, react_1.useEffect)(() => {
|
|
30
36
|
if (JSON.stringify(p) !== JSON.stringify(pIn)) {
|
|
31
37
|
setP(pIn);
|
|
32
|
-
setData(defaultState(pIn));
|
|
38
|
+
setData(defaultState(pIn, true));
|
|
33
39
|
}
|
|
34
40
|
}, [p, pIn]);
|
|
35
41
|
(0, react_1.useEffect)(() => {
|
|
@@ -47,7 +53,7 @@ const useCallOpenApi = (pIn) => {
|
|
|
47
53
|
setData((d) => (Object.assign(Object.assign({}, d), { loading: true })));
|
|
48
54
|
void run();
|
|
49
55
|
}, [data, p, setData]);
|
|
50
|
-
return Object.assign(Object.assign({}, data), { reFetch: () => __awaiter(void 0, void 0, void 0, function* () { return setData(defaultState(p)); }), setData: (d) => {
|
|
56
|
+
return Object.assign(Object.assign({}, data), { reFetch: () => __awaiter(void 0, void 0, void 0, function* () { return setData(defaultState(p, true)); }), setData: (d) => {
|
|
51
57
|
setData(Object.assign(Object.assign({}, data), { data: d(data.data), datetime: new Date().getTime() }));
|
|
52
58
|
} });
|
|
53
59
|
};
|