imatrix-ui 2.7.36 → 2.7.40

package/package.json

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

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

@@ -1,7 +1,14 @@
 import sessionStorage from 'sessionstorage'
 import Vue from 'vue'
-import { analysisCondition, analysisValue, getEntityFieldValue, setEntityFieldValue } from './util'
-import { getSystemFrontendUrl } from './common-util'
+import {
+  analysisCondition,
+  analysisValue,
+  getEntityFieldValue,
+  setEntityFieldValue
+} from './util'
+import {
+  getSystemFrontendUrl
+} from './common-util'
 // 解析初始化条件，api方法;additionalParamMap是上个页面传过来的附加参数集合
 export function initialization(jumpPage, entity, isSql, additionalParamerter, contextParameter, tableName, parentFormData) {
   const result = {}
@@ -86,13 +93,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`)
@@ -151,6 +164,7 @@ export function jumpToPage(jumpPageSetting, system, dataId, entity, additionalPa
     })
   })
 }
+
 function getSystem(system, jumpPageUrl) {
   return new Promise((resolve, reject) => {
     if (isFullPath(jumpPageUrl)) {
@@ -197,7 +211,7 @@ function jumpToPageTwo(jumpPageSetting, system, dataId, ids, buttonCode) {
       return
     }
     if (jumpPageUrl.indexOf('page:') === 0) {
-    // 表示是自定义系统跳转页面编码
+      // 表示是自定义系统跳转页面编码
       jumpWithSuperPage(jumpPageUrl, system, dataId, jumpPageSetting, ids, buttonCode).then((openPageParams) => {
         resolve(openPageParams)
       })
@@ -210,13 +224,13 @@ function jumpToPageTwo(jumpPageSetting, system, dataId, ids, buttonCode) {
         path = jumpPageUrl.substring(jumpPageUrl.indexOf('path:') + 'path:'.length)
       }
       if (isFullPath(path)) {
-      // 表示是全路径，例如：http://www.baidu.com 或 http://localhost:9600/demo/#/demo/plan/list
-        jumpToPageWithFullPath(dataId, path, additionalParameterStr, jumpPageSetting, ids, buttonCode)
+        // 表示是全路径，例如：http://www.baidu.com 或 http://localhost:9600/demo/#/demo/plan/list
       } else if (system) {
-      // 表示是路由路径，例如：/demo/plan/list
-      // TODO 配置系统暂时不支持该配置，只能选页面或全路径
-        // jumpToPageWithPath(dataId, path, additionalParameterStr, system, jumpPage)
+        // 表示是路由路径，例如：/demo/plan/list
+        const frontendUrl = getSystemFrontendUrl(system.frontendUrl)
+        path = frontendUrl + '/#' + path
       }
+      jumpToPageWithFullPath(dataId, path, additionalParameterStr, jumpPageSetting, ids, buttonCode)
       resolve()
     }
   })
@@ -248,10 +262,22 @@ 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' // 设置新窗口的特性
+      'scrollbars=no,resizable=no, location=no, status=no' // 设置新窗口的特性
     window.open(path, 'newW', features) // 打开新窗口
   } else if (jumpMode === 'newTab') {
     // 新页签
@@ -335,13 +361,19 @@ function jumpWithSuperPage(jumpPageUrl, system, dataId, jumpPageSetting, ids, bu
       popPageSetting._path = path
       resolve(popPageSetting)
     } else if (jumpMode === 'newTab') {
-    // 新页签打开
+      // 新页签打开
       const path = packageOpenUrl(system, pageCode, dataId, jumpPageSetting, jumpMode, ids, buttonCode)
       window.open(path)
       resolve()
     } else {
       // 刷新页面
-      const queryParam = { pageCode: pageCode, customSystem: system.code, jumpMode: jumpMode, buttonCode: buttonCode, ids: ids ? ids.join(',') : '' }
+      const queryParam = {
+        pageCode: pageCode,
+        customSystem: system.code,
+        jumpMode: jumpMode,
+        buttonCode: buttonCode,
+        ids: ids ? ids.join(',') : ''
+      }
       if (jumpPageSetting.isNeedId === undefined || jumpPageSetting.isNeedId === null || jumpPageSetting.isNeedId === true) {
         if (dataId) {
           // 表示是修改或查看页面，封装id参数
@@ -369,8 +401,7 @@ function jumpWithSuperPage(jumpPageUrl, system, dataId, jumpPageSetting, ids, bu
  * @param {*} buttonCode
  */
 function openDialogWhenPopup(jumpPageSetting, system, pageCode, dataId, jumpMode, ids, buttonCode) {
-  const popPageSetting = {
-  }
+  const popPageSetting = {}
   if (jumpPageSetting) {
     popPageSetting.jumpPageTitle = jumpPageSetting.jumpPageTitle
     popPageSetting.jumpPageWidth = jumpPageSetting.jumpPageWidth
@@ -436,7 +467,7 @@ export function updateWithPageValue(sourceModel, sourceTableName, jumpPageSettin
   if (sourceModel && sourceModel !== null && entity && entity !== null && jumpPageSetting && jumpPageSetting !== null && jumpPageSetting.valueMappings) {
     let sourceEntity = sourceModel
     if (Array.isArray(sourceModel) && sourceModel.length > 0) {
-    // 弹出框中列表选择了多行时，默认只赋值第一行记录
+      // 弹出框中列表选择了多行时，默认只赋值第一行记录
       sourceEntity = sourceModel[0]
     }
     const valueMappings = jumpPageSetting.valueMappings
@@ -464,4 +495,3 @@ export function updateWithPageValue(sourceModel, sourceTableName, jumpPageSettin
     })
   }
 }
-

package/src/utils/util.js

@@ -183,7 +183,7 @@ function parseCondition(entity, conditionList, isSql, tableName, additionalParam
       } else {
         leftValue = getValue(entity, propName, isSql)
       }
-      if (leftValue !== undefined && leftValue !== null) {
+      if (leftValue === undefined || leftValue === null) {
         leftValue = getValue(entity, propDbName, isSql)
       }
     }