@ibiz-template/runtime 0.1.29-dev.0 → 0.1.29
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 +795 -618
- package/dist/index.system.min.js +1 -1
- package/dist/index.system.min.js.map +1 -1
- package/out/command/app/open-app-view/open-app-view.d.ts +1 -1
- package/out/command/app/open-app-view/open-app-view.d.ts.map +1 -1
- package/out/command/app/open-app-view/open-app-view.js +16 -5
- package/out/controller/common/control/md-control.controller.d.ts.map +1 -1
- package/out/controller/common/control/md-control.controller.js +2 -1
- package/out/controller/control/dashboard/dashboard.controller.d.ts.map +1 -1
- package/out/controller/control/dashboard/dashboard.controller.js +2 -6
- package/out/controller/control/form/edit-form/edit-form.controller.d.ts +11 -2
- package/out/controller/control/form/edit-form/edit-form.controller.d.ts.map +1 -1
- package/out/controller/control/form/edit-form/edit-form.controller.js +56 -2
- package/out/controller/control/form/edit-form/edit-form.service.js +1 -1
- package/out/controller/control/form/form/form.controller.d.ts.map +1 -1
- package/out/controller/control/form/form/form.controller.js +2 -6
- package/out/controller/control/grid/grid/grid.controller.d.ts.map +1 -1
- package/out/controller/control/grid/grid/grid.controller.js +5 -10
- package/out/controller/control/toolbar/toolbar.controllerr.d.ts.map +1 -1
- package/out/controller/control/toolbar/toolbar.controllerr.js +8 -8
- package/out/controller/control/tree/tree.service.d.ts.map +1 -1
- package/out/controller/control/tree/tree.service.js +6 -11
- package/out/engine/md-view.engine.d.ts.map +1 -1
- package/out/engine/md-view.engine.js +5 -4
- package/out/global/global-util/global-util.d.ts +8 -0
- package/out/global/global-util/global-util.d.ts.map +1 -1
- package/out/global/global-util/global-util.js +8 -0
- package/out/interface/common/i-error-handler/i-error-handler.d.ts +17 -0
- package/out/interface/common/i-error-handler/i-error-handler.d.ts.map +1 -0
- package/out/interface/common/i-error-handler/i-error-handler.js +1 -0
- package/out/interface/common/index.d.ts +1 -0
- package/out/interface/common/index.d.ts.map +1 -1
- package/out/interface/controller/state/view/i-edit-view.state.d.ts +8 -0
- package/out/interface/controller/state/view/i-edit-view.state.d.ts.map +1 -1
- package/out/logic-scheduler/executor/app-ui-logic-executor.d.ts.map +1 -1
- package/out/logic-scheduler/executor/app-ui-logic-executor.js +10 -4
- package/out/logic-scheduler/trigger/item-dyna-logic-trigger.d.ts.map +1 -1
- package/out/logic-scheduler/trigger/item-dyna-logic-trigger.js +1 -4
- package/out/model/data-entity/data-entity.js +2 -2
- package/out/register/helper/control-register.d.ts.map +1 -1
- package/out/register/helper/control-register.js +6 -1
- package/out/utils/error-handler/default-error-handler.d.ts +13 -0
- package/out/utils/error-handler/default-error-handler.d.ts.map +1 -0
- package/out/utils/error-handler/default-error-handler.js +36 -0
- package/out/utils/error-handler/error-handler-center.d.ts +41 -0
- package/out/utils/error-handler/error-handler-center.d.ts.map +1 -0
- package/out/utils/error-handler/error-handler-center.js +59 -0
- package/out/utils/error-handler/index.d.ts +3 -0
- package/out/utils/error-handler/index.d.ts.map +1 -0
- package/out/utils/error-handler/index.js +2 -0
- package/out/utils/index.d.ts +1 -0
- package/out/utils/index.d.ts.map +1 -1
- package/out/utils/index.js +1 -0
- package/out/utils/promise/promise.d.ts +15 -0
- package/out/utils/promise/promise.d.ts.map +1 -0
- package/out/utils/promise/promise.js +38 -0
- package/package.json +2 -2
- package/src/command/app/open-app-view/open-app-view.ts +18 -5
- package/src/controller/common/control/md-control.controller.ts +2 -1
- package/src/controller/control/dashboard/dashboard.controller.ts +2 -6
- package/src/controller/control/form/edit-form/edit-form.controller.ts +71 -3
- package/src/controller/control/form/edit-form/edit-form.service.ts +1 -1
- package/src/controller/control/form/form/form.controller.ts +2 -6
- package/src/controller/control/grid/grid/grid.controller.ts +5 -9
- package/src/controller/control/toolbar/toolbar.controllerr.ts +14 -8
- package/src/controller/control/tree/tree.service.ts +8 -9
- package/src/engine/md-view.engine.ts +6 -4
- package/src/global/global-util/global-util.ts +15 -0
- package/src/interface/common/i-error-handler/i-error-handler.ts +16 -0
- package/src/interface/common/index.ts +1 -0
- package/src/interface/controller/state/view/i-edit-view.state.ts +10 -1
- package/src/logic-scheduler/executor/app-ui-logic-executor.ts +13 -4
- package/src/logic-scheduler/trigger/item-dyna-logic-trigger.ts +1 -4
- package/src/model/data-entity/data-entity.ts +2 -2
- package/src/register/helper/control-register.ts +6 -1
- package/src/utils/error-handler/default-error-handler.ts +40 -0
- package/src/utils/error-handler/error-handler-center.ts +61 -0
- package/src/utils/error-handler/index.ts +2 -0
- package/src/utils/index.ts +1 -0
- package/src/utils/promise/promise.ts +41 -0
|
@@ -21,7 +21,7 @@ export declare class OpenAppViewCommand {
|
|
|
21
21
|
* @param {IData} [_opts={}]
|
|
22
22
|
* @return {*} {(Promise<IModalData | void>)}
|
|
23
23
|
*/
|
|
24
|
-
exec(appViewId: string,
|
|
24
|
+
exec(appViewId: string, _context: IContext, params?: IParams, opts?: IOpenViewOptions): Promise<IModalData | void>;
|
|
25
25
|
/**
|
|
26
26
|
* 首页导航模式打开
|
|
27
27
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open-app-view.d.ts","sourceRoot":"","sources":["../../../../src/command/app/open-app-view/open-app-view.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"open-app-view.d.ts","sourceRoot":"","sources":["../../../../src/command/app/open-app-view/open-app-view.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAK/E;;;;;;;GAOG;AACH,qBAAa,kBAAkB;IAC7B,MAAM,CAAC,QAAQ,CAAC,GAAG,wBAAwB;;IAM3C;;;;;;;;;;OAUG;IACG,IAAI,CACR,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,QAAQ,EAClB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IA6D7B;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CACxB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,SAAS,CACvB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,WAAW,CACzB,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,UAAU,GAAG,SAAS,EAC7B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAOtB;;;;;;;;;;OAUG;cACa,UAAU,CACxB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,cAAc,CAC5B,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;CAGvB"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { ModelError, RuntimeError } from '@ibiz-template/core';
|
|
2
|
+
import { clone } from 'ramda';
|
|
2
3
|
import { calcDeCodeNameById } from '../../../model';
|
|
3
4
|
import { openRedirectView } from '../../../utils';
|
|
5
|
+
import { Srfuf } from '../../../service';
|
|
4
6
|
/**
|
|
5
7
|
* 打开应用视图
|
|
6
8
|
*
|
|
@@ -24,16 +26,25 @@ export class OpenAppViewCommand {
|
|
|
24
26
|
* @param {IData} [_opts={}]
|
|
25
27
|
* @return {*} {(Promise<IModalData | void>)}
|
|
26
28
|
*/
|
|
27
|
-
async exec(appViewId,
|
|
29
|
+
async exec(appViewId, _context, params = {}, opts = {}) {
|
|
30
|
+
const context = clone(_context);
|
|
28
31
|
const appView = await ibiz.hub.config.view.get(appViewId);
|
|
29
32
|
if (!appView) {
|
|
30
33
|
throw new RuntimeError(`应用视图[${appViewId}]不存在`);
|
|
31
34
|
}
|
|
32
|
-
|
|
33
|
-
|
|
35
|
+
if ((context.srfkey || params.srfuf === Srfuf.CREATE) &&
|
|
36
|
+
appView.appDataEntityId) {
|
|
34
37
|
const deName = calcDeCodeNameById(appView.appDataEntityId);
|
|
35
|
-
|
|
36
|
-
context.srfkey
|
|
38
|
+
// 识别上下文的srfkey并转成对应视图实体名称，然后置空srfkey
|
|
39
|
+
if (context.srfkey) {
|
|
40
|
+
context[deName] = context.srfkey;
|
|
41
|
+
context.srfkey = undefined;
|
|
42
|
+
}
|
|
43
|
+
// 识别参数的 srfuf=0 时为新建。置空和当前要打开视图同实体的主键，避免同上下文导致后一个页面识别为了编辑。然后置空srfuf
|
|
44
|
+
if (params.srfuf === Srfuf.CREATE) {
|
|
45
|
+
context[deName] = undefined;
|
|
46
|
+
delete params.srfuf;
|
|
47
|
+
}
|
|
37
48
|
}
|
|
38
49
|
if (appView.redirectView) {
|
|
39
50
|
const fullViewModel = await ibiz.hub.getAppView(appViewId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;GASG;AACH,qBAAa,mBAAmB,CAC5B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAE7C,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAExC;;;;;;OAMG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAgB3B;;;;;OAKG;IACH,SAAS,CAAC,cAAc,sBAA6B;IAErD;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;cAEtB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAiB1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C,SAAS,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAKtC;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI;IAMxC;;;;;;;;OAQG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAMnD;;;;;;OAMG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IA6B7D;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAmDzD;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIzE;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiEtD;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAU9B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrC,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5C;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9C;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBjC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAkC9D"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import { isElementSame, RuntimeError } from '@ibiz-template/core';
|
|
3
3
|
import { calcDeCodeNameById } from '../../../model';
|
|
4
4
|
import { Srfuf } from '../../../service';
|
|
5
|
+
import { handleAllSettled } from '../../../utils';
|
|
5
6
|
import { ControlController } from './control.controller';
|
|
6
7
|
/**
|
|
7
8
|
* 多数据部件控制器
|
|
@@ -223,7 +224,7 @@ export class MDControlController extends ControlController {
|
|
|
223
224
|
let needRefresh = false;
|
|
224
225
|
try {
|
|
225
226
|
const deName = calcDeCodeNameById(this.model.appDataEntityId);
|
|
226
|
-
await
|
|
227
|
+
await handleAllSettled(data.map(async (item) => {
|
|
227
228
|
// 新建未保存的数据直接走后续删除处理逻辑
|
|
228
229
|
if (item.srfuf !== Srfuf.CREATE) {
|
|
229
230
|
const tempContext = context.clone();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dashboard.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/dashboard.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,gBAAgB,EAChB,kBAAkB,EAClB,2BAA2B,EAC5B,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"dashboard.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/dashboard.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,gBAAgB,EAChB,kBAAkB,EAClB,2BAA2B,EAC5B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD;;;;;;OAMG;IACH,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAA;KAAE,CAAM;IAErD,SAAS,CAAC,SAAS,IAAI,IAAI;cAIX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB1C;;;;;;;;OAQG;IACG,YAAY,CAChB,aAAa,EAAE,cAAc,EAAE,EAC/B,MAAM,CAAC,EAAE,2BAA2B,GACnC,OAAO,CAAC,IAAI,CAAC;IA0BhB;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAQnD"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { getPortletProvider } from '../../../register';
|
|
2
|
+
import { handleAllSettled } from '../../../utils';
|
|
2
3
|
import { ControlController } from '../../common';
|
|
3
4
|
import { getOriginData } from '../../utils';
|
|
4
5
|
/**
|
|
@@ -82,13 +83,8 @@ export class DashboardController extends ControlController {
|
|
|
82
83
|
*/
|
|
83
84
|
async dataChangeNotify(data) {
|
|
84
85
|
// 通知所有成员项去处理成员项相关逻辑
|
|
85
|
-
|
|
86
|
+
await handleAllSettled(Object.values(this.portlets).map(async (portlet) => {
|
|
86
87
|
return portlet.dataChangeNotify(data);
|
|
87
88
|
}));
|
|
88
|
-
const rejectedValue = values.find(item => item.status === 'rejected');
|
|
89
|
-
if (rejectedValue) {
|
|
90
|
-
ibiz.log.error('dataChangeNotify报错', values);
|
|
91
|
-
throw rejectedValue.reason;
|
|
92
|
-
}
|
|
93
89
|
}
|
|
94
90
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { IDEEditForm } from '@ibiz/model-core';
|
|
2
|
-
import { IEditFormState, IEditFormEvent, IEditFormController } from '../../../../interface';
|
|
1
|
+
import { IAppDEEditView, IDEEditForm } from '@ibiz/model-core';
|
|
2
|
+
import { IEditFormState, IEditFormEvent, IEditFormController, IViewController, IEditViewState, IEditViewEvent } from '../../../../interface';
|
|
3
3
|
import { FormController } from '../form';
|
|
4
4
|
import { EditFormService } from './edit-form.service';
|
|
5
5
|
/**
|
|
@@ -19,6 +19,7 @@ export declare class EditFormController extends FormController<IDEEditForm, IEdi
|
|
|
19
19
|
* @type {EditFormService}
|
|
20
20
|
*/
|
|
21
21
|
service: EditFormService;
|
|
22
|
+
get view(): IViewController<IAppDEEditView, IEditViewState, IEditViewEvent>;
|
|
22
23
|
/**
|
|
23
24
|
* 初始化方法
|
|
24
25
|
*
|
|
@@ -36,6 +37,14 @@ export declare class EditFormController extends FormController<IDEEditForm, IEdi
|
|
|
36
37
|
* @return {*} {Promise<IData>}
|
|
37
38
|
*/
|
|
38
39
|
loadDraft(): Promise<IData>;
|
|
40
|
+
/**
|
|
41
|
+
* 拷贝模式加载数据
|
|
42
|
+
*
|
|
43
|
+
* @author chitanda
|
|
44
|
+
* @date 2023-09-26 19:09:21
|
|
45
|
+
* @return {*} {Promise<IData>}
|
|
46
|
+
*/
|
|
47
|
+
protected copy(): Promise<IData>;
|
|
39
48
|
/**
|
|
40
49
|
* 部件加载数据行为
|
|
41
50
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/D,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,cAAc,EACf,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B,IAAI,IAAI,IAAI,eAAe,CAAC,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,CAM1E;IAED;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAY1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;OAKG;IACG,SAAS,IAAI,OAAO,CAAC,KAAK,CAAC;IAiCjC;;;;;;OAMG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA4CtC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA0C5B;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA+C5B;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IA2ChC;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAc7B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+C7D;;;;;;;OAOG;IACG,OAAO,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BvD;;;;;;;OAOG;IACG,QAAQ,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAUhC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { awaitTimeout, mergeInLeft, RuntimeError, mergeDefaultInLeft, } from '@ibiz-template/core';
|
|
2
2
|
import { debounce } from 'lodash-es';
|
|
3
|
-
import {
|
|
3
|
+
import { clone } from 'ramda';
|
|
4
|
+
import { calcDeCodeNameById, hasDeCodeName } from '../../../../model';
|
|
4
5
|
import { Srfuf, ControlVO } from '../../../../service';
|
|
5
6
|
import { ScriptFactory } from '../../../../utils';
|
|
6
7
|
import { FormNotifyState } from '../../../constant';
|
|
@@ -16,6 +17,9 @@ import { EditFormService } from './edit-form.service';
|
|
|
16
17
|
* @extends {FormController<EditFormModel>}
|
|
17
18
|
*/
|
|
18
19
|
export class EditFormController extends FormController {
|
|
20
|
+
get view() {
|
|
21
|
+
return this.ctx.view;
|
|
22
|
+
}
|
|
19
23
|
/**
|
|
20
24
|
* 初始化方法
|
|
21
25
|
*
|
|
@@ -77,6 +81,51 @@ export class EditFormController extends FormController {
|
|
|
77
81
|
this.state.isLoaded = true;
|
|
78
82
|
return this.data;
|
|
79
83
|
}
|
|
84
|
+
/**
|
|
85
|
+
* 拷贝模式加载数据
|
|
86
|
+
*
|
|
87
|
+
* @author chitanda
|
|
88
|
+
* @date 2023-09-26 19:09:21
|
|
89
|
+
* @return {*} {Promise<IData>}
|
|
90
|
+
*/
|
|
91
|
+
async copy() {
|
|
92
|
+
const context = clone(this.context);
|
|
93
|
+
const queryParams = clone(this.params);
|
|
94
|
+
const appDataEntity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId);
|
|
95
|
+
const key = appDataEntity.keyAppDEFieldId;
|
|
96
|
+
if (key && this.params[key]) {
|
|
97
|
+
const deCodeName = calcDeCodeNameById(this.model.appDataEntityId);
|
|
98
|
+
context[deCodeName] = this.params[key];
|
|
99
|
+
delete queryParams[key];
|
|
100
|
+
delete this.params[key];
|
|
101
|
+
delete queryParams.srfcopymode;
|
|
102
|
+
delete this.params.srfcopymode;
|
|
103
|
+
}
|
|
104
|
+
let res;
|
|
105
|
+
try {
|
|
106
|
+
await this.startLoading();
|
|
107
|
+
await this.evt.emit('onBeforeLoad', undefined);
|
|
108
|
+
res = await this.service.get(context, queryParams);
|
|
109
|
+
}
|
|
110
|
+
catch (error) {
|
|
111
|
+
await this.evt.emit('onLoadError', undefined);
|
|
112
|
+
this.actionNotification('GETERROR', {
|
|
113
|
+
error: error,
|
|
114
|
+
});
|
|
115
|
+
throw error;
|
|
116
|
+
}
|
|
117
|
+
finally {
|
|
118
|
+
await this.endLoading();
|
|
119
|
+
}
|
|
120
|
+
res.data.$origin.srfsourcekey = undefined;
|
|
121
|
+
this.state.modified = false;
|
|
122
|
+
this.state.data = res.data;
|
|
123
|
+
this.formStateNotify(FormNotifyState.LOAD);
|
|
124
|
+
await this.evt.emit('onLoadSuccess', undefined);
|
|
125
|
+
this.actionNotification('GETSUCCESS');
|
|
126
|
+
this.state.isLoaded = true;
|
|
127
|
+
return this.data;
|
|
128
|
+
}
|
|
80
129
|
/**
|
|
81
130
|
* 部件加载数据行为
|
|
82
131
|
*
|
|
@@ -84,12 +133,17 @@ export class EditFormController extends FormController {
|
|
|
84
133
|
* @date 2022-08-19 14:08:50
|
|
85
134
|
*/
|
|
86
135
|
async load() {
|
|
136
|
+
// 复制模式独立处理
|
|
137
|
+
const copyMode = this.params.srfcopymode;
|
|
138
|
+
if (copyMode) {
|
|
139
|
+
return this.copy();
|
|
140
|
+
}
|
|
87
141
|
const isLoadDraft = !hasDeCodeName(this.context, this.model.appDataEntityId);
|
|
88
142
|
// 加载草稿单独走一个方法
|
|
89
143
|
if (isLoadDraft) {
|
|
90
144
|
return this.loadDraft();
|
|
91
145
|
}
|
|
92
|
-
const queryParams =
|
|
146
|
+
const queryParams = clone(this.params);
|
|
93
147
|
let res;
|
|
94
148
|
try {
|
|
95
149
|
await this.startLoading();
|
|
@@ -197,7 +197,7 @@ export class EditFormService extends ControlService {
|
|
|
197
197
|
this.dataUIMap.set(uiKey, mapField);
|
|
198
198
|
}
|
|
199
199
|
}, {
|
|
200
|
-
childrenFields: ['deformPages', 'deformDetails'],
|
|
200
|
+
childrenFields: ['deformPages', 'deformTabPages', 'deformDetails'],
|
|
201
201
|
});
|
|
202
202
|
}
|
|
203
203
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAiB,MAAM,gBAAgB,CAAC;AAChE,OAAO,KAAK,EACV,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,gBAAgB,CAAC;AAExB;;;;;;;;;GASG;AACH,8BAAsB,cAAc,CAChC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,UAAU,CAAC,CAEhD;IAED;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAEvD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;;OAMG;IACH,SAAS,EAAE,kBAAkB,EAAE,CAAM;IAErC;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAStD;;;;;OAKG;IACH,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAM7C;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1C;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC;IAQtC;;;;;;OAMG;cACa,qBAAqB,CACnC,OAAO,GAAE,aAAa,EAA4B,EAClD,IAAI,GAAE,cAAqB,EAC3B,MAAM,GAAE,wBAAwB,GAAG,SAAqB,GACvD,OAAO,CAAC,IAAI,CAAC;IAkChB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAE/B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB;;;;;;;OAOG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB/D;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IASlC,kBAAkB,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE,GACzC,IAAI;CAGR"}
|
|
@@ -3,6 +3,7 @@ import { debounceAndAsyncMerge } from '@ibiz-template/core';
|
|
|
3
3
|
import { findChildFormDetails } from '../../../../model';
|
|
4
4
|
import { getFormDetailProvider } from '../../../../register';
|
|
5
5
|
import { ControlVO } from '../../../../service';
|
|
6
|
+
import { handleAllSettled } from '../../../../utils';
|
|
6
7
|
import { ControlController } from '../../../common';
|
|
7
8
|
import { isValueChange } from '../../../utils';
|
|
8
9
|
/**
|
|
@@ -73,14 +74,9 @@ export class FormController extends ControlController {
|
|
|
73
74
|
*/
|
|
74
75
|
async dataChangeNotify(names) {
|
|
75
76
|
// 通知所有成员项去处理成员项相关逻辑
|
|
76
|
-
|
|
77
|
+
await handleAllSettled(Object.values(this.details).map(async (detail) => {
|
|
77
78
|
return detail.dataChangeNotify(names);
|
|
78
79
|
}));
|
|
79
|
-
const rejectedValue = values.find(item => item.status === 'rejected');
|
|
80
|
-
if (rejectedValue) {
|
|
81
|
-
ibiz.log.error('dataChangeNotify报错', values);
|
|
82
|
-
throw rejectedValue.reason;
|
|
83
|
-
}
|
|
84
80
|
}
|
|
85
81
|
/**
|
|
86
82
|
* 表单状态变更通知
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,OAAO,EAAsB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAE9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,+DAA+D,CAAC;AAC1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAS,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIpD;;;;;;;;GAQG;AACH,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAE1B;;;;;;OAMG;IACK,OAAO,EAAE,WAAW,CAAC;IAE7B;;;;;OAKG;IACH,iBAAiB,EAAE,OAAO,CAAS;IAEnC;;;;;OAKG;IACH,kBAAkB,EAAE,OAAO,CAAS;IAEpC;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEtD;;;;;;OAMG;IACH,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAA;KAAE,CAAM;IAEhE;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAE,CAAM;IAE1D;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,6BAA6B,CAAA;KAAE,CAAM;IAEnE;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;IAE7C;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,CAAQ;IAExB;;;;;OAKG;IACH,IAAI,kBAAkB,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAE7D;IAED;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAW3B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB1C;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiDpC,SAAS,CACb,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,SAAS,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ import { Srfuf } from '../../../../service';
|
|
|
9
9
|
import { MDControlController } from '../../../common';
|
|
10
10
|
import { GridNotifyState } from '../../../constant';
|
|
11
11
|
import { getDefaultValue, isValueChange } from '../../../utils';
|
|
12
|
-
import { ScriptFactory } from '../../../../utils';
|
|
12
|
+
import { handleAllSettled, ScriptFactory } from '../../../../utils';
|
|
13
13
|
/**
|
|
14
14
|
* 表格控制器
|
|
15
15
|
*
|
|
@@ -188,9 +188,9 @@ export class GridController extends MDControlController {
|
|
|
188
188
|
async afterLoad(args, items) {
|
|
189
189
|
await super.afterLoad(args, items);
|
|
190
190
|
// 每次表格刷新时通知表格属性列,加载代码表,避免动态代码表更新不及时
|
|
191
|
-
await
|
|
191
|
+
await handleAllSettled(Object.values(this.fieldColumns).map(async (fieldColumn) => {
|
|
192
192
|
await fieldColumn.loadCodeList();
|
|
193
|
-
}));
|
|
193
|
+
}), false);
|
|
194
194
|
// 生成表格row对象
|
|
195
195
|
this.state.rows = items.map(item => {
|
|
196
196
|
const row = new GridRowState(item, this);
|
|
@@ -418,7 +418,7 @@ export class GridController extends MDControlController {
|
|
|
418
418
|
if (!needSaveData.length) {
|
|
419
419
|
return;
|
|
420
420
|
}
|
|
421
|
-
|
|
421
|
+
await handleAllSettled(needSaveData.map(data => {
|
|
422
422
|
return this.save(data);
|
|
423
423
|
}));
|
|
424
424
|
}
|
|
@@ -555,14 +555,9 @@ export class GridController extends MDControlController {
|
|
|
555
555
|
*/
|
|
556
556
|
async dataChangeNotify(row, names) {
|
|
557
557
|
// 通知所有编辑项去处理编辑项相关逻辑
|
|
558
|
-
|
|
558
|
+
await handleAllSettled(Object.values(this.editColumns).map(async (column) => {
|
|
559
559
|
return column.dataChangeNotify(row, names);
|
|
560
560
|
}));
|
|
561
|
-
const rejectedValue = values.find(item => item.status === 'rejected');
|
|
562
|
-
if (rejectedValue) {
|
|
563
|
-
ibiz.log.error('dataChangeNotify报错', values);
|
|
564
|
-
throw rejectedValue.reason;
|
|
565
|
-
}
|
|
566
561
|
}
|
|
567
562
|
/**
|
|
568
563
|
* 表格状态变更通知
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolbar.controllerr.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/toolbar.controllerr.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,cAAc,EAEd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,YAAY,EAEb,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,eAAe,EAGhB,MAAM,aAAa,CAAC;AAErB;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;;;;;;OAWG;cACa,UAAU,CACxB,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,UAAU,EACjB,KAAK,GAAE,KAAU,GAChB,OAAO,CAAC,IAAI,CAAC;cAoCA,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1C;;;;;;;;;;OAUG;IACG,WAAW,CACf,IAAI,EAAE,cAAc,GAAG,YAAY,EACnC,KAAK,EAAE,UAAU,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,IAAI,CAAC;IAcV,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"toolbar.controllerr.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/toolbar.controllerr.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,cAAc,EAEd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,YAAY,EAEb,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,eAAe,EAGhB,MAAM,aAAa,CAAC;AAErB;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;;;;;;OAWG;cACa,UAAU,CACxB,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,UAAU,EACjB,KAAK,GAAE,KAAU,GAChB,OAAO,CAAC,IAAI,CAAC;cAoCA,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1C;;;;;;;;;;OAUG;IACG,WAAW,CACf,IAAI,EAAE,cAAc,GAAG,YAAY,EACnC,KAAK,EAAE,UAAU,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,IAAI,CAAC;IAcV,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA6CpE,eAAe,CACb,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,EACrC,OAAO,EAAE,YAAY,EAAE,GACtB,IAAI;IAOP,iBAAiB,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI;IAS/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;CAcnE"}
|
|
@@ -75,7 +75,7 @@ export class ToolbarController extends ControlController {
|
|
|
75
75
|
this.state.buttonsState.addState(uiItem.id, buttonState);
|
|
76
76
|
}
|
|
77
77
|
}, { childrenFields: ['detoolbarItems'] });
|
|
78
|
-
await this.
|
|
78
|
+
await this.calcButtonState();
|
|
79
79
|
}
|
|
80
80
|
/**
|
|
81
81
|
* 工具栏按钮点击事件
|
|
@@ -107,24 +107,24 @@ export class ToolbarController extends ControlController {
|
|
|
107
107
|
}
|
|
108
108
|
await this.state.buttonsState.update(_data, appDeId);
|
|
109
109
|
// 计算菜单项逻辑的预置逻辑
|
|
110
|
-
if (this.scheduler
|
|
110
|
+
if (this.scheduler) {
|
|
111
|
+
const logicParams = {};
|
|
112
|
+
if (_data) {
|
|
113
|
+
logicParams.data = [_data];
|
|
114
|
+
}
|
|
111
115
|
// 遍历所有的项
|
|
112
116
|
recursiveIterate(this.model, (item) => {
|
|
113
117
|
const itemState = this.state.buttonsState[item.id];
|
|
114
118
|
// 计算项显示逻辑
|
|
115
119
|
if (itemState.visible) {
|
|
116
|
-
const dynaVisible = this.scheduler.triggerItemVisible(item.id,
|
|
117
|
-
data: [_data],
|
|
118
|
-
});
|
|
120
|
+
const dynaVisible = this.scheduler.triggerItemVisible(item.id, logicParams);
|
|
119
121
|
if (dynaVisible !== undefined) {
|
|
120
122
|
itemState.visible = dynaVisible;
|
|
121
123
|
}
|
|
122
124
|
}
|
|
123
125
|
// 计算项启用逻辑
|
|
124
126
|
if (!itemState.disabled) {
|
|
125
|
-
const dynaEnable = this.scheduler.triggerItemEnable(item.id,
|
|
126
|
-
data: [_data],
|
|
127
|
-
});
|
|
127
|
+
const dynaEnable = this.scheduler.triggerItemEnable(item.id, logicParams);
|
|
128
128
|
if (dynaEnable !== undefined) {
|
|
129
129
|
itemState.disabled = !dynaEnable;
|
|
130
130
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tree.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EACP,mBAAmB,EACnB,kBAAkB,EAClB,WAAW,EACX,aAAa,EACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAOnD,OAAO,EACL,gBAAgB,EAEhB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAG1B,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE/B;;;;;OAKG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;;;;;;GAOG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;;;OAOG;IACG,eAAe,CACnB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"tree.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EACP,mBAAmB,EACnB,kBAAkB,EAClB,WAAW,EACX,aAAa,EACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAOnD,OAAO,EACL,gBAAgB,EAEhB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAG1B,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE/B;;;;;OAKG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;;;;;;GAOG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;;;OAOG;IACG,eAAe,CACnB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CAAC;IA8CvC;;;;;;;;;;OAUG;cACa,oBAAoB,CAClC,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,EAAE,CAAC;IAwE3B;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,CAAC;IAUzB;;;;;;;OAOG;IACH,qBAAqB,CACnB,MAAM,EAAE,aAAa,EACrB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB;QACD,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,OAAO,CAAC;QAChB,UAAU,EAAE,OAAO,CAAC;QACpB,SAAS,EAAE,OAAO,CAAC;KACpB;IA+DD;;;;;;;;OAQG;cACa,cAAc,CAC5B,SAAS,EAAE,kBAAkB,EAC7B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,mBAAmB,EAAE,CAAC;IA6CjC;;;;;;;OAOG;cACa,oBAAoB,CAClC,SAAS,EAAE,mBAAmB,EAC9B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,oBAAoB,EAAE,CAAC;CA8BnC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ModelError } from '@ibiz-template/core';
|
|
2
2
|
import { getRootNode, getChildNodeRSs, getTreeNode, calcDeCodeNameById, } from '../../../model';
|
|
3
3
|
import { MDControlService, TreeStaticNodeData, TreeDataSetNodeData, TreeCodeListNodeData, } from '../../../service';
|
|
4
|
-
import { calcNavParams } from '../../../utils';
|
|
4
|
+
import { calcNavParams, handleAllSettled } from '../../../utils';
|
|
5
5
|
/**
|
|
6
6
|
* 树部件服务
|
|
7
7
|
* @author lxm
|
|
@@ -36,17 +36,12 @@ export class TreeService extends MDControlService {
|
|
|
36
36
|
if (childNodeRSs.length === 0) {
|
|
37
37
|
return;
|
|
38
38
|
}
|
|
39
|
-
const results = await
|
|
39
|
+
const results = await handleAllSettled(childNodeRSs.map(async (childNodeRS) => {
|
|
40
40
|
const childNode = getTreeNode(this.model, childNodeRS.childDETreeNodeId);
|
|
41
41
|
return this.fetchNodeDatasByType(childNode, childNodeRS, parentNodeData, opts);
|
|
42
|
-
}));
|
|
42
|
+
}), false);
|
|
43
43
|
results.forEach(result => {
|
|
44
|
-
|
|
45
|
-
childrenNodes.push(...result.value);
|
|
46
|
-
}
|
|
47
|
-
else if (result.status === 'rejected') {
|
|
48
|
-
ibiz.log.error(result.reason);
|
|
49
|
-
}
|
|
44
|
+
childrenNodes.push(...result);
|
|
50
45
|
});
|
|
51
46
|
}
|
|
52
47
|
return childrenNodes;
|
|
@@ -193,9 +188,9 @@ export class TreeService extends MDControlService {
|
|
|
193
188
|
// 设置查询长度
|
|
194
189
|
params.size = nodeModel.maxSize || 1000;
|
|
195
190
|
// 排序属性
|
|
196
|
-
if (nodeModel.sortAppDEFieldId
|
|
191
|
+
if (nodeModel.sortAppDEFieldId) {
|
|
197
192
|
Object.assign(params, {
|
|
198
|
-
sort: `${nodeModel.sortAppDEFieldId.toLowerCase()},${nodeModel.sortDir.toLowerCase()}`,
|
|
193
|
+
sort: `${nodeModel.sortAppDEFieldId.toLowerCase()},${nodeModel.sortDir ? nodeModel.sortDir.toLowerCase() : 'asc'}`,
|
|
199
194
|
});
|
|
200
195
|
}
|
|
201
196
|
// 请求实体数据
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EAChB,SAAS,EACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,cAAc;IAC9C,UAAkB,IAAI,EAAE,cAAc,CACpC,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IAEF;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;;OAMG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAIjD;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsDhC;;;;;;;OAOG;cACa,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAwCrE,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;;OAQG;cACa,QAAQ,CAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BjB;;;;;;;;OAQG;cACa,OAAO,CAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BjB;;;;;;OAMG;cACa,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;;;;OAKG;cACa,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE;;;;;OAKG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,OAAO;IAsCpC;;;;;OAKG;cACa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C;;;;;;OAMG;cACa,UAAU,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;OAMG;IACG,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAc1C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;CAS/B"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { RuntimeModelError } from '@ibiz-template/core';
|
|
2
|
+
import { clone } from 'ramda';
|
|
2
3
|
import { SysUIActionTag, ViewCallTag } from '../constant';
|
|
3
4
|
import { calcDeCodeNameById } from '../model';
|
|
4
5
|
import { ViewEngineBase } from './view-base.engine';
|
|
@@ -209,13 +210,13 @@ export class MDViewEngine extends ViewEngineBase {
|
|
|
209
210
|
if (!openAppViewLogic) {
|
|
210
211
|
throw new RuntimeModelError(this.view.model, `缺少newdata的视图逻辑`);
|
|
211
212
|
}
|
|
212
|
-
const
|
|
213
|
+
const params = clone(this.view.params);
|
|
213
214
|
if (copyMode) {
|
|
214
|
-
|
|
215
|
+
params.srfcopymode = copyMode;
|
|
215
216
|
}
|
|
216
217
|
const result = await ((_c = this.view.scheduler) === null || _c === void 0 ? void 0 : _c.triggerCustom('newdata', {
|
|
217
|
-
context,
|
|
218
|
-
params
|
|
218
|
+
context: this.view.context,
|
|
219
|
+
params,
|
|
219
220
|
data,
|
|
220
221
|
event,
|
|
221
222
|
view: this.view,
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { IExportExcelUtil } from '../../interface';
|
|
2
2
|
import { TextUtil, LayoutPanelUtil, HandlebarsUtil, RawValueUtil } from '../../utils';
|
|
3
|
+
import { ErrorHandlerCenter } from '../../utils/error-handler';
|
|
3
4
|
/**
|
|
4
5
|
* 全局工具方法或对象
|
|
5
6
|
*
|
|
@@ -37,6 +38,13 @@ export declare class GlobalUtil {
|
|
|
37
38
|
* @date 2023-08-24 11:08:28
|
|
38
39
|
*/
|
|
39
40
|
readonly rawValue: RawValueUtil;
|
|
41
|
+
/**
|
|
42
|
+
* 错误处理中心
|
|
43
|
+
* @author lxm
|
|
44
|
+
* @date 2023-09-26 05:04:26
|
|
45
|
+
*/
|
|
46
|
+
readonly error: ErrorHandlerCenter;
|
|
47
|
+
constructor();
|
|
40
48
|
/**
|
|
41
49
|
* 获取导出Excel工具类对象
|
|
42
50
|
* @author lxm
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global-util.d.ts","sourceRoot":"","sources":["../../../src/global/global-util/global-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EACL,QAAQ,EACR,eAAe,EACf,cAAc,EACd,YAAY,EACb,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"global-util.d.ts","sourceRoot":"","sources":["../../../src/global/global-util/global-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EACL,QAAQ,EACR,eAAe,EACf,cAAc,EACd,YAAY,EACb,MAAM,aAAa,CAAC;AACrB,OAAO,EAEL,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AAEnC;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,kBAAyB;IAE7C;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,WAAkB;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,iBAAwB;IAEpC;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,eAAsB;IAEvC;;;;OAIG;IACH,QAAQ,CAAC,KAAK,qBAA4B;;IAM1C;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAEjD;;;;;OAKG;IACH,cAAc,IAAI,IAAI;IAOtB;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;CAQzB"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { TextUtil, LayoutPanelUtil, HandlebarsUtil, RawValueUtil, } from '../../utils';
|
|
2
|
+
import { DefaultErrorHandler, ErrorHandlerCenter, } from '../../utils/error-handler';
|
|
2
3
|
/**
|
|
3
4
|
* 全局工具方法或对象
|
|
4
5
|
*
|
|
@@ -37,6 +38,13 @@ export class GlobalUtil {
|
|
|
37
38
|
* @date 2023-08-24 11:08:28
|
|
38
39
|
*/
|
|
39
40
|
this.rawValue = new RawValueUtil();
|
|
41
|
+
/**
|
|
42
|
+
* 错误处理中心
|
|
43
|
+
* @author lxm
|
|
44
|
+
* @date 2023-09-26 05:04:26
|
|
45
|
+
*/
|
|
46
|
+
this.error = new ErrorHandlerCenter();
|
|
47
|
+
this.error.register(new DefaultErrorHandler());
|
|
40
48
|
}
|
|
41
49
|
/**
|
|
42
50
|
* 显示应用级别的加载提示
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 错误处理器接口
|
|
3
|
+
* @author lxm
|
|
4
|
+
* @date 2023-09-26 04:51:18
|
|
5
|
+
* @export
|
|
6
|
+
* @interface IErrorHandler
|
|
7
|
+
*/
|
|
8
|
+
export interface IErrorHandler {
|
|
9
|
+
/**
|
|
10
|
+
* 处理错误,如果处理了该异常则返回true,后续处理器的就不会处理该异常
|
|
11
|
+
* @author lxm
|
|
12
|
+
* @date 2023-09-26 04:48:57
|
|
13
|
+
* @param {unknown} error
|
|
14
|
+
*/
|
|
15
|
+
handle(error: unknown): boolean | undefined;
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=i-error-handler.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"i-error-handler.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-error-handler/i-error-handler.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC;CAC7C"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -17,4 +17,5 @@ export { IDataAbilityParams } from './i-data-ability-params/i-data-ability-param
|
|
|
17
17
|
export type { IAppConfigService } from './i-app-config-service/i-app-config-service';
|
|
18
18
|
export type { IAppViewConfigService, IViewConfig, } from './i-app-view-config-service/i-app-view-config-service';
|
|
19
19
|
export type { IOpenViewOptions } from './i-open-view-options/i-open-view-options';
|
|
20
|
+
export type { IErrorHandler } from './i-error-handler/i-error-handler';
|
|
20
21
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/interface/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EACL,eAAe,EACf,SAAS,GACV,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,YAAY,EACV,aAAa,EACb,qBAAqB,EACrB,iBAAiB,EACjB,oBAAoB,EACpB,iBAAiB,GAClB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,YAAY,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AACrF,YAAY,EACV,qBAAqB,EACrB,WAAW,GACZ,MAAM,uDAAuD,CAAC;AAC/D,YAAY,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/interface/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EACL,eAAe,EACf,SAAS,GACV,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,YAAY,EACV,aAAa,EACb,qBAAqB,EACrB,iBAAiB,EACjB,oBAAoB,EACpB,iBAAiB,GAClB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,YAAY,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AACrF,YAAY,EACV,qBAAqB,EACrB,WAAW,GACZ,MAAM,uDAAuD,CAAC;AAC/D,YAAY,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAClF,YAAY,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC"}
|
|
@@ -7,5 +7,13 @@ import { IViewState } from './i-view.state';
|
|
|
7
7
|
* @extends {IViewState}
|
|
8
8
|
*/
|
|
9
9
|
export interface IEditViewState extends IViewState {
|
|
10
|
+
/**
|
|
11
|
+
* 是否为复制模式
|
|
12
|
+
*
|
|
13
|
+
* @author chitanda
|
|
14
|
+
* @date 2023-09-26 17:09:21
|
|
15
|
+
* @type {boolean}
|
|
16
|
+
*/
|
|
17
|
+
copyMode?: boolean;
|
|
10
18
|
}
|
|
11
19
|
//# sourceMappingURL=i-edit-view.state.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-edit-view.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/i-edit-view.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;GAMG;AACH,MAAM,WAAW,cAAe,SAAQ,UAAU;
|
|
1
|
+
{"version":3,"file":"i-edit-view.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/i-edit-view.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;GAMG;AACH,MAAM,WAAW,cAAe,SAAQ,UAAU;IAChD;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-ui-logic-executor.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/executor/app-ui-logic-executor.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,mBAAmB,EAEnB,kBAAkB,EAClB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAG7D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"app-ui-logic-executor.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/executor/app-ui-logic-executor.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,mBAAmB,EAEnB,kBAAkB,EAClB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAG7D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,aAAa;IAC3C,IAAI,EAAE,YAAY,CAAC;IAG3B,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,GAAG;IAiB3C;;;;;;;;;;;OAWG;IACG,yBAAyB,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;cAqDN,eAAe,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,CAAC;IA2BlC;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IAyFtB;;;;;;;;;;OAUG;cACa,mBAAmB,CACjC,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IAmC9C;;;;;;;;;;OAUG;cACa,UAAU,CACxB,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,KAAK,EAAE,EACnB,OAAO,EAAE,QAAQ,EACjB,UAAU,EAAE,sBAAsB,GACjC,OAAO,CAAC,IAAI,CAAC;CA+DjB"}
|