@ibiz-template/runtime 0.6.7 → 0.6.9

package/out/service/service/control/control.service.js

@@ -50,8 +50,27 @@ export class ControlService {
     async exec(methodName, context, data, params) {
         const header = this.handleCustomRequestHeader();
         const res = await this.app.deService.exec(this.model.appDataEntityId, methodName, context, data, params, header);
+        await this.handleItemPrivilege(res.data, context);
         return res;
     }
+    /**
+     * 处理启用项权限标识
+     *
+     * @protected
+     * @param {IData} data 实体数据
+     * @param {IContext} context 上下文
+     * @memberof ControlService
+     */
+    async handleItemPrivilege(data, context) {
+        const { enableItemPrivilege, appDataEntityId } = this.model;
+        if (enableItemPrivilege && appDataEntityId) {
+            const deAuthority = await this.app.authority.getService(appDataEntityId);
+            const items = Array.isArray(data) ? data : [data];
+            items.forEach(item => {
+                deAuthority.setDataAccAction({ srfkey: item.srfkey, srfsessionid: context.srfsessionid }, item.srfdataaccaction);
+            });
+        }
+    }
     /**
      * 处理自定义请求头
      *

package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts

@@ -96,6 +96,7 @@ export declare class DynamicCodeListCache {
      * @returns {*}
      */
     protected convertData(data: IData): CodeListItem;
+    protected presetconvertData(data: IData): CodeListItem;
     /**
      * 加载服务获取数据，返回代码项
      *

package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIlD;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE1B,QAAQ,EAAE,YAAY;IAIlC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAwEhD;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IA+E1B;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,SAAS;IAmBrE;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAyC5E"}
+{"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIlD;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE1B,QAAQ,EAAE,YAAY;IAIlC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAwEhD,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAetD;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IA0F1B;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,SAAS;IAmBrE;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAyC5E"}

package/out/service/utils/dynamic-code-list/dynamic-code-list.js

@@ -116,6 +116,19 @@ export class DynamicCodeListCache {
         }
         return result;
     }
+    presetconvertData(data) {
+        const result = {};
+        const { color, bkcolor, disabled, id, text, label, value, cls } = data;
+        result.value = value;
+        result.color = color;
+        result.bkcolor = bkcolor;
+        result.text = text;
+        result.id = id;
+        result.id = label;
+        result.disableSelect = disabled;
+        result.cls = cls;
+        return result;
+    }
     /**
      * 加载服务获取数据，返回代码项
      *
@@ -158,7 +171,16 @@ export class DynamicCodeListCache {
                         : this.codeList.codeName;
             }
             const res = await app.net.get(`/dictionaries/codelist/${tag}`, tempParams);
-            return Object.freeze(res.data.items);
+            const presetresultItems = [];
+            if (res.data.items.every((item) => 'showorder' in item)) {
+                return res.data.items.sort((a, b) => (b.showorder || 0) - (a.showorder || 0));
+            }
+            if (res.data.items.length) {
+                res.data.items.forEach((item) => {
+                    presetresultItems.push(this.presetconvertData(item));
+                });
+            }
+            return Object.freeze(presetresultItems);
         }
         // *加载实体服务数据
         if (!appDataEntityId) {

package/out/service/utils/util/util.d.ts

@@ -16,7 +16,7 @@ export declare function fieldValueToBoolean(value: unknown): boolean;
  * @param input 输入字符串，如：DELETE:0,UPDATE:1
  * @returns {"DELETE":0,"UPDATE":1}
  */
-export declare function convertToObject(input: string): {
+export declare function convertToObject(input: string | undefined): {
     [key: string]: number;
 };
 //# sourceMappingURL=util.d.ts.map

package/out/service/utils/util/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/util/util.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAsB3D;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAaxE"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/util/util.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAsB3D;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG;IAC1D,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB,CAaA"}

package/out/ui-logic/ui-logic.js

@@ -197,7 +197,7 @@ export class UILogic {
             if (bol && link.dstNode) {
                 await this.deepExec(link.dstNode, ctx);
                 // 平行输出: 在满足连接条件并逻辑执行完毕后若是非平行输出则执行完成
-                if (node.model.parallelOutput === false) {
+                if (node.model.parallelOutput !== true) {
                     break;
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.6.7",
+  "version": "0.6.9",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@ibiz-template/core": "^0.6.3",
-    "@ibiz/model-core": "^0.1.14",
+    "@ibiz/model-core": "^0.1.15",
     "@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.14",
+    "@ibiz/model-core": "^0.1.15",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",