imatrix-ui 2.7.37 → 2.7.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.7.37",
+  "version": "2.7.38",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,

package/src/utils/jump-page-utils.js

@@ -86,13 +86,19 @@ export function openPage(pageSetting) {
         const popPageSetting = openPageParams
         const path = popPageSetting._path
         if (jumpMode === 'popup') {
-          let jumpPageWidth = 400
-          let jumpPageHeight = 400
+          let jumpPageWidth
+          let jumpPageHeight
+
           if (openPageParams.jumpPageWidth) {
             jumpPageWidth = openPageParams.jumpPageWidth
+          } else {
+            jumpPageWidth = window.innerWidth - 150
           }
+
           if (openPageParams.jumpPageHeight) {
             jumpPageHeight = openPageParams.jumpPageHeight
+          } else {
+            jumpPageHeight = window.innerHeight - 150
           }
           // 弹出页面
           window.open(path, '', `height=` + jumpPageHeight + `,width=` + jumpPageWidth + `,top=100,left=100,toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no`)
@@ -248,8 +254,20 @@ function jumpToPageWithFullPath(dataId, path, additionalParameterStr, jumpPage,
   }
   if (jumpMode === 'popup') {
     // 弹框
-    const jumpPageWidth = jumpPage.jumpPageWidth
-    const jumpPageHeight = jumpPage.jumpPageHeight
+    let jumpPageWidth
+    let jumpPageHeight
+
+    if (jumpPage.jumpPageWidth) {
+      jumpPageWidth = jumpPage.jumpPageWidth
+    } else {
+      jumpPageWidth = window.innerWidth - 150
+    }
+
+    if (jumpPage.jumpPageHeight) {
+      jumpPageHeight = jumpPage.jumpPageHeight
+    } else {
+      jumpPageHeight = window.innerHeight - 150
+    }
     const features = 'height=' + jumpPageHeight + ', width=' + jumpPageWidth + ', top=0, left=0, toolbar=no, menubar=no,' +
     'scrollbars=no,resizable=no, location=no, status=no' // 设置新窗口的特性
     window.open(path, 'newW', features) // 打开新窗口