Merge branch 'master' into v4.0
This commit is contained in:
		@@ -1,6 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
  "name": "vue-element-admin",
 | 
			
		||||
  "version": "3.9.2",
 | 
			
		||||
  "version": "3.9.3",
 | 
			
		||||
  "description": "A magical vue admin. Typical templates for enterprise applications. Newest development stack of vue. Lots of awesome features",
 | 
			
		||||
  "author": "Pan <panfree23@gmail.com>",
 | 
			
		||||
  "license": "MIT",
 | 
			
		||||
 
 | 
			
		||||
@@ -121,11 +121,21 @@ export default {
 | 
			
		||||
      this.$router.push('/')
 | 
			
		||||
    },
 | 
			
		||||
    openMenu(tag, e) {
 | 
			
		||||
      const menuMinWidth = 105
 | 
			
		||||
      const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
 | 
			
		||||
      const offsetWidth = this.$el.offsetWidth // container width
 | 
			
		||||
      const maxLeft = offsetWidth - menuMinWidth // left boundary
 | 
			
		||||
      const left = e.clientX - offsetLeft + 15 // 15: margin right
 | 
			
		||||
 | 
			
		||||
      if (left > maxLeft) {
 | 
			
		||||
        this.left = maxLeft
 | 
			
		||||
      } else {
 | 
			
		||||
        this.left = left
 | 
			
		||||
      }
 | 
			
		||||
      this.top = e.clientY
 | 
			
		||||
 | 
			
		||||
      this.visible = true
 | 
			
		||||
      this.selectedTag = tag
 | 
			
		||||
      const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
 | 
			
		||||
      this.left = e.clientX - offsetLeft + 15 // 15: margin right
 | 
			
		||||
      this.top = e.clientY
 | 
			
		||||
    },
 | 
			
		||||
    closeMenu() {
 | 
			
		||||
      this.visible = false
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user