@ibiz-template/runtime 0.6.9 → 0.6.10

package/out/controller/control/search-bar/index.d.ts

@@ -2,4 +2,5 @@ export * from './search-bar.controller';
 export { SearchBarFilterController } from './search-bar-filter.controller';
 export * from './entity-schema';
 export * from './use-searchcond';
+export { SearchBarFilterItemsController } from './search-bar-filter-items.controller';
 //# sourceMappingURL=index.d.ts.map

package/out/controller/control/search-bar/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC"}

package/out/controller/control/search-bar/index.js

@@ -2,3 +2,4 @@ export * from './search-bar.controller';
 export { SearchBarFilterController } from './search-bar-filter.controller';
 export * from './entity-schema';
 export * from './use-searchcond';
+export { SearchBarFilterItemsController } from './search-bar-filter-items.controller';

package/out/controller/control/search-bar/search-bar-filter-items.controller.d.ts

@@ -0,0 +1,81 @@
+import { IAppDataEntity, ISearchBarFilter } from '@ibiz/model-core';
+import { SearchBarFilterController } from './search-bar-filter.controller';
+/** 不需要编辑器的OP */
+export declare const ExcludeOPs: string[];
+type FieldInfo = {
+    name: string;
+    label: string;
+    valueOPs: string[];
+};
+/**
+ * 搜索栏过滤项ITEMS控制器
+ * @author lxm
+ * @date 2023-10-12 05:49:19
+ * @export
+ * @class SearchBarFilterController
+ * @implements {IEditorContainerController}
+ */
+export declare class SearchBarFilterItemsController extends SearchBarFilterController {
+    protected filterModels: ISearchBarFilter[];
+    /**
+     * 关联实体的模型
+     * @author lxm
+     * @date 2024-03-14 03:30:45
+     * @type {IAppDataEntity}
+     */
+    protected minorAppDE: IAppDataEntity;
+    /**
+     * 所有可以配置的子属性集合
+     * @author lxm
+     * @date 2024-03-14 04:20:10
+     * @type {Array<FieldInfo>}
+     */
+    allFields: Array<FieldInfo>;
+    /**
+     * 子编辑项控制器
+     * @author lxm
+     * @date 2024-03-14 04:53:26
+     * @protected
+     * @type {Map<string, SearchBarFilterController>}
+     */
+    protected subFilterCMap: Map<string, SearchBarFilterController>;
+    constructor(filterModels: ISearchBarFilter[], appDataEntity: IAppDataEntity, context: IContext, params: IParams);
+    /**
+     * 计算标识
+     * @author lxm
+     * @date 2024-03-14 05:06:14
+     * @protected
+     * @param {string} field
+     * @param {string} op
+     * @return {*}  {string}
+     */
+    protected calcKey(field: string, op: string): string;
+    /**
+     * 初始化子实体
+     * @author lxm
+     * @date 2024-03-14 04:43:04
+     * @protected
+     * @return {*}  {Promise<void>}
+     */
+    protected initMinorAppDE(): Promise<void>;
+    /**
+     * 初始化子实体目标属性相关信息
+     * @author lxm
+     * @date 2024-03-14 04:42:32
+     * @protected
+     * @return {*}  {Promise<void>}
+     */
+    protected initAllFields(): Promise<void>;
+    init(): Promise<void>;
+    /**
+     * 获取子搜索栏控制器
+     * @author lxm
+     * @date 2024-03-15 02:51:02
+     * @param {string} field
+     * @param {string} op
+     * @return {*}  {SearchBarFilterController}
+     */
+    getSubFilterController(field: string, op: string): SearchBarFilterController;
+}
+export {};
+//# sourceMappingURL=search-bar-filter-items.controller.d.ts.map

package/out/controller/control/search-bar/search-bar-filter-items.controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"search-bar-filter-items.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar-filter-items.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAIpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,gBAAgB;AAChB,eAAO,MAAM,UAAU,EAAE,MAAM,EAGrB,CAAC;AAIX,KAAK,SAAS,GAAG;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,8BAA+B,SAAQ,yBAAyB;IA2BzE,SAAS,CAAC,YAAY,EAAE,gBAAgB,EAAE;IA1B5C;;;;;OAKG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;IAEtC;;;;;OAKG;IACH,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAa;gBAGhE,YAAY,EAAE,gBAAgB,EAAE,EAC1C,aAAa,EAAE,cAAc,EAC7B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO;IAKjB;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM;IAIpD;;;;;;OAMG;cACa,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB/C;;;;;;OAMG;cACa,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA6CxC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3B;;;;;;;OAOG;IACH,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,yBAAyB;CAG7E"}

package/out/controller/control/search-bar/search-bar-filter-items.controller.js

@@ -0,0 +1,134 @@
+/* eslint-disable no-template-curly-in-string */
+import { RuntimeError } from '@ibiz-template/core';
+import { clone } from 'ramda';
+import { ValueOP } from '../../../constant';
+import { SearchBarFilterController } from './search-bar-filter.controller';
+/** 不需要编辑器的OP */
+export const ExcludeOPs = [
+    ValueOP.IS_NULL,
+    ValueOP.IS_NOT_NULL,
+];
+const SubFieldRegex = /^N_(.\w+)_(.\w+)$/; // N_USER_ID_EQ格式字符串中的USER_ID和EQ
+/**
+ * 搜索栏过滤项ITEMS控制器
+ * @author lxm
+ * @date 2023-10-12 05:49:19
+ * @export
+ * @class SearchBarFilterController
+ * @implements {IEditorContainerController}
+ */
+export class SearchBarFilterItemsController extends SearchBarFilterController {
+    constructor(filterModels, appDataEntity, context, params) {
+        super(filterModels[0], appDataEntity, context, params);
+        this.filterModels = filterModels;
+        /**
+         * 所有可以配置的子属性集合
+         * @author lxm
+         * @date 2024-03-14 04:20:10
+         * @type {Array<FieldInfo>}
+         */
+        this.allFields = [];
+        /**
+         * 子编辑项控制器
+         * @author lxm
+         * @date 2024-03-14 04:53:26
+         * @protected
+         * @type {Map<string, SearchBarFilterController>}
+         */
+        this.subFilterCMap = new Map();
+    }
+    /**
+     * 计算标识
+     * @author lxm
+     * @date 2024-03-14 05:06:14
+     * @protected
+     * @param {string} field
+     * @param {string} op
+     * @return {*}  {string}
+     */
+    calcKey(field, op) {
+        return `${field.toUpperCase()}_${op.toUpperCase()}`;
+    }
+    /**
+     * 初始化子实体
+     * @author lxm
+     * @date 2024-03-14 04:43:04
+     * @protected
+     * @return {*}  {Promise<void>}
+     */
+    async initMinorAppDE() {
+        var _a;
+        const targetField = this.filterModels[0].appDEFieldId;
+        let minorDEId = '';
+        (_a = this.appDataEntity.appDEMethodDTOs) === null || _a === void 0 ? void 0 : _a.find(item => {
+            var _a;
+            const field = (_a = item.appDEMethodDTOFields) === null || _a === void 0 ? void 0 : _a.find(x => {
+                return x.appDEFieldId === targetField;
+            });
+            if (field) {
+                minorDEId = field.refAppDataEntityId;
+                return true;
+            }
+            return false;
+        });
+        if (!minorDEId) {
+            throw new RuntimeError(`找不到属性${targetField}对应的关联实体`);
+        }
+        this.minorAppDE = await ibiz.hub.getAppDataEntity(minorDEId, this.context.srfappid);
+    }
+    /**
+     * 初始化子实体目标属性相关信息
+     * @author lxm
+     * @date 2024-03-14 04:42:32
+     * @protected
+     * @return {*}  {Promise<void>}
+     */
+    async initAllFields() {
+        var _a;
+        const fieldMap = new Map();
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        this.filterModels.forEach(item => {
+            var _a;
+            const subStr = (_a = item.defsearchMode.codeName) === null || _a === void 0 ? void 0 : _a.split('__')[1];
+            const matches = subStr.match(SubFieldRegex);
+            const subField = matches[1];
+            const subOP = matches[2];
+            if (!fieldMap.has(subField)) {
+                fieldMap.set(subField, {
+                    name: subField,
+                    label: '',
+                    valueOPs: [],
+                });
+            }
+            fieldMap.get(subField).valueOPs.push(subOP);
+            // 修改子项的模型
+            const cloneItem = clone(item);
+            cloneItem.defsearchMode.valueOP = subOP;
+            this.subFilterCMap.set(this.calcKey(subField, subOP), new SearchBarFilterController(cloneItem, this.appDataEntity, this.context, this.params));
+        });
+        (_a = this.minorAppDE.appDEFields) === null || _a === void 0 ? void 0 : _a.forEach(item => {
+            const codeName = item.codeName.toUpperCase();
+            if (fieldMap.has(codeName)) {
+                fieldMap.get(codeName).label = item.logicName;
+            }
+        });
+        this.allFields = Array.from(fieldMap.values());
+        // 初始化子过滤项控制器
+        await Promise.all(Array.from(this.subFilterCMap.values()).map(item => item.init()));
+    }
+    async init() {
+        await this.initMinorAppDE();
+        await this.initAllFields();
+    }
+    /**
+     * 获取子搜索栏控制器
+     * @author lxm
+     * @date 2024-03-15 02:51:02
+     * @param {string} field
+     * @param {string} op
+     * @return {*}  {SearchBarFilterController}
+     */
+    getSubFilterController(field, op) {
+        return this.subFilterCMap.get(this.calcKey(field, op));
+    }
+}

package/out/controller/control/search-bar/search-bar-filter.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search-bar-filter.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar-filter.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,cAAc,EACd,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAK5B,gBAAgB;AAChB,eAAO,MAAM,UAAU,EAAE,MAAM,EAGrB,CAAC;AAIX,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,QAAQ,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,cAAc,CAAC;CAC/B;AAED;;;;;;;GAOG;AACH,qBAAa,yBAA0B,YAAW,0BAA0B;IAoEjE,KAAK,EAAE,gBAAgB;IACvB,aAAa,EAAE,cAAc;IAC7B,OAAO,EAAE,QAAQ;IACjB,MAAM,EAAE,OAAO;IAtExB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;OAKG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAElC;gBAGQ,KAAK,EAAE,gBAAgB,EACvB,aAAa,EAAE,cAAc,EAC7B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO;IAqBxB;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B;;;;;;OAMG;IACH,eAAe,CAAC,IAAI,EAAE,eAAe,GAAG;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,KAAK,CAAA;KAAE;IAevE;;;;;;;OAOG;IACH,cAAc,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;CAO3E"}
+{"version":3,"file":"search-bar-filter.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar-filter.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,cAAc,EACd,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAK5B,gBAAgB;AAChB,eAAO,MAAM,UAAU,EAAE,MAAM,EAKrB,CAAC;AAIX,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,QAAQ,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,cAAc,CAAC;CAC/B;AAED;;;;;;;GAOG;AACH,qBAAa,yBAA0B,YAAW,0BAA0B;IAoEjE,KAAK,EAAE,gBAAgB;IACvB,aAAa,EAAE,cAAc;IAC7B,OAAO,EAAE,QAAQ;IACjB,MAAM,EAAE,OAAO;IAtExB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;OAKG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAElC;gBAGQ,KAAK,EAAE,gBAAgB,EACvB,aAAa,EAAE,cAAc,EAC7B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO;IAqBxB;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B;;;;;;OAMG;IACH,eAAe,CAAC,IAAI,EAAE,eAAe,GAAG;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,KAAK,CAAA;KAAE;IAevE;;;;;;;OAOG;IACH,cAAc,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;CAO3E"}

package/out/controller/control/search-bar/search-bar-filter.controller.js

@@ -7,6 +7,8 @@ import { ValueOP } from '../../../constant';
 export const ExcludeOPs = [
     ValueOP.IS_NULL,
     ValueOP.IS_NOT_NULL,
+    ValueOP.EXISTS,
+    ValueOP.NOT_EXISTS,
 ];
 const ScriptValueRegex = /\$\{[^}]*\}/; // 匹配${xxx}格式字符串
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGhF,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,sBAAsB,EACtB,eAAe,EAEhB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAWxD;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;OAKG;IACH,WAAW,SAAM;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,yBAAyB,EAAE,CAAM;IAEpD;;;;;OAKG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B;;;;;OAKG;IACH,gBAAgB,EAAE,sBAAsB,GAAG,IAAI,CAAQ;IAEvD;;;;;OAKG;IACH,oBAAoB,UAA8C;IAElE;;;;;OAKG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;OAKG;IACH,IAAI,gBAAgB,IAAI,gBAAgB,EAAE,CAEzC;IAED;;;;OAIG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,GAAG,SAAS,CAGtC;IAED;;;;;OAKG;IACH,aAAa,EAAG,cAAc,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;cAcX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B1C;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwCzC;;;;;;OAMG;IACH,SAAS,CAAC,0BAA0B,IAAI,IAAI;IA2B5C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAIhB;;;;;;;OAOG;IACH,oBAAoB,CAClB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,yBAAyB,GAAG,SAAS;IAUxC;;;;;OAKG;IACH,eAAe,IAAI,OAAO;IA4B1B;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBrD;;;;;OAKG;IACH,WAAW,CAAC,WAAW,UAAO,GAAG,KAAK,EAAE,GAAG,SAAS;IAoCpD;;;;;OAKG;IACG,iBAAiB,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAoGlE;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IAWxB;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCjC;;;;;OAKG;IACG,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;CA2CzE"}
+{"version":3,"file":"search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGhF,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,sBAAsB,EACtB,eAAe,EAEhB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAYxD;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;OAKG;IACH,WAAW,SAAM;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,yBAAyB,EAAE,CAAM;IAEpD;;;;;OAKG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B;;;;;OAKG;IACH,gBAAgB,EAAE,sBAAsB,GAAG,IAAI,CAAQ;IAEvD;;;;;OAKG;IACH,oBAAoB,UAA8C;IAElE;;;;;OAKG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;OAKG;IACH,IAAI,gBAAgB,IAAI,gBAAgB,EAAE,CAEzC;IAED;;;;OAIG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,GAAG,SAAS,CAGtC;IAED;;;;;OAKG;IACH,aAAa,EAAG,cAAc,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;cAcX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B1C;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwCzC;;;;;;OAMG;IACH,SAAS,CAAC,0BAA0B,IAAI,IAAI;IA2B5C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAIhB;;;;;;;OAOG;IACH,oBAAoB,CAClB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,yBAAyB,GAAG,SAAS;IAUxC;;;;;OAKG;IACH,eAAe,IAAI,OAAO;IA4B1B;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IA6CrD;;;;;OAKG;IACH,WAAW,CAAC,WAAW,UAAO,GAAG,KAAK,EAAE,GAAG,SAAS;IA+CpD;;;;;OAKG;IACG,iBAAiB,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAoGlE;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IAWxB;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCjC;;;;;OAKG;IACG,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;CA2CzE"}

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

@@ -8,6 +8,7 @@ import { SearchBarService } from './search-bar.service';
 import { getEntitySchema } from '../../utils';
 import { calcFilterModelBySchema } from './entity-schema';
 import { calcSearchConds, getOriginFilterNodes, parseFilters, } from './use-searchcond';
+import { SearchBarFilterItemsController } from './search-bar-filter-items.controller';
 const ScriptValueRegex = /\$\{[^}]*\}/; // 匹配${xxx}格式字符串
 /**
  * 搜索栏控制器
@@ -267,10 +268,29 @@ export class SearchBarController extends ControlController {
     async initSearchBarFilters() {
         var _a;
         if ((_a = this.searchBarFilters) === null || _a === void 0 ? void 0 : _a.length) {
+            const itemsMap = new Map();
             this.searchBarFilters.forEach(item => {
+                var _a;
+                // 整理exists或者NOTEXISTS的模型
+                if (((_a = item.defsearchMode) === null || _a === void 0 ? void 0 : _a.valueOP) &&
+                    ['EXISTS', 'NOTEXISTS'].includes(item.defsearchMode.valueOP)) {
+                    const key = `${item.appDEFieldId}_${item.defsearchMode.valueOP}`;
+                    if (!itemsMap.has(key)) {
+                        itemsMap.set(key, []);
+                    }
+                    itemsMap.get(key).push(item);
+                    return;
+                }
                 const filterController = new SearchBarFilterController(item, this.appDataEntity, this.context, this.params);
                 this.filterControllers.push(filterController);
             });
+            // 初始化SearchBarFilterItemsController
+            if (itemsMap.size > 0) {
+                itemsMap.forEach(items => {
+                    const filterController = new SearchBarFilterItemsController(items, this.appDataEntity, this.context, this.params);
+                    this.filterControllers.push(filterController);
+                });
+            }
             await Promise.all(this.filterControllers.map(controller => controller.init()));
         }
     }
@@ -287,9 +307,13 @@ export class SearchBarController extends ControlController {
         const searchconds = calcSearchConds(this.state.filterNodes);
         if (valueFormat && searchconds) {
             // 给多数据加载之前进行脚本值转换
-            recursiveIterate(searchconds[0], (node) => {
+            recursiveIterate(searchconds[0], (node, parent) => {
                 if (node.condtype === 'DEFIELD' && !isNil(node.value)) {
-                    const controller = this.findFilterController(node.fieldname, node.condop);
+                    let controller = this.findFilterController(node.fieldname, node.condop);
+                    if (!controller && parent.condtype === 'ITEMS') {
+                        const itemC = this.findFilterController(parent.fieldname, parent.condop);
+                        controller = itemC.getSubFilterController(node.fieldname, node.condop);
+                    }
                     if (controller) {
                         if (controller.valueItem && node.valueItem) {
                             node.value = node.valueItem;

package/out/controller/control/search-bar/use-searchcond.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-searchcond.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/use-searchcond.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAElE;;;;;GAKG;AACH,wBAAgB,oBAAoB,IAAI,WAAW,EAAE,CAQpD;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,KAAK,CAsBtD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,CAoBrD;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,WAAW,EAAE,WAAW,EAAE,GACzB,KAAK,EAAE,GAAG,SAAS,CAiBrB"}
+{"version":3,"file":"use-searchcond.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/use-searchcond.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAElE;;;;;GAKG;AACH,wBAAgB,oBAAoB,IAAI,WAAW,EAAE,CAQpD;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,KAAK,CA+BtD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,CA+BrD;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,WAAW,EAAE,WAAW,EAAE,GACzB,KAAK,EAAE,GAAG,SAAS,CAiBrB"}

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/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/service/i-app-de-authority.service.d.ts

@@ -13,9 +13,10 @@ export interface IAppDeAuthorityService {
      * @param {string} dataAccessAction 操作标识
      * @param {IData | undefined} data 实体数据
      * @param {IContext} context 上下文
+     * @param {boolean} enablePermission 是否启用权限
      * @return {*}  {Promise<boolean>}
      */
-    calcByDataAccessAction(dataAccessAction: string, data: IData | undefined, context: IContext): Promise<boolean>;
+    calcByDataAccessAction(dataAccessAction: string, data: IData | undefined, context: IContext, enablePermission: boolean): Promise<boolean>;
     /**
      * 设置实体数据权限标识
      *

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,GAAG,SAAS,EACvB,OAAO,EAAE,QAAQ,GAChB,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"}
+{"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.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;;;;;;;;;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;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

@@ -145,7 +145,7 @@ export class AuthorityService {
         // 有实体标识走实体权限的校验（不一定需要数据，可以使用附属主实体的操作标识）
         if (appDeId) {
             const service = await this.getService(appDeId);
-            return service.calcByDataAccessAction(dataAccessAction, data, context);
+            return service.calcByDataAccessAction(dataAccessAction, data, context, this.enablePermission);
         }
         return result;
     }

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

@@ -34,9 +34,10 @@ export declare class DeAuthorityService implements IAppDeAuthorityService {
      * @param {string} dataAccessAction 操作标识
      * @param {IData} data 实体数据
      * @param {IContext} context 上下文
+     * @param {boolean} enablePermission 是否启用权限
      * @return {*}  {Promise<boolean>}
      */
-    calcByDataAccessAction(dataAccessAction: string, data: IData | undefined, context: IContext): Promise<boolean>;
+    calcByDataAccessAction(dataAccessAction: string, data: IData | undefined, context: IContext, enablePermission: boolean): Promise<boolean>;
     /**
      * 计算实体附属主实体控制操作标识
      */

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;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;;;;;;;;OAQG;IACG,sBAAsB,CAC1B,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,GAAG,SAAS,EACvB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,OAAO,CAAC;IAuBnB;;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;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"}

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

@@ -42,13 +42,16 @@ export class DeAuthorityService {
      * @param {string} dataAccessAction 操作标识
      * @param {IData} data 实体数据
      * @param {IContext} context 上下文
+     * @param {boolean} enablePermission 是否启用权限
      * @return {*}  {Promise<boolean>}
      */
-    async calcByDataAccessAction(dataAccessAction, data, context) {
-        // 判断实体数据权限
-        const deDataAccActionResult = await this.calcDeDataAccAction(dataAccessAction, data, context);
-        if (!deDataAccActionResult) {
-            return false;
+    async calcByDataAccessAction(dataAccessAction, data, context, enablePermission) {
+        if (enablePermission) {
+            // 判断实体数据权限
+            const deDataAccActionResult = await this.calcDeDataAccAction(dataAccessAction, data, context);
+            if (!deDataAccActionResult) {
+                return false;
+            }
         }
         // 判断主状态的权限
         const mainStateResult = await this.calcByDeMainState(dataAccessAction, data);
@@ -134,6 +137,10 @@ export class DeAuthorityService {
      */
     async calcByDeMainState(dataAccessAction, data = {}) {
         let result = true;
+        // 无数据时不计算主状态权限
+        if (Object.keys(data).length === 0) {
+            return result;
+        }
         const appDataEntity = this.entityModel;
         // 实体没有启用主状态，默认有权限
         if (!appDataEntity.enableDEMainState) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.6.9",
+  "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",