@baosight/er4j 0.0.14 → 0.0.16

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

@@ -1,5 +1,12 @@
 declare const _default: {
     ERX: {
+        Null: string;
+        Reset: string;
+        Visible: string;
+        Display: string;
+        Layout: string;
+        Valid: string;
+        Invalid: string;
         OperateSuccess: string;
         ConfirmMessage: string;
         CancelMessage: string;
@@ -30,15 +37,36 @@ declare const _default: {
         UploadMaxCount: string;
         UploadFileExist: string;
         UploadMaxCountMessage: string;
+        UpdateConfigConfirmMessage: string;
+        UpdateConfigSuccessMessage: string;
+        UpdateConfigFailedMessage: string;
+        NoServiceConfig: string;
         ShowDetails: string;
         HideDetails: string;
         ShowTemplate: string;
+        DeleteTemplate: string;
+        ShareTemplate: string;
         HideTemplate: string;
         TemplateList: string;
+        TemplateDetail: string;
+        TemplateEmptyMessage: string;
+        TemplateNameEmptyMessage: string;
+        TemplateSaveSuccessMessage: string;
+        TemplateSaveFailedMessage: string;
+        TemplateDeleteSuccessMessage: string;
+        TemplateDeleteFailedMessage: string;
+        TemplateDeleteConfirmMessage: string;
+        TemplateNotAllowOperateOtherPersonMessage: string;
+        TemplateShareSuccessMessage: string;
+        TemplateShareFailedMessage: string;
+        TemplateShareConfirmMessage: string;
         GroupedData: string;
         Horizontal: string;
         Vertical: string;
+        Default: string;
+        Public: string;
         SetAsDefault: string;
+        SetAsPublic: string;
         List: string;
         Details: string;
         Query: string;
@@ -72,15 +100,60 @@ declare const _default: {
         Max: string;
         Min: string;
         Sum: string;
+        Field: string;
+        FieldDuplicated: string;
+        Sort: string;
         SortAsc: string;
         SortDesc: string;
         Sorted: string;
+        AdvanceFilter: string;
+        BracketNotMatch: string;
         Filter: string;
+        FilterValue: string;
+        FilterOperator: string;
         Filtered: string;
         FilterClear: string;
         FilterAnd: string;
         FilterOr: string;
+        FilterAndOrCaption: string;
+        FilterIsNull: string;
+        FilterIsNotNull: string;
+        FilterIsZero: string;
+        FilterIsNotZero: string;
+        FilterIsTrue: string;
+        FilterIsFalse: string;
+        FilterEqual: string;
+        FilterNotEqual: string;
+        FilterGreaterThan: string;
+        FilterLessThan: string;
+        FilterGreaterThanOrEqual: string;
+        FilterLessThanOrEqual: string;
+        FilterBeginWith: string;
+        FilterNotBeginWith: string;
+        FilterEndWith: string;
+        FilterNotEndWith: string;
+        FilterContains: string;
+        FilterNotContains: string;
+        FilterIn: string;
+        FilterNotIn: string;
+        FilterToday: string;
+        FilterYesterday: string;
+        FilterCurrentWeek: string;
+        FilterRecentWeek: string;
+        FilterLastWeek: string;
+        FilterCurrentMonth: string;
+        FilterRecentMonth: string;
+        FilterLastMonth: string;
+        FilterCurrentYear: string;
+        FilterRecentYear: string;
+        FilterLastYear: string;
+        FilterCurrentQuarter: string;
+        FilterRecentQuarter: string;
+        FilterLastQuarter: string;
+        FilterRecentHalfYear: string;
+        FilterEmptyMessage: string;
         ErGrid: {
+            StyleDesc: string;
             ShowQuickFilter: string;
             HideQuickFilter: string;
             ClearColumnFilter: string;
@@ -91,6 +164,54 @@ declare const _default: {
             HideFilterRow: string;
             ShowDetailForm: string;
             QuickFilterPlaceHoder: string;
+            AddColumn: string;
+            AddCustomColumn: string;
+            AddColumnSuccess: string;
+            AddColumnFailed: string;
+            RemoveColumn: string;
+            RemoveColumnSuccess: string;
+            RemoveColumnFailed: string;
+            CustomColumnTitle: string;
+            SaveUserConfig: string;
+            SaveUserConfigSuccess: string;
+            SaveUserConfigFailed: string;
+            ResetUserConfig: string;
+            ResetUserConfigSuccess: string;
+            ResetUserConfigFailed: string;
+            SaveUserConfigConfirmMessage: string;
+            ResetUserConfigConfirmMessage: string;
+            ResetAllUserConfig: string;
+            ResetAllUserConfigSuccess: string;
+            ResetAllUserConfigFailed: string;
+            ResetAllUserConfigConfirmMessage: string;
+            SaveColumnWidth: string;
+            SaveColumnWidthSuccess: string;
+            SaveColumnWidthFailed: string;
+            SaveColumnWidthConfirmMessage: string;
+            SaveAllColumnWidth: string;
+            SaveAllColumnWidthSuccess: string;
+            SaveAllColumnWidthFailed: string;
+            SaveAllColumnWidthConfirmMessage: string;
+            SaveColumnOrder: string;
+            SaveColumnOrderSuccess: string;
+            SaveColumnOrderFailed: string;
+            SaveColumnOrderConfirmMessage: string;
+            SaveAllColumnOrder: string;
+            SaveAllColumnOrderSuccess: string;
+            SaveAllColumnOrderFailed: string;
+            HorizontalAlign: string;
+            HorizontalAlignCenter: string;
+            HorizontalAlignLeft: string;
+            HorizontalAlignRight: string;
+            VerticalAlign: string;
+            VerticalAlignTop: string;
+            VerticalAlignMiddle: string;
+            VerticalAlignBottom: string;
+            GridPropertiesConfig: string;
+            ColumnPropertiesConfig: string;
+            ExportOptions: string;
+            ExportOptionsNumberAsText: string;
+            ExportOptionsSelectedRows: string;
         };
         ErApprovalSteps: {
             ApprovalTitle: string;
@@ -116,6 +237,7 @@ declare const _default: {
             ToolbarPanel: {
                 Refresh: string;
                 AddRow: string;
+                InsertRow: string;
                 CopyRow: string;
                 Delete: string;
                 Save: string;

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

@@ -1,5 +1,12 @@
 declare const _default: {
     ERX: {
+        Null: string;
+        Reset: string;
+        Visible: string;
+        Display: string;
+        Layout: string;
+        Valid: string;
+        Invalid: string;
         OperateSuccess: string;
         ConfirmMessage: string;
         CancelMessage: string;
@@ -30,15 +37,36 @@ declare const _default: {
         UploadMaxCount: string;
         UploadFileExist: string;
         UploadMaxCountMessage: string;
+        UpdateConfigConfirmMessage: string;
+        UpdateConfigSuccessMessage: string;
+        UpdateConfigFailedMessage: string;
+        NoServiceConfig: string;
         ShowDetails: string;
         HideDetails: string;
         ShowTemplate: string;
+        DeleteTemplate: string;
+        ShareTemplate: string;
         HideTemplate: string;
         TemplateList: string;
+        TemplateDetail: string;
+        TemplateEmptyMessage: string;
+        TemplateNameEmptyMessage: string;
+        TemplateSaveSuccessMessage: string;
+        TemplateSaveFailedMessage: string;
+        TemplateDeleteSuccessMessage: string;
+        TemplateDeleteFailedMessage: string;
+        TemplateDeleteConfirmMessage: string;
+        TemplateNotAllowOperateOtherPersonMessage: string;
+        TemplateShareSuccessMessage: string;
+        TemplateShareFailedMessage: string;
+        TemplateShareConfirmMessage: string;
         GroupedData: string;
         Horizontal: string;
         Vertical: string;
+        Default: string;
+        Public: string;
         SetAsDefault: string;
+        SetAsPublic: string;
         List: string;
         Details: string;
         Query: string;
@@ -72,16 +100,60 @@ declare const _default: {
         Max: string;
         Min: string;
         Sum: string;
+        Field: string;
+        FieldDuplicated: string;
         Sort: string;
         SortAsc: string;
         SortDesc: string;
         Sorted: string;
+        AdvanceFilter: string;
+        BracketNotMatch: string;
         Filter: string;
+        FilterValue: string;
+        FilterOperator: string;
         Filtered: string;
         FilterClear: string;
         FilterAnd: string;
         FilterOr: string;
+        FilterAndOrCaption: string;
+        FilterIsNull: string;
+        FilterIsNotNull: string;
+        FilterIsZero: string;
+        FilterIsNotZero: string;
+        FilterIsTrue: string;
+        FilterIsFalse: string;
+        FilterEqual: string;
+        FilterNotEqual: string;
+        FilterGreaterThan: string;
+        FilterLessThan: string;
+        FilterGreaterThanOrEqual: string;
+        FilterLessThanOrEqual: string;
+        FilterBeginWith: string;
+        FilterNotBeginWith: string;
+        FilterEndWith: string;
+        FilterNotEndWith: string;
+        FilterContains: string;
+        FilterNotContains: string;
+        FilterIn: string;
+        FilterNotIn: string;
+        FilterToday: string;
+        FilterYesterday: string;
+        FilterCurrentWeek: string;
+        FilterRecentWeek: string;
+        FilterLastWeek: string;
+        FilterCurrentMonth: string;
+        FilterRecentMonth: string;
+        FilterLastMonth: string;
+        FilterCurrentYear: string;
+        FilterRecentYear: string;
+        FilterLastYear: string;
+        FilterCurrentQuarter: string;
+        FilterRecentQuarter: string;
+        FilterLastQuarter: string;
+        FilterRecentHalfYear: string;
+        FilterEmptyMessage: string;
         ErGrid: {
+            StyleDesc: string;
             ShowQuickFilter: string;
             HideQuickFilter: string;
             ClearColumnFilter: string;
@@ -92,6 +164,54 @@ declare const _default: {
             HideFilterRow: string;
             ShowDetailForm: string;
             QuickFilterPlaceHoder: string;
+            AddColumn: string;
+            AddCustomColumn: string;
+            AddColumnSuccess: string;
+            AddColumnFailed: string;
+            RemoveColumn: string;
+            RemoveColumnSuccess: string;
+            RemoveColumnFailed: string;
+            CustomColumnTitle: string;
+            SaveUserConfig: string;
+            SaveUserConfigSuccess: string;
+            SaveUserConfigFailed: string;
+            ResetUserConfig: string;
+            ResetUserConfigSuccess: string;
+            ResetUserConfigFailed: string;
+            SaveUserConfigConfirmMessage: string;
+            ResetUserConfigConfirmMessage: string;
+            ResetAllUserConfig: string;
+            ResetAllUserConfigSuccess: string;
+            ResetAllUserConfigFailed: string;
+            ResetAllUserConfigConfirmMessage: string;
+            SaveColumnWidth: string;
+            SaveColumnWidthSuccess: string;
+            SaveColumnWidthFailed: string;
+            SaveColumnWidthConfirmMessage: string;
+            SaveAllColumnWidth: string;
+            SaveAllColumnWidthSuccess: string;
+            SaveAllColumnWidthFailed: string;
+            SaveAllColumnWidthConfirmMessage: string;
+            SaveColumnOrder: string;
+            SaveColumnOrderSuccess: string;
+            SaveColumnOrderFailed: string;
+            SaveColumnOrderConfirmMessage: string;
+            SaveAllColumnOrder: string;
+            SaveAllColumnOrderSuccess: string;
+            SaveAllColumnOrderFailed: string;
+            HorizontalAlign: string;
+            HorizontalAlignCenter: string;
+            HorizontalAlignLeft: string;
+            HorizontalAlignRight: string;
+            VerticalAlign: string;
+            VerticalAlignTop: string;
+            VerticalAlignMiddle: string;
+            VerticalAlignBottom: string;
+            GridPropertiesConfig: string;
+            ColumnPropertiesConfig: string;
+            ExportOptions: string;
+            ExportOptionsNumberAsText: string;
+            ExportOptionsSelectedRows: string;
         };
         ErApprovalSteps: {
             ApprovalTitle: string;
@@ -117,6 +237,7 @@ declare const _default: {
             ToolbarPanel: {
                 Refresh: string;
                 AddRow: string;
+                InsertRow: string;
                 CopyRow: string;
                 Delete: string;
                 Save: string;

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

@@ -81,6 +81,7 @@ export interface DataTableSchemaField {
     min?: any;
     max?: any;
     maxLength?: any;
+    camelCaseName?: string | undefined;
     [rule: string]: any;
 }
 export interface DataTableSchemaFields {

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

@@ -10,7 +10,21 @@ export declare namespace ER {
     interface Culture {
         ar: string;
         en: string;
+        id: string;
         zh_Hans: string;
+        zh_Hant: string;
+    }
+    /**
+     * 调用服务选项
+     * @interface CallServiceOptions
+     * @property {boolean | 'modal'} [messageError] - 是否显示错误消息
+     * @property {boolean} [toCamelCase] - 是否将元数据转换为驼峰命名
+     * @property {string} [partition] - 分区
+     */
+    interface CallServiceOptions {
+        messageError?: boolean | 'modal';
+        toCamelCase?: boolean;
+        partition?: string;
     }
     interface ErLayoutOptions {
         context?: {
@@ -477,6 +491,23 @@ export declare namespace ER {
         beforePreview?: (file: File) => boolean;
         afterPreview?: (file: File) => void;
     }
+    interface CheckboxOption {
+        label: string;
+        value: string;
+    }
+    interface RadioGroupOption {
+        title: string;
+        key: string;
+        options: CheckboxOption[];
+    }
+    interface SelectModalOptions {
+        checkboxOptions?: CheckboxOption[];
+        radioGroups?: RadioGroupOption[];
+        title?: string;
+        width?: number;
+        okText?: string;
+        cancelText?: string;
+    }
     class Class {
         #private;
         protected _events: {};
@@ -498,7 +529,27 @@ export declare namespace ER {
          * @returns jQuery
          */
         static jQuery(selector: any): any;
+        /**
+        * 将下划线命名转换为驼峰命名
+        * @param str 下划线命名
+        * @returns 驼峰命名
+        */
+        static camelCase(str: string): string;
+        /**
+         * 加密数据
+         * @param plaintext 明文
+         * @param key 密钥
+         * @param iv 初始化向量
+         * @returns 加密后的数据
+         */
         static encryptData(plaintext: string, key: string, iv: string): string;
+        /**
+         * 解密数据
+         * @param ciphertext 密文
+         * @param key 密钥
+         * @param iv 初始化向量
+         * @returns 解密后的数据
+         */
         static decryptData(ciphertext: string, key: string, iv: string): string;
         /**
          * 获取系统支持的语言列表
@@ -674,6 +725,15 @@ export declare namespace ER {
         * @returns 列头模版
         */
         static getGridHeaderTemplate(header: any): string;
+        /**
+        * 弹出一个包含 checkbox + 多个 radiogroup 的 modal
+        * @param config 弹窗内容配置
+        * @param onConfirm 用户点击“确认”后的回调，返回 { checkboxes, radios }
+        */
+        static openSelectOptionsModal(config: SelectModalOptions, onConfirm: (result: {
+            checkboxes: string[];
+            radios: Record<string, string>;
+        }) => void): void;
         /**
          * 暂停当前线程一段时间
          * @param seconds 暂停时间(毫秒)
@@ -681,11 +741,11 @@ export declare namespace ER {
          */
         static sleep(seconds: number): Promise<void>;
         /**
-         * 根据数据及表达式脚本判断是否满足
-         * @param data 数据
-         * @param expression 脚本
-         * @returns 是否满足
-         */
+        * 根据数据及表达式脚本判断是否满足
+        * @param data 数据
+        * @param expression 脚本
+        * @returns 是否满足
+        */
         static checkExpressionValid(data: {
             [key: string]: any;
         }, expression: string): boolean;
@@ -1272,11 +1332,11 @@ export declare namespace ER {
          * @param serviceTransformer 请求/响应数据处理回调函数
          * @returns Promise EiInfo
          */
-        static callService(partition: 'Master' | 'EP' | string, svcName: string, data: EiInfo, loadingOptions?: {
+        static callService(svcName: string, data: EiInfo, loadingOptions?: {
             show?: boolean;
             tip?: string;
             delay?: number;
-        }, messageError?: boolean | 'modal'): Promise<EiInfo>;
+        }, options?: CallServiceOptions): Promise<EiInfo>;
     }
     class SysInfo {
         /**
@@ -2757,6 +2817,12 @@ export declare namespace ER {
          * @returns 属性值
          */
         getGridOptions(configId: string, key: string, isReactive?: boolean): any;
+        /**
+         * 获取Layout的配置扩展属性(包括系统全局默认Layout属性)
+         * @param configId 配置代码
+         * @returns options
+         */
+        getLayoutExtentedOptions(configId: string): any;
         /**
          * 获取Grid的配置扩展属性(包括系统全局默认Grid属性)
          * @param configId 配置代码
@@ -2972,7 +3038,7 @@ export declare namespace ER {
          */
         getAllControlValueAsEiBlock(configId: string | Array<string>, extendJson?: {
             [key: string]: any;
-        }): EiBlock;
+        }, blockName?: string): EiBlock;
         /**
          * 获取配置区域内所有控件的值，并以此生成查询条件的结构[后台服务需支持]
          * @param configId 配置区域代码
@@ -3118,6 +3184,7 @@ export declare namespace ER {
          */
         private setGridInitialEvent;
         private processRowSelectedEvent;
+        private getGridContextMenuItems;
         private setGridContextMenu;
         /**
           * 维护配置的扩展信息
@@ -3221,6 +3288,7 @@ export declare namespace ER {
          * @returns this
          */
         private setGridColumnNumberEditor;
+        private setGridColumnImageUpload;
         getGridMenuItems(params: any): any;
         /**
          * 设置Grid的列头菜单信息
@@ -3504,7 +3572,7 @@ export declare namespace ER {
             show?: boolean;
             tip?: string;
             delay?: number;
-        }, messageError?: boolean | 'modal', partition?: string): Promise<EiInfo>;
+        }, options?: CallServiceOptions): Promise<EiInfo>;
         /**
          * 动态SQL查询
          * @param svcName 自定义服务名称，传空时默认系统服务
@@ -3627,6 +3695,14 @@ export declare namespace ER {
          * @returns DataTable | undefined
          */
         getGridBindingTable(grid: any): DataTable | undefined;
+        /**
+         * 获取Grid的结构
+         * @param grid Grid
+         * @param onlyGridColumns 是否仅获取Grid中存在的字段
+         * @param blockName 块名
+         * @returns EiBlock
+         */
+        getGridStructureAsBlock(grid: any, onlyGridColumns?: boolean, blockName?: string): EiBlock;
         /**
          * 获取Grid的选中行[无勾选框时为当前行]
          * @param grid
@@ -4216,7 +4292,7 @@ export declare namespace ER {
          * 关闭弹出画面
          */
         CloseDialog(): void;
-        queryMainGridInfo: () => void;
+        queryMainGridInfo: (showMsg?: boolean) => void;
         /**
          * 自动勾选记录
          */

package/package.json

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

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

@@ -14,10 +14,6 @@
 
 <script lang="ts" setup name="JAER02">
 import { getCurrentInstance } from "vue";
-// import { ER } from '@/utils/er';
-// import ErPanel from '@/components/ErPanel/ErPanel.vue';
-// import ErLayout from '@/components/ErLayout/ErLayout.vue';
-// import ErGrid from '@/components/ErGrid/ErGrid.vue';
 
 import { ER, ErPanel, ErGrid, ErLayout } from "@baosight/er4j";