@ibiz-template/runtime 0.4.4 → 0.4.5

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.
@@ -1 +1 @@
1
- {"version":3,"file":"grid-field-edit-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGrE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEjE;;;;;GAKG;AACH,qBAAa,6BACX,SAAQ,yBACR,YAAW,0BAA0B;IAErC;;;;;;OAMG;IACH,QAAQ,EAAG,eAAe,CAAC;IAE3B;;;;;;OAMG;IACH,MAAM,EAAG,iBAAiB,CAAC;IAE3B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;OAKG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;;OAQG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,OAAO,EACd,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IAKhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA4CzE;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;IAMjE;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAiB3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAe3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAM3C;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAe1C;;;;;;OAMG;IACG,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;CAwBpD"}
1
+ {"version":3,"file":"grid-field-edit-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGrE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEjE;;;;;GAKG;AACH,qBAAa,6BACX,SAAQ,yBACR,YAAW,0BAA0B;IAErC;;;;;;OAMG;IACH,QAAQ,EAAG,eAAe,CAAC;IAE3B;;;;;;OAMG;IACH,MAAM,EAAG,iBAAiB,CAAC;IAE3B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;OAKG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;;OAQG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,OAAO,EACd,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IAKhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAoDzE;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;IAMjE;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAiB3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAe3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAM3C;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAe1C;;;;;;OAMG;IACG,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;CAwBpD"}
@@ -137,8 +137,16 @@ export class GridFieldEditColumnController extends GridFieldColumnController {
137
137
  */
138
138
  async dataChangeNotify(row, names) {
139
139
  // 重置项,变更时自己的值置空
140
- const { resetItemName } = this.editItem;
141
- if (resetItemName && names.includes(resetItemName)) {
140
+ const { resetItemNames } = this.editItem;
141
+ let isReset = false;
142
+ if (resetItemNames && resetItemNames.length > 0) {
143
+ resetItemNames.forEach((resetItemName) => {
144
+ if (names.includes(resetItemName)) {
145
+ isReset = true;
146
+ }
147
+ });
148
+ }
149
+ if (isReset) {
142
150
  this.setRowValue(row, null);
143
151
  }
144
152
  // 计算禁用状态
@@ -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;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"}
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;IAgDpE,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"}
@@ -115,6 +115,9 @@ export class ToolbarController extends ControlController {
115
115
  // 遍历所有的项
116
116
  recursiveIterate(this.model, (item) => {
117
117
  const itemState = this.state.buttonsState[item.id];
118
+ if (!itemState) {
119
+ return;
120
+ }
118
121
  // 计算项显示逻辑
119
122
  if (itemState.visible) {
120
123
  const dynaVisible = this.scheduler.triggerItemVisible(item.id, logicParams);
@@ -1,4 +1,4 @@
1
- import { IAppView, IAppViewRef, IControl, IModelObject, IPanel, ISysPFPlugin } from '@ibiz/model-core';
1
+ import { IAppView, IAppViewRef, IControl, IControlRender, IModelObject, IPanel, ISysPFPlugin } from '@ibiz/model-core';
2
2
  /**
3
3
  * 在数据模型中查找对应 id 模型
4
4
  *
@@ -61,5 +61,7 @@ export declare function getPFPlugin(id: string, appId?: string): ISysPFPlugin;
61
61
  * @param {IControl} control
62
62
  * @return {*} {(IPanel | undefined)}
63
63
  */
64
- export declare function getControlPanel(control: IControl): IPanel | undefined;
64
+ export declare function getControlPanel(control: {
65
+ controlRenders?: IControlRender[];
66
+ }): IPanel | undefined;
65
67
  //# sourceMappingURL=util.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/model/utils/util.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,YAAY,EACZ,MAAM,EACN,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EAAE,EACtB,EAAE,EAAE,MAAM,GACT,YAAY,GAAG,IAAI,CAarB;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAQ5E;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,QAAQ,EACd,GAAG,EAAE,MAAM,GACV,WAAW,GAAG,SAAS,CAQzB;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;IACnE,gBAAgB,EAAE,OAAO,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,OAAO,CAAC;CAChB,CAyBA;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,YAAY,CAgBpE;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS,CASrE"}
1
+ {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/model/utils/util.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,MAAM,EACN,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EAAE,EACtB,EAAE,EAAE,MAAM,GACT,YAAY,GAAG,IAAI,CAarB;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAQ5E;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,QAAQ,EACd,GAAG,EAAE,MAAM,GACV,WAAW,GAAG,SAAS,CAQzB;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;IACnE,gBAAgB,EAAE,OAAO,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,OAAO,CAAC;CAChB,CAyBA;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,YAAY,CAgBpE;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC;CACnC,GAAG,MAAM,GAAG,SAAS,CASrB"}
@@ -1 +1 @@
1
- {"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE1B,QAAQ,EAAE,YAAY;IAIlC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAuDhD;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAuE1B;;;;OAIG;IACH,SAAS,CAAC,eAAe,CACvB,KAAK,EAAE,KAAK,EAAE,EACd,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GACvB,YAAY,EAAE,GAAG,SAAS;IAwB7B;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;CAyC3B"}
1
+ {"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE1B,QAAQ,EAAE,YAAY;IAIlC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IA6DhD;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAuE1B;;;;OAIG;IACH,SAAS,CAAC,eAAe,CACvB,KAAK,EAAE,KAAK,EAAE,EACd,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GACvB,YAAY,EAAE,GAAG,SAAS;IAwB7B;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;CAyC3B"}
@@ -98,7 +98,12 @@ export class DynamicCodeListCache {
98
98
  }
99
99
  // 数据属性
100
100
  if (dataAppDEFieldId && data[dataAppDEFieldId]) {
101
- result.data = ScriptFactory.execSingleLine(data[dataAppDEFieldId]);
101
+ try {
102
+ result.data = ScriptFactory.execSingleLine(data[dataAppDEFieldId]);
103
+ }
104
+ catch (error) {
105
+ ibiz.log.error('动态代码表数据属性返回值不为对象格式的字符串,无法转换!');
106
+ }
102
107
  }
103
108
  return result;
104
109
  }
@@ -2,6 +2,7 @@ import { BackendUIActionProvider } from './backend-ui-action-provider';
2
2
  import { SysUIActionProvider } from './sys-ui-action-provider';
3
3
  import { FrontUIActionProvider } from './front-ui-action-provider';
4
4
  import { WFWithdrawUIActionProvider } from './wf-withdraw-ui-action-provider';
5
+ import { UIActionProviderBase } from './ui-action-provider-base';
5
6
  /**
6
7
  * 预置默认的界面行为适配器
7
8
  *
@@ -10,5 +11,5 @@ import { WFWithdrawUIActionProvider } from './wf-withdraw-ui-action-provider';
10
11
  * @export
11
12
  */
12
13
  export declare function presetUIActionProvider(): void;
13
- export { FrontUIActionProvider, SysUIActionProvider, BackendUIActionProvider, WFWithdrawUIActionProvider, };
14
+ export { FrontUIActionProvider, SysUIActionProvider, BackendUIActionProvider, WFWithdrawUIActionProvider, UIActionProviderBase, };
14
15
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAE9E;;;;;;GAMG;AACH,wBAAgB,sBAAsB,IAAI,IAAI,CAkB7C;AAED,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,uBAAuB,EACvB,0BAA0B,GAC3B,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;GAMG;AACH,wBAAgB,sBAAsB,IAAI,IAAI,CAkB7C;AAED,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,uBAAuB,EACvB,0BAA0B,EAC1B,oBAAoB,GACrB,CAAC"}
@@ -3,6 +3,7 @@ import { BackendUIActionProvider } from './backend-ui-action-provider';
3
3
  import { SysUIActionProvider } from './sys-ui-action-provider';
4
4
  import { FrontUIActionProvider } from './front-ui-action-provider';
5
5
  import { WFWithdrawUIActionProvider } from './wf-withdraw-ui-action-provider';
6
+ import { UIActionProviderBase } from './ui-action-provider-base';
6
7
  /**
7
8
  * 预置默认的界面行为适配器
8
9
  *
@@ -25,4 +26,4 @@ export function presetUIActionProvider() {
25
26
  const wfWithdrawUIActionProvider = new WFWithdrawUIActionProvider();
26
27
  registerUIActionProvider('DEUIACTION_WFWithdraw', () => wfWithdrawUIActionProvider);
27
28
  }
28
- export { FrontUIActionProvider, SysUIActionProvider, BackendUIActionProvider, WFWithdrawUIActionProvider, };
29
+ export { FrontUIActionProvider, SysUIActionProvider, BackendUIActionProvider, WFWithdrawUIActionProvider, UIActionProviderBase, };
@@ -26,6 +26,17 @@ export declare class ThemeUtil {
26
26
  * @return {*} {Promise<void>}
27
27
  */
28
28
  loadTheme(theme: IAppUITheme): Promise<void>;
29
+ /**
30
+ * 设置额外修改的主题参数
31
+ *
32
+ * @author chitanda
33
+ * @date 2023-12-05 11:12:00
34
+ * @protected
35
+ * @param {IAppUITheme} theme
36
+ * @param {Record<string, string>} params
37
+ * @return {*} {void}
38
+ */
39
+ protected setThemeParams(theme: IAppUITheme, params: Record<string, string>): void;
29
40
  /**
30
41
  * 设置主题
31
42
  *
@@ -1 +1 @@
1
- {"version":3,"file":"theme-util.d.ts","sourceRoot":"","sources":["../../../src/utils/theme-util/theme-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAgB,MAAM,kBAAkB,CAAC;AAE7D;;;;;;;GAOG;AACH,qBAAa,SAAS;IACpB;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,WAAW,CAA4C;IAEvE;;;;;;;OAOG;IACG,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAUlD;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAO3B;;;;;;OAMG;IACH,QAAQ,IAAI,MAAM;CAGnB"}
1
+ {"version":3,"file":"theme-util.d.ts","sourceRoot":"","sources":["../../../src/utils/theme-util/theme-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAgB,MAAM,kBAAkB,CAAC;AAG7D;;;;;;;GAOG;AACH,qBAAa,SAAS;IACpB;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,WAAW,CAA4C;IAEvE;;;;;;;OAOG;IACG,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAclD;;;;;;;;;OASG;IACH,SAAS,CAAC,cAAc,CACtB,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7B,IAAI;IAoBP;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAO3B;;;;;;OAMG;IACH,QAAQ,IAAI,MAAM;CAGnB"}
@@ -1,3 +1,4 @@
1
+ import { clone } from 'ramda';
1
2
  /**
2
3
  * 主题工具类
3
4
  *
@@ -27,14 +28,47 @@ export class ThemeUtil {
27
28
  * @return {*} {Promise<void>}
28
29
  */
29
30
  async loadTheme(theme) {
30
- const data = theme.themeParams || {};
31
+ const data = clone(theme.themeParams || {});
32
+ const path = data['theme-package-path'];
33
+ delete data.appId;
34
+ delete data['theme-package-path'];
31
35
  await ibiz.plugin.loadPlugin({
32
36
  runtimeObject: true,
33
37
  rtobjectName: theme.name,
34
- rtobjectRepo: data['theme-package-path'],
38
+ rtobjectRepo: path,
35
39
  });
40
+ this.setThemeParams(theme, data);
36
41
  this.setTheme(theme.themeTag);
37
42
  }
43
+ /**
44
+ * 设置额外修改的主题参数
45
+ *
46
+ * @author chitanda
47
+ * @date 2023-12-05 11:12:00
48
+ * @protected
49
+ * @param {IAppUITheme} theme
50
+ * @param {Record<string, string>} params
51
+ * @return {*} {void}
52
+ */
53
+ setThemeParams(theme, params) {
54
+ const themeStyle = document.getElementById(theme.themeTag);
55
+ if (themeStyle) {
56
+ return;
57
+ }
58
+ let content = `:root.${theme.themeTag}{`;
59
+ for (const key in params) {
60
+ if (Object.prototype.hasOwnProperty.call(params, key)) {
61
+ const val = params[key];
62
+ content += `${key}: ${val}${val.endsWith(';') ? '' : ';'}`;
63
+ }
64
+ }
65
+ content += '}';
66
+ const script = document.createElement('style');
67
+ script.id = theme.themeTag;
68
+ script.type = 'text/css';
69
+ script.innerHTML = content;
70
+ document.head.appendChild(script);
71
+ }
38
72
  /**
39
73
  * 设置主题
40
74
  *
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ibiz-template/runtime",
3
- "version": "0.4.4",
3
+ "version": "0.4.5",
4
4
  "description": "控制器包",
5
5
  "type": "module",
6
6
  "main": "out/index.js",
@@ -29,8 +29,8 @@
29
29
  "author": "chitanda",
30
30
  "license": "MIT",
31
31
  "devDependencies": {
32
- "@ibiz-template/core": "^0.4.0",
33
- "@ibiz/model-core": "^0.0.23",
32
+ "@ibiz-template/core": "^0.4.5",
33
+ "@ibiz/model-core": "^0.0.24",
34
34
  "@types/path-browserify": "^1.0.2",
35
35
  "@types/qs": "^6.9.10",
36
36
  "@types/systemjs": "^6.13.5",
@@ -47,7 +47,7 @@
47
47
  },
48
48
  "peerDependencies": {
49
49
  "@ibiz-template/core": "^0.4.0",
50
- "@ibiz/model-core": "^0.0.23",
50
+ "@ibiz/model-core": "^0.0.24",
51
51
  "async-validator": "^4.2.5",
52
52
  "dayjs": "^1.11.7",
53
53
  "echarts": "^5.4.3",
@@ -59,5 +59,5 @@
59
59
  "qx-util": "^0.4.8",
60
60
  "ramda": "^0.29.0"
61
61
  },
62
- "gitHead": "283c09417c873f27c58087f33a93466940c1b002"
62
+ "gitHead": "28b2af793771fa7be9fac2e1c8396081f4002230"
63
63
  }
@@ -208,8 +208,16 @@ export class GridFieldEditColumnController
208
208
  */
209
209
  async dataChangeNotify(row: GridRowState, names: string[]): Promise<void> {
210
210
  // 重置项,变更时自己的值置空
211
- const { resetItemName } = this.editItem;
212
- if (resetItemName && names.includes(resetItemName)) {
211
+ const { resetItemNames } = this.editItem;
212
+ let isReset = false;
213
+ if (resetItemNames && resetItemNames.length > 0) {
214
+ resetItemNames.forEach((resetItemName: string) => {
215
+ if (names.includes(resetItemName)) {
216
+ isReset = true;
217
+ }
218
+ });
219
+ }
220
+ if (isReset) {
213
221
  this.setRowValue(row, null);
214
222
  }
215
223
 
@@ -174,6 +174,9 @@ export class ToolbarController<
174
174
  this.model,
175
175
  (item: IDEToolbarItem) => {
176
176
  const itemState = this.state.buttonsState[item.id!] as IButtonState;
177
+ if (!itemState) {
178
+ return;
179
+ }
177
180
  // 计算项显示逻辑
178
181
  if (itemState.visible) {
179
182
  const dynaVisible = this.scheduler!.triggerItemVisible(
@@ -3,6 +3,7 @@ import {
3
3
  IAppView,
4
4
  IAppViewRef,
5
5
  IControl,
6
+ IControlRender,
6
7
  IModelObject,
7
8
  IPanel,
8
9
  ISysPFPlugin,
@@ -151,7 +152,9 @@ export function getPFPlugin(id: string, appId?: string): ISysPFPlugin {
151
152
  * @param {IControl} control
152
153
  * @return {*} {(IPanel | undefined)}
153
154
  */
154
- export function getControlPanel(control: IControl): IPanel | undefined {
155
+ export function getControlPanel(control: {
156
+ controlRenders?: IControlRender[];
157
+ }): IPanel | undefined {
155
158
  let layoutPanel: IPanel | undefined;
156
159
  if (control.controlRenders) {
157
160
  const panelRender = control.controlRenders.find(
@@ -178,9 +178,15 @@ export class DynamicCodeListCache {
178
178
  }
179
179
  // 数据属性
180
180
  if (dataAppDEFieldId && data[dataAppDEFieldId]) {
181
- result.data = ScriptFactory.execSingleLine(
182
- data[dataAppDEFieldId],
183
- ) as IData;
181
+ try {
182
+ result.data = ScriptFactory.execSingleLine(
183
+ data[dataAppDEFieldId],
184
+ ) as IData;
185
+ } catch (error) {
186
+ ibiz.log.error(
187
+ '动态代码表数据属性返回值不为对象格式的字符串,无法转换!',
188
+ );
189
+ }
184
190
  }
185
191
  return result;
186
192
  }
@@ -3,6 +3,7 @@ import { BackendUIActionProvider } from './backend-ui-action-provider';
3
3
  import { SysUIActionProvider } from './sys-ui-action-provider';
4
4
  import { FrontUIActionProvider } from './front-ui-action-provider';
5
5
  import { WFWithdrawUIActionProvider } from './wf-withdraw-ui-action-provider';
6
+ import { UIActionProviderBase } from './ui-action-provider-base';
6
7
 
7
8
  /**
8
9
  * 预置默认的界面行为适配器
@@ -36,4 +37,5 @@ export {
36
37
  SysUIActionProvider,
37
38
  BackendUIActionProvider,
38
39
  WFWithdrawUIActionProvider,
40
+ UIActionProviderBase,
39
41
  };
@@ -1,4 +1,5 @@
1
1
  import { IAppUITheme, ISysPFPlugin } from '@ibiz/model-core';
2
+ import { clone } from 'ramda';
2
3
 
3
4
  /**
4
5
  * 主题工具类
@@ -28,15 +29,52 @@ export class ThemeUtil {
28
29
  * @return {*} {Promise<void>}
29
30
  */
30
31
  async loadTheme(theme: IAppUITheme): Promise<void> {
31
- const data = theme.themeParams || {};
32
+ const data = clone(theme.themeParams || {});
33
+ const path = data['theme-package-path'];
34
+ delete data.appId;
35
+ delete data['theme-package-path'];
32
36
  await ibiz.plugin.loadPlugin({
33
37
  runtimeObject: true,
34
38
  rtobjectName: theme.name,
35
- rtobjectRepo: data['theme-package-path'],
39
+ rtobjectRepo: path,
36
40
  } as unknown as ISysPFPlugin);
41
+ this.setThemeParams(theme, data);
37
42
  this.setTheme(theme.themeTag!);
38
43
  }
39
44
 
45
+ /**
46
+ * 设置额外修改的主题参数
47
+ *
48
+ * @author chitanda
49
+ * @date 2023-12-05 11:12:00
50
+ * @protected
51
+ * @param {IAppUITheme} theme
52
+ * @param {Record<string, string>} params
53
+ * @return {*} {void}
54
+ */
55
+ protected setThemeParams(
56
+ theme: IAppUITheme,
57
+ params: Record<string, string>,
58
+ ): void {
59
+ const themeStyle = document.getElementById(theme.themeTag!);
60
+ if (themeStyle) {
61
+ return;
62
+ }
63
+ let content = `:root.${theme.themeTag!}{`;
64
+ for (const key in params) {
65
+ if (Object.prototype.hasOwnProperty.call(params, key)) {
66
+ const val = params[key];
67
+ content += `${key}: ${val}${val.endsWith(';') ? '' : ';'}`;
68
+ }
69
+ }
70
+ content += '}';
71
+ const script = document.createElement('style');
72
+ script.id = theme.themeTag!;
73
+ script.type = 'text/css';
74
+ script.innerHTML = content;
75
+ document.head.appendChild(script);
76
+ }
77
+
40
78
  /**
41
79
  * 设置主题
42
80
  *