dfish-widget 1.0.83 → 1.0.85

package/lib/index.esm.js

@@ -7144,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');
@@ -11326,7 +11339,8 @@ var script$a = {
       onkeyup() {
         this.showDrop = true;
       },
-      onclose() {
+      // implement
+      onCloseDrop() {
         this.showDrop = false;
         this.currentDate = null;
         this.doAutoFix();
@@ -11433,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: '*',
@@ -11534,7 +11547,7 @@ var script$9 = {
       }
     },
     props: ['multiple', 'cancelable', 'clearable', 'dropProps'],
-		emits: ['drop', 'clear'],
+		emits: ['clear'],
     data() {
       return {
         hasBorder: true,
@@ -11596,11 +11609,9 @@ var script$9 = {
 					  position: m ? null : 'v',
 					  indent: 1,
             scrollY: true,
-            scrollView: '.z-on',
-            onShow: () => this.$emit('drop'),
-					  onClose: () => this.showDrop = false
+            scrollView: '.z-on'
 					};
-					if (this.x.dropProps) dropProps = mergeProps(dropProps, this.x.dropProps);
+          dropProps = this.mergeDropProps(dropProps);
 					r.push(h(script$1a, dropProps, this.$slots));
 				}
 				return r
@@ -11798,27 +11809,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', 'drop'],
+    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) {
@@ -11826,7 +11840,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;
@@ -11880,7 +11905,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);
@@ -11924,6 +11948,10 @@ var script$5 = {
           e.preventDefault();
         }
       },
+      // implement
+      onCloseDrop() {
+        this.showSuggest = false;
+      },
       clickItem(e, item) {
         e.runType = 'click:item';
         e.value = item;
@@ -11958,7 +11986,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
             }],
@@ -12016,11 +12044,9 @@ var script$5 = {
             snap:() => this.el('form'),
             position: 'v',
             indent: 1,
-            scrollY: true,
-            onShow: () => this.$emit('drop'),
-            onClose: () => this.showSuggest = false
+            scrollY: true
           };
-					if (this.x.dropProps) dropProps = mergeProps(dropProps, this.x.dropProps);
+					dropProps = this.mergeDropProps(dropProps);
 					r.push(h(script$1a, dropProps, this.$slots));
 				}
         return [
@@ -12061,8 +12087,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,
         }
@@ -12105,7 +12140,7 @@ var script$4 = {
     name: 'w-linkbox',
     mixins: [script$A],
     props: ['multiple', 'picker', 'dropProps', 'separator', 'strict', 'br', 'clearable'],
-    emits: ['input', 'dblclick:item', 'clear', 'drop'],
+    emits: ['input', 'dblclick:item', 'clear'],
     created() {
       this.$watch(() => this.x.modelValue, (v) => {
         if (!this.isFocus) {
@@ -12428,6 +12463,10 @@ var script$4 = {
           }
         }
       },
+      // implement
+      onCloseDrop() {
+        this.showSuggest = false;
+      },
       formText() {
         return this.input_title
       },
@@ -12477,11 +12516,9 @@ var script$4 = {
             snap: () => this.el('form'),
             position: 'v',
             indent: 1,
-            scrollY: true,
-            onShow: () => this.$emit('drop'),
-            onClose: () => this.showSuggest = false
+            scrollY: true
           };
-					if (this.x.dropProps) dropProps = mergeProps(dropProps, this.x.dropProps);
+					dropProps = this.mergeDropProps(dropProps);
 					r.push(h(script$1a, dropProps, this.$slots));
 				}
         return [