@ibiz-template/runtime 0.7.28-alpha.1 → 0.7.28

package/out/command/app/app-func/app-func.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-func.d.ts","sourceRoot":"","sources":["../../../../src/command/app/app-func/app-func.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAI5C;;;;;;;GAOG;AACH,qBAAa,cAAc;IACzB;;;;;;;OAOG;IACH,MAAM,CAAC,QAAQ,CAAC,GAAG,wBAAwB;;IAM3C;;;;;;;;;;OAUG;IACG,IAAI,CACR,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,IAAI,CAAC;IAuChB;;;;;;;;;;OAUG;cACa,WAAW,CACzB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,IAAI,CAAC;IAiBhB;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAK/C;;;;;;;;;OASG;IACH,SAAS,CAAC,aAAa,CACrB,OAAO,EAAE,QAAQ,EACjB,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,IAAI;IAKP;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,OAAO,EAAE,QAAQ,EACjB,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,IAAI;IAKP;;;;;;;;;OASG;IACH,SAAS,CAAC,MAAM,CACd,OAAO,EAAE,QAAQ,EACjB,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,IAAI;CAIR"}
+{"version":3,"file":"app-func.d.ts","sourceRoot":"","sources":["../../../../src/command/app/app-func/app-func.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAI5C;;;;;;;GAOG;AACH,qBAAa,cAAc;IACzB;;;;;;;OAOG;IACH,MAAM,CAAC,QAAQ,CAAC,GAAG,wBAAwB;;IAM3C;;;;;;;;;;OAUG;IACG,IAAI,CACR,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,IAAI,CAAC;IAuChB;;;;;;;;;;OAUG;cACa,WAAW,CACzB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,IAAI,CAAC;IAiBhB;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAK/C;;;;;;;;;OASG;IACH,SAAS,CAAC,aAAa,CACrB,OAAO,EAAE,QAAQ,EACjB,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,IAAI;IAKP;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,OAAO,EAAE,QAAQ,EACjB,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,IAAI;IAOP;;;;;;;;;OASG;IACH,SAAS,CAAC,MAAM,CACd,OAAO,EAAE,QAAQ,EACjB,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,IAAI;CAIR"}

package/out/command/app/app-func/app-func.js

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { ModelError, RuntimeError } from '@ibiz-template/core';
-import { convertNavData } from '../../../utils';
+import { convertNavData, ScriptFactory } from '../../../utils';
 import { OpenAppViewCommand } from '../open-app-view/open-app-view';
 /**
  * 执行应用功能
@@ -112,8 +112,7 @@ export class AppFuncCommand {
      * @param {IParams} [params]
      */
     executeJavaScript(appFunc, context, params) {
-        ibiz.log.warn('executeJavaScript', appFunc, context, params);
-        throw new RuntimeError(ibiz.i18n.t('runtime.common.unrealized'));
+        ScriptFactory.execScriptFn({ context, params, data: {}, el: null, view: null }, appFunc.jscode);
     }
     /**
      * 自定义应用功能

package/out/utils/bi-report-util/bi-report-util.d.ts

@@ -113,16 +113,6 @@ export declare class BIReportUtil {
      * @return {*}  {Promise<void>}
      */
     mergeSpecialParams(type: string, sourceData: IData, targetData: IData): Promise<void>;
-    /**
-     * 处理数字特殊参数（同环比）
-     *
-     * @author tony001
-     * @date 2024-07-05 10:07:35
-     * @param {IData} sourceData
-     * @param {IData} targetData
-     * @return {*}  {Promise<void>}
-     */
-    mergeNumberSpecialParams(sourceData: IData, targetData: IData): Promise<void>;
     /**
      * 处理交叉表特殊参数（维度列）
      *

package/out/utils/bi-report-util/bi-report-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bi-report-util.d.ts","sourceRoot":"","sources":["../../../src/utils/bi-report-util/bi-report-util.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAErE;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,sBAAsB,CAAC;IAErC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,YAAY;IACvB;;;;;;;;;OASG;IACG,cAAc,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,UAAU,CAAC;IAkDtB;;;;;;;;OAQG;IACG,yBAAyB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IA+E5D;;;;;;OAMG;IACG,4BAA4B,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC;IA2FzE;;;;;;;;;;;;;OAaG;IACG,0BAA0B,CAAC,GAAG,EAAE;QACpC,SAAS,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,MAAM,CAAC;QACxB,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,KAAK,CAAC;QACZ,KAAK,EAAE,KAAK,CAAC;KACd,GAAG,OAAO,CAAC,KAAK,CAAC;IAoDlB;;;;;;;;;OASG;IACG,kBAAkB,CACtB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,KAAK,EACjB,UAAU,EAAE,KAAK,GAChB,OAAO,CAAC,IAAI,CAAC;IA0BhB;;;;;;;;OAQG;IACG,wBAAwB,CAC5B,UAAU,EAAE,KAAK,EACjB,UAAU,EAAE,KAAK,GAChB,OAAO,CAAC,IAAI,CAAC;IAIhB;;;;;;;;OAQG;IACG,4BAA4B,CAChC,UAAU,EAAE,KAAK,EACjB,UAAU,EAAE,KAAK,GAChB,OAAO,CAAC,IAAI,CAAC;IAoBhB;;;;;;;;OAQG;IACG,gBAAgB,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAwB5E"}
+{"version":3,"file":"bi-report-util.d.ts","sourceRoot":"","sources":["../../../src/utils/bi-report-util/bi-report-util.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAErE;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,sBAAsB,CAAC;IAErC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,YAAY;IACvB;;;;;;;;;OASG;IACG,cAAc,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,UAAU,CAAC;IAkDtB;;;;;;;;OAQG;IACG,yBAAyB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAmF5D;;;;;;OAMG;IACG,4BAA4B,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC;IAiGzE;;;;;;;;;;;;;OAaG;IACG,0BAA0B,CAAC,GAAG,EAAE;QACpC,SAAS,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,MAAM,CAAC;QACxB,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,KAAK,CAAC;QACZ,KAAK,EAAE,KAAK,CAAC;KACd,GAAG,OAAO,CAAC,KAAK,CAAC;IA4DlB;;;;;;;;;OASG;IACG,kBAAkB,CACtB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,KAAK,EACjB,UAAU,EAAE,KAAK,GAChB,OAAO,CAAC,IAAI,CAAC;IAsBhB;;;;;;;;OAQG;IACG,4BAA4B,CAChC,UAAU,EAAE,KAAK,EACjB,UAAU,EAAE,KAAK,GAChB,OAAO,CAAC,IAAI,CAAC;IAoBhB;;;;;;;;OAQG;IACG,gBAAgB,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAwB5E"}

package/out/utils/bi-report-util/bi-report-util.js

@@ -140,6 +140,10 @@ export class BIReportUtil {
         if (biReportUIModel.filter) {
             propertyData.data.filter = biReportUIModel.filter;
         }
+        // 识别period
+        if (biReportUIModel.period) {
+            propertyData.data.period = biReportUIModel.period;
+        }
         config.propertyData = propertyData;
         return config;
     }
@@ -169,7 +173,13 @@ export class BIReportUtil {
             config.selectChartType = reportUIModelObj.selectChartType;
             propertyData.style = reportUIModelObj.style;
             // 识别filter
-            propertyData.data.filter = reportUIModelObj.filter;
+            if (reportUIModelObj.filter) {
+                propertyData.data.filter = reportUIModelObj.filter;
+            }
+            // 识别period
+            if (reportUIModelObj.period) {
+                propertyData.data.period = reportUIModelObj.period;
+            }
         }
         else {
             config.selectChartType = 'NUMBER';
@@ -250,15 +260,23 @@ export class BIReportUtil {
     async translateDataToAppBIReport(arg) {
         const { reportTag, selectChartType, selectCubeId, caption, data, style } = arg;
         const app = ibiz.hub.getApp(ibiz.env.appId);
+        const tempUIReportModel = {
+            selectChartType,
+            style,
+        };
+        // 识别filter
+        if (data.filter) {
+            Object.assign(tempUIReportModel, { filter: data.filter });
+        }
+        // 识别period
+        if (data.period) {
+            Object.assign(tempUIReportModel, { period: data.period });
+        }
         const targetData = {
             pssysbireportitems: [],
             pssysbischemeid: selectCubeId.split('.')[0],
             pssysbicubeid: selectCubeId,
-            bireportuimodel: JSON.stringify({
-                selectChartType,
-                style,
-                filter: data === null || data === void 0 ? void 0 : data.filter,
-            }),
+            bireportuimodel: JSON.stringify(tempUIReportModel),
             pssysappid: app.model.codeName,
             bireporttag: reportTag,
             pssysbireportname: caption,
@@ -309,10 +327,6 @@ export class BIReportUtil {
      */
     async mergeSpecialParams(type, sourceData, targetData) {
         switch (type) {
-            // 数字
-            case 'NUMBER':
-                await this.mergeNumberSpecialParams(sourceData, targetData);
-                break;
             // 交叉表
             case 'CROSSTABLE':
                 await this.mergeCrosstableSpecialParams(sourceData, targetData);
@@ -332,18 +346,6 @@ export class BIReportUtil {
                 break;
         }
     }
-    /**
-     * 处理数字特殊参数（同环比）
-     *
-     * @author tony001
-     * @date 2024-07-05 10:07:35
-     * @param {IData} sourceData
-     * @param {IData} targetData
-     * @return {*}  {Promise<void>}
-     */
-    async mergeNumberSpecialParams(sourceData, targetData) {
-        console.log(sourceData, targetData);
-    }
     /**
      * 处理交叉表特殊参数（维度列）
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.7.28-alpha.1",
+  "version": "0.7.28",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -35,7 +35,7 @@
     "animejs": "^3.2.2"
   },
   "devDependencies": {
-    "@ibiz-template/core": "^0.7.28-alpha.1",
+    "@ibiz-template/core": "^0.7.28",
     "@ibiz/model-core": "^0.1.42",
     "@types/animejs": "^3.1.12",
     "@types/path-browserify": "^1.0.2",
@@ -66,5 +66,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "0d5ae0bbdc6e79585b7edd60daecb7cad456fc4d"
+  "gitHead": "29b9fd2bc8acbec5d66607ae8dfddd84d8824b24"
 }