dfish-widget 1.0.107 → 1.0.108

package/lib/index.esm.js

@@ -3538,7 +3538,7 @@ const O = {},
     T = true,
     F = false;
 
-  const positionHooks = {
+  const positionCodes = {
     t: 'tt', r: 'rr', b: 'bb', l: 'll', c: 'cc', lt: '11', tl: '11', tr: '22', rt: '22', rb: '33', br: '33', bl: '44', lb: '44',
     '-t': 'tb', '-r': 'rl', '-b': 'bt', '-l': 'lr', '-c': 'cc', '-tl': '14', '-tr': '23', '-rt': '21', '-rb': '34', '-bl': '41', '-br': '32', '-lt': '12', '-lb': '43',
   };
@@ -3546,7 +3546,7 @@ const O = {},
 	const boundary = ['minWidth', 'maxWidth', 'minHeight', 'maxHeight'];
 
 	const dialogPosition = (a) => {
-	  return typeof a === 'string' && a.split(',').map(v => positionHooks[v] || v).join()
+	  return typeof a === 'string' && a.split(',').map(v => positionCodes[v] || v).join()
 	};
 
   var script$1b = {
@@ -3859,7 +3859,7 @@ const O = {},
           ['z-face-' + this.x.face]: this.x.face,
 				  ['z-mag-' + (r.mag_t ? 't' : r.mag_l ? 'l' : r.mag_b ? 'b' : 'r')]: r.type,
 				  ['z-snap z-snap-' + r.type]: r.type,
-					[`w-dialog-animate-${p}`]: p && typeof p === 'string' && this.animateState != 'animating'
+					[`w-dialog-animate-${p}`]: positionCodes[p] && typeof p === 'string' && this.animateState != 'animating'
 				}]
       },
       html_style() {
@@ -4494,7 +4494,7 @@ script$14.__file = "src/widgets/Img.vue";
 var script$13 = {
     pubParentName: 'w-buttonbar',
     mixins: [script$1i],
-    props: ['text', 'icon', 'focusIcon', 'face', 'target', 'closable', 'dropToggle', 'loading', 'disabled', 'vertical', 'hoverShowDrop', 'dropProps', 'dropIcon', 'showDropIcon'],
+    props: ['text', 'icon', 'focusIcon', 'dropIcon', 'focusDropIcon', 'arrowIcon', 'face', 'target', 'closable', 'dropToggle', 'loading', 'disabled', 'vertical', 'hoverShowDrop', 'dropProps', 'showArrowIcon'],
     inject: ['providePubParent', 'provideMenu_w'],
     emits: ['click:close', 'dropClose'],
     data() {
@@ -4594,8 +4594,11 @@ var script$13 = {
           })));
         }
         if (this.x.icon) {
-          r.push(this.html_icon(this.x.focusIcon && this.isCurrent ? this.x.focusIcon : this.x.icon,
-            'w-button-icon f-flex-center' + (this.x.vertical ? '' : ' f-height')));
+          let icon = this.x.focusDropIcon && this.isCurrent && this.showDrop ? this.x.focusDropIcon :
+            this.x.focusIcon && this.isCurrent ? this.x.focusIcon :
+            this.x.dropIcon && this.showDrop ? this.x.dropIcon :
+            this.x.icon;
+          r.push(this.html_icon(icon, 'w-button-icon f-flex-center' + (this.x.vertical ? '' : ' f-height')));
         }
         if (t) {
 					const title = this.pubParent && this.pubParent.x.flexSize && t;
@@ -4603,10 +4606,10 @@ var script$13 = {
             class: 'w-button-text'
           }, h('span', {class: 'w-button-text-line f-line-1', title}, t)));
         }
-        if (this.isMore && this.x.showDropIcon) {
+        if (this.isMore && this.x.showArrowIcon) {
           r.push(h(script$14, {
             class: 'w-button-more f-flex-center f-height',
-            src: this.x.dropIcon || '.f-i .f-i-caret-down'
+            src: this.x.arrowIcon || '.f-i .f-i-caret-down'
           }));
         }
         if (this.x.closable) {
@@ -4624,7 +4627,7 @@ var script$13 = {
           }, r),
           this.isCombo && h(script$14, {
             class: 'w-button-drop f-flex-center f-height',
-            src: this.x.dropIcon || '.f-i .f-i-caret-down',
+            src: '.f-i .f-i-caret-down',
             ...(!this.isDisabled && this.mouses),
             onclick: this.clickDrop
           }),
@@ -4647,7 +4650,7 @@ var script$13 = {
         return this.hasChild && !this.getOn('click')
       },
       isCombo() {
-        return !!(this.hasChild && this.x.showDropIcon && this.getOn('click'))
+        return !!(this.hasChild && this.x.showArrowIcon && this.getOn('click'))
       },
       isDisabled() {
         return !!this.x.disabled || !!this.x.loading
@@ -4742,7 +4745,7 @@ var script$12 = {
         }
         r.push(h(script$14, {
           class: 'w-menubutton-drop f-flex-center f-height',
-          src: this.isMore ? (this.x.dropIcon || '.f-i .f-i-caret-right') : ''
+          src: this.isMore ? (this.x.arrowIcon || '.f-i .f-i-caret-right') : ''
         }));
         if (this.showDrop) {
 					let dropProps = {
@@ -4801,7 +4804,7 @@ var script$11 = {
     methods: {
       x_default() {
         return {
-          showDropIcon: true,
+          showArrowIcon: true,
           autoMenuButton: true,
         }
       },
@@ -6324,25 +6327,13 @@ var script$K = {
 						gut.push(h(script$11, {
 							ref: 'quickCloseButton',
 							data: {isQuickCloseButton: true},
-							showDropIcon: false,
+							showArrowIcon: false,
 							icon: '.f-i .f-i-close',
 							class: 'w-tabbar-quickclosebutton',
               onClick: this.closeAll,
               disabled: closeAllDisabled,
               title: '关闭全部标签'
 						}));
-						// gut.push(h(Button, {
-						// 	ref: 'quickCloseButton',
-						// 	data: {isQuickCloseButton: true},
-						// 	showDropIcon: false,
-						// 	icon: '.f-i .f-i-ellipsis',
-						// 	class: 'w-tabbar-quickclosebutton',
-						// 	onDropClose: this.onMouseleave
-						// }, {
-						// 	default: () => [
-						// 		h(Button, {text: '关闭全部标签', onClick: this.closeAll, disabled: closeAllDisabled})
-						// 	]
-						// }))
 					}
 				}
         return this.html_scroll_slots(gut)