agilebuilder-ui 1.0.47 → 1.0.49

package/package.json

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

package/packages/plugins/export-data-new.js

@@ -119,7 +119,8 @@ function exportResultData(
           uuid,
           isAsync,
           pageCode,
-          isPermission
+          isPermission,
+          exportOptions
         )
           .then((result) => {
             resolve(result)
@@ -263,7 +264,8 @@ function exportListData(
   uuid,
   isAsync,
   pageCode,
-  isPermission
+  isPermission,
+  exportOptions
 ) {
   return new Promise((resolve, reject) => {
     const gridParams = getGridParams(listCode)
@@ -309,9 +311,13 @@ function exportListData(
       param['pageCode'] = pageCode
       // 导出按钮是否需要验证权限
       param['isPermission'] = isPermission
+      let baseUrl = exportOptions ? exportOptions.backendUrl : null
+      if(!baseUrl){
+        baseUrl = window.$vueApp.config.globalProperties.baseURL
+      }
       window.$vueApp.config.globalProperties.$http
         .post(
-          window.$vueApp.config.globalProperties.baseURL +
+          baseUrl +
             '/dsc/commons/export-list-data',
           param
         )

package/src/views/layout/components/Menubar/index.vue

@@ -104,6 +104,7 @@ export default {
 					this.firstLeafMenu.code + '~~' + this.firstLeafMenu.i18nValue
 			window.$vueApp.config.globalProperties._selectMenu = this.defaultActive
 		}
+			console.log('getFirstMenu=====firstLeafMenu333=', this.firstLeafMenu)
 		if (this.firstLeafMenu && this.firstLeafMenu.fullPath) {
 			// 跳转到第一个页面
 			if (
@@ -125,7 +126,11 @@ export default {
 						'/iframe-page/page'
 				)
 				// this.$router.push({ path: '/iframe-page/page', query: query })
-				this.$router.push({path: '/tab-content-iframe-index', query: query})
+				let routePath = '/tab-content-iframe-index'
+				if(this.isDevp){
+					routePath = '/devp-project/setting'
+				}
+				this.$router.push({path: routePath, query: query})
 			} else {
 				const query = {
 					customSystem: this.systemCode,
@@ -161,8 +166,11 @@ export default {
 				// 表示需要选中指定的菜单
 				this.isSelectFirst = true
 			} else {
-				shouldSelectMenu = this.getFirstMenuWithCookie(menus)
+				if(!this.isDevp){
+					shouldSelectMenu = this.getFirstMenuWithCookie(menus)
+				}
 			}
+			console.log('getFirstMenu=====shouldSelectMenu111=', shouldSelectMenu)
 			if (this.isSelectFirst && !shouldSelectMenu && menus && menus.length > 0) {
 				for (let i = 0; i < menus.length; i++) {
 					const menu = menus[i]
@@ -173,6 +181,7 @@ export default {
 					}
 				}
 			}
+			console.log('getFirstMenu=====shouldSelectMenu222=', shouldSelectMenu)
 			return shouldSelectMenu
 		},
 		getShouldSelectMenu(menu, currentMenuCode) {