agilebuilder-ui 1.0.621 → 1.0.962

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

@@ -1,11 +1,6 @@
 import * as Vue from 'vue'
-import {
-  analysisCondition,
-  analysisValue,
-  getEntityFieldValue,
-  setEntityFieldValue,
-} from './util'
-import { getSystemFrontendUrl } from './common-util'
+import { analysisCondition, analysisValue, getEntityFieldValue, setEntityFieldValue } from './util'
+import { getSystemFrontendUrl, getUuidv4, isMobileBrowser } from './common-util'
 // 解析初始化条件，api方法;additionalParamMap是上个页面传过来的附加参数集合
 export function initialization(
   jumpPage,
@@ -15,70 +10,110 @@ export function initialization(
   contextParameter,
   tableName,
   parentFormData,
-  pageContext
+  gridParams
 ) {
   const result = {}
   if (jumpPage) {
     // 页面附加参数
     result.visible = true
     let additionalParameterMap = {}
-    if (
-      additionalParamerter &&
-      typeof additionalParamerter === 'string' &&
-      additionalParamerter !== ''
-    ) {
+    if (additionalParamerter && typeof additionalParamerter === 'string' && additionalParamerter !== '') {
       additionalParameterMap = JSON.parse(additionalParamerter)
-    } else if (
-      additionalParamerter &&
-      typeof additionalParamerter === 'object'
-    ) {
+    } else if (additionalParamerter && typeof additionalParamerter === 'object') {
       additionalParameterMap = additionalParamerter
     }
     // 环境变量，例如：当前用户id、当前用户登录名等
     let contextParameterMap = {}
-    if (
-      contextParameter &&
-      typeof contextParameter === 'string' &&
-      contextParameter !== ''
-    ) {
+    if (contextParameter && typeof contextParameter === 'string' && contextParameter !== '') {
       contextParameterMap = JSON.parse(contextParameter)
     } else if (contextParameter && typeof contextParameter === 'object') {
       contextParameterMap = contextParameter
     }
-    if (jumpPage.displayTextJudge) {
-      // 例如：${obj.menu_code}-#-#${input.---}-#-#${context.currentTransactor}
-      const label = analysisValue(
-        jumpPage.displayText,
-        entity,
-        additionalParameterMap,
-        contextParameterMap,
-        pageContext
-      )
-      result.label = label
-    }
-    if (jumpPage.icon) {
-      result.icon = jumpPage.icon
-    }
-    if (jumpPage.linkTips) {
-      result.title = jumpPage.linkTips
-    }
-    if (jumpPage.buttonDisplayConditionsList) {
-      let displayJudgment = ''
-      if (jumpPage.buttonDisplayConditionsList) {
-        displayJudgment = JSON.stringify(jumpPage.buttonDisplayConditionsList)
+    if (Array.isArray(jumpPage)) {
+      for (let i = 0; i < jumpPage.length; i++) {
+        let enable = false
+        const jumpPageItem = jumpPage[i]
+        if (jumpPageItem.jumpConditionType === 'none') {
+          enable = true
+        } else if (jumpPageItem.jumpConditionType === 'config') {
+          if (jumpPageItem.conditions && jumpPageItem.conditions.length > 0) {
+            const visible = analysisCondition(
+              JSON.stringify(jumpPageItem.conditions),
+              entity,
+              additionalParameterMap,
+              contextParameterMap,
+              isSql,
+              tableName,
+              parentFormData,
+              gridParams.pageContext
+            )
+            enable = visible ? true : false
+          } else {
+            enable = true
+          }
+        } else if (jumpPageItem.jumpConditionType === 'customFunc') {
+          const param = {
+            row: entity,
+            additionalParamMap: gridParams.additionalParamMap
+          }
+          const funcResult = gridParams.options['eventCallBack'][jumpPageItem.customFunc].call(this, param)
+          enable = funcResult ? true : false
+        }
+        if (enable) {
+          const jumpPageResult = initialization(
+            jumpPageItem.jumpPageSetting,
+            entity,
+            isSql,
+            additionalParamerter,
+            contextParameter,
+            tableName,
+            parentFormData,
+            gridParams
+          )
+          if (jumpPageResult && jumpPageResult.visible) {
+            const res = { ...jumpPageResult }
+            res.jumpPageSetting = JSON.stringify(jumpPageItem.jumpPageSetting)
+            return res
+          }
+        }
       }
-      if (displayJudgment && displayJudgment !== '') {
-        const visible = analysisCondition(
-          displayJudgment,
+      return { visible: false }
+    } else {
+      if (jumpPage.displayTextJudge) {
+        // 例如：${obj.menu_code}-#-#${input.---}-#-#${context.currentTransactor}
+        const label = analysisValue(
+          jumpPage.displayText,
           entity,
           additionalParameterMap,
           contextParameterMap,
-          isSql,
-          tableName,
-          parentFormData,
-          pageContext
+          gridParams.pageContext
         )
-        result.visible = visible
+        result.label = label
+      }
+      if (jumpPage.icon) {
+        result.icon = jumpPage.icon
+      }
+      if (jumpPage.linkTips) {
+        result.title = jumpPage.linkTips
+      }
+      if (jumpPage.buttonDisplayConditionsList) {
+        let displayJudgment = ''
+        if (jumpPage.buttonDisplayConditionsList) {
+          displayJudgment = JSON.stringify(jumpPage.buttonDisplayConditionsList)
+        }
+        if (displayJudgment && displayJudgment !== '') {
+          const visible = analysisCondition(
+            displayJudgment,
+            entity,
+            additionalParameterMap,
+            contextParameterMap,
+            isSql,
+            tableName,
+            parentFormData,
+            gridParams.pageContext
+          )
+          result.visible = visible
+        }
       }
     }
   }
@@ -116,53 +151,46 @@ export function openPage(pageSetting) {
     const additionalParamMap = pageSetting.additionalParamMap
     const entity = pageSetting.entity
     const parentFormData = pageSetting.parentFormData
-    jumpToPage(
-      jumpPageSetting,
-      system,
-      dataId,
-      entity,
-      additionalParamMap,
-      ids,
-      buttonCode,
-      parentFormData
-    ).then((openPageParams) => {
-      let jumpMode
-      if (openPageParams) {
-        jumpMode = openPageParams.jumpMode
-      }
-      if (openPageParams) {
-        const popPageSetting = openPageParams
-        const path = popPageSetting._path
-        if (jumpMode === 'popup') {
-          let jumpPageWidth
-          let jumpPageHeight
+    jumpToPage(jumpPageSetting, system, dataId, entity, additionalParamMap, ids, buttonCode, parentFormData).then(
+      (openPageParams) => {
+        let jumpMode
+        if (openPageParams) {
+          jumpMode = openPageParams.jumpMode
+        }
+        if (openPageParams) {
+          const popPageSetting = openPageParams
+          const path = popPageSetting._path
+          if (jumpMode === 'popup') {
+            let jumpPageWidth
+            let jumpPageHeight
 
-          if (openPageParams.jumpPageWidth) {
-            jumpPageWidth = openPageParams.jumpPageWidth
-          } else {
-            jumpPageWidth = window.innerWidth - 150
-          }
+            if (openPageParams.jumpPageWidth) {
+              jumpPageWidth = openPageParams.jumpPageWidth
+            } else {
+              jumpPageWidth = window.innerWidth - 150
+            }
 
-          if (openPageParams.jumpPageHeight) {
-            jumpPageHeight = openPageParams.jumpPageHeight
-          } else {
-            jumpPageHeight = window.innerHeight - 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`
+            )
+          } else if (jumpMode === 'refresh') {
+            window.location.href = path
           }
-          // 弹出页面
-          window.open(
-            path,
-            '',
-            `height=` +
-              jumpPageHeight +
-              `,width=` +
-              jumpPageWidth +
-              `,top=100,left=100,toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no`
-          )
-        } else if (jumpMode === 'refresh') {
-          window.location.href = path
         }
       }
-    })
+    )
   }
 }
 
@@ -171,10 +199,7 @@ function isHasIdAdditionalParam(jumpPageAdditional) {
   if (jumpPageAdditional && jumpPageAdditional.length > 0) {
     for (let i = 0; i < jumpPageAdditional.length; i++) {
       const item = jumpPageAdditional[i]
-      if (
-        item.paramName &&
-        (item.paramName === 'id' || item.paramName === 'ID')
-      ) {
+      if (item.paramName && (item.paramName === 'id' || item.paramName === 'ID')) {
         return true
       }
     }
@@ -194,11 +219,7 @@ export function jumpToPage(
   parentFormData
 ) {
   return new Promise((resolve, reject) => {
-    if (
-      jumpPageSetting &&
-      typeof jumpPageSetting === 'string' &&
-      jumpPageSetting !== ''
-    ) {
+    if (jumpPageSetting && typeof jumpPageSetting === 'string' && jumpPageSetting !== '') {
       jumpPageSetting = JSON.parse(jumpPageSetting)
     }
     if (!jumpPageSetting.jumpPageUrl) {
@@ -206,61 +227,33 @@ export function jumpToPage(
     }
     getSystem(system, jumpPageSetting.jumpPageUrl, jumpPageSetting.isNewPage, jumpPageSetting)
       .then((system) => {
-        if (
-          jumpPageSetting.jumpPageAdditional &&
-          jumpPageSetting.jumpPageAdditional.length > 0
-        ) {
+        if (jumpPageSetting.jumpPageAdditional && jumpPageSetting.jumpPageAdditional.length > 0) {
           // 发送请求，获取附加参数，并存入缓存
           const paramPath =
-            window.$vueApp.config.globalProperties.baseAPI +
-            '/component/super-pages/parsing-additional-parameters'
+            window.$vueApp.config.globalProperties.baseAPI + '/component/super-pages/parsing-additional-parameters'
           const paramMap = {}
-          paramMap.jumpPageAdditional = JSON.stringify(
-            jumpPageSetting.jumpPageAdditional
-          )
+          paramMap.jumpPageAdditional = JSON.stringify(jumpPageSetting.jumpPageAdditional)
+          paramMap.jumpPageTitle = jumpPageSetting.jumpPageTitle
           // 表单页面
           paramMap.entity = entity
           paramMap.additionalParamMap = additionalParamMap
           console.log('paramMap.parentFormData', parentFormData)
           paramMap.parentFormData = parentFormData
-          const isHasIdParam = isHasIdAdditionalParam(
-            jumpPageSetting.jumpPageAdditional
-          )
+          const isHasIdParam = isHasIdAdditionalParam(jumpPageSetting.jumpPageAdditional)
 
-          window.$vueApp.config.globalProperties.$http
-            .post(paramPath, paramMap)
-            .then((result) => {
-              let paramStoreId = ''
-              if (result && result.uuid) {
-                paramStoreId = result.uuid + '_additionalParamMap'
-                window.sessionStorage.setItem(
-                  paramStoreId,
-                  JSON.stringify(result.paramMap)
-                )
-              }
-              jumpPageSetting.paramStoreId = paramStoreId
-              // 存入缓存
-              jumpToPageTwo(
-                jumpPageSetting,
-                system,
-                dataId,
-                ids,
-                buttonCode,
-                isHasIdParam
-              ).then((openPageParams) => {
-                // openPageParams:xxx弹框打开页面时需要的参数 或 刷新页面时路由查询参数
-                resolve(openPageParams)
-              })
+          window.$vueApp.config.globalProperties.$http.post(paramPath, paramMap).then((result) => {
+            // 新页面设计中page信息当作附加参数传达跳转到的页面
+            getParamMapWithPageData(jumpPageSetting, result)
+            // 存入缓存
+            jumpToPageTwo(jumpPageSetting, system, dataId, ids, buttonCode, isHasIdParam).then((openPageParams) => {
+              // openPageParams:xxx弹框打开页面时需要的参数 或 刷新页面时路由查询参数
+              resolve(openPageParams)
             })
+          })
         } else {
-          jumpToPageTwo(
-            jumpPageSetting,
-            system,
-            dataId,
-            ids,
-            buttonCode,
-            false
-          ).then((openPageParams) => {
+          // 新页面设计中page信息当作附加参数传达跳转到的页面
+          getParamMapWithPageData(jumpPageSetting)
+          jumpToPageTwo(jumpPageSetting, system, dataId, ids, buttonCode, false).then((openPageParams) => {
             // openPageParams:xxx弹框打开页面时需要的参数 或 刷新页面时路由查询参数
             resolve(openPageParams)
           })
@@ -273,20 +266,57 @@ export function jumpToPage(
   })
 }
 
+// 新页面设计中page信息当作附加参数传达跳转到的页面
+function getParamMapWithPageData(jumpPageSetting, paramResult) {
+  let pageData = jumpPageSetting._pageData
+  if (!pageData) {
+    pageData = {}
+  }
+  if (!paramResult) {
+    paramResult = {}
+  }
+  if (jumpPageSetting._pageData && Object.keys(jumpPageSetting._pageData).length > 0) {
+    // 表示新页面中page数据需要作为跳转页面的附加参数
+    if (!paramResult.uuid) {
+      paramResult.uuid = getUuidv4()
+    }
+    pageData = jumpPageSetting._pageData
+  }
+  if (!paramResult.paramMap) {
+    paramResult.paramMap = {}
+  }
+  const paramMap = { ...pageData, ...paramResult.paramMap }
+  let paramStoreId = ''
+  if (paramResult && paramResult.uuid) {
+    paramStoreId = paramResult.uuid + '_additionalParamMap'
+    window.sessionStorage.setItem(paramStoreId, JSON.stringify(paramMap))
+  }
+  jumpPageSetting.paramStoreId = paramStoreId
+  // 解析标题的值
+  if (paramResult && paramResult.jumpPageTitle) {
+    // 格式如：${obj.ID}aasdfd${obj.name}
+    jumpPageSetting.jumpPageTitle = paramResult.jumpPageTitle
+  }
+}
+
 function getSystem(system, jumpPageUrl, isNewPage, jumpPageSetting) {
   return new Promise((resolve, reject) => {
     if (isFullPath(jumpPageUrl)) {
       resolve(null)
     } else {
-      if ((!system || system === null) || (jumpPageSetting.jumpSystemCode && jumpPageSetting.jumpSystemCode !== system.code)) {
+      if (
+        !system ||
+        system === null ||
+        (jumpPageSetting.jumpSystemCode && jumpPageSetting.jumpSystemCode !== system.code)
+      ) {
         if (jumpPageUrl.indexOf('page:') === 0) {
-          const pageCode = jumpPageUrl.substring(
-            jumpPageUrl.indexOf('page:') + 'page:'.length
-          )
+          const pageCode = jumpPageUrl.substring(jumpPageUrl.indexOf('page:') + 'page:'.length)
           const path =
             window.$vueApp.config.globalProperties.baseAPI +
             '/component/business-systems/with-page-codes/' +
-            pageCode+'?isNewPage='+isNewPage
+            pageCode +
+            '?isNewPage=' +
+            isNewPage
           window.$vueApp.config.globalProperties.$http
             .get(path)
             .then((data) => {
@@ -301,10 +331,7 @@ function getSystem(system, jumpPageUrl, isNewPage, jumpPageSetting) {
           if (!systemCode) {
             systemCode = window.$vueApp.config.globalProperties.systemCode
           }
-          const path =
-            window.$vueApp.config.globalProperties.baseAPI +
-            '/component/business-systems/' +
-            systemCode
+          const path = window.$vueApp.config.globalProperties.baseAPI + '/component/business-systems/' + systemCode
           window.$vueApp.config.globalProperties.$http
             .get(path)
             .then((data) => {
@@ -326,43 +353,27 @@ function isFullPath(path) {
   return path.indexOf('http:') === 0 || path.indexOf('https:') === 0
 }
 // 正式跳转
-function jumpToPageTwo(
-  jumpPageSetting,
-  system,
-  dataId,
-  ids,
-  buttonCode,
-  isHasIdParam
-) {
+function jumpToPageTwo(jumpPageSetting, system, dataId, ids, buttonCode, isHasIdParam) {
   return new Promise((resolve, reject) => {
     const jumpPageUrl = jumpPageSetting.jumpPageUrl
     if (!jumpPageUrl) {
       return
     }
+    const isMobile = isMobileBrowser()
     if (jumpPageUrl.indexOf('page:') === 0) {
       // 表示是自定义系统跳转页面编码
-      jumpWithSuperPage(
-        jumpPageUrl,
-        system,
-        dataId,
-        jumpPageSetting,
-        ids,
-        buttonCode,
-        isHasIdParam
-      ).then((openPageParams) => {
-        resolve(openPageParams)
-      })
-    } else {
-      const additionalParameterStr = analysisAdditionalParameter(
-        jumpPageSetting.paramStoreId
+      jumpWithSuperPage(jumpPageUrl, system, dataId, jumpPageSetting, ids, buttonCode, isHasIdParam, isMobile).then(
+        (openPageParams) => {
+          resolve(openPageParams)
+        }
       )
+    } else {
+      const additionalParameterStr = analysisAdditionalParameter(jumpPageSetting.paramStoreId)
       // 表示是路径，格式如：http://www.baidu.com 或 http://localhost:9600/demo/#/demo/plan/list 或 /demo/plan/list
       let path = jumpPageUrl
       if (jumpPageUrl.indexOf('path:') >= 0) {
         // 兼容历史数据
-        path = jumpPageUrl.substring(
-          jumpPageUrl.indexOf('path:') + 'path:'.length
-        )
+        path = jumpPageUrl.substring(jumpPageUrl.indexOf('path:') + 'path:'.length)
       }
       if (isFullPath(path)) {
         // 表示是全路径，例如：http://www.baidu.com 或 http://localhost:9600/demo/#/demo/plan/list
@@ -372,7 +383,8 @@ function jumpToPageTwo(
         path = frontendUrl + '/#' + path
       }
       const systemName = getSystemNameWithLanguage(system)
-      jumpToPageWithFullPath(
+      // 移动端时会有返回值
+      const fullPath = jumpToPageWithFullPath(
         dataId,
         path,
         additionalParameterStr,
@@ -380,9 +392,14 @@ function jumpToPageTwo(
         ids,
         buttonCode,
         isHasIdParam,
-        systemName
+        systemName,
+        isMobile
       )
-      resolve()
+      if (fullPath) {
+        // 移动端时返回的全路径
+        jumpPageSetting._path = fullPath
+      }
+      resolve(jumpPageSetting)
     }
   })
 }
@@ -401,16 +418,10 @@ function jumpToPageWithFullPath(
   ids,
   buttonCode,
   isHasIdParam,
-  systemName
+  systemName,
+  isMobile
 ) {
-  path = packagePathParams(
-    dataId,
-    path,
-    jumpPage,
-    ids,
-    buttonCode,
-    isHasIdParam
-  )
+  path = packagePathParams(dataId, path, jumpPage, ids, buttonCode, isHasIdParam)
   // 保持这种情况参数传递，是为了解决不同域时获得不到window.sessionStorage中存的附加参数问题
   if (additionalParameterStr && additionalParameterStr !== '') {
     let systemNameParam = ''
@@ -425,6 +436,10 @@ function jumpToPageWithFullPath(
       path += additionalParameterStr + systemNameParam
     }
   }
+  if (isMobile) {
+    // 如果是移动端返回全路径即可
+    return path
+  }
   let jumpMode = 'refresh'
   if (jumpPage) {
     if (jumpPage.jumpPageOpenMode) {
@@ -465,19 +480,8 @@ function jumpToPageWithFullPath(
 }
 
 // path封装参数
-function packagePathParams(
-  dataId,
-  path,
-  jumpPage,
-  ids,
-  buttonCode,
-  isHasIdParam
-) {
-  if (
-    jumpPage.isNeedId === undefined ||
-    jumpPage.isNeedId === null ||
-    jumpPage.isNeedId === true
-  ) {
+function packagePathParams(dataId, path, jumpPage, ids, buttonCode, isHasIdParam) {
+  if (jumpPage.isNeedId === undefined || jumpPage.isNeedId === null || jumpPage.isNeedId === true) {
     if (!isHasIdParam && dataId) {
       // 表示是修改或查看页面，封装id参数
       let paramSeparator = '?'
@@ -517,9 +521,7 @@ function packagePathParams(
       path += '?buttonCode=' + buttonCode
     }
   }
-  if (
-    jumpPage.isNewPage!==undefined && jumpPage.isNewPage === true
-  ) {
+  if (jumpPage.isNewPage !== undefined && jumpPage.isNewPage === true) {
     let paramSeparator = ''
     if (path.indexOf('?') !== -1) {
       paramSeparator = '&'
@@ -527,97 +529,63 @@ function packagePathParams(
       paramSeparator = '?'
     }
     path = path + paramSeparator + 'isNewPage=true'
-  } 
+  }
   return path
 }
 
 function getPageCode(jumpPageUrl) {
   let pageCode
   if (jumpPageUrl && jumpPageUrl.indexOf('page:') !== -1) {
-    pageCode = jumpPageUrl.substring(
-      jumpPageUrl.indexOf('page:') + 'page:'.length
-    )
+    pageCode = jumpPageUrl.substring(jumpPageUrl.indexOf('page:') + 'page:'.length)
   }
   return pageCode
 }
 // 使用页面组件内部调整
-function jumpWithSuperPage(
-  jumpPageUrl,
-  system,
-  dataId,
-  jumpPageSetting,
-  ids,
-  buttonCode,
-  isHasIdParam
-) {
+function jumpWithSuperPage(jumpPageUrl, system, dataId, jumpPageSetting, ids, buttonCode, isHasIdParam, isMobile) {
   return new Promise((resolve, reject) => {
     // 表示是自定义系统跳转页面编码
-    console.log(
-      '----jumpWithSuperPage---',
-      jumpPageUrl,
-      system,
-      dataId,
-      jumpPageSetting
-    )
+    console.log('----jumpWithSuperPage---', jumpPageUrl, system, dataId, jumpPageSetting)
     const pageCode = getPageCode(jumpPageUrl)
     let jumpMode = 'refresh'
-    if (jumpPageSetting) {
-      if (jumpPageSetting.jumpPageOpenMode) {
-        jumpMode = jumpPageSetting.jumpPageOpenMode
-      }
+    if (jumpPageSetting && jumpPageSetting.jumpPageOpenMode) {
+      jumpMode = jumpPageSetting.jumpPageOpenMode
     }
     const jumpJsonData = {
-      jumpMode: jumpMode,
+      jumpMode: jumpMode
     }
-    window.sessionStorage.setItem(
-      pageCode + '-jumpMode',
-      JSON.stringify(jumpJsonData)
-    )
+    window.sessionStorage.setItem(pageCode + '-jumpMode', JSON.stringify(jumpJsonData))
     if (jumpMode === 'popup') {
-      const path = packageOpenUrl(
-        system,
-        pageCode,
-        dataId,
-        jumpPageSetting,
-        jumpMode,
-        ids,
-        buttonCode,
-        isHasIdParam
-      )
+      const path = packageOpenUrl(system, pageCode, dataId, jumpPageSetting, jumpMode, ids, buttonCode, isHasIdParam)
       // 页面布局中的按钮打开
-      const popPageSetting = openDialogWhenPopup(
-        jumpPageSetting,
-        system,
-        pageCode,
-        dataId,
-        jumpMode,
-        ids,
-        buttonCode
-      )
+      const popPageSetting = openDialogWhenPopup(jumpPageSetting, system, pageCode, dataId, jumpMode, ids, buttonCode)
       if (
-        popPageSetting && (jumpPageSetting.isRefreshWhenClosePopup!==undefined && jumpPageSetting.isRefreshWhenClosePopup!==null)
+        popPageSetting &&
+        jumpPageSetting.isRefreshWhenClosePopup !== undefined &&
+        jumpPageSetting.isRefreshWhenClosePopup !== null
       ) {
         popPageSetting.isRefreshWhenClosePopup = jumpPageSetting.isRefreshWhenClosePopup
-      } 
+      }
       popPageSetting._path = path
+      popPageSetting.customSystem = system.code
       resolve(popPageSetting)
     } else if (jumpMode === 'newTab') {
       // 新页签打开
       const path =
-        packageOpenUrl(
-          system,
-          pageCode,
-          dataId,
-          jumpPageSetting,
-          jumpMode,
-          ids,
-          buttonCode,
-          isHasIdParam
-        ) +
+        packageOpenUrl(system, pageCode, dataId, jumpPageSetting, jumpMode, ids, buttonCode, isHasIdParam) +
         '&_t_=' +
         new Date().getTime()
-      window.open(path)
-      resolve()
+      const popPageSetting = {
+        _path: path,
+        pageCode: pageCode,
+        customSystem: system.code,
+        jumpMode: jumpMode
+      }
+      console.log('----jumpWithSuperPage---', isMobile, popPageSetting)
+      if (!isMobile) {
+        // 不是移动端时直接open打开pc新页签
+        window.open(path)
+      }
+      resolve(popPageSetting)
     } else {
       // 刷新页面
       const queryParam = {
@@ -625,7 +593,7 @@ function jumpWithSuperPage(
         customSystem: system.code,
         jumpMode: jumpMode,
         buttonCode: buttonCode,
-        ids: ids ? ids.join(',') : '',
+        ids: ids ? ids.join(',') : ''
       }
       if (
         jumpPageSetting.isNeedId === undefined ||
@@ -641,16 +609,7 @@ function jumpWithSuperPage(
       if (paramStoreId && paramStoreId !== '') {
         queryParam['paramStoreId'] = paramStoreId
       }
-      const path = packageOpenUrl(
-        system,
-        pageCode,
-        dataId,
-        jumpPageSetting,
-        jumpMode,
-        ids,
-        buttonCode,
-        isHasIdParam
-      )
+      const path = packageOpenUrl(system, pageCode, dataId, jumpPageSetting, jumpMode, ids, buttonCode, isHasIdParam)
       queryParam._path = path
       resolve(queryParam)
     }
@@ -666,15 +625,7 @@ function jumpWithSuperPage(
  * @param {*} ids
  * @param {*} buttonCode
  */
-function openDialogWhenPopup(
-  jumpPageSetting,
-  system,
-  pageCode,
-  dataId,
-  jumpMode,
-  ids,
-  buttonCode
-) {
+function openDialogWhenPopup(jumpPageSetting, system, pageCode, dataId, jumpMode, ids, buttonCode) {
   const popPageSetting = {}
   if (jumpPageSetting) {
     popPageSetting.jumpPageTitle = jumpPageSetting.jumpPageTitle
@@ -683,8 +634,7 @@ function openDialogWhenPopup(
     popPageSetting.valueMappings = jumpPageSetting.valueMappings
     popPageSetting.updateValueEvent = jumpPageSetting.updateValueEvent
     popPageSetting.closeEvent = jumpPageSetting.closeEvent
-    popPageSetting.isRefreshWhenClosePopup =
-      jumpPageSetting.isRefreshWhenClosePopup
+    popPageSetting.isRefreshWhenClosePopup = jumpPageSetting.isRefreshWhenClosePopup
   }
   // 是否是自定义系统
   let isDsc = false
@@ -713,16 +663,7 @@ function openDialogWhenPopup(
   return popPageSetting
 }
 
-function packageOpenUrl(
-  system,
-  pageCode,
-  dataId,
-  jumpPageSetting,
-  jumpMode,
-  ids,
-  buttonCode,
-  isHasIdParam
-) {
+function packageOpenUrl(system, pageCode, dataId, jumpPageSetting, jumpMode, ids, buttonCode, isHasIdParam) {
   const frontendUrl = getSystemFrontendUrl(system.frontendUrl)
   let path =
     frontendUrl +
@@ -736,14 +677,7 @@ function packageOpenUrl(
   if (systemName) {
     path += '&_systemName_=' + encodeURI(systemName)
   }
-  return packagePathParams(
-    dataId,
-    path,
-    jumpPageSetting,
-    ids,
-    buttonCode,
-    isHasIdParam
-  )
+  return packagePathParams(dataId, path, jumpPageSetting, ids, buttonCode, isHasIdParam)
 }
 
 function getSystemNameWithLanguage(system) {
@@ -772,10 +706,7 @@ function analysisAdditionalParameterWithMap(additionalParamMap) {
   if (additionalParamMap) {
     const additionalParameterMap = JSON.parse(additionalParamMap)
     const keys = Object.keys(additionalParameterMap)
-    console.log(
-      'analysisAdditionalParameterWithMap--Object.keys(additionalParameterMap)=',
-      keys
-    )
+    console.log('analysisAdditionalParameterWithMap--Object.keys(additionalParameterMap)=', keys)
     for (let i = 0; i < keys.length; i++) {
       if (additionalParameterStr !== '') {
         additionalParameterStr += '&'