agilebuilder-ui 1.0.12 → 1.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/super-grid/src/super-grid.vue

@@ -2945,8 +2945,27 @@ export default {
       const popPageSetting = openPageParams
       if (jumpMode === 'popup') {
         // 弹出页面
-        this.jumpPageSetting = popPageSetting
+        const gridParams = store.get(this.code)
+        this.jumpPageSetting = popPageSetting 
         this.$emit('open-grid-dialog', this.jumpPageSetting)
+        const isSubTableShowPage = gridParams.isSubTableShowPage
+        // 每页显示多少条
+        const pageSize = gridParams.pagination && gridParams.pagination.pageSize
+        const isMobile = false
+        const row = popPageSetting.row
+        const eventParams = {
+          position: popPageSetting._position,
+          listCode: popPageSetting._listCode,
+          rowIndex: popPageSetting._rowIndex,
+          row: popPageSetting.row,
+          id: row?(row.ID?row.ID:row.id):null,
+          isMobile,
+          gridData: isSubTableShowPage
+                ? gridParams.subTableData
+                : gridParams.gridData,
+          pageGridData: isSubTableShowPage ? gridParams.gridData : null,
+          pageSize }
+        this.$emit('new-open-grid-dialog', {pageContext: this.pageContext,configureObj: this.configureObj, eventParams})
         this.isShowPageDialog = true
       } else if (jumpMode === 'refresh') {
         this.$router.push({ path: '/dsc/page', query: popPageSetting })

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

@@ -514,6 +514,17 @@ function packagePathParams(
       path += '?buttonCode=' + buttonCode
     }
   }
+  if (
+    jumpPage.isNewPage!==undefined && jumpPage.isNewPage === true
+  ) {
+    let paramSeparator = ''
+    if (path.indexOf('?') !== -1) {
+      paramSeparator = '&'
+    } else {
+      paramSeparator = '?'
+    }
+    path = path + paramSeparator + 'isNewPage=' + dataId
+  } 
   return path
 }
 
@@ -580,6 +591,11 @@ function jumpWithSuperPage(
         ids,
         buttonCode
       )
+      if (
+        popPageSetting && (jumpPageSetting.isRefreshWhenClosePopup!==undefined && jumpPageSetting.isRefreshWhenClosePopup!==null)
+      ) {
+        popPageSetting.isRefreshWhenClosePopup = jumpPageSetting.isRefreshWhenClosePopup
+      } 
       popPageSetting._path = path
       resolve(popPageSetting)
     } else if (jumpMode === 'newTab') {

package/src/views/dsc-component/Sidebar/SidebarItem.vue

@@ -3,7 +3,7 @@
     <template v-if="!item.children || item.children.lenght === 0">
       <app-link :to="toPath(item)" @click="clickMenu(toPath(item))">
         <el-menu-item
-          :index="resolvePath(item.code, item.path, item.pageType)"
+          :index="resolvePath(item.code, item.path, item.pageType, item.newPage)"
           :class="{ 'submenu-title-noDropdown': !isNest }"
         >
           <item
@@ -17,7 +17,7 @@
 
     <el-sub-menu
       v-else
-      :index="resolvePath(item.code, item.path, item.pageType)"
+      :index="resolvePath(item.code, item.path, item.pageType, item.newPage)"
       :show-timeout="0"
       :hide-timeout="50"
       popper-class="sidebar-container-popper"
@@ -39,7 +39,7 @@
         />
         <app-link v-else :to="toPath(child)" @click="clickMenu(toPath(child))">
           <el-menu-item
-            :index="resolvePath(child.code, child.path, child.pageType)"
+            :index="resolvePath(child.code, child.path, child.pageType, child.newPage)"
           >
             <item :icon="child.iconName" :title="getI18nName(child)" />
           </el-menu-item>
@@ -100,11 +100,11 @@ export default {
 
       return false
     },
-    resolvePath(menuCode, pageCode, pageType) {
+    resolvePath(menuCode, pageCode, pageType, isNewPage) {
       if (this.isExternalLink(pageType)) {
-        return '/dsc/' + menuCode + '~~'
+        return '/dsc/' + menuCode + '~~' + pageCode + '~~' + isNewPage
       } else {
-        return '/dsc/' + menuCode + '~~' + pageCode
+        return '/dsc/' + menuCode + '~~' + pageCode + '~~' + isNewPage
       }
     },
     toPath(menu) {
@@ -115,6 +115,7 @@ export default {
         toPathObj.path = '/dsc-index/iframe-page'
         toPathObj.tabPath = '/dsc/iframe-page'
         toPathObj.query = {}
+        toPathObj.query.isNewPage=menu.newPage
         toPathObj.query.src = routePath
         toPathObj.isExternal = true
         // 如果路径中没有拼系统编码，才需要把系统编码放到参数中
@@ -128,6 +129,7 @@ export default {
         toPathObj.tabPath = '/dsc/page'
         toPathObj.query = {}
         toPathObj.query.pageCode = pageCode
+        toPathObj.query.isNewPage= menu.newPage
         toPathObj.query.customSystem =
           window.$vueApp.config.globalProperties.customSystem
         toPathObj.query._menuCode = menu.code
@@ -167,12 +169,30 @@ export default {
         if (toPathObj.query.customSystem) {
           url += 'customSystem=' + toPathObj.query.customSystem
         }
+        if (url && url.indexOf('?') > 0) {
+          url += '&'
+        } else {
+          url += '?'
+        }
         if (toPathObj.query._menuCode) {
           url += '_menuCode=' + toPathObj.query._menuCode
         }
+        if (url && url.indexOf('?') > 0) {
+          url += '&'
+        } else {
+          url += '?'
+        }
         if (toPathObj.query._menuCode) {
           url += '_menuName=' + toPathObj.query._menuName
         }
+        if (url && url.indexOf('?') > 0) {
+          url += '&'
+        } else {
+          url += '?'
+        }
+        if (toPathObj.query.isNewPage) {
+          url += 'isNewPage=' + toPathObj.query.isNewPage
+        }
         window.open(url, toPathObj.query._menuCode)
       } else {
         // 刷新页签打开菜单

package/src/views/dsc-component/Sidebar/index.vue

@@ -76,6 +76,7 @@ export default {
 					path: path,
 					_menuCode: this.firstLeafMenu.code,
 					_menuName: getI18nName(this.firstLeafMenu),
+					isNewPage: this.firstLeafMenu.newPage
 				}
 				this.addTabs(
 						query,
@@ -91,6 +92,7 @@ export default {
 					pageCode: pageCode,
 					_menuCode: this.firstLeafMenu.code,
 					_menuName: getI18nName(this.firstLeafMenu),
+					isNewPage: this.firstLeafMenu.newPage
 				}
 				this.addTabs(
 						query,
@@ -190,9 +192,11 @@ export default {
 				if (cookieMenu) {
 					//   // 表示缓存中存储了menu，格式为：/dsc/菜单编码~~pageCode
 					const prefix = '/dsc/'
-					const menuCode = cookieMenu.substring(
-							cookieMenu.indexOf(prefix) + prefix.length,
-							cookieMenu.lastIndexOf('~~')
+					//  '/dsc/' + menuCode + '~~' + pageCode + '~~' + isNewPage
+					const menuInfoArr = cookieMenu.split('~~')
+					const pathPrefix = menuInfoArr[0]
+					const menuCode = pathPrefix.substring(
+							cookieMenu.indexOf(prefix) + prefix.length
 					)
 
 					let shouldSelectMenu