@baosight/er4j 0.0.69 → 0.0.70

package/er4j-dist/types/locales/erLocale/locale.ar.d.ts

@@ -269,6 +269,7 @@ declare const _default: {
         ErLayout: {
             Query: string;
             Expand: string;
+            Collapse: string;
             SaveLayoutConfirmMessage: string;
             SaveLayoutSuccessMessage: string;
             CopyLabel: string;

package/er4j-dist/types/locales/erLocale/locale.en.d.ts

@@ -269,6 +269,7 @@ declare const _default: {
         ErLayout: {
             Query: string;
             Expand: string;
+            Collapse: string;
             SaveLayoutConfirmMessage: string;
             SaveLayoutSuccessMessage: string;
             CopyLabel: string;

package/er4j-dist/types/locales/erLocale/locale.id.d.ts

@@ -269,6 +269,7 @@ declare const _default: {
         ErLayout: {
             Query: string;
             Expand: string;
+            Collapse: string;
             SaveLayoutConfirmMessage: string;
             SaveLayoutSuccessMessage: string;
             CopyLabel: string;

package/er4j-dist/types/locales/erLocale/locale.zh_Hans.d.ts

@@ -269,6 +269,7 @@ declare const _default: {
         ErLayout: {
             Query: string;
             Expand: string;
+            Collapse: string;
             SaveLayoutConfirmMessage: string;
             SaveLayoutSuccessMessage: string;
             CopyLabel: string;

package/er4j-dist/types/locales/erLocale/locale.zh_Hant.d.ts

@@ -269,6 +269,7 @@ declare const _default: {
         ErLayout: {
             Query: string;
             Expand: string;
+            Collapse: string;
             SaveLayoutConfirmMessage: string;
             SaveLayoutSuccessMessage: string;
             CopyLabel: string;

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

@@ -429,6 +429,7 @@ export declare namespace ER {
         open: string;
         beforeQuery: string;
         query: string;
+        afterQuery: string;
         beforeOk: string;
         ok: string;
         beforeCancel: string;
@@ -1264,6 +1265,20 @@ export declare namespace ER {
          * @param block
          * @returns EiBlock
          */
+        static addJsonToEiBlock(data: {
+            [key: string]: any;
+        }[], block?: any): EiBlock;
+        /**
+         * 添加自定义查询条件配置[后台服务需支持]
+         * @param customFilter 查询条件脚本(字符串或对象数组,operator默认=)
+         * @param queryEiInfo 查询条件配置
+         * @returns void
+         */
+        static addCustomFilterToQueryFilter(customFilter: string | {
+            fieldName: string;
+            value: any;
+            operator?: string;
+        }[], queryEiInfo: EiInfo): void;
         /**
          * 动态SQL查询
          * @param partition 服务分区
@@ -1357,6 +1372,26 @@ export declare namespace ER {
             type: 'info' | 'success' | 'warning' | 'error';
             autoHideAfter?: number;
         }, modal?: boolean): void;
+        /**
+         * 打印日志
+         * @param args 日志内容
+         */
+        static log(...args: any[]): void;
+        /**
+         * 打印错误日志
+         * @param args 日志内容
+         */
+        static error(...args: any[]): void;
+        /**
+         * 打印警告日志
+         * @param args 日志内容
+         */
+        static warn(...args: any[]): void;
+        /**
+         * 打印调试日志
+         * @param args 日志内容
+         */
+        static debug(...args: any[]): void;
         /**
          * 在页面上侧中间显示提示信息栏[2000ms后自动消失]
          * @param text 显示文本内容
@@ -1406,6 +1441,12 @@ export declare namespace ER {
          * @returns boolean
          */
         static isJQueryHTMLElement(obj: any): boolean;
+        /**
+         * 编码URL
+         * @param str 要编码的字符串
+         * @returns 编码后的字符串
+         */
+        static encodeURIComponent(str: string): string;
         /**
          * 创建一个进度条div
          * @param value 当前值
@@ -3144,6 +3185,16 @@ export declare namespace ER {
          * @returns options
          */
         getSystemGlobalOptions(): any;
+        /**
+         * 获取Layout的系统全局配置信息
+         * @returns options
+         */
+        getLayoutGlobalOptions(): any;
+        /**
+         * 获取Grid的系统全局配置信息
+         * @returns options
+         */
+        getGridGlobalOptions(): any;
         /**
          * 获取Form的配置扩展属性
          * @returns options
@@ -3198,6 +3249,17 @@ export declare namespace ER {
         * @returns EiBlock
         */
         collapseLayoutGroup(configIds: string | Array<string>): FormHelper;
+        /**
+         * 添加自定义查询条件配置[后台服务需支持]
+         * @param customFilter 查询条件脚本(字符串或对象数组,operator默认=)
+         * @param queryEiInfo 查询条件配置
+         * @returns this
+         */
+        addCustomFilterToQueryFilter(customFilter: string | {
+            fieldName: string;
+            value: any;
+            operator?: string;
+        }[], queryEiInfo: EiInfo): FormHelper;
         /**
          * 根据画面配置按钮的服务查询数据
          * @param buttonName 按钮名称
@@ -4320,6 +4382,10 @@ export declare namespace ER {
          * MasterDetailView
          */
         MasterDetailView: boolean;
+        /**
+         * 画面配置查询按钮过滤条件
+         */
+        FormButtonQueryFilter: string;
         /**
          * 画面配置查询服务
          */
@@ -4401,7 +4467,7 @@ export declare namespace ER {
         LayoutFilterOptions: {};
         MainViewOptions: any;
         DetailViewOptions: any;
-        MainInfoQueryMethod: Function | undefined;
+        MainInfoQueryMethod: ((params: any) => Promise<EiInfo>) | undefined;
         DetailInfoQueryMethod: Function | undefined;
         private _partition?;
         private _queryPartition?;
@@ -4490,7 +4556,7 @@ export declare namespace ER {
          * 关闭弹出画面
          */
         CloseDialog(): void;
-        queryMainGridInfo: (showMsg?: boolean) => void;
+        queryMainGridInfo: (showMsg?: boolean) => Promise<void>;
         /**
          * 自动勾选记录
          */
@@ -5336,6 +5402,71 @@ export declare namespace ER {
         show(): Promise<any>;
         close(): void;
     }
+    /**
+     * 高级查询相关
+     */
+    class PopAdvanceFilterHelper {
+        /**
+         * 获取画面是否打开状态
+         */
+        get WindowOpened(): any;
+        get Partition(): string;
+        get FormName(): string;
+        get FilterConfigId(): string;
+        get GridConfigId(): string;
+        get Options(): any;
+        get ErGrid(): any;
+        get GridColumns(): any[];
+        get GridColumnFieldList(): any[];
+        get GridColumnDisplayList(): any[];
+        get GridColumnMap(): any;
+        get FilterDataStructure(): DataTable | undefined;
+        UnMountWhenCloseDialog: boolean;
+        private _app;
+        private _component;
+        private _windowOpened;
+        private _partition;
+        private _formName;
+        private _filterConfigId;
+        private _gridConfigId;
+        private _erGrid;
+        private _resolveDialogResult;
+        private _gridColumns;
+        private _gridColumnFieldList;
+        private _gridColumnDisplayList;
+        private _gridColumnMap;
+        private _filterDataStructure;
+        private _options;
+        private _events;
+        constructor(partition: string, formName: string, grid: any);
+        /**
+         * 设置画面的相关事件
+         * @param event 事件'ok', 'cancel'
+         * @param type 事件类型[初始化/打开/确定/取消/查询完成]
+         * @returns void
+         */
+        setEvent(type: 'open' | 'ok' | 'cancel' | 'templateChanged' | 'afterQuery', event: Function | undefined): void;
+        /**
+         * 获取画面的相关事件
+         * @param type 事件类型[初始化/打开/确定/取消/查询完成]
+         * @returns event
+         */
+        getEvent(type: 'open' | 'ok' | 'cancel' | 'templateChanged' | 'afterQuery'): Function | undefined;
+        /**
+         * 执行画面的相关事件
+         * @param type 事件类型[初始化/打开/确定/取消/查询完成]
+         * @returns event
+         */
+        doEvent(type: 'open' | 'ok' | 'cancel' | 'templateChanged' | 'afterQuery', args?: any): any;
+        /**
+         * 通用弹出高级过滤画面
+         * @param options 选项
+         * @returns void
+         */
+        show(options?: any): Promise<any>;
+        setOpitons(options: any): PopAdvanceFilterHelper;
+        close(): void;
+    }
     /**
      * 通用弹出组件类
      */

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

@@ -1,6 +1,6 @@
 import { LocaleMessages, VueMessageType } from 'vue-i18n';
 /**
- * 自动导入 框架自定义语言
- * @author Edward
+ * 自动导入框架自定义语言包
+ * @returns LocaleMessages<VueMessageType>
  */
 export declare function importErxLocales(): LocaleMessages<VueMessageType>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baosight/er4j",
-  "version": "0.0.69",
+  "version": "0.0.70",
   "description": "er4j 辅助开发",
   "license": "UNLICENSED",
   "private": false,

package/src/views/JA/ER/JAER02.vue

@@ -2,6 +2,7 @@
   <EFPage title="基表维护示例" style="height: 100vh;">
     <template v-if="initializeFlag === 1">
       <er-layout :er-form-helper-prop="erFormHelper" :config-id="'LayoutGroupFilter'" :show-form-toolbar="false"
+      :display-rows="1"
         :allow-collapse="true" @toolbar-click="layoutToolbarClick" @query-click="queryClick"></er-layout>
       <er-panel :title="'查询结果'" :open-header-show="false" style="height: 100%">
         <template #customButtonSlot>
@@ -62,10 +63,8 @@ const layoutToolbarClick = (params: any) => {
 };
 
 const queryClick = async (params: any) => {
-  ER.Core.loading(true, 2000);
   const outInfo = await erFormHelper.queryDataByDataSource('SI00051', { filterConfigId: 'LayoutGroupFilter' });
   erFormHelper.mergeEiInfoToGrid(outInfo, 'gridView1');
-  ER.Core.loading(false);
 };
 
 const testButtonClick = () => {

package/er4j-dist/ErPopFree-BUnRYMy4.js

@@ -1,5 +0,0 @@
-import { e } from "./index-ofQiDhL3.js";
-export {
-  e as default
-};
-//# sourceMappingURL=ErPopFree-BUnRYMy4.js.map

package/er4j-dist/ErPopFree-BUnRYMy4.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ErPopFree-BUnRYMy4.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/er4j-dist/ErPopQuery-BOnM155Y.js

@@ -1,5 +0,0 @@
-import { d as f } from "./index-ofQiDhL3.js";
-export {
-  f as default
-};
-//# sourceMappingURL=ErPopQuery-BOnM155Y.js.map

package/er4j-dist/ErPopQuery-BOnM155Y.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ErPopQuery-BOnM155Y.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/er4j-dist/ErPopRichEditor-CTN8uO-e.js

@@ -1,5 +0,0 @@
-import { h as f } from "./index-ofQiDhL3.js";
-export {
-  f as default
-};
-//# sourceMappingURL=ErPopRichEditor-CTN8uO-e.js.map

package/er4j-dist/ErPopRichEditor-CTN8uO-e.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ErPopRichEditor-CTN8uO-e.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/er4j-dist/ErPopTree-KMcjQqPw.js

@@ -1,5 +0,0 @@
-import { f } from "./index-ofQiDhL3.js";
-export {
-  f as default
-};
-//# sourceMappingURL=ErPopTree-KMcjQqPw.js.map

package/er4j-dist/ErPopTree-KMcjQqPw.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ErPopTree-KMcjQqPw.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}