dfish-widget 1.0.87 → 1.0.88

package/lib/index.esm.js

@@ -4472,7 +4472,7 @@ script$13.__file = "src/widgets/Img.vue";
 var script$12 = {
     pubParentName: 'w-buttonbar',
     mixins: [script$1h],
-    props: ['text', 'icon', 'focusIcon', 'face', 'target', 'closable', 'loading', 'disabled', 'vertical', 'hoverShowDrop', 'dropProps', 'dropIcon', 'showDropIcon'],
+    props: ['text', 'icon', 'focusIcon', 'face', 'target', 'closable', 'dropToggle', 'loading', 'disabled', 'vertical', 'hoverShowDrop', 'dropProps', 'dropIcon', 'showDropIcon'],
     inject: ['providePubParent', 'provideMenu_w'],
     emits: ['click:close', 'dropClose'],
     data() {
@@ -4482,7 +4482,7 @@ var script$12 = {
         mouses: {
           onmouseenter: e => {
 						if (!this.showDrop) {
-							if (this.pubParent && menuRelate(this.pubParent) && !menuRelate()) ;
+							if (this.pubParent && menuRelate(this.pubParent) && !menuRelate(this)) closeMenu();
 							if(this.x.hoverShowDrop) {
 								this.drop();
 								this.$nextTick(() => e.currentTarget.classList.add('z-hv'));
@@ -4509,14 +4509,23 @@ var script$12 = {
       drop() {
 				if (this.hasChild) {
 					this.showDrop = true;
+				} else {
+					closeMenu();
 				}
+      },
+      isShowDrop() {
+        return this.showDrop
       },
 			closeDrop() {
         this.showDrop = false;
 			},
       onclick(e) {
         if (this.isMore) {
-          this.drop();
+          if (this.showDrop && this.x.dropToggle) {
+            this.closeDrop();
+          } else {
+            this.drop();
+          }
         }
 				if (this.pubParent)
 					this.pubParent.$emit('click:item', e);
@@ -4788,8 +4797,15 @@ script$10.__file = "src/widgets/Button.vue";
 
 let inst = null;
 	
+	function closeMenu() {
+		if (inst) {
+			$$1.close(inst);
+			inst = null;
+		}
+	}
+	
 	function menuRelate(ctx) {
-		return inst 
+		return inst && (ctx.hasBubble(inst.context) || inst.hasBubble(ctx))
 	}
 
   var script$$ = {
@@ -4828,7 +4844,6 @@ let inst = null;
       // implement
       setVisibleSub(a) {
         if (a === false && this.currentMenuButton) {
-          console.log('setVisibleSub');
           this.currentMenuButton.showDrop = false;
           // this.subMenu.setVisibleSub(a)
         }
@@ -4917,12 +4932,12 @@ let inst = null;
 			}
     },
     mounted() {
-      // if (!this.context || (this.context.$options && this.context.$options.name !== 'w-menubutton')) {
-      //   if (inst) {
-      //     $.close(inst)
-      //   }
-      //   inst = this
-      // }
+      if (!this.context || (this.context.$options && this.context.$options.name !== 'w-menubutton')) {
+        if (inst && inst.context !== this.context) {
+          $$1.close(inst);
+        }
+        inst = this;
+      }
     }
   };