agilebuilder-ui 1.1.36-sit4 → 1.1.36-tmp1

package/src/store/modules/table.js

@@ -68,6 +68,7 @@ const app = {
      * @param {Object} context - 上下文对象
      */
     clearAllEditing({ commit }) {
+      debugger
       commit('clearAllEditing');
     }
   },

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

@@ -220,15 +220,6 @@
     }
   }
 
-// 注释的原因：会导致孙子菜单显示的位置不正确
-  // .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/gray/sidebar.scss

@@ -189,15 +189,14 @@
     }
   }
 
-// 注释的原因：会导致孙子菜单显示的位置不正确
-  // .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-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;

package/src/styles/theme/green/sidebar.scss

@@ -223,16 +223,6 @@
     }
   }
 
-// 注释的原因：会导致孙子菜单显示的位置不正确
-  // .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/ocean-blue/sidebar.scss

@@ -217,15 +217,6 @@
     }
   }
 
-// 注释的原因：会导致孙子菜单显示的位置不正确
-  // .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,15 +219,6 @@
     }
   }
 
-// 注释的原因：会导致孙子菜单显示的位置不正确
-  // .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;
+        link.href = cssUrl + `?_v=${timestamp}`;
         link.onload = function () {
             window.insertedCssFiles.add(cssUrl);
         };

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: 45px;
-  --el-menu-sub-item-height: 45px;
+  --el-menu-item-height: 36px;
+  --el-menu-sub-item-height: 36px;
   &.el-menu-item, &.el-sub-menu {
     padding: 0 !important;
     &:not(:has(> .el-tooltip__trigger)) {

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

@@ -46,10 +46,8 @@ 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: {
@@ -140,54 +138,38 @@ 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) {
-			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) {
+			if (menus && menus.length > 0) {
+				let shouldSelectMenu
 				for (let i = 0; i < menus.length; i++) {
 					const menu = menus[i]
-					shouldSelectMenu = this.getShouldSelectMenu(menu, currentMenuCode)
+					shouldSelectMenu = this.getShouldSelectMenu(menu)
 					if (shouldSelectMenu) {
 						// 表示获得到了应该选中的菜单
 						break
 					}
 				}
+				return shouldSelectMenu
 			}
-			console.log('getFirstMenu=====shouldSelectMenu222=', shouldSelectMenu)
-			return shouldSelectMenu
 		},
-		getShouldSelectMenu(menu, currentMenuCode) {
-			if (menu) {
+		getShouldSelectMenu(menu) {
+			// console.log('dsc--getShouldSelectMenu--this.$route=', this.$route)
+			const currentMenuCode = this.$route.query
+					? this.$route.query._menuCode
+					: null
+			if (menu && currentMenuCode) {
 				let shouldSelectMenu
-				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
-					}
+				const children = menu.children
+				if (children && children.length > 0) {
+					shouldSelectMenu = this.getFirstMenu(children)
+				} else if (menu.code && menu.code === currentMenuCode) {
+					shouldSelectMenu = menu
 				}
 				return shouldSelectMenu
 			}

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

@@ -40,6 +40,15 @@ 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: 45px;
-  --el-menu-sub-item-height: 45px;
+  --el-menu-item-height: 36px;
+  --el-menu-sub-item-height: 36px;
   &.el-menu-item, &.el-sub-menu {
     padding: 0 !important;
     &:not(:has(> .el-tooltip__trigger)) {

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

@@ -9,10 +9,7 @@ export default function render(_props, _context) {
 	}
 	const { icon, title, hasChildren } = context.props
 	const vnodes = []
-	let iconsData = [h('i', { class: 'amb-iconfont amb-icon-meun_post' })]
-    if (icon) {
-      iconsData = [h(SuperIcon, { iconValue: icon })]
-    }
+	let iconsData = <svg-icon icon-class={ icon || 'meun_post'} />
 
 	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: 45px;
-  --el-menu-sub-item-height: 45px;
+  --el-menu-item-height: 36px;
+  --el-menu-sub-item-height: 36px;
   &.el-menu-item, &.el-sub-menu {
     padding: 0 !important;
     &:not(:has(> .el-tooltip__trigger)) {

package/vite.config.js

@@ -30,7 +30,7 @@ export default defineConfig(({ mode }) => ({
     }, //库编译模式配置
     rollupOptions: {
       // 确保外部化处理那些你不想打包进库的依赖
-      external: ["vue", "jsx"],
+      external: ["vue"],
       output: {
         // 在 UMD 构建模式下为这些外部化的依赖提供一个全局变量
         globals: {