@jari-ace/app-bolts 0.5.10 → 0.6.0

package/dist/api/appService/appRoute.d.ts

@@ -1,5 +1,5 @@
 import type { IAceAxios } from "../../http/IAceAxios";
-import type { AppRouteBase, CreateAppRouteCommand, AppRoute, UpdateAppRouteCommand, DeleteAppRouteCommand, MoveRouteCommand } from "../../models/appService/AppRouter";
+import type { AppRoute, AppRouteBase, CreateAppRouteCommand, DeleteAppRouteCommand, MoveRouteCommand, UpdateAppRouteCommand } from "../../models/appService/AppRouter";
 import type { AceAxiosRequestConfig } from "../../http/types";
 /**
  * 路由定义API服务
@@ -30,6 +30,12 @@ export declare function useRouteApi(axios?: IAceAxios): {
      * @param config 请求配置参数
      */
     getAllEnabled(appName: string, config?: AceAxiosRequestConfig | undefined): Promise<AppRoute[]>;
+    /**
+     * 获取指定应用下当前登录人被授权访问的路由定义
+     * @param appName 应用名称
+     * @param config 请求配置参数
+     */
+    getAuthorized(appName: string, config?: AceAxiosRequestConfig | undefined): Promise<AppRoute[]>;
     /**
      * 创建路由
      * @param command 创建路由命令

package/dist/api/appService/appRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"appRoute.d.ts","sourceRoot":"","sources":["../../../src/api/appService/appRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAGR,YAAY,EACZ,qBAAqB,EACrB,QAAQ,EACR,qBAAqB,EACrB,qBAAqB,EACrB,gBAAgB,EAEnB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AA8F9D;;;GAGG;AACH,wBAAgB,WAAW,CAAC,KAAK,CAAC,EAAE,SAAS;IA5FrC;;;;OAIG;;IAKH;;;;OAIG;;IAKH;;;;OAIG;;IAKH;;;;OAIG;;IAKH;;;;OAIG;;IAUH;;;;OAIG;;IAQH;;;;OAIG;;IAQH;;;;OAIG;;EAgBV;AAED,MAAM,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC"}
+{"version":3,"file":"appRoute.d.ts","sourceRoot":"","sources":["../../../src/api/appService/appRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EACR,QAAQ,EACR,YAAY,EACZ,qBAAqB,EACrB,qBAAqB,EACrB,gBAAgB,EAChB,qBAAqB,EACxB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,kBAAkB,CAAC;AA6G5D;;;GAGG;AACH,wBAAgB,WAAW,CAAC,KAAK,CAAC,EAAE,SAAS;IA3GrC;;;;OAIG;;IAKH;;;;OAIG;;IAKH;;;;OAIG;;IAKH;;;;OAIG;;IAIH;;;;OAIG;;IAKH;;;;OAIG;;IAWH;;;;OAIG;;IAUH;;;;OAIG;;IAUH;;;;OAIG;;EAkBV;AAED,MAAM,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC"}

package/dist/api/appService/appRoute.js

@@ -45,6 +45,14 @@ function useRouteApiInternal(axios) {
         getAllEnabled: function (appName, config) {
             return axios.get("".concat(baseUrl, "/enabled/").concat(appName), undefined, config);
         },
+        /**
+         * 获取指定应用下当前登录人被授权访问的路由定义
+         * @param appName 应用名称
+         * @param config 请求配置参数
+         */
+        getAuthorized: function (appName, config) {
+            return axios.get("".concat(baseUrl, "/authorized/").concat(appName), undefined, config);
+        },
         /**
          * 创建路由
          * @param command 创建路由命令

package/dist/api/appService/appRoute.js.map

@@ -1 +1 @@
-{"version":3,"file":"appRoute.js","sourceRoot":"","sources":["../../../src/api/appService/appRoute.ts"],"names":[],"mappings":";;;;;;;;;;;AAYA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGjD,SAAS,mBAAmB,CAAC,KAAgB;IACzC,IAAM,OAAO,GAAG,SAAS,CAAC;IAE1B,OAAO;QACH;;;;WAIG;QACH,OAAO,YAAC,EAAU,EAAE,MAA8B;YAC9C,OAAO,KAAK,CAAC,GAAG,CAAW,UAAG,OAAO,oBAAU,EAAE,CAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC5E,CAAC;QAED;;;;WAIG;QACH,QAAQ,YAAC,OAAe,EAAE,MAA8B;YACpD,OAAO,KAAK,CAAC,GAAG,CAAiB,UAAG,OAAO,oBAAU,OAAO,CAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QACvF,CAAC;QAED;;;;WAIG;QACH,WAAW,YAAC,QAAgB,EAAE,MAA8B;YACxD,OAAO,KAAK,CAAC,GAAG,CAAiB,UAAG,OAAO,uBAAa,QAAQ,CAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC3F,CAAC;QAED;;;;WAIG;QACH,aAAa,YAAC,OAAe,EAAE,MAA8B;YACzD,OAAO,KAAK,CAAC,GAAG,CAAa,UAAG,OAAO,sBAAY,OAAO,CAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QACrF,CAAC;QAED;;;;WAIG;QACH,MAAM,YAAC,OAA8B,EAAE,MAA8B;YACjE,OAAO,KAAK,CAAC,IAAI,CAAW,OAAO,EAAE,OAAO,EAAE,SAAS,aACnD,kBAAkB,EAAE,IAAI,IACrB,CAAC,MAAM,IAAI,EAAE,CAAC,EACnB,CAAC;QACP,CAAC;QAID;;;;WAIG;QACH,MAAM,YAAC,OAA8B,EAAE,MAA8B;YACjE,OAAO,KAAK,CAAC,GAAG,CAAW,OAAO,EAAE,OAAO,EAAE,SAAS,aAClD,kBAAkB,EAAE,IAAI,IACrB,CAAC,MAAM,IAAI,EAAE,CAAC,EACnB,CAAC;QACP,CAAC;QAED;;;;WAIG;QACH,WAAW,YAAC,OAA8B,EAAE,MAA8B;YACtE,OAAO,KAAK,CAAC,MAAM,CAAO,OAAO,EAAE,OAAO,EAAE,SAAS,aACjD,kBAAkB,EAAE,IAAI,IACrB,CAAC,MAAM,IAAI,EAAE,CAAC,EACnB,CAAC;QACP,CAAC;QAED;;;;WAIG;QACH,IAAI,YAAC,OAAyB,EAAE,MAA8B;YAC1D,OAAO,KAAK,CAAC,GAAG,CAAO,UAAG,OAAO,UAAO,EAAE,OAAO,EAAE,SAAS,aACxD,kBAAkB,EAAE,IAAI,IACrB,CAAC,MAAM,IAAI,EAAE,CAAC,EACnB,CAAC;QACP,CAAC;KACJ,CAAC;AACN,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,KAAiB;IACzC,OAAO,kBAAkB,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;AAC1D,CAAC"}
+{"version":3,"file":"appRoute.js","sourceRoot":"","sources":["../../../src/api/appService/appRoute.ts"],"names":[],"mappings":";;;;;;;;;;;AASA,OAAO,EAAC,kBAAkB,EAAC,MAAM,aAAa,CAAC;AAG/C,SAAS,mBAAmB,CAAC,KAAgB;IACzC,IAAM,OAAO,GAAG,SAAS,CAAC;IAE1B,OAAO;QACH;;;;WAIG;QACH,OAAO,YAAC,EAAU,EAAE,MAA8B;YAC9C,OAAO,KAAK,CAAC,GAAG,CAAW,UAAG,OAAO,oBAAU,EAAE,CAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC5E,CAAC;QAED;;;;WAIG;QACH,QAAQ,YAAC,OAAe,EAAE,MAA8B;YACpD,OAAO,KAAK,CAAC,GAAG,CAAiB,UAAG,OAAO,oBAAU,OAAO,CAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QACvF,CAAC;QAED;;;;WAIG;QACH,WAAW,YAAC,QAAgB,EAAE,MAA8B;YACxD,OAAO,KAAK,CAAC,GAAG,CAAiB,UAAG,OAAO,uBAAa,QAAQ,CAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC3F,CAAC;QAED;;;;WAIG;QACH,aAAa,YAAC,OAAe,EAAE,MAA8B;YACzD,OAAO,KAAK,CAAC,GAAG,CAAa,UAAG,OAAO,sBAAY,OAAO,CAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QACrF,CAAC;QACD;;;;WAIG;QACH,aAAa,YAAC,OAAe,EAAE,MAA8B;YACzD,OAAO,KAAK,CAAC,GAAG,CAAa,UAAG,OAAO,yBAAe,OAAO,CAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QACxF,CAAC;QAED;;;;WAIG;QACH,MAAM,YAAC,OAA8B,EAAE,MAA8B;YACjE,OAAO,KAAK,CAAC,IAAI,CAAW,OAAO,EAAE,OAAO,EAAE,SAAS,aACnD,kBAAkB,EAAE,IAAI,IACrB,CACC,MAAM,IAAI,EAAE,CACf,EACH,CAAC;QACP,CAAC;QAGD;;;;WAIG;QACH,MAAM,YAAC,OAA8B,EAAE,MAA8B;YACjE,OAAO,KAAK,CAAC,GAAG,CAAW,OAAO,EAAE,OAAO,EAAE,SAAS,aAClD,kBAAkB,EAAE,IAAI,IACrB,CACC,MAAM,IAAI,EAAE,CACf,EACH,CAAC;QACP,CAAC;QAED;;;;WAIG;QACH,WAAW,YAAC,OAA8B,EAAE,MAA8B;YACtE,OAAO,KAAK,CAAC,MAAM,CAAO,OAAO,EAAE,OAAO,EAAE,SAAS,aACjD,kBAAkB,EAAE,IAAI,IACrB,CACC,MAAM,IAAI,EAAE,CACf,EACH,CAAC;QACP,CAAC;QAED;;;;WAIG;QACH,IAAI,YAAC,OAAyB,EAAE,MAA8B;YAC1D,OAAO,KAAK,CAAC,GAAG,CAAO,UAAG,OAAO,UAAO,EAAE,OAAO,EAAE,SAAS,aACxD,kBAAkB,EAAE,IAAI,IACrB,CACC,MAAM,IAAI,EAAE,CACf,EACH,CAAC;QACP,CAAC;KACJ,CAAC;AACN,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,KAAiB;IACzC,OAAO,kBAAkB,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;AAC1D,CAAC"}

package/dist/api/domainModel/indexDef.d.ts

@@ -0,0 +1,36 @@
+import type { IAceAxios } from "../../http/IAceAxios";
+import type { AceAxiosRequestConfig } from "../../http/types";
+import type { CreateIndexDefinitionCommand, DeleteIndexCommand, IndexDefinition, UpdateIndexDefinitionCommand } from "../../models/domainModel";
+export declare function useIndexDefinitionApi(axios?: IAceAxios): {
+    /**
+     * 根据ID获取索引定义
+     * @param id 索引定义ID
+     * @param config 请求配置参数
+     */
+    getById(id: string, config?: AceAxiosRequestConfig | undefined): Promise<IndexDefinition>;
+    /**
+     * 获取指定实体下的所有索引定义
+     * @param entityId 实体ID
+     * @param config 请求配置参数
+     */
+    getAll(entityId: string, config?: AceAxiosRequestConfig | undefined): Promise<IndexDefinition[]>;
+    /**
+     * 创建索引定义
+     * @param command 创建索引命令
+     * @param config 请求配置参数
+     */
+    create(command: CreateIndexDefinitionCommand, config?: AceAxiosRequestConfig | undefined): Promise<IndexDefinition>;
+    /**
+     * 更新索引定义
+     * @param command 更新索引命令
+     * @param config 请求配置参数
+     */
+    update(command: UpdateIndexDefinitionCommand, config?: AceAxiosRequestConfig | undefined): Promise<IndexDefinition>;
+    /**
+     * 删除索引定义
+     * @param command 删除索引命令
+     * @param config 请求配置参数
+     */
+    delete(command: DeleteIndexCommand, config?: AceAxiosRequestConfig | undefined): Promise<unknown>;
+};
+//# sourceMappingURL=indexDef.d.ts.map

package/dist/api/domainModel/indexDef.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"indexDef.d.ts","sourceRoot":"","sources":["../../../src/api/domainModel/indexDef.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,KAAK,EACR,4BAA4B,EAC5B,kBAAkB,EAClB,eAAe,EACf,4BAA4B,EAC/B,MAAM,0BAA0B,CAAC;AAuElC,wBAAgB,qBAAqB,CAAC,KAAK,CAAC,EAAE,SAAS;IAjE/C;;;;OAIG;;IAKH;;;;OAIG;;IAKH;;;;OAIG;;IAWH;;;;OAIG;;IAWH;;;;OAIG;;EAeV"}

package/dist/api/domainModel/indexDef.js

@@ -0,0 +1,61 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import { createApiWithCache } from "../apiCache";
+function useIndexDefinitionApiInternal(axios) {
+    var baseUrl = "/ace-domain-modeler/indexes";
+    return {
+        /**
+         * 根据ID获取索引定义
+         * @param id 索引定义ID
+         * @param config 请求配置参数
+         */
+        getById: function (id, config) {
+            return axios.get("".concat(baseUrl, "/by-id/").concat(id), undefined, config);
+        },
+        /**
+         * 获取指定实体下的所有索引定义
+         * @param entityId 实体ID
+         * @param config 请求配置参数
+         */
+        getAll: function (entityId, config) {
+            return axios.get("".concat(baseUrl, "/by-entity/").concat(entityId), undefined, config);
+        },
+        /**
+         * 创建索引定义
+         * @param command 创建索引命令
+         * @param config 请求配置参数
+         */
+        create: function (command, config) {
+            return axios.post("".concat(baseUrl), command, undefined, __assign({ showSuccessMessage: true, popValidationErrorNotification: true }, (config || {})));
+        },
+        /**
+         * 更新索引定义
+         * @param command 更新索引命令
+         * @param config 请求配置参数
+         */
+        update: function (command, config) {
+            return axios.put("".concat(baseUrl), command, undefined, __assign({ showSuccessMessage: true, popValidationErrorNotification: true }, (config || {})));
+        },
+        /**
+         * 删除索引定义
+         * @param command 删除索引命令
+         * @param config 请求配置参数
+         */
+        delete: function (command, config) {
+            return axios.delete("".concat(baseUrl), command, undefined, __assign({ showSuccessMessage: true, popValidationErrorNotification: true }, (config || {})));
+        }
+    };
+}
+export function useIndexDefinitionApi(axios) {
+    return createApiWithCache(useIndexDefinitionApiInternal, axios);
+}
+//# sourceMappingURL=indexDef.js.map

package/dist/api/domainModel/indexDef.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"indexDef.js","sourceRoot":"","sources":["../../../src/api/domainModel/indexDef.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AASjD,SAAS,6BAA6B,CAAC,KAAgB;IACnD,IAAM,OAAO,GAAG,6BAA6B,CAAC;IAC9C,OAAO;QAEH;;;;WAIG;QACH,OAAO,YAAC,EAAU,EAAE,MAA8B;YAC9C,OAAO,KAAK,CAAC,GAAG,CAAkB,UAAG,OAAO,oBAAU,EAAE,CAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QACnF,CAAC;QAED;;;;WAIG;QACH,MAAM,YAAC,QAAgB,EAAE,MAA8B;YACnD,OAAO,KAAK,CAAC,GAAG,CAAoB,UAAG,OAAO,wBAAc,QAAQ,CAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC/F,CAAC;QAED;;;;WAIG;QACH,MAAM,YAAC,OAAqC,EAAE,MAA8B;YACxE,OAAO,KAAK,CAAC,IAAI,CAAkB,UAAG,OAAO,CAAE,EAAE,OAAO,EAAE,SAAS,aAC/D,kBAAkB,EAAE,IAAI,EACxB,8BAA8B,EAAE,IAAI,IACjC,CACC,MAAM,IAAI,EAAE,CACf,EACH,CAAC;QACP,CAAC;QAED;;;;WAIG;QACH,MAAM,YAAC,OAAqC,EAAE,MAA8B;YACxE,OAAO,KAAK,CAAC,GAAG,CAAkB,UAAG,OAAO,CAAE,EAAE,OAAO,EAAE,SAAS,aAC9D,kBAAkB,EAAE,IAAI,EACxB,8BAA8B,EAAE,IAAI,IACjC,CACC,MAAM,IAAI,EAAE,CACf,EACH,CAAC;QACP,CAAC;QAED;;;;WAIG;QACH,MAAM,YAAC,OAA2B,EAAE,MAA8B;YAC9D,OAAO,KAAK,CAAC,MAAM,CAAC,UAAG,OAAO,CAAE,EAAE,OAAO,EAAE,SAAS,aAChD,kBAAkB,EAAE,IAAI,EACxB,8BAA8B,EAAE,IAAI,IACjC,CACC,MAAM,IAAI,EAAE,CACf,EACH,CAAC;QACP,CAAC;KACJ,CAAC;AACN,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAiB;IACnD,OAAO,kBAAkB,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC;AACpE,CAAC"}

package/dist/api/domainModel/query.d.ts

@@ -2,6 +2,34 @@ import type { IAceAxios } from "../../http/IAceAxios";
 import type { AceAxiosRequestConfig } from "../../http/types";
 import type { CreateQueryDefinitionCommand, QueryDefinition, UpdateQueryDefinitionCommand, QueryParamDefinition, UpdateQueryParamDefinitionCommand, CreateQueryParamDefinitionCommand, QueryParamConstraintDefinition, CreateQueryParamConstraintDefinitionCommand, UpdateQueryParamConstraintDefinitionCommand, QueryParamDefinitionReference } from "../../models/domainModel";
 import type { EntityBase } from "../../models/EntityBase";
+export interface ValidateJpqlCommand {
+    jpql: string;
+}
+export interface ValidateJpqlResult {
+    valid: boolean;
+    errorMessage?: string;
+    line?: number;
+    column?: number;
+    errors?: {
+        line: number;
+        column: number;
+        message: string;
+    }[];
+}
+export interface JpqlCodeCompleteCommand {
+    jpql: string;
+    position: number;
+    appName?: string;
+}
+export interface CompletionItem {
+    label: string;
+    kind: string;
+    detail?: string;
+    insertText: string;
+}
+export interface JpqlCodeCompleteResult {
+    suggestions: CompletionItem[];
+}
 /**
  * 命令定义API
  * @param axios axios对象
@@ -120,5 +148,17 @@ export declare function useQueryApi(axios?: IAceAxios): {
      * @param config 请求配置参数
      */
     batchUpdateConstraints(param: QueryParamDefinitionReference, createCommands: CreateQueryParamConstraintDefinitionCommand[], updateCommands: UpdateQueryParamConstraintDefinitionCommand[], deleteCommands: EntityBase[], config?: AceAxiosRequestConfig | undefined): Promise<QueryParamConstraintDefinition>;
+    /**
+     * 验证JPQL
+     * @param command 验证命令
+     * @param config 请求配置参数
+     */
+    validateJpql(command: ValidateJpqlCommand, config?: AceAxiosRequestConfig | undefined): Promise<ValidateJpqlResult>;
+    /**
+     * JPQL 代码补全
+     * @param command
+     * @param config
+     */
+    codeComplete(command: JpqlCodeCompleteCommand, config?: AceAxiosRequestConfig | undefined): Promise<JpqlCodeCompleteResult>;
 };
 //# sourceMappingURL=query.d.ts.map

package/dist/api/domainModel/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/api/domainModel/query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAEpD,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EACR,4BAA4B,EAC5B,eAAe,EACf,4BAA4B,EAC5B,oBAAoB,EACpB,iCAAiC,EACjC,iCAAiC,EACjC,8BAA8B,EAC9B,2CAA2C,EAC3C,2CAA2C,EAC3C,6BAA6B,EAChC,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,yBAAyB,CAAC;AA6NxD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,KAAK,CAAC,EAAE,SAAS;IA3NrC;;;;;OAKG;;IAIH;;;;OAIG;;IAKH;;;;OAIG;;IAKH;;;;;OAKG;;IASH;;;;;OAKG;;IASH;;;;;;OAMG;;IAUH;;;;;OAKG;;IAIH;;;;OAIG;;IAKH;;;;;OAKG;;IASH;;;;;OAKG;;IASH;;;;;;OAMG;;IAUH;;;;OAIG;;IAKH;;;;;OAKG;;IASH;;;;;OAKG;;IASH;;;;;;OAMG;;IAUH;;;;;;;OAOG;;EA4BV"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/api/domainModel/query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAEpD,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EACR,4BAA4B,EAC5B,eAAe,EACf,4BAA4B,EAC5B,oBAAoB,EACpB,iCAAiC,EACjC,iCAAiC,EACjC,8BAA8B,EAC9B,2CAA2C,EAC3C,2CAA2C,EAC3C,6BAA6B,EAChC,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,yBAAyB,CAAC;AAExD,MAAM,WAAW,mBAAmB;IAChC,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,kBAAkB;IAC/B,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;KACnB,EAAE,CAAC;CACP;AAED,MAAM,WAAW,uBAAuB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE,cAAc,EAAE,CAAC;CACjC;AA6OD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,KAAK,CAAC,EAAE,SAAS;IA3OrC;;;;;OAKG;;IAIH;;;;OAIG;;IAKH;;;;OAIG;;IAKH;;;;;OAKG;;IASH;;;;;OAKG;;IASH;;;;;;OAMG;;IAUH;;;;;OAKG;;IAIH;;;;OAIG;;IAKH;;;;;OAKG;;IASH;;;;;OAKG;;IASH;;;;;;OAMG;;IAUH;;;;OAIG;;IAKH;;;;;OAKG;;IASH;;;;;OAKG;;IASH;;;;;;OAMG;;IAUH;;;;;;;OAOG;;IAmBH;;;;OAIG;;IAIH;;;;OAIG;;EAaV"}

package/dist/api/domainModel/query.js

@@ -163,6 +163,22 @@ function useQueryApiInternal(axios) {
                 deleteCommands: deleteCommands
             }, undefined, __assign({ showSuccessMessage: true }, (config || {})));
         },
+        /**
+         * 验证JPQL
+         * @param command 验证命令
+         * @param config 请求配置参数
+         */
+        validateJpql: function (command, config) {
+            return axios.post("".concat(baseUrl, "/validate-jpql"), command, undefined, config);
+        },
+        /**
+         * JPQL 代码补全
+         * @param command
+         * @param config
+         */
+        codeComplete: function (command, config) {
+            return axios.post("".concat(baseUrl, "/code-complete"), command, undefined, config);
+        },
     };
 }
 /**

package/dist/api/domainModel/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/api/domainModel/query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/api/domainModel/query.ts"],"names":[],"mappings":"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"}

package/dist/api/orgService/group.d.ts

@@ -1,6 +1,6 @@
 import type { MergedRole, GrantRoleToGroupsCommand, RevokeRoleFromGroupsCommand } from "../../models/orgService/Role";
 import type { IAceAxios } from "../../http/IAceAxios";
-import type { Group, MoveGroupCommand, UpdateGroupCommand, CreateGroupCommand, ProjectedGroup, GrantRolesToGroupCommand, RevokeRolesFromGroupCommand, DeleteGroupCommand } from "../../models/orgService/Group";
+import type { Group, MoveGroupCommand, UpdateGroupCommand, CreateGroupCommand, ProjectedGroup, GrantRolesToGroupCommand, RevokeRolesFromGroupCommand, DeleteGroupCommand, UpdateGroupRolesCommand } from "../../models/orgService/Group";
 import type { AceAxiosRequestConfig } from "../../http/types";
 declare function useUserGroupApiInternal(axios: IAceAxios): {
     /**
@@ -9,13 +9,22 @@ declare function useUserGroupApiInternal(axios: IAceAxios): {
      * @param realmId
      * @param config 请求配置参数
      */
-    getByAppIdAndRealm(appId: string, realmId: string, config?: AceAxiosRequestConfig): Promise<ProjectedGroup[]>;
+    getAll(appId: string, realmId: string, config?: AceAxiosRequestConfig): Promise<ProjectedGroup[]>;
+    /**
+     * 获取应用下所有用户组列表。
+     * @param appId
+     * @param realmId
+     * @param category 业务分类
+     * @param config 请求配置参数
+     */
+    getByAppIdAndRealm(appId: string, realmId: string, category?: string, config?: AceAxiosRequestConfig): Promise<ProjectedGroup[]>;
     /**
      * 获取全局用户组
      * @param realmId 用户域id
+     * @param category 组分类
      * @param config 请求配置参数
      */
-    getGlobalGroups(realmId: string, config?: AceAxiosRequestConfig): Promise<ProjectedGroup[]>;
+    getGlobalGroups(realmId: string, category?: string, config?: AceAxiosRequestConfig): Promise<ProjectedGroup[]>;
     /**
      * 根据ID获取用户组信息信息。
      * 需要角色：管理员 | 安全员
@@ -65,6 +74,13 @@ declare function useUserGroupApiInternal(axios: IAceAxios): {
      * @param config 请求配置参数
      */
     revokeRolesFromGroup(command: RevokeRolesFromGroupCommand, config?: AceAxiosRequestConfig): Promise<Group>;
+    /**
+     * 修改用户组关联角色
+     * 需要角色：安全员
+     * @param command 删除用户组角色命令
+     * @param config 请求配置参数
+     */
+    updateGroupRoles(command: UpdateGroupRolesCommand, config?: AceAxiosRequestConfig): Promise<Group>;
     /**
      * 将指定角色授予多个用户组。
      * 需要角色：安全员
@@ -95,9 +111,11 @@ declare function useUserGroupApiInternal(axios: IAceAxios): {
     /**
      * 获取指定用户组的角色集合
      * @param groupId 用户组id
+     * @param appName 应用名
+     * @param category 角色业务类别
      * @param config 请求配置参数
      */
-    getRoles(groupId: string, config?: AceAxiosRequestConfig): Promise<{
+    getRoles(groupId: string, appName: string, category?: string, config?: AceAxiosRequestConfig): Promise<{
         /**
          * 应用Id
          */
@@ -120,13 +138,22 @@ export declare function useUserGroupApi(axios?: IAceAxios): {
      * @param realmId
      * @param config 请求配置参数
      */
-    getByAppIdAndRealm(appId: string, realmId: string, config?: AceAxiosRequestConfig | undefined): Promise<ProjectedGroup[]>;
+    getAll(appId: string, realmId: string, config?: AceAxiosRequestConfig | undefined): Promise<ProjectedGroup[]>;
+    /**
+     * 获取应用下所有用户组列表。
+     * @param appId
+     * @param realmId
+     * @param category 业务分类
+     * @param config 请求配置参数
+     */
+    getByAppIdAndRealm(appId: string, realmId: string, category?: string | undefined, config?: AceAxiosRequestConfig | undefined): Promise<ProjectedGroup[]>;
     /**
      * 获取全局用户组
      * @param realmId 用户域id
+     * @param category 组分类
      * @param config 请求配置参数
      */
-    getGlobalGroups(realmId: string, config?: AceAxiosRequestConfig | undefined): Promise<ProjectedGroup[]>;
+    getGlobalGroups(realmId: string, category?: string | undefined, config?: AceAxiosRequestConfig | undefined): Promise<ProjectedGroup[]>;
     /**
      * 根据ID获取用户组信息信息。
      * 需要角色：管理员 | 安全员
@@ -176,6 +203,13 @@ export declare function useUserGroupApi(axios?: IAceAxios): {
      * @param config 请求配置参数
      */
     revokeRolesFromGroup(command: RevokeRolesFromGroupCommand, config?: AceAxiosRequestConfig | undefined): Promise<Group>;
+    /**
+     * 修改用户组关联角色
+     * 需要角色：安全员
+     * @param command 删除用户组角色命令
+     * @param config 请求配置参数
+     */
+    updateGroupRoles(command: UpdateGroupRolesCommand, config?: AceAxiosRequestConfig | undefined): Promise<Group>;
     /**
      * 将指定角色授予多个用户组。
      * 需要角色：安全员
@@ -206,9 +240,11 @@ export declare function useUserGroupApi(axios?: IAceAxios): {
     /**
      * 获取指定用户组的角色集合
      * @param groupId 用户组id
+     * @param appName 应用名
+     * @param category 角色业务类别
      * @param config 请求配置参数
      */
-    getRoles(groupId: string, config?: AceAxiosRequestConfig | undefined): Promise<{
+    getRoles(groupId: string, appName: string, category?: string | undefined, config?: AceAxiosRequestConfig | undefined): Promise<{
         /**
          * 应用Id
          */

package/dist/api/orgService/group.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"group.d.ts","sourceRoot":"","sources":["../../../src/api/orgService/group.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,UAAU,EACV,wBAAwB,EACxB,2BAA2B,EAC9B,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EACR,KAAK,EACL,gBAAgB,EAChB,kBAAkB,EAClB,kBAAkB,EAClB,cAAc,EACd,wBAAwB,EACxB,2BAA2B,EAC3B,kBAAkB,EACrB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,kBAAkB,CAAC;AAE5D,iBAAS,uBAAuB,CAAC,KAAK,EAAE,SAAS;IAGzC;;;;;OAKG;8BACuB,MAAM,WAAW,MAAM,WAAW,qBAAqB;IAGjF;;;;OAIG;6BACsB,MAAM,WAAW,qBAAqB;IAG/D;;;;;OAKG;gBACS,MAAM,WAAW,qBAAqB;IAGlD;;;;;OAKG;sBACe,MAAM,WAAW,MAAM,WAAW,qBAAqB;IAGzE;;;;;OAKG;oBACa,kBAAkB,WAAW,qBAAqB;IAMlE;;;;;OAKG;oBACa,kBAAkB,WAAW,qBAAqB;IAMlE;;;;;OAKG;kBACW,gBAAgB,WAAW,qBAAqB;IAO9D;;;;;OAKG;+BACwB,wBAAwB,WAAW,qBAAqB;IAOnF;;;;;OAKG;kCAC2B,2BAA2B,WAAW,qBAAqB;IAOzF;;;;;OAKG;+BACwB,wBAAwB,WAAW,qBAAqB;IAOnF;;;;;OAKG;kCAC2B,2BAA2B,WAAW,qBAAqB;IAOzF;;;;;OAKG;oBACa,kBAAkB,WAAW,qBAAqB;IAOlE;;;;OAIG;4BACqB,MAAM,WAAW,qBAAqB;IAG9D;;;;OAIG;sBACe,MAAM,WAAW,qBAAqB;QAG5C;;WAEG;eACI,MAAM;cACP,MAAM;QACZ;;WAEG;YACC,MAAM;;EAK7B;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,SAAS;IA5KzC;;;;;OAKG;;IAIH;;;;OAIG;;IAIH;;;;;OAKG;;IAIH;;;;;OAKG;;IAIH;;;;;OAKG;;IAOH;;;;;OAKG;;IAOH;;;;;OAKG;;IAQH;;;;;OAKG;;IAQH;;;;;OAKG;;IAQH;;;;;OAKG;;IAQH;;;;;OAKG;;IAQH;;;;;OAKG;;IAQH;;;;OAIG;;IAIH;;;;OAIG;;QAIS;;WAEG;;;QAGH;;WAEG;;;EActB;AAED,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC"}
+{"version":3,"file":"group.d.ts","sourceRoot":"","sources":["../../../src/api/orgService/group.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,UAAU,EACV,wBAAwB,EACxB,2BAA2B,EAC9B,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EACR,KAAK,EACL,gBAAgB,EAChB,kBAAkB,EAClB,kBAAkB,EAClB,cAAc,EACd,wBAAwB,EACxB,2BAA2B,EAC3B,kBAAkB,EAAE,uBAAuB,EAC9C,MAAM,+BAA+B,CAAC;AAEvC,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,kBAAkB,CAAC;AAE5D,iBAAS,uBAAuB,CAAC,KAAK,EAAE,SAAS;IAGzC;;;;;OAKG;kBACW,MAAM,WAAW,MAAM,WAAW,qBAAqB;IAIrE;;;;;;OAMG;8BACuB,MAAM,WAAW,MAAM,aAAa,MAAM,WAAW,qBAAqB;IAMpG;;;;;OAKG;6BACsB,MAAM,aAAa,MAAM,WAAW,qBAAqB;IAMlF;;;;;OAKG;gBACS,MAAM,WAAW,qBAAqB;IAGlD;;;;;OAKG;sBACe,MAAM,WAAW,MAAM,WAAW,qBAAqB;IAGzE;;;;;OAKG;oBACa,kBAAkB,WAAW,qBAAqB;IAMlE;;;;;OAKG;oBACa,kBAAkB,WAAW,qBAAqB;IAMlE;;;;;OAKG;kBACW,gBAAgB,WAAW,qBAAqB;IAO9D;;;;;OAKG;+BACwB,wBAAwB,WAAW,qBAAqB;IAOnF;;;;;OAKG;kCAC2B,2BAA2B,WAAW,qBAAqB;IAQzF;;;;;OAKG;8BACuB,uBAAuB,WAAW,qBAAqB;IAOjF;;;;;OAKG;+BACwB,wBAAwB,WAAW,qBAAqB;IAOnF;;;;;OAKG;kCAC2B,2BAA2B,WAAW,qBAAqB;IAOzF;;;;;OAKG;oBACa,kBAAkB,WAAW,qBAAqB;IAOlE;;;;OAIG;4BACqB,MAAM,WAAW,qBAAqB;IAG9D;;;;;;OAMG;sBACe,MAAM,WAAW,MAAM,aAAY,MAAM,WAAW,qBAAqB;QAI3E;;WAEG;eACI,MAAM;cACP,MAAM;QACZ;;WAEG;YACC,MAAM;;EAoBjC;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,SAAS;IA9NzC;;;;;OAKG;;IAKH;;;;;;OAMG;;IAOH;;;;;OAKG;;IAOH;;;;;OAKG;;IAIH;;;;;OAKG;;IAIH;;;;;OAKG;;IAOH;;;;;OAKG;;IAOH;;;;;OAKG;;IAQH;;;;;OAKG;;IAQH;;;;;OAKG;;IASH;;;;;OAKG;;IAQH;;;;;OAKG;;IAQH;;;;;OAKG;;IAQH;;;;;OAKG;;IAQH;;;;OAIG;;IAIH;;;;;;OAMG;;QAKa;;WAEG;;;QAGH;;WAEG;;;EA6B1B;AAED,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC"}

package/dist/api/orgService/group.js

@@ -19,16 +19,33 @@ function useUserGroupApiInternal(axios) {
          * @param realmId
          * @param config 请求配置参数
          */
-        getByAppIdAndRealm: function (appId, realmId, config) {
-            return axios.get("".concat(baseUrl, "/byApp/").concat(realmId, "/").concat(appId), undefined, config);
+        getAll: function (appId, realmId, config) {
+            return axios.get("".concat(baseUrl, "/byApp/").concat(realmId, "/").concat(appId, "/"), undefined, config);
+        },
+        /**
+         * 获取应用下所有用户组列表。
+         * @param appId
+         * @param realmId
+         * @param category 业务分类
+         * @param config 请求配置参数
+         */
+        getByAppIdAndRealm: function (appId, realmId, category, config) {
+            if (category && category.length > 0) {
+                return axios.get("".concat(baseUrl, "/byApp/").concat(realmId, "/").concat(appId, "/").concat(category), undefined, config);
+            }
+            return axios.get("".concat(baseUrl, "/byApp/").concat(realmId, "/").concat(appId, "/"), undefined, config);
         },
         /**
          * 获取全局用户组
          * @param realmId 用户域id
+         * @param category 组分类
          * @param config 请求配置参数
          */
-        getGlobalGroups: function (realmId, config) {
-            return axios.get("".concat(baseUrl, "/global/").concat(realmId), undefined, config);
+        getGlobalGroups: function (realmId, category, config) {
+            if (category && category.length > 0) {
+                return axios.get("".concat(baseUrl, "/global/").concat(realmId, "/").concat(category), undefined, config);
+            }
+            return axios.get("".concat(baseUrl, "/global/").concat(realmId, "/"), undefined, config);
         },
         /**
          * 根据ID获取用户组信息信息。
@@ -93,6 +110,15 @@ function useUserGroupApiInternal(axios) {
         revokeRolesFromGroup: function (command, config) {
             return axios.delete("".concat(baseUrl, "/roles"), command, undefined, __assign({ popValidationErrorNotification: true, showSuccessMessage: true }, (config || {})));
         },
+        /**
+         * 修改用户组关联角色
+         * 需要角色：安全员
+         * @param command 删除用户组角色命令
+         * @param config 请求配置参数
+         */
+        updateGroupRoles: function (command, config) {
+            return axios.put("".concat(baseUrl, "/roles"), command, undefined, __assign({ popValidationErrorNotification: true, showSuccessMessage: true }, (config || {})));
+        },
         /**
          * 将指定角色授予多个用户组。
          * 需要角色：安全员
@@ -131,10 +157,17 @@ function useUserGroupApiInternal(axios) {
         /**
          * 获取指定用户组的角色集合
          * @param groupId 用户组id
+         * @param appName 应用名
+         * @param category 角色业务类别
          * @param config 请求配置参数
          */
-        getRoles: function (groupId, config) {
-            return axios.get("".concat(baseUrl, "/roles/").concat(groupId), undefined, config);
+        getRoles: function (groupId, appName, category, config) {
+            if (category) {
+                return axios.get("".concat(baseUrl, "/roles/").concat(groupId, "/").concat(appName, "/").concat(category), undefined, config);
+            }
+            else {
+                return axios.get("".concat(baseUrl, "/roles/").concat(groupId, "/").concat(appName), undefined, config);
+            }
         },
     };
 }

package/dist/api/orgService/group.js.map

@@ -1 +1 @@
-{"version":3,"file":"group.js","sourceRoot":"","sources":["../../../src/api/orgService/group.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"group.js","sourceRoot":"","sources":["../../../src/api/orgService/group.ts"],"names":[],"mappings":"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"}

package/dist/api/orgService/resourceScope.d.ts

@@ -0,0 +1,40 @@
+import type { IAceAxios } from "../../http/IAceAxios";
+import type { AceAxiosRequestConfig } from "../../http/types";
+import type { User, UserReference } from "../../models/orgService/User";
+export declare function useResourceScopeApi(axios: IAceAxios): {
+    /**
+     * 切换当前会话资源域
+     * @param scope 资源域
+     * @param config 请求配置参数
+     */
+    setCurrentScope(scope: string, config?: AceAxiosRequestConfig | undefined): Promise<User>;
+    /**
+     * 获取当前会话资源域
+     * @param config 请求配置参数
+     */
+    getCurrentScope(config?: AceAxiosRequestConfig | undefined): Promise<string>;
+    /**
+     * 设定用户在指定资源域下的用户组集合
+     * @param userId 用户ID
+     * @param resourceScope 资源域
+     * @param groupKeys 用户组标识集合
+     * @param config 请求配置参数
+     */
+    setResourceScopeGroups(userId: string, resourceScope: string, groupKeys: string[], config?: AceAxiosRequestConfig | undefined): Promise<void>;
+    /**
+     * 获取指定资源域下的指定组的关联用户集合
+     * @param groupKey 用户组标识
+     * @param resourceScope 资源域
+     * @param config 请求配置参数
+     */
+    getScopeGroupUsers(groupKey: string, resourceScope: string, config?: AceAxiosRequestConfig | undefined): Promise<UserReference[]>;
+    /**
+     * 设定指定资源域下的用户组的成员集合
+     * @param groupKey 用户组标识
+     * @param resourceScope 资源域
+     * @param userIds 用户ID集合
+     * @param config 请求配置参数
+     */
+    setResourceScopeGroupMembers(groupKey: string, resourceScope: string, userIds: string[], config?: AceAxiosRequestConfig | undefined): Promise<void>;
+};
+//# sourceMappingURL=resourceScope.d.ts.map

package/dist/api/orgService/resourceScope.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resourceScope.d.ts","sourceRoot":"","sources":["../../../src/api/orgService/resourceScope.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAEpD,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAC,IAAI,EAAE,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAwDtE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,SAAS;IAnD5C;;;;OAIG;;IAKH;;;OAGG;;IAKH;;;;;;OAMG;;IAKH;;;;;OAKG;;IAKH;;;;;;OAMG;;EASV"}

package/dist/api/orgService/resourceScope.js

@@ -0,0 +1,54 @@
+import { createApiWithCache } from "../apiCache";
+function useResourceScopeApiInternal(axios) {
+    var baseUrl = "/ace-app-service/resource-scopes";
+    return {
+        /**
+         * 切换当前会话资源域
+         * @param scope 资源域
+         * @param config 请求配置参数
+         */
+        setCurrentScope: function (scope, config) {
+            return axios.put("".concat(baseUrl, "/current"), scope, undefined, config);
+        },
+        /**
+         * 获取当前会话资源域
+         * @param config 请求配置参数
+         */
+        getCurrentScope: function (config) {
+            return axios.get("".concat(baseUrl, "/current"), undefined, config);
+        },
+        /**
+         * 设定用户在指定资源域下的用户组集合
+         * @param userId 用户ID
+         * @param resourceScope 资源域
+         * @param groupKeys 用户组标识集合
+         * @param config 请求配置参数
+         */
+        setResourceScopeGroups: function (userId, resourceScope, groupKeys, config) {
+            return axios.put("".concat(baseUrl, "/").concat(resourceScope, "/users/").concat(userId, "/groups"), groupKeys, undefined, config);
+        },
+        /**
+         * 获取指定资源域下的指定组的关联用户集合
+         * @param groupKey 用户组标识
+         * @param resourceScope 资源域
+         * @param config 请求配置参数
+         */
+        getScopeGroupUsers: function (groupKey, resourceScope, config) {
+            return axios.get("".concat(baseUrl, "/").concat(resourceScope, "/groups/").concat(groupKey, "/users"), undefined, config);
+        },
+        /**
+         * 设定指定资源域下的用户组的成员集合
+         * @param groupKey 用户组标识
+         * @param resourceScope 资源域
+         * @param userIds 用户ID集合
+         * @param config 请求配置参数
+         */
+        setResourceScopeGroupMembers: function (groupKey, resourceScope, userIds, config) {
+            return axios.put("".concat(baseUrl, "/").concat(resourceScope, "/groups/").concat(groupKey, "/users"), userIds, undefined, config);
+        }
+    };
+}
+export function useResourceScopeApi(axios) {
+    return createApiWithCache(useResourceScopeApiInternal, axios);
+}
+//# sourceMappingURL=resourceScope.js.map

package/dist/api/orgService/resourceScope.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resourceScope.js","sourceRoot":"","sources":["../../../src/api/orgService/resourceScope.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,kBAAkB,EAAC,MAAM,aAAa,CAAC;AAI/C,SAAS,2BAA2B,CAAC,KAAgB;IACjD,IAAM,OAAO,GAAG,kCAAkC,CAAC;IACnD,OAAO;QACH;;;;WAIG;QACH,eAAe,YAAC,KAAa,EAAE,MAA8B;YACzD,OAAO,KAAK,CAAC,GAAG,CAAO,UAAG,OAAO,aAAU,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC3E,CAAC;QAED;;;WAGG;QACH,eAAe,YAAC,MAA8B;YAC1C,OAAO,KAAK,CAAC,GAAG,CAAS,UAAG,OAAO,aAAU,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QACtE,CAAC;QAED;;;;;;WAMG;QACH,sBAAsB,YAAC,MAAc,EAAE,aAAqB,EAAE,SAAmB,EAAE,MAA8B;YAC7G,OAAO,KAAK,CAAC,GAAG,CAAO,UAAG,OAAO,cAAI,aAAa,oBAAU,MAAM,YAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC/G,CAAC;QAED;;;;;WAKG;QACH,kBAAkB,YAAC,QAAgB,EAAE,aAAqB,EAAE,MAA8B;YACtF,OAAO,KAAK,CAAC,GAAG,CAAkB,UAAG,OAAO,cAAI,aAAa,qBAAW,QAAQ,WAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QACjH,CAAC;QAED;;;;;;WAMG;QACH,4BAA4B,YAAC,QAAgB,EAAE,aAAqB,EAAE,OAAiB,EAAE,MAA8B;YACnH,OAAO,KAAK,CAAC,GAAG,CAAO,UAAG,OAAO,cAAI,aAAa,qBAAW,QAAQ,WAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC/G,CAAC;KACJ,CAAC;AACN,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAAgB;IAChD,OAAO,kBAAkB,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAA;AACjE,CAAC"}

package/dist/api/orgService/role.d.ts

@@ -14,16 +14,24 @@ export declare function useRoleApi(axios?: IAceAxios): {
     getById(id: string, config?: AceAxiosRequestConfig | undefined): Promise<Role>;
     /**
      * 获取指定应用下所有角色
-     * @param appId
+     * @param appId 应用ID
      * @param config 请求配置参数
      */
     getAllRole(appId: string, config?: AceAxiosRequestConfig | undefined): Promise<ProjectedRole[]>;
+    /**
+     * 获取应用下指定分类的所有角色
+     * @param appId 应用ID
+     * @param category 业务分类
+     * @param config 请求配置参数
+     */
+    getByCategoryWithChildren(appId: string, category?: string | undefined, config?: AceAxiosRequestConfig | undefined): Promise<ProjectedRole[]>;
     /**
      * 获取指定应用下所有根角色
      * @param appId
+     * @param category 角色分类
      * @param config 请求配置参数
      */
-    getRoots(appId: string, config?: AceAxiosRequestConfig | undefined): Promise<ProjectedRole[]>;
+    getRoots(appId: string, category?: string | undefined, config?: AceAxiosRequestConfig | undefined): Promise<ProjectedRole[]>;
     /**
      * 获取指定父角色下的所有子角色
      * @param parentId 父角色ID

package/dist/api/orgService/role.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"role.d.ts","sourceRoot":"","sources":["../../../src/api/orgService/role.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EACR,aAAa,EACb,IAAI,EACJ,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,EACf,uBAAuB,EACvB,0BAA0B,EAC1B,iBAAiB,EACpB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AA4G9D;;;GAGG;AACH,wBAAgB,UAAU,CAAC,KAAK,CAAC,EAAE,SAAS;IA3GpC;;;;OAIG;;IAIH;;;;OAIG;;IAIH;;;;OAIG;;IAIH;;;;OAIG;;IAIH;;;;;OAKG;;IAMH;;;;;OAKG;;IAMH;;;;;OAKG;;IAOH;;;;;OAKG;;IAOH;;;;OAIG;;IAOH;;;;;OAKG;;EAeV;AAED,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC"}
+{"version":3,"file":"role.d.ts","sourceRoot":"","sources":["../../../src/api/orgService/role.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EACR,aAAa,EACb,IAAI,EACJ,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,EACf,uBAAuB,EACvB,0BAA0B,EAC1B,iBAAiB,EACpB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AA4H9D;;;GAGG;AACH,wBAAgB,UAAU,CAAC,KAAK,CAAC,EAAE,SAAS;IA3HpC;;;;OAIG;;IAIH;;;;OAIG;;IAIH;;;;;OAKG;;IAOH;;;;;OAKG;;IAOH;;;;OAIG;;IAIH;;;;;OAKG;;IAMH;;;;;OAKG;;IAMH;;;;;OAKG;;IAOH;;;;;OAKG;;IAOH;;;;OAIG;;IAOH;;;;;OAKG;;EAeV;AAED,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC"}