@puca/puca-core 7.7.1 → 7.7.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/core/services/index.d.ts +1 -1
- package/dist/core/services/index.js +3 -3
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/life-cycle.service.d.ts +3 -1
- package/dist/core/services/life-cycle.service.js +17 -8
- package/dist/core/services/life-cycle.service.js.map +1 -1
- package/dist/core/services/single-instance-ensure.service.d.ts +5 -0
- package/dist/core/services/single-instance-ensure.service.js +45 -7
- package/dist/core/services/single-instance-ensure.service.js.map +1 -1
- package/dist/core/services/source/gcloud-run-cloud/v1/application.service.js +9 -5
- package/dist/core/services/source/gcloud-run-cloud/v1/application.service.js.map +1 -1
- package/dist/models/field-dictionary.d.ts +6 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -18,9 +18,9 @@ import { JobService } from './job/job.service';
|
|
|
18
18
|
import { SingleInstanceEnsureService } from './single-instance-ensure.service';
|
|
19
19
|
export declare const singleInstanceEnsureService: SingleInstanceEnsureService;
|
|
20
20
|
export declare const configsService: ConfigsService;
|
|
21
|
-
export declare const storageServiceManager: StorageServiceManager;
|
|
22
21
|
export declare const moduleConfigService: ModuleConfigService;
|
|
23
22
|
export declare const jobService: JobService;
|
|
23
|
+
export declare const storageServiceManager: StorageServiceManager;
|
|
24
24
|
export declare const authService: AuthService;
|
|
25
25
|
export declare const cacheServiceFactory: CacheServiceFactory;
|
|
26
26
|
export declare const userConfigService: UserConfigService;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.lifeCycleService = exports.reportService = exports.notificationService = exports.webSocketService = exports.installService = exports.bootstrapService = exports.migrationService = exports.sourceService = exports.comunicationService = exports.comunicationHttpService = exports.userConfigService = exports.cacheServiceFactory = exports.authService = exports.
|
|
3
|
+
exports.lifeCycleService = exports.reportService = exports.notificationService = exports.webSocketService = exports.installService = exports.bootstrapService = exports.migrationService = exports.sourceService = exports.comunicationService = exports.comunicationHttpService = exports.userConfigService = exports.cacheServiceFactory = exports.authService = exports.storageServiceManager = exports.jobService = exports.moduleConfigService = exports.configsService = exports.singleInstanceEnsureService = void 0;
|
|
4
4
|
const plugins_1 = require("../../plugins");
|
|
5
5
|
const essential_1 = require("../../essential");
|
|
6
6
|
const services_1 = require("../../orm/services");
|
|
@@ -28,9 +28,9 @@ const single_instance_ensure_service_1 = require("./single-instance-ensure.servi
|
|
|
28
28
|
exports.singleInstanceEnsureService = new single_instance_ensure_service_1.SingleInstanceEnsureService(services_1.redisManagerService);
|
|
29
29
|
exports.configsService = new configs_service_1.ConfigsService(plugins_1.fileSystemService);
|
|
30
30
|
const jobClientManager = new job_client_1.JobClientManager(essential_1.configService);
|
|
31
|
-
exports.storageServiceManager = new storage_service_1.StorageServiceManager(exports.configsService);
|
|
32
31
|
exports.moduleConfigService = new module_config_service_1.ModuleConfigService(plugins_1.fileSystemService);
|
|
33
32
|
exports.jobService = new job_service_1.JobService(jobClientManager, essential_1.configService, exports.moduleConfigService);
|
|
33
|
+
exports.storageServiceManager = new storage_service_1.StorageServiceManager(exports.configsService);
|
|
34
34
|
exports.authService = new auth_service_1.AuthService(exports.configsService, services_1.repositoryFactory, exports.moduleConfigService, plugins_1.uuidService);
|
|
35
35
|
exports.cacheServiceFactory = new cache_service_1.CacheServiceFactory(services_1.redisManagerService);
|
|
36
36
|
exports.userConfigService = new user_config_service_1.UserConfigService(exports.moduleConfigService, services_1.repositoryFactory, exports.configsService, exports.cacheServiceFactory);
|
|
@@ -48,5 +48,5 @@ exports.installService = new install_service_1.InstallService(exports.migrationS
|
|
|
48
48
|
exports.webSocketService = new web_socket_service_1.WebSocketService(services_1.redisManagerService, exports.authService);
|
|
49
49
|
exports.notificationService = new notification_service_1.NotificationService(exports.comunicationService);
|
|
50
50
|
exports.reportService = new report_service_1.ReportService(plugins_1.uuidService, exports.notificationService, services_1.repositoryFactory, exports.storageServiceManager, essential_1.configService);
|
|
51
|
-
exports.lifeCycleService = new life_cycle_service_1.LifeCycleService(services_1.databaseManagerService, services_1.redisManagerService, exports.bootstrapService, essential_1.envConfigService, exports.installService, services_1.repositoryFactory, exports.webSocketService, exports.configsService, exports.comunicationHttpService, services_1.sqlService, exports.reportService);
|
|
51
|
+
exports.lifeCycleService = new life_cycle_service_1.LifeCycleService(services_1.databaseManagerService, services_1.redisManagerService, exports.bootstrapService, essential_1.envConfigService, exports.installService, services_1.repositoryFactory, exports.webSocketService, exports.configsService, exports.comunicationHttpService, services_1.sqlService, exports.reportService, exports.singleInstanceEnsureService);
|
|
52
52
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/services/index.ts"],"names":[],"mappings":";;;AAAA,2CAA+D;AAC/D,+CAAkE;AAClE,iDAAgH;AAChH,2DAAuD;AACvD,8EAA0E;AAC1E,6DAAwD;AACxD,mEAA8D;AAC9D,2DAAuD;AACvD,uDAAmD;AACnD,+DAA0D;AAC1D,6DAAwD;AACxD,iDAA6C;AAC7C,+DAAkE;AAClE,oFAAkH;AAClH,0FAA4H;AAC5H,4DAAwD;AACxD,qEAAiE;AACjE,wFAAmF;AACnF,mDAAsD;AACtD,qDAAiD;AACjD,iEAA6D;AAC7D,iDAAoD;AACpD,mDAA+C;AAC/C,qFAA+E;AAElE,QAAA,2BAA2B,GAAG,IAAI,4DAA2B,CAAC,8BAAmB,CAAC,CAAA;AAClF,QAAA,cAAc,GAAG,IAAI,gCAAc,CAAC,2BAAiB,CAAC,CAAA;AACnE,MAAM,gBAAgB,GAAG,IAAI,6BAAgB,CAAC,yBAAa,CAAC,CAAA;AAC/C,QAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/services/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ import { RedisManagerService } from '../../orm/services/managers/redis-manager.s
|
|
|
10
10
|
import { ComunicationServiceHttp } from './comunication/comunication-http.service';
|
|
11
11
|
import { SqlService } from '../../orm/services/sql.service';
|
|
12
12
|
import { ReportService } from './report.service';
|
|
13
|
+
import { SingleInstanceEnsureService } from './single-instance-ensure.service';
|
|
13
14
|
export interface StartArgs {
|
|
14
15
|
appModule: any;
|
|
15
16
|
execBootStrap?: boolean;
|
|
@@ -29,10 +30,11 @@ export declare class LifeCycleService {
|
|
|
29
30
|
private readonly comunicationServiceHttp;
|
|
30
31
|
private readonly sqlService;
|
|
31
32
|
private readonly reportService;
|
|
33
|
+
private readonly singleInstanceEnsureService;
|
|
32
34
|
private readonly logger;
|
|
33
35
|
private app;
|
|
34
36
|
private readonly intervals;
|
|
35
|
-
constructor(databaseManagerService: DatabaseManagerService, redisManagerService: RedisManagerService, bootstrapService: BootstrapService, envConfigService: EnvConfigService, installService: InstallService, repositoryFactory: RepositoryFactory, webSocketService: WebSocketService, configsService: ConfigsService, comunicationServiceHttp: ComunicationServiceHttp, sqlService: SqlService, reportService: ReportService);
|
|
37
|
+
constructor(databaseManagerService: DatabaseManagerService, redisManagerService: RedisManagerService, bootstrapService: BootstrapService, envConfigService: EnvConfigService, installService: InstallService, repositoryFactory: RepositoryFactory, webSocketService: WebSocketService, configsService: ConfigsService, comunicationServiceHttp: ComunicationServiceHttp, sqlService: SqlService, reportService: ReportService, singleInstanceEnsureService: SingleInstanceEnsureService);
|
|
36
38
|
stop(): Promise<void>;
|
|
37
39
|
start(args: StartArgs): Promise<INestApplication>;
|
|
38
40
|
private connectToRedis;
|
|
@@ -6,7 +6,7 @@ const database_manager_service_1 = require("../../orm/services/managers/database
|
|
|
6
6
|
const core_1 = require("@nestjs/core");
|
|
7
7
|
const logger_1 = require("./logger");
|
|
8
8
|
class LifeCycleService {
|
|
9
|
-
constructor(databaseManagerService, redisManagerService, bootstrapService, envConfigService, installService, repositoryFactory, webSocketService, configsService, comunicationServiceHttp, sqlService, reportService) {
|
|
9
|
+
constructor(databaseManagerService, redisManagerService, bootstrapService, envConfigService, installService, repositoryFactory, webSocketService, configsService, comunicationServiceHttp, sqlService, reportService, singleInstanceEnsureService) {
|
|
10
10
|
this.databaseManagerService = databaseManagerService;
|
|
11
11
|
this.redisManagerService = redisManagerService;
|
|
12
12
|
this.bootstrapService = bootstrapService;
|
|
@@ -18,19 +18,28 @@ class LifeCycleService {
|
|
|
18
18
|
this.comunicationServiceHttp = comunicationServiceHttp;
|
|
19
19
|
this.sqlService = sqlService;
|
|
20
20
|
this.reportService = reportService;
|
|
21
|
+
this.singleInstanceEnsureService = singleInstanceEnsureService;
|
|
21
22
|
this.logger = new logger_1.Logger('LifeCycleService');
|
|
22
23
|
this.intervals = [];
|
|
23
24
|
}
|
|
24
25
|
async stop() {
|
|
25
|
-
|
|
26
|
+
this.intervals.forEach(clearInterval);
|
|
27
|
+
this.comunicationServiceHttp.shutdown();
|
|
28
|
+
this.reportService.shutdown();
|
|
29
|
+
const tasks = [];
|
|
30
|
+
tasks.push(this.webSocketService.disconnect);
|
|
31
|
+
tasks.push(this.repositoryFactory.shuwdown);
|
|
32
|
+
tasks.push(this.databaseManagerService.get().disconnect);
|
|
33
|
+
tasks.push(this.singleInstanceEnsureService.shutdown);
|
|
26
34
|
if (this.app) {
|
|
27
|
-
|
|
35
|
+
tasks.push(this.app.close);
|
|
36
|
+
}
|
|
37
|
+
try {
|
|
38
|
+
await Promise.all(tasks);
|
|
39
|
+
}
|
|
40
|
+
catch (e) {
|
|
41
|
+
this.logger.error(e);
|
|
28
42
|
}
|
|
29
|
-
await this.repositoryFactory.shuwdown();
|
|
30
|
-
this.intervals.forEach(clearInterval);
|
|
31
|
-
await this.databaseManagerService.get().disconnect();
|
|
32
|
-
await this.comunicationServiceHttp.shutdown();
|
|
33
|
-
await this.reportService.shutdown();
|
|
34
43
|
}
|
|
35
44
|
async start(args) {
|
|
36
45
|
logger_1.Logger.setStackCondition(await this.envConfigService.getEnvByName('LOG_STACK_CONDITION', ''));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"life-cycle.service.js","sourceRoot":"","sources":["../../../src/core/services/life-cycle.service.ts"],"names":[],"mappings":";;;AACA,+BAA8B;AAE9B,mGAG8D;AAI9D,uCAA2C;AAC3C,qCAAkC;
|
|
1
|
+
{"version":3,"file":"life-cycle.service.js","sourceRoot":"","sources":["../../../src/core/services/life-cycle.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,13 @@ import { RedisManagerService } from "../../orm/services/managers/redis-manager.s
|
|
|
2
2
|
export declare class SingleInstanceEnsureService {
|
|
3
3
|
private readonly redisManagerService;
|
|
4
4
|
private readonly logger;
|
|
5
|
+
private readonly running;
|
|
6
|
+
private readonly healthCheck;
|
|
5
7
|
constructor(redisManagerService: RedisManagerService);
|
|
6
8
|
ensure(key: string, func: () => Promise<void>, opt: {
|
|
7
9
|
timeoutInSeconds: number;
|
|
8
10
|
}): Promise<boolean>;
|
|
11
|
+
private toCompleteKey;
|
|
12
|
+
private shutdownByKey;
|
|
13
|
+
shutdown(): Promise<void>;
|
|
9
14
|
}
|
|
@@ -6,37 +6,75 @@ class SingleInstanceEnsureService {
|
|
|
6
6
|
constructor(redisManagerService) {
|
|
7
7
|
this.redisManagerService = redisManagerService;
|
|
8
8
|
this.logger = new logger_1.Logger('SingleInstanceEnsureService');
|
|
9
|
+
this.running = [];
|
|
10
|
+
this.healthCheck = setInterval(() => {
|
|
11
|
+
if (this.running.length) {
|
|
12
|
+
this.logger.log("Running: " + this.running.reduce((a, b) => `${a},${b}`));
|
|
13
|
+
}
|
|
14
|
+
}, 5000);
|
|
9
15
|
}
|
|
10
16
|
ensure(key, func, opt) {
|
|
11
17
|
return new Promise((resolve, reject) => {
|
|
12
|
-
const completeKey =
|
|
18
|
+
const completeKey = this.toCompleteKey(key);
|
|
13
19
|
const r = this.redisManagerService.get();
|
|
14
20
|
r.get(completeKey, (error, data) => {
|
|
15
21
|
if (error) {
|
|
16
22
|
return reject(error);
|
|
17
23
|
}
|
|
18
24
|
if (data) {
|
|
19
|
-
this.logger.log(`processo ${key} já em execução por outro pod`);
|
|
25
|
+
this.logger.log(`processo '${key}' já em execução por outro pod`);
|
|
20
26
|
return resolve(false);
|
|
21
27
|
}
|
|
22
28
|
r.setex(completeKey, opt.timeoutInSeconds, 'locked', () => {
|
|
23
|
-
this.logger.log(`processo ${key} iniciado`);
|
|
29
|
+
this.logger.log(`processo '${key}' iniciado`);
|
|
24
30
|
resolve(true);
|
|
31
|
+
this.running.push(key);
|
|
25
32
|
func()
|
|
26
33
|
.catch((error) => {
|
|
27
34
|
this.logger.error(error);
|
|
28
35
|
})
|
|
29
36
|
.finally(() => {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
}
|
|
37
|
+
this.shutdownByKey(key)
|
|
38
|
+
.catch(error => {
|
|
39
|
+
this.logger.error(error);
|
|
34
40
|
});
|
|
35
41
|
});
|
|
36
42
|
});
|
|
37
43
|
});
|
|
38
44
|
});
|
|
39
45
|
}
|
|
46
|
+
toCompleteKey(key) {
|
|
47
|
+
return `SingleInstanceEnsureService-${key}`;
|
|
48
|
+
}
|
|
49
|
+
async shutdownByKey(key) {
|
|
50
|
+
const completeKey = this.toCompleteKey(key);
|
|
51
|
+
const r = this.redisManagerService.get();
|
|
52
|
+
return new Promise((resolve, reject) => {
|
|
53
|
+
r.del(completeKey, error => {
|
|
54
|
+
this.logger.log(`processo '${key}' finalizado`);
|
|
55
|
+
this.running.splice(this.running.findIndex(r => r === key), 1);
|
|
56
|
+
if (error) {
|
|
57
|
+
return reject(error);
|
|
58
|
+
}
|
|
59
|
+
return resolve();
|
|
60
|
+
});
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
async shutdown() {
|
|
64
|
+
clearInterval(this.healthCheck);
|
|
65
|
+
await Promise.all(this.running.map(key => () => {
|
|
66
|
+
return new Promise(async (r) => {
|
|
67
|
+
try {
|
|
68
|
+
await this.shutdownByKey(key);
|
|
69
|
+
r();
|
|
70
|
+
}
|
|
71
|
+
catch (e) {
|
|
72
|
+
this.logger.error(e);
|
|
73
|
+
r();
|
|
74
|
+
}
|
|
75
|
+
});
|
|
76
|
+
}));
|
|
77
|
+
}
|
|
40
78
|
}
|
|
41
79
|
exports.SingleInstanceEnsureService = SingleInstanceEnsureService;
|
|
42
80
|
//# sourceMappingURL=single-instance-ensure.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"single-instance-ensure.service.js","sourceRoot":"","sources":["../../../src/core/services/single-instance-ensure.service.ts"],"names":[],"mappings":";;;AACA,qCAAkC;AAGlC,MAAa,2BAA2B;
|
|
1
|
+
{"version":3,"file":"single-instance-ensure.service.js","sourceRoot":"","sources":["../../../src/core/services/single-instance-ensure.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,12 +16,16 @@ class ApplicationService {
|
|
|
16
16
|
async exec({ root, request: { method, path = '', query = {}, body = null, headers = {} }, user, }) {
|
|
17
17
|
const supportsBody = method.toLowerCase() != 'get';
|
|
18
18
|
const url = [root, path].filter(i => i).join('/');
|
|
19
|
+
const h = Object.assign(Object.assign({}, _.chain(headers)
|
|
20
|
+
.omit('host')
|
|
21
|
+
.value()), { 'authorization': await this.comunicationService.computeToken({
|
|
22
|
+
user
|
|
23
|
+
}) });
|
|
24
|
+
if (_.has(headers, 'host')) {
|
|
25
|
+
h.domain = headers.host;
|
|
26
|
+
}
|
|
19
27
|
const request = {
|
|
20
|
-
headers:
|
|
21
|
-
.omit('host')
|
|
22
|
-
.value()), { 'authorization': await this.comunicationService.computeToken({
|
|
23
|
-
user
|
|
24
|
-
}) }),
|
|
28
|
+
headers: h,
|
|
25
29
|
method,
|
|
26
30
|
params: query,
|
|
27
31
|
url,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.service.js","sourceRoot":"","sources":["../../../../../../src/core/services/source/gcloud-run-cloud/v1/application.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,iCAA4C;AAa5C,MAAa,kBAAkB;IAC7B,YAA6B,mBAAwC;QAAxC,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAI,CAAC;IAE1E,SAAS;QACP,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,IAAI,CAAI,EACZ,IAAI,EACJ,OAAO,EAAE,EACP,MAAM,EACN,IAAI,GAAG,EAAE,EACT,KAAK,GAAG,EAAE,EACV,IAAI,GAAG,IAAI,EACX,OAAO,GAAG,EAAE,EACb,EACD,IAAI,GAC4B;QAChC,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,EAAE,IAAI,KAAK,CAAA;QAClD,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEjD,MAAM,
|
|
1
|
+
{"version":3,"file":"application.service.js","sourceRoot":"","sources":["../../../../../../src/core/services/source/gcloud-run-cloud/v1/application.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,iCAA4C;AAa5C,MAAa,kBAAkB;IAC7B,YAA6B,mBAAwC;QAAxC,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAI,CAAC;IAE1E,SAAS;QACP,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,IAAI,CAAI,EACZ,IAAI,EACJ,OAAO,EAAE,EACP,MAAM,EACN,IAAI,GAAG,EAAE,EACT,KAAK,GAAG,EAAE,EACV,IAAI,GAAG,IAAI,EACX,OAAO,GAAG,EAAE,EACb,EACD,IAAI,GAC4B;QAChC,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,EAAE,IAAI,KAAK,CAAA;QAClD,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEjD,MAAM,CAAC,GAAG,gCACL,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;aAChB,IAAI,CAAC,MAAM,CAAC;aACZ,KAAK,EAAE,KACV,eAAe,EAAE,MAAM,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC;gBAC3D,IAAI;aACL,CAAC,GACI,CAAA;QAER,IAAG,CAAC,CAAC,GAAG,CAAC,OAAO,EAAC,MAAM,CAAC,EAAE;YACxB,CAAC,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAA;SACxB;QAED,MAAM,OAAO,GAAG;YACd,OAAO,EAAE,CAAC;YACV,MAAM;YACN,MAAM,EAAE,KAAK;YACb,GAAG;YACH,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;SACjC,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,OAAO,CAAsB,OAAO,CAAC,CAAA;QAClE,OAAO;YACL,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;SACR,CAAA;IACf,CAAC;CACF;AApDD,gDAoDC"}
|
|
@@ -13,4 +13,10 @@ export interface FieldDictionary {
|
|
|
13
13
|
crud_front_default_value?: any;
|
|
14
14
|
crud_front_validate?: string;
|
|
15
15
|
crud_enum_values?: string[];
|
|
16
|
+
crud_front_reference_component?: string;
|
|
17
|
+
crud_front_reference_component_args?: string;
|
|
18
|
+
crud_component?: string;
|
|
19
|
+
crud_component_args?: string;
|
|
20
|
+
display_precision?: number;
|
|
21
|
+
help_link?: string;
|
|
16
22
|
}
|