@ibiz-template/runtime 0.4.3-dev.1 → 0.4.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (31) hide show
  1. package/dist/index.esm.js +66 -18
  2. package/dist/index.system.min.js +2 -2
  3. package/dist/index.system.min.js.map +1 -1
  4. package/out/controller/common/control/md-control.controller.d.ts.map +1 -1
  5. package/out/controller/common/control/md-control.controller.js +5 -1
  6. package/out/controller/control/chart/generator/chart-options-generator.d.ts.map +1 -1
  7. package/out/controller/control/chart/generator/chart-options-generator.js +3 -0
  8. package/out/ui-action/provider/front-ui-action-provider.d.ts.map +1 -1
  9. package/out/ui-action/provider/front-ui-action-provider.js +5 -1
  10. package/out/ui-logic/ui-logic-context.d.ts +10 -1
  11. package/out/ui-logic/ui-logic-context.d.ts.map +1 -1
  12. package/out/ui-logic/ui-logic-context.js +11 -0
  13. package/out/ui-logic/ui-logic-node/index.d.ts +1 -0
  14. package/out/ui-logic/ui-logic-node/index.d.ts.map +1 -1
  15. package/out/ui-logic/ui-logic-node/index.js +1 -0
  16. package/out/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.d.ts +8 -0
  17. package/out/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.d.ts.map +1 -0
  18. package/out/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.js +13 -0
  19. package/out/ui-logic/ui-logic.d.ts.map +1 -1
  20. package/out/ui-logic/ui-logic.js +4 -1
  21. package/out/utils/script/script-function.d.ts.map +1 -1
  22. package/out/utils/script/script-function.js +22 -16
  23. package/package.json +2 -2
  24. package/src/controller/common/control/md-control.controller.ts +5 -1
  25. package/src/controller/control/chart/generator/chart-options-generator.ts +4 -1
  26. package/src/ui-action/provider/front-ui-action-provider.ts +5 -1
  27. package/src/ui-logic/ui-logic-context.ts +13 -1
  28. package/src/ui-logic/ui-logic-node/index.ts +1 -0
  29. package/src/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.ts +22 -0
  30. package/src/ui-logic/ui-logic.ts +4 -0
  31. package/src/utils/script/script-function.ts +22 -16
package/out/controller/common/control/md-control.controller.d.ts.map CHANGED
@@ -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,EAAoB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEhF,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;cAsB1B,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;IAuDzD;;;;;;;;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"}
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,EAAoB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEhF,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;cAsB1B,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;IAuDzD;;;;;;;;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;IA4BjC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAkC9D"}
package/out/controller/common/control/md-control.controller.js CHANGED
@@ -358,7 +358,11 @@ export class MDControlController extends ControlController {
358
358
  if (!dataImport) {
359
359
  throw new RuntimeError('无导入模型！');
360
360
  }
361
- const modal = ibiz.overlay.createModal('DataImport', {
361
+ let importName = 'DataImport';
362
+ if (dataImport.enableCustomized) {
363
+ importName = 'DataImport2';
364
+ }
365
+ const modal = ibiz.overlay.createModal(importName, {
362
366
  dismiss: () => modal.dismiss(),
363
367
  appDataEntity,
364
368
  }, {
package/out/controller/control/chart/generator/chart-options-generator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"chart-options-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/chart-options-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,oBAAoB,EACpB,oBAAoB,EACpB,cAAc,EAEf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,cAAc,EACd,WAAW,EACX,WAAW,EACX,QAAQ,EACR,cAAc,EACd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAM9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAmBzE;AAED,qBAAa,qBAAqB;IAoEpB,OAAO,CAAC,KAAK;IAnEzB;;;;;OAKG;IACH,MAAM,EAAG,cAAc,CAAC;IAExB;;;;;OAKG;IACH,aAAa,EAAE,aAAa,CAI1B;IAEF;;;;;OAKG;IACH,OAAO,EAAE,aAAa,CAAM;IAE5B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,aAAa,CAAC;IAE/B;;;;;OAKG;IACH,gBAAgB,EAAE,mBAAmB,EAAE,CAAM;IAE7C;;;;;OAKG;IACH,QAAQ,gCAAuC;IAE/C;;;;OAIG;IACH,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAa;IAE/D;;;;;OAKG;IACH,uBAAuB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAa;gBAElD,KAAK,EAAE,QAAQ;IAoCnC,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAgCtC,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC;IAmB5E,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,cAAc,GAC1B,aAAa,CAAC,QAAQ,CAAC;IAe1B,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,GACzC,oBAAoB,EAAE,GAAG,oBAAoB,EAAE;IAwClD;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAM7D;;;;;;OAMG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKtC;;;;;;;;;OASG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBrE;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,aAAa;IAoE/C;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;CA8DhE"}
1
+ {"version":3,"file":"chart-options-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/chart-options-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,oBAAoB,EACpB,oBAAoB,EACpB,cAAc,EAEf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,cAAc,EACd,WAAW,EACX,WAAW,EACX,QAAQ,EACR,cAAc,EACd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAM9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAmBzE;AAED,qBAAa,qBAAqB;IAoEpB,OAAO,CAAC,KAAK;IAnEzB;;;;;OAKG;IACH,MAAM,EAAG,cAAc,CAAC;IAExB;;;;;OAKG;IACH,aAAa,EAAE,aAAa,CAI1B;IAEF;;;;;OAKG;IACH,OAAO,EAAE,aAAa,CAAM;IAE5B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,aAAa,CAAC;IAE/B;;;;;OAKG;IACH,gBAAgB,EAAE,mBAAmB,EAAE,CAAM;IAE7C;;;;;OAKG;IACH,QAAQ,gCAAuC;IAE/C;;;;OAIG;IACH,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAa;IAE/D;;;;;OAKG;IACH,uBAAuB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAa;gBAElD,KAAK,EAAE,QAAQ;IAoCnC,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAgCtC,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC;IAmB5E,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,cAAc,GAC1B,aAAa,CAAC,QAAQ,CAAC;IAe1B,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,GACzC,oBAAoB,EAAE,GAAG,oBAAoB,EAAE;IA2ClD;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAM7D;;;;;;OAMG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKtC;;;;;;;;;OASG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBrE;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,aAAa;IAoE/C;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;CA8DhE"}
package/out/controller/control/chart/generator/chart-options-generator.js CHANGED
@@ -181,6 +181,9 @@ export class ChartOptionsGenerator {
181
181
  position,
182
182
  axisLabel: {
183
183
  formatter: (value) => {
184
+ if (typeof value === 'number') {
185
+ value = value.toString();
186
+ }
184
187
  if (dataShowMode === 1) {
185
188
  if (value.length > 4) {
186
189
  return `${value.slice(0, 4).split('').join('\n')}\n...`;
package/out/ui-action/provider/front-ui-action-provider.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA+D3B;;;;;;;;OAQG;IAEH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;IAalB;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAgEhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC,eAAe,CAAC;IA8B3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;CAoDjB"}
1
+ {"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA+D3B;;;;;;;;OAQG;IAEH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;IAalB;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAgEhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC,eAAe,CAAC;IAkC3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;CAoDjB"}
package/out/ui-action/provider/front-ui-action-provider.js CHANGED
@@ -148,8 +148,12 @@ export class FrontUIActionProvider extends UIActionProviderBase {
148
148
  var _a;
149
149
  const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId);
150
150
  const appDEDataImport = (_a = appDataEntity.appDEDataImports) === null || _a === void 0 ? void 0 : _a.find(dataImport => dataImport.id === action.appDEDataImportId);
151
+ let importName = 'DataImport';
152
+ if (appDEDataImport && appDEDataImport.enableCustomized) {
153
+ importName = 'DataImport2';
154
+ }
151
155
  if (appDEDataImport) {
152
- const modal = ibiz.overlay.createModal('DataImport', {
156
+ const modal = ibiz.overlay.createModal(importName, {
153
157
  dismiss: () => modal.dismiss(),
154
158
  appDataEntity,
155
159
  dataImport: appDEDataImport,
package/out/ui-logic/ui-logic-context.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { IUILogicContext, IUILogicParams } from '../interface';
1
+ import { IUILogicContext, IUILogicParams, IViewController } from '../interface';
2
2
  import { UILogicParam } from './ui-logic-param/ui-logic-param';
3
3
  /**
4
4
  * 界面逻辑执行上下文
@@ -18,6 +18,15 @@ export declare class UILogicContext implements IUILogicContext {
18
18
  * @type {unknown}
19
19
  */
20
20
  lastReturn: unknown;
21
+ /**
22
+ * 视图控制器
23
+ *
24
+ * @author chitanda
25
+ * @date 2023-12-01 11:12:48
26
+ * @readonly
27
+ * @type {IViewController}
28
+ */
29
+ get view(): IViewController;
21
30
  /**
22
31
  * 上下文
23
32
  */
package/out/ui-logic/ui-logic-context.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ui-logic-context.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAe,YAAW,eAAe;IA4ClD,OAAO,CAAC,aAAa;IACd,UAAU,EAAE,cAAc;IA5CnC;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,IAAI,OAAO,IAAI,QAAQ,CAKtB;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;OAEG;IACH,IAAI,SAAS,IAAI,OAAO,CAKvB;IAED;;;;;;OAMG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,UAAU,EAAE,cAAc;IAGnC;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;;OAOG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;OAMG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;;OAMG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAQtC;;;;;;;OAOG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAIxC"}
1
+ {"version":3,"file":"ui-logic-context.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAe,YAAW,eAAe;IAwDlD,OAAO,CAAC,aAAa;IACd,UAAU,EAAE,cAAc;IAxDnC;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,eAAe,CAE1B;IAED;;OAEG;IACH,IAAI,OAAO,IAAI,QAAQ,CAKtB;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;OAEG;IACH,IAAI,SAAS,IAAI,OAAO,CAKvB;IAED;;;;;;OAMG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,UAAU,EAAE,cAAc;IAGnC;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;;OAOG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;OAMG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;;OAMG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAQtC;;;;;;;OAOG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAIxC"}
package/out/ui-logic/ui-logic-context.js CHANGED
@@ -7,6 +7,17 @@
7
7
  * @class UILogicContext
8
8
  */
9
9
  export class UILogicContext {
10
+ /**
11
+ * 视图控制器
12
+ *
13
+ * @author chitanda
14
+ * @date 2023-12-01 11:12:48
15
+ * @readonly
16
+ * @type {IViewController}
17
+ */
18
+ get view() {
19
+ return this.parameters.view;
20
+ }
10
21
  /**
11
22
  * 上下文
12
23
  */
package/out/ui-logic/ui-logic-node/index.d.ts CHANGED
@@ -18,4 +18,5 @@ export { DataSetNode } from './data-set-node/data-set-node';
18
18
  export { ThrowExceptionNode } from './throw-exception-node/throw-exception-node';
19
19
  export { ViewCtrlFireEventNode } from './view-ctrl-fire-event-node/view-ctrl-fire-event-node';
20
20
  export { ExecuteDELogicNode } from './execute-de-logic-node/execute-de-logic-node';
21
+ export { RawJSCodeNode } from './raw-js-code-node/raw-js-code-node';
21
22
  //# sourceMappingURL=index.d.ts.map
package/out/ui-logic/ui-logic-node/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-node/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,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,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,uDAAuD,CAAC;AAC9F,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-node/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,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,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,uDAAuD,CAAC;AAC9F,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC"}
package/out/ui-logic/ui-logic-node/index.js CHANGED
@@ -18,3 +18,4 @@ export { DataSetNode } from './data-set-node/data-set-node';
18
18
  export { ThrowExceptionNode } from './throw-exception-node/throw-exception-node';
19
19
  export { ViewCtrlFireEventNode } from './view-ctrl-fire-event-node/view-ctrl-fire-event-node';
20
20
  export { ExecuteDELogicNode } from './execute-de-logic-node/execute-de-logic-node';
21
+ export { RawJSCodeNode } from './raw-js-code-node/raw-js-code-node';
package/out/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.d.ts ADDED
@@ -0,0 +1,8 @@
1
+ import { IDEUIRawCodeLogic } from '@ibiz/model-core';
2
+ import { UILogicContext } from '../../ui-logic-context';
3
+ import { UILogicNode } from '../ui-logic-node';
4
+ export declare class RawJSCodeNode extends UILogicNode {
5
+ model: IDEUIRawCodeLogic;
6
+ exec(ctx: UILogicContext): Promise<void>;
7
+ }
8
+ //# sourceMappingURL=raw-js-code-node.d.ts.map
package/out/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"raw-js-code-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,aAAc,SAAQ,WAAW;IACpC,KAAK,EAAE,iBAAiB,CAAC;IAE3B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAa/C"}
package/out/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.js ADDED
@@ -0,0 +1,13 @@
1
+ import { ScriptFactory } from '../../../utils';
2
+ import { UILogicNode } from '../ui-logic-node';
3
+ export class RawJSCodeNode extends UILogicNode {
4
+ async exec(ctx) {
5
+ console.log(ctx);
6
+ ScriptFactory.execScriptFn({
7
+ view: ctx.view,
8
+ context: ctx.context,
9
+ params: ctx.viewParam,
10
+ uiLogic: ctx.params,
11
+ }, this.model.code || '', { isAsync: false });
12
+ }
13
+ }
package/out/ui-logic/ui-logic.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ui-logic.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAkBL,WAAW,EAGZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IA2BN,SAAS,CAAC,KAAK,EAAE,UAAU;IA1BvC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAExD;;;;;OAKG;gBACmB,KAAK,EAAE,UAAU;IAoFvC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBxD;;;;;;;;;;;;;OAaG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}
1
+ {"version":3,"file":"ui-logic.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAmBL,WAAW,EAGZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IA2BN,SAAS,CAAC,KAAK,EAAE,UAAU;IA1BvC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAExD;;;;;OAKG;gBACmB,KAAK,EAAE,UAAU;IAuFvC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBxD;;;;;;;;;;;;;OAaG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}
package/out/ui-logic/ui-logic.js CHANGED
@@ -1,7 +1,7 @@
1
1
  /* eslint-disable no-await-in-loop */
2
2
  import { ModelError, RuntimeModelError } from '@ibiz-template/core';
3
3
  import { UILogicContext } from './ui-logic-context';
4
- import { AppendParamNode, BindParamNode, CopyParamNode, DataSetNode, DEActionNode, DebugParamNode, DEUIActionNode, EndNode, ExecuteDELogicNode, MsgBoxNode, PFPluginNode, PrepareJSParamNode, RenewParamNode, ResetParamNode, SortParamNode, StartNode, ThrowExceptionNode, ViewCtrlFireEventNode, ViewCtrlInvokeNode, } from './ui-logic-node';
4
+ import { AppendParamNode, BindParamNode, CopyParamNode, DataSetNode, DEActionNode, DebugParamNode, DEUIActionNode, EndNode, ExecuteDELogicNode, MsgBoxNode, PFPluginNode, PrepareJSParamNode, RawJSCodeNode, RenewParamNode, ResetParamNode, SortParamNode, StartNode, ThrowExceptionNode, ViewCtrlFireEventNode, ViewCtrlInvokeNode, } from './ui-logic-node';
5
5
  import { UILogicParam } from './ui-logic-param/ui-logic-param';
6
6
  /**
7
7
  * 界面逻辑
@@ -103,6 +103,9 @@ export class UILogic {
103
103
  case 'PFPLUGIN': // 前端插件调用
104
104
  logicNode = new PFPluginNode(node);
105
105
  break;
106
+ case 'RAWJSCODE':
107
+ logicNode = new RawJSCodeNode(node);
108
+ break;
106
109
  default:
107
110
  throw new ModelError(node, `未支持的逻辑节点类型: ${logicNodeType}`);
108
111
  }
package/out/utils/script/script-function.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"script-function.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-function.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAmB,MAAM,iBAAiB,CAAC;AASvE,qBAAa,cAAc;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAE7B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAM;IAEjC,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;gBAGrC,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,mBAAoC;IAgB/C;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,MAAM;IAWT;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI;IA4B5E;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,EAAE;IAuB7C;;;;;;;OAOG;IACH,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IA4C9D;;;;;;OAMG;IACH,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;CAI/B"}
1
+ {"version":3,"file":"script-function.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-function.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAmB,MAAM,iBAAiB,CAAC;AASvE,qBAAa,cAAc;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAE7B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAM;IAEjC,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;gBAGrC,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,mBAAoC;IAgB/C;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,MAAM;IAWT;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI;IA4B5E;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,EAAE;IAuB7C;;;;;;;OAOG;IACH,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IAkD9D;;;;;;OAMG;IACH,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;CAI/B"}
package/out/utils/script/script-function.js CHANGED
@@ -115,7 +115,6 @@ export class ScriptFunction {
115
115
  * @param {IParams} param
116
116
  */
117
117
  fillDefaultParams(key, param) {
118
- const view = param.view;
119
118
  switch (key) {
120
119
  case 'util': // 工具类
121
120
  param.util = {
@@ -135,27 +134,34 @@ export class ScriptFunction {
135
134
  case 'app': // 应用级的控制器
136
135
  param.app = ibiz.hub.controller;
137
136
  break;
138
- case 'parent': // 父容器控制器
139
- param.parent = view === null || view === void 0 ? void 0 : view.parentView;
140
- break;
141
- case 'topView': // 顶级视图控制器
142
- param.topView = view === null || view === void 0 ? void 0 : view.getTopView();
143
- break;
144
- case 'parentView': // 父级视图控制器
145
- param.parentView = view === null || view === void 0 ? void 0 : view.parentView;
146
- break;
147
- case 'topViewSession': // 顶级视图共享数据对象
148
- param.topViewSession = view === null || view === void 0 ? void 0 : view.getTopView().session;
149
- break;
150
- case 'viewSession': // 当前视图共享数据对象
151
- param.viewSession = view === null || view === void 0 ? void 0 : view.session;
152
- break;
153
137
  case 'appSession': // 全局共享数据对象
154
138
  param.appSession = ibiz.hub.controller.session;
155
139
  break;
156
140
  default:
157
141
  break;
158
142
  }
143
+ const view = param.view;
144
+ if (view) {
145
+ switch (key) {
146
+ case 'parent': // 父容器控制器
147
+ param.parent = view.parentView;
148
+ break;
149
+ case 'topView': // 顶级视图控制器
150
+ param.topView = view.getTopView();
151
+ break;
152
+ case 'parentView': // 父级视图控制器
153
+ param.parentView = view.parentView;
154
+ break;
155
+ case 'topViewSession': // 顶级视图共享数据对象
156
+ param.topViewSession = view.getTopView().session;
157
+ break;
158
+ case 'viewSession': // 当前视图共享数据对象
159
+ param.viewSession = view.session;
160
+ break;
161
+ default:
162
+ break;
163
+ }
164
+ }
159
165
  }
160
166
  /**
161
167
  * 执行脚本代码
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ibiz-template/runtime",
3
- "version": "0.4.3-dev.1",
3
+ "version": "0.4.3",
4
4
  "description": "控制器包",
5
5
  "type": "module",
6
6
  "main": "out/index.js",
@@ -59,5 +59,5 @@
59
59
  "qx-util": "^0.4.8",
60
60
  "ramda": "^0.29.0"
61
61
  },
62
- "gitHead": "2a8d1bf53f9d3ac19722a0fc2da1da1cccf634f0"
62
+ "gitHead": "ed51e5098f87bc6805cf39d4edc6aec1c2bbf7d0"
63
63
  }
package/src/controller/common/control/md-control.controller.ts CHANGED
@@ -436,8 +436,12 @@ export class MDControlController<
436
436
  if (!dataImport) {
437
437
  throw new RuntimeError('无导入模型！');
438
438
  }
439
+ let importName = 'DataImport';
440
+ if (dataImport.enableCustomized) {
441
+ importName = 'DataImport2';
442
+ }
439
443
  const modal = ibiz.overlay.createModal(
440
- 'DataImport',
444
+ importName,
441
445
  {
442
446
  dismiss: () => modal.dismiss(),
443
447
  appDataEntity,
package/src/controller/control/chart/generator/chart-options-generator.ts CHANGED
@@ -240,7 +240,10 @@ export class ChartOptionsGenerator {
240
240
  min: chartAxis.minValue,
241
241
  position,
242
242
  axisLabel: {
243
- formatter: (value: string): string => {
243
+ formatter: (value: string | number): string => {
244
+ if (typeof value === 'number') {
245
+ value = value.toString();
246
+ }
244
247
  if (dataShowMode === 1) {
245
248
  if (value.length > 4) {
246
249
  return `${value.slice(0, 4).split('').join('\n')}\n...`;
package/src/ui-action/provider/front-ui-action-provider.ts CHANGED
@@ -203,9 +203,13 @@ export class FrontUIActionProvider extends UIActionProviderBase {
203
203
  const appDEDataImport = appDataEntity.appDEDataImports?.find(
204
204
  dataImport => dataImport.id === action.appDEDataImportId,
205
205
  );
206
+ let importName = 'DataImport';
207
+ if (appDEDataImport && appDEDataImport.enableCustomized) {
208
+ importName = 'DataImport2';
209
+ }
206
210
  if (appDEDataImport) {
207
211
  const modal = ibiz.overlay.createModal(
208
- 'DataImport',
212
+ importName,
209
213
  {
210
214
  dismiss: () => modal.dismiss(),
211
215
  appDataEntity,
package/src/ui-logic/ui-logic-context.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { IUILogicContext, IUILogicParams } from '../interface';
1
+ import { IUILogicContext, IUILogicParams, IViewController } from '../interface';
2
2
  import { UILogicParam } from './ui-logic-param/ui-logic-param';
3
3
 
4
4
  /**
@@ -18,6 +18,18 @@ export class UILogicContext implements IUILogicContext {
18
18
  */
19
19
  lastReturn: unknown;
20
20
 
21
+ /**
22
+ * 视图控制器
23
+ *
24
+ * @author chitanda
25
+ * @date 2023-12-01 11:12:48
26
+ * @readonly
27
+ * @type {IViewController}
28
+ */
29
+ get view(): IViewController {
30
+ return this.parameters.view;
31
+ }
32
+
21
33
  /**
22
34
  * 上下文
23
35
  */
package/src/ui-logic/ui-logic-node/index.ts CHANGED
@@ -18,3 +18,4 @@ export { DataSetNode } from './data-set-node/data-set-node';
18
18
  export { ThrowExceptionNode } from './throw-exception-node/throw-exception-node';
19
19
  export { ViewCtrlFireEventNode } from './view-ctrl-fire-event-node/view-ctrl-fire-event-node';
20
20
  export { ExecuteDELogicNode } from './execute-de-logic-node/execute-de-logic-node';
21
+ export { RawJSCodeNode } from './raw-js-code-node/raw-js-code-node';
package/src/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.ts ADDED
@@ -0,0 +1,22 @@
1
+ import { IDEUIRawCodeLogic } from '@ibiz/model-core';
2
+ import { ScriptFactory } from '../../../utils';
3
+ import { UILogicContext } from '../../ui-logic-context';
4
+ import { UILogicNode } from '../ui-logic-node';
5
+
6
+ export class RawJSCodeNode extends UILogicNode {
7
+ declare model: IDEUIRawCodeLogic;
8
+
9
+ async exec(ctx: UILogicContext): Promise<void> {
10
+ console.log(ctx);
11
+ ScriptFactory.execScriptFn(
12
+ {
13
+ view: ctx.view,
14
+ context: ctx.context,
15
+ params: ctx.viewParam,
16
+ uiLogic: ctx.params,
17
+ },
18
+ this.model.code || '',
19
+ { isAsync: false },
20
+ );
21
+ }
22
+ }
package/src/ui-logic/ui-logic.ts CHANGED
@@ -16,6 +16,7 @@ import {
16
16
  MsgBoxNode,
17
17
  PFPluginNode,
18
18
  PrepareJSParamNode,
19
+ RawJSCodeNode,
19
20
  RenewParamNode,
20
21
  ResetParamNode,
21
22
  SortParamNode,
@@ -127,6 +128,9 @@ export class UILogic {
127
128
  case 'PFPLUGIN': // 前端插件调用
128
129
  logicNode = new PFPluginNode(node);
129
130
  break;
131
+ case 'RAWJSCODE':
132
+ logicNode = new RawJSCodeNode(node);
133
+ break;
130
134
  default:
131
135
  throw new ModelError(node, `未支持的逻辑节点类型: ${logicNodeType}`);
132
136
  }
package/src/utils/script/script-function.ts CHANGED
@@ -136,7 +136,6 @@ export class ScriptFunction {
136
136
  * @param {IParams} param
137
137
  */
138
138
  protected fillDefaultParams(key: string, param: IParams): void {
139
- const view = param.view as IViewController | undefined;
140
139
  switch (key) {
141
140
  case 'util': // 工具类
142
141
  param.util = {
@@ -156,27 +155,34 @@ export class ScriptFunction {
156
155
  case 'app': // 应用级的控制器
157
156
  param.app = ibiz.hub.controller;
158
157
  break;
159
- case 'parent': // 父容器控制器
160
- param.parent = view?.parentView;
161
- break;
162
- case 'topView': // 顶级视图控制器
163
- param.topView = view?.getTopView();
164
- break;
165
- case 'parentView': // 父级视图控制器
166
- param.parentView = view?.parentView;
167
- break;
168
- case 'topViewSession': // 顶级视图共享数据对象
169
- param.topViewSession = view?.getTopView().session;
170
- break;
171
- case 'viewSession': // 当前视图共享数据对象
172
- param.viewSession = view?.session;
173
- break;
174
158
  case 'appSession': // 全局共享数据对象
175
159
  param.appSession = ibiz.hub.controller.session;
176
160
  break;
177
161
  default:
178
162
  break;
179
163
  }
164
+ const view = param.view as IViewController | undefined;
165
+ if (view) {
166
+ switch (key) {
167
+ case 'parent': // 父容器控制器
168
+ param.parent = view.parentView;
169
+ break;
170
+ case 'topView': // 顶级视图控制器
171
+ param.topView = view.getTopView();
172
+ break;
173
+ case 'parentView': // 父级视图控制器
174
+ param.parentView = view.parentView;
175
+ break;
176
+ case 'topViewSession': // 顶级视图共享数据对象
177
+ param.topViewSession = view.getTopView().session;
178
+ break;
179
+ case 'viewSession': // 当前视图共享数据对象
180
+ param.viewSession = view.session;
181
+ break;
182
+ default:
183
+ break;
184
+ }
185
+ }
180
186
  }
181
187
 
182
188
  /**