agilebuilder-ui 1.1.36 → 1.1.37

package/src/styles/theme/ocean-blue/sidebar.scss

@@ -217,6 +217,15 @@
     }
   }
 
+// 注释的原因：会导致孙子菜单显示的位置不正确
+  // .sidebar-container-popper .el-menu{
+  //   // height: 100vh;
+  //   height: auto;
+  //   max-height: 100vh;
+  //   overflow-y: auto;
+  //   overflow-x: hidden;
+  //   scroll-behavior: smooth;
+  // }
   .sidebar-container-popper .el-submenu__title:not(.is-disabled):hover {
     background: #F7F7F8;
     color: rgba(0, 13, 31, 0.85);

package/src/styles/theme/tiffany-blue-mobile/sidebar.scss

@@ -219,6 +219,15 @@
     }
   }
 
+// 注释的原因：会导致孙子菜单显示的位置不正确
+  // .sidebar-container-popper .el-menu{
+  //   // height: 100vh;
+  //   height: auto;
+  //   max-height: 100vh;
+  //   overflow-y: auto;
+  //   overflow-x: hidden;
+  //   scroll-behavior: smooth;
+  // }
   .sidebar-container-popper .el-submenu__title:not(.is-disabled):hover {
     background: #F7F7F8;
     color: rgba(0, 13, 31, 0.85);

package/src/utils/insert_css.js

@@ -18,7 +18,7 @@ if (!window.insertCssFile) {
         const timestamp = new Date().getTime();
         const link = document.createElement('link');
         link.rel = 'stylesheet';
-        link.href = cssUrl + `?_v=${timestamp}`;
+        link.href = cssUrl;
         link.onload = function () {
             window.insertedCssFiles.add(cssUrl);
         };

package/src/utils/util.js

@@ -624,6 +624,7 @@ export function getPropValueNew(propValue, pageContext, row) {
   let value = null
   if (propValue && propValue !== null && propValue !== '') {
     const entity = pageContext && pageContext.entity ? pageContext.entity.data : null
+    const pageVar = pageContext && pageContext.entity ? pageContext.entity.page : null
     const additionalParamMap = getAdditionalParamMap(pageContext)
     const contextParameterMap = pageContext && pageContext.entity ? pageContext.entity.context : null
     const parentEntity =
@@ -643,6 +644,9 @@ export function getPropValueNew(propValue, pageContext, row) {
         const propName = propValue.replace('${row.', '').replace('}', '')
         value = getEntityFieldValue(row, propName)
       }
+    } else if (propValue.indexOf('${page.') === 0) {
+      const variable = propValue.replace('${page.', '').replace('}', '')
+      value = pageVar ? pageVar[variable] : null
     } else if (
       propValue.includes('${context.') ||
       propValue.includes('${request.') ||
@@ -930,3 +934,18 @@ export function isImage(fileName) {
     return false
   }
 }
+
+export function watchPageContextDynamicVariable(that, pageContext, variable, callback) {
+  const match = variable.match(/\${(.*?)}/)
+  if (!match) return
+  const path = match ? match[1].split('.') : []
+  if (path && path.length > 0) {
+    // 监听 pageContext.entity[type][field][xxx]... 的变化
+    that.$watch(
+      () => path.reduce((obj, key) => obj[key], pageContext.entity),
+      (newVal, oldVal) => {
+        callback(newVal, oldVal)
+      }
+    )
+  }
+}

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

@@ -192,8 +192,8 @@ export default {
 <style lang="scss" scoped>
 .smb-sidebar-menu-item {
   position: relative;
-  --el-menu-item-height: 36px;
-  --el-menu-sub-item-height: 36px;
+  --el-menu-item-height: 45px;
+  --el-menu-sub-item-height: 45px;
   &.el-menu-item, &.el-sub-menu {
     padding: 0 !important;
     &:not(:has(> .el-tooltip__trigger)) {

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

@@ -46,8 +46,10 @@ export default {
 	},
 	data() {
 		const menus = getMenus()
+		const isSelectFirst = window.$vueApp.config.globalProperties.showFirstMenu === undefined ||  window.$vueApp.config.globalProperties.showFirstMenu === null? true : window.$vueApp.config.globalProperties.showFirstMenu
 		return {
 			menus: Object.freeze(menus),
+			isSelectFirst
 		}
 	},
 	computed: {
@@ -138,38 +140,54 @@ export default {
 				const b = new Date().getTime()
 				console.log('菜单组件==>getMyFirstMenu==>b-a', b - a)
 				// 默认不展示第一个有权限的菜单了，可以去掉下面的代码
-				// if (!shouldSelectMenu) {
-				//   shouldSelectMenu = this.getSelectMenuWithFirstMenu(menus[0])
-				// }
+				if (!shouldSelectMenu) {
+				  shouldSelectMenu = this.getSelectMenuWithFirstMenu(menus[0])
+				}
 				return shouldSelectMenu
 			}
 		},
 		getFirstMenu(menus) {
-			if (menus && menus.length > 0) {
-				let shouldSelectMenu
+			const currentMenuCode = this.$route.query
+					? this.$route.query._menuCode
+					: null
+			let shouldSelectMenu
+			if(currentMenuCode){
+				// 表示需要选中指定的菜单
+				this.isSelectFirst = true
+			} else {
+				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]
-					shouldSelectMenu = this.getShouldSelectMenu(menu)
+					shouldSelectMenu = this.getShouldSelectMenu(menu, currentMenuCode)
 					if (shouldSelectMenu) {
 						// 表示获得到了应该选中的菜单
 						break
 					}
 				}
-				return shouldSelectMenu
 			}
+			console.log('getFirstMenu=====shouldSelectMenu222=', shouldSelectMenu)
+			return shouldSelectMenu
 		},
-		getShouldSelectMenu(menu) {
-			// console.log('dsc--getShouldSelectMenu--this.$route=', this.$route)
-			const currentMenuCode = this.$route.query
-					? this.$route.query._menuCode
-					: null
-			if (menu && currentMenuCode) {
+		getShouldSelectMenu(menu, currentMenuCode) {
+			if (menu) {
 				let shouldSelectMenu
-				const children = menu.children
-				if (children && children.length > 0) {
-					shouldSelectMenu = this.getFirstMenu(children)
-				} else if (menu.code && menu.code === currentMenuCode) {
-					shouldSelectMenu = menu
+				if(currentMenuCode){
+					const children = menu.children
+					if (children && children.length > 0) {
+						shouldSelectMenu = this.getFirstMenu(children)
+					} else if (menu.code && menu.code === currentMenuCode) {
+						shouldSelectMenu = menu
+					}
+				} else {
+					const children = menu.children
+					if (children && children.length > 0) {
+						shouldSelectMenu = this.getFirstMenu(children)
+					} else {
+						shouldSelectMenu = menu
+					}
 				}
 				return shouldSelectMenu
 			}

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

@@ -40,15 +40,6 @@ export default defineComponent({
     let iconsData = [h('i', { class: 'amb-iconfont amb-icon-meun_post' })]
     if (icon) {
       iconsData = [h(SuperIcon, { iconValue: icon })]
-      // if (icon.indexOf('amb-icon') === 0) {
-      // 	iconsData = [h('i',{class: 'amb-iconfont ' + icon})]
-      // } else if (icon.indexOf('fa-') === 0) {
-      // 	iconsData = [h('i',{class: 'fa ' + icon})]
-      // } else if (icon.indexOf('svg-') === 0) {
-      // 	iconsData = [h(SvgIcon,{'icon-class': icon.substring(icon.indexOf('svg-') + 4)})]
-      // } else {
-      // 	iconsData = [h('i',{class: icon + ' svg-icon'})]
-      // }
     }
     vnodes.push(h('div', { class: ['smb-sidebar-menu-item-icon'] }, iconsData))
     if (title) {

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

@@ -254,8 +254,8 @@ export default {
 <style lang="scss" scoped>
 .smb-sidebar-menu-item {
   position: relative;
-  --el-menu-item-height: 36px;
-  --el-menu-sub-item-height: 36px;
+  --el-menu-item-height: 45px;
+  --el-menu-sub-item-height: 45px;
   &.el-menu-item, &.el-sub-menu {
     padding: 0 !important;
     &:not(:has(> .el-tooltip__trigger)) {

package/src/views/layout/components/Sidebar/Item.vue

@@ -9,7 +9,10 @@ export default function render(_props, _context) {
 	}
 	const { icon, title, hasChildren } = context.props
 	const vnodes = []
-	let iconsData = <svg-icon icon-class={ icon || 'meun_post'} />
+	let iconsData = [h('i', { class: 'amb-iconfont amb-icon-meun_post' })]
+    if (icon) {
+      iconsData = [h(SuperIcon, { iconValue: icon })]
+    }
 
 	vnodes.push(<div class="smb-sidebar-menu-item-icon">{ iconsData }</div>)
 

package/src/views/layout/components/Sidebar/SidebarItem.vue

@@ -140,8 +140,8 @@ export default {
 <style lang="scss" scoped>
 .smb-sidebar-menu-item {
   position: relative;
-  --el-menu-item-height: 36px;
-  --el-menu-sub-item-height: 36px;
+  --el-menu-item-height: 45px;
+  --el-menu-sub-item-height: 45px;
   &.el-menu-item, &.el-sub-menu {
     padding: 0 !important;
     &:not(:has(> .el-tooltip__trigger)) {