@ibiz-template/runtime 0.6.8 → 0.6.10

package/out/service/service/authority/de-authority.service.js

@@ -1,24 +1,55 @@
-import { matchMainState, calcMainStateOPPrivsStrs } from '../../../model';
+import { matchMainState, calcMainStateOPPrivsStrs, calcDeCodeNameById, } from '../../../model';
 import { convertToObject } from '../../utils/util/util';
 export class DeAuthorityService {
     constructor(entityModel) {
         this.entityModel = entityModel;
+        /**
+         * 数据权限MAP
+         *
+         * @protected
+         * @type {Map<string, string>}
+         * @memberof DeAuthorityService
+         */
+        this.dataAccActionMap = new Map();
+    }
+    /**
+     * 设置实体数据权限标识
+     *
+     * @param {IParams} params
+     * @param {string} dataAccAction
+     * @memberof DeAuthorityService
+     */
+    setDataAccAction(params, dataAccAction) {
+        if (params.srfsessionid) {
+            this.dataAccActionMap.set(`${params.srfsessionid}-${params.srfkey}`, dataAccAction);
+        }
+        this.dataAccActionMap.set(params.srfkey, dataAccAction);
+    }
+    /**
+     * 获取实体数据权限标识
+     *
+     * @param {string} key
+     * @return {*}  {(string | undefined)}
+     * @memberof DeAuthorityService
+     */
+    getDataAccAction(key) {
+        return this.dataAccActionMap.get(key);
     }
     /**
      * 通过操作标识计算权限
      * @author lxm
      * @date 2023-05-10 12:33:10
      * @param {string} dataAccessAction 操作标识
-     * @param {IData} [data] 实体数据
-     * @param {string} [appDeId] 应用实体id
+     * @param {IData} data 实体数据
+     * @param {IContext} context 上下文
+     * @param {boolean} enablePermission 是否启用权限
      * @return {*}  {Promise<boolean>}
      */
-    async calcByDataAccessAction(dataAccessAction, data) {
-        // 判断实体数据带回来的权限,不通过就返回false
-        // 返回格式（srfdataaccaction:"DELETE:0,UPDATE:1"）
-        if (data.srfdataaccaction) {
-            const dataAccactions = convertToObject(data.srfdataaccaction);
-            if (!dataAccactions[dataAccessAction]) {
+    async calcByDataAccessAction(dataAccessAction, data, context, enablePermission) {
+        if (enablePermission) {
+            // 判断实体数据权限
+            const deDataAccActionResult = await this.calcDeDataAccAction(dataAccessAction, data, context);
+            if (!deDataAccActionResult) {
                 return false;
             }
         }
@@ -29,6 +60,72 @@ export class DeAuthorityService {
         }
         return true;
     }
+    /**
+     * 计算实体附属主实体控制操作标识
+     */
+    async calcMajorDataAccAction(context) {
+        const { minorAppDERSs } = this.entityModel;
+        if (!minorAppDERSs)
+            return;
+        const appDeRSs = minorAppDERSs === null || minorAppDERSs === void 0 ? void 0 : minorAppDERSs.find(rs => {
+            const majorDeName = calcDeCodeNameById(rs.majorAppDataEntityId);
+            return (Object.prototype.hasOwnProperty.call(context, majorDeName) &&
+                context[majorDeName]);
+        });
+        if (!appDeRSs)
+            return;
+        const app = await ibiz.hub.getApp(context.srfappid);
+        const majorAuthorityService = await app.authority.getService(appDeRSs.majorAppDataEntityId);
+        if (!majorAuthorityService)
+            return;
+        const majorAppDeName = calcDeCodeNameById(appDeRSs.majorAppDataEntityId);
+        const majorDataAccAction = majorAuthorityService.getDataAccAction(`${context.srfsessionid}-${context[majorAppDeName]}`) || majorAuthorityService.getDataAccAction(`${context[majorAppDeName]}`);
+        return majorDataAccAction;
+    }
+    /**
+     * 计算实体数据权限，根据实体数据访问控制方式计算权限
+     *
+     * 0：无控制 不计算实体数据权限
+     * 1：自控制 根据实体数据中的权限标识计算
+     * 2：附属主实体控制 根据主实体的数据权限标识计算
+     * 3：附属主实体控制（未映射自控）根据主实体的数据权限标识计算，主实体没有权限标识时使用实体数据中的权限标识计算
+     * @param {string} dataAccessAction 操作标识
+     * @param {IData} data 实体数据
+     * @param {IContext} context 上下文
+     * @memberof DeAuthorityService
+     */
+    async calcDeDataAccAction(dataAccessAction, data, context) {
+        let result = true;
+        let tempDataAccObject;
+        const { dataAccCtrlMode } = this.entityModel;
+        switch (dataAccCtrlMode) {
+            case 1:
+                tempDataAccObject = (data === null || data === void 0 ? void 0 : data.srfdataaccaction)
+                    ? convertToObject(data.srfdataaccaction)
+                    : undefined;
+                break;
+            case 2:
+                tempDataAccObject = convertToObject(await this.calcMajorDataAccAction(context));
+                break;
+            case 3:
+                tempDataAccObject = convertToObject(await this.calcMajorDataAccAction(context));
+                // 父没有当前操作标识
+                if (!Object.prototype.hasOwnProperty.call(tempDataAccObject, dataAccessAction) &&
+                    data &&
+                    data.srfdataaccaction) {
+                    tempDataAccObject = convertToObject(data.srfdataaccaction);
+                }
+                break;
+            default:
+                break;
+        }
+        if (tempDataAccObject &&
+            dataAccessAction &&
+            !tempDataAccObject[dataAccessAction]) {
+            result = false;
+        }
+        return result;
+    }
     /**
      * 通过实体主状态计算权限
      * @author lxm
@@ -38,8 +135,12 @@ export class DeAuthorityService {
      * @param {string} appDeId 应用实体id
      * @return {*}  {Promise<boolean>}
      */
-    async calcByDeMainState(dataAccessAction, data) {
+    async calcByDeMainState(dataAccessAction, data = {}) {
         let result = true;
+        // 无数据时不计算主状态权限
+        if (Object.keys(data).length === 0) {
+            return result;
+        }
         const appDataEntity = this.entityModel;
         // 实体没有启用主状态，默认有权限
         if (!appDataEntity.enableDEMainState) {

package/out/service/service/control/control.service.d.ts

@@ -55,6 +55,15 @@ export declare class ControlService<T extends IAjaxControl = IAjaxControl> {
      * @returns {*}  {Promise<IHttpResponse>}
      */
     exec(methodName: string, context: IContext, data?: IData, params?: IParams): Promise<IHttpResponse>;
+    /**
+     * 处理启用项权限标识
+     *
+     * @protected
+     * @param {IData} data 实体数据
+     * @param {IContext} context 上下文
+     * @memberof ControlService
+     */
+    protected handleItemPrivilege(data: IData | IData[], context: IContext): Promise<void>;
     /**
      * 处理自定义请求头
      *

package/out/service/service/control/control.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAS,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,qBAAa,cAAc,CAAC,CAAC,SAAS,YAAY,GAAG,YAAY;IAC/D,GAAG,EAAG,WAAW,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;;OAOG;IACH,SAAS,0BAAiC;IAE1C;;;;;OAKG;gBACS,KAAK,EAAE,CAAC;IAIpB;;;;;;OAMG;IACG,IAAI,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAK9C;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAE/B;;;;;;;;;OASG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC;IAazB;;;;;;OAMG;IACH,SAAS,CAAC,yBAAyB,IAAI,KAAK;IAS5C;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,aAAa;IAKjD;;;;;;;OAOG;IACH,QAAQ,CAAC,UAAU,EAAE,KAAK,GAAG,SAAS;CAGvC"}
+{"version":3,"file":"control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAS,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,qBAAa,cAAc,CAAC,CAAC,SAAS,YAAY,GAAG,YAAY;IAC/D,GAAG,EAAG,WAAW,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;;OAOG;IACH,SAAS,0BAAiC;IAE1C;;;;;OAKG;gBACS,KAAK,EAAE,CAAC;IAIpB;;;;;;OAMG;IACG,IAAI,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAK9C;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAE/B;;;;;;;;;OASG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC;IAczB;;;;;;;OAOG;cACa,mBAAmB,CACjC,IAAI,EAAE,KAAK,GAAG,KAAK,EAAE,EACrB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,IAAI,CAAC;IAchB;;;;;;OAMG;IACH,SAAS,CAAC,yBAAyB,IAAI,KAAK;IAS5C;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,aAAa;IAKjD;;;;;;;OAOG;IACH,QAAQ,CAAC,UAAU,EAAE,KAAK,GAAG,SAAS;CAGvC"}

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.8",
+  "version": "0.6.10",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -16,7 +16,7 @@
   ],
   "scripts": {
     "dev": "tsc --watch",
-    "build": "npm run test:run && npm run lint && node scripts/build.js && npm run build:rollup && tsc --build",
+    "build": "npm run lint && node scripts/build.js && npm run build:rollup && tsc --build",
     "build:rollup": "rollup -c",
     "lint": "eslint 'src/**/*.ts'",
     "lint:fix": "eslint --fix 'src/**/*.ts'",
@@ -35,7 +35,7 @@
     "animejs": "^3.2.2"
   },
   "devDependencies": {
-    "@ibiz-template/core": "^0.6.3",
+    "@ibiz-template/core": "^0.6.10",
     "@ibiz/model-core": "^0.1.15",
     "@types/animejs": "^3.1.12",
     "@types/path-browserify": "^1.0.2",