@ibiz-template/runtime 0.6.8 → 0.6.9
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 +241 -64
- package/dist/index.system.min.js +1 -1
- package/out/controller/common/control/control.controller.d.ts.map +1 -1
- package/out/controller/common/control/control.controller.js +6 -2
- package/out/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.d.ts.map +1 -1
- package/out/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.js +3 -3
- package/out/controller/control/data-view/data-view.controller.d.ts.map +1 -1
- package/out/controller/control/data-view/data-view.controller.js +5 -5
- package/out/controller/control/form/form/form.controller.d.ts +2 -0
- package/out/controller/control/form/form/form.controller.d.ts.map +1 -1
- package/out/controller/control/form/form/form.controller.js +28 -23
- package/out/controller/control/form/form-detail/form-button/form-button.controller.js +1 -1
- package/out/controller/control/form/form-detail/form-group-panel/form-group-panel.controller.js +1 -1
- package/out/controller/control/grid/grid/grid.controller.d.ts.map +1 -1
- package/out/controller/control/grid/grid/grid.controller.js +2 -2
- package/out/controller/control/md-ctrl/md-ctrl.controller.js +1 -1
- package/out/controller/control/toolbar/toolbar.controllerr.js +2 -2
- package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-node-column.controller.js +1 -1
- package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-ua-column/tree-grid-ex-ua-column.controller.js +1 -1
- package/out/controller/utils/button-state/button-container.state.d.ts +1 -1
- package/out/controller/utils/button-state/button-container.state.d.ts.map +1 -1
- package/out/controller/utils/button-state/button-container.state.js +2 -2
- package/out/controller/utils/button-state/ui-action-button.state.d.ts +2 -2
- package/out/controller/utils/button-state/ui-action-button.state.d.ts.map +1 -1
- package/out/controller/utils/button-state/ui-action-button.state.js +4 -4
- package/out/de-logic/de-logic.js +1 -1
- package/out/interface/controller/common/button-state/i-button-container.state.d.ts +4 -4
- package/out/interface/controller/common/button-state/i-button-container.state.d.ts.map +1 -1
- package/out/interface/controller/common/button-state/i-button.state.d.ts +4 -4
- package/out/interface/controller/common/button-state/i-button.state.d.ts.map +1 -1
- package/out/interface/service/code-list-item/code-list-item.d.ts +10 -0
- package/out/interface/service/code-list-item/code-list-item.d.ts.map +1 -1
- package/out/interface/service/service/i-app-de-authority.service.d.ts +19 -3
- package/out/interface/service/service/i-app-de-authority.service.d.ts.map +1 -1
- package/out/service/service/authority/authority.service.d.ts +2 -1
- package/out/service/service/authority/authority.service.d.ts.map +1 -1
- package/out/service/service/authority/authority.service.js +5 -4
- package/out/service/service/authority/de-authority.service.d.ts +45 -4
- package/out/service/service/authority/de-authority.service.d.ts.map +1 -1
- package/out/service/service/authority/de-authority.service.js +106 -12
- package/out/service/service/control/control.service.d.ts +9 -0
- package/out/service/service/control/control.service.d.ts.map +1 -1
- package/out/service/service/control/control.service.js +19 -0
- package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts +1 -0
- package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts.map +1 -1
- package/out/service/utils/dynamic-code-list/dynamic-code-list.js +23 -1
- package/out/service/utils/util/util.d.ts +1 -1
- package/out/service/utils/util/util.d.ts.map +1 -1
- package/out/ui-logic/ui-logic.js +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,aAAa,EAEb,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,
|
|
1
|
+
{"version":3,"file":"control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,aAAa,EAEb,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAGL,UAAU,EAEX,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,aAAa,EACb,aAAa,EACb,eAAe,EACf,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EACL,kBAAkB,EAClB,SAAS,EAEV,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAKjE;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED,IAAI,IAAI,IAAI,eAAe,CAE1B;IAED;;;;;OAKG;IACH,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAEhC,WAAW,CAAC,EAAE,0BAA0B,CAAC;IAEzC;;;;;;;OAOG;IACH,aAAa,EAAE,KAAK,CAAM;IAE1B;;;;;OAKG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAM;IAErC,MAAM,EAAE,UAAU,CAAC;IAE3B;;;;;;;;OAQG;gBACS,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG;IAuBlE;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;IAStD,SAAS,CAAC,SAAS,IAAI,IAAI;cAMX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cA0B1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAO1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ5C;;;;;;OAMG;IACH,mBAAmB,CAAC,IAAI,EAAE;QAAE,OAAO,CAAC,EAAE,QAAQ,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI;IAyBzE;;;;;OAKG;IACH,cAAc,IAAI,MAAM;IAIxB;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE,GAAG,IAAI;IAIzB;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnC;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC;;;;;OAKG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;OAKG;IACH,aAAa,IAAI,IAAI;IAKrB;;;;;;;OAOG;IACH,SAAS,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG;QACzD,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;QAChB,IAAI,EAAE,KAAK,EAAE,CAAC;KACf;IAqBD;;;;;OAKG;IACH,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;IAWvD;;;;;;;OAOG;IACH,SAAS,CAAC,mBAAmB,IAAI,IAAI;IAYrC;;;;;;OAMG;IACH,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;IAUlE;;;;;;;OAOG;IACH,kBAAkB,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE,GACjE,IAAI;CAmER"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IBizContext, IBizParams, NoticeError } from '@ibiz-template/core';
|
|
1
|
+
import { HttpError, IBizContext, IBizParams, NoticeError, } from '@ibiz-template/core';
|
|
2
2
|
import { clone, isNil } from 'ramda';
|
|
3
3
|
import { notNilEmpty } from 'qx-util';
|
|
4
4
|
import { BaseController } from '..';
|
|
@@ -334,8 +334,12 @@ export class ControlController extends BaseController {
|
|
|
334
334
|
return;
|
|
335
335
|
}
|
|
336
336
|
if (opts === null || opts === void 0 ? void 0 : opts.error) {
|
|
337
|
+
// 401和403的报错原样抛出
|
|
338
|
+
if (opts.error instanceof HttpError && opts.error.status !== 500) {
|
|
339
|
+
throw opts.error;
|
|
340
|
+
}
|
|
341
|
+
// 其他报错时抛错误信息
|
|
337
342
|
ibiz.log.error(opts.error);
|
|
338
|
-
// 报错时抛错误
|
|
339
343
|
throw new NoticeError(message, duration);
|
|
340
344
|
}
|
|
341
345
|
else {
|
package/out/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portlet-part.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,2BAA2B,EAC3B,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;;;;;;GAQG;AACH,qBAAa,qBAAqB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,CAC1E,YAAW,kBAAkB;IAE7B,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,gBAAgB,CAAC;IAExB;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;IAEzC;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,2BAA2B,CAAC;IAE9C;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;;OAOG;gBAED,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,oBAAoB,EAC/B,MAAM,CAAC,EAAE,2BAA2B;IAQtC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBvC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAIzC;;;;;;OAMG;IACH,YAAY,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"portlet-part.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,2BAA2B,EAC3B,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;;;;;;GAQG;AACH,qBAAa,qBAAqB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,CAC1E,YAAW,kBAAkB;IAE7B,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,gBAAgB,CAAC;IAExB;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;IAEzC;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,2BAA2B,CAAC;IAE9C;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;;OAOG;gBAED,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,oBAAoB,EAC/B,MAAM,CAAC,EAAE,2BAA2B;IAQtC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBvC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAIzC;;;;;;OAMG;IACH,YAAY,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAc1C;;;;;;OAMG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BvC;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,EACjB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,IAAI,CAAC;IAgBhB;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAWlD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAS1C;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAIjC"}
|
|
@@ -107,7 +107,7 @@ export class PortletPartController {
|
|
|
107
107
|
data = data.getOrigin();
|
|
108
108
|
}
|
|
109
109
|
if (data) {
|
|
110
|
-
this.state.actionGroupState.update(data, this.dashboard.view.model.appDataEntityId);
|
|
110
|
+
this.state.actionGroupState.update(this.context, data, this.dashboard.view.model.appDataEntityId);
|
|
111
111
|
}
|
|
112
112
|
}
|
|
113
113
|
/**
|
|
@@ -132,7 +132,7 @@ export class PortletPartController {
|
|
|
132
132
|
containerState.addState(detail.id, buttonState);
|
|
133
133
|
}
|
|
134
134
|
});
|
|
135
|
-
await containerState.update();
|
|
135
|
+
await containerState.update(this.dashboard.context);
|
|
136
136
|
this.state.actionGroupState = containerState;
|
|
137
137
|
// 实体门户视图监听视图数据变更，刷新界面行为组的状态。
|
|
138
138
|
const { appDataEntityId } = this.dashboard.view.model;
|
|
@@ -169,7 +169,7 @@ export class PortletPartController {
|
|
|
169
169
|
// 计算界面行为组状态
|
|
170
170
|
if (this.state.actionGroupState) {
|
|
171
171
|
const { appDataEntityId } = this.dashboard.view.model;
|
|
172
|
-
this.state.actionGroupState.update(data, appDataEntityId);
|
|
172
|
+
this.state.actionGroupState.update(this.context, data, appDataEntityId);
|
|
173
173
|
}
|
|
174
174
|
// 计算动态样式表
|
|
175
175
|
this.calcDynaClass(data);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/data-view/data-view.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,0BAA0B,EAC1B,gBAAgB,EAChB,oBAAoB,EACpB,YAAY,EAEb,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAuB,MAAM,aAAa,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,qBAAa,yBAAyB,CAClC,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,EACvD,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,CAEzD,SAAQ,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACnC,YAAW,0BAA0B;IAErC;;;;;OAKG;IACK,OAAO,EAAE,sBAAsB,CAAC;IAExC;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAE7C;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1C;;;;;;OAMG;cACa,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnD;;;;;;OAMG;IACG,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB5C;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"data-view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/data-view/data-view.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,0BAA0B,EAC1B,gBAAgB,EAChB,oBAAoB,EACpB,YAAY,EAEb,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAuB,MAAM,aAAa,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,qBAAa,yBAAyB,CAClC,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,EACvD,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,CAEzD,SAAQ,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACnC,YAAW,0BAA0B;IAErC;;;;;OAKG;IACK,OAAO,EAAE,sBAAsB,CAAC;IAExC;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAE7C;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1C;;;;;;OAMG;cACa,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnD;;;;;;OAMG;IACG,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB5C;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAyD5C;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAMzB,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAOzE;;;;;OAKG;IACH,eAAe,IAAI,eAAe,GAAG,IAAI;IAazC;;;;;;OAMG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,oBAAoB;IA2BnD;;;;;;;;OAQG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAehB;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IActC;;;;OAIG;IACH,eAAe,IAAI,IAAI;IA6BvB;;;;;;OAMG;cACa,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAavD;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAkC1C;;;;;OAKG;IACH,YAAY,IAAI;QACd,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;KAClC;IAOD;;;;;;OAMG;IACH,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAe3D;;;;;;;OAOG;IACG,mBAAmB,CACvB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,IAAI,CAAC;IAgBhB;;;;;OAKG;IACH,aAAa,IAAI,IAAI;CAoCtB"}
|
|
@@ -74,7 +74,7 @@ export class DataViewControlController extends MDControlController {
|
|
|
74
74
|
containerState.addState(detail.id, buttonState);
|
|
75
75
|
}
|
|
76
76
|
});
|
|
77
|
-
await containerState.update();
|
|
77
|
+
await containerState.update(this.context);
|
|
78
78
|
group.groupActionGroupState = containerState;
|
|
79
79
|
});
|
|
80
80
|
}
|
|
@@ -112,11 +112,11 @@ export class DataViewControlController extends MDControlController {
|
|
|
112
112
|
tempData = tempData.getOrigin();
|
|
113
113
|
}
|
|
114
114
|
if (tempData) {
|
|
115
|
-
(_a = group.groupActionGroupState) === null || _a === void 0 ? void 0 : _a.update(tempData, this.model.appDataEntityId);
|
|
115
|
+
(_a = group.groupActionGroupState) === null || _a === void 0 ? void 0 : _a.update(this.context, tempData, this.model.appDataEntityId);
|
|
116
116
|
}
|
|
117
117
|
}
|
|
118
118
|
else {
|
|
119
|
-
(_b = group.groupActionGroupState) === null || _b === void 0 ? void 0 : _b.update(undefined, this.model.appDataEntityId);
|
|
119
|
+
(_b = group.groupActionGroupState) === null || _b === void 0 ? void 0 : _b.update(this.context, undefined, this.model.appDataEntityId);
|
|
120
120
|
}
|
|
121
121
|
});
|
|
122
122
|
}
|
|
@@ -126,7 +126,7 @@ export class DataViewControlController extends MDControlController {
|
|
|
126
126
|
return group.children.indexOf(data) !== -1;
|
|
127
127
|
});
|
|
128
128
|
if (actionGroup) {
|
|
129
|
-
(_a = actionGroup.groupActionGroupState) === null || _a === void 0 ? void 0 : _a.update(actionGroup.selectedData[0], this.model.appDataEntityId);
|
|
129
|
+
(_a = actionGroup.groupActionGroupState) === null || _a === void 0 ? void 0 : _a.update(this.context, actionGroup.selectedData[0], this.model.appDataEntityId);
|
|
130
130
|
}
|
|
131
131
|
}
|
|
132
132
|
}
|
|
@@ -192,7 +192,7 @@ export class DataViewControlController extends MDControlController {
|
|
|
192
192
|
containerState.addState(detail.id, buttonState);
|
|
193
193
|
}
|
|
194
194
|
});
|
|
195
|
-
containerState.update(item.getOrigin());
|
|
195
|
+
containerState.update(this.context, item.getOrigin());
|
|
196
196
|
}
|
|
197
197
|
return containerState;
|
|
198
198
|
}
|
|
@@ -4,6 +4,7 @@ import { AppCounter } from '../../../../service';
|
|
|
4
4
|
import { ControlController } from '../../../common';
|
|
5
5
|
import { FormNotifyState } from '../../../constant';
|
|
6
6
|
import { ControllerEvent } from '../../../utils';
|
|
7
|
+
import { CTX } from '../../../ctx';
|
|
7
8
|
import type { FormGroupPanelController, FormItemController, FormMDCtrlController } from '../form-detail';
|
|
8
9
|
/**
|
|
9
10
|
* 表单控制器
|
|
@@ -72,6 +73,7 @@ export declare abstract class FormController<T extends IDEForm = IDEForm, S exte
|
|
|
72
73
|
*/
|
|
73
74
|
get data(): IData;
|
|
74
75
|
protected initState(): void;
|
|
76
|
+
constructor(model: T, context: IContext, params: IParams, ctx: CTX);
|
|
75
77
|
/**
|
|
76
78
|
* 进行模型预处理
|
|
77
79
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.controller.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,aAAa,EACb,OAAO,EACP,aAAa,EACb,gBAAgB,EAIjB,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
/* eslint-disable no-param-reassign */
|
|
2
2
|
import { RuntimeModelError, debounceAndAsyncMerge, recursiveIterate, } from '@ibiz-template/core';
|
|
3
|
+
import { clone } from 'ramda';
|
|
3
4
|
import { findChildFormDetails, isFormDataContainer } from '../../../../model';
|
|
4
5
|
import { getFormDetailProvider } from '../../../../register';
|
|
5
6
|
import { ControlVO, CounterService } from '../../../../service';
|
|
@@ -17,8 +18,33 @@ import { isValueChange } from '../../../utils';
|
|
|
17
18
|
* @template T
|
|
18
19
|
*/
|
|
19
20
|
export class FormController extends ControlController {
|
|
20
|
-
|
|
21
|
-
|
|
21
|
+
get _evt() {
|
|
22
|
+
return this.evt;
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* 表单数据
|
|
26
|
+
*
|
|
27
|
+
* @author chitanda
|
|
28
|
+
* @date 2023-01-04 10:01:46
|
|
29
|
+
* @readonly
|
|
30
|
+
* @type {IData}
|
|
31
|
+
*/
|
|
32
|
+
get data() {
|
|
33
|
+
return this.state.data;
|
|
34
|
+
}
|
|
35
|
+
initState() {
|
|
36
|
+
super.initState();
|
|
37
|
+
this.state.data = new ControlVO();
|
|
38
|
+
this.state.isLoaded = false;
|
|
39
|
+
this.state.processing = false;
|
|
40
|
+
this.state.modified = false;
|
|
41
|
+
}
|
|
42
|
+
constructor(model, context, params, ctx) {
|
|
43
|
+
if (context &&
|
|
44
|
+
(context.srfreadonly === true || context.srfreadonly === 'true')) {
|
|
45
|
+
model = clone(model);
|
|
46
|
+
}
|
|
47
|
+
super(model, context, params, ctx);
|
|
22
48
|
/**
|
|
23
49
|
* 所有表单项成员的控制器
|
|
24
50
|
*
|
|
@@ -59,27 +85,6 @@ export class FormController extends ControlController {
|
|
|
59
85
|
*/
|
|
60
86
|
this.counters = {};
|
|
61
87
|
}
|
|
62
|
-
get _evt() {
|
|
63
|
-
return this.evt;
|
|
64
|
-
}
|
|
65
|
-
/**
|
|
66
|
-
* 表单数据
|
|
67
|
-
*
|
|
68
|
-
* @author chitanda
|
|
69
|
-
* @date 2023-01-04 10:01:46
|
|
70
|
-
* @readonly
|
|
71
|
-
* @type {IData}
|
|
72
|
-
*/
|
|
73
|
-
get data() {
|
|
74
|
-
return this.state.data;
|
|
75
|
-
}
|
|
76
|
-
initState() {
|
|
77
|
-
super.initState();
|
|
78
|
-
this.state.data = new ControlVO();
|
|
79
|
-
this.state.isLoaded = false;
|
|
80
|
-
this.state.processing = false;
|
|
81
|
-
this.state.modified = false;
|
|
82
|
-
}
|
|
83
88
|
/**
|
|
84
89
|
* 进行模型预处理
|
|
85
90
|
*
|
|
@@ -53,7 +53,7 @@ export class FormButtonController extends FormDetailController {
|
|
|
53
53
|
async formStateNotify(_state) {
|
|
54
54
|
if (this.actionState) {
|
|
55
55
|
const deCodeName = calcDeCodeNameById(this.form.model.appDataEntityId);
|
|
56
|
-
await this.actionState.update(this.data, deCodeName);
|
|
56
|
+
await this.actionState.update(this.context, this.data, deCodeName);
|
|
57
57
|
}
|
|
58
58
|
await super.formStateNotify(_state);
|
|
59
59
|
}
|
package/out/controller/control/form/form-detail/form-group-panel/form-group-panel.controller.js
CHANGED
|
@@ -72,7 +72,7 @@ export class FormGroupPanelController extends FormDetailController {
|
|
|
72
72
|
containerState.addState(detail.id, buttonState);
|
|
73
73
|
}
|
|
74
74
|
});
|
|
75
|
-
await containerState.update();
|
|
75
|
+
await containerState.update(this.form.context);
|
|
76
76
|
this.state.actionGroupState = containerState;
|
|
77
77
|
}
|
|
78
78
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,OAAO,EAEP,aAAa,EACb,aAAa,EACd,MAAM,kBAAkB,CAAC;AAE1B,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,EAChB,aAAa,EACb,aAAa,EACb,YAAY,EACZ,gBAAgB,EAEjB,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;AACpD,OAAO,EACL,eAAe,EAKhB,MAAM,gBAAgB,CAAC;AAIxB;;;;;;;;GAQG;AACH,qBAAa,cAAc,CACvB,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACnC,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC;;;;;;OAMG;IACK,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,UAAU,CAAC,CAEhD;IAED;;;;;OAKG;IACH,iBAAiB,EAAE,OAAO,CAAS;IAEnC;;;;;OAKG;IACH,kBAAkB,EAAE,OAAO,CAAS;IAEpC;;;;;OAKG;IACH,eAAe,EAAE,OAAO,CAAS;IAEjC;;;;;;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,UAAU,EAAE,aAAa,GAAG,SAAS,CAAC;IAEtC;;;;;OAKG;IACH,gBAAgB,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAE9C;;;;;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;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,UAAU,CAEtC;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAW3B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB1C;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAkCzC;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAkDpC,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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"}
|
|
@@ -256,12 +256,12 @@ export class GridController extends MDControlController {
|
|
|
256
256
|
// 响应式写法，用state里遍历出来的row才是reactive
|
|
257
257
|
this.state.rows.forEach(row => {
|
|
258
258
|
Object.values(row.uaColStates).forEach(uaState => {
|
|
259
|
-
uaState.update(row.data.getOrigin(), this.model.appDataEntityId);
|
|
259
|
+
uaState.update(this.context, row.data.getOrigin(), this.model.appDataEntityId);
|
|
260
260
|
});
|
|
261
261
|
});
|
|
262
262
|
this.state.rows.forEach(row => {
|
|
263
263
|
Object.values(row.uiActionGroupStates).forEach(uaState => {
|
|
264
|
-
uaState.update(row.data.getOrigin(), this.model.appDataEntityId);
|
|
264
|
+
uaState.update(this.context, row.data.getOrigin(), this.model.appDataEntityId);
|
|
265
265
|
});
|
|
266
266
|
});
|
|
267
267
|
this.calcGroupData(items);
|
|
@@ -135,7 +135,7 @@ export class MDCtrlController extends MDControlController {
|
|
|
135
135
|
containerState.addState(detail.id, buttonState);
|
|
136
136
|
}
|
|
137
137
|
});
|
|
138
|
-
containerState.update(row.data.getOrigin());
|
|
138
|
+
containerState.update(this.context, row.data.getOrigin());
|
|
139
139
|
row.uaColStates[group.id] = containerState;
|
|
140
140
|
}
|
|
141
141
|
/**
|
|
@@ -89,7 +89,7 @@ export class ToolbarController extends ControlController {
|
|
|
89
89
|
}
|
|
90
90
|
}, { childrenFields: ['detoolbarItems'] });
|
|
91
91
|
if (!this.state.manualCalcButtonState) {
|
|
92
|
-
await this.calcButtonState();
|
|
92
|
+
await this.calcButtonState(undefined, this.model.appDataEntityId);
|
|
93
93
|
}
|
|
94
94
|
else {
|
|
95
95
|
await this.state.buttonsState.init();
|
|
@@ -123,7 +123,7 @@ export class ToolbarController extends ControlController {
|
|
|
123
123
|
if (data && data instanceof ControlVO) {
|
|
124
124
|
_data = data.getOrigin();
|
|
125
125
|
}
|
|
126
|
-
await this.state.buttonsState.update(_data, appDeId);
|
|
126
|
+
await this.state.buttonsState.update(this.context, _data, appDeId);
|
|
127
127
|
// 计算菜单项逻辑的预置逻辑
|
|
128
128
|
if (this.scheduler) {
|
|
129
129
|
const logicParams = {};
|
|
@@ -319,7 +319,7 @@ export class TreeGridExNodeColumnController {
|
|
|
319
319
|
const uaColState = row.columnActionsStates[this.name];
|
|
320
320
|
if (uaColState && row.data._nodeType === 'DE') {
|
|
321
321
|
// 实体节点更新操作列状态
|
|
322
|
-
uaColState.update(row.data._deData);
|
|
322
|
+
uaColState.update(this.context, row.data._deData);
|
|
323
323
|
}
|
|
324
324
|
}
|
|
325
325
|
}
|
|
@@ -112,7 +112,7 @@ export class TreeGridExUAColumnController extends TreeGridExColumnController {
|
|
|
112
112
|
const uaColState = row.columnActionsStates[this.model.id];
|
|
113
113
|
if (uaColState && row.data._nodeType === 'DE') {
|
|
114
114
|
// 实体节点更新操作列状态
|
|
115
|
-
uaColState.update(row.data._deData);
|
|
115
|
+
uaColState.update(this.context, row.data._deData);
|
|
116
116
|
}
|
|
117
117
|
}
|
|
118
118
|
}
|
|
@@ -13,7 +13,7 @@ export declare class ButtonContainerState implements IButtonContainerState {
|
|
|
13
13
|
constructor();
|
|
14
14
|
addState(name: string, state: IButtonContainerState | IButtonState): void;
|
|
15
15
|
setLoading(name: string): void;
|
|
16
|
-
update(data?: IData, appDeId?: string): Promise<void>;
|
|
16
|
+
update(context: IContext, data?: IData, appDeId?: string): Promise<void>;
|
|
17
17
|
init(): Promise<void>;
|
|
18
18
|
[p: string]: any;
|
|
19
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"button-container.state.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/button-state/button-container.state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEzE;;;;;;;GAOG;AACH,qBAAa,oBAAqB,YAAW,qBAAqB;IACxD,OAAO,EAAE,OAAO,CAAC;IAEjB,QAAQ,EAAE,KAAK,CAAC,qBAAqB,GAAG,YAAY,CAAC,CAAC;;IAuB9D,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,YAAY,GAAG,IAAI;IAWzE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAUxB,MAAM,
|
|
1
|
+
{"version":3,"file":"button-container.state.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/button-state/button-container.state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEzE;;;;;;;GAOG;AACH,qBAAa,oBAAqB,YAAW,qBAAqB;IACxD,OAAO,EAAE,OAAO,CAAC;IAEjB,QAAQ,EAAE,KAAK,CAAC,qBAAqB,GAAG,YAAY,CAAC,CAAC;;IAuB9D,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,YAAY,GAAG,IAAI;IAWzE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAUxB,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;IAQV,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ3B,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB"}
|
|
@@ -47,9 +47,9 @@ export class ButtonContainerState {
|
|
|
47
47
|
}
|
|
48
48
|
});
|
|
49
49
|
}
|
|
50
|
-
async update(data, appDeId) {
|
|
50
|
+
async update(context, data, appDeId) {
|
|
51
51
|
await Promise.all(this.children.map(child => {
|
|
52
|
-
return child.update(data, appDeId);
|
|
52
|
+
return child.update(context, data, appDeId);
|
|
53
53
|
}));
|
|
54
54
|
}
|
|
55
55
|
async init() {
|
|
@@ -76,7 +76,7 @@ export declare class UIActionButtonState implements IButtonState {
|
|
|
76
76
|
* @param {string} [appDeId] 数据对应的实体id
|
|
77
77
|
* @return {*}
|
|
78
78
|
*/
|
|
79
|
-
protected calcPermission(data?: IData, appDeId?: string): Promise<void>;
|
|
80
|
-
update(data?: IData, appDeId?: string): Promise<void>;
|
|
79
|
+
protected calcPermission(context: IContext, data?: IData, appDeId?: string): Promise<void>;
|
|
80
|
+
update(context: IContext, data?: IData, appDeId?: string): Promise<void>;
|
|
81
81
|
}
|
|
82
82
|
//# sourceMappingURL=ui-action-button.state.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ui-action-button.state.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/button-state/ui-action-button.state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D;;;;;;;GAOG;AACH,qBAAa,mBAAoB,YAAW,YAAY;IACtD,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,EAAE,OAAO,CAAS;IAE1B,OAAO,EAAE,OAAO,CAAQ;IAExB,OAAO,EAAE,OAAO,CAAS;IAEzB;;OAEG;IACH,SAAS,CAAC,SAAS,EAAE,OAAO,CAAQ;IAEpC;;OAEG;IACH,SAAS,CAAC,kBAAkB,EAAE,OAAO,CAAQ;IAE7C;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,EAAE,OAAO,CAAS;IAE1C;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,EAAE,OAAO,CAAS;IAEzC;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAEpC;;OAEG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAE9B;;OAEG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,CAAS;gBAEtB,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAM5D;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqD3B;;;;;;;;OAQG;cACa,cAAc,CAC5B,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"ui-action-button.state.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/button-state/ui-action-button.state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D;;;;;;;GAOG;AACH,qBAAa,mBAAoB,YAAW,YAAY;IACtD,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,EAAE,OAAO,CAAS;IAE1B,OAAO,EAAE,OAAO,CAAQ;IAExB,OAAO,EAAE,OAAO,CAAS;IAEzB;;OAEG;IACH,SAAS,CAAC,SAAS,EAAE,OAAO,CAAQ;IAEpC;;OAEG;IACH,SAAS,CAAC,kBAAkB,EAAE,OAAO,CAAQ;IAE7C;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,EAAE,OAAO,CAAS;IAE1C;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,EAAE,OAAO,CAAS;IAEzC;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAEpC;;OAEG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAE9B;;OAEG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,CAAS;gBAEtB,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAM5D;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqD3B;;;;;;;;OAQG;cACa,cAAc,CAC5B,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;IAmBV,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;CAiBjB"}
|
|
@@ -104,7 +104,7 @@ export class UIActionButtonState {
|
|
|
104
104
|
* @param {string} [appDeId] 数据对应的实体id
|
|
105
105
|
* @return {*}
|
|
106
106
|
*/
|
|
107
|
-
async calcPermission(data, appDeId) {
|
|
107
|
+
async calcPermission(context, data, appDeId) {
|
|
108
108
|
if (!this.dataAccessAction) {
|
|
109
109
|
return;
|
|
110
110
|
}
|
|
@@ -113,13 +113,13 @@ export class UIActionButtonState {
|
|
|
113
113
|
if (this.appDeName && appDeId && !appDeId.includes(this.appDeName)) {
|
|
114
114
|
ibiz.log.warn(`${this.uiActionId}界面行为的实体${this.appDeName}和数据的实体${appDeId}不一致`);
|
|
115
115
|
}
|
|
116
|
-
this.permitted = await app.authority.calcByDataAccessAction(this.dataAccessAction, data, appDeId);
|
|
116
|
+
this.permitted = await app.authority.calcByDataAccessAction(this.dataAccessAction, context, data, appDeId);
|
|
117
117
|
}
|
|
118
|
-
async update(data, appDeId) {
|
|
118
|
+
async update(context, data, appDeId) {
|
|
119
119
|
if (!this.isInit) {
|
|
120
120
|
await this.init();
|
|
121
121
|
}
|
|
122
|
-
await this.calcPermission(data, appDeId);
|
|
122
|
+
await this.calcPermission(context, data, appDeId);
|
|
123
123
|
// 赋值,没权限时都禁用，没权限时隐藏的才会不显示
|
|
124
124
|
if (!this.permitted) {
|
|
125
125
|
this.disabled = true;
|
package/out/de-logic/de-logic.js
CHANGED
|
@@ -184,7 +184,7 @@ export class DELogic {
|
|
|
184
184
|
if (bol && link.dstNode) {
|
|
185
185
|
await this.deepExec(link.dstNode, ctx);
|
|
186
186
|
// 平行输出: 在满足连接条件并逻辑执行完毕后若是非平行输出则执行完成
|
|
187
|
-
if (node.model.parallelOutput
|
|
187
|
+
if (node.model.parallelOutput !== true) {
|
|
188
188
|
break;
|
|
189
189
|
}
|
|
190
190
|
}
|
|
@@ -36,13 +36,13 @@ export interface IButtonContainerState {
|
|
|
36
36
|
/**
|
|
37
37
|
* 更新子的状态
|
|
38
38
|
*
|
|
39
|
-
* @
|
|
40
|
-
* @
|
|
41
|
-
* @param {IData} data 后台数据，可能不存在
|
|
39
|
+
* @param {IContext} context 上下文
|
|
40
|
+
* @param {IData} [data] 后台数据，可能不存在
|
|
42
41
|
* @param {string} [appDeId] 实体标识
|
|
43
42
|
* @return {*} {Promise<void>}
|
|
43
|
+
* @memberof IButtonContainerState
|
|
44
44
|
*/
|
|
45
|
-
update(data?: IData, appDeId?: string): Promise<void>;
|
|
45
|
+
update(context: IContext, data?: IData, appDeId?: string): Promise<void>;
|
|
46
46
|
/**
|
|
47
47
|
* 初始化
|
|
48
48
|
* @author lxm
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-button-container.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/common/button-state/i-button-container.state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,MAAM,WAAW,qBAAqB;IACpC;;;;;;OAMG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAE/B;;;;;;;OAOG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,YAAY,GAAG,IAAI,CAAC;IAE1E;;;;;;;;OAQG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"i-button-container.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/common/button-state/i-button-container.state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,MAAM,WAAW,qBAAqB;IACpC;;;;;;OAMG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAE/B;;;;;;;OAOG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,YAAY,GAAG,IAAI,CAAC;IAE1E;;;;;;;;OAQG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzE;;;;;OAKG;IACH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB"}
|
|
@@ -42,13 +42,13 @@ export interface IButtonState {
|
|
|
42
42
|
/**
|
|
43
43
|
* 更新自身状态
|
|
44
44
|
*
|
|
45
|
-
* @
|
|
46
|
-
* @
|
|
47
|
-
* @param {IData} data 后台数据，可能不存在
|
|
45
|
+
* @param {IContext} context 上下文
|
|
46
|
+
* @param {IData} [data] 后台数据，可能不存在
|
|
48
47
|
* @param {string} [appDeId] 实体标识
|
|
49
48
|
* @return {*} {Promise<void>}
|
|
49
|
+
* @memberof IButtonState
|
|
50
50
|
*/
|
|
51
|
-
update(data?: IData, appDeId?: string): Promise<void>;
|
|
51
|
+
update(context: IContext, data?: IData, appDeId?: string): Promise<void>;
|
|
52
52
|
/**
|
|
53
53
|
* 初始化
|
|
54
54
|
* @author lxm
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-button.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/common/button-state/i-button.state.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;;OAMG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;;OAMG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;;;;OAQG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"i-button.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/common/button-state/i-button.state.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;;OAMG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;;OAMG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;;;;OAQG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzE;;;;;OAKG;IACH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB"}
|
|
@@ -28,6 +28,11 @@ export interface CodeListItem {
|
|
|
28
28
|
* @type {string}
|
|
29
29
|
*/
|
|
30
30
|
color?: string;
|
|
31
|
+
/**
|
|
32
|
+
* 背景颜色
|
|
33
|
+
* @type {string}
|
|
34
|
+
*/
|
|
35
|
+
bkcolor?: string;
|
|
31
36
|
/**
|
|
32
37
|
* 子代码项
|
|
33
38
|
* @type {CodeListItem[]}
|
|
@@ -38,6 +43,11 @@ export interface CodeListItem {
|
|
|
38
43
|
* @type {string}
|
|
39
44
|
*/
|
|
40
45
|
textCls?: string;
|
|
46
|
+
/**
|
|
47
|
+
* 样式表名称
|
|
48
|
+
* @type {string}
|
|
49
|
+
*/
|
|
50
|
+
cls?: string;
|
|
41
51
|
/**
|
|
42
52
|
* 禁止选择
|
|
43
53
|
* @author lxm
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code-list-item.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/code-list-item/code-list-item.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;OAGG;IACH,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IAEvB;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;OAGG;IACH,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAE1B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;OAGG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB;;;OAGG;IACH,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB"}
|
|
1
|
+
{"version":3,"file":"code-list-item.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/code-list-item/code-list-item.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;OAGG;IACH,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IAEvB;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAE1B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;OAGG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB;;;OAGG;IACH,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB"}
|
|
@@ -11,10 +11,26 @@ export interface IAppDeAuthorityService {
|
|
|
11
11
|
* @author lxm
|
|
12
12
|
* @date 2023-05-10 12:33:10
|
|
13
13
|
* @param {string} dataAccessAction 操作标识
|
|
14
|
-
* @param {IData}
|
|
15
|
-
* @param {
|
|
14
|
+
* @param {IData | undefined} data 实体数据
|
|
15
|
+
* @param {IContext} context 上下文
|
|
16
16
|
* @return {*} {Promise<boolean>}
|
|
17
17
|
*/
|
|
18
|
-
calcByDataAccessAction(dataAccessAction: string, data: IData): Promise<boolean>;
|
|
18
|
+
calcByDataAccessAction(dataAccessAction: string, data: IData | undefined, context: IContext): Promise<boolean>;
|
|
19
|
+
/**
|
|
20
|
+
* 设置实体数据权限标识
|
|
21
|
+
*
|
|
22
|
+
* @param {IParams} params
|
|
23
|
+
* @param {string} dataAccAction
|
|
24
|
+
* @memberof IAppDeAuthorityService
|
|
25
|
+
*/
|
|
26
|
+
setDataAccAction(params: IParams, dataAccAction: string): void;
|
|
27
|
+
/**
|
|
28
|
+
* 获取实体数据权限标识
|
|
29
|
+
*
|
|
30
|
+
* @param {string} key
|
|
31
|
+
* @return {*} {(string | undefined)}
|
|
32
|
+
* @memberof IAppDeAuthorityService
|
|
33
|
+
*/
|
|
34
|
+
getDataAccAction(key: string): string | undefined;
|
|
19
35
|
}
|
|
20
36
|
//# sourceMappingURL=i-app-de-authority.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-app-de-authority.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-app-de-authority.service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;;;;;;OAQG;IACH,sBAAsB,CACpB,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"i-app-de-authority.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-app-de-authority.service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;;;;;;OAQG;IACH,sBAAsB,CACpB,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,GAAG,SAAS,EACvB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;;;;OAMG;IACH,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAE/D;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CACnD"}
|
|
@@ -88,10 +88,11 @@ export declare class AuthorityService {
|
|
|
88
88
|
* @author lxm
|
|
89
89
|
* @date 2023-05-10 12:33:10
|
|
90
90
|
* @param {string} dataAccessAction 操作标识
|
|
91
|
+
* @param {IContext} context 上下文
|
|
91
92
|
* @param {IData} [data] 实体数据
|
|
92
93
|
* @param {string} [appDeId] 应用实体id
|
|
93
94
|
* @return {*} {Promise<boolean>}
|
|
94
95
|
*/
|
|
95
|
-
calcByDataAccessAction(dataAccessAction: string, data?: IData, appDeId?: string): Promise<boolean>;
|
|
96
|
+
calcByDataAccessAction(dataAccessAction: string, context: IContext, data?: IData, appDeId?: string): Promise<boolean>;
|
|
96
97
|
}
|
|
97
98
|
//# sourceMappingURL=authority.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authority.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/authority/authority.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAG5D;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IA2Cf,SAAS,CAAC,QAAQ,EAAE,YAAY;IA1C5C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAa;IAEjE;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAC7B,MAAM,EACN,CAAC,WAAW,EAAE,cAAc,KAAK,OAAO,CAAC,sBAAsB,CAAC,CACjE,CAAa;IAEd;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAM;IAElC;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,EAAE,OAAO,CAAS;gBAEtB,QAAQ,EAAE,YAAY;IAE5C;;;;;;;;;OASG;IACH,QAAQ,CACN,EAAE,EAAE,MAAM,EACV,WAAW,EAAE,CACX,WAAW,EAAE,cAAc,KACxB,OAAO,CAAC,sBAAsB,CAAC,GACnC,IAAI;IAIP;;;;;;;;OAQG;IACG,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAsB7D;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,oBAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAejD;;;;;OAKG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIvC
|
|
1
|
+
{"version":3,"file":"authority.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/authority/authority.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAG5D;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IA2Cf,SAAS,CAAC,QAAQ,EAAE,YAAY;IA1C5C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAa;IAEjE;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAC7B,MAAM,EACN,CAAC,WAAW,EAAE,cAAc,KAAK,OAAO,CAAC,sBAAsB,CAAC,CACjE,CAAa;IAEd;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAM;IAElC;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,EAAE,OAAO,CAAS;gBAEtB,QAAQ,EAAE,YAAY;IAE5C;;;;;;;;;OASG;IACH,QAAQ,CACN,EAAE,EAAE,MAAM,EACV,WAAW,EAAE,CACX,WAAW,EAAE,cAAc,KACxB,OAAO,CAAC,sBAAsB,CAAC,GACnC,IAAI;IAIP;;;;;;;;OAQG;IACG,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAsB7D;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,oBAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAejD;;;;;OAKG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIvC;;;;;;;;;OASG;IACG,sBAAsB,CAC1B,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC;CA0BpB"}
|
|
@@ -123,11 +123,12 @@ export class AuthorityService {
|
|
|
123
123
|
* @author lxm
|
|
124
124
|
* @date 2023-05-10 12:33:10
|
|
125
125
|
* @param {string} dataAccessAction 操作标识
|
|
126
|
+
* @param {IContext} context 上下文
|
|
126
127
|
* @param {IData} [data] 实体数据
|
|
127
128
|
* @param {string} [appDeId] 应用实体id
|
|
128
129
|
* @return {*} {Promise<boolean>}
|
|
129
130
|
*/
|
|
130
|
-
async calcByDataAccessAction(dataAccessAction, data, appDeId) {
|
|
131
|
+
async calcByDataAccessAction(dataAccessAction, context, data, appDeId) {
|
|
131
132
|
// 默认为true
|
|
132
133
|
const result = true;
|
|
133
134
|
// 启用权限校验的通过操作标识去找它映射的统一资源校验，先通过了才走主状态
|
|
@@ -141,10 +142,10 @@ export class AuthorityService {
|
|
|
141
142
|
return false;
|
|
142
143
|
}
|
|
143
144
|
}
|
|
144
|
-
//
|
|
145
|
-
if (
|
|
145
|
+
// 有实体标识走实体权限的校验（不一定需要数据，可以使用附属主实体的操作标识）
|
|
146
|
+
if (appDeId) {
|
|
146
147
|
const service = await this.getService(appDeId);
|
|
147
|
-
return service.calcByDataAccessAction(dataAccessAction, data);
|
|
148
|
+
return service.calcByDataAccessAction(dataAccessAction, data, context);
|
|
148
149
|
}
|
|
149
150
|
return result;
|
|
150
151
|
}
|