@baosight/er4j 0.0.62 → 0.0.65

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

@@ -1515,23 +1515,6 @@ export declare namespace ER {
          */
         static get saveDevConfigService(): string;
     }
-    class EIInfo extends EiInfo {
-        sys: {
-            descName: string;
-            detailMsg?: string;
-            msg: string;
-            msgKey: string;
-            name: string;
-            status: number;
-            traceId: string;
-        };
-        blocks(): {
-            [key: string]: EiBlock;
-        };
-        constructor(info?: EiInfo);
-        getBlock(blockInfo: string | number): EiBlock;
-        contains(blockId: string): boolean;
-    }
     /**
      * 翻译工具
      */
@@ -1688,6 +1671,7 @@ export declare namespace ER {
         }, source?: string, setValueBySchemaFields?: boolean): Model;
         addField(...fields: DataTableSchemaField[]): Model;
         reomveField(...fields: DataTableSchemaField[]): Model;
+        setField(fieldName: string, options: Omit<DataTableSchemaField, 'name'>): Model;
         accept(jsonData?: {
             [key: string]: any;
         }, schema?: DataTableSchemaFields): Model;
@@ -1713,6 +1697,7 @@ export declare namespace ER {
         setAllowCancelChanges(allowCancelChanges: boolean | undefined): DataTable;
         addField(...fields: DataTableSchemaField[]): DataTable;
         removeField(...fields: DataTableSchemaField[]): DataTable;
+        setField(fieldName: string, options: Omit<DataTableSchemaField, 'name'>): DataTable;
         get(uid: string): any;
         getRows(rowState: 'created' | 'updated' | 'removed' | 'unchanged' | 'original' | 'all', toJSON?: boolean | ((data: Model) => {
             [key: string]: any;
@@ -1929,6 +1914,12 @@ export declare namespace ER {
          * 画面初始化成功标志(1:成功;<=0:失败)
          */
         get InitializeFlag(): number;
+        /**
+         * 画面配置信息
+         */
+        get FormInfo(): {
+            [key: string]: any;
+        };
         /**
          * 画面配置信息
          */
@@ -2092,6 +2083,7 @@ export declare namespace ER {
         private _tableNames;
         private _serviceName;
         private _initialConfiParas;
+        private _formInfo;
         private _configInfo;
         private _systemInfo;
         private _customDefaultValues;
@@ -3006,8 +2998,7 @@ export declare namespace ER {
          * 根据配置代码设置ErLayout组件的值
          * @param configId Grid配置Id
          * @param itemCode 字段配置代码
-         * @param editValue 需要设置的值
-         * @param widgetType 组件类型
+         * @param editValue 需要设置的值[值为void 0时，不触发validator]
          * @returns this
          */
         setControlValue(configId: string, itemCode: string, editValue: any): FormHelper;
@@ -3141,11 +3132,12 @@ export declare namespace ER {
          * 获取配置区域内所有控件的值
          * @param configId 配置区域代码或用逗号隔开的多个配置代码或配置代码数组
          * @param extendJson 扩展属性
+         * @param onlyVisibleControl 是否只获取可见控件的值
          * @returns Json
          */
         getAllControlValue(configId: string | Array<string>, extendJson?: {
             [key: string]: any;
-        }): {
+        }, onlyVisibleControl?: boolean): {
             [key: string]: any;
         };
         /**

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

@@ -136,6 +136,11 @@ export declare const getAntdTheme: (theme?: string) => {
         };
     };
 };
+/**
+ * 获取antd组件大小
+ * @returns
+ */
+export declare const getAntdComponentSize: () => string;
 /**
  * 换肤
  * @param theme 主题

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baosight/er4j",
-  "version": "0.0.62",
+  "version": "0.0.65",
   "description": "er4j 辅助开发",
   "license": "UNLICENSED",
   "private": false,
@@ -37,7 +37,6 @@
     "@xr/ui": ">=1.2.5",
     "dayjs": "1.11.13"
   },
-  "dependencies": {},
   "devDependencies": {
     "@ag-grid-community/client-side-row-model": "30.2.1",
     "@ag-grid-community/core": "30.2.1",
@@ -65,9 +64,6 @@
     "@ag-grid-enterprise/status-bar": "30.2.1",
     "@ag-grid-enterprise/viewport-row-model": "30.2.1",
     "@babel/polyfill": "7.12.1",
-    "@codemirror/lang-javascript": "6.2.2",
-    "@codemirror/lang-json": "6.0.1",
-    "@codemirror/lang-sql": "6.6.3",
     "@element-plus/icons-vue": "2.0.4",
     "@eplat/ei": "1.2.4",
     "@erp/erp-ui-lib": "0.0.1",
@@ -91,7 +87,6 @@
     "@xr/ui": "1.4.1",
     "ant-design-vue": "4.0.6",
     "axios": "0.27.2",
-    "codemirror": "6.0.1",
     "core-js": "3.22.8",
     "crypto-js": "4.2.0",
     "decimal.js": "10.5.0",
@@ -127,9 +122,15 @@
     "vite-plugin-top-level-await": "1.3.1",
     "vue": "3.5.13",
     "vue-clipboard3": "2.0.0",
-    "vue-codemirror": "^6.1.1",
     "vue-i18n": "9.2.2",
     "vue-router": "4.0.16",
     "xlsx": "0.18.5"
+  },
+  "dependencies": {
+    "@codemirror/lang-javascript": "^6.2.4",
+    "@codemirror/lang-json": "^6.0.2",
+    "@codemirror/lang-sql": "^6.10.0",
+    "codemirror": "^6.0.2",
+    "vue-codemirror": "^6.1.1"
   }
 }

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

@@ -4,6 +4,9 @@
       <er-layout :er-form-helper-prop="erFormHelper" :config-id="'LayoutGroupFilter'" :show-form-toolbar="false"
         :allow-collapse="true" @toolbar-click="layoutToolbarClick" @query-click="queryClick"></er-layout>
       <er-panel :title="'查询结果'" :open-header-show="false" style="height: 100%">
+        <template #customButtonSlot>
+          <a-button type="primary" @click="testButtonClick">测试按钮</a-button>
+        </template>
         <template #contentSlot>
           <er-grid :config-id="'gridView1'" :er-form-helper-prop="erFormHelper"></er-grid>
         </template>
@@ -65,10 +68,14 @@ const queryClick = async (params: any) => {
   ER.Core.loading(false);
 };
 
-onMounted(() => {
-
-
+const testButtonClick = () => {
+  const popTest = new ER.PopQueryHelper('', 'PopFormTest');
+  popTest.show(null, () => {
+    console.log('popTest closed');
+  });
+};
 
+onMounted(() => {
   initializePage().then(() => {
     nextTick(() => {
       console.log('画面初始化完成:', erFormHelper);

package/er4j-dist/ErPopFree-D0387she.js

@@ -1,5 +0,0 @@
-import { ErPopFree as a } from "./er4j.es.js";
-export {
-  a as default
-};
-//# sourceMappingURL=ErPopFree-D0387she.js.map

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

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

package/er4j-dist/ErPopQuery-DWj-lb5u.js

@@ -1,5 +0,0 @@
-import { ErPopQuery as a } from "./er4j.es.js";
-export {
-  a as default
-};
-//# sourceMappingURL=ErPopQuery-DWj-lb5u.js.map

package/er4j-dist/ErPopQuery-DWj-lb5u.js.map

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

package/er4j-dist/ErPopRichEditor-CdDc0Cvo.js

@@ -1,5 +0,0 @@
-import { ErPopRichEditor as r } from "./er4j.es.js";
-export {
-  r as default
-};
-//# sourceMappingURL=ErPopRichEditor-CdDc0Cvo.js.map

package/er4j-dist/ErPopRichEditor-CdDc0Cvo.js.map

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

package/er4j-dist/ErPopTree-2Ab-Nxgb.js

@@ -1,5 +0,0 @@
-import { ErPopTree as a } from "./er4j.es.js";
-export {
-  a as default
-};
-//# sourceMappingURL=ErPopTree-2Ab-Nxgb.js.map

package/er4j-dist/ErPopTree-2Ab-Nxgb.js.map

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