@ibiz-template/runtime 0.7.26-alpha.0 → 0.7.26-alpha.2

package/out/locale/zh-CN/index.d.ts

@@ -63,6 +63,9 @@ export declare const zhCn: {
                     noFindSequence: string;
                     noInitialised: string;
                     noCalculated: string;
+                    classificationNotArray: string;
+                    classificationNotString: string;
+                    errorJson: string;
                 };
                 dataView: {
                     noBehaviourGroup: string;

package/out/locale/zh-CN/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/locale/zh-CN/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwnBhB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/locale/zh-CN/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2nBhB,CAAC"}

package/out/locale/zh-CN/index.js

@@ -64,6 +64,9 @@ export const zhCn = {
                     noFindSequence: '找不到{seriesIndex}序列的generator！',
                     noInitialised: 'chart对象没有正确初始化',
                     noCalculated: 'options还没计算',
+                    classificationNotArray: '配置的分类属性值不是一个数组',
+                    classificationNotString: '配置的分类属性值不是一个字符串',
+                    errorJson: 'JSON解析错误',
                 },
                 dataView: {
                     noBehaviourGroup: '操作项没有配置界面行为组',

package/out/service/app-data-entity/app-data-entity.d.ts

@@ -20,6 +20,7 @@ export declare class AppDataEntity implements IDataEntity {
     srfkey: string;
     srfmajortext: string;
     tempsrfkey: string;
+    srfordervalue: number;
     get srfuf(): Srfuf;
     /**
      * Creates an instance of AppDataEntity.

package/out/service/app-data-entity/app-data-entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-data-entity.d.ts","sourceRoot":"","sources":["../../../src/service/app-data-entity/app-data-entity.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,WAAW;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,UAAkB,KAAK,EAAE,KAAK,CAAC;IAE/B,UAAkB,OAAO,EAAE,cAAc,CAAC;IAElC,OAAO,EAAE,MAAM,CAAC;IAEhB,aAAa,EAAE,MAAM,CAAC;IAEtB,WAAW,EAAE,MAAM,CAAC;IAEpB,aAAa,EAAE,MAAM,CAAC;IAEtB,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,EAAE,MAAM,CAAC;IAErB,UAAU,EAAE,MAAM,CAAC;IAE3B,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED;;;;;;;OAOG;gBACS,MAAM,EAAE,cAAc,EAAE,IAAI,GAAE,KAAK,GAAG,aAAkB;IAyFpE;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAgClC;;;;;;OAMG;IACH,KAAK,IAAI,aAAa;IAMtB;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,aAAa;IAgBlD;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;CA6B5E"}
+{"version":3,"file":"app-data-entity.d.ts","sourceRoot":"","sources":["../../../src/service/app-data-entity/app-data-entity.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,WAAW;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,UAAkB,KAAK,EAAE,KAAK,CAAC;IAE/B,UAAkB,OAAO,EAAE,cAAc,CAAC;IAElC,OAAO,EAAE,MAAM,CAAC;IAEhB,aAAa,EAAE,MAAM,CAAC;IAEtB,WAAW,EAAE,MAAM,CAAC;IAEpB,aAAa,EAAE,MAAM,CAAC;IAEtB,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,EAAE,MAAM,CAAC;IAErB,UAAU,EAAE,MAAM,CAAC;IAEnB,aAAa,EAAE,MAAM,CAAC;IAE9B,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED;;;;;;;OAOG;gBACS,MAAM,EAAE,cAAc,EAAE,IAAI,GAAE,KAAK,GAAG,aAAkB;IAyFpE;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAgClC;;;;;;OAMG;IACH,KAAK,IAAI,aAAa;IAOtB;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,aAAa;IAiBlD;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;CA6B5E"}

package/out/service/app-data-entity/app-data-entity.js

@@ -148,6 +148,7 @@ export class AppDataEntity {
     clone() {
         const entity = new AppDataEntity(this._entity, this._data);
         entity.srfkey = this.srfkey;
+        entity.srfordervalue = this.srfordervalue;
         return entity;
     }
     /**
@@ -162,6 +163,7 @@ export class AppDataEntity {
         let _data = {};
         if (data instanceof AppDataEntity) {
             _data = data._data;
+            this.srfordervalue = data.srfordervalue;
         }
         else {
             _data = data;

package/out/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.d.ts

@@ -1,6 +1,21 @@
 import { IDEUIRawCodeLogic } from '@ibiz/model-core';
 import { UILogicContext } from '../../ui-logic-context';
 import { UILogicNode } from '../ui-logic-node';
+/**
+ * 直接脚本，同步执行方式写法
+ * 1）`return new Promise((resolve) => {
+ *       uiLogic.reportpanel.openReportDesignPage().then((result) =>{
+ *          resolve(result);
+ *       })
+ *     });`
+ * 2）`return await uiLogic.reportpanel.openReportDesignPage()`
+ *
+ * @author tony001
+ * @date 2024-06-25 14:06:02
+ * @export
+ * @class RawJSCodeNode
+ * @extends {UILogicNode}
+ */
 export declare class RawJSCodeNode extends UILogicNode {
     model: IDEUIRawCodeLogic;
     exec(ctx: UILogicContext): Promise<void>;

package/out/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.d.ts.map

@@ -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;CAkB/C"}
+{"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;AAC/C;;;;;;;;;;;;;;GAcG;AACH,qBAAa,aAAc,SAAQ,WAAW;IACpC,KAAK,EAAE,iBAAiB,CAAC;IAE3B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAiB/C"}

package/out/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.js

@@ -1,15 +1,30 @@
 import { ScriptFactory } from '../../../utils';
 import { UILogicNode } from '../ui-logic-node';
+/**
+ * 直接脚本，同步执行方式写法
+ * 1）`return new Promise((resolve) => {
+ *       uiLogic.reportpanel.openReportDesignPage().then((result) =>{
+ *          resolve(result);
+ *       })
+ *     });`
+ * 2）`return await uiLogic.reportpanel.openReportDesignPage()`
+ *
+ * @author tony001
+ * @date 2024-06-25 14:06:02
+ * @export
+ * @class RawJSCodeNode
+ * @extends {UILogicNode}
+ */
 export class RawJSCodeNode extends UILogicNode {
     async exec(ctx) {
         ibiz.log.debug(ibiz.i18n.t('runtime.uiLogic.interfaceLogicNodeDirectCode', {
             id: this.model.id,
         }), this.model.code);
-        ScriptFactory.execScriptFn({
+        await ScriptFactory.asyncExecScriptFn({
             view: ctx.view,
             context: ctx.context,
             params: ctx.viewParam,
             uiLogic: ctx.params,
-        }, this.model.code || '', { isAsync: false });
+        }, this.model.code || '');
     }
 }

package/out/utils/script/script-factory.d.ts

@@ -22,6 +22,18 @@ export declare class ScriptFactory {
      * @return {*}
      */
     static execScriptFn(args: IParams, scriptCode: string, options?: IScriptFunctionOpts): unknown;
+    /**
+     * 直接创建并同步执行脚本
+     *
+     * @author tony001
+     * @date 2024-06-25 14:06:25
+     * @static
+     * @param {IParams} args
+     * @param {string} scriptCode
+     * @param {IScriptFunctionOpts} [options={}]
+     * @return {*}  {Promise<unknown>}
+     */
+    static asyncExecScriptFn(args: IParams, scriptCode: string, options?: IScriptFunctionOpts): Promise<unknown>;
     /**
      * 执行单行脚本
      * @author lxm

package/out/utils/script/script-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"script-factory.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,aAAa;IACxB;;;;;;;;OAQG;IACH,MAAM,CAAC,cAAc,CACnB,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,mBAAmB,GAC5B,cAAc;IAIjB;;;;;;;;;OASG;IACH,MAAM,CAAC,YAAY,CACjB,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO;IAMV;;;;;;;;OAQG;IACH,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,GAAE,OAAY,GAAG,OAAO;CAMvE"}
+{"version":3,"file":"script-factory.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,aAAa;IACxB;;;;;;;;OAQG;IACH,MAAM,CAAC,cAAc,CACnB,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,mBAAmB,GAC5B,cAAc;IAIjB;;;;;;;;;OASG;IACH,MAAM,CAAC,YAAY,CACjB,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,mBAAwB,GAChC,OAAO;IAMV;;;;;;;;;;OAUG;WACU,iBAAiB,CAC5B,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,OAAO,CAAC;IAQnB;;;;;;;;OAQG;IACH,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,GAAE,OAAY,GAAG,OAAO;CAMvE"}

package/out/utils/script/script-factory.js

@@ -22,9 +22,24 @@ export class ScriptFactory {
      * @param {IScriptFunctionOpts} options 选项
      * @return {*}
      */
-    static execScriptFn(args, scriptCode, options) {
+    static execScriptFn(args, scriptCode, options = {}) {
         return this.createScriptFn(Object.keys(args), scriptCode, options).exec(args);
     }
+    /**
+     * 直接创建并同步执行脚本
+     *
+     * @author tony001
+     * @date 2024-06-25 14:06:25
+     * @static
+     * @param {IParams} args
+     * @param {string} scriptCode
+     * @param {IScriptFunctionOpts} [options={}]
+     * @return {*}  {Promise<unknown>}
+     */
+    static async asyncExecScriptFn(args, scriptCode, options = {}) {
+        const result = await this.createScriptFn(Object.keys(args), scriptCode, Object.assign(Object.assign({}, options), { isAsync: true })).exec(args);
+        return result;
+    }
     /**
      * 执行单行脚本
      * @author lxm

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.7.26-alpha.0",
+  "version": "0.7.26-alpha.2",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@ibiz-template/core": "^0.7.25",
-    "@ibiz/model-core": "^0.1.35",
+    "@ibiz/model-core": "^0.1.37",
     "@types/animejs": "^3.1.12",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
@@ -54,7 +54,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.6.0",
-    "@ibiz/model-core": "^0.1.35",
+    "@ibiz/model-core": "^0.1.37",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -66,5 +66,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "1ca87b0da3c01b72e5afaf88cb841c432f955240"
+  "gitHead": "cb512f1b38c1ad8a757d83cb1adc6e3d226628d2"
 }