dfish-widget 1.0.40 → 1.0.42

package/lib/index.esm.js

@@ -1465,7 +1465,11 @@ $$1.slotsChildren = function(slots, name = 'default') {
   const getChildren = (d) => {
     d && d.forEach(v => {
       if (typeof v.type === 'symbol') {
-        Array.isArray(v.children) && getChildren(v.children);
+        if (Array.isArray(v.children)) {
+          getChildren(v.children);
+        } else if (v.type.toString() === 'Symbol(v-txt)') {
+          r.push(v);
+        }
       } else
         r.push(v);
     });
@@ -1530,7 +1534,7 @@ $$1.print = function(a, y) {
 			if (y.input2text) {
 				let g = $$1(this);
 				if (g && g.isFormWidget) {
-					h = g.el('main').outerHTML;
+					h = g.el('form').outerHTML;
 					v = g.formText();
 				} else
 					v = this.value;
@@ -1557,7 +1561,7 @@ $$1.print = function(a, y) {
 			$$1.q('input[type=hidden]', d).each(function() {
 				var g = $$1(this);
 				if (g && g.isFormWidget && g.$options.name != 'w-hidden') {
-					s = s.replace(g.el('main').outerHTML, () => '<div class="f-wdbr f-print-input-text">' + g.formText() + '</div>');
+					s = s.replace(g.el('form').outerHTML, () => '<div class="f-wdbr f-print-input-text">' + g.formText() + '</div>');
 				}
 			});
 		}
@@ -4419,7 +4423,7 @@ var script$_ = {
         this.x.loading = a;
       },
       drop() {
-				if (this.$slots.default) {
+				if (this.hasChild) {
 					this.showDrop = true;
 				} else {
 					closeMenu();
@@ -4446,7 +4450,7 @@ var script$_ = {
         this.drop();
       },
       html_drop() {
-        if (this.showDrop && this.$slots.default) {
+        if (this.showDrop && this.hasChild) {
 					let dropProps = {
 					  context: this,
 					  ownproperty: true,
@@ -4519,14 +4523,18 @@ var script$_ = {
       tagName() {
         return 'button'
       },
+      hasChild() {
+        const c = this.slots_children();
+        return c && c.length
+      },
       isCurrent() {
         return this.pubParent && this.pubParent.inCurrent(this)
       },
       isMore() {
-        return this.$slots.default && !this.getOn('click')
+        return this.hasChild && !this.getOn('click')
       },
       isCombo() {
-        return !!(this.$slots.default && this.x.showDropIcon && this.getOn('click'))
+        return !!(this.hasChild && this.x.showDropIcon && this.getOn('click'))
       },
       isDisabled() {
         return this.x.disabled || this.x.loading
@@ -6217,7 +6225,7 @@ var script$A = {
         }
       },
       snapElem() {
-        return this.el('main')
+        return this.el('form')
       },
       hasBubble(a) {
         return this.snapElem().contains(a.isWidget ? a.el() : a)
@@ -6288,7 +6296,7 @@ var script$A = {
       html_button() {
         return []
       },
-      html_form() {
+      html_form_slot() {
         return [
           this.slot('prepend'),
           this.html_input(),
@@ -6297,10 +6305,13 @@ var script$A = {
         ]
       },
       html_main() {
+        return h('div', {class: 'w-formbase-main'}, [this.html_form(), this.slot('down')])
+      },
+      html_form() {
         let fh = this.x.inputHeight && $$1.unitSize(this.x.inputHeight);
         return h('div', mergeProps({
-          ref: 'main',
-          id: this.uid + 'main',
+          ref: 'form',
+          id: this.uid + 'form',
           class: ['w-input', {
             'w-input-border': this.hasBorder,
             [`f-${this.dir}-gap`]: $$1.br.compat.gap && this.x.gap,
@@ -6309,10 +6320,10 @@ var script$A = {
             'height': fh
           },
           title: this.input_title
-        }, this.main_prop), this.html_form())
+        }, this.form_prop), this.html_form_slot())
       },
       html_slots() {
-        return [this.html_label(), this.html_main(), this.slot('after'), this.slot('dialog')]
+        return [this.html_label(), this.html_main(), this.slot('right')]
       }
     },
     computed: {
@@ -6404,7 +6415,7 @@ var script$A = {
         }
         return s
       },
-      main_prop() {
+      form_prop() {
         // implement
       },
       hasVal() {
@@ -6434,7 +6445,8 @@ var script$A = {
             'z-req': this.rules.required,
             'z-label-vertical': this.labelVertical,
             'z-fixed': !!fw,
-            'z-full': this.x.inputWidth === '*'
+            'z-full': this.x.inputWidth === '*',
+            'z-slot-down': !!this.$slots.down
           }],
           style: fw && {
             '--w-input-width': fw
@@ -8671,7 +8683,7 @@ var script$k = {
           gap: 15
         }
       },
-      html_form() {
+      html_form_slot() {
         return this.x.vertical ? h('div', {class: 'w-boxgroup-grid'}, this.$slots) : this.$slots
       },
     },
@@ -9270,14 +9282,24 @@ const suffixHooks = {
     aud: 'aif.aifc.aiff.als.awb.mp3.aac.au.wav.wma.cda.flac.m4a.mid.mka.mp2.mpc.ape.ofr.ogg.ra.wv.tta.ac3.dts.wv.shn.vqf.spc.nsf.adx.psf.minipsf.psf2.minipsf2.rsn.zst',
     img: 'jpg.jpeg.gif.png.bmp.tif.tiff.ico'
   };
-
-  const suffix = (function() {
-    let r = {};
-    for (let k in suffixHooks) {
-      suffixHooks[k].split('.').forEach(v => r[v] = k == '0' ? v : k);
-    }
-    return r
-  })();
+  
+  const suffix = {};
+  
+  for (let k in suffixHooks) {
+    suffixHooks[k].split('.').forEach(v => {
+      suffix[v] = k == '0' ? v : k;
+    });
+  }
+  
+  const fileTypesAlias = {
+    video: suffixHooks.vid,
+    audio: suffixHooks.aud,
+    image: suffixHooks.img
+  };
+  
+  for (let k in fileTypesAlias) {
+    fileTypesAlias[k] = fileTypesAlias[k].split('.').map(v => `*.${v};`).join('');
+  }
 
   const getSuffix = function(url) {
     let a = $$1.strFrom(url || '', '.', true).toLowerCase();
@@ -9297,12 +9319,6 @@ const suffixHooks = {
       'T' ? 1024 * 1024 * 1024 * 1024 : 1)
   };
 
-  const fileTypeHooks = {
-    video: suffixHooks.vid,
-    audio: suffixHooks.aud,
-    image: suffixHooks.img
-  };
-
   var script$g = {
     name: 'w-fileupload',
     mixins: [script$A],
@@ -9342,6 +9358,9 @@ const suffixHooks = {
       },
       getFileTypes() {
         let t = this.x.fileTypes;
+        if (fileTypesAlias[t]) {
+          t = fileTypesAlias[t];
+        }
         return t && t !== '*.*' ? t.replace(/\*/g, '').replace(/;/g, ',').toLowerCase() : ''
       },
       getAccept() {
@@ -9350,8 +9369,7 @@ const suffixHooks = {
         if (!t) return
         let n = [];
         t.toLowerCase().split(',').forEach(b => {
-          if (!b) return
-          n.push(fileTypeHooks[b] || b);
+          b && n.push(b);
         });
         n.forEach(b => {
           b && r.push(mimeType$1(b) || b);
@@ -9432,24 +9450,26 @@ const suffixHooks = {
               item.value = d;
               this.x.success && this.x.success(item.value, this, res);
             }
-            this.nextUpload();
             if (item.error && item.error.message) $$1.alert(item.error.message);
           }).catch(error => {
             item.error = error;
             item.loading = false;
             item.loaded = true;
             item.source = null;
+            this.nextUpload();
             if (error.response && error.response.status) $$1.alert(error.response.status + ': ' + error);
           });
         } else if (!this.x.uploadSrc) {
           let message = '请给上传组件配置uploadSrc';
           item.error = {message};
           console.error(message);
+          this.nextUpload();
         }
       },
       nextUpload() {
         for (let item of this.list) {
           if (item.loading) return
+          if (item.error) continue
           if (item.file && !item.loaded) {
             return this.upload(item)
           }
@@ -9500,7 +9520,10 @@ const suffixHooks = {
 							default: () => this.$slots.menu({item: value})
 						}));
 					}
+          let key = value ? value.id : item.key;
+          if (!key) {item.key = key = $$1.uid();}
           return h('div', {
+            key,
             class: ['w-fileupload-value', {
               'z-loading': item.loading,
               'z-err': item.error
@@ -9540,18 +9563,25 @@ const suffixHooks = {
         ]
       },
       html_input_button() {
-        return h(script$J, {
-          ref: 'uploadbbr',
-          class: 'w-fileupload-bbr',
-          gap: 10,
-        }, {
-          default: () => [this.$slots.button ? this.$slots.button() : h(script$_, {
-            text: '选择文件',
-            icon: '.f-i .f-i-upload',
-            class: 'w-fileupload-button',
-            onclick: this.chooseFile
-          })]
-        })
+        return h('div', {}, [
+          h(script$J, {
+              ref: 'uploadbbr',
+              class: 'w-fileupload-bbr',
+              gap: 10,
+            }, {
+              default: () => [
+                this.$slots.button ? this.$slots.button({chooseFile: this.chooseFile}) :
+                h(script$_, {
+                  text: '选择文件',
+                  icon: '.f-i .f-i-upload',
+                  class: 'w-fileupload-button',
+                  onclick: this.chooseFile
+                }),
+                this.slot('right')
+              ]
+          }),
+          this.slot('down')
+        ])
       },
       html_input_list() {
         return this.list.length ? h('div', {
@@ -9564,7 +9594,12 @@ const suffixHooks = {
       html_input() {
         return this.html_input_form().concat(this.canUpload && this.html_input_button(), this.html_input_list())
       },
-
+      html_main() {
+        return h('div', {class: 'w-formbase-main'}, this.html_form())
+      },
+      html_slots() {
+        return [this.html_label(), this.html_main()]
+      }
     },
     computed: {
       validHooks() {
@@ -9818,26 +9853,34 @@ var script$e = {
       },
       html_list() {
         return this.list.map((item, index) => {
-          return h(script$f, {item, index})
+          let key = item.value ? item.value.id : item.key;
+          if (!key) {item.key = key = $$1.uid();}
+          return h(script$f, {item, index, key})
         })
       },
       html_input_button() {
-        return h(script$J, {
-          ref: 'uploadbbr',
-          class: 'w-fileupload-bbr'
-        }, {
-          default: () => [this.$slots.button ? this.$slots.button() : h(script$_, {
-            ref: 'uploadbutton',
-            title: $$1.loc.form.choose_image,
-            icon: '.f-i .f-i-plus',
-            class: 'w-mediaupload-button',
-            style: {
-              width: $$1.unitSize(this.x.thumbnailWidth),
-              height: $$1.unitSize(this.x.thumbnailHeight),
-            },
-            onclick: this.chooseFile
-          })]
-        })
+        return h('div', {}, [
+          h(script$J, {
+            ref: 'uploadbbr',
+            class: 'w-fileupload-bbr'
+          }, {
+            default: () => [
+              this.$slots.button ? this.$slots.button({chooseFile: this.chooseFile}) : h(script$_, {
+                ref: 'uploadbutton',
+                title: $$1.loc.form.choose_image,
+                icon: '.f-i .f-i-plus',
+                class: 'w-mediaupload-button',
+                style: {
+                  width: $$1.unitSize(this.x.thumbnailWidth),
+                  height: $$1.unitSize(this.x.thumbnailHeight),
+                },
+                onclick: this.chooseFile
+              }),
+              this.slot('right')
+            ]
+          }),
+          this.slot('down')
+        ])
       },
       html_input() {
         return this.html_input_form().concat(h('div', {
@@ -10363,7 +10406,7 @@ var script$a = {
           onkeyup: this.onkeyup,
         }
       },
-      main_prop() {
+      form_prop() {
         return {
           onclick: this.isNormal && this.drop
         }
@@ -10444,10 +10487,10 @@ var script$9 = {
 					  context: this,
 					  ownproperty: true,
 					  class: 'f-dfish-dialog w-dropbox-dialog' + (m ? ' z-mob' : ''),
-					  width: m ? '100%' : $$1.bcr(this.el('main')).width,
+					  width: m ? '100%' : $$1.bcr(this.el('form')).width,
 					  autoHide: true,
 					  cover: m,
-					  snap: m ? null : () => this.el('main'),
+					  snap: m ? null : () => this.el('form'),
 					  position: m ? null : 'v',
 					  indent: 1,
 					  onClose: () => this.showDrop = false
@@ -10480,7 +10523,7 @@ var script$9 = {
         });
         return r.sort().map(v => s[v].props.text).join(', ')
       },
-      main_prop() {
+      form_prop() {
         return {
           onclick: this.isNormal && this.click
         }
@@ -10621,14 +10664,15 @@ var script$6 = {
         }
       },
       forms() {
-        return this.ownerView.fAll(null, this.el('main'))
+        const to = this.$refs.to;
+        return to && this.ownerView.fAll(null, to.parentNode)
       },
       snapElem() {
-        return this.forms()[0] || this.el('main')
+        return this.forms()[0] || this.el('form')
       },
       html_form() {
         let c = this.slots_children();
-        c.splice(1, 0, h('div', {class: 'w-range-to'}, $$1.loc.to));
+        c.splice(1, 0, h('div', {ref: 'to', class: 'w-range-to'}, $$1.loc.to));
         //c.push(h('input', {type: 'hidden', ref:'v', id: this.uid + 'hdn'}))
         return c
       },
@@ -10843,9 +10887,9 @@ var script$5 = {
             context: this,
             ownproperty: true,
             class: 'f-dfish-dialog',
-            width: $$1.bcr(this.el('main')).width,
+            width: $$1.bcr(this.el('form')).width,
             autoHide: true,
-            snap:() => this.el('main'),
+            snap:() => this.el('form'),
             position: 'v',
             indent: 1,
             onClose: () => this.showSuggest = false
@@ -10913,7 +10957,7 @@ var script$5 = {
           'z-clearable': this.x.clearable,
         }
       },
-      main_prop() {
+      form_prop() {
 				return {
 					onclick: this.isNormal && this.onclick
 				}
@@ -11298,10 +11342,10 @@ var script$4 = {
             context: this,
             ownproperty: true,
             class: 'f-dfish-dialog',
-            width: $$1.bcr(this.el('main')).width,
+            width: $$1.bcr(this.el('form')).width,
             scrollY: true,
             autoHide: true,
-            snap: () => this.el('main'),
+            snap: () => this.el('form'),
             position: 'v',
             indent: 1,
             onClose: () => this.showSuggest = false
@@ -11584,7 +11628,7 @@ const init_text = $$1.loc.form.jigsaw_drag_right;
         return $$1.bcr(this.$refs.thumb).width
       },
       mainWidth() {
-        return $$1.bcr(this.$refs.main).width
+        return $$1.bcr(this.$refs.form).width
       },
       html_input() {
         return [
@@ -11615,7 +11659,7 @@ const init_text = $$1.loc.form.jigsaw_drag_right;
 					})
 				];
 				if (this.showDrop) {
-					let width = Math.max($$1.number(this.x.dropWidth), $$1.bcr(this.el('main')).width);
+					let width = Math.max($$1.number(this.x.dropWidth), $$1.bcr(this.el('form')).width);
 					let height = Math.ceil(width * (this.x.big.height / this.x.big.width));
 					r.push(h(script$3, {
 					  ownproperty: true,
@@ -11623,7 +11667,7 @@ const init_text = $$1.loc.form.jigsaw_drag_right;
 					  height,
 					  autoHide: true,
 					  context: this,
-					  snap: () => this.el('main'),
+					  snap: () => this.el('form'),
 					  position: 'v',
 					  onClose: () => this.showDrop = null
 					}));
@@ -11647,7 +11691,7 @@ const init_text = $$1.loc.form.jigsaw_drag_right;
           'z-success': this.isSuccess,
         }
       },
-      main_prop() {
+      form_prop() {
         return {
           onmouseenter: this.mouseenter
         }
@@ -11694,7 +11738,7 @@ var script$1 = {
           '--w-form-gap': $$1.unitSize(this.x.gap)
         }
       },
-      main_prop() {
+      form_prop() {
         return this.name && {
           onclick: e => this.warn(false)
         }