@ibiz-template/runtime 0.7.41-alpha.89 → 0.7.41-alpha.90
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.esm.js +159 -97
- package/dist/index.system.min.js +1 -1
- package/out/controller/control/app-menu/app-menu.controller.d.ts +4 -5
- package/out/controller/control/app-menu/app-menu.controller.d.ts.map +1 -1
- package/out/controller/control/app-menu/app-menu.controller.js +12 -18
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.state.d.ts +1 -1
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.state.js +1 -1
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.d.ts +6 -0
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.d.ts.map +1 -1
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.js +15 -0
- package/out/controller/control/grid/grid/grid.controller.d.ts.map +1 -1
- package/out/controller/control/grid/grid/grid.controller.js +7 -15
- package/out/controller/control/toolbar/toolbar.controller.d.ts +2 -3
- package/out/controller/control/toolbar/toolbar.controller.d.ts.map +1 -1
- package/out/controller/control/toolbar/toolbar.controller.js +12 -20
- package/out/controller/control/tree/tree.controller.d.ts +6 -0
- package/out/controller/control/tree/tree.controller.d.ts.map +1 -1
- package/out/controller/control/tree/tree.controller.js +16 -0
- package/out/controller/control/tree-grid-ex/tree-grid-ex.controller.d.ts.map +1 -1
- package/out/controller/control/tree-grid-ex/tree-grid-ex.controller.js +6 -12
- package/out/interface/api/common/i-api-from-mdctrl-form-item.d.ts +1 -1
- package/out/interface/api/controller/control/form-detail/i-api-form-detail.controller.d.ts +1 -1
- package/out/interface/api/controller/control/i-api-form.controller.d.ts +5 -5
- package/out/service/mqtt/collaborate.service.d.ts +8 -0
- package/out/service/mqtt/collaborate.service.d.ts.map +1 -1
- package/out/service/mqtt/collaborate.service.js +15 -0
- package/out/service/mqtt/mqtt.service.d.ts +8 -0
- package/out/service/mqtt/mqtt.service.d.ts.map +1 -1
- package/out/service/mqtt/mqtt.service.js +15 -0
- package/package.json +2 -2
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { IAppMenu, IAppMenuItem } from '@ibiz/model-core';
|
|
2
|
-
import { IAppMenuState, IAppMenuEvent, IAppMenuController,
|
|
2
|
+
import { IAppService, IAppMenuState, IAppMenuEvent, IAppMenuController, IAppMenuItemProvider } from '../../../interface';
|
|
3
|
+
import { CTX } from '../../ctx';
|
|
3
4
|
import { AppCounter } from '../../../service';
|
|
4
5
|
import { ControlController } from '../../common';
|
|
5
|
-
import { CTX } from '../../ctx';
|
|
6
6
|
import { CustomAppMenuController } from './custom-app-menu.controller';
|
|
7
7
|
/**
|
|
8
8
|
* 应用菜单控制器
|
|
@@ -210,10 +210,9 @@ export declare class AppMenuController extends ControlController<IAppMenu, IAppM
|
|
|
210
210
|
*/
|
|
211
211
|
getCounter(id: string): AppCounter | null;
|
|
212
212
|
/**
|
|
213
|
-
* 转换各类多语言
|
|
214
|
-
*
|
|
215
|
-
* @date 2023-05-18 02:57:00
|
|
213
|
+
* @description 转换各类多语言
|
|
216
214
|
* @protected
|
|
215
|
+
* @memberof AppMenuController
|
|
217
216
|
*/
|
|
218
217
|
protected convertMultipleLanguages(): void;
|
|
219
218
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-menu.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/app-menu/app-menu.controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"app-menu.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/app-menu/app-menu.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { RuntimeError, recursiveIterate, RuntimeModelError, findRecursiveChild, } from '@ibiz-template/core';
|
|
2
2
|
import { AppFuncCommand } from '../../../command';
|
|
3
3
|
import { ControlController } from '../../common';
|
|
4
4
|
import { getAppMenuItemProvider } from '../../../register';
|
|
@@ -428,26 +428,20 @@ export class AppMenuController extends ControlController {
|
|
|
428
428
|
return null;
|
|
429
429
|
}
|
|
430
430
|
/**
|
|
431
|
-
* 转换各类多语言
|
|
432
|
-
*
|
|
433
|
-
* @date 2023-05-18 02:57:00
|
|
431
|
+
* @description 转换各类多语言
|
|
434
432
|
* @protected
|
|
433
|
+
* @memberof AppMenuController
|
|
435
434
|
*/
|
|
436
435
|
convertMultipleLanguages() {
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
convertItemLang(item.appMenuItems);
|
|
447
|
-
});
|
|
448
|
-
};
|
|
449
|
-
if ((_a = this.model.appMenuItems) === null || _a === void 0 ? void 0 : _a.length)
|
|
450
|
-
convertItemLang(this.model.appMenuItems);
|
|
436
|
+
recursiveIterate(this.model, (item) => {
|
|
437
|
+
var _a, _b;
|
|
438
|
+
if ((_a = item.capLanguageRes) === null || _a === void 0 ? void 0 : _a.lanResTag)
|
|
439
|
+
item.caption = ibiz.i18n.t(item.capLanguageRes.lanResTag, item.caption);
|
|
440
|
+
if ((_b = item.tooltipLanguageRes) === null || _b === void 0 ? void 0 : _b.lanResTag)
|
|
441
|
+
item.tooltip = ibiz.i18n.t(item.tooltipLanguageRes.lanResTag, item.tooltip);
|
|
442
|
+
}, {
|
|
443
|
+
childrenFields: ['appMenuItems'],
|
|
444
|
+
});
|
|
451
445
|
}
|
|
452
446
|
/**
|
|
453
447
|
* @description 获取默认打开菜单项
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { IApiFormMDCtrlFormItem, IApiFormMDCtrlFormState } from '../../../../../interface';
|
|
2
2
|
import { FormMDCtrlState } from './form-mdctrl.state';
|
|
3
3
|
/**
|
|
4
|
-
* @description
|
|
4
|
+
* @description 表单多数据部件表单状态
|
|
5
5
|
* @export
|
|
6
6
|
* @class FormMDCtrlFormState
|
|
7
7
|
* @extends {FormMDCtrlState}
|
package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.d.ts
CHANGED
|
@@ -59,6 +59,12 @@ export declare class FormMDCtrlRepeaterController extends FormMDCtrlController i
|
|
|
59
59
|
* @memberof FormMDCtrlRepeaterController
|
|
60
60
|
*/
|
|
61
61
|
prepareRepeatedForm(): void;
|
|
62
|
+
/**
|
|
63
|
+
* @description 转化多语言
|
|
64
|
+
* @protected
|
|
65
|
+
* @memberof FormMDCtrlRepeaterController
|
|
66
|
+
*/
|
|
67
|
+
protected convertMultipleLanguages(): void;
|
|
62
68
|
/**
|
|
63
69
|
* @description 设置重复器控制器
|
|
64
70
|
* @param {string} id
|
package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form-mdctrl-repeater.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,OAAO,EAAiB,MAAM,kBAAkB,CAAC;AAE3E,OAAO,EAEL,mBAAmB,EACnB,6BAA6B,EAC9B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAGhE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;GAMG;AACH,qBAAa,4BACX,SAAQ,oBACR,YAAW,6BAA6B;IAExC;;;;;OAKG;IACH,IAAI,KAAK,IAAI,KAAK,EAAE,GAAG,KAAK,GAAG,IAAI,CAElC;IAED;;;;;OAKG;IACH,IAAI,UAAU,IAAI,OAAO,CAMxB;IAED;;;;OAIG;IACH,aAAa,EAAE,MAAM,GAAG,WAAW,GAAG,YAAY,CAAe;IAEjE;;;;OAIG;IACH,YAAY,EAAE,OAAO,CAAS;IAE9B;;;;OAIG;IACH,YAAY,EAAG,OAAO,CAAC;IAEvB;;;OAGG;IACH,WAAW,mCAA0C;IAErD;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCvC;;;OAGG;IACH,mBAAmB,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"form-mdctrl-repeater.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,OAAO,EAAiB,MAAM,kBAAkB,CAAC;AAE3E,OAAO,EAEL,mBAAmB,EACnB,6BAA6B,EAC9B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAGhE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;GAMG;AACH,qBAAa,4BACX,SAAQ,oBACR,YAAW,6BAA6B;IAExC;;;;;OAKG;IACH,IAAI,KAAK,IAAI,KAAK,EAAE,GAAG,KAAK,GAAG,IAAI,CAElC;IAED;;;;;OAKG;IACH,IAAI,UAAU,IAAI,OAAO,CAMxB;IAED;;;;OAIG;IACH,aAAa,EAAE,MAAM,GAAG,WAAW,GAAG,YAAY,CAAe;IAEjE;;;;OAIG;IACH,YAAY,EAAE,OAAO,CAAS;IAE9B;;;;OAIG;IACH,YAAY,EAAG,OAAO,CAAC;IAEvB;;;OAGG;IACH,WAAW,mCAA0C;IAErD;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCvC;;;OAGG;IACH,mBAAmB,IAAI,IAAI;IA2C3B;;;;OAIG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;IAgB1C;;;;;OAKG;IACH,qBAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,mBAAmB,GAAG,IAAI;IAUxE;;;;OAIG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IASlC;;;;OAIG;IACG,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IASxC;;;;OAIG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,GAAG,IAAI,GAAG,IAAI;IAW7C;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAsB5B;;;;;OAKG;IACH,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAgB5B;;;;;OAKG;IACH,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI;IAQ7D;;;;;OAKG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBtD;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAa5D;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,IAAI;CAkC9D"}
|
package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.js
CHANGED
|
@@ -130,6 +130,21 @@ export class FormMDCtrlRepeaterController extends FormMDCtrlController {
|
|
|
130
130
|
tempForm[key] = this.form.model[key];
|
|
131
131
|
});
|
|
132
132
|
this.repeatedForm = clone(tempForm);
|
|
133
|
+
this.convertMultipleLanguages();
|
|
134
|
+
}
|
|
135
|
+
/**
|
|
136
|
+
* @description 转化多语言
|
|
137
|
+
* @protected
|
|
138
|
+
* @memberof FormMDCtrlRepeaterController
|
|
139
|
+
*/
|
|
140
|
+
convertMultipleLanguages() {
|
|
141
|
+
recursiveIterate(this.repeatedForm, (item) => {
|
|
142
|
+
var _a;
|
|
143
|
+
if ((_a = item.capLanguageRes) === null || _a === void 0 ? void 0 : _a.lanResTag)
|
|
144
|
+
item.caption = ibiz.i18n.t(item.capLanguageRes.lanResTag, item.caption);
|
|
145
|
+
}, {
|
|
146
|
+
childrenFields: ['deformPages', 'deformTabPages', 'deformDetails'],
|
|
147
|
+
});
|
|
133
148
|
}
|
|
134
149
|
/**
|
|
135
150
|
* @description 设置重复器控制器
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"AAeA,OAAO,EACL,OAAO,EACP,aAAa,EACb,aAAa,EACb,aAAa,
|
|
1
|
+
{"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1547,21 +1547,13 @@ export class GridController extends MDControlController {
|
|
|
1547
1547
|
* @protected
|
|
1548
1548
|
*/
|
|
1549
1549
|
convertMultipleLanguages() {
|
|
1550
|
-
|
|
1551
|
-
|
|
1552
|
-
|
|
1553
|
-
|
|
1554
|
-
|
|
1555
|
-
|
|
1556
|
-
|
|
1557
|
-
column.degridColumns) {
|
|
1558
|
-
convertColumnCaption(column.degridColumns);
|
|
1559
|
-
}
|
|
1560
|
-
});
|
|
1561
|
-
};
|
|
1562
|
-
if (this.model.degridColumns && this.model.degridColumns.length > 0) {
|
|
1563
|
-
convertColumnCaption(this.model.degridColumns);
|
|
1564
|
-
}
|
|
1550
|
+
recursiveIterate(this.model, (item) => {
|
|
1551
|
+
var _a;
|
|
1552
|
+
if ((_a = item.capLanguageRes) === null || _a === void 0 ? void 0 : _a.lanResTag)
|
|
1553
|
+
item.caption = ibiz.i18n.t(item.capLanguageRes.lanResTag, item.caption);
|
|
1554
|
+
}, {
|
|
1555
|
+
childrenFields: ['degridColumns'],
|
|
1556
|
+
});
|
|
1565
1557
|
}
|
|
1566
1558
|
/**
|
|
1567
1559
|
* 控制列显示
|
|
@@ -162,10 +162,9 @@ export declare class ToolbarController<T extends IDEToolbar = IDEToolbar, S exte
|
|
|
162
162
|
clearExtraButtons(position?: 'before' | 'after' | number): void;
|
|
163
163
|
protected initControlScheduler(logics?: IControlLogic[]): void;
|
|
164
164
|
/**
|
|
165
|
-
* 转换各类多语言
|
|
166
|
-
*
|
|
167
|
-
* @date 2023-05-18 02:57:00
|
|
165
|
+
* @description 转换各类多语言
|
|
168
166
|
* @protected
|
|
167
|
+
* @memberof ToolbarController
|
|
169
168
|
*/
|
|
170
169
|
protected convertMultipleLanguages(): void;
|
|
171
170
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolbar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/toolbar.controller.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"toolbar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/toolbar.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { recursiveIterate, RuntimeError } from '@ibiz-template/core';
|
|
2
2
|
import { ViewCallTag, ViewMode } from '../../../constant';
|
|
3
|
-
import { calcUIActionGroup, getAllUIActionItems,
|
|
3
|
+
import { getUIActionById, calcUIActionGroup, getAllUIActionItems, } from '../../../model';
|
|
4
4
|
import { ControlVO } from '../../../service';
|
|
5
5
|
import { UIActionUtil } from '../../../ui-action';
|
|
6
6
|
import { ControlController } from '../../common';
|
|
@@ -412,27 +412,19 @@ export class ToolbarController extends ControlController {
|
|
|
412
412
|
super.initControlScheduler(actualLogics);
|
|
413
413
|
}
|
|
414
414
|
/**
|
|
415
|
-
* 转换各类多语言
|
|
416
|
-
*
|
|
417
|
-
* @date 2023-05-18 02:57:00
|
|
415
|
+
* @description 转换各类多语言
|
|
418
416
|
* @protected
|
|
417
|
+
* @memberof ToolbarController
|
|
419
418
|
*/
|
|
420
419
|
convertMultipleLanguages() {
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
item.detoolbarItems) {
|
|
431
|
-
convertItemLang(item.detoolbarItems);
|
|
432
|
-
}
|
|
433
|
-
});
|
|
434
|
-
};
|
|
435
|
-
if ((_a = this.model.detoolbarItems) === null || _a === void 0 ? void 0 : _a.length)
|
|
436
|
-
convertItemLang(this.model.detoolbarItems);
|
|
420
|
+
recursiveIterate(this.model, (item) => {
|
|
421
|
+
var _a, _b;
|
|
422
|
+
if ((_a = item.capLanguageRes) === null || _a === void 0 ? void 0 : _a.lanResTag)
|
|
423
|
+
item.caption = ibiz.i18n.t(item.capLanguageRes.lanResTag, item.caption);
|
|
424
|
+
if ((_b = item.tooltipLanguageRes) === null || _b === void 0 ? void 0 : _b.lanResTag)
|
|
425
|
+
item.tooltip = ibiz.i18n.t(item.tooltipLanguageRes.lanResTag, item.tooltip);
|
|
426
|
+
}, {
|
|
427
|
+
childrenFields: ['detoolbarItems'],
|
|
428
|
+
});
|
|
437
429
|
}
|
|
438
430
|
}
|
|
@@ -453,5 +453,11 @@ export declare class TreeController<T extends IDETree = IDETree, S extends ITree
|
|
|
453
453
|
* @memberof TreeController
|
|
454
454
|
*/
|
|
455
455
|
updateUI(): void;
|
|
456
|
+
/**
|
|
457
|
+
* @description 转换各类多语言
|
|
458
|
+
* @protected
|
|
459
|
+
* @memberof TreeController
|
|
460
|
+
*/
|
|
461
|
+
protected convertMultipleLanguages(): void;
|
|
456
462
|
}
|
|
457
463
|
//# sourceMappingURL=tree.controller.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tree.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,cAAc,EAGf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,OAAO,EACP,WAAW,EAEX,iBAAiB,
|
|
1
|
+
{"version":3,"file":"tree.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1232,4 +1232,20 @@ export class TreeController extends MDControlController {
|
|
|
1232
1232
|
updateUI() {
|
|
1233
1233
|
this._evt.emit('onUpdateUI', undefined);
|
|
1234
1234
|
}
|
|
1235
|
+
/**
|
|
1236
|
+
* @description 转换各类多语言
|
|
1237
|
+
* @protected
|
|
1238
|
+
* @memberof TreeController
|
|
1239
|
+
*/
|
|
1240
|
+
convertMultipleLanguages() {
|
|
1241
|
+
const { detreeNodes = [] } = this.model;
|
|
1242
|
+
detreeNodes.forEach((item) => {
|
|
1243
|
+
var _a;
|
|
1244
|
+
// 只转化静态节点多语言
|
|
1245
|
+
if (item.treeNodeType === 'STATIC' && ((_a = item.nameLanguageRes) === null || _a === void 0 ? void 0 : _a.lanResTag)) {
|
|
1246
|
+
item.name = ibiz.i18n.t(item.nameLanguageRes.lanResTag, item.name);
|
|
1247
|
+
item.text = ibiz.i18n.t(item.nameLanguageRes.lanResTag, item.text);
|
|
1248
|
+
}
|
|
1249
|
+
});
|
|
1250
|
+
}
|
|
1235
1251
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tree-grid-ex.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tree-grid-ex.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -318,18 +318,12 @@ export class TreeGridExController extends TreeController {
|
|
|
318
318
|
* @protected
|
|
319
319
|
*/
|
|
320
320
|
convertMultipleLanguages() {
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
}
|
|
328
|
-
});
|
|
329
|
-
};
|
|
330
|
-
if (this.model.detreeColumns && this.model.detreeColumns.length > 0) {
|
|
331
|
-
convertColumnCaption(this.model.detreeColumns);
|
|
332
|
-
}
|
|
321
|
+
const { detreeColumns } = this.model;
|
|
322
|
+
detreeColumns === null || detreeColumns === void 0 ? void 0 : detreeColumns.forEach(column => {
|
|
323
|
+
var _a;
|
|
324
|
+
if ((_a = column.capLanguageRes) === null || _a === void 0 ? void 0 : _a.lanResTag)
|
|
325
|
+
column.caption = ibiz.i18n.t(column.capLanguageRes.lanResTag, column.caption);
|
|
326
|
+
});
|
|
333
327
|
}
|
|
334
328
|
async save(nodeData) {
|
|
335
329
|
if (this.state.isSimple) {
|
|
@@ -33,7 +33,7 @@ import { IApiFormItemController } from './form-detail';
|
|
|
33
33
|
*/
|
|
34
34
|
export interface IApiFormController<T extends IDEForm = IDEForm, S extends IApiFormState = IApiFormState> extends IApiControlController<T, S> {
|
|
35
35
|
/**
|
|
36
|
-
* @description
|
|
36
|
+
* @description 表单成员控件对象(key 为成员标识,value 为表单成员对象),包括表单项、表单按钮、表单分页、表单分组、关系界面、表单多数据部件等类型成员对象
|
|
37
37
|
* @type {{ [key: string]: IApiFormDetailController }}
|
|
38
38
|
* @memberof IApiFormController
|
|
39
39
|
*/
|
|
@@ -59,13 +59,13 @@ export interface IApiFormController<T extends IDEForm = IDEForm, S extends IApiF
|
|
|
59
59
|
*/
|
|
60
60
|
formDruipart: IApiFormDruipartController[];
|
|
61
61
|
/**
|
|
62
|
-
* @description
|
|
62
|
+
* @description 获取表单VO数据
|
|
63
63
|
* @returns {*} {IApiData[]}
|
|
64
64
|
* @memberof IApiFormController
|
|
65
65
|
*/
|
|
66
66
|
getData(): IApiData[];
|
|
67
67
|
/**
|
|
68
|
-
* @description
|
|
68
|
+
* @description 获取表单VO映射的原始实体数据
|
|
69
69
|
* @returns {*} {IApiData[]}
|
|
70
70
|
* @memberof IApiFormController
|
|
71
71
|
*/
|
|
@@ -86,13 +86,13 @@ export interface IApiFormController<T extends IDEForm = IDEForm, S extends IApiF
|
|
|
86
86
|
expand?: boolean;
|
|
87
87
|
}): void;
|
|
88
88
|
/**
|
|
89
|
-
* @description
|
|
89
|
+
* @description 设置表单激活分页(传入分页标识)
|
|
90
90
|
* @param {string} name 分页标识
|
|
91
91
|
* @memberof IApiFormController
|
|
92
92
|
*/
|
|
93
93
|
setActiveTab(name: string): void;
|
|
94
94
|
/**
|
|
95
|
-
* @description
|
|
95
|
+
* @description 设置指定表单项的数据值
|
|
96
96
|
* @param {string} name 表单项名称
|
|
97
97
|
* @param {unknown} value 值
|
|
98
98
|
* @param {boolean} [ignore] 是否忽略脏值检查
|
|
@@ -5,6 +5,14 @@ export declare class CollaborateService {
|
|
|
5
5
|
protected mqttTopic: string;
|
|
6
6
|
protected token: string;
|
|
7
7
|
protected appId: string;
|
|
8
|
+
/**
|
|
9
|
+
* 设定最大重连次数
|
|
10
|
+
*/
|
|
11
|
+
MAX_RECONNECT_TIMES: number;
|
|
12
|
+
/**
|
|
13
|
+
* 重连次数
|
|
14
|
+
*/
|
|
15
|
+
reconnectCount: number;
|
|
8
16
|
/**
|
|
9
17
|
* 发送消息
|
|
10
18
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collaborate.service.d.ts","sourceRoot":"","sources":["../../../src/service/mqtt/collaborate.service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,EAAc,OAAO,EAAE,MAAM,SAAS,CAAC;AAE9C,qBAAa,kBAAkB;
|
|
1
|
+
{"version":3,"file":"collaborate.service.d.ts","sourceRoot":"","sources":["../../../src/service/mqtt/collaborate.service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,EAAc,OAAO,EAAE,MAAM,SAAS,CAAC;AAE9C,qBAAa,kBAAkB;IAmF3B,SAAS,CAAC,EAAE,EAAE,MAAM;IACpB,SAAS,CAAC,SAAS,EAAE,MAAM;IAC3B,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,KAAK,EAAE,MAAM;IArFzB;;OAEG;IACH,mBAAmB,SAAK;IAExB;;OAEG;IACH,cAAc,SAAK;IAEnB;;;;;;OAMG;IACH,SAAS,CAAC,cAAc,SAAyB;IAEjD;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;IAE7B;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;QACpB,OAAO,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC;QACnC,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;QAC9B,SAAS,EAAE,MAAM,IAAI,CAAC;QACtB,KAAK,EAAE,MAAM,IAAI,CAAC;KACnB,CAAC,CAAiB;IAEnB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;IAEpB;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,cAAc,CAU/B;IAEF;;;;;;;;OAQG;gBAES,EAAE,EAAE,MAAM,EACV,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM;IAOzB;;;;;;OAMG;IACH,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,GAAG,eAAe,GAAG,IAAI;IAInE;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAuD9B;;;;;OAKG;IACH,KAAK,IAAI,IAAI;CAId"}
|
|
@@ -14,6 +14,14 @@ export class CollaborateService {
|
|
|
14
14
|
this.mqttTopic = mqttTopic;
|
|
15
15
|
this.token = token;
|
|
16
16
|
this.appId = appId;
|
|
17
|
+
/**
|
|
18
|
+
* 设定最大重连次数
|
|
19
|
+
*/
|
|
20
|
+
this.MAX_RECONNECT_TIMES = 3;
|
|
21
|
+
/**
|
|
22
|
+
* 重连次数
|
|
23
|
+
*/
|
|
24
|
+
this.reconnectCount = 0;
|
|
17
25
|
/**
|
|
18
26
|
* 发送消息
|
|
19
27
|
*
|
|
@@ -70,6 +78,7 @@ export class CollaborateService {
|
|
|
70
78
|
* @return {*} {Promise<void>}
|
|
71
79
|
*/
|
|
72
80
|
async connect() {
|
|
81
|
+
this.reconnectCount = 0;
|
|
73
82
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
74
83
|
// @ts-ignore
|
|
75
84
|
const module = await import('mqtt/dist/mqtt.min');
|
|
@@ -98,7 +107,13 @@ export class CollaborateService {
|
|
|
98
107
|
ibiz.log.debug('collaborate message');
|
|
99
108
|
});
|
|
100
109
|
this.client.on('reconnect', () => {
|
|
110
|
+
var _a;
|
|
101
111
|
this.readyState = 0;
|
|
112
|
+
this.reconnectCount += 1;
|
|
113
|
+
if (this.reconnectCount >= this.MAX_RECONNECT_TIMES) {
|
|
114
|
+
(_a = this.client) === null || _a === void 0 ? void 0 : _a.end(true);
|
|
115
|
+
ibiz.log.warn(`the maximum number of reconnection attempts has been reached (${this.MAX_RECONNECT_TIMES}), and reconnection will be stopped.`);
|
|
116
|
+
}
|
|
102
117
|
this.evt.emit('reconnect');
|
|
103
118
|
});
|
|
104
119
|
this.client.on('close', () => {
|
|
@@ -13,6 +13,14 @@ export declare class MqttService {
|
|
|
13
13
|
protected mqttTopic: string;
|
|
14
14
|
protected token: string;
|
|
15
15
|
protected appId: string;
|
|
16
|
+
/**
|
|
17
|
+
* 设定最大重连次数
|
|
18
|
+
*/
|
|
19
|
+
MAX_RECONNECT_TIMES: number;
|
|
20
|
+
/**
|
|
21
|
+
* 重连次数
|
|
22
|
+
*/
|
|
23
|
+
reconnectCount: number;
|
|
16
24
|
/**
|
|
17
25
|
* 接受消息通知
|
|
18
26
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mqtt.service.d.ts","sourceRoot":"","sources":["../../../src/service/mqtt/mqtt.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,EAAE,OAAO,EAAc,MAAM,SAAS,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,WAAW;
|
|
1
|
+
{"version":3,"file":"mqtt.service.d.ts","sourceRoot":"","sources":["../../../src/service/mqtt/mqtt.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,EAAE,OAAO,EAAc,MAAM,SAAS,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,WAAW;IAoEpB,SAAS,CAAC,SAAS,EAAE,MAAM;IAC3B,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,KAAK,EAAE,MAAM;IArEzB;;OAEG;IACH,mBAAmB,SAAK;IAExB;;OAEG;IACH,cAAc,SAAK;IAEnB;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;QACpB,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,cAAc,KAAK,IAAI,CAAC;KACvD,CAAC,CAAiB;IAEnB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;IAEpB;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,cAAc,CAU/B;IAEF;;;;;;;;OAQG;gBAES,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM;IAOzB;;;;;;;OAOG;IACH,OAAO,CAAC,kBAAkB;IAa1B;;;;;;;;OAQG;IACH,OAAO,CAAC,aAAa;IAkBrB;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAuC9B;;;;;OAKG;IACH,KAAK,IAAI,IAAI;CAId"}
|
|
@@ -22,6 +22,14 @@ export class MqttService {
|
|
|
22
22
|
this.mqttTopic = mqttTopic;
|
|
23
23
|
this.token = token;
|
|
24
24
|
this.appId = appId;
|
|
25
|
+
/**
|
|
26
|
+
* 设定最大重连次数
|
|
27
|
+
*/
|
|
28
|
+
this.MAX_RECONNECT_TIMES = 3;
|
|
29
|
+
/**
|
|
30
|
+
* 重连次数
|
|
31
|
+
*/
|
|
32
|
+
this.reconnectCount = 0;
|
|
25
33
|
/**
|
|
26
34
|
* 接受消息通知
|
|
27
35
|
*
|
|
@@ -104,6 +112,7 @@ export class MqttService {
|
|
|
104
112
|
* @return {*} {Promise<void>}
|
|
105
113
|
*/
|
|
106
114
|
async connect() {
|
|
115
|
+
this.reconnectCount = 0;
|
|
107
116
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
108
117
|
// @ts-ignore
|
|
109
118
|
const module = await import('mqtt/dist/mqtt.min');
|
|
@@ -124,7 +133,13 @@ export class MqttService {
|
|
|
124
133
|
this.evt.emit('message', topic, msg);
|
|
125
134
|
});
|
|
126
135
|
this.client.on('reconnect', () => {
|
|
136
|
+
var _a;
|
|
127
137
|
ibiz.log.warn('mqtt reconnect');
|
|
138
|
+
this.reconnectCount += 1;
|
|
139
|
+
if (this.reconnectCount >= this.MAX_RECONNECT_TIMES) {
|
|
140
|
+
(_a = this.client) === null || _a === void 0 ? void 0 : _a.end(true);
|
|
141
|
+
ibiz.log.warn(`the maximum number of reconnection attempts has been reached (${this.MAX_RECONNECT_TIMES}), and reconnection will be stopped.`);
|
|
142
|
+
}
|
|
128
143
|
});
|
|
129
144
|
this.client.on('close', () => {
|
|
130
145
|
ibiz.log.warn('mqtt close');
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ibiz-template/runtime",
|
|
3
|
-
"version": "0.7.41-alpha.
|
|
3
|
+
"version": "0.7.41-alpha.90",
|
|
4
4
|
"description": "运行时逻辑库",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "out/index.js",
|
|
@@ -68,5 +68,5 @@
|
|
|
68
68
|
"qx-util": "^0.4.8",
|
|
69
69
|
"ramda": "^0.29.0"
|
|
70
70
|
},
|
|
71
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "68c45e9512044ff7d11643763ef6e4b5b545dcf4"
|
|
72
72
|
}
|