@baosight/er4j 0.0.16 → 0.0.18

package/er4j-dist/types/components/ErGridCellRender/ButtonGroup.vue.d.ts

@@ -786,6 +786,7 @@ declare const _default: import('vue').DefineComponent<{
             };
         };
     }>;
+    columnConfig: any;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<{
     params?: any;
 }> & Readonly<{}>, {}, {}, {

package/er4j-dist/types/type/er-type.d.ts

@@ -2,11 +2,13 @@ export interface DialogResult {
     result: 'ok' | 'cancel' | 'yes' | 'no' | 'none';
     context?: any;
 }
+/**
+ * 加载提示框选项
+ */
 export interface LoadingOptions {
-    show: boolean;
-    target?: string;
-    showAnimation?: boolean;
-    ms?: number;
+    show?: boolean;
+    tip?: string;
+    delay?: number;
 }
 /**
  * ErPopFree组件返回参数

package/er4j-dist/types/utils/er.d.ts

@@ -1,5 +1,5 @@
 import { ResponseType } from 'axios';
-import { DataTableOptions, DataTableSchemaFields, DataTableSchemaField, DialogResult, PopQueryReturnInfo, PopFreeReturnInfo, PopWindowReturnInfo, PopTreeReturnInfo, PopFormReturnInfo, GetGridRowsType } from '../type/er-type';
+import { DataTableOptions, DataTableSchemaFields, DataTableSchemaField, DialogResult, PopQueryReturnInfo, PopFreeReturnInfo, PopWindowReturnInfo, PopTreeReturnInfo, PopFormReturnInfo, LoadingOptions, GetGridRowsType } from '../type/er-type';
 import { EiInfo, EiBlock } from '@eplat/ei';
 import { ColDef, ColumnApi, GridApi, RowPinnedType } from '@ag-grid-community/core';
 import { Dayjs } from 'dayjs';
@@ -1148,7 +1148,7 @@ export declare namespace ER {
          * @param tableName 相关表
          * @returns Promise EiInfo
          */
-        static queryDataByService(partition: string, svcName: string, paras?: {
+        static queryDataByService(svcName: string, paras?: {
             queryFilter?: {
                 ITEM_CODE: string;
                 FIELD_NAME: string;
@@ -1332,11 +1332,7 @@ export declare namespace ER {
          * @param serviceTransformer 请求/响应数据处理回调函数
          * @returns Promise EiInfo
          */
-        static callService(svcName: string, data: EiInfo, loadingOptions?: {
-            show?: boolean;
-            tip?: string;
-            delay?: number;
-        }, options?: CallServiceOptions): Promise<EiInfo>;
+        static callService(svcName: string, data: EiInfo, loadingOptions?: LoadingOptions, options?: CallServiceOptions): Promise<EiInfo>;
     }
     class SysInfo {
         /**
@@ -3101,6 +3097,41 @@ export declare namespace ER {
             clearTable?: true;
             showLoading?: boolean;
         }, serviceName?: string): Promise<EiInfo>;
+        /**
+         * 查询数据并合并到Grid
+         * @param serviceName 服务名称
+         * @param filterConfId 过滤配置ID
+         * @param gridConfId Grid配置ID
+         * @param options 选项
+         */
+        queryDataToGrid(serviceName: string, filterConfId: string, gridConfId: string, options?: {
+            processInInfo?: (inInfo: EiInfo) => EiInfo;
+            mergeToGrid?: (outInfo: EiInfo) => void;
+            loadingOptions?: LoadingOptions;
+            callServiceOptions?: CallServiceOptions;
+            filterBlockId?: string;
+            gridBlockId?: string;
+        }): Promise<void>;
+        /**
+         * 保存Grid数据
+         * @param saveSerivce 保存服务
+         * @param filterConfId 过滤配置ID
+         * @param gridConfId Grid配置ID
+         * @param options 选项
+         */
+        saveGridData(saveSerivce: string | {
+            insertService: string;
+            updateService: string;
+            deleteService: string;
+        }, filterConfId: string, gridConfId: string, options?: {
+            processInInfo?: (inInfo: EiInfo) => EiInfo;
+            messageConfirm?: boolean | string;
+            loadingOptions?: LoadingOptions;
+            callServiceOptions?: CallServiceOptions;
+            queryService?: string;
+            filterBlockId?: string;
+            gridBlockId?: string;
+        }): Promise<unknown>;
         /**
          * 获取画面配置代码对应的SQL条件脚本
          * @param codeClass 代码定义
@@ -3568,11 +3599,7 @@ export declare namespace ER {
          * @param partition 分区
          * @returns Promise<EiInfo>
          */
-        callService(svcName: string, data: EiInfo, loadingOptions?: {
-            show?: boolean;
-            tip?: string;
-            delay?: number;
-        }, options?: CallServiceOptions): Promise<EiInfo>;
+        callService(svcName: string, data: EiInfo, loadingOptions?: LoadingOptions, options?: CallServiceOptions): Promise<EiInfo>;
         /**
          * 动态SQL查询
          * @param svcName 自定义服务名称，传空时默认系统服务
@@ -3932,7 +3959,7 @@ export declare namespace ER {
          */
         initialGridToolbar(configId: string, buttonOptions: {
             [key: string]: {
-                visible: boolean;
+                visible?: boolean;
                 caption?: string;
                 ico?: any;
                 action?: Function;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baosight/er4j",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "er4j 辅助开发",
   "private": false,
   "type": "module",