npm - @ibiz-template/runtime - Versions diffs - 0.7.41-alpha.111 → 0.7.41-alpha.113 - Mend

@ibiz-template/runtime 0.7.41-alpha.111 → 0.7.41-alpha.113

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 (80) hide show

package/out/config/global-config.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"global-config.d.ts","sourceRoot":"","sources":["../../src/config/global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,iBAAiB,EACjB,yBAAyB,EACzB,yBAAyB,EACzB,iBAAiB,EACjB,uBAAuB,EACvB,iBAAiB,EACjB,mBAAmB,EACnB,sBAAsB,EACtB,sBAAsB,EACtB,yBAAyB,EACzB,gBAAgB,EAChB,wBAAwB,EACzB,MAAM,cAAc,CAAC;AAEtB;;;;;;;;GAQG;AACH,qBAAa,YAAa,YAAW,aAAa;IAEhD,IAAI,EAAE,iBAAiB,CAUrB;IAGF,IAAI,EAAE,iBAAiB,CAOrB;IAGF,OAAO,EAAE,oBAAoB,CAI3B;IAGF,QAAQ,EAAE,qBAAqB,CAE7B;IAGF,IAAI,EAAE,iBAAiB,CAWrB;IAGF,MAAM,EAAE,sBAAsB,CAG5B;IAGF,YAAY,EAAE,yBAAyB,CAErC;IAGF,YAAY,EAAE,yBAAyB,CAErC;IAGF,UAAU,EAAE,uBAAuB,CAGjC;IAGF,IAAI,EAAE,iBAAiB,CAGrB;IAGF,MAAM,EAAE,mBAAmB,~~CAwBzB~~;IAGF,KAAK,EAAE,sBAAsB,CAI3B;IAGF,iBAAiB,EAAE,MAAM,CAAM;IAG/B,iBAAiB,EAAE,SAAS,GAAG,OAAO,CAAW;IAGjD,iBAAiB,EAAE,MAAM,CAAM;IAG/B,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAAQ;IAGjD,SAAS,EAAE,yBAAyB,CAmBlC;IAEF;;;;OAIG;IACH,GAAG,EAAE,gBAAgB,CAWnB;IAEF;;;;OAIG;IACH,iBAAiB,EAAE,wBAAwB,CAIzC;CACH"}
1	+ {"version":3,"file":"global-config.d.ts","sourceRoot":"","sources":["../../src/config/global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,iBAAiB,EACjB,yBAAyB,EACzB,yBAAyB,EACzB,iBAAiB,EACjB,uBAAuB,EACvB,iBAAiB,EACjB,mBAAmB,EACnB,sBAAsB,EACtB,sBAAsB,EACtB,yBAAyB,EACzB,gBAAgB,EAChB,wBAAwB,EACzB,MAAM,cAAc,CAAC;AAEtB;;;;;;;;GAQG;AACH,qBAAa,YAAa,YAAW,aAAa;IAEhD,IAAI,EAAE,iBAAiB,CAUrB;IAGF,IAAI,EAAE,iBAAiB,CAOrB;IAGF,OAAO,EAAE,oBAAoB,CAI3B;IAGF,QAAQ,EAAE,qBAAqB,CAE7B;IAGF,IAAI,EAAE,iBAAiB,CAWrB;IAGF,MAAM,EAAE,sBAAsB,CAG5B;IAGF,YAAY,EAAE,yBAAyB,CAErC;IAGF,YAAY,EAAE,yBAAyB,CAErC;IAGF,UAAU,EAAE,uBAAuB,CAGjC;IAGF,IAAI,EAAE,iBAAiB,CAGrB;IAGF,MAAM,EAAE,mBAAmB,CAyBzB;IAGF,KAAK,EAAE,sBAAsB,CAI3B;IAGF,iBAAiB,EAAE,MAAM,CAAM;IAG/B,iBAAiB,EAAE,SAAS,GAAG,OAAO,CAAW;IAGjD,iBAAiB,EAAE,MAAM,CAAM;IAG/B,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAAQ;IAGjD,SAAS,EAAE,yBAAyB,CAmBlC;IAEF;;;;OAIG;IACH,GAAG,EAAE,gBAAgB,CAWnB;IAEF;;;;OAIG;IACH,iBAAiB,EAAE,wBAAwB,CAIzC;CACH"}

package/out/config/global-config.js CHANGED Viewed

@@ -101,6 +101,7 @@ export class GlobalConfig {
             aiChunkView: '',
             aiChunkEntity: '',
             counterMaxValue: 99,
+            enhancedUI: false,
         };
         // 全局分页流布局配置
         this.drtab = {

package/out/constant/predefined-attributes.d.ts CHANGED Viewed

@@ -13,6 +13,10 @@ export declare enum PredefinedAttributes {
     /**
      * 样式注入标识
      */
-    STYLES = "styles"
+    STYLES = "styles",
+    /**
+     * 前置导出标识
+     */
+    BEFORE_FRONT_EXPORT = "before-front-export"
 }
 //# sourceMappingURL=predefined-attributes.d.ts.map

package/out/constant/predefined-attributes.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"predefined-attributes.d.ts","sourceRoot":"","sources":["../../src/constant/predefined-attributes.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AACH,oBAAY,oBAAoB;IAC9B;;OAEG;IACH,UAAU,eAAe;IAEzB;;OAEG;IACH,MAAM,WAAW;~~CAClB~~"}
1	+ {"version":3,"file":"predefined-attributes.d.ts","sourceRoot":"","sources":["../../src/constant/predefined-attributes.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AACH,oBAAY,oBAAoB;IAC9B;;OAEG;IACH,UAAU,eAAe;IAEzB;;OAEG;IACH,MAAM,WAAW;IAEjB;;OAEG;IACH,mBAAmB,wBAAwB;CAC5C"}

package/out/constant/predefined-attributes.js CHANGED Viewed

@@ -16,4 +16,8 @@ export var PredefinedAttributes;
      * 样式注入标识
      */
     PredefinedAttributes["STYLES"] = "styles";
+    /**
+     * 前置导出标识
+     */
+    PredefinedAttributes["BEFORE_FRONT_EXPORT"] = "before-front-export";
 })(PredefinedAttributes || (PredefinedAttributes = {}));

package/out/controller/common/base.controller.js CHANGED Viewed

@@ -124,12 +124,12 @@ export class BaseController {
         // 登记自身
         this.mountCounter.enroll(SELF_KEY);
         await this.onCreated();
+        ibiz.log.debug(`${this.constructor.name}:${this.name} onCreated`);
+        await this._evt.emit('onCreated', undefined);
         this.state.isCreated = true;
         this.force(() => {
             this.mountSelf();
         });
-        ibiz.log.debug(`${this.constructor.name}:${this.name} onCreated`);
-        this._evt.emit('onCreated', undefined);
     }
     /**
      * 生命周期-创建完成，实际执行逻辑，子类重写用这个

package/out/controller/common/editor/editor.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"editor.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/editor/editor.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,~~EAGR~~,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;~~AAIvC~~;;;;;;;GAOG;AACH,qBAAa,gBAAgB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CACvD,YAAW,iBAAiB;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAM;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAG,QAAQ,CAAC;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAG,OAAO,CAAC;IAE1B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,0BAA0B,CAAC;IAE5C;;;;;OAKG;IACI,WAAW,SAAM;IAExB;;;;;OAKG;IACI,YAAY,EAAE,KAAK,CAAM;IAEhC;;;;;OAKG;IACI,WAAW,EAAE,KAAK,CAAM;IAE/B;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,CAkBxB;IAED;;;;;;OAMG;IACH,IAAI,oBAAoB,IAAI,OAAO,CAUlC;IAED;;;;;;;;OAQG;IACH,IAAI,oBAAoB,IAAI;QAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAgBA;IAED;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,CAO1B;IAED;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,kBAAkB,CAO7B;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,0BAA0B;IAOxD;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;~~IAsDvC~~;;;;OAIG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAwBjC;;;;;;OAMG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAgBzC;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS;IASjD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAIjC;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;CAqBzC"}
1	+ {"version":3,"file":"editor.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/editor/editor.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EAIR,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AAKvC;;;;;;;GAOG;AACH,qBAAa,gBAAgB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CACvD,YAAW,iBAAiB;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAM;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAG,QAAQ,CAAC;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAG,OAAO,CAAC;IAE1B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,0BAA0B,CAAC;IAE5C;;;;;OAKG;IACI,WAAW,SAAM;IAExB;;;;;OAKG;IACI,YAAY,EAAE,KAAK,CAAM;IAEhC;;;;;OAKG;IACI,WAAW,EAAE,KAAK,CAAM;IAE/B;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,CAkBxB;IAED;;;;;;OAMG;IACH,IAAI,oBAAoB,IAAI,OAAO,CAUlC;IAED;;;;;;;;OAQG;IACH,IAAI,oBAAoB,IAAI;QAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAgBA;IAED;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,CAO1B;IAED;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,kBAAkB,CAO7B;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,0BAA0B;IAOxD;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAgEvC;;;;OAIG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAwBjC;;;;;;OAMG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAgBzC;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS;IASjD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAIjC;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;CAqBzC"}

package/out/controller/common/editor/editor.controller.js CHANGED Viewed

@@ -2,6 +2,7 @@ import { DataTypes } from '@ibiz-template/core';
 import dayjs from 'dayjs';
 import { convertNavData } from '../../../utils';
 import { ValueExUtil } from '../../utils';
+import { PredefinedAttributes } from '../../../constant';
 /**
  * 编辑器控制器基类
  *
@@ -190,7 +191,7 @@ export class EditorController {
         await this.onInit();
     }
     async onInit() {
-        var _a, _b;
+        var _a, _b, _c, _d;
         // 异步初始化
         if (this.model.placeHolder) {
             this.placeHolder = this.model.placeHolder;
@@ -237,6 +238,14 @@ export class EditorController {
         if (this.model.editorItems) {
             this.model.editorItems = this.model.editorItems.filter((item) => item.id !== this.model.id);
         }
+        // 合并语义化埋点属性
+        const controlAttributes = ((_d = (_c = this.parent.model) === null || _c === void 0 ? void 0 : _c.controlAttributes) === null || _d === void 0 ? void 0 : _d.filter((item) => PredefinedAttributes.CLASSNAMES === item.attrName ||
+            PredefinedAttributes.STYLES === item.attrName)) || [];
+        if (controlAttributes.length) {
+            if (!this.model.controlAttributes)
+                this.model.controlAttributes = [];
+            this.model.controlAttributes.push(...controlAttributes);
+        }
         this.initExtraParams();
     }
     /**

package/out/controller/common/view/view.controller.js CHANGED Viewed

@@ -355,8 +355,8 @@ export class ViewController extends BaseController {
             };
             if (this.scheduler.hasViewEventTrigger) {
                 // 监听视图事件触发视图事件触发器
-                this.evt.onAll((_eventName, event) => {
-                    this.scheduler.triggerViewEvent(event);
+                this.evt.onAll(async (_eventName, event) => {
+                    await this.scheduler.triggerViewEvent(event);
                 });
             }
         }

package/out/controller/control/calendar/calendar.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"calendar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/calendar/calendar.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAElE,OAAO,EAEL,cAAc,EACd,cAAc,EAEd,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAIxD;;;;;;;;;GASG;AACH,qBAAa,kBACX,SAAQ,mBAAmB,CAAC,YAAY,EAAE,cAAc,EAAE,cAAc,CACxE,YAAW,mBAAmB;IAE9B;;;;;;;OAOG;IACK,OAAO,EAAE,eAAe,CAAC;IAEjC;;;;;OAKG;IACH,aAAa,CAAC,EAAE,kBAAkB,CAAC;IAEnC;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAE1D;;;;OAIG;IACI,qBAAqB,EAAE,MAAM,CAAgB;IAEpD;;;;;;;OAOG;IACH,IAAI,aAAa,IAAI;QACnB,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAAC;KAClC,CAEA;IAED;;;;;OAKG;IACH,IAAI,cAAc,IAAI,WAAW,GAAG,SAAS,CAI5C;IAED;;;;;OAKG;IACH,IAAI,aAAa,IAAI,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,UAAU,CAI9D;IAED;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAkB3B;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyC1C;;;;OAIG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAuD/B;;;;;;;;OAQG;IACG,UAAU,CACd,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,iBAAiB,EACvB,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IAqBhB;;;;;OAKG;IACH,SAAS,CAAC,mBAAmB,IAAI,IAAI;IAiBrC;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAgBnC;;;;;;OAMG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAO5C;;;;;;OAMG;IACG,SAAS,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAQvD;;;;;;OAMG;IACG,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC;~~IAkCzE~~;;;;;OAKG;IACG,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC;~~IA8BxE~~;;;;;OAKG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAoBhC;;;;;;;;OAQG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAsCrE;;;;;;;OAOG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAQzE;;;;;;OAMG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAsChD;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CACjB,KAAK,EAAE,iBAAiB,EAAE,EAC1B,SAAS,GAAE,WAAW,GAAG,SAAuB,GAC/C,IAAI;IAcP;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK;IAyEjD;;;;;;;;OAQG;IACG,cAAc,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAmCjE;;;;;;;;OAQG;IACG,UAAU,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BzD;;;;;;OAMG;IACG,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAO3D;;;;;;;OAOG;IACH,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAI/B;;;;;OAKG;IACH,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS;IAO5D;;;;;;;OAOG;IACG,gBAAgB,CACpB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,OAAO,CAAC;IAuBnB;;;;OAIG;IACG,aAAa,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAIvC;;;;OAIG;IACG,gBAAgB,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAI1C;;;;OAIG;IACG,YAAY,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAItC;;;;OAIG;IACG,YAAY,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAItC;;;;OAIG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;CAO3C"}
1	+ {"version":3,"file":"calendar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/calendar/calendar.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/calendar/calendar.controller.js CHANGED Viewed

@@ -1,6 +1,6 @@
 /* eslint-disable no-case-declarations */
 import dayjs from 'dayjs';
-import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
+import { RuntimeError } from '@ibiz-template/core';
 import { MDControlController } from '../../common';
 import { CalendarService } from './calendar.service';
 import { calcDeCodeNameById, getViewLogics } from '../../../model';
@@ -243,8 +243,8 @@ export class CalendarController extends MDControlController {
             };
             if (this.viewScheduler.hasViewEventTrigger) {
                 // 监听视图事件触发视图事件触发器
-                this.evt.onAll((_eventName, event) => {
-                    this.viewScheduler.triggerViewEvent(event);
+                this.evt.onAll(async (_eventName, event) => {
+                    await this.viewScheduler.triggerViewEvent(event);
                 });
             }
         }
@@ -302,10 +302,12 @@ export class CalendarController extends MDControlController {
             view: this.view,
             ctrl: this,
         }));
-        if (result === -1)
-            throw new RuntimeModelError(calendarItem, ibiz.i18n.t('runtime.controller.common.md.logicOpendata', {
-                itemType: calendarItem.itemType.toLowerCase(),
-            }));
+        if (result === -1) {
+            ibiz.log.error(ibiz.i18n.t('runtime.engine.logicOpendata'));
+            return {
+                cancel: true,
+            };
+        }
         return {
             cancel: result ? result.ok : true,
         };
@@ -330,10 +332,12 @@ export class CalendarController extends MDControlController {
             view: this.view,
             ctrl: this,
         }));
-        if (result === -1)
-            throw new RuntimeModelError(calendarItem, ibiz.i18n.t('runtime.controller.common.md.logicNewdata', {
-                itemType: calendarItem.itemType.toLowerCase(),
-            }));
+        if (result === -1) {
+            ibiz.log.error(ibiz.i18n.t('runtime.engine.logicNewdata'));
+            return {
+                cancel: true,
+            };
+        }
         return {
             cancel: result ? result.ok : true,
         };

package/out/controller/control/form/form-detail/form-item/form-item.controller.d.ts CHANGED Viewed

@@ -236,5 +236,11 @@ export declare class FormItemController extends FormDetailController<IDEFormItem
      * @memberof FormItemController
      */
     clearTipsCache(): void;
+    /**
+     * @description 计算动态样式表
+     * @param {IData} data
+     * @memberof FormItemController
+     */
+    protected calcDynaClass(data: IData): void;
 }
 //# sourceMappingURL=form-item.controller.d.ts.map

package/out/controller/control/form/form-detail/form-item/form-item.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-item/form-item.controller.ts"],"names":[],"mappings":"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~~CAGvB~~"}
1	+ {"version":3,"file":"form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-item/form-item.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/form/form-detail/form-item/form-item.controller.js CHANGED Viewed

@@ -6,7 +6,7 @@ import { FormItemState } from './form-item.state';
 import { FormDetailEventName, } from '../../../../../interface';
 import { getEditorProvider } from '../../../../../register';
 import { Srfuf } from '../../../../../service';
-import { calcDeCodeNameById } from '../../../../../model';
+import { calcDeCodeNameById, calcDynaClass } from '../../../../../model';
 import { filterValueRules } from '../../../../../utils';
 import { generateEditorRules, generateRules } from '../../../../utils';
 import { ControlType } from '../../../../../constant';
@@ -512,4 +512,17 @@ export class FormItemController extends FormDetailController {
     clearTipsCache() {
         localStorage.removeItem(this.TIPS_CACHE);
     }
+    /**
+     * @description 计算动态样式表
+     * @param {IData} data
+     * @memberof FormItemController
+     */
+    calcDynaClass(data) {
+        var _a;
+        super.calcDynaClass(data);
+        if ((_a = this.model.editor) === null || _a === void 0 ? void 0 : _a.dynaClass) {
+            const dynaClass = calcDynaClass(this.model.editor.dynaClass, data);
+            this.state.editorClass = dynaClass;
+        }
+    }
 }

package/out/controller/control/form/form-detail/form-item/form-item.state.d.ts CHANGED Viewed

@@ -39,5 +39,12 @@ export declare class FormItemState extends FormDetailState implements IApiFormIt
      * @memberof FormItemState
      */
     inputTipUrl: string | undefined;
+    /**
+     * 编辑器类名集合
+     *
+     * @type {string[]}
+     * @memberof FormItemState
+     */
+    editorClass: string[];
 }
 //# sourceMappingURL=form-item.state.d.ts.map

package/out/controller/control/form/form-detail/form-item/form-item.state.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"form-item.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-item/form-item.state.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EACjB,yBAAyB,EAC1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAEnE;;;;;;GAMG;AACH,qBAAa,aACX,SAAQ,eACR,YAAW,iBAAiB;IAEhB,SAAS,CAAC,MAAM,CAAC;gBAAP,MAAM,CAAC,uCAA2B;IAoBxD;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,GAAG,IAAI,CAAQ;IAE5B;;;;;OAKG;IACH,kBAAkB,UAAS;IAE3B;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAa;IAEzC;;;;;OAKG;IACH,WAAW,EAAE,MAAM,GAAG,SAAS,CAAa;~~CAC7C~~"}
1	+ {"version":3,"file":"form-item.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-item/form-item.state.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EACjB,yBAAyB,EAC1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAEnE;;;;;;GAMG;AACH,qBAAa,aACX,SAAQ,eACR,YAAW,iBAAiB;IAEhB,SAAS,CAAC,MAAM,CAAC;gBAAP,MAAM,CAAC,uCAA2B;IAoBxD;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,GAAG,IAAI,CAAQ;IAE5B;;;;;OAKG;IACH,kBAAkB,UAAS;IAE3B;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAa;IAEzC;;;;;OAKG;IACH,WAAW,EAAE,MAAM,GAAG,SAAS,CAAa;IAE5C;;;;;OAKG;IACH,WAAW,EAAE,MAAM,EAAE,CAAM;CAC5B"}

package/out/controller/control/form/form-detail/form-item/form-item.state.js CHANGED Viewed

@@ -39,6 +39,13 @@ export class FormItemState extends FormDetailState {
          * @memberof FormItemState
          */
         this.inputTipUrl = undefined;
+        /**
+         * 编辑器类名集合
+         *
+         * @type {string[]}
+         * @memberof FormItemState
+         */
+        this.editorClass = [];
         let $disabled = false;
         Object.defineProperty(this, 'disabled', {
             enumerable: true,

package/out/controller/control/form/form-detail/form-rawitem/form-rawitem.controller.d.ts CHANGED Viewed

@@ -12,5 +12,12 @@ import { IApiFormRawItemController } from '../../../../../interface';
 export declare class FormRawItemController extends FormDetailController<IDEFormRawItem> implements IApiFormRawItemController {
     state: FormRawItemState;
     protected createState(): FormRawItemState;
+    /**
+     * @description 计算动态样式表
+     * @protected
+     * @param {IData} data
+     * @memberof FormRawItemController
+     */
+    protected calcDynaClass(data: IData): void;
 }
 //# sourceMappingURL=form-rawitem.controller.d.ts.map

package/out/controller/control/form/form-detail/form-rawitem/form-rawitem.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"form-rawitem.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-rawitem/form-rawitem.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;~~AAErE~~;;;;;;GAMG;AACH,qBAAa,qBACX,SAAQ,oBAAoB,CAAC,cAAc,CAC3C,YAAW,yBAAyB;IAE5B,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,IAAI,gBAAgB;~~CAG1C~~"}
1	+ {"version":3,"file":"form-rawitem.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-rawitem/form-rawitem.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAGrE;;;;;;GAMG;AACH,qBAAa,qBACX,SAAQ,oBAAoB,CAAC,cAAc,CAC3C,YAAW,yBAAyB;IAE5B,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAIzC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;CAO3C"}

package/out/controller/control/form/form-detail/form-rawitem/form-rawitem.controller.js CHANGED Viewed

@@ -1,5 +1,6 @@
 import { FormDetailController } from '../form-detail';
 import { FormRawItemState } from './form-rawitem.state';
+import { calcDynaClass } from '../../../../../model';
 /**
  * @description 表单直接内容控制器
  * @export
@@ -12,4 +13,18 @@ export class FormRawItemController extends FormDetailController {
         var _a;
         return new FormRawItemState((_a = this.parent) === null || _a === void 0 ? void 0 : _a.state);
     }
+    /**
+     * @description 计算动态样式表
+     * @protected
+     * @param {IData} data
+     * @memberof FormRawItemController
+     */
+    calcDynaClass(data) {
+        var _a;
+        super.calcDynaClass(data);
+        if ((_a = this.model.rawItem) === null || _a === void 0 ? void 0 : _a.dynaClass) {
+            const dynaClass = calcDynaClass(this.model.rawItem.dynaClass, data);
+            this.state.class.containerDyna = dynaClass;
+        }
+    }
 }

package/out/controller/control/grid/grid/grid.controller.d.ts CHANGED Viewed

@@ -534,6 +534,10 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
     getDataExcelModel(): {
         header: string[];
         fields: string[];
+        exportColumns: IData[];
+        colWidths: {
+            wpx: number;
+        }[];
     };
     /**
      * 格式化导出数据

package/out/controller/control/grid/grid/grid.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"AAeA,OAAO,EACL,OAAO,EACP,aAAa,EACb,aAAa,EACb,aAAa,EAEb,gBAAgB,EAIjB,MAAM,kBAAkB,CAAC;AAG1B,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,sBAAsB,EACtB,6BAA6B,EAC9B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,UAAU,EACV,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EAEnB,qBAAqB,EACrB,gBAAgB,~~EACjB~~,MAAM,uBAAuB,CAAC;AAM/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,EAKL,eAAe,EAChB,MAAM,gBAAgB,CAAC;~~AAaxB~~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~~QAAE~~,MAAM,EAAE,MAAM,EAAE,CAAC;~~QAAC~~,MAAM,EAAE,MAAM,EAAE,CAAA;~~KAAE~~;~~IA+B3D~~;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE;IAmDzD;;;;;OAKG;IACG,aAAa,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IA6B/D;;;OAGG;IACG,mBAAmB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuClE;;;;;OAKG;IACG,UAAU,CAAC,IAAI,EAAE;QACrB,MAAM,EAAE,gBAAgB,CAAC;QACzB,KAAK,EAAE,UAAU,CAAC;KACnB,GAAG,OAAO,CAAC,IAAI,CAAC;~~IAuBjB~~;;;;;;;;OAQG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,GAAG,KAAK;IAsBvD;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM;IAwBtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,SAAS;IAKpD;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5C;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;IAuB1C;;;;;;OAMG;IACH,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,IAAI;IASjD;;;;;;OAMG;IACH,cAAc,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IA8C5C;;;;;OAKG;IACH,qBAAqB,CACnB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,IAAI;IAcP;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IAoBxB;;;;;;;OAOG;IACH,kBAAkB,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;QACL,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,CAAC;QACvB,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,QAAQ,CAAC,EAAE,aAAa,CAAC;KAC1B,GACA,IAAI;IAqBP;;;;;OAKG;IACG,YAAY,CAChB,QAAQ,EAAE,aAAa,EACvB,IAAI,EAAE,aAAa,EACnB,QAAQ,EAAE,MAAM,GAAG,MAAM,GACxB,OAAO,CAAC,IAAI,CAAC;IAwBhB;;;;;OAKG;IACH,aAAa,IAAI,IAAI;IAoBrB;;;;;OAKG;IACH,cAAc,CAAC,MAAM,GAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,IAAI;IAoBrE;;;;;OAKG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI;IAWlD;;;;;;;OAOG;IACH,aAAa,CAAC,CAAC,SAAS,MAAM,qBAAqB,EACjD,IAAI,EAAE,CAAC,EACP,EAAE,EAAE,MAAM,GACT,qBAAqB,CAAC,CAAC,CAAC;IAI3B;;;;;OAKG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAI7C"}
1	+ {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/grid/grid/grid.controller.js CHANGED Viewed

@@ -15,6 +15,7 @@ import { ValueExUtil, isValueChange, getDefaultValue, getEntitySchema, } from '.
 import { ScriptFactory, convertNavData, handleAllSettled, } from '../../../../utils';
 import { calcColumnModelBySchema } from './entity-schema';
 import { newRowDynamic, switchRowEditDynamic, initModelByEntitySchema, } from './auto-grid.util';
+import { PredefinedAttributes } from '../../../../constant';
 /**
  * 表格控制器
  *
@@ -1289,11 +1290,14 @@ export class GridController extends MDControlController {
         const excelModel = {
             header: [],
             fields: [],
+            exportColumns: [],
+            colWidths: [],
         };
         if (dedataExportId) {
             if (this.allExportColumns.length) {
                 excelModel.fields = this.allExportColumns.map(x => x.appDEFieldId);
                 excelModel.header = this.allExportColumns.map(x => x.caption);
+                excelModel.exportColumns = this.allExportColumns;
             }
         }
         else {
@@ -1311,6 +1315,12 @@ export class GridController extends MDControlController {
             });
             excelModel.fields = exportColumns.map(item => item.id);
             excelModel.header = exportColumns.map(item => item.caption);
+            excelModel.colWidths = exportColumns.map(item => {
+                return {
+                    wpx: item.width || 150,
+                };
+            });
+            excelModel.exportColumns = exportColumns;
         }
         return excelModel;
     }
@@ -1447,25 +1457,54 @@ export class GridController extends MDControlController {
      * @memberof GridController
      */
     async exportData(args) {
-        var _a;
+        var _a, _b, _c;
         if ((_a = this.dataExport) === null || _a === void 0 ? void 0 : _a.enableBackend) {
             await this.excuteBackendExport(args.params);
             return;
         }
-        const { header, fields } = this.getDataExcelModel();
-        if (!header) {
-            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.grid.tabularColumns'));
-        }
         // 导出前先填充导出代码表数据
         await this.fillExportCodelistMap();
         const data = await this.getExportData(args.params);
+        const { header, fields, exportColumns, colWidths } = this.getDataExcelModel();
+        if (!header) {
+            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.grid.tabularColumns'));
+        }
         const formatData = this.formatExcelData(data, fields);
         const table = formatData.map(v => Object.values(v));
-        await ibiz.platform.frontExport({
+        // 获取导出文件名,如果有自定义文件名格式则使用自定义文件名格式
+        let fileName = this.model.logicName;
+        if ((_b = this.dataExport) === null || _b === void 0 ? void 0 : _b.fileNameFormat) {
+            fileName = await ibiz.util.hbs.render(this.dataExport.fileNameFormat, {
+                context: this.context,
+                params: this.params,
+                data: this.view.state.srfactiveviewdata,
+                now: new Date(),
+            });
+        }
+        // 准备前台导出参数
+        const frontExportParams = {
             header,
             data: table,
-            fileName: this.model.logicName,
+            fileName,
+            colWidths: () => {
+                return colWidths;
+            },
+        };
+        // 前台导出注入属性识别
+        const frontExportAttri = (_c = this.model.controlAttributes) === null || _c === void 0 ? void 0 : _c.find(item => {
+            return item.attrName === PredefinedAttributes.BEFORE_FRONT_EXPORT;
         });
+        if (frontExportAttri) {
+            const { attrValue } = frontExportAttri;
+            if (attrValue) {
+                const frontExportResult = await ScriptFactory.asyncExecScriptFn({ exportColumns, data }, attrValue);
+                if (frontExportResult) {
+                    Object.assign(frontExportParams, frontExportResult);
+                }
+            }
+        }
+        // 导出数据
+        await ibiz.platform.frontExport(frontExportParams);
     }
     /**
      * 计算默认值并返回一个对象，对象里的属性就是要填充的默认值

package/out/controller/control/md-ctrl/md-ctrl.controller.d.ts CHANGED Viewed

@@ -218,12 +218,13 @@ export declare class MDCtrlController extends MDControlController<IDEMobMDCtrl,
     findAllExportColumns(dataExport: IAppDEDataExport): Promise<IExportColumn[]>;
     /**
      * @description 获取数据导出模型
-     * @returns {*}  {{ header: string[]; fields: string[] }}
+     * @returns {*}  {{ header: string[], fields: string[], exportColumns: IData[] }}
      * @memberof MDCtrlController
      */
     getDataExcelModel(): {
         header: string[];
         fields: string[];
+        exportColumns: IData[];
     };
     /**
      * @description 加载数据(只加载数据 不做其他操作)

package/out/controller/control/md-ctrl/md-ctrl.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"md-ctrl.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/md-ctrl/md-ctrl.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,cAAc,EACd,gBAAgB,EAChB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAEhB,YAAY,EACZ,gBAAgB,EAChB,aAAa,EACb,gBAAgB,~~EACjB~~,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;~~AAK7C~~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~~QAAE~~,MAAM,EAAE,MAAM,EAAE,CAAC;~~QAAC~~,MAAM,EAAE,MAAM,EAAE,~~CAAA~~;~~KAAE~~;~~IAe3D~~;;;;;OAKG;IACG,QAAQ,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAexD;;;;;OAKG;IACG,aAAa,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IA6B/D;;;;;;OAMG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE;IA2CzD;;;;;OAKG;IACG,mBAAmB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuClE;;;;;;;;OAQG;IACG,UAAU,CACd,IAAI,GAAE;QACJ,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,MAAM,CAAC,EAAE,gBAAgB,CAAC;KACtB,GACL,OAAO,CAAC,IAAI,CAAC;~~CAoBjB~~"}
1	+ {"version":3,"file":"md-ctrl.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/md-ctrl/md-ctrl.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/md-ctrl/md-ctrl.controller.js CHANGED Viewed

@@ -7,6 +7,8 @@ import { MDControlController } from '../../common';
 import { UIActionUtil } from '../../../ui-action';
 import { ButtonContainerState, UIActionButtonState } from '../../utils';
 import { calcUIActionGroup, getAllUIActionItems } from '../../../model';
+import { ScriptFactory } from '../../../utils';
+import { PredefinedAttributes } from '../../../constant';
 export class MDCtrlController extends MDControlController {
     constructor() {
         super(...arguments);
@@ -469,7 +471,7 @@ export class MDCtrlController extends MDControlController {
     }
     /**
      * @description 获取数据导出模型
-     * @returns {*}  {{ header: string[]; fields: string[] }}
+     * @returns {*}  {{ header: string[], fields: string[], exportColumns: IData[] }}
      * @memberof MDCtrlController
      */
     getDataExcelModel() {
@@ -477,11 +479,13 @@ export class MDCtrlController extends MDControlController {
         const excelModel = {
             header: [],
             fields: [],
+            exportColumns: [],
         };
         if (dedataExportId) {
             if (this.allExportColumns.length) {
                 excelModel.fields = this.allExportColumns.map(x => x.appDEFieldId);
                 excelModel.header = this.allExportColumns.map(x => x.caption);
+                excelModel.exportColumns = this.allExportColumns;
             }
         }
         return excelModel;
@@ -641,22 +645,41 @@ export class MDCtrlController extends MDControlController {
      * @memberof MDCtrlController
      */
     async exportData(args = {}) {
-        var _a;
+        var _a, _b;
         if ((_a = this.dataExport) === null || _a === void 0 ? void 0 : _a.enableBackend) {
             await this.excuteBackendExport(args.params || {});
             return;
         }
-        const { header, fields } = this.getDataExcelModel();
+        const { header, fields, exportColumns } = this.getDataExcelModel();
         if (!header) {
             throw new RuntimeError(ibiz.i18n.t('runtime.controller.common.md.tabularColumns'));
         }
         const data = await this.getExportData(args.params || {});
         const formatData = this.formatExcelData(data, fields);
         const table = formatData.map(v => Object.values(v));
-        await ibiz.platform.frontExport({
+        // 准备前台导出参数
+        const frontExportParams = {
             header,
             data: table,
             fileName: this.model.logicName,
+            colWidths: () => {
+                return [];
+            },
+        };
+        // 前台导出注入属性识别
+        const frontExportAttri = (_b = this.model.controlAttributes) === null || _b === void 0 ? void 0 : _b.find(item => {
+            return item.attrName === PredefinedAttributes.BEFORE_FRONT_EXPORT;
         });
+        if (frontExportAttri) {
+            const { attrValue } = frontExportAttri;
+            if (attrValue) {
+                const frontExportResult = await ScriptFactory.asyncExecScriptFn({ exportColumns, data }, attrValue);
+                if (frontExportResult) {
+                    Object.assign(frontExportParams, frontExportResult);
+                }
+            }
+        }
+        // 导出数据
+        await ibiz.platform.frontExport(frontExportParams);
     }
 }

package/out/controller/control/report-panel/generator/bi-converter/base/grid-converter-base.js CHANGED Viewed

@@ -23,22 +23,22 @@ export class GridConverterBase extends ConverterBase {
         };
         const { grid_show_agg, grid_header_fontstyle, grid_header_fontsize, grid_header_fontcolor, grid_header_position, grid_body_fontstyle, grid_body_fontsize, grid_body_fontcolor, grid_agg_row_position, grid_function_setting, } = this.reportUIModel;
         result.vars = {
-            '--ibiz-control-grid-header-align': grid_header_position,
-            '--ibiz-control-grid-header-font-size': `${grid_header_fontsize}px`,
-            '--ibiz-control-grid-header-text-color': grid_header_fontcolor,
-            '--ibiz-control-grid-content-font-size': `${grid_body_fontsize}px`,
-            '--ibiz-control-grid-content-text-color': grid_body_fontcolor,
+            '--ibiz-control-grid-header-cell-align': grid_header_position,
+            '--ibiz-control-grid-header-cell-font-size': `${grid_header_fontsize}px`,
+            '--ibiz-control-grid-header-cell-text-color': grid_header_fontcolor,
+            '--ibiz-control-grid-body-cell-font-size': `${grid_body_fontsize}px`,
+            '--ibiz-control-grid-body-cell-text-color': grid_body_fontcolor,
         };
         if (grid_header_fontstyle) {
             const key = grid_header_fontstyle === 'bold'
-                ? '--ibiz-control-grid-header-font-weight'
-                : '--ibiz-control-grid-header-font-style';
+                ? '--ibiz-control-grid-header-cell-font-weight'
+                : '--ibiz-control-grid-header-cell-font-style';
             result.vars[key] = grid_header_fontstyle;
         }
         if (grid_body_fontstyle) {
             const key = grid_body_fontstyle === 'bold'
-                ? '--ibiz-control-grid-content-font-weight'
-                : '--ibiz-control-grid-content-font-style';
+                ? '--ibiz-control-grid-body-cell-font-weight'
+                : '--ibiz-control-grid-body-cell-font-style';
             result.vars[key] = grid_body_fontstyle;
         }
         if (grid_show_agg == '1') {