dfish-widget 1.0.81 → 1.0.84

package/lib/index.esm.js

@@ -2,7 +2,7 @@ import lodash from 'lodash';
 import jquery from 'jquery';
 import http from 'axios';
 import Qs from 'qs';
-import { nextTick, h, mergeProps, toRaw, resolveComponent, openBlock, createElementBlock, createStaticVNode, createElementVNode, createBlock, withCtx, Fragment, createVNode, renderList, toDisplayString, createTextVNode, createCommentVNode, Teleport, computed, resolveDirective, withDirectives, unref, renderSlot, ref, onMounted, watch, normalizeClass, normalizeStyle, TransitionGroup, getCurrentInstance, createSlots, resolveDynamicComponent, withModifiers } from 'vue';
+import { nextTick, h, mergeProps, toRaw, resolveComponent, openBlock, createElementBlock, createStaticVNode, createElementVNode, createBlock, withCtx, Fragment, createVNode, renderList, toDisplayString, createTextVNode, createCommentVNode, inject, provide, renderSlot, Teleport, computed, resolveDirective, withDirectives, unref, ref, onMounted, watch, normalizeClass, normalizeStyle, TransitionGroup, getCurrentInstance, createSlots, resolveDynamicComponent, withModifiers } from 'vue';
 import ResizeObserver$1 from 'resize-observer-polyfill';
 
 let u = navigator.userAgent.toLowerCase();
@@ -1834,7 +1834,7 @@ function directive(Vue) {
 
 const bindCache = {};
 
-  var script$1n = {
+  var script$1o = {
     props: ['data', 'width', 'height', 'colspan', 'rowspan', 'ownproperty', 'orientUid'],
     data() {
       return {
@@ -2096,9 +2096,9 @@ const bindCache = {};
     }
   };
 
-script$1n.__file = "src/widgets/WidgetAbs.vue";
+script$1o.__file = "src/widgets/WidgetAbs.vue";
 
-var script$1m = {
+var script$1n = {
     props: ['src', 'children', 'parentItem'],
     data() {
       return {
@@ -2132,11 +2132,11 @@ var script$1m = {
     }
   };
 
-script$1m.__file = "src/widgets/SrcParent.vue";
+script$1n.__file = "src/widgets/SrcParent.vue";
 
-var script$1l = {
+var script$1m = {
     name: 'w-view',
-    mixins: [script$1m],
+    mixins: [script$1n],
     provide() {
       return {
         provideView: this
@@ -2342,9 +2342,9 @@ var script$1l = {
     }
   };
 
-script$1l.__file = "src/widgets/ViewAbs.vue";
+script$1m.__file = "src/widgets/ViewAbs.vue";
 
-var script$1k = {
+var script$1l = {
     name: 'w-svg-loading'
   };
 
@@ -2374,10 +2374,10 @@ function render$8(_ctx, _cache, $props, $setup, $data, $options) {
   return (openBlock(), createElementBlock("svg", _hoisted_1$b, _hoisted_6$3))
 }
 
-script$1k.render = render$8;
-script$1k.__file = "src/assets/SVGIcon.vue";
+script$1l.render = render$8;
+script$1l.__file = "src/assets/SVGIcon.vue";
 
-var script$1j = {
+var script$1k = {
     props: ['data'],
     data() {
       return {
@@ -2491,10 +2491,10 @@ function render$7(_ctx, _cache, $props, $setup, $data, $options) {
   }))
 }
 
-script$1j.render = render$7;
-script$1j.__file = "src/template/TemplatePreviewMedia.vue";
+script$1k.render = render$7;
+script$1k.__file = "src/template/TemplatePreviewMedia.vue";
 
-var script$1i = {
+var script$1j = {
     props: ['data'],
     data() {
       let f = this.data.format || 'yyyy-MM-dd';
@@ -2995,12 +2995,12 @@ function render$6(_ctx, _cache, $props, $setup, $data, $options) {
   }))
 }
 
-script$1i.render = render$6;
-script$1i.__file = "src/template/TemplateDateSheet.vue";
+script$1j.render = render$6;
+script$1j.__file = "src/template/TemplateDateSheet.vue";
 
-var script$1h = {
+var script$1i = {
     name: 'w-docview',
-    mixins: [script$1n, script$1l],
+    mixins: [script$1o, script$1m],
     provide() {
       return {
         providePubParent: null,
@@ -3022,15 +3022,15 @@ var script$1h = {
         return null
       },
       previewVideo(src) {
-        this.pop(script$1j, {data: {type: 'video', src}});
+        this.pop(script$1k, {data: {type: 'video', src}});
       },
       previewImage(imgs, options) {
-        this.pop(script$1j, {data: {type: 'image', imgs, options}});
+        this.pop(script$1k, {data: {type: 'image', imgs, options}});
       },
       //dateOptions: {value, format, minValue, maxValue, success}
       dateSheet(dateOptions, dialogOptions) {
-        this.pop(script$1i, {
-          template: script$1i,
+        this.pop(script$1j, {
+          template: script$1j,
           width: '100%',
           height: '55%',
           position: 'b',
@@ -3046,20 +3046,20 @@ var script$1h = {
         return [
           this.$slots.default && this.$slots.default(),
           this.html_pops(),
-          h(script$1k),
+          h(script$1l),
         ]
       }
     }
   };
 
-script$1h.__file = "src/widgets/DocView.vue";
+script$1i.__file = "src/widgets/DocView.vue";
 
-var script$1g = {
-    mixins: [script$1n],
+var script$1h = {
+    mixins: [script$1o],
     inject: ['provideView']
   };
 
-script$1g.__file = "src/widgets/WidgetBase.vue";
+script$1h.__file = "src/widgets/WidgetBase.vue";
 
 const onScroll = function(e) {
     if (this.wScrollPercentX) {
@@ -3100,8 +3100,8 @@ const onScroll = function(e) {
     }, dnEv);
   };
 
-  var script$1f = {
-    mixins: [script$1g],
+  var script$1g = {
+    mixins: [script$1h],
     props: ['scrollX', 'scrollY', 'scrollView', 'scrollFlex'],
     data() {
       return {
@@ -3330,7 +3330,7 @@ const onScroll = function(e) {
         }
       },
       scroll_observe(ob) {
-        if (this.isDeactivated) return
+        if (this.isDeactivated) return        
         this.initScroll();
 				this.onScrollResize(ob);
         this.$refs.wScrollOverflow && this.$refs.wScrollOverflow.dispatchEvent(new Event('scroll'));
@@ -3387,9 +3387,9 @@ const onScroll = function(e) {
     }
   };
 
-script$1f.__file = "src/widgets/Scroll.vue";
+script$1g.__file = "src/widgets/Scroll.vue";
 
-var script$1e = {
+var script$1f = {
     props: ['align', 'valign', 'gap'],
     computed: {
       dir() {
@@ -3404,11 +3404,11 @@ var script$1e = {
     }
   };
 
-script$1e.__file = "src/widgets/AlignParent.vue";
+script$1f.__file = "src/widgets/AlignParent.vue";
 
-var script$1d = {
+var script$1e = {
     name: 'w-horizontal',
-    mixins: [script$1f, script$1e],
+    mixins: [script$1g, script$1f],
     props: ['br', 'reverse'],
     provide() {
       return {
@@ -3460,11 +3460,11 @@ var script$1d = {
     }
   };
 
-script$1d.__file = "src/widgets/Horizontal.vue";
+script$1e.__file = "src/widgets/Horizontal.vue";
 
-var script$1c = {
+var script$1d = {
     name: 'w-vertical',
-    mixins: [script$1d],
+    mixins: [script$1e],
     computed: {
       dir() {
         return 'v'
@@ -3472,11 +3472,11 @@ var script$1c = {
     }
   };
 
-script$1c.__file = "src/widgets/Vertical.vue";
+script$1d.__file = "src/widgets/Vertical.vue";
 
-var script$1b = {
+var script$1c = {
     name: 'w-view',
-    mixins: [script$1c, script$1l],
+    mixins: [script$1d, script$1m],
     inject: ['provideView'],
     methods: {
 			html_slots() {
@@ -3493,7 +3493,24 @@ var script$1b = {
     }
   };
 
-script$1b.__file = "src/widgets/View.vue";
+script$1c.__file = "src/widgets/View.vue";
+
+var script$1b = {
+  __name: 'DialogTarget',
+  setup(__props) {
+
+  const dialogView = inject('provideView', null);
+  const provideView = dialogView && dialogView.provideView;
+  provide('provideView', provideView);
+
+return (_ctx, _cache) => {
+  return renderSlot(_ctx.$slots, "default")
+}
+}
+
+};
+
+script$1b.__file = "src/widgets/DialogTarget.vue";
 
 const O = {},
     T = true,
@@ -3512,12 +3529,12 @@ const O = {},
 
   var script$1a = {
     name: 'w-dialog',
-    mixins: [script$1b],
+    mixins: [script$1c],
     props: ['title', 'autoHide', 'context', 'prong', 'independent', 'timeout',
       'cover', 'position', 'snap', 'indent', 'offsetRange', 'local', 'fullScreen', 'hoverShowDrop', 'visible',
 			...boundary
     ],
-    emits: ['close', 'click:cover', 'update:visible'],
+    emits: ['show', 'close', 'click:cover', 'update:visible'],
     data() {
       return {
         isDialog: true,
@@ -3715,6 +3732,10 @@ const O = {},
             this.getTargetElem().removeAttribute('w-pop-visible');
           }
         }
+        this.setVisibleSub(a);
+      },
+      setVisibleSub(a) {
+        // implement
       },
       getTargetElem() {
         return !this.$el ? null : this.$el.nodeType === 3 ? this.$el.nextElementSibling : this.$el
@@ -3769,7 +3790,7 @@ const O = {},
         }) : null;
         let s = [cover, this.html_self(true)];
         let r = to ? h(Teleport, {to}, s) : s;
-        return this.slotTarget ? [this.slotTarget(), r] : r
+        return this.slotTarget ? [r, h(script$1b, null, {default: () => [this.slotTarget()]})] : r
       }
     },
     computed: {
@@ -3803,7 +3824,7 @@ const O = {},
       html_class() {
 				const r = this._pos || O;
 				const p = this.x.position;
-        return ['w-vertical', this.html_align_class, {
+        return ['w-vertical', this.html_align_class, this.html_scroll_class, {
           'z-hide': this.isDeactivated || (this.x.visible != null ? !this.x.visible : !!this.slotTarget),
           'z-full': this.x.fullScreen,
           ['z-face-' + this.x.face]: this.x.face,
@@ -3855,7 +3876,10 @@ const O = {},
             this.axis();
           }
         }, {immediate: true});
-        setTimeout(this.axis);
+        setTimeout(() => {
+          this.axis();
+          this.$nextTick(() => this.trigger('show'));
+        });
         if (this.slotTarget) {
           let el = this.getTargetElem();
           if (el) {
@@ -4356,7 +4380,7 @@ script$14.__file = "src/widgets/Tip.vue";
 var script$13 = {
     name: 'w-img',
     pubParentName: 'w-album',
-    mixins: [script$1g],
+    mixins: [script$1h],
     inject: ['providePubParent'],
     props: ['src', 'text', 'square', 'imgWidth', 'imgHeight', 'dataUrl', 'vertical', 'disabled'],
     data() {
@@ -4402,7 +4426,7 @@ var script$13 = {
               class: 'w-img-cover f-abs-full'
             }, this.$slots.cover())
           ]),
-          cont && h(script$1c, {
+          cont && h(script$1d, {
             class: 'w-img-description'
           }, cont)
         ]
@@ -4440,7 +4464,7 @@ script$13.__file = "src/widgets/Img.vue";
 
 var script$12 = {
     pubParentName: 'w-buttonbar',
-    mixins: [script$1g],
+    mixins: [script$1h],
     props: ['text', 'icon', 'focusIcon', 'face', 'target', 'closable', 'loading', 'disabled', 'vertical', 'hoverShowDrop', 'dropProps', 'dropIcon', 'showDropIcon'],
     inject: ['providePubParent', 'provideMenu_w'],
     emits: ['click:close', 'dropClose'],
@@ -4590,7 +4614,7 @@ var script$12 = {
         return !!(this.hasChild && this.x.showDropIcon && this.getOn('click'))
       },
       isDisabled() {
-        return this.x.disabled || this.x.loading
+        return !!this.x.disabled || !!this.x.loading
       },
       html_props() {
         return {
@@ -4600,10 +4624,10 @@ var script$12 = {
             'z-combo': this.isCombo,
             'z-more': this.isMore,
             'z-on': this.isCurrent,
-            'z-ds': this.x.disabled,
-            'z-loading': this.x.loading,
-            'z-vertical': this.x.vertical,
-            'z-closable': this.x.closable,
+            'z-ds': !!this.x.disabled,
+            'z-loading': !!this.x.loading,
+            'z-vertical': !!this.x.vertical,
+            'z-closable': !!this.x.closable,
 						'z-drop': this.showDrop
           },
           onclick: this.onclick,
@@ -4629,7 +4653,7 @@ var script$11 = {
         if (this.showDrop) return
         this.closeSub();
         this.showDrop = true;
-        this.parentMenu.subMenu = this;
+        this.parentMenu.currentMenuButton = this;
       },
       onclick(e) {
         if (this.isMore) return
@@ -4645,9 +4669,9 @@ var script$11 = {
         }
       },
       closeSub() {
-        if (this.parentMenu.subMenu) {
-          this.parentMenu.subMenu.showDrop = false;
-          this.parentMenu.subMenu = null;
+        if (this.parentMenu.currentMenuButton) {
+          this.parentMenu.currentMenuButton.showDrop = false;
+          this.parentMenu.currentMenuButton = null;
         }
       },
       clickClose(e) {
@@ -4713,14 +4737,15 @@ var script$11 = {
         return p
       },
       ownerView() { // 因为业务会调用 $.vm(event), 所以返回commander的view
-        return this.parentMenu.rootCommander.ownerView
+        const cmd = this.parentMenu.rootCommander;
+        return cmd ? cmd.ownerView : this.parentMenu.root.provideView
       },
       html_props() {
         return {
-          disabled: this.x.disabled,
+          disabled: !!this.x.disabled,
           class: {
             'z-on': this.isCurrent,
-            'z-ds': this.x.disabled,
+            'z-ds': !!this.x.disabled,
             'z-drop': this.showDrop,
           },
           onmouseenter: this.onmouseenter,
@@ -4803,6 +4828,13 @@ let inst = null;
         return c
       },
       // implement
+      setVisibleSub(a) {
+        if (a === false && this.currentMenuButton) {
+          this.currentMenuButton.showDrop = false;
+          // this.subMenu.setVisibleSub(a)
+        }
+      },
+      // implement
       checkOutScreen() {
         let c = this._pos;
         if (c.mag_l || c.mag_r) {
@@ -4840,7 +4872,7 @@ let inst = null;
           }, h('i', {
             class: 'f-i f-i-caret-up'
           })),
-          h(script$1c, {
+          h(script$1d, {
             class: 'w-menu-bbr',
             height: '*',
             ref: 'bbr',
@@ -4925,7 +4957,7 @@ script$_.__file = "src/widgets/Loading.vue";
 
 var script$Z = {
     name: 'w-table',
-    mixins: [script$1g],
+    mixins: [script$1h],
     props: ['face', 'scroll-x', 'scroll-y'],
     provide() {
       return {
@@ -5062,7 +5094,7 @@ script$V.__file = "src/widgets/SlotDefault.vue";
 
 var script$U = {
     name: 'w-thead',
-    mixins: [script$1g, script$W],
+    mixins: [script$1h, script$W],
     props: ['br', 'sort'],
     inject: ['_provideTable'],
     provide() {
@@ -5159,7 +5191,7 @@ script$U.__file = "src/widgets/TableTHead.vue";
 
 var script$T = {
     name: 'w-tbody',
-    mixins: [script$U, script$1f],
+    mixins: [script$U, script$1g],
     inject: ['_provideTable'],
     props: ['children'],
     provide() {
@@ -5232,7 +5264,7 @@ script$T.__file = "src/widgets/TableTBody.vue";
 var script$S = {
     name: 'w-tr',
     pubParentName: 'w-tbody,w-thead',
-    mixins: [script$1g, script$1m],
+    mixins: [script$1h, script$1n],
     props: ['rowIndex', 'expanded', 'children'],
     inject: ['_provideTable', 'providePubParent', 'provideInBody', '_provideTBody', 'provideLevel', 'provideParentTR'],
     provide() {
@@ -5403,7 +5435,7 @@ script$R.__file = "src/widgets/TableTD.vue";
 
 var script$Q = {
     name: 'w-th',
-    mixins: [script$R, script$1g],
+    mixins: [script$R, script$1h],
     props: ['sortable', 'sortOrders', 'sortOrderDefault'],
     inject: ['_provideThead'],
     emits: ['click:sort'],
@@ -5438,7 +5470,7 @@ var script$Q = {
         this.$emit('click:sort', e, o);
       },
       html_slots() {
-        return h(script$1d, {class: 'w-th-wrap', valign: 'middle', align: this.align || this.col.align}, {default: () => [
+        return h(script$1e, {class: 'w-th-wrap', valign: 'middle', align: this.align || this.col.align}, {default: () => [
           h('div', {class: 'w-th-title'}, this.$slots),
           this.x.sortable ? h('div', {class: 'w-th-sort f-flex-column f-flex-center f-oh'}, [
             h('i', {class: 'f-i f-i-caret-up f-oh w-th-sort-up', onClick: e => this.clickSort(e, 'asc')}),
@@ -5466,7 +5498,7 @@ var script$Q = {
 script$Q.__file = "src/widgets/TableTH.vue";
 
 var script$P = {
-    mixins: [script$1c],
+    mixins: [script$1d],
     emits: ['scroll'],
     methods: {
       onScroll(e) {
@@ -5917,7 +5949,7 @@ script$O.__file = "src/widgets/TableV2.vue";
 
 var script$N = {
     name: 'w-grid',
-    mixins: [script$1f],
+    mixins: [script$1g],
     props: ['columns', 'rows', 'gap', 'defaultColspan', 'face', 'labelWidth'],
     methods: {
       x_default() {
@@ -5965,7 +5997,7 @@ var script$M = {
     name: 'w-swiper-item',
     pubParentName: 'w-swiper',
     inject: ['providePubParent'],
-    mixins: [script$1g],
+    mixins: [script$1h],
     props: ['lazy'],
     data() {
       return {
@@ -6002,7 +6034,7 @@ script$M.__file = "src/widgets/SwiperItem.vue";
 
 var script$L = {
     name: 'w-swiper',
-    mixins: [script$1g, script$W],
+    mixins: [script$1h, script$W],
     props: ['arrow', 'indicatorDots', 'duration'],
     data() {
       return {
@@ -6091,7 +6123,7 @@ script$L.__file = "src/widgets/Swiper.vue";
 
 var script$K = {
     name: 'w-buttonbar',
-    mixins: [script$1d, script$W],
+    mixins: [script$1e, script$W],
     props: ['vertical'],
 		emits: ['click:item'],
     methods: {
@@ -6204,7 +6236,7 @@ var script$J = {
 			},
       html_slots() {
 				let group = h(TransitionGroup, {name: 'w-tabbar', onBeforeEnter: this.onBeforeEnter, onAfterEnter: this.onAfterEnter, onBeforeLeave: this.onBeforeLeave, onAfterLeave: this.onAfterLeave}, {default: () => this.buttons});
-				let gut = [h(this.x.vertical ? script$1c : script$1d, {ref: 'gut', width: '*', class: 'w-tabbar-gut', gap: this.x.gap, align: this.x.align, valign: this.x.valign}, {default: () => group})];
+				let gut = [h(this.x.vertical ? script$1d : script$1e, {ref: 'gut', width: '*', class: 'w-tabbar-gut', gap: this.x.gap, align: this.x.align, valign: this.x.valign}, {default: () => group})];
 				if (this.x.arrow) {
 					gut.unshift(h('div', {class: 'w-tabbar-arrow-start', onClick: () => this.clickArrow(-1)}, h('i', {class: 'f-i f-i-caret-left'})));
 					gut.push(h('div', {class: 'w-tabbar-arrow-end', onClick: () => this.clickArrow(1)}, h('i', {class: 'f-i f-i-caret-right'})));
@@ -6315,7 +6347,10 @@ var script$J = {
 					if (len) {
 						this.$nextTick(() => {
 							unwatch();
-							setTimeout(() => this.el().setAttribute('w-tabbar-flex-all', ''), 150);
+							setTimeout(() => {
+                const el = this.el();
+                el && el.setAttribute('w-tabbar-flex-all', '');
+              }, 150);
 						});
 					}
 				}, {immediate: true});
@@ -6352,7 +6387,7 @@ script$I.__file = "src/widgets/TabButton.vue";
 
 var script$H = {
     name: 'w-tabs',
-    mixins: [script$1g],
+    mixins: [script$1h],
     props: ['current', 'position', 'gap', 'face', 'quickCloseButton', 'flexSize'],
 		emits: ['click:quickCloseButton'],
     methods: {
@@ -6400,6 +6435,9 @@ var script$H = {
       }
     },
     computed: {
+      tabBar() {
+        return this.$refs.tabBar
+      },
       html_class() {
         let pos = this.x.position;
         return 'f-oh f-flex' + (pos == 'top' || pos == 'bottom' ? '-column' : '') + ' z-pos-' + pos + ' z-face-' + this.x.face
@@ -6417,7 +6455,7 @@ script$G.__file = "src/widgets/Tab.vue";
 
 var script$F = {
     name: 'w-album',
-    mixins: [script$1d, script$W],
+    mixins: [script$1e, script$W],
     methods: {
       x_default() {
         return {
@@ -6438,7 +6476,7 @@ script$F.__file = "src/widgets/Album.vue";
 
 var script$E = {
     name: 'w-html',
-    mixins: [script$1g, script$1e],
+    mixins: [script$1h, script$1f],
     props: ['line'],
     computed: {
       html_props() {
@@ -6461,7 +6499,7 @@ script$E.__file = "src/widgets/Html.vue";
 
 var script$D = {
     name: 'w-tree',
-    mixins: [script$1f, script$W, script$1m],
+    mixins: [script$1g, script$W, script$1n],
     emits: ['click:item'],
     provide() {
       return {
@@ -6914,7 +6952,7 @@ script$C.__file = "src/widgets/TreeV2.vue";
 
 var script$B = {
     name: 'w-label',
-    mixins: [script$1g, script$1e],
+    mixins: [script$1h, script$1f],
     props: ['text', 'suffix', 'vertical'],
     methods: {
       html_slots() {
@@ -6939,7 +6977,7 @@ var script$B = {
 script$B.__file = "src/widgets/Label.vue";
 
 var script$A = {
-    mixins: [script$1g, script$1e],
+    mixins: [script$1h, script$1f],
     props: ['name', 'value', 'modelValue', 'placeholder', 'label', 'readonly', 'readonlyValidate', 'disabled', 'required',
       'validateDefault', 'validateHandler', 'inputWidth', 'inputHeight' ],
     emits: ['update:modelValue', 'change', 'blur', 'focus'],
@@ -7106,6 +7144,19 @@ var script$A = {
         let t = this.x.label || (this.pubParent && this.pubParent.x.label);
         return t ? (t.text || t) : ''
       },
+      onCloseDrop() {
+        this.showDrop = false;
+      },
+      mergeDropProps(dropProps) {
+        if (this.x.dropProps) dropProps = mergeProps(dropProps, this.x.dropProps);
+        dropProps.onClose = () => {
+          this.onCloseDrop();
+          if (this.x.dropProps && this.x.dropProps.onClose) {
+            this.x.dropProps.onClose();
+          }
+        };
+        return dropProps
+      },
       oninput(e) {
         this.val(e.target.value);
         this.baseValid('change');
@@ -7200,7 +7251,7 @@ var script$A = {
           ref: 'v',
           name: this.input_name,
           value: this.input_value,
-          disabled: this.x.disabled,
+          disabled: this.isDisabled,
           class: 'f-hide'
         }) : []
       },
@@ -7339,10 +7390,10 @@ var script$A = {
         return !this.isReadonly && !this.isDisabled
       },
       isDisabled() {
-        return this.x.disabled
+        return !!this.x.disabled
       },
       isReadonly() {
-        return this.x.readonly
+        return !!this.x.readonly
       },
       errorTipTarget() {
         return this
@@ -7540,7 +7591,7 @@ const {leafSymbol: leafSymbol$1} = $$1.symbol;
         }, this.html_input())
       },
       html_target() {
-        return this.$slots.default ? h(script$1d, {
+        return this.$slots.default ? h(script$1e, {
           class: this.$options.name + '-target',
           ref: 'target'
         }, this.$slots) : []
@@ -7565,7 +7616,7 @@ const {leafSymbol: leafSymbol$1} = $$1.symbol;
       },
       rules() {
         return {
-          required: this.x.required != null ? this.x.required : (this.pubParent && this.pubParent.x.required),
+          required: this.x.required != null ? !!this.x.required : !!(this.pubParent && this.pubParent.x.required),
           minSize: this.x.minSize != null ? this.x.minSize : (this.pubParent && this.pubParent.x.minSize),
           maxSize: this.x.maxSize != null ? this.x.maxSize : (this.pubParent && this.pubParent.x.maxSize),
         }
@@ -7600,10 +7651,10 @@ const {leafSymbol: leafSymbol$1} = $$1.symbol;
         return $$1.idsAny(this.x.modelValue, this.checkValue)
       },
       isDisabled() {
-        return this.x.disabled != null ? this.x.disabled : (this.pubParent && this.pubParent.disabled)
+        return this.x.disabled != null ? !!this.x.disabled : (this.pubParent && this.pubParent.disabled)
       },
       isReadonly() {
-        return this.x.readonly != null ? this.x.readonly : (this.pubParent && this.pubParent.readonly)
+        return this.x.readonly != null ? !!this.x.readonly : (this.pubParent && this.pubParent.readonly)
       },
       html_class() {
         return {
@@ -7779,7 +7830,7 @@ script$y.__file = "src/widgets/TripleBox.vue";
 var script$x = {
     name: 'w-leaf',
     pubParentName: 'w-tree',
-    mixins: [script$1g, script$1m],
+    mixins: [script$1h, script$1n],
     props: ['text', 'expanded', 'expandedIcon', 'collapsedIcon', 'icon', 'boxSync', 'src', 'disabled'],
     inject: ['providePubParent', 'provideLevel', 'provideParentLeaf', 'provideParentTR'],
     provide() {
@@ -7947,7 +7998,7 @@ var script$x = {
       html_props() {
         let exp = this.isExpanded();
         let fd  = this.isFolder();
-        let ds = this.x.disabled;
+        let ds = !!this.x.disabled;
         let prop = {
           class: {
             'z-on': this.isCurrent,
@@ -8158,7 +8209,7 @@ script$w.__file = "src/widgets/PageBar.vue";
 
 var script$v = {
     name: 'w-split',
-    mixins: [script$1g],
+    mixins: [script$1h],
     props: ['collapsedIcon', 'expandedIcon', 'movable', 'range', 'toNext', 'expanded'],
     inject: ['provideLayout'],
     created() {
@@ -8259,7 +8310,7 @@ script$v.__file = "src/widgets/Split.vue";
 
 var script$u = {
     name: 'w-toggle',
-    mixins: [script$1g, script$1e],
+    mixins: [script$1h, script$1f],
     props: ['collapsedIcon', 'expandedIcon', 'expanded', 'align', 'valign'],
     methods: {
       x_default() {
@@ -8307,7 +8358,7 @@ script$u.__file = "src/widgets/Toggle.vue";
 
 var script$t = {
     name: 'w-video',
-    mixins: [script$1g],
+    mixins: [script$1h],
     props: ['src', 'poster'],
     data() {
       return {
@@ -8359,7 +8410,7 @@ script$t.__file = "src/widgets/Video.vue";
 
 var script$s = {
     name: 'w-progress',
-    mixins: [script$1g],
+    mixins: [script$1h],
     props: ['percent', 'range', 'text'],
     methods: {
       html_slots() {
@@ -8404,7 +8455,7 @@ script$s.__file = "src/widgets/Progress.vue";
 
 var script$r = {
     name: 'w-calendar',
-    mixins: [script$1g],
+    mixins: [script$1h],
     emits: ['click:item', 'change'],
     props: ['value', 'minValue', 'maxValue', 'current', 'pad', 'face', 'format', 'success', 'cg', 'start',
       'enableHour', 'enableMinute', 'enableSecond', 'defaultHour', 'defaultMinute', 'defaultSecond'
@@ -9176,7 +9227,7 @@ script$r.__file = "src/widgets/Calendar.vue";
 
 var script$q = {
     name: 'w-timeline',
-    mixins: [script$1f, script$W],
+    mixins: [script$1g, script$W],
     props: ['face', 'vertical'],
     methods: {
       indent() {
@@ -9331,7 +9382,7 @@ script$q.__file = "src/widgets/Timeline.vue";
 var script$p = {
     name: 'w-timeline-item',
     pubParentName: 'w-timeline',
-    mixins: [script$1g],
+    mixins: [script$1h],
     inject: ['providePubParent'],
     props: ['position', 'index', 'align', 'lineColor'],
     watch: {
@@ -9374,7 +9425,7 @@ script$p.__file = "src/widgets/TimelineItem.vue";
 
 var script$o = {
     name: 'w-slidepicker',
-    mixins: [script$1g],
+    mixins: [script$1h],
     provide() {
       return {
         provideOptionParent: this,
@@ -9630,6 +9681,7 @@ var script$m = {
     name: 'w-text',
     mixins: [script$A],
     props: ['minLength', 'maxLength', 'pattern', 'clearable', 'showCount'],
+		emits: ['clear'],
     data() {
       return {
         hasBorder: true
@@ -9641,6 +9693,7 @@ var script$m = {
         if (this.hasVal) {
           this.val('');
           this.focus();
+          this.$emit('clear', e);
         }
       },
       html_button() {
@@ -9696,11 +9749,15 @@ var script$l = {
           let counter = '';
           if (this.x.showCount && this.x.maxLength) {
             let v = this.x.modelValue || '';
-            counter = `${v.length} / ${this.x.maxLength}`;
+            let cnt = $$1.strLen(v);
+            if (cnt > this.x.maxLength) {
+              cnt = `<em class=w-textarea-show-count-exceed>超出${cnt-this.x.maxLength}字节</em>`;
+            }
+            counter = `${cnt} / ${this.x.maxLength}`;
           }
           return h('div', {class: 'w-textarea-down'}, [
             h('div', {class: 'w-textarea-down-left'}, down),
-            h('div', {class: 'w-textarea-down-right w-textarea-show-count'}, counter)
+            h('div', {class: 'w-textarea-down-right w-textarea-show-count', innerHTML: counter})
           ])
         }
         return down
@@ -10935,7 +10992,7 @@ var script$e = {
         ])
       },
       html_input() {
-        return this.html_input_form().concat(h(script$1d, {
+        return this.html_input_form().concat(h(script$1e, {
           width: '*',
           class: 'w-mediaupload-list',
           align: this.x.align,
@@ -10981,7 +11038,7 @@ script$d.__file = "src/widgets/ImageUpload.vue";
 
 var script$c = {
     name: 'w-option',
-    mixins: [script$1g],
+    mixins: [script$1h],
     props: ['value', 'text', 'disabled'],
     inject: ['provideOptionParent'],
     methods: {
@@ -11033,7 +11090,7 @@ var script$b = {
     name: 'w-spinner',
     mixins: [script$m],
     inject: ['provideRangeParent'],
-    props: ['decimal', 'format', 'showButton', 'buttonPosition', 'step', 'autoFix', 'compare', 'minValue', 'maxValue', 'clearable'],
+    props: ['decimal', 'format', 'showButton', 'buttonPosition', 'step', 'autoFix', 'compare', 'minValue', 'maxValue'],
     mounted() {
       this.x.format && this.doFormat();
     },
@@ -11146,14 +11203,14 @@ var script$b = {
               h('button', {
 								ref: 'buttonPlus',
                 class: 'w-spinner-step-up f-rel',
-                disabled: this.x.disabled,
+                disabled: !!this.x.disabled,
                 onclick: e => this.stepBy(1),
                 innerHTML: '<i class="f-abs-center f-i f-i-caret-up"></i>'
               }),
               h('button', {
 								ref: 'buttonMinus',
                 class: 'w-spinner-step-down f-rel',
-                disabled: this.x.disabled,
+                disabled: !!this.x.disabled,
                 onclick: e => this.stepBy(-1),
                 innerHTML: '<i class="f-abs-center f-i f-i-caret-down"></i>'
               }),
@@ -11162,14 +11219,14 @@ var script$b = {
             r.push(h('button', {
 							ref: 'buttonMinus',
               class: 'w-spinner-step-minus f-rel',
-              disabled: this.x.disabled,
+              disabled: !!this.x.disabled,
               onclick: e => this.stepBy(-1),
               innerHTML: '<i class="f-abs-center f-i f-i-minus"></i>'
             }),
             h('button', {
 							ref: 'buttonPlus',
               class: 'w-spinner-step-plus f-rel',
-              disabled: this.x.disabled,
+              disabled: !!this.x.disabled,
               onclick: e => this.stepBy(1),
               innerHTML: '<i class="f-abs-center f-i f-i-plus"></i>'
             }));
@@ -11232,7 +11289,7 @@ var script$b = {
       html_class() {
         return ['z-buttonposition-' + this.x.buttonPosition, {
           'z-val': this.hasVal,
-          'z-clearable': this.x.clearable,
+          'z-clearable': !!this.x.clearable,
         }]
       }
     }
@@ -11245,7 +11302,7 @@ var script$a = {
     mixins: [script$m],
     inject: ['provideRangeParent'],
     props: ['showButton', 'multiple', 'format', 'autoFix', 'compare', 'minValue', 'maxValue', 'dropProps', 'enableHour', 'enableMinute', 'enableSecond',
-      'defaultHour', 'defaultMinute', 'defaultSecond', 'clearables'],
+      'defaultHour', 'defaultMinute', 'defaultSecond'],
     data() {
       return {
         showDrop: false,
@@ -11282,7 +11339,8 @@ var script$a = {
       onkeyup() {
         this.showDrop = true;
       },
-      onclose() {
+      // implement
+      onCloseDrop() {
         this.showDrop = false;
         this.currentDate = null;
         this.doAutoFix();
@@ -11291,6 +11349,7 @@ var script$a = {
         e.stopPropagation();
         if (this.hasVal) {
           this.val('');
+          this.$emit('clear', e);
         }
       },
       doAutoFix() {
@@ -11388,10 +11447,9 @@ var script$a = {
             autoHide: true,
             snap: () => this.snapElem(),
             position: 'v',
-						indent: 1,
-            onClose: this.onclose
+						indent: 1
           };
-					if (this.x.dropProps) dropProps = mergeProps(dropProps, this.x.dropProps);
+					dropProps = this.mergeDropProps(dropProps);
           r.push(h(script$1a, dropProps, {
             default: () => h(script$r, {
               height: '*',
@@ -11522,6 +11580,7 @@ var script$9 = {
         if (this.x.clearable && this.hasVal) {
           e.stopPropagation();
           this.val('');
+          this.$emit('clear', e);
         }
       },
       formText() {
@@ -11549,10 +11608,11 @@ var script$9 = {
 					  snap: m ? null : () => this.el('form'),
 					  position: m ? null : 'v',
 					  indent: 1,
-					  onClose: () => this.showDrop = false
+            scrollY: true,
+            scrollView: '.z-on'
 					};
-					if (this.x.dropProps) dropProps = mergeProps(dropProps, this.x.dropProps);
-					r.push(h(script$1a, dropProps, {default: () => h(script$1c, {height: '*', scrollY: true, scrollView: '.z-on'}, this.$slots)}));
+          dropProps = this.mergeDropProps(dropProps);
+					r.push(h(script$1a, dropProps, this.$slots));
 				}
 				return r
       },
@@ -11600,7 +11660,7 @@ script$9.__file = "src/widgets/DropBox.vue";
 var script$8 = {
     name: 'w-pickbox',
     mixins: [script$9],
-    props: ['picker', 'clearable'],
+    props: ['picker'],
     methods: {
       // implement
       getInputValue(mv) {
@@ -11750,7 +11810,7 @@ var script$5 = {
     name: 'w-combobox',
     mixins: [script$A],
     props: ['multiple', 'dropper', 'picker', 'dropProps', 'br', 'inputValue', 'clearable'],
-    emits: ['input', 'click:item', 'blur', 'focus', 'update:inputValue'],
+    emits: ['input', 'click:item', 'blur', 'focus', 'update:inputValue', 'clear'],
     data() {
       return {
         hasBorder: true,
@@ -11875,6 +11935,10 @@ var script$5 = {
           e.preventDefault();
         }
       },
+      // implement
+      onCloseDrop() {
+        this.showSuggest = false;
+      },
       clickItem(e, item) {
         e.runType = 'click:item';
         e.value = item;
@@ -11891,6 +11955,7 @@ var script$5 = {
       },
       clickButtonPicker(e) {
         e.stopPropagation();
+        this.warn(false);
         let c = this.x.picker;
         if (typeof c === 'function') c(this);
       },
@@ -11900,6 +11965,7 @@ var script$5 = {
         this.clear();
         this.suggest(false);
         this.focus();
+        this.$emit('clear', e);
       },
       formText() {
         return this.input_title
@@ -11965,10 +12031,10 @@ var script$5 = {
             snap:() => this.el('form'),
             position: 'v',
             indent: 1,
-            onClose: () => this.showSuggest = false
+            scrollY: true
           };
-					if (this.x.dropProps) dropProps = mergeProps(dropProps, this.x.dropProps);
-					r.push(h(script$1a, dropProps, {default: () => h(script$1c, {height: '*', scrollY: true}, this.$slots)}));
+					dropProps = this.mergeDropProps(dropProps);
+					r.push(h(script$1a, dropProps, this.$slots));
 				}
         return [
           this.html_input_hidden(),
@@ -12051,8 +12117,8 @@ script$5.__file = "src/widgets/ComboBox.vue";
 var script$4 = {
     name: 'w-linkbox',
     mixins: [script$A],
-    emits: ['input', 'dblclick:item'],
     props: ['multiple', 'picker', 'dropProps', 'separator', 'strict', 'br', 'clearable'],
+    emits: ['input', 'dblclick:item', 'clear'],
     created() {
       this.$watch(() => this.x.modelValue, (v) => {
         if (!this.isFocus) {
@@ -12299,6 +12365,7 @@ var script$4 = {
         if (this.x.clearable && this.hasVal) {
           this.val([]);
           this.$nextTick(this.focus);
+          this.$emit('clear', e);
         }
       },
       addStore(m) {
@@ -12374,6 +12441,10 @@ var script$4 = {
           }
         }
       },
+      // implement
+      onCloseDrop() {
+        this.showSuggest = false;
+      },
       formText() {
         return this.input_title
       },
@@ -12423,10 +12494,10 @@ var script$4 = {
             snap: () => this.el('form'),
             position: 'v',
             indent: 1,
-            onClose: () => this.showSuggest = false
+            scrollY: true
           };
-					if (this.x.dropProps) dropProps = mergeProps(dropProps, this.x.dropProps);
-					r.push(h(script$1a, dropProps, {default: () => h(script$1c, {height: '*', scrollY: true}, this.$slots)}));
+					dropProps = this.mergeDropProps(dropProps);
+					r.push(h(script$1a, dropProps, this.$slots));
 				}
         return [
           this.html_input_hidden(),
@@ -12724,7 +12795,7 @@ const init_text = $$1.loc.form.jigsaw_drag_right;
 					  class: ['w-jigsaw-thumb w-input-button f-i', this.isSuccess ? 'f-i-check' :
 					    'f-i-long-arrow-right'
 					  ],
-					  disabled: this.x.disabled,
+					  disabled: !!this.x.disabled,
 					  onmousedown: this.dragstart,
 						onmouseenter: this.mouseenter,
 					  ondrop: this.drop,
@@ -12889,8 +12960,8 @@ var script = {
 script.__file = "src/widgets/Rate.vue";
 
 const components = [
-  script$1h, script$1b, script$1a, script$18, script$16, script$14, script$$, script$_, 
-  script$N, script$1c, script$1d, script$Z, script$Y, script$X, script$T, script$U, script$S, script$R, script$Q, script$O, script$L, script$M, script$H, script$G,
+  script$1i, script$1c, script$1a, script$18, script$16, script$14, script$$, script$_, 
+  script$N, script$1d, script$1e, script$Z, script$Y, script$X, script$T, script$U, script$S, script$R, script$Q, script$O, script$L, script$M, script$H, script$G,
   script$F, script$13, script$K, script$10, script$11, script$E, script$D, script$x, script$C, script$w, script$v, script$u, script$t, script$s, script$r, script$q, script$p, script$o,
   script$B, script$n, script$m, script$l, script$k, script$z, script$j, script$i, script$y, script$h, script$g, script$e, script$d, script$c,
   script$b, script$a, script$9, script$8, script$7, script$6, script$5, script$4, script$2, script$1, script