dfish-widget 1.0.84 → 1.0.86

package/lib/index.esm.js

@@ -3530,8 +3530,8 @@ const O = {},
   var script$1a = {
     name: 'w-dialog',
     mixins: [script$1c],
-    props: ['title', 'autoHide', 'context', 'prong', 'independent', 'timeout',
-      'cover', 'position', 'snap', 'indent', 'offsetRange', 'local', 'fullScreen', 'hoverShowDrop', 'visible',
+    props: ['title', 'autoHide', 'context', 'prong', 'independent', 'timeout', 'cover', 'coverProps',
+      'position', 'snap', 'indent', 'offsetRange', 'local', 'fullScreen', 'hoverShowDrop', 'visible',
 			...boundary
     ],
     emits: ['show', 'close', 'click:cover', 'update:visible'],
@@ -3783,11 +3783,17 @@ const O = {},
       },
       html() {
         let to = this.x.local ? this.getLocalElem() : '#w-dfish-pops';
-        let cover = this.x.cover && this.x.visible !== false && !this.isDeactivated ? h('div', {
-          ref: 'cover',
-          class: 'w-dialog-cover f-abs-full',
-          onclick: e => this.trigger('click:cover', e)
-        }) : null;
+        let cover = null;
+        if (this.x.cover && this.x.visible !== false && !this.isDeactivated) {
+          let coverProps = {
+            ref: 'cover',
+            class: 'w-dialog-cover f-abs-full'
+          };
+          if (this.x.coverProps) {
+            coverProps = mergeProps(coverProps, this.x.coverProps);
+          }
+          cover = h('div', coverProps);
+        }
         let s = [cover, this.html_self(true)];
         let r = to ? h(Teleport, {to}, s) : s;
         return this.slotTarget ? [r, h(script$1b, null, {default: () => [this.slotTarget()]})] : r
@@ -4475,7 +4481,7 @@ var script$12 = {
         mouses: {
           onmouseenter: e => {
 						if (!this.showDrop) {
-							if (this.pubParent && menuRelate(this.pubParent) && !menuRelate(this)) closeMenu();
+							if (this.pubParent && menuRelate(this.pubParent) && !menuRelate()) ;
 							if(this.x.hoverShowDrop) {
 								this.drop();
 								this.$nextTick(() => e.currentTarget.classList.add('z-hv'));
@@ -4502,12 +4508,10 @@ var script$12 = {
       drop() {
 				if (this.hasChild) {
 					this.showDrop = true;
-				} else {
-					closeMenu();
 				}
       },
 			closeDrop() {
-				this.showDrop = false;
+        this.showDrop = false;
 			},
       onclick(e) {
         if (this.isMore) {
@@ -4783,15 +4787,8 @@ script$10.__file = "src/widgets/Button.vue";
 
 let inst = null;
 	
-	function closeMenu() {
-		if (inst) {
-			$$1.close(inst);
-			inst = null;
-		}
-	}
-	
 	function menuRelate(ctx) {
-		return inst && (ctx.hasBubble(inst.context) || inst.hasBubble(ctx))
+		return inst 
 	}
 
   var script$$ = {
@@ -4830,6 +4827,7 @@ let inst = null;
       // implement
       setVisibleSub(a) {
         if (a === false && this.currentMenuButton) {
+          console.log('setVisibleSub');
           this.currentMenuButton.showDrop = false;
           // this.subMenu.setVisibleSub(a)
         }
@@ -4918,12 +4916,12 @@ let inst = null;
 			}
     },
     mounted() {
-      if (!this.context || (this.context.$options && this.context.$options.name !== 'w-menubutton')) {
-        if (inst) {
-          $$1.close(inst);
-        }
-        inst = this;
-      }
+      // if (!this.context || (this.context.$options && this.context.$options.name !== 'w-menubutton')) {
+      //   if (inst) {
+      //     $.close(inst)
+      //   }
+      //   inst = this
+      // }
     }
   };
 
@@ -10430,9 +10428,8 @@ const suffixHooks = {
     name: 'w-fileupload',
     mixins: [script$A],
     props: ['uploadSrc', 'thumbnailSrc', 'downloadSrc', 'uploadLimit', 'sizeLimit', 'maxFileSize', 'minFileSize',
-      'fileTypes', 'filter', 'success', 'error', 'itemWidth', 'click:item', 'align', 'vertical', 'gap'
+      'fileTypes', 'filter', 'success', 'error', 'itemWidth', 'align', 'vertical', 'gap'
     ],
-    emits: ['click:item'],
     data() {
       return {
         list: [],
@@ -10589,13 +10586,11 @@ const suffixHooks = {
         this.$emit('update:modelValue', v);
         this.trigger('change', v);
       },
-      clickItem(e, item, ctx) {
-        if (!item.value) return
-        if (this.getOn('click:item')) {
-          e.runType = 'click:item';
-          e.value = item.value;
-          this.trigger(e, item.value, ctx);
-        } else if (this.x.downloadSrc) {
+      clickItem(e, item) {
+        if (!item.value || !this.x.downloadSrc) return
+        if (typeof this.x.downloadSrc === 'function') {
+          this.x.downloadSrc(item.value);
+        } else {
           $$1.download($$1.urlServer(this.x.downloadSrc, item.value, this.x.data));
         }
       },
@@ -10646,14 +10641,14 @@ const suffixHooks = {
           }, [
             h('i', {
               class: ['w-fileupload-value-icon f-i', 'f-i-file-' + getSuffix(name)],
-							onclick: e => this.clickItem(e, item, this)
+							onclick: e => this.clickItem(e, item)
             }),
             item.error && h('div', {
               class: 'w-fileupload-value-error'
             }, $$1.loc.form.upload_error),
             h('div', {
               class: 'w-fileupload-value-text f-line-1',
-							onclick: e => this.clickItem(e, item, this)
+							onclick: e => this.clickItem(e, item)
             }, name),
 						button
           ])
@@ -11809,27 +11804,30 @@ script$6.__file = "src/widgets/Range.vue";
 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', 'clear'],
+    props: ['multiple', 'strict', 'dropper', 'picker', 'dropProps', 'br', 'clearable'],
+    emits: ['input', 'click:item', 'blur', 'focus', 'clear'],
     data() {
       return {
         hasBorder: true,
         text: '',
         showSuggest: false,
         sug_timer: null,
-        sensor_text: this.inputValue,
+        sensor_text: this.getInputText(this.modelValue),
         sensor_width: null,
       }
     },
-		watch: {
-			inputValue(v) {
-				this.sensor_text = v;
-			}
-		},
     methods: {
+      x_default() {
+        return {
+          strict: true
+        }
+      },
       // implement
       watchModelValue(v, ov) {
         this.clear();
+        if (!this.x.strict) {
+          this.sensor_text = this.getInputText(v);
+        }
         const or = ov && ov.map ? ov.map(n => n.value).join(',') : '';
         const r = v && v.map ? v.map(n => n.value).join(',') : '';
         if (or != r) {
@@ -11837,7 +11835,18 @@ var script$5 = {
         }
       },
       getInputValue(mv) {
-        return typeof mv === 'string' ? mv : $$1.array(mv).map(v => v.value).join(',')
+        if (typeof mv === 'string') {
+          return mv
+        }
+        let r = $$1.array(mv).filter(v => v.value).map(v => v.value);
+        if (!this.x.strict && this.sensor_text) {
+          r.push(this.sensor_text);
+        }
+        return r.join(',')
+      },
+      getInputText(mv) {
+        const n = $$1.array(mv).find(v => !v.value && v.text);
+        return n ? n.text : ''
       },
       addVal(v) {
         let mv;
@@ -11891,7 +11900,6 @@ var script$5 = {
       oninput(e) {
         let v = e.target.value;
         this.sensor_text = v;
-				this.$emit('update:inputValue', v);
         clearTimeout(this.sug_timer);
         if (v === '') {
           this.suggest(false);
@@ -11973,7 +11981,7 @@ var script$5 = {
       html_options() {
         let m = this.x.modelValue;
         if (m && typeof m !== 'string') {
-          return [].concat(m).map(v => h('div', {
+          return $$1.array(m).filter(v => v.value).map(v => h('div', {
             class: ['w-combobox-option f-flex-center', {
               'z-forbid': v.forbid
             }],
@@ -12010,7 +12018,6 @@ var script$5 = {
             onkeydown: this.onkeydown,
             onblur: this.onblur,
             onfocus: this.onfocus,
-
           })
         ])
       },
@@ -12074,8 +12081,17 @@ var script$5 = {
       validHooks() {
         return {
           validateDefault: (v) => {
-            if (this.$refs.input.value)
-              return this.formErr({type: 'invalid_option'})
+            if (this.sensor_text) {
+              if (this.x.strict) {
+                return this.formErr({type: 'invalid_option'})
+              }
+              if (!this.x.multiple) {
+                const n = $$1.array(this.x.modelValue).find(v => v.value);
+                if (n) {
+                  return this.formErr({type: 'maxSize'}, 1)
+                }
+              }
+            }
           },
           ...this.pubValidHooks,
         }