@ibiz-template/runtime 0.6.8 → 0.6.10

package/out/controller/control/search-bar/use-searchcond.js

@@ -24,6 +24,14 @@ export function getOriginFilterNodes() {
  */
 export function formatFilters(node) {
     if (!node.leaf) {
+        if (node.logicType === 'ITEMS') {
+            return {
+                condtype: 'ITEMS',
+                fieldname: node.field,
+                condop: node.valueOP,
+                searchconds: node.children.map(item => formatFilters(item)),
+            };
+        }
         return {
             condtype: 'GROUP',
             condop: node.logicType,
@@ -58,6 +66,15 @@ export function parseFilters(data) {
             children: (data.searchconds || []).map((item) => parseFilters(item)),
         };
     }
+    if (data.condtype === 'ITEMS') {
+        return {
+            leaf: false,
+            logicType: 'ITEMS',
+            field: data.fieldname || null,
+            valueOP: data.condop || null,
+            children: (data.searchconds || []).map((item) => parseFilters(item)),
+        };
+    }
     if (data.condtype === 'DEFIELD') {
         return {
             leaf: true,

package/out/controller/control/toolbar/toolbar.controllerr.js

@@ -89,7 +89,7 @@ export class ToolbarController extends ControlController {
             }
         }, { childrenFields: ['detoolbarItems'] });
         if (!this.state.manualCalcButtonState) {
-            await this.calcButtonState();
+            await this.calcButtonState(undefined, this.model.appDataEntityId);
         }
         else {
             await this.state.buttonsState.init();
@@ -123,7 +123,7 @@ export class ToolbarController extends ControlController {
         if (data && data instanceof ControlVO) {
             _data = data.getOrigin();
         }
-        await this.state.buttonsState.update(_data, appDeId);
+        await this.state.buttonsState.update(this.context, _data, appDeId);
         // 计算菜单项逻辑的预置逻辑
         if (this.scheduler) {
             const logicParams = {};

package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-node-column.controller.js

@@ -319,7 +319,7 @@ export class TreeGridExNodeColumnController {
             const uaColState = row.columnActionsStates[this.name];
             if (uaColState && row.data._nodeType === 'DE') {
                 // 实体节点更新操作列状态
-                uaColState.update(row.data._deData);
+                uaColState.update(this.context, row.data._deData);
             }
         }
     }

package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-ua-column/tree-grid-ex-ua-column.controller.js

@@ -112,7 +112,7 @@ export class TreeGridExUAColumnController extends TreeGridExColumnController {
             const uaColState = row.columnActionsStates[this.model.id];
             if (uaColState && row.data._nodeType === 'DE') {
                 // 实体节点更新操作列状态
-                uaColState.update(row.data._deData);
+                uaColState.update(this.context, row.data._deData);
             }
         }
     }

package/out/controller/utils/button-state/button-container.state.d.ts

@@ -13,7 +13,7 @@ export declare class ButtonContainerState implements IButtonContainerState {
     constructor();
     addState(name: string, state: IButtonContainerState | IButtonState): void;
     setLoading(name: string): void;
-    update(data?: IData, appDeId?: string): Promise<void>;
+    update(context: IContext, data?: IData, appDeId?: string): Promise<void>;
     init(): Promise<void>;
     [p: string]: any;
 }

package/out/controller/utils/button-state/button-container.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"button-container.state.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/button-state/button-container.state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEzE;;;;;;;GAOG;AACH,qBAAa,oBAAqB,YAAW,qBAAqB;IACxD,OAAO,EAAE,OAAO,CAAC;IAEjB,QAAQ,EAAE,KAAK,CAAC,qBAAqB,GAAG,YAAY,CAAC,CAAC;;IAuB9D,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,YAAY,GAAG,IAAI;IAWzE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAUxB,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQrD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ3B,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB"}
+{"version":3,"file":"button-container.state.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/button-state/button-container.state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEzE;;;;;;;GAOG;AACH,qBAAa,oBAAqB,YAAW,qBAAqB;IACxD,OAAO,EAAE,OAAO,CAAC;IAEjB,QAAQ,EAAE,KAAK,CAAC,qBAAqB,GAAG,YAAY,CAAC,CAAC;;IAuB9D,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,YAAY,GAAG,IAAI;IAWzE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAUxB,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;IAQV,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ3B,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB"}

package/out/controller/utils/button-state/button-container.state.js

@@ -47,9 +47,9 @@ export class ButtonContainerState {
             }
         });
     }
-    async update(data, appDeId) {
+    async update(context, data, appDeId) {
         await Promise.all(this.children.map(child => {
-            return child.update(data, appDeId);
+            return child.update(context, data, appDeId);
         }));
     }
     async init() {

package/out/controller/utils/button-state/ui-action-button.state.d.ts

@@ -76,7 +76,7 @@ export declare class UIActionButtonState implements IButtonState {
      * @param {string} [appDeId] 数据对应的实体id
      * @return {*}
      */
-    protected calcPermission(data?: IData, appDeId?: string): Promise<void>;
-    update(data?: IData, appDeId?: string): Promise<void>;
+    protected calcPermission(context: IContext, data?: IData, appDeId?: string): Promise<void>;
+    update(context: IContext, data?: IData, appDeId?: string): Promise<void>;
 }
 //# sourceMappingURL=ui-action-button.state.d.ts.map

package/out/controller/utils/button-state/ui-action-button.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-action-button.state.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/button-state/ui-action-button.state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D;;;;;;;GAOG;AACH,qBAAa,mBAAoB,YAAW,YAAY;IACtD,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,EAAE,OAAO,CAAS;IAE1B,OAAO,EAAE,OAAO,CAAQ;IAExB,OAAO,EAAE,OAAO,CAAS;IAEzB;;OAEG;IACH,SAAS,CAAC,SAAS,EAAE,OAAO,CAAQ;IAEpC;;OAEG;IACH,SAAS,CAAC,kBAAkB,EAAE,OAAO,CAAQ;IAE7C;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,EAAE,OAAO,CAAS;IAE1C;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,EAAE,OAAO,CAAS;IAEzC;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAEpC;;OAEG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAE9B;;OAEG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,CAAS;gBAEtB,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAM5D;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqD3B;;;;;;;;OAQG;cACa,cAAc,CAC5B,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;IAkBV,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAiB5D"}
+{"version":3,"file":"ui-action-button.state.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/button-state/ui-action-button.state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D;;;;;;;GAOG;AACH,qBAAa,mBAAoB,YAAW,YAAY;IACtD,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,EAAE,OAAO,CAAS;IAE1B,OAAO,EAAE,OAAO,CAAQ;IAExB,OAAO,EAAE,OAAO,CAAS;IAEzB;;OAEG;IACH,SAAS,CAAC,SAAS,EAAE,OAAO,CAAQ;IAEpC;;OAEG;IACH,SAAS,CAAC,kBAAkB,EAAE,OAAO,CAAQ;IAE7C;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,EAAE,OAAO,CAAS;IAE1C;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,EAAE,OAAO,CAAS;IAEzC;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAEpC;;OAEG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAE9B;;OAEG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,CAAS;gBAEtB,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAM5D;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqD3B;;;;;;;;OAQG;cACa,cAAc,CAC5B,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;IAmBV,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;CAiBjB"}

package/out/controller/utils/button-state/ui-action-button.state.js

@@ -104,7 +104,7 @@ export class UIActionButtonState {
      * @param {string} [appDeId] 数据对应的实体id
      * @return {*}
      */
-    async calcPermission(data, appDeId) {
+    async calcPermission(context, data, appDeId) {
         if (!this.dataAccessAction) {
             return;
         }
@@ -113,13 +113,13 @@ export class UIActionButtonState {
         if (this.appDeName && appDeId && !appDeId.includes(this.appDeName)) {
             ibiz.log.warn(`${this.uiActionId}界面行为的实体${this.appDeName}和数据的实体${appDeId}不一致`);
         }
-        this.permitted = await app.authority.calcByDataAccessAction(this.dataAccessAction, data, appDeId);
+        this.permitted = await app.authority.calcByDataAccessAction(this.dataAccessAction, context, data, appDeId);
     }
-    async update(data, appDeId) {
+    async update(context, data, appDeId) {
         if (!this.isInit) {
             await this.init();
         }
-        await this.calcPermission(data, appDeId);
+        await this.calcPermission(context, data, appDeId);
         // 赋值,没权限时都禁用，没权限时隐藏的才会不显示
         if (!this.permitted) {
             this.disabled = true;

package/out/de-logic/de-logic.js

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

package/out/interface/controller/common/button-state/i-button-container.state.d.ts

@@ -36,13 +36,13 @@ export interface IButtonContainerState {
     /**
      * 更新子的状态
      *
-     * @author lxm
-     * @date 2022-10-13 21:10:09
-     * @param {IData} data 后台数据，可能不存在
+     * @param {IContext} context 上下文
+     * @param {IData} [data] 后台数据，可能不存在
      * @param {string} [appDeId] 实体标识
      * @return {*}  {Promise<void>}
+     * @memberof IButtonContainerState
      */
-    update(data?: IData, appDeId?: string): Promise<void>;
+    update(context: IContext, data?: IData, appDeId?: string): Promise<void>;
     /**
      * 初始化
      * @author lxm

package/out/interface/controller/common/button-state/i-button-container.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-button-container.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/common/button-state/i-button-container.state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,MAAM,WAAW,qBAAqB;IACpC;;;;;;OAMG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAE/B;;;;;;;OAOG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,YAAY,GAAG,IAAI,CAAC;IAE1E;;;;;;;;OAQG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtD;;;;;OAKG;IACH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB"}
+{"version":3,"file":"i-button-container.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/common/button-state/i-button-container.state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,MAAM,WAAW,qBAAqB;IACpC;;;;;;OAMG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAE/B;;;;;;;OAOG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,YAAY,GAAG,IAAI,CAAC;IAE1E;;;;;;;;OAQG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzE;;;;;OAKG;IACH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB"}

package/out/interface/controller/common/button-state/i-button.state.d.ts

@@ -42,13 +42,13 @@ export interface IButtonState {
     /**
      * 更新自身状态
      *
-     * @author lxm
-     * @date 2022-10-13 21:10:09
-     * @param {IData} data 后台数据，可能不存在
+     * @param {IContext} context 上下文
+     * @param {IData} [data] 后台数据，可能不存在
      * @param {string} [appDeId] 实体标识
      * @return {*}  {Promise<void>}
+     * @memberof IButtonState
      */
-    update(data?: IData, appDeId?: string): Promise<void>;
+    update(context: IContext, data?: IData, appDeId?: string): Promise<void>;
     /**
      * 初始化
      * @author lxm

package/out/interface/controller/common/button-state/i-button.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-button.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/common/button-state/i-button.state.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;;OAMG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;;OAMG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;;;;OAQG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtD;;;;;OAKG;IACH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB"}
+{"version":3,"file":"i-button.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/common/button-state/i-button.state.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;;OAMG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;;OAMG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;;;;OAQG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzE;;;;;OAKG;IACH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB"}

package/out/interface/controller/state/control/i-search-bar.state.d.ts

@@ -15,7 +15,14 @@ export interface IFilterBranchNode {
      * @date 2023-10-12 05:21:18
      * @type {('AND' | 'OR')}
      */
-    logicType: 'AND' | 'OR';
+    logicType: 'AND' | 'OR' | 'ITEMS';
+    /**
+     * 实体属性名称
+     * @author lxm
+     * @date 2023-10-13 02:35:42
+     * @type {string}
+     */
+    field?: string | null;
     /**
      * 过滤项值
      * @author lxm

package/out/interface/controller/state/control/i-search-bar.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-search-bar.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-search-bar.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,WAAW,iBAAiB;IAChC;;;;;OAKG;IACH,IAAI,EAAE,KAAK,CAAC;IAEZ;;;;;OAKG;IACH,SAAS,EAAE,KAAK,GAAG,IAAI,CAAC;IAExB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,EAAE,WAAW,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B;;;;;OAKG;IACH,IAAI,EAAE,IAAI,CAAC;IAEX;;;;;OAKG;IACH,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;;;;OAKG;IACH,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IAEtB;;;;;OAKG;IACH,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,MAAM,WAAW,GAAG,iBAAiB,GAAG,eAAe,CAAC;AAE9D,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACpD;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,eAAe,GAAG,IAAI,CAAC;IAE1C;;;;;OAKG;IACH,WAAW,EAAE,WAAW,EAAE,CAAC;IAE3B;;;;;OAKG;IACH,uBAAuB,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAEvD;;;;;OAKG;IACH,eAAe,EAAE,sBAAsB,EAAE,CAAC;CAC3C;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,YAAY,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAEnC;;OAEG;IACH,WAAW,CAAC,EAAE,KAAK,EAAE,CAAC;IAEtB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;;;OAKG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,KAAK,EAAE,OAAO,CAAC;IAEf;;;;;OAKG;IACH,IAAI,EAAE,OAAO,CAAC;IAEd;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,eAAe,EAAE,gBAAgB,CAAC;IAElC;;;;;OAKG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB"}
+{"version":3,"file":"i-search-bar.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-search-bar.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,WAAW,iBAAiB;IAChC;;;;;OAKG;IACH,IAAI,EAAE,KAAK,CAAC;IAEZ;;;;;OAKG;IACH,SAAS,EAAE,KAAK,GAAG,IAAI,GAAG,OAAO,CAAC;IAElC;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEtB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,EAAE,WAAW,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B;;;;;OAKG;IACH,IAAI,EAAE,IAAI,CAAC;IAEX;;;;;OAKG;IACH,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;;;;OAKG;IACH,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IAEtB;;;;;OAKG;IACH,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,MAAM,WAAW,GAAG,iBAAiB,GAAG,eAAe,CAAC;AAE9D,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACpD;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,eAAe,GAAG,IAAI,CAAC;IAE1C;;;;;OAKG;IACH,WAAW,EAAE,WAAW,EAAE,CAAC;IAE3B;;;;;OAKG;IACH,uBAAuB,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAEvD;;;;;OAKG;IACH,eAAe,EAAE,sBAAsB,EAAE,CAAC;CAC3C;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,YAAY,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAEnC;;OAEG;IACH,WAAW,CAAC,EAAE,KAAK,EAAE,CAAC;IAEtB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;;;OAKG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,KAAK,EAAE,OAAO,CAAC;IAEf;;;;;OAKG;IACH,IAAI,EAAE,OAAO,CAAC;IAEd;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,eAAe,EAAE,gBAAgB,CAAC;IAElC;;;;;OAKG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB"}

package/out/interface/service/code-list-item/code-list-item.d.ts

@@ -28,6 +28,11 @@ export interface CodeListItem {
      * @type {string}
      */
     color?: string;
+    /**
+     * 背景颜色
+     * @type {string}
+     */
+    bkcolor?: string;
     /**
      * 子代码项
      * @type {CodeListItem[]}
@@ -38,6 +43,11 @@ export interface CodeListItem {
      * @type {string}
      */
     textCls?: string;
+    /**
+     * 样式表名称
+     * @type {string}
+     */
+    cls?: string;
     /**
      * 禁止选择
      * @author lxm

package/out/interface/service/code-list-item/code-list-item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code-list-item.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/code-list-item/code-list-item.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;OAGG;IACH,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IAEvB;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;OAGG;IACH,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAE1B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;OAGG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB;;;OAGG;IACH,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB"}
+{"version":3,"file":"code-list-item.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/code-list-item/code-list-item.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;OAGG;IACH,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IAEvB;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAE1B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;OAGG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB;;;OAGG;IACH,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB"}

package/out/interface/service/service/i-app-de-authority.service.d.ts

@@ -11,10 +11,27 @@ export interface IAppDeAuthorityService {
      * @author lxm
      * @date 2023-05-10 12:33:10
      * @param {string} dataAccessAction 操作标识
-     * @param {IData} [data] 实体数据
-     * @param {string} [appDeId] 应用实体id
+     * @param {IData | undefined} data 实体数据
+     * @param {IContext} context 上下文
+     * @param {boolean} enablePermission 是否启用权限
      * @return {*}  {Promise<boolean>}
      */
-    calcByDataAccessAction(dataAccessAction: string, data: IData): Promise<boolean>;
+    calcByDataAccessAction(dataAccessAction: string, data: IData | undefined, context: IContext, enablePermission: boolean): Promise<boolean>;
+    /**
+     * 设置实体数据权限标识
+     *
+     * @param {IParams} params
+     * @param {string} dataAccAction
+     * @memberof IAppDeAuthorityService
+     */
+    setDataAccAction(params: IParams, dataAccAction: string): void;
+    /**
+     * 获取实体数据权限标识
+     *
+     * @param {string} key
+     * @return {*}  {(string | undefined)}
+     * @memberof IAppDeAuthorityService
+     */
+    getDataAccAction(key: string): string | undefined;
 }
 //# sourceMappingURL=i-app-de-authority.service.d.ts.map

package/out/interface/service/service/i-app-de-authority.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-app-de-authority.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-app-de-authority.service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;;;;;;OAQG;IACH,sBAAsB,CACpB,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,OAAO,CAAC,CAAC;CACrB"}
+{"version":3,"file":"i-app-de-authority.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-app-de-authority.service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;;;;;;;OASG;IACH,sBAAsB,CACpB,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,GAAG,SAAS,EACvB,OAAO,EAAE,QAAQ,EACjB,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;;;;OAMG;IACH,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAE/D;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CACnD"}

package/out/interface/service/service/i-auth.service.d.ts

@@ -74,5 +74,12 @@ export interface IAuthService {
      * @return {*}  {(Promise<IAuthInfo | undefined>)}
      */
     getAuthInfo(): IAuthInfo | undefined;
+    /**
+     * 通过refreshToken换算token
+     * @author zpc
+     * @date 2024-03-15 14:24:48
+     * @return {*}  {(Promise<void>)}
+     */
+    refreshToken(): Promise<void>;
 }
 //# sourceMappingURL=i-auth.service.d.ts.map

package/out/interface/service/service/i-auth.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-auth.service.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,SAAS;IACxB;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;;OAOG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;;OAMG;IACH,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAEnC;;;;;;;;;OASG;IACH,KAAK,CACH,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;;;;OAMG;IACH,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3B;;;;;;OAMG;IACH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7B;;;;;OAKG;IACH,WAAW,IAAI,SAAS,GAAG,SAAS,CAAC;CACtC"}
+{"version":3,"file":"i-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-auth.service.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,SAAS;IACxB;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;;OAOG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;;OAMG;IACH,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAEnC;;;;;;;;;OASG;IACH,KAAK,CACH,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;;;;OAMG;IACH,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3B;;;;;;OAMG;IACH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7B;;;;;OAKG;IACH,WAAW,IAAI,SAAS,GAAG,SAAS,CAAC;IAErC;;;;;OAKG;IACH,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B"}

package/out/service/service/auth/v7-auth.service.d.ts

@@ -13,6 +13,7 @@ export declare class V7AuthService implements IAuthService {
     login(loginName: string, password: string, remember?: boolean): Promise<boolean>;
     logout(): Promise<boolean>;
     extendLogin(): Promise<void>;
+    refreshToken(): Promise<void>;
     getAuthInfo(): IAuthInfo | undefined;
     /**
      * 加载应用数据

package/out/service/service/auth/v7-auth.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"v7-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/auth/v7-auth.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE7D;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,YAAY;IAChD,IAAI,WAAW,IAAI,OAAO,CAEzB;IAEK,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAyBlC,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,OAAO,CAAC;IAsCb,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAoB1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAiDlC,WAAW,IAAI,SAAS,GAAG,SAAS;IAWpC;;;;;;OAMG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAM7C"}
+{"version":3,"file":"v7-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/auth/v7-auth.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE7D;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,YAAY;IAChD,IAAI,WAAW,IAAI,OAAO,CAEzB;IAEK,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAyBlC,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,OAAO,CAAC;IAsCb,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAoB1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAoD5B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IA2BnC,WAAW,IAAI,SAAS,GAAG,SAAS;IAWpC;;;;;;OAMG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAM7C"}

package/out/service/service/auth/v7-auth.service.js

@@ -45,15 +45,15 @@ export class V7AuthService {
             });
             const { data } = res;
             if (data && data.token) {
-                const cacheDays = remember ? 7 : 0;
+                const cacheDay = remember ? 30 : 0;
                 if (remember) {
-                    setCookie(CoreConst.TOKEN_REMEMBER, '1', cacheDays, true);
+                    setCookie(CoreConst.TOKEN_REMEMBER, '1', cacheDay, true);
                 }
-                setCookie(CoreConst.TOKEN, data.token, cacheDays, true);
+                setCookie(CoreConst.TOKEN, data.token, cacheDay, true);
                 const expiredDate = new Date().getTime() + (data.expirein || 7199) * 1000;
-                setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, cacheDays, true);
+                setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, cacheDay, true);
                 if (data.refresh_token) {
-                    setCookie(CoreConst.REFRESH_TOKEN, data.refresh_token, cacheDays, true);
+                    setCookie(CoreConst.REFRESH_TOKEN, data.refresh_token, cacheDay, true);
                 }
                 clearCookie(CoreConst.IS_ANONYMOUS);
             }
@@ -102,7 +102,7 @@ export class V7AuthService {
             setTimeout(async () => {
                 const remember = getCookie(CoreConst.TOKEN_REMEMBER);
                 const refreshToken = getCookie(CoreConst.REFRESH_TOKEN);
-                const cacheDay = remember ? 7 : 0;
+                const cacheDay = remember ? 30 : 0;
                 let res;
                 if (refreshToken != null && refreshToken !== '') {
                     res = await ibiz.net.get(`/uaa/refresh_token/${refreshToken}`);
@@ -111,6 +111,9 @@ export class V7AuthService {
                     res = await ibiz.net.get(`/uaa/refreshtoken2`);
                 }
                 if (res.ok) {
+                    if (remember) {
+                        setCookie(CoreConst.TOKEN_REMEMBER, '1', cacheDay, true);
+                    }
                     setCookie(CoreConst.TOKEN, res.data.token, cacheDay, true);
                     const expiredDate = new Date().getTime() + (res.data.expirein || 7199) * 1000;
                     setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, cacheDay, true);
@@ -129,6 +132,26 @@ export class V7AuthService {
             }, wait);
         }
     }
+    async refreshToken() {
+        const remember = getCookie(CoreConst.TOKEN_REMEMBER);
+        const refreshToken = getCookie(CoreConst.REFRESH_TOKEN);
+        if (refreshToken != null && refreshToken !== '') {
+            const res = await ibiz.net.get(`/uaa/refresh_token/${refreshToken}`);
+            if (res.ok) {
+                const cacheDay = remember ? 30 : 0;
+                if (remember) {
+                    setCookie(CoreConst.TOKEN_REMEMBER, '1', cacheDay, true);
+                }
+                setCookie(CoreConst.TOKEN, res.data.token, cacheDay, true);
+                const expiredDate = new Date().getTime() + (res.data.expirein || 7199) * 1000;
+                setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, cacheDay, true);
+                if (res.data.refresh_token) {
+                    setCookie(CoreConst.REFRESH_TOKEN, res.data.refresh_token, cacheDay, true);
+                }
+                clearCookie(CoreConst.IS_ANONYMOUS);
+            }
+        }
+    }
     getAuthInfo() {
         const token = getCookie(CoreConst.TOKEN);
         const isAnonymous = !!getCookie(CoreConst.IS_ANONYMOUS);

package/out/service/service/authority/authority.service.d.ts

@@ -88,10 +88,11 @@ export declare class AuthorityService {
      * @author lxm
      * @date 2023-05-10 12:33:10
      * @param {string} dataAccessAction 操作标识
+     * @param {IContext} context 上下文
      * @param {IData} [data] 实体数据
      * @param {string} [appDeId] 应用实体id
      * @return {*}  {Promise<boolean>}
      */
-    calcByDataAccessAction(dataAccessAction: string, data?: IData, appDeId?: string): Promise<boolean>;
+    calcByDataAccessAction(dataAccessAction: string, context: IContext, data?: IData, appDeId?: string): Promise<boolean>;
 }
 //# sourceMappingURL=authority.service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"authority.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/authority/authority.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAG5D;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IA2Cf,SAAS,CAAC,QAAQ,EAAE,YAAY;IA1C5C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAa;IAEjE;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAC7B,MAAM,EACN,CAAC,WAAW,EAAE,cAAc,KAAK,OAAO,CAAC,sBAAsB,CAAC,CACjE,CAAa;IAEd;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAM;IAElC;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,EAAE,OAAO,CAAS;gBAEtB,QAAQ,EAAE,YAAY;IAE5C;;;;;;;;;OASG;IACH,QAAQ,CACN,EAAE,EAAE,MAAM,EACV,WAAW,EAAE,CACX,WAAW,EAAE,cAAc,KACxB,OAAO,CAAC,sBAAsB,CAAC,GACnC,IAAI;IAIP;;;;;;;;OAQG;IACG,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAsB7D;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,oBAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAejD;;;;;OAKG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIvC;;;;;;;;OAQG;IACG,sBAAsB,CAC1B,gBAAgB,EAAE,MAAM,EACxB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC;CA0BpB"}
+{"version":3,"file":"authority.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/authority/authority.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAG5D;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IA2Cf,SAAS,CAAC,QAAQ,EAAE,YAAY;IA1C5C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAa;IAEjE;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAC7B,MAAM,EACN,CAAC,WAAW,EAAE,cAAc,KAAK,OAAO,CAAC,sBAAsB,CAAC,CACjE,CAAa;IAEd;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAM;IAElC;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,EAAE,OAAO,CAAS;gBAEtB,QAAQ,EAAE,YAAY;IAE5C;;;;;;;;;OASG;IACH,QAAQ,CACN,EAAE,EAAE,MAAM,EACV,WAAW,EAAE,CACX,WAAW,EAAE,cAAc,KACxB,OAAO,CAAC,sBAAsB,CAAC,GACnC,IAAI;IAIP;;;;;;;;OAQG;IACG,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAsB7D;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,oBAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAejD;;;;;OAKG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIvC;;;;;;;;;OASG;IACG,sBAAsB,CAC1B,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC;CA+BpB"}

package/out/service/service/authority/authority.service.js

@@ -123,11 +123,12 @@ export class AuthorityService {
      * @author lxm
      * @date 2023-05-10 12:33:10
      * @param {string} dataAccessAction 操作标识
+     * @param {IContext} context 上下文
      * @param {IData} [data] 实体数据
      * @param {string} [appDeId] 应用实体id
      * @return {*}  {Promise<boolean>}
      */
-    async calcByDataAccessAction(dataAccessAction, data, appDeId) {
+    async calcByDataAccessAction(dataAccessAction, context, data, appDeId) {
         // 默认为true
         const result = true;
         // 启用权限校验的通过操作标识去找它映射的统一资源校验，先通过了才走主状态
@@ -141,10 +142,10 @@ export class AuthorityService {
                 return false;
             }
         }
-        // 有实体的走主状态的校验
-        if (data && appDeId) {
+        // 有实体标识走实体权限的校验（不一定需要数据，可以使用附属主实体的操作标识）
+        if (appDeId) {
             const service = await this.getService(appDeId);
-            return service.calcByDataAccessAction(dataAccessAction, data);
+            return service.calcByDataAccessAction(dataAccessAction, data, context, this.enablePermission);
         }
         return result;
     }

package/out/service/service/authority/de-authority.service.d.ts

@@ -3,16 +3,58 @@ import { IAppDeAuthorityService } from '../../../interface';
 export declare class DeAuthorityService implements IAppDeAuthorityService {
     protected entityModel: IAppDataEntity;
     constructor(entityModel: IAppDataEntity);
+    /**
+     * 数据权限MAP
+     *
+     * @protected
+     * @type {Map<string, string>}
+     * @memberof DeAuthorityService
+     */
+    protected dataAccActionMap: Map<string, string>;
+    /**
+     * 设置实体数据权限标识
+     *
+     * @param {IParams} params
+     * @param {string} dataAccAction
+     * @memberof DeAuthorityService
+     */
+    setDataAccAction(params: IParams, dataAccAction: string): void;
+    /**
+     * 获取实体数据权限标识
+     *
+     * @param {string} key
+     * @return {*}  {(string | undefined)}
+     * @memberof DeAuthorityService
+     */
+    getDataAccAction(key: string): string | undefined;
     /**
      * 通过操作标识计算权限
      * @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>}
      */
-    calcByDataAccessAction(dataAccessAction: string, data: IData): Promise<boolean>;
+    calcByDataAccessAction(dataAccessAction: string, data: IData | undefined, context: IContext, enablePermission: boolean): Promise<boolean>;
+    /**
+     * 计算实体附属主实体控制操作标识
+     */
+    protected calcMajorDataAccAction(context: IContext): Promise<string | undefined>;
+    /**
+     * 计算实体数据权限，根据实体数据访问控制方式计算权限
+     *
+     * 0：无控制 不计算实体数据权限
+     * 1：自控制 根据实体数据中的权限标识计算
+     * 2：附属主实体控制 根据主实体的数据权限标识计算
+     * 3：附属主实体控制（未映射自控）根据主实体的数据权限标识计算，主实体没有权限标识时使用实体数据中的权限标识计算
+     * @param {string} dataAccessAction 操作标识
+     * @param {IData} data 实体数据
+     * @param {IContext} context 上下文
+     * @memberof DeAuthorityService
+     */
+    protected calcDeDataAccAction(dataAccessAction: string, data: IData | undefined, context: IContext): Promise<boolean>;
     /**
      * 通过实体主状态计算权限
      * @author lxm
@@ -22,6 +64,6 @@ export declare class DeAuthorityService implements IAppDeAuthorityService {
      * @param {string} appDeId 应用实体id
      * @return {*}  {Promise<boolean>}
      */
-    protected calcByDeMainState(dataAccessAction: string, data: IData): Promise<boolean>;
+    protected calcByDeMainState(dataAccessAction: string, data?: IData): Promise<boolean>;
 }
 //# sourceMappingURL=de-authority.service.d.ts.map

package/out/service/service/authority/de-authority.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-authority.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/authority/de-authority.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAI5D,qBAAa,kBAAmB,YAAW,sBAAsB;IACnD,SAAS,CAAC,WAAW,EAAE,cAAc;gBAA3B,WAAW,EAAE,cAAc;IAEjD;;;;;;;;OAQG;IACG,sBAAsB,CAC1B,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,OAAO,CAAC;IAsBnB;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,OAAO,CAAC;CAiCpB"}
+{"version":3,"file":"de-authority.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/authority/de-authority.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAQ5D,qBAAa,kBAAmB,YAAW,sBAAsB;IACnD,SAAS,CAAC,WAAW,EAAE,cAAc;gBAA3B,WAAW,EAAE,cAAc;IAEjD;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE5D;;;;;;OAMG;IACH,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IAU9D;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIjD;;;;;;;;;OASG;IACG,sBAAsB,CAC1B,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,GAAG,SAAS,EACvB,OAAO,EAAE,QAAQ,EACjB,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC,OAAO,CAAC;IAyBnB;;OAEG;cACa,sBAAsB,CACpC,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IA2B9B;;;;;;;;;;;OAWG;cACa,mBAAmB,CACjC,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,GAAG,SAAS,EACvB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,OAAO,CAAC;IAkDnB;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,gBAAgB,EAAE,MAAM,EACxB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,OAAO,CAAC;CAqCpB"}