dfish-widget 1.0.29 → 1.0.35

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 { h, mergeProps, resolveComponent, resolveDirective, openBlock, createBlock, withCtx, createVNode, withDirectives, createTextVNode, toDisplayString, renderSlot, createCommentVNode, toRaw, Fragment, renderList, Teleport, TransitionGroup, getCurrentInstance, ref, computed, onMounted, watch, createSlots, resolveDynamicComponent, withModifiers } from 'vue';
+import { nextTick, h, mergeProps, toRaw, resolveComponent, openBlock, createElementBlock, createStaticVNode, createElementVNode, createBlock, withCtx, Fragment, createVNode, renderList, toDisplayString, createTextVNode, createCommentVNode, Teleport, computed, resolveDirective, withDirectives, unref, renderSlot, TransitionGroup, normalizeClass, getCurrentInstance, ref, onMounted, watch, createSlots, resolveDynamicComponent, normalizeStyle, withModifiers } from 'vue';
 import ResizeObserver$1 from 'resize-observer-polyfill';
 
 let u = navigator.userAgent.toLowerCase();
@@ -910,9 +910,9 @@ const snap = function(a, b, c, d, e, f, u) {
 	_snapMag.inner[y] && (o.inner = T$1);
 	if (f && o.mag) {
 		if (o.inner) {
-			o.mag_t ? (o.top -= f) : o.mag_b ? (o.bottom -= f) : o.mag_r ? (o.right -= f) : (o.left -= f);
+			o.mag_t ? (o.top -= f, o.bottom += f) : o.mag_b ? (o.top += f, o.bottom -= f) : o.mag_r ? (o.left += f, o.right -= f) : (o.left -= f, o.right += f);
 		} else {
-			o.mag_t ? (o.bottom -= f) : o.mag_b ? (o.top -= f) : o.mag_r ? (o.left -= f) : (o.right -= f);
+			o.mag_t ? (o.top += f, o.bottom -= f) : o.mag_b ? (o.top -= f, o.bottom += f) : o.mag_r ? (o.left -= f, o.right += f) : (o.left += f, o.right -= f);
 		}
 	}
 	if (e) {// 自适应位置  
@@ -1417,11 +1417,15 @@ $$1.download = function(a, b) {
 };
 
 
-$$1.wifiConfirm = function(a, b) {
-	$$1.x.wifiConfirm && plus.networkinfo.getCurrentType() != 3 ? plus.nativeUI.confirm($$1.loc.connection_not_wifi, function(e){e.index === 0 && a.call(b);}, {buttons:[$$1.loc.confirm, $$1.loc.cancel]}) : a.call(b);
+$$1.wifiConfirm = (a, b) => {
+  if ($$1.x.wifiConfirm && plus.networkinfo.getCurrentType() != 3) {
+    plus.nativeUI.confirm($$1.loc.connection_not_wifi, function(e){e.index === 0 && a.call(b);}, {buttons:[$$1.loc.confirm, $$1.loc.cancel]});
+  } else {
+    a.call(b);
+  }
 };
 
-$$1.vm = (a) => {
+$$1.vm = $$1.view = (a) => {
   if (!a) return $$1.docView
   if (typeof a === 'string') {
     if ($$1.vueMap.has(a)) {
@@ -1587,39 +1591,25 @@ const queryEncode = function(data, config) {
   return contentType == 'application/x-www-form-urlencoded' ? Qs.stringify(data, {arrayFormat: 'repeat'}) : data
 };
 
-$$1.ajax = function(cmd, args) {
+$$1.ajax = async function(cmd, args) {
   let src = args ? $$1.urlFormat(cmd.src, args) : cmd.src;
   if (!src && !cmd.request) {
     return Promise.reject('$.ajax(): The first parameter must be an object, and the property(src) of the object is required.')
   }
-  let ctx = cmd.context || $$1.docView;
-  let lock = ctx.ajaxLock;
   let config = $$1.lodash.pick(cmd, ['headers', 'responseType']);
   if (cmd.download) {
     $$1.extend(config, {responseType: 'blob'});
   }
-  lock && lock();
-  cmd.loading && ctx.pop('w-loading', cmd.loading);
 	if (cmd.request) {
-		return cmd.request(cmd.data).then(res => {
-			lock && lock(false);
-			cmd.loading && ctx.pop('w-loading', false);
-			return res
-		}).catch(ex => {
-			lock && lock(false);
-			cmd.loading && ctx.pop('w-loading', false);
-			return Promise.reject(ex) 
-		})
+		return cmd.request(cmd.data)
 	} else {
 		let method = (cmd.method || (cmd.data ? 'post' : 'get')).toLowerCase();
 		return (method === 'post' || method === 'put' || method === 'patch' ? $$1.http[method](src, queryEncode(cmd.data, config), config) : $$1.http[method](src, config))
 			.then(res => {
-		    lock && lock(false);
 		    let data = res.data;
-		    if (cmd.filter) data = cmd.filter(res, ctx);
-		    if (cmd.success) cmd.success(data, ctx);
-		    if (cmd.complete) cmd.complete(res, ctx);
-		    cmd.loading && ctx.pop('w-loading', false);
+		    if (cmd.filter) data = cmd.filter(res);
+		    if (cmd.success) cmd.success(data);
+		    if (cmd.complete) cmd.complete(res);
 		    if (cmd.download) {
 		      let disposition = res.headers['content-disposition'];
 		      if (disposition) {
@@ -1636,10 +1626,8 @@ $$1.ajax = function(cmd, args) {
 		    }
 		    return data
 		  }).catch(ex => {
-		    lock && lock(false);
-		    if (cmd.error) cmd.error(ex, ctx);
-		    if (cmd.complete) cmd.complete(ex.response, ctx, ex);
-		    cmd.loading && ctx.pop('w-loading', false);
+		    if (cmd.error) cmd.error(ex);
+		    if (cmd.complete) cmd.complete(ex.response, ex);
 		    return Promise.reject(ex)
 		  })
 	}
@@ -1710,6 +1698,16 @@ $$1.config = function(opt) {
   }
 };
 
+$$1.pop = (template, props, options = {}) => {
+  const commander = $$1(options.target) || $$1.vm();
+  return $$1.vm(commander).createPop(commander, template, props, options)
+};
+
+$$1.submit = (request, options = {}) => {
+  const commander = $$1(options.target) || $$1.vm();
+  return commander.submit(request, options)
+};
+
 window.addEventListener('unhandledrejection', (event) => {
   if ($$1.x.catchReject) {
     $$1.x.catchReject(event);
@@ -1802,7 +1800,7 @@ function directive(Vue) {
 
 const bindCache = {};
 
-  var script$1k = {
+  var script$1i = {
     props: ['data', 'width', 'height', 'colspan', 'rowspan', 'ownproperty', 'orientUid'],
     data() {
       return {
@@ -1870,8 +1868,11 @@ const bindCache = {};
 				}
 			},
 			ajax(cmd) {
-				cmd.context = cmd.context || this;
-				return $$1.ajax(cmd)
+        this.ajaxLock && this.ajaxLock();
+				return $$1.ajax(cmd).then((res) => {
+          this.ajaxLock && this.ajaxLock(false);
+          return res
+        })
 			},
 			submit(request, cmd) {
 				if (typeof request === 'object') {
@@ -1884,26 +1885,30 @@ const bindCache = {};
 				if (request) {
 					cmd.request = request;
 				}
-				const vm = $$1.vm(this);
-				return new Promise(rsv => this.$nextTick(() => {
-				  let d = cmd.validate || false;
-				  let f = vm.getFormList(d.range || cmd.range);
-				  let g = d.range && d.range != cmd.range ? vm.getFormList(cmd.range) : f;
-				  if (vm.valid(f, d.group)) {
-				    let post = vm.getPostData(g);
-				    cmd.data = cmd.data ? $$1.extend(cmd.data, post) : post;
-						this.ajax(cmd).then(data => rsv(data));
-				  }
-				}))
+        return new Promise(async (resolve) => {
+          await nextTick();
+          const vm = $$1.vm(this);
+          let d = cmd.validate || false;
+          let f = vm.getFormList(d.range || cmd.range);
+          let g = d.range && d.range != cmd.range ? vm.getFormList(cmd.range) : f;
+          this.ajaxLock && this.ajaxLock();
+          let isValid = await vm.valid(f, d.group);
+          if (isValid) {
+            let post = vm.getPostData(g);
+            cmd.data = cmd.data ? $$1.extend(cmd.data, post) : post;
+          	resolve(this.ajax(cmd));
+          } else {
+            this.ajaxLock && this.ajaxLock(false);
+          }
+        })
 			},
-			pop(template, props) {
-				let vm = $$1.vm(this);
-				if (props === false) {
-					vm.getPops({template, commander: this}).forEach(p => vm.removePop(p));
-				} else {
-					return vm.createPop(template, props, this)
-				}
+			pop(template, props, options) {
+        return $$1.vm(this).createPop(this, template, props, options)
 			},
+      closePop(template) {
+        const vm = $$1.vm(this);
+        vm.getPops(template).forEach(p => vm.removePop(p));
+      },
       trigger(ev, ...args) {
         let type = ev.runType || ev.type || ev;
         let f = this.getOn(type);
@@ -1960,7 +1965,7 @@ const bindCache = {};
           let c = 'hasScroll' + dir.toUpperCase();
           let t = this.closest(p => p[c] && (p.scrollState() || false)[dir]);
           if (t) {
-            t.scrollTo(this, opt.hasOwnProperty('y') ? opt.y : 'auto', opt.hasOwnProperty('x') ? opt.x : 'auto', opt.ease == null ? 200 : opt.ease, opt.divide, fn);
+            t.scrollTo(this, opt.hasOwnProperty('y') ? opt.y : 'auto', opt.x, opt.ease == null ? 200 : opt.ease, opt.divide, fn);
           } else
            fn && fn();
         };
@@ -1970,7 +1975,7 @@ const bindCache = {};
         if (!a) return false
         if (this.contains(a)) return true
         let d = $$1.dialog(a);
-        if (d && d.commander) return this.hasBubble(d.commander)
+        if (d && d.commander) return d.commander === a ? true : this.hasBubble(d.commander)
       },
       bind(name, fn) {
         let c = bindCache[this.uid] || (bindCache[this.uid] = {});
@@ -2060,9 +2065,9 @@ const bindCache = {};
     }
   };
 
-script$1k.__file = "src/widgets/WidgetAbs.vue";
+script$1i.__file = "src/widgets/WidgetAbs.vue";
 
-var script$1j = {
+var script$1h = {
     props: ['src', 'children'],
     data() {
       return {
@@ -2096,310 +2101,11 @@ var script$1j = {
     }
   };
 
-script$1j.__file = "src/widgets/SrcParent.vue";
-
-const icons = {
-    info: '.f-i .f-i-alert-info',
-    warning: '.f-i .f-i-alert-warning',
-    success: '.f-i .f-i-alert-success',
-    question: '.f-i .f-i-alert-question',
-    error: '.f-i .f-i-alert-error'
-  };
-
-  var script$1i = {
-    props: ['text', 'title', 'icon', 'showButton'],
-    data() {
-      return {
-        defaultIconType: 'info'
-      }
-    },
-    methods: {
-      save() {
-        this.$refs.dialog.cueYes();
-      },
-      close() {
-        this.$refs.dialog.close();
-      }
-    },
-    computed: {
-      typeIcon() {
-        return icons[this.icon] || this.icon || icons[this.defaultIconType]
-      }
-    },
-  };
-
-const _hoisted_1$9 = /*#__PURE__*/createVNode("i", { class: "w-alert-close-icon f-i f-i-close" }, null, -1 /* HOISTED */);
-
-function render$b(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_w_html = resolveComponent("w-html");
-  const _component_w_vertical = resolveComponent("w-vertical");
-  const _component_w_horizontal = resolveComponent("w-horizontal");
-  const _component_w_img = resolveComponent("w-img");
-  const _component_w_button = resolveComponent("w-button");
-  const _component_w_buttonbar = resolveComponent("w-buttonbar");
-  const _component_w_alert = resolveComponent("w-alert");
-  const _directive_dialog_move = resolveDirective("dialog-move");
-
-  return (openBlock(), createBlock(_component_w_alert, { ref: "dialog" }, {
-    default: withCtx(() => [
-      createVNode(_component_w_horizontal, { class: "w-alert-head" }, {
-        default: withCtx(() => [
-          withDirectives(createVNode(_component_w_vertical, {
-            class: "w-alert-move",
-            "w-width": "*"
-          }, {
-            default: withCtx(() => [
-              createVNode(_component_w_html, {
-                class: "w-alert-title",
-                valign: "middle",
-                height: "*"
-              }, {
-                default: withCtx(() => [
-                  createTextVNode(toDisplayString($props.title), 1 /* TEXT */)
-                ]),
-                _: 1 /* STABLE */
-              })
-            ]),
-            _: 1 /* STABLE */
-          }, 512 /* NEED_PATCH */), [
-            [_directive_dialog_move, true]
-          ]),
-          createVNode(_component_w_html, {
-            class: "w-alert-close",
-            align: "center",
-            valign: "middle",
-            onClick: $options.close
-          }, {
-            default: withCtx(() => [
-              _hoisted_1$9
-            ]),
-            _: 1 /* STABLE */
-          }, 8 /* PROPS */, ["onClick"])
-        ]),
-        _: 1 /* STABLE */
-      }),
-      createVNode(_component_w_vertical, { class: "w-alert-body" }, {
-        default: withCtx(() => [
-          createVNode(_component_w_horizontal, { class: "w-alert-main" }, {
-            default: withCtx(() => [
-              createVNode(_component_w_img, {
-                class: "w-alert-icon",
-                src: $options.typeIcon
-              }, null, 8 /* PROPS */, ["src"]),
-              renderSlot(_ctx.$slots, "default", {}, () => [
-                createVNode("div", {
-                  "w-width": "*",
-                  class: "w-alert-text",
-                  innerHTML: $props.text
-                }, null, 8 /* PROPS */, ["innerHTML"])
-              ])
-            ]),
-            _: 3 /* FORWARDED */
-          }),
-          ($props.showButton!==false)
-            ? (openBlock(), createBlock(_component_w_buttonbar, {
-                key: 0,
-                class: "w-alert-buttonbar"
-              }, {
-                default: withCtx(() => [
-                  createVNode(_component_w_button, {
-                    face: "primary",
-                    class: "w-alert-button",
-                    text: "确定",
-                    onClick: $options.save,
-                    ownproperty: true
-                  }, null, 8 /* PROPS */, ["onClick"])
-                ]),
-                _: 1 /* STABLE */
-              }))
-            : createCommentVNode("v-if", true)
-        ]),
-        _: 1 /* STABLE */
-      })
-    ]),
-    _: 1 /* STABLE */
-  }, 512 /* NEED_PATCH */))
-}
-
-script$1i.render = render$b;
-script$1i.__file = "src/template/TemplateAlert.vue";
-
-var script$1h = {
-    mixins: [script$1i],
-    data() {
-      return {
-        defaultIconType: 'question'
-      }
-    },
-    methods: {
-      save() {
-        this.$refs.dialog.cueYes();
-      },
-      cancel() {
-        this.$refs.dialog.cueNo();
-      }
-    }
-  };
-
-const _hoisted_1$8 = /*#__PURE__*/createVNode("i", { class: "w-alert-close-icon f-i f-i-close" }, null, -1 /* HOISTED */);
-
-function render$a(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_w_html = resolveComponent("w-html");
-  const _component_w_vertical = resolveComponent("w-vertical");
-  const _component_w_horizontal = resolveComponent("w-horizontal");
-  const _component_w_img = resolveComponent("w-img");
-  const _component_w_button = resolveComponent("w-button");
-  const _component_w_buttonbar = resolveComponent("w-buttonbar");
-  const _component_w_confirm = resolveComponent("w-confirm");
-  const _directive_dialog_move = resolveDirective("dialog-move");
-
-  return (openBlock(), createBlock(_component_w_confirm, { ref: "dialog" }, {
-    default: withCtx(() => [
-      createVNode(_component_w_horizontal, { class: "w-alert-head" }, {
-        default: withCtx(() => [
-          withDirectives(createVNode(_component_w_vertical, {
-            class: "w-alert-move",
-            "w-width": "*"
-          }, {
-            default: withCtx(() => [
-              createVNode(_component_w_html, {
-                class: "w-alert-title",
-                valign: "middle",
-                height: "*"
-              }, {
-                default: withCtx(() => [
-                  createTextVNode(toDisplayString(_ctx.title), 1 /* TEXT */)
-                ]),
-                _: 1 /* STABLE */
-              })
-            ]),
-            _: 1 /* STABLE */
-          }, 512 /* NEED_PATCH */), [
-            [_directive_dialog_move, true]
-          ]),
-          createVNode(_component_w_html, {
-            class: "w-alert-close",
-            align: "center",
-            valign: "middle",
-            onClick: $options.cancel
-          }, {
-            default: withCtx(() => [
-              _hoisted_1$8
-            ]),
-            _: 1 /* STABLE */
-          }, 8 /* PROPS */, ["onClick"])
-        ]),
-        _: 1 /* STABLE */
-      }),
-      createVNode(_component_w_vertical, { class: "w-alert-body" }, {
-        default: withCtx(() => [
-          createVNode(_component_w_horizontal, {
-            class: "w-alert-main",
-            valign: "middle"
-          }, {
-            default: withCtx(() => [
-              createVNode(_component_w_img, {
-                class: "w-alert-icon",
-                src: _ctx.typeIcon
-              }, null, 8 /* PROPS */, ["src"]),
-              renderSlot(_ctx.$slots, "default", {}, () => [
-                createVNode("div", {
-                  "w-width": "*",
-                  class: "w-alert-text",
-                  innerHTML: _ctx.text
-                }, null, 8 /* PROPS */, ["innerHTML"])
-              ])
-            ]),
-            _: 3 /* FORWARDED */
-          }),
-          createVNode(_component_w_buttonbar, {
-            gap: "10",
-            class: "w-alert-buttonbar"
-          }, {
-            default: withCtx(() => [
-              createVNode(_component_w_button, {
-                face: "primary",
-                class: "w-alert-button",
-                text: "确定",
-                onClick: $options.save,
-                ownproperty: true
-              }, null, 8 /* PROPS */, ["onClick"]),
-              createVNode(_component_w_button, {
-                class: "w-alert-button",
-                text: "取消",
-                onClick: $options.cancel,
-                ownproperty: true
-              }, null, 8 /* PROPS */, ["onClick"])
-            ]),
-            _: 1 /* STABLE */
-          })
-        ]),
-        _: 1 /* STABLE */
-      })
-    ]),
-    _: 1 /* STABLE */
-  }, 512 /* NEED_PATCH */))
-}
-
-script$1h.render = render$a;
-script$1h.__file = "src/template/TemplateConfirm.vue";
+script$1h.__file = "src/widgets/SrcParent.vue";
 
 var script$1g = {
-    props: ['text'],
-    methods: {
-
-    },
-    computed: {
-
-    }
-  };
-
-const _hoisted_1$7 = { class: "w-tip-body f-flex-center" };
-const _hoisted_2$6 = { class: "w-tip-text" };
-
-function render$9(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_w_tip = resolveComponent("w-tip");
-
-  return (openBlock(), createBlock(_component_w_tip, null, {
-    default: withCtx(() => [
-      createVNode("div", _hoisted_1$7, [
-        createVNode("div", _hoisted_2$6, [
-          renderSlot(_ctx.$slots, "default", {}, () => [
-            createTextVNode(toDisplayString($props.text), 1 /* TEXT */)
-          ])
-        ])
-      ])
-    ]),
-    _: 3 /* FORWARDED */
-  }))
-}
-
-script$1g.render = render$9;
-script$1g.__file = "src/template/TemplateTip.vue";
-
-function render$8(_ctx, _cache) {
-  const _component_w_loading = resolveComponent("w-loading");
-
-  return (openBlock(), createBlock(_component_w_loading))
-}
-
-const script$1f = {};
-
-
-script$1f.render = render$8;
-script$1f.__file = "src/template/TemplateLoading.vue";
-
-const templateHooks = {
-	  'w-alert': script$1i,
-	  'w-confirm': script$1h,
-	  'w-tip': script$1g,
-	  'w-loading': script$1f
-	};
-
-	
-  var script$1e = {
     name: 'w-view',
-    mixins: [script$1j],
+    mixins: [script$1h],
     provide() {
       return {
         provideView: this
@@ -2502,10 +2208,10 @@ const templateHooks = {
         return r
       },
       // 表单验证。如果检测到错误，将返回一个包含错误信息的数组 /@r -> range, n -> validate group name
-      getValidError(range) {
+      async getValidError(range) {
         let e, q = this.getFormList(range);
         for (let i = 0, l = q.length, c, v; i < l; i++) {
-          if ((c = $$1(q[i])) && c.isFormWidget && (v = c.getValidError())) {
+          if ((c = $$1(q[i])) && c.isFormWidget && (v = await c.getValidError())) {
             if (!e) e = [];
             if (!e.find(n => n.wid == v.wid)) e.push(v);
           }
@@ -2513,14 +2219,14 @@ const templateHooks = {
         return e
       },
       // 表单验证。验证通过返回true /@ range -> validaterange
-      valid(range) {
+      async valid(range) {
         if (this._err_ns) {
           this._err_ns.forEach(v => {
             let n = $$1.vueMap.get(v.wid);
              n && n.warn(false);
           });
         }
-        let e = this.getValidError(range);
+        let e = await this.getValidError(range);
         if (e) {
           e.forEach(v => $$1.vueMap.get(v.wid).warn());
           $$1.vueMap.get(e[0].wid).showErrorTip(e[0].text);
@@ -2548,19 +2254,40 @@ const templateHooks = {
 					return this.pop('w-loading', {cover: true, local: true, ...props})
 				}
       },
-      createPop(template, props, commander) {
+      /*
+        @options: {
+          mode: {
+            'default': 一个template只有一个实例，且每次都是新实例
+            'component': 一个template只有一个实例
+            'multiple': 一个template可以多个实例
+          }, 
+          init(pop): Function, 对话框mounted后执行
+        }
+      */
+      createPop(commander, template, props, options = {}) {
         return new Promise((resolve, reject) => {
-					const orientUid = $$1.uid();
-          this.pops.push({template, orientUid, props, commander, resolve, reject});
+          const mode = options.mode || 'default';
+          const pop = this.getPops(template)[0];
+          if (pop) {
+            if (mode === 'component') {
+              Object.assign(pop, {props, options, resolve, reject});
+              return
+            } else if (mode === 'default') {
+              let index = this.pops.indexOf(pop);
+              this.pops.splice(index, 1);
+            }
+          } 
+          const orientUid = $$1.uid();
+          this.pops.push({commander, template, props, options, orientUid, resolve, reject});
         })
       },
       removePop(p) {
 				let i = typeof p === 'string' ? this.pops.findIndex(v => v.orientUid == p) : this.pops.indexOf(p);
 				i > -1 && this.pops.splice(i, 1);
       },
-			getPops({template, commander}) {
+			getPops(template, commander) {
 				return this.pops.filter(p => {
-					if (template && p.template != template) return false
+					if (template && toRaw(p.template) != toRaw(template)) return false
 					if (commander && p.commander != commander) return false
 					return true
 				})
@@ -2570,160 +2297,49 @@ const templateHooks = {
 			},
       html_pops() {
         return this.pops.map(({template, orientUid, props}) => {
-					const com = toRaw(typeof template === 'string' ? templateHooks[template] : template);
+					const com = typeof template === 'string' ? resolveComponent(template) : toRaw(template);
 					return com && h(com, {key: orientUid, orientUid, ...props})
 				})
       }
     }
   };
 
-script$1e.__file = "src/widgets/ViewAbs.vue";
+script$1g.__file = "src/widgets/ViewAbs.vue";
 
-var script$1d = {
+var script$1f = {
     name: 'w-svg-loading'
   };
 
-const _hoisted_1$6 = {
+const _hoisted_1$9 = {
   style: {"display":"none","width":"0","height":"0"},
   width: "0",
   height: "0",
   focusable: "false",
   "aria-hidden": "true"
 };
-const _hoisted_2$5 = /*#__PURE__*/createVNode("symbol", {
-  id: "f-svg-loading",
-  viewBox: "0 0 50 50"
-}, [
-  /*#__PURE__*/createVNode("path", {
-    d: "M43.935,25.145c0-10.318-8.364-18.683-18.683-18.683c-10.318,0-18.683,8.365-18.683,18.683h4.068c0-8.071,6.543-14.615,14.615-14.615c8.072,0,14.615,6.543,14.615,14.615H43.935z",
-    transform: "rotate(86.9154 25 25)"
-  })
-], -1 /* HOISTED */);
-const _hoisted_3$5 = /*#__PURE__*/createVNode("symbol", {
-  id: "f-svg-loading-1",
-  viewBox: "10 10 80 80"
-}, [
-  /*#__PURE__*/createVNode("circle", {
-    cx: "50",
-    cy: "50",
-    r: "30"
-  })
-], -1 /* HOISTED */);
-const _hoisted_4$3 = /*#__PURE__*/createVNode("symbol", {
-  id: "f-svg-loading-2",
-  viewBox: "0 0 24 30"
-}, [
-  /*#__PURE__*/createVNode("rect", {
-    x: "0",
-    y: "8.66115",
-    width: "4",
-    height: "12.6777",
-    opacity: "0.2"
-  }, [
-    /*#__PURE__*/createVNode("animate", {
-      attributeName: "opacity",
-      values: "0.2; 1; .2",
-      begin: "0s",
-      dur: "0.6s",
-      repeatCount: "indefinite"
-    }),
-    /*#__PURE__*/createVNode("animate", {
-      attributeName: "height",
-      values: "10; 20; 10",
-      begin: "0s",
-      dur: "0.6s",
-      repeatCount: "indefinite"
-    }),
-    /*#__PURE__*/createVNode("animate", {
-      attributeName: "y",
-      values: "10; 5; 10",
-      begin: "0s",
-      dur: "0.6s",
-      repeatCount: "indefinite"
-    })
-  ]),
-  /*#__PURE__*/createVNode("rect", {
-    x: "8",
-    y: "6.16115",
-    width: "4",
-    height: "17.6777",
-    opacity: "0.2"
-  }, [
-    /*#__PURE__*/createVNode("animate", {
-      attributeName: "opacity",
-      values: "0.2; 1; .2",
-      begin: "0.15s",
-      dur: "0.6s",
-      repeatCount: "indefinite"
-    }),
-    /*#__PURE__*/createVNode("animate", {
-      attributeName: "height",
-      values: "10; 20; 10",
-      begin: "0.15s",
-      dur: "0.6s",
-      repeatCount: "indefinite"
-    }),
-    /*#__PURE__*/createVNode("animate", {
-      attributeName: "y",
-      values: "10; 5; 10",
-      begin: "0.15s",
-      dur: "0.6s",
-      repeatCount: "indefinite"
-    })
-  ]),
-  /*#__PURE__*/createVNode("rect", {
-    x: "16",
-    y: "6.33885",
-    width: "4",
-    height: "17.3223",
-    opacity: "0.2"
-  }, [
-    /*#__PURE__*/createVNode("animate", {
-      attributeName: "opacity",
-      values: "0.2; 1; .2",
-      begin: "0.3s",
-      dur: "0.6s",
-      repeatCount: "indefinite"
-    }),
-    /*#__PURE__*/createVNode("animate", {
-      attributeName: "height",
-      values: "10; 20; 10",
-      begin: "0.3s",
-      dur: "0.6s",
-      repeatCount: "indefinite"
-    }),
-    /*#__PURE__*/createVNode("animate", {
-      attributeName: "y",
-      values: "10; 5; 10",
-      begin: "0.3s",
-      dur: "0.6s",
-      repeatCount: "indefinite"
-    })
-  ])
-], -1 /* HOISTED */);
-const _hoisted_5$2 = /*#__PURE__*/createVNode("symbol", {
+const _hoisted_2$7 = /*#__PURE__*/createStaticVNode("<symbol id=\"f-svg-loading\" viewBox=\"0 0 50 50\"><path d=\"M43.935,25.145c0-10.318-8.364-18.683-18.683-18.683c-10.318,0-18.683,8.365-18.683,18.683h4.068c0-8.071,6.543-14.615,14.615-14.615c8.072,0,14.615,6.543,14.615,14.615H43.935z\" transform=\"rotate(86.9154 25 25)\"></path></symbol><symbol id=\"f-svg-loading-1\" viewBox=\"10 10 80 80\"><circle cx=\"50\" cy=\"50\" r=\"30\"></circle></symbol><symbol id=\"f-svg-loading-2\" viewBox=\"0 0 24 30\"><rect x=\"0\" y=\"8.66115\" width=\"4\" height=\"12.6777\" opacity=\"0.2\"><animate attributeName=\"opacity\" values=\"0.2; 1; .2\" begin=\"0s\" dur=\"0.6s\" repeatCount=\"indefinite\"></animate><animate attributeName=\"height\" values=\"10; 20; 10\" begin=\"0s\" dur=\"0.6s\" repeatCount=\"indefinite\"></animate><animate attributeName=\"y\" values=\"10; 5; 10\" begin=\"0s\" dur=\"0.6s\" repeatCount=\"indefinite\"></animate></rect><rect x=\"8\" y=\"6.16115\" width=\"4\" height=\"17.6777\" opacity=\"0.2\"><animate attributeName=\"opacity\" values=\"0.2; 1; .2\" begin=\"0.15s\" dur=\"0.6s\" repeatCount=\"indefinite\"></animate><animate attributeName=\"height\" values=\"10; 20; 10\" begin=\"0.15s\" dur=\"0.6s\" repeatCount=\"indefinite\"></animate><animate attributeName=\"y\" values=\"10; 5; 10\" begin=\"0.15s\" dur=\"0.6s\" repeatCount=\"indefinite\"></animate></rect><rect x=\"16\" y=\"6.33885\" width=\"4\" height=\"17.3223\" opacity=\"0.2\"><animate attributeName=\"opacity\" values=\"0.2; 1; .2\" begin=\"0.3s\" dur=\"0.6s\" repeatCount=\"indefinite\"></animate><animate attributeName=\"height\" values=\"10; 20; 10\" begin=\"0.3s\" dur=\"0.6s\" repeatCount=\"indefinite\"></animate><animate attributeName=\"y\" values=\"10; 5; 10\" begin=\"0.3s\" dur=\"0.6s\" repeatCount=\"indefinite\"></animate></rect></symbol>", 3);
+const _hoisted_5$2 = /*#__PURE__*/createElementVNode("symbol", {
   id: "f-svg-loading-3",
   viewBox: "0 0 1024 1024"
 }, [
-  /*#__PURE__*/createVNode("path", {
+  /*#__PURE__*/createElementVNode("path", {
     d: "M514.048 337.715a32 32 0 0 1-32-32V135.168a32 32 0 1 1 64 0v170.534a32 32 0 0 1-32 32z m-1.28 581.799a32 32 0 0 1-32-32V714.406a32 32 0 1 1 64 0v173.095a32 32 0 0 1-32 32zM305.011 543.347H135.744a32 32 0 0 1 0-64h169.267a32 32 0 0 1 0 64z m583.079 0H713.83a32 32 0 0 1 0-64h174.26a32 32 0 1 1 0 64zM245.978 806.4a32 32 0 0 1-22.656-54.669L342.643 632.32a32 32 0 0 1 45.325 45.325L268.646 796.979a31.898 31.898 0 0 1-22.668 9.344z m408.435-408.5a32 32 0 0 1-22.656-54.68l123.558-123.56a32 32 0 1 1 45.325 45.3L677.12 388.544a31.898 31.898 0 0 1-22.669 9.357z m121.523 411.06a31.885 31.885 0 0 1-22.669-9.344l-122.15-122.15a32 32 0 1 1 45.325-45.325l122.15 122.15a32 32 0 0 1-22.656 54.669zM364.672 397.632a31.923 31.923 0 0 1-22.669-9.344L221.273 267.52a32 32 0 1 1 45.325-45.325l120.73 120.743a32 32 0 0 1-22.656 54.668z m0 0",
     "p-id": "4486"
   })
 ], -1 /* HOISTED */);
+const _hoisted_6$2 = [
+  _hoisted_2$7,
+  _hoisted_5$2
+];
 
 function render$7(_ctx, _cache, $props, $setup, $data, $options) {
-  return (openBlock(), createBlock("svg", _hoisted_1$6, [
-    _hoisted_2$5,
-    _hoisted_3$5,
-    _hoisted_4$3,
-    _hoisted_5$2
-  ]))
+  return (openBlock(), createElementBlock("svg", _hoisted_1$9, _hoisted_6$2))
 }
 
-script$1d.render = render$7;
-script$1d.__file = "src/assets/SVGIcon.vue";
+script$1f.render = render$7;
+script$1f.__file = "src/assets/SVGIcon.vue";
 
-var script$1c = {
+var script$1e = {
     props: ['data'],
     data() {
       return {
@@ -2764,9 +2380,10 @@ var script$1c = {
     }
   };
 
-const _hoisted_1$5 = { class: "f-height f-rel f-oh" };
-const _hoisted_2$4 = { class: "_rotate" };
-const _hoisted_3$4 = /*#__PURE__*/createVNode("span", { class: "_s" }, "|", -1 /* HOISTED */);
+const _hoisted_1$8 = { class: "f-height f-rel f-oh" };
+const _hoisted_2$6 = ["src"];
+const _hoisted_3$4 = { class: "_rotate" };
+const _hoisted_4$2 = /*#__PURE__*/createElementVNode("span", { class: "_s" }, "|", -1 /* HOISTED */);
 
 function render$6(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_w_swiper_item = resolveComponent("w-swiper-item");
@@ -2784,7 +2401,7 @@ function render$6(_ctx, _cache, $props, $setup, $data, $options) {
   }, {
     default: withCtx(() => [
       ($props.data.type=='image')
-        ? (openBlock(), createBlock(Fragment, { key: 0 }, [
+        ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
             createVNode(_component_w_swiper, {
               ref: "swiper",
               class: "f-height",
@@ -2794,14 +2411,14 @@ function render$6(_ctx, _cache, $props, $setup, $data, $options) {
               duration: "300"
             }, {
               default: withCtx(() => [
-                (openBlock(true), createBlock(Fragment, null, renderList($props.data.imgs, (item, index) => {
+                (openBlock(true), createElementBlock(Fragment, null, renderList($props.data.imgs, (item, index) => {
                   return (openBlock(), createBlock(_component_w_swiper_item, { key: index }, {
                     default: withCtx(() => [
-                      createVNode("div", _hoisted_1$5, [
-                        createVNode("img", {
+                      createElementVNode("div", _hoisted_1$8, [
+                        createElementVNode("img", {
                           class: "_img",
                           src: item
-                        }, null, 8 /* PROPS */, ["src"])
+                        }, null, 8 /* PROPS */, _hoisted_2$6)
                       ])
                     ]),
                     _: 2 /* DYNAMIC */
@@ -2810,15 +2427,15 @@ function render$6(_ctx, _cache, $props, $setup, $data, $options) {
               ]),
               _: 1 /* STABLE */
             }, 8 /* PROPS */, ["current", "arrow", "indicator-dots"]),
-            createVNode("div", _hoisted_2$4, [
-              createVNode("a", {
+            createElementVNode("div", _hoisted_3$4, [
+              createElementVNode("a", {
                 class: "_l",
-                onClick: _cache[1] || (_cache[1] = $event => ($options.rot(-1)))
+                onClick: _cache[0] || (_cache[0] = $event => ($options.rot(-1)))
               }, toDisplayString($options.loc.rotate_left), 1 /* TEXT */),
-              _hoisted_3$4,
-              createVNode("a", {
+              _hoisted_4$2,
+              createElementVNode("a", {
                 class: "_r",
-                onClick: _cache[2] || (_cache[2] = $event => ($options.rot(1)))
+                onClick: _cache[1] || (_cache[1] = $event => ($options.rot(1)))
               }, toDisplayString($options.loc.rotate_right), 1 /* TEXT */)
             ])
           ], 64 /* STABLE_FRAGMENT */))
@@ -2827,19 +2444,19 @@ function render$6(_ctx, _cache, $props, $setup, $data, $options) {
             class: "f-height",
             src: $props.data.src
           }, null, 8 /* PROPS */, ["src"])),
-      createVNode("div", {
+      createElementVNode("div", {
         class: "_dlg_x",
-        onClick: _cache[3] || (_cache[3] = (...args) => ($options.close && $options.close(...args)))
+        onClick: _cache[2] || (_cache[2] = (...args) => ($options.close && $options.close(...args)))
       })
     ]),
     _: 1 /* STABLE */
   }))
 }
 
-script$1c.render = render$6;
-script$1c.__file = "src/template/TemplatePreviewMedia.vue";
+script$1e.render = render$6;
+script$1e.__file = "src/template/TemplatePreviewMedia.vue";
 
-var script$1b = {
+var script$1d = {
     props: ['data'],
     data() {
       let f = this.data.format || 'yyyy-MM-dd';
@@ -3023,14 +2640,6 @@ var script$1b = {
     }
   };
 
-const _hoisted_1$4 = /*#__PURE__*/createTextVNode("年");
-const _hoisted_2$3 = /*#__PURE__*/createTextVNode("月");
-const _hoisted_3$3 = /*#__PURE__*/createTextVNode("日");
-const _hoisted_4$2 = /*#__PURE__*/createTextVNode("时");
-const _hoisted_5$1 = /*#__PURE__*/createTextVNode("分");
-const _hoisted_6$1 = /*#__PURE__*/createTextVNode("秒");
-const _hoisted_7$1 = /*#__PURE__*/createTextVNode("周");
-
 function render$5(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_w_button = resolveComponent("w-button");
   const _component_w_buttonbar = resolveComponent("w-buttonbar");
@@ -3076,21 +2685,21 @@ function render$5(_ctx, _cache, $props, $setup, $data, $options) {
                     valign: "middle"
                   }, {
                     default: withCtx(() => [
-                      _hoisted_1$4
+                      createTextVNode("年")
                     ]),
                     _: 1 /* STABLE */
                   }),
                   createVNode(_component_w_slidepicker, {
                     height: "*",
                     modelValue: $data.focusYear,
-                    "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => ($data.focusYear = $event)),
+                    "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => (($data.focusYear) = $event)),
                     "min-value": $options.minYear,
                     "max-value": $options.maxYear,
                     "keep-index": true,
                     data: {mode: 'year'}
                   }, {
                     default: withCtx(() => [
-                      (openBlock(true), createBlock(Fragment, null, renderList($options.yearList, (y) => {
+                      (openBlock(true), createElementBlock(Fragment, null, renderList($options.yearList, (y) => {
                         return (openBlock(), createBlock(_component_w_option, {
                           key: y,
                           value: y,
@@ -3116,21 +2725,21 @@ function render$5(_ctx, _cache, $props, $setup, $data, $options) {
                     valign: "middle"
                   }, {
                     default: withCtx(() => [
-                      _hoisted_2$3
+                      createTextVNode("月")
                     ]),
                     _: 1 /* STABLE */
                   }),
                   createVNode(_component_w_slidepicker, {
                     height: "*",
                     modelValue: $data.focusMonth,
-                    "onUpdate:modelValue": _cache[2] || (_cache[2] = $event => ($data.focusMonth = $event)),
+                    "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => (($data.focusMonth) = $event)),
                     "min-value": $options.minMonth,
                     "max-value": $options.maxMonth,
                     "keep-index": true,
                     data: {mode: 'month'}
                   }, {
                     default: withCtx(() => [
-                      (openBlock(true), createBlock(Fragment, null, renderList($options.monthList, (m) => {
+                      (openBlock(true), createElementBlock(Fragment, null, renderList($options.monthList, (m) => {
                         return (openBlock(), createBlock(_component_w_option, {
                           key: m,
                           value: m,
@@ -3156,21 +2765,21 @@ function render$5(_ctx, _cache, $props, $setup, $data, $options) {
                     valign: "middle"
                   }, {
                     default: withCtx(() => [
-                      _hoisted_3$3
+                      createTextVNode("日")
                     ]),
                     _: 1 /* STABLE */
                   }),
                   createVNode(_component_w_slidepicker, {
                     height: "*",
                     modelValue: $data.focusDate,
-                    "onUpdate:modelValue": _cache[3] || (_cache[3] = $event => ($data.focusDate = $event)),
+                    "onUpdate:modelValue": _cache[2] || (_cache[2] = $event => (($data.focusDate) = $event)),
                     "min-value": $options.minDate,
                     "max-value": $options.maxDate,
                     "keep-index": true,
                     data: {mode: 'date'}
                   }, {
                     default: withCtx(() => [
-                      (openBlock(true), createBlock(Fragment, null, renderList($options.dateList, (d) => {
+                      (openBlock(true), createElementBlock(Fragment, null, renderList($options.dateList, (d) => {
                         return (openBlock(), createBlock(_component_w_option, {
                           key: d,
                           value: d,
@@ -3196,20 +2805,20 @@ function render$5(_ctx, _cache, $props, $setup, $data, $options) {
                     valign: "middle"
                   }, {
                     default: withCtx(() => [
-                      _hoisted_4$2
+                      createTextVNode("时")
                     ]),
                     _: 1 /* STABLE */
                   }),
                   createVNode(_component_w_slidepicker, {
                     height: "*",
                     modelValue: $data.focusHour,
-                    "onUpdate:modelValue": _cache[4] || (_cache[4] = $event => ($data.focusHour = $event)),
+                    "onUpdate:modelValue": _cache[3] || (_cache[3] = $event => (($data.focusHour) = $event)),
                     "min-value": $options.minHour,
                     "max-value": $options.maxHour,
                     "keep-index": true
                   }, {
                     default: withCtx(() => [
-                      (openBlock(true), createBlock(Fragment, null, renderList($options.hourList, (h) => {
+                      (openBlock(true), createElementBlock(Fragment, null, renderList($options.hourList, (h) => {
                         return (openBlock(), createBlock(_component_w_option, {
                           key: h,
                           value: h,
@@ -3235,20 +2844,20 @@ function render$5(_ctx, _cache, $props, $setup, $data, $options) {
                     valign: "middle"
                   }, {
                     default: withCtx(() => [
-                      _hoisted_5$1
+                      createTextVNode("分")
                     ]),
                     _: 1 /* STABLE */
                   }),
                   createVNode(_component_w_slidepicker, {
                     height: "*",
                     modelValue: $data.focusMinute,
-                    "onUpdate:modelValue": _cache[5] || (_cache[5] = $event => ($data.focusMinute = $event)),
+                    "onUpdate:modelValue": _cache[4] || (_cache[4] = $event => (($data.focusMinute) = $event)),
                     "min-value": $options.minMinute,
                     "max-value": $options.maxMinute,
                     "keep-index": true
                   }, {
                     default: withCtx(() => [
-                      (openBlock(true), createBlock(Fragment, null, renderList($options.minuteList, (i) => {
+                      (openBlock(true), createElementBlock(Fragment, null, renderList($options.minuteList, (i) => {
                         return (openBlock(), createBlock(_component_w_option, {
                           key: i,
                           value: i,
@@ -3274,20 +2883,20 @@ function render$5(_ctx, _cache, $props, $setup, $data, $options) {
                     valign: "middle"
                   }, {
                     default: withCtx(() => [
-                      _hoisted_6$1
+                      createTextVNode("秒")
                     ]),
                     _: 1 /* STABLE */
                   }),
                   createVNode(_component_w_slidepicker, {
                     height: "*",
                     modelValue: $data.focusSecond,
-                    "onUpdate:modelValue": _cache[6] || (_cache[6] = $event => ($data.focusSecond = $event)),
+                    "onUpdate:modelValue": _cache[5] || (_cache[5] = $event => (($data.focusSecond) = $event)),
                     "min-value": $options.minSecond,
                     "max-value": $options.maxSecond,
                     "keep-index": true
                   }, {
                     default: withCtx(() => [
-                      (openBlock(true), createBlock(Fragment, null, renderList($options.secondList, (s) => {
+                      (openBlock(true), createElementBlock(Fragment, null, renderList($options.secondList, (s) => {
                         return (openBlock(), createBlock(_component_w_option, {
                           key: s,
                           value: s,
@@ -3313,20 +2922,20 @@ function render$5(_ctx, _cache, $props, $setup, $data, $options) {
                     valign: "middle"
                   }, {
                     default: withCtx(() => [
-                      _hoisted_7$1
+                      createTextVNode("周")
                     ]),
                     _: 1 /* STABLE */
                   }),
                   createVNode(_component_w_slidepicker, {
                     height: "*",
                     modelValue: $data.focusWeek,
-                    "onUpdate:modelValue": _cache[7] || (_cache[7] = $event => ($data.focusWeek = $event)),
+                    "onUpdate:modelValue": _cache[6] || (_cache[6] = $event => (($data.focusWeek) = $event)),
                     "min-value": $options.minWeek,
                     "max-value": $options.maxWeek,
                     "keep-index": true
                   }, {
                     default: withCtx(() => [
-                      (openBlock(true), createBlock(Fragment, null, renderList($options.weekList, (w) => {
+                      (openBlock(true), createElementBlock(Fragment, null, renderList($options.weekList, (w) => {
                         return (openBlock(), createBlock(_component_w_option, {
                           key: w.value,
                           value: w.value,
@@ -3348,12 +2957,12 @@ function render$5(_ctx, _cache, $props, $setup, $data, $options) {
   }))
 }
 
-script$1b.render = render$5;
-script$1b.__file = "src/template/TemplateDateSheet.vue";
+script$1d.render = render$5;
+script$1d.__file = "src/template/TemplateDateSheet.vue";
 
-var script$1a = {
+var script$1c = {
     name: 'w-docview',
-    mixins: [script$1k, script$1e],
+    mixins: [script$1i, script$1g],
     provide() {
       return {
         providePubParent: null,
@@ -3374,15 +2983,15 @@ var script$1a = {
         return null
       },
       previewVideo(src) {
-        this.pop(script$1c, {data: {type: 'video', src}});
+        this.pop(script$1e, {data: {type: 'video', src}});
       },
       previewImage(imgs, options) {
-        this.pop(script$1c, {data: {type: 'image', imgs, options}});
+        this.pop(script$1e, {data: {type: 'image', imgs, options}});
       },
       //dateOptions: {value, format, minValue, maxValue, success}
       dateSheet(dateOptions, dialogOptions) {
-        this.pop(script$1b, {
-          template: script$1b,
+        this.pop(script$1d, {
+          template: script$1d,
           width: '100%',
           height: '55%',
           position: 'b',
@@ -3398,20 +3007,20 @@ var script$1a = {
         return [
           this.$slots.default && this.$slots.default(),
           this.html_pops(),
-          h(script$1d),
+          h(script$1f),
         ]
       }
     }
   };
 
-script$1a.__file = "src/widgets/DocView.vue";
+script$1c.__file = "src/widgets/DocView.vue";
 
-var script$19 = {
-    mixins: [script$1k],
+var script$1b = {
+    mixins: [script$1i],
     inject: ['provideView']
   };
 
-script$19.__file = "src/widgets/WidgetBase.vue";
+script$1b.__file = "src/widgets/WidgetBase.vue";
 
 const onScroll = function(e) {
     if (this.wScrollPercentX) {
@@ -3452,8 +3061,8 @@ const onScroll = function(e) {
     }, dnEv);
   };
 
-  var script$18 = {
-    mixins: [script$19],
+  var script$1a = {
+    mixins: [script$1b],
     props: ['scrollX', 'scrollY', 'scrollView', 'scrollFlex'],
     data() {
       return {
@@ -3739,9 +3348,9 @@ const onScroll = function(e) {
     }
   };
 
-script$18.__file = "src/widgets/Scroll.vue";
+script$1a.__file = "src/widgets/Scroll.vue";
 
-var script$17 = {
+var script$19 = {
     props: ['align', 'valign', 'gap'],
     computed: {
       dir() {
@@ -3756,11 +3365,11 @@ var script$17 = {
     }
   };
 
-script$17.__file = "src/widgets/AlignParent.vue";
+script$19.__file = "src/widgets/AlignParent.vue";
 
-var script$16 = {
+var script$18 = {
     name: 'w-horizontal',
-    mixins: [script$18, script$17],
+    mixins: [script$1a, script$19],
     props: ['br', 'reverse'],
     provide() {
       return {
@@ -3812,11 +3421,11 @@ var script$16 = {
     }
   };
 
-script$16.__file = "src/widgets/Horizontal.vue";
+script$18.__file = "src/widgets/Horizontal.vue";
 
-var script$15 = {
+var script$17 = {
     name: 'w-vertical',
-    mixins: [script$16],
+    mixins: [script$18],
     computed: {
       dir() {
         return 'v'
@@ -3824,11 +3433,11 @@ var script$15 = {
     }
   };
 
-script$15.__file = "src/widgets/Vertical.vue";
+script$17.__file = "src/widgets/Vertical.vue";
 
-var script$14 = {
+var script$16 = {
     name: 'w-view',
-    mixins: [script$15, script$1e],
+    mixins: [script$17, script$1g],
     inject: ['provideView'],
     methods: {
 			html_slots() {
@@ -3845,7 +3454,7 @@ var script$14 = {
     }
   };
 
-script$14.__file = "src/widgets/View.vue";
+script$16.__file = "src/widgets/View.vue";
 
 const O = {},
     T = true,
@@ -3862,25 +3471,24 @@ const O = {},
 	  return typeof a === 'string' && a.split(',').map(v => positionHooks[v] || v).join()
 	};
 
-  var script$13 = {
+  var script$15 = {
     name: 'w-dialog',
-    mixins: [script$14],
+    mixins: [script$16],
     props: ['title', 'autoHide', 'context', 'prong', 'independent', 'timeout',
-      'cover', 'position', 'snap', 'indent', 'local', 'fullScreen', 'hoverShowDrop',
+      'cover', 'position', 'snap', 'indent', 'local', 'fullScreen', 'hoverShowDrop', 'visible',
 			...boundary
     ],
-    emits: ['close', 'click:cover'],
+    emits: ['close', 'click:cover', 'update:visible'],
     data() {
       return {
         isDialog: true,
         keepHover: false,
         hoverTimer: null,
         hoverMove: null,
-        closed: false,
         animateState: null,
         isDeactivated: false,
         _pos: null,
-        snapStyle: null,
+        snapStyle: null
       }
     },
     activated() {
@@ -3980,14 +3588,14 @@ const O = {},
         }
       },
       close() {
-        if (this.closed) return
+        if (this.x.visible === false) return
         this.closeRelease();
         this.trigger('close');
         this.ownerView.removePop(this.uid);
+        this.setVisible(false);
       },
       closeRelease() {
         this.x.autoHide && this.listenHide(F);
-        this.closed = true;
         let f = this.x.position;
         if (f && typeof f === 'string' && this.el()) { // 当前窗口关闭后，有相同position的dialog依次移动补空位
 					let lc = this._pos;
@@ -4018,7 +3626,7 @@ const O = {},
           this.setListenHide(a);
         } else {
           setTimeout(() => {
-            if (!this.closed) {
+            if (this.x.visible !== false) {
               this.setListenHide(a);
             }
           }, 100); // 延时处理，避免出现后立即消失的情况
@@ -4029,25 +3637,26 @@ const O = {},
         let n = a ? 'addEventListener' : 'removeEventListener';
         let evs = $$1.br.mobile ? ['touchend'] : ['mousedown', $$1.br.firefox ? 'DOMMouseScroll' : 'mousewheel'];
         evs.forEach(v => document[n](v, this.bind('listenHideClose', (e) => {
-          if (!this.closed && (e.target.classList.contains('w-dialog-cover') || !(this.hasBubble(e.target) || (!this.x.independent && (this.commander.isWidget ? this.commander.hasBubble(e.target) : this.commander.contains(e.target)))))) {
+          let c;
+          if (this.x.visible !== false && (e.target.classList.contains('w-dialog-cover') || !(this.hasBubble(e.target) || (!this.x.independent && ((c = this.getCommander()).isWidget ? c.hasBubble(e.target) : c.contains(e.target)))))) {
             if (e.target.id == this.id + 'cvr') e.stopPropagation();
             this.close();
           }
         }), T));
         window.plus && plus.key[n]('backbutton', this.bind('close'), F);
         if (d) {
-          let o = d === T ? (this.x.snap ? this.snapTargetElem() : $$1.el(this.commander)) : $$1.el(d);
+          let o = d === T ? (this.x.snap ? this.snapTargetElem() : $$1.el(this.getCommander())) : $$1.el(d);
           let hvOver = this.bind('listenHideHoverOver', e => {
             clearTimeout(this.hoverTimer), this.hoverTimer = null;
           });
           let hvMove = this.bind('listenHideHoverMove', e => {
             if (!o.contains(e.target) && !this.hasBubble(e.target) && !this.keepHover) {
               if (!this.hoverTimer)
-                this.hoverTimer = setTimeout(this.close, 200);
+                this.hoverTimer = setTimeout(() => {this.close(); hvOver(); }, 200);
             } else
               hvOver();
           });
-          [o, this.el()].forEach(v => v[n]('mouseenter', hvOver));
+          [o, this.el()].forEach(v => v && v[n]('mouseenter', hvOver));
           document[n]('mousemove', hvMove);
         }
       },
@@ -4056,13 +3665,32 @@ const O = {},
 					this.x.maxHeight = h;
 				}
       },
+      setVisible(a) {
+        a = a == null ? true : a;
+        this.x.visible = a;
+        this.$emit('update:visible', a);
+        if (this.slotTarget) {
+          if (a) {
+            this.getTargetElem().setAttribute('w-pop-visible', '');
+          } else {
+            this.getTargetElem().removeAttribute('w-pop-visible');
+          }
+        }
+      },
+      getTargetElem() {
+        return !this.$el ? null : this.$el.nodeType === 3 ? this.$el.nextElementSibling : this.$el
+      },
       getPop() {
         return this.ownerView.getPopById(this.uid)
       },
       getCommander() {
 				if (this.context) return this.context
         let o = this.getPop();
-        return (o && o.commander) || this.ownerView
+        if (o) return o.commander
+        if (this.slotTarget) {
+          return this.getTargetElem()
+        }
+        return this.ownerView
       },
       resolve(v) {
         let o = this.getPop();
@@ -4072,6 +3700,9 @@ const O = {},
         let o = this.getPop();
         o && o.reject && o.reject(v);
       },
+      html_slots_default() {
+        return null
+      },
       html_slots() {
         let prong;
         let r = this._pos;
@@ -4088,17 +3719,18 @@ const O = {},
             }),
           ]);
         }
-        return [prong || [], this.html_scroll_slots(), this.html_pops()]
+        return [prong || [], this.html_scroll_slots(this.html_slots_default()), this.html_pops()]
       },
       html() {
         let to = this.x.local ? this.getLocalElem() : '#w-dfish-pops';
-        let cover = this.x.cover && !this.closed && !this.isDeactivated ? h('div', {
+        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 s = [cover, this.html_self(true)];
-				return to ? h(Teleport, {to}, s) : s
+        let s = [cover, this.html_self(true)];
+        let r = to ? h(Teleport, {to}, s) : s;
+        return this.slotTarget ? [this.slotTarget(), r] : r
       }
     },
     computed: {
@@ -4110,6 +3742,9 @@ const O = {},
       },
       defaultSnapPosition() {
         return 'cc'
+      },
+      slotTarget() {
+        return this.$slots.target
       },
 			scope_props() { // 手动获取 data-v-xxxxx 数据，因为Teleport会丢失这部分数据
 				let scopeId = this.$.vnode.scopeId || this.$.parent.vnode.scopeId;
@@ -4130,8 +3765,9 @@ const O = {},
 				const r = this._pos || O;
 				const p = this.x.position;
         return ['w-vertical', this.html_align_class, {
-          'z-hide': this.isDeactivated,
+          '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,
 				  ['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'
@@ -4173,97 +3809,470 @@ const O = {},
         $$1.q(this.getLocalElem()).addClass('f-dialog-local-wrap');
       }
       this.$nextTick(() => {
-        this.x.autoHide && this.listenHide(T);
 				this.$watch(() => this.x.position, this.axis);
+				this.$watch(() => this.x.visible, (vis) => {
+          if (vis !== false) {
+            this.x.autoHide && this.listenHide(T);
+            this.axis();
+          }
+        }, {immediate: true});
         setTimeout(this.axis);
+        if (this.slotTarget) {
+          let el = this.getTargetElem();
+          if (el) {
+            if (this.hoverShowDrop) {
+              el.addEventListener('mouseenter', () => this.visible == null && this.setVisible(), false);
+            } else {
+              el.addEventListener('click', (e) => {e.stopPropagation(); this.visible == null && this.setVisible();}, false);
+            }
+          }
+        }
         const observe = (o) => {
-          if (this.closed || this.animateState == 'animating' || !this.el()) return
+          if (this.x.visible === false || this.animateState == 'animating' || !this.el()) return
           this.axis();
         };
         new ResizeObserver$1(observe).observe(this.el());
         if (this.x.timeout) {
           setTimeout(this.close, this.x.timeout);
         }
+        let o = this.getPop();
+        if (o && o.options && o.options.init) {
+          o.options.init(this);
+        }
       });
     },
     unmounted() {
-      if (!this.closed) {
+      if (this.x.visible !== false) {
         this.closeRelease();
       }
     }
   };
 
-script$13.__file = "src/widgets/Dialog.vue";
+script$15.__file = "src/widgets/Dialog.vue";
+
+const _hoisted_1$7 = /*#__PURE__*/createElementVNode("i", { class: "w-alert-close-icon f-i f-i-close" }, null, -1 /* HOISTED */);
+  
+  
+var script$14 = {
+  __name: 'TemplateAlert',
+  props: ['text', 'escape', 'title', 'icon', 'showButton'],
+  emits: ['save', 'close'],
+  setup(__props, { emit }) {
+
+const {icon} = __props;
+
+  
+  
+  
+  
+  const icons = {
+    info: '.f-i .f-i-alert-info',
+    warning: '.f-i .f-i-alert-warning',
+    success: '.f-i .f-i-alert-success',
+    question: '.f-i .f-i-alert-question',
+    error: '.f-i .f-i-alert-error'
+  };
+  
+  const save = () => {
+    emit('save');
+  };
+  
+  const close = () => {
+    emit('close');
+  };
+  
+  const typeIcon = computed(() => {
+    return icons[icon] || icon || icons['info']
+  });
+
+return (_ctx, _cache) => {
+  const _component_w_html = resolveComponent("w-html");
+  const _component_w_vertical = resolveComponent("w-vertical");
+  const _component_w_horizontal = resolveComponent("w-horizontal");
+  const _component_w_img = resolveComponent("w-img");
+  const _component_w_button = resolveComponent("w-button");
+  const _component_w_buttonbar = resolveComponent("w-buttonbar");
+  const _directive_dialog_move = resolveDirective("dialog-move");
+
+  return (openBlock(), createBlock(_component_w_vertical, { class: "w-alert-wrap" }, {
+    default: withCtx(() => [
+      createVNode(_component_w_horizontal, { class: "w-alert-head" }, {
+        default: withCtx(() => [
+          withDirectives((openBlock(), createBlock(_component_w_vertical, {
+            class: "w-alert-move",
+            "w-width": "*"
+          }, {
+            default: withCtx(() => [
+              createVNode(_component_w_html, {
+                class: "w-alert-title",
+                valign: "middle",
+                height: "*",
+                innerHTML: __props.title
+              }, null, 8 /* PROPS */, ["innerHTML"])
+            ]),
+            _: 1 /* STABLE */
+          })), [
+            [_directive_dialog_move, true]
+          ]),
+          createVNode(_component_w_html, {
+            class: "w-alert-close",
+            align: "center",
+            valign: "middle",
+            onClick: close
+          }, {
+            default: withCtx(() => [
+              _hoisted_1$7
+            ]),
+            _: 1 /* STABLE */
+          })
+        ]),
+        _: 1 /* STABLE */
+      }),
+      createVNode(_component_w_vertical, { class: "w-alert-body" }, {
+        default: withCtx(() => [
+          createVNode(_component_w_horizontal, { class: "w-alert-main" }, {
+            default: withCtx(() => [
+              createVNode(_component_w_img, {
+                class: "w-alert-icon",
+                src: unref(typeIcon)
+              }, null, 8 /* PROPS */, ["src"]),
+              renderSlot(_ctx.$slots, "default", { width: "*" }, () => [
+                (__props.escape)
+                  ? (openBlock(), createBlock(_component_w_html, {
+                      key: 0,
+                      width: "*",
+                      class: "w-alert-text"
+                    }, {
+                      default: withCtx(() => [
+                        createTextVNode(toDisplayString(__props.text), 1 /* TEXT */)
+                      ]),
+                      _: 1 /* STABLE */
+                    }))
+                  : (openBlock(), createBlock(_component_w_html, {
+                      key: 1,
+                      width: "*",
+                      class: "w-alert-text",
+                      innerHTML: __props.text
+                    }, null, 8 /* PROPS */, ["innerHTML"]))
+              ])
+            ]),
+            _: 3 /* FORWARDED */
+          }),
+          (__props.showButton!==false)
+            ? (openBlock(), createBlock(_component_w_buttonbar, {
+                key: 0,
+                class: "w-alert-buttonbar"
+              }, {
+                default: withCtx(() => [
+                  createVNode(_component_w_button, {
+                    face: "primary",
+                    class: "w-alert-button",
+                    text: "确定",
+                    onClick: save,
+                    ownproperty: true
+                  })
+                ]),
+                _: 1 /* STABLE */
+              }))
+            : createCommentVNode("v-if", true)
+        ]),
+        _: 3 /* FORWARDED */
+      })
+    ]),
+    _: 3 /* FORWARDED */
+  }))
+}
+}
+
+};
+
+script$14.__file = "src/template/TemplateAlert.vue";
 
-var script$12 = {
+var script$13 = {
     name: 'w-alert',
-    mixins: [script$13],
-    props: ['text', 'yes', 'no', 'showButton'],
-		unmounted() {
-			this.$options.name == 'w-alert' ? this.cue(this.x.yes) : this.cue(this.x.no);
-		},
+    mixins: [script$15],
+    props: ['text', 'title', 'escape', 'yes', 'no', 'showButton'],
     methods: {
-      cueYes() {
-				this.resolve();
-        this.close();
+      x_default() {
+        return {
+          title: $$1.loc.opertip
+        }
       },
-      cueNo() {
+      onSave() {
+        this.x.yes && this.x.yes();
+        this.resolve();
         this.close();
       },
-      cue(a) {
-        a && a();
+      onClose() {
+        this.onSave();
+      },
+      html_slots_default() {
+        return h(
+          script$14,
+          {
+            text: this.x.text,
+            title: this.x.title,
+            icon: this.x.icon,
+            escape: this.x.escape,
+            showButton: this.x.showButton,
+            onSave: this.onSave,
+            onClose: this.onClose,
+          },
+          this.$slots
+        )
       }
     }
   };
 
-script$12.__file = "src/widgets/Alert.vue";
+script$13.__file = "src/widgets/Alert.vue";
+
+const _hoisted_1$6 = /*#__PURE__*/createElementVNode("i", { class: "w-alert-close-icon f-i f-i-close" }, null, -1 /* HOISTED */);
+  
+  
+var script$12 = {
+  __name: 'TemplateConfirm',
+  props: ['text', 'escape', 'title', 'icon', 'showButton'],
+  emits: ['save', 'close'],
+  setup(__props, { emit }) {
+
+const {icon} = __props;
+
+  
+  
+  
+  
+  const icons = {
+    info: '.f-i .f-i-alert-info',
+    warning: '.f-i .f-i-alert-warning',
+    success: '.f-i .f-i-alert-success',
+    question: '.f-i .f-i-alert-question',
+    error: '.f-i .f-i-alert-error'
+  };
+  
+  const save = () => {
+    emit('save');
+  };
+  
+  const close = () => {
+    emit('close');
+  };
+  
+  const typeIcon = computed(() => {
+    return icons[icon] || icon || icons['question']
+  });
+
+return (_ctx, _cache) => {
+  const _component_w_html = resolveComponent("w-html");
+  const _component_w_vertical = resolveComponent("w-vertical");
+  const _component_w_horizontal = resolveComponent("w-horizontal");
+  const _component_w_img = resolveComponent("w-img");
+  const _component_w_button = resolveComponent("w-button");
+  const _component_w_buttonbar = resolveComponent("w-buttonbar");
+  const _directive_dialog_move = resolveDirective("dialog-move");
+
+  return (openBlock(), createBlock(_component_w_vertical, { class: "w-alert-wrap" }, {
+    default: withCtx(() => [
+      createVNode(_component_w_horizontal, { class: "w-alert-head" }, {
+        default: withCtx(() => [
+          withDirectives((openBlock(), createBlock(_component_w_vertical, {
+            class: "w-alert-move",
+            "w-width": "*"
+          }, {
+            default: withCtx(() => [
+              createVNode(_component_w_html, {
+                class: "w-alert-title",
+                valign: "middle",
+                height: "*",
+                innerHTML: __props.title
+              }, null, 8 /* PROPS */, ["innerHTML"])
+            ]),
+            _: 1 /* STABLE */
+          })), [
+            [_directive_dialog_move, true]
+          ]),
+          createVNode(_component_w_html, {
+            class: "w-alert-close",
+            align: "center",
+            valign: "middle",
+            onClick: close
+          }, {
+            default: withCtx(() => [
+              _hoisted_1$6
+            ]),
+            _: 1 /* STABLE */
+          })
+        ]),
+        _: 1 /* STABLE */
+      }),
+      createVNode(_component_w_vertical, { class: "w-alert-body" }, {
+        default: withCtx(() => [
+          createVNode(_component_w_horizontal, {
+            class: "w-alert-main",
+            valign: "middle"
+          }, {
+            default: withCtx(() => [
+              createVNode(_component_w_img, {
+                class: "w-alert-icon",
+                src: unref(typeIcon)
+              }, null, 8 /* PROPS */, ["src"]),
+              renderSlot(_ctx.$slots, "default", { width: "*" }, () => [
+                (__props.escape)
+                  ? (openBlock(), createBlock(_component_w_html, {
+                      key: 0,
+                      width: "*",
+                      class: "w-alert-text"
+                    }, {
+                      default: withCtx(() => [
+                        createTextVNode(toDisplayString(__props.text), 1 /* TEXT */)
+                      ]),
+                      _: 1 /* STABLE */
+                    }))
+                  : (openBlock(), createBlock(_component_w_html, {
+                      key: 1,
+                      width: "*",
+                      class: "w-alert-text",
+                      innerHTML: __props.text
+                    }, null, 8 /* PROPS */, ["innerHTML"]))
+              ])
+            ]),
+            _: 3 /* FORWARDED */
+          }),
+          createVNode(_component_w_buttonbar, {
+            gap: "10",
+            class: "w-alert-buttonbar"
+          }, {
+            default: withCtx(() => [
+              createVNode(_component_w_button, {
+                face: "primary",
+                class: "w-alert-button",
+                text: "确定",
+                onClick: save,
+                ownproperty: true
+              }),
+              createVNode(_component_w_button, {
+                class: "w-alert-button",
+                text: "取消",
+                onClick: close,
+                ownproperty: true
+              })
+            ]),
+            _: 1 /* STABLE */
+          })
+        ]),
+        _: 3 /* FORWARDED */
+      })
+    ]),
+    _: 3 /* FORWARDED */
+  }))
+}
+}
+
+};
+
+script$12.__file = "src/template/TemplateConfirm.vue";
 
 var script$11 = {
     name: 'w-confirm',
-    mixins: [script$12],
+    mixins: [script$15],
+    props: ['text', 'title', 'escape', 'yes', 'no', 'showButton'],
     methods: {
-      cueYes() {
-        this.cue(this.x.yes);
-        this.x.no = null;
-				this.resolve();
+      x_default() {
+        return {
+          title: $$1.loc.opertip
+        }
+      },
+      onSave() {
+        this.x.yes && this.x.yes();
+        this.resolve();
         this.close();
       },
-      cueNo() {
+      onClose() {
+        this.x.no && this.x.no();
         this.close();
       },
-    },
-    computed: {
-      html_prop_class() {
-        return 'w-alert w-dialog w-vertical'
+      html_slots_default() {
+        return h(
+          script$12,
+          {
+            text: this.x.text,
+            title: this.x.title,
+            icon: this.x.icon,
+            escape: this.x.escape,
+            showButton: this.x.showButton,
+            onSave: this.onSave,
+            onClose: this.onClose,
+          },
+          this.$slots
+        )
       }
     }
   };
 
 script$11.__file = "src/widgets/Confirm.vue";
 
+const _hoisted_1$5 = { class: "w-tip-body" };
+const _hoisted_2$5 = {
+  key: 0,
+  class: "w-tip-text"
+};
+const _hoisted_3$3 = ["innerHTML"];
+
+
+var script$10 = {
+  __name: 'TemplateTip',
+  props: ['text', 'escape'],
+  setup(__props) {
+
+  
+
+return (_ctx, _cache) => {
+  return (openBlock(), createElementBlock("div", _hoisted_1$5, [
+    renderSlot(_ctx.$slots, "text", {}, () => [
+      (__props.escape)
+        ? (openBlock(), createElementBlock("div", _hoisted_2$5, toDisplayString(__props.text), 1 /* TEXT */))
+        : (openBlock(), createElementBlock("div", {
+            key: 1,
+            class: "w-tip-text",
+            innerHTML: __props.text
+          }, null, 8 /* PROPS */, _hoisted_3$3))
+    ])
+  ]))
+}
+}
+
+};
+
+script$10.__file = "src/template/TemplateTip.vue";
+
 let inst$1 = null;
   let tipCache = {
     time: new Date().getTime()
   };
   
-  var script$10 = {
+  var script$$ = {
     name: 'w-tip',
-    mixins: [script$13],
-    props: ['text', 'face'],
+    mixins: [script$15],
+    props: ['face', 'text', 'escape'],
     methods: {
       x_default() {
         return {
           prong: true,
           autoHide: true,
+          face: 'normal',
+          escape: true,
         }
       },
+      html_slots_default() {
+        return h(script$10, {text: this.x.text, escape: this.x.escape}, this.$slots)
+      }
     },
     computed: {
-      html_class() {
-        return 'w-dialog w-vertical' + (this.x.face && ' z-face-' + this.x.face)
+     slotTarget() {
+        return this.$slots.default
       },
       defaultSnapTargetElem() {
-        return this.commander.snapElem()
+        const  c = this.commander;
+        return c.snapElem ? c.snapElem() : c
       },
       defaultSnapPosition() {
         return '-t,-r,-b,-l,-tl,-tr,-rt,-tb,-bl,-br,-lt,-lb,c'
@@ -4279,12 +4288,12 @@ let inst$1 = null;
     }
   };
 
-script$10.__file = "src/widgets/Tip.vue";
+script$$.__file = "src/widgets/Tip.vue";
 
-var script$$ = {
+var script$_ = {
     name: 'w-img',
     pubParentName: 'w-album',
-    mixins: [script$19],
+    mixins: [script$1b],
     inject: ['providePubParent'],
     props: ['src', 'text', 'square', 'imgWidth', 'imgHeight', 'dataUrl', 'vertical', 'disabled'],
     data() {
@@ -4330,7 +4339,7 @@ var script$$ = {
               class: 'w-img-cover f-abs-full'
             }, this.$slots.cover())
           ]),
-          cont && h(script$15, {
+          cont && h(script$17, {
             class: 'w-img-description'
           }, cont)
         ]
@@ -4364,12 +4373,12 @@ var script$$ = {
     }
   };
 
-script$$.__file = "src/widgets/Img.vue";
+script$_.__file = "src/widgets/Img.vue";
 
-var script$_ = {
+var script$Z = {
     name: 'w-button',
     pubParentName: 'w-buttonbar',
-    mixins: [script$19],
+    mixins: [script$1b],
     props: ['text', 'icon', 'focusIcon', 'face', 'target', 'closable', 'loading', 'disabled', 'vertical', 'hoverShowDrop', 'dropProps', 'dropIcon', 'showDropIcon'],
     inject: ['providePubParent'],
     emits: ['click:close', 'dropClose'],
@@ -4463,7 +4472,7 @@ var script$_ = {
         if (this.x.loading) {
           r.push(h('div', {
             class: 'w-button-loading f-abs-full f-flex-center'
-          }, h(script$$, {
+          }, h(script$_, {
             src: '#f-svg-loading'
           })));
         }
@@ -4478,7 +4487,7 @@ var script$_ = {
           }, h('span', {class: 'w-button-text-line f-line-1', title}, t)));
         }
         if (this.isMore && this.x.showDropIcon) {
-          r.push(h(script$$, {
+          r.push(h(script$_, {
             class: 'w-button-more f-flex-center f-height',
             src: this.x.dropIcon || '.f-i .f-i-caret-down'
           }));
@@ -4496,7 +4505,7 @@ var script$_ = {
             class: 'w-button-main f-oh f-height',
             ...(this.isCombo && !this.isDisabled && this.mouses),
           }, r),
-          this.isCombo && h(script$$, {
+          this.isCombo && h(script$_, {
             class: 'w-button-drop f-flex-center f-height',
             src: this.x.dropIcon || '.f-i .f-i-caret-down',
             ...(!this.isDisabled && this.mouses),
@@ -4543,11 +4552,11 @@ var script$_ = {
     }
   };
 
-script$_.__file = "src/widgets/Button.vue";
+script$Z.__file = "src/widgets/Button.vue";
 
-var script$Z = {
+var script$Y = {
     name: 'w-menubutton',
-    mixins: [script$_],
+    mixins: [script$Z],
     methods: {
 			ajax(...args) {
 			  return this.parentMenu.rootCommander.ajax(...args)
@@ -4610,7 +4619,7 @@ var script$Z = {
             onclick: this.clickClose
           })));
         }
-        r.push(h(script$$, {
+        r.push(h(script$_, {
           class: 'w-menubutton-drop f-flex-center f-height',
           src: this.isMore ? (this.x.dropIcon || '.f-i .f-i-caret-right') : ''
         }));
@@ -4660,7 +4669,7 @@ var script$Z = {
     },
   };
 
-script$Z.__file = "src/widgets/MenuButton.vue";
+script$Y.__file = "src/widgets/MenuButton.vue";
 
 let inst = null;
 	
@@ -4675,9 +4684,9 @@ let inst = null;
 		return inst && (ctx.hasBubble(inst.context) || inst.hasBubble(ctx))
 	}
 
-  var script$Y = {
+  var script$X = {
     name: 'w-menu',
-    mixins: [script$13],
+    mixins: [script$15],
     methods: {
       x_default() {
         return {
@@ -4700,7 +4709,7 @@ let inst = null;
       },
       getRoot() {
         let c = this;
-        while (c.getCommander().isWidget && c.getCommander().$options.name === 'w-menubutton') c = c.getCommander().parentMenu;
+        while (c.getCommander() && c.getCommander().isWidget && c.getCommander().$options.name === 'w-menubutton') c = c.getCommander().parentMenu;
         return c
       },
       // implement
@@ -4732,8 +4741,8 @@ let inst = null;
       },
       html_buttons() {
         return this.slots_children().map(s => {
-					if (s.type === script$_) {
-						s.type = script$Z;
+					if (s.type === script$Z) {
+						s.type = script$Y;
 					}
           return s
         })
@@ -4746,7 +4755,7 @@ let inst = null;
           }, h('i', {
             class: 'f-i f-i-caret-up'
           })),
-          h(script$15, {
+          h(script$17, {
             class: 'w-menu-bbr',
             height: '*',
             ref: 'bbr',
@@ -4776,21 +4785,25 @@ let inst = null;
         return p
       },
 			defaultSnapTargetElem() {
-			  return this.commander.isWidget ? this.commander.snapElem() : this.commander
+        let c = this.getCommander();
+        if (c)
+          return c.isWidget ? c.snapElem() : c
 			},
 			defaultSnapPosition() {
 			  return '-bl,-br,-tl,-tr'
 			},
 			scope_props() { // implement Dialog.scope_props
-				const cmd = $$1(this.rootCommander);
-				let scopeId = cmd.$.vnode.scopeId || this.$.vnode.scopeId || this.$.parent.vnode.scopeId;
-				if (scopeId) {
-					return {[`${scopeId}`]: ''}
-				}
+        if (this.rootCommander) {
+          const cmd = $$1(this.rootCommander);
+          let scopeId = cmd.$.vnode.scopeId || this.$.vnode.scopeId || this.$.parent.vnode.scopeId;
+          if (scopeId) {
+          	return {[`${scopeId}`]: ''}
+          }
+        }
 			}
     },
     mounted() {
-      if (this.context && this.context.$options && this.context.$options.name !== 'w-menubutton') {
+      if (!this.context || (this.context.$options && this.context.$options.name !== 'w-menubutton')) {
         if (inst) {
           $$1.close(inst);
         }
@@ -4799,11 +4812,11 @@ let inst = null;
     }
   };
 
-script$Y.__file = "src/widgets/Menu.vue";
+script$X.__file = "src/widgets/Menu.vue";
 
-var script$X = {
+var script$W = {
     name: 'w-loading',
-    mixins: [script$13],
+    mixins: [script$15],
     props: ['text', 'icon'],
     methods: {
       x_default() {
@@ -4812,7 +4825,7 @@ var script$X = {
         }
       },
       html_slots() {
-        return h(script$$, {
+        return h(script$_, {
           src: this.x.icon !== undefined ? this.x.icon : '#f-svg-loading',
           text: this.x.text !== undefined ? this.x.text : $$1.loc.loading
         })
@@ -4825,87 +4838,11 @@ var script$X = {
     }
   };
 
-script$X.__file = "src/widgets/Loading.vue";
-
-var script$W = {
-    name: 'w-pop',
-    mixins: [script$19],
-    props: ['hoverShowDrop'],
-		data() {
-			return {
-				showPop: false
-			}
-		},
-		methods: {
-			onclick(e) {
-				e.stopPropagation();
-				this.show();
-			},
-			onclose() {
-				this.show(false);
-			},
-      onmouseenter() {
-        this.show();
-      },
-      show(a) {
-        a = a == null ? true : a;
-        this.showPop = a;
-        if (a) {
-          this.el().setAttribute('w-pop-show', '');
-        } else {
-          this.el().removeAttribute('w-pop-show');
-        }
-      },
-			el() {
-				let el = this.$el;
-				return el.nodeType === 3 ? el.nextElementSibling : el
-			}
-		},
-		mounted() {
-			let el = this.el();
-			if (el) {
-        if (this.hoverShowDrop) {
-          el.addEventListener('mouseenter', this.onmouseenter, false);
-        } else {
-          el.addEventListener('click', this.onclick, false);
-        }
-			}
-		},
-		unmounted() {
-			let el = this.el();
-			if (el) {
-				el.removeEventListener('click', this.onclick);
-			} else {
-        el.removeEventListener('mouseenter', this.onmouseenter);
-      }
-		},
-    render() {
-			let rt = [];
-			if (this.$slots.default) {
-				rt.push(this.$slots.default());
-			}
-			if (this.$slots.pop && this.showPop) {
-				let pop = this.$slots.pop().map(n => {
-					if (!n.props) n.props = {};
-          const props = {context: this.el(), onClose: this.onclose};
-          if (this.x.hoverShowDrop) {
-            props.hoverShowDrop = true;
-            props.autoHide = true;
-          }
-					$$1.extend(n.props, props);
-					return n
-				});
-				rt.push(pop);
-			}
-			return rt
-    }
-  };
-
-script$W.__file = "src/widgets/Pop.vue";
+script$W.__file = "src/widgets/Loading.vue";
 
 var script$V = {
     name: 'w-table',
-    mixins: [script$19],
+    mixins: [script$1b],
     props: ['face', 'scroll-x', 'scroll-y'],
     provide() {
       return {
@@ -5032,7 +4969,7 @@ script$S.__file = "src/widgets/PubParent.vue";
 
 var script$R = {
     name: 'w-thead',
-    mixins: [script$19, script$S],
+    mixins: [script$1b, script$S],
     props: ['br', 'sort'],
     inject: ['_provideTable'],
     provide() {
@@ -5116,7 +5053,7 @@ script$R.__file = "src/widgets/TableTHead.vue";
 
 var script$Q = {
     name: 'w-tbody',
-    mixins: [script$R, script$18],
+    mixins: [script$R, script$1a],
     inject: ['_provideTable'],
     props: ['children'],
     provide() {
@@ -5133,6 +5070,7 @@ var script$Q = {
       }, {
         immediate: true
       });
+      this.$watch('current', () => this.viewCurrent());
     },
     methods: {
 			getCurrent() {
@@ -5140,11 +5078,13 @@ var script$Q = {
 			  return tr && $$1(tr)
 			},
       viewCurrent(f) {
-				f = f || this.getCurrent();
-        if (f) {
-          f.expandToView();
-          this.$nextTick(() => f.scrollIntoView({x: 'left'}));
-        }
+        this.$nextTick(() => {
+          f = f || this.getCurrent();
+          if (f) {
+            f.expandToView();
+            this.$nextTick(() => f.scrollIntoView());
+          }
+        });
       },
       onScroll(e) {
         let hd = this._provideTable.slotHooks.thead;
@@ -5186,7 +5126,7 @@ script$Q.__file = "src/widgets/TableTBody.vue";
 var script$P = {
     name: 'w-tr',
     pubParentName: 'w-tbody,w-thead',
-    mixins: [script$19, script$1j],
+    mixins: [script$1b, script$1h],
     props: ['rowIndex', 'expanded', 'children'],
     inject: ['_provideTable', 'providePubParent', 'provideInBody', '_provideTBody', 'provideLevel', 'provideParentTR'],
     provide() {
@@ -5341,7 +5281,7 @@ script$O.__file = "src/widgets/TableTD.vue";
 
 var script$N = {
     name: 'w-th',
-    mixins: [script$O, script$19],
+    mixins: [script$O, script$1b],
     props: ['sortable', 'sortOrders', 'sortOrderDefault'],
     inject: ['_provideThead'],
     emits: ['click:sort'],
@@ -5376,7 +5316,7 @@ var script$N = {
         this.$emit('click:sort', e, o);
       },
       html_slots() {
-        return h(script$16, {class: 'w-th-wrap', valign: 'middle', align: this.align || this.col.align}, {default: () => [
+        return h(script$18, {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')}),
@@ -5405,7 +5345,7 @@ script$N.__file = "src/widgets/TableTH.vue";
 
 var script$M = {
     name: 'w-grid',
-    mixins: [script$18],
+    mixins: [script$1a],
     props: ['columns', 'rows', 'gap', 'defaultColspan', 'face', 'labelWidth'],
     methods: {
       x_default() {
@@ -5453,7 +5393,7 @@ var script$L = {
     name: 'w-swiper-item',
     pubParentName: 'w-swiper',
     inject: ['providePubParent'],
-    mixins: [script$19],
+    mixins: [script$1b],
     props: ['lazy'],
     data() {
       return {
@@ -5490,7 +5430,7 @@ script$L.__file = "src/widgets/SwiperItem.vue";
 
 var script$K = {
     name: 'w-swiper',
-    mixins: [script$19, script$S],
+    mixins: [script$1b, script$S],
     props: ['arrow', 'indicatorDots', 'duration'],
     data() {
       return {
@@ -5579,7 +5519,7 @@ script$K.__file = "src/widgets/Swiper.vue";
 
 var script$J = {
     name: 'w-buttonbar',
-    mixins: [script$16, script$S],
+    mixins: [script$18, script$S],
     props: ['vertical'],
 		emits: ['click:item'],
     methods: {
@@ -5661,7 +5601,8 @@ var script$I = {
 					this.el().removeAttribute('w-tabbar-fixed-quickclosebutton');
 					this.resizeObserver++;
 				}
-				$$1(e).vis();
+        const b = $$1(e);
+				b && b.vis && b.vis();
 			},
 			onBeforeLeave(e) {
 				if (!e.nextElementSibling) {
@@ -5691,7 +5632,7 @@ var script$I = {
 			},
       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$15 : script$16, {ref: 'gut', 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$17 : script$18, {ref: 'gut', 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'})));
@@ -5699,7 +5640,7 @@ var script$I = {
 				if (this.x.quickCloseButton) {
 					let closeAllDisabled = !this.buttons.find(c => c.props.closable);
 					if (this.buttons.length) {
-						gut.push(h(script$_, {
+						gut.push(h(script$Z, {
 							ref: 'quickCloseButton',
 							data: {isQuickCloseButton: true},
 							showDropIcon: false,
@@ -5708,7 +5649,7 @@ var script$I = {
 							onDropClose: this.onMouseleave
 						}, {
 							default: () => [
-								h(script$_, {text: '关闭全部标签', onClick: this.closeAll, disabled: closeAllDisabled})
+								h(script$Z, {text: '关闭全部标签', onClick: this.closeAll, disabled: closeAllDisabled})
 							]
 						}));
 					}
@@ -5815,7 +5756,7 @@ script$I.__file = "src/widgets/TabBar.vue";
 var script$H = {
 		name: 'w-tabbutton',
     pubParentName: 'w-tabbar',
-    mixins: [script$_],
+    mixins: [script$Z],
 		methods: {
 			vis() {
 				let add = [20, 20];
@@ -5839,7 +5780,7 @@ script$H.__file = "src/widgets/TabButton.vue";
 
 var script$G = {
     name: 'w-tabs',
-    mixins: [script$19],
+    mixins: [script$1b],
     props: ['current', 'position', 'gap', 'face', 'quickCloseButton', 'flexSize'],
 		emits: ['click:quickCloseButton'],
     methods: {
@@ -5906,7 +5847,7 @@ script$F.__file = "src/widgets/Tab.vue";
 
 var script$E = {
     name: 'w-album',
-    mixins: [script$16, script$S],
+    mixins: [script$18, script$S],
     methods: {
       x_default() {
         return {
@@ -5927,7 +5868,7 @@ script$E.__file = "src/widgets/Album.vue";
 
 var script$D = {
     name: 'w-html',
-    mixins: [script$19, script$17],
+    mixins: [script$1b, script$19],
     props: ['line'],
     computed: {
       html_props() {
@@ -5950,7 +5891,7 @@ script$D.__file = "src/widgets/Html.vue";
 
 var script$C = {
     name: 'w-tree',
-    mixins: [script$18, script$S, script$1j],
+    mixins: [script$1a, script$S, script$1h],
     emits: ['click:item'],
     provide() {
       return {
@@ -5965,11 +5906,13 @@ var script$C = {
         return leaf && $$1(leaf)
       },
       viewCurrent(f) {
-        f = f || this.getCurrent();
-        if (f) {
-          f.expandToView();
-          this.$nextTick(() => f.scrollIntoView());
-        }
+        this.$nextTick(() => {
+          f = f || this.getCurrent();
+          if (f) {
+            f.expandToView();
+            this.$nextTick(() => f.scrollIntoView());
+          }
+        });
       },
       html_slots() {
         let r;
@@ -6003,7 +5946,7 @@ script$C.__file = "src/widgets/Tree.vue";
 
 var script$B = {
     name: 'w-label',
-    mixins: [script$19, script$17],
+    mixins: [script$1b, script$19],
     props: ['text', 'suffix', 'vertical'],
     methods: {
       html_slots() {
@@ -6028,7 +5971,7 @@ var script$B = {
 script$B.__file = "src/widgets/Label.vue";
 
 var script$A = {
-    mixins: [script$19, script$17],
+    mixins: [script$1b, script$19],
     props: ['name', 'value', 'modelValue', 'placeholder', 'label', 'readonly', 'readonlyValidate', 'disabled', 'required',
       'validateDefault', 'validateHandler', 'inputWidth', 'inputHeight' ],
     emits: ['update:modelValue', 'change', 'blur', 'focus'],
@@ -6039,11 +5982,13 @@ var script$A = {
         isFocus: false,
         hasBorder: false,
         isPlural: false,
+        loading: false,
         warnClass: '',
         labelVertical: false,
         modifiedValue: mv,
         defaultValue: mv,
         placeholder_type: '',
+        validIndex: 0,
       }
     },
     methods: {
@@ -6080,15 +6025,15 @@ var script$A = {
           return r && r.value ? r.value : r
         }
       },
-      valid(trigger) {
-        let error = this.getValidError(trigger);
+      async valid(trigger) {
+        let error = await this.getValidError(trigger);
         if (error) {
           this.warn();
           this.showErrorTip(error.text);
         }
         return !error
       },
-      getValidError(trigger, val) {
+      async getValidError(trigger, val) {
         let ques = trigger ? this.validTriggers[trigger] : this.validQueues;
         if (ques && (this.isNormal || (this.isReadonly && this.x.readonlyValidate))) {
           let v = val !== undefined ? val : this.isPlural ? this.groupFormVal() : this.formVal();
@@ -6098,7 +6043,7 @@ var script$A = {
           let hs = this.validHooks;
           for (let q of ques) {
             let rv = typeof q.rule !== 'object' ? q.rule : q.rule.value !== undefined ? q.rule.value : q.rule;
-            let e = hs[q.type](v, rv, q);
+            let e = await hs[q.type](v, rv, q);
             if (e) return e
           }
         }
@@ -6122,19 +6067,21 @@ var script$A = {
         let w = typeof a === 'string' ? a : a !== false ? 'z-err' : '';
         this.warnClass = w;
         if (!w && this._tip) {
-					this.pop('w-tip', false);
+					this._tip.close();
         }
       },
       showErrorTip(text) {
         this.scrollIntoView({
           ease: 200,
           success: () => {
-            this._tip = this.pop('w-tip', {
+            this.pop('w-tip', {
               text,
               face: 'warn',
               independent: true,
               snap: this.errorTipTarget,
 							onClose: () => this._tip = null
+            }, (tip) => {
+              this._tip = tip;
             });
           }
         });
@@ -6153,21 +6100,29 @@ var script$A = {
       },
       oninput(e) {
         this.val(e.target.value);
+        this.baseValid('change');
       },
       baseFocus(e) {
         this.isFocus = true;
         this.warn(false);
         this.trigger(e);
+        this.baseValid('focus');
       },
       baseBlur(e) {
         if (!this.isFocusTarget(e.relatedTarget)) this.isFocus = false;
         this.trigger(e);
-       setTimeout(() => {
-         if (!this.$.isUnmounted && !this.$.isDeactivated) {
-           let time = new Date().getTime();
-           if (time - tipCache.time > 100) this.valid('blur');
-         }
-        }, 100);
+        this.baseValid('blur');
+      },
+      baseValid(trigger) {
+        if (this.validTriggers[trigger]) {
+          clearTimeout(this._baseValidTimer);
+          this._baseValidTimer = setTimeout(() => {
+            if (!this.$.isUnmounted && !this.$.isDeactivated) {
+              let time = new Date().getTime();
+              if (time - tipCache.time > 100) this.valid(trigger);
+            }
+          }, 100);
+        }
       },
       snapElem() {
         return this.el('main')
@@ -6280,10 +6235,13 @@ var script$A = {
             if (v && (typeof rule === 'string' ? !$$1.eval(`${rule}.test(v)`, {rule, v}) : !rule.test(v)))
               return this.formErr(que)
           },
-          validateHandler: (v, rule) => {
-            let text = rule && rule(v);
-            if (text) {
-              return this.formErr({type: 'validateHandler', rule: {text}})
+          validateHandler: async(v, rule, que) => {
+            let rs = rule && rule(v);
+            if (rs) {
+              let text = await rs;
+              if (text) {
+                return this.formErr({type: 'validateHandler', rule: {text}})
+              }
             }
           }
         }
@@ -6553,10 +6511,10 @@ var script$z = {
         }, this.html_input())
       },
       html_target() {
-        return h(script$16, {
+        return this.$slots.default ? h(script$18, {
           class: this.$options.name + '-target',
           ref: 'target'
-        }, this.$slots)
+        }, this.$slots) : []
       },
       html() {
         return this.pubParent && this.pubParent.x.vertical ? [this.html_self(true), this.html_target()] : this.html_self()
@@ -6616,7 +6574,9 @@ var script$z = {
       },
       html_class() {
         return {
-          'z-half': this.indeterminate
+          'z-half': this.indeterminate,
+          'z-target': !!this.$slots.default,
+          'z-checked': this.isChecked,
         }
       }
     },
@@ -6727,7 +6687,7 @@ script$y.__file = "src/widgets/TripleBox.vue";
 var script$x = {
     name: 'w-leaf',
     pubParentName: 'w-tree',
-    mixins: [script$19, script$1j],
+    mixins: [script$1b, script$1h],
     props: ['text', 'expanded', 'expandedIcon', 'collapsedIcon', 'icon', 'boxSync', 'src', 'disabled'],
     inject: ['providePubParent', 'provideLevel', 'provideParentLeaf', 'provideParentTR'],
     provide() {
@@ -6827,7 +6787,7 @@ var script$x = {
         let ico = this.isFolder() ? (exp ? this.x.expandedIcon : this.x.collapsedIcon) : this.x.icon;
         return h('div', mergeProps(this.html_attrs, this.html_props, this.$attrs), [
           this.loading ?
-          h(script$$, {
+          h(script$_, {
             src: '#f-svg-loading',
             class: 'w-leaf-loading'
           }) :
@@ -6839,7 +6799,7 @@ var script$x = {
             }
           }),
           this.$slots.box && this.$slots.box(),
-          ico && h(script$$, {
+          ico && h(script$_, {
             src: ico,
             class: 'w-leaf-icon'
           }),
@@ -6971,13 +6931,13 @@ var script$w = {
                this.html_face_normal()
       },
       html_buttons() {
-        return [h(script$_, {
+        return [h(script$Z, {
           class: 'w-pagebar-button w-pagebar-prev',
           icon: '.f-i .f-i-angle-left',
           disabled: this.currentPage == 1,
           title: $$1.loc.page_text.prev,
           onclick: e => this.clickItem(e, this.currentPage - 1)
-        }), h(script$_, {
+        }), h(script$Z, {
           class: 'w-pagebar-button w-pagebar-next',
           icon: '.f-i .f-i-angle-right',
           disabled: this.currentPage == this.sumPage,
@@ -6988,7 +6948,7 @@ var script$w = {
       html_drop() {
         let s = [];
         if (this.x.buttonCount) {
-          s.push(h(script$_, {
+          s.push(h(script$Z, {
             class: 'w-pagebar-button w-pagebar-button-count w-pagebar-prev',
             ref: 'drop',
             text: this.currentPage + '/' + this.sumPage,
@@ -6997,8 +6957,8 @@ var script$w = {
         }
         if (this.showDrop) {
           let b = [];
-          for (let i = 1, sp = this.sumPage; i <= sp; i ++) b.push(h(script$_, {text: i, onClick: e => this.clickItem(e, i)}));
-          s.push(h(script$Y, {snap: () => this.$refs.drop, position: 'v', indent: 1, onClose: () => this.showDrop = false}, {default: () => b}));
+          for (let i = 1, sp = this.sumPage; i <= sp; i ++) b.push(h(script$Z, {text: i, onClick: e => this.clickItem(e, i)}));
+          s.push(h(script$X, {snap: () => this.$refs.drop, position: 'v', indent: 1, onClose: () => this.showDrop = false}, {default: () => b}));
         }
         return s
       },
@@ -7100,7 +7060,7 @@ script$w.__file = "src/widgets/PageBar.vue";
 
 var script$v = {
     name: 'w-split',
-    mixins: [script$19],
+    mixins: [script$1b],
     props: ['collapsedIcon', 'expandedIcon', 'movable', 'range', 'toNext', 'expanded'],
     inject: ['provideLayout'],
     created() {
@@ -7201,7 +7161,7 @@ script$v.__file = "src/widgets/Split.vue";
 
 var script$u = {
     name: 'w-toggle',
-    mixins: [script$19, script$17],
+    mixins: [script$1b, script$19],
     props: ['collapsedIcon', 'expandedIcon', 'expanded', 'align', 'valign'],
     methods: {
       x_default() {
@@ -7218,7 +7178,7 @@ var script$u = {
       html_slots() {
         let exp = this.x.expanded;
         let ico = exp ? this.x.expandedIcon : this.x.collapsedIcon;
-        return [ico && h(script$$, {
+        return [ico && h(script$_, {
           src: ico,
           class: 'w-toggle-icon',
         }), h('div', {class: 'w-toggle-main'}, this.$slots.default())]
@@ -7249,7 +7209,7 @@ script$u.__file = "src/widgets/Toggle.vue";
 
 var script$t = {
     name: 'w-video',
-    mixins: [script$19],
+    mixins: [script$1b],
     props: ['src', 'poster'],
     data() {
       return {
@@ -7301,7 +7261,7 @@ script$t.__file = "src/widgets/Video.vue";
 
 var script$s = {
     name: 'w-progress',
-    mixins: [script$19],
+    mixins: [script$1b],
     props: ['percent', 'range', 'text'],
     methods: {
       html_slots() {
@@ -7346,7 +7306,7 @@ script$s.__file = "src/widgets/Progress.vue";
 
 var script$r = {
     name: 'w-calendar',
-    mixins: [script$19],
+    mixins: [script$1b],
     emits: ['click:item', 'change'],
     props: ['value', 'minValue', 'maxValue', 'current', 'pad', 'face', 'format', 'success', 'cg', 'start',
       'enableHour', 'enableMinute', 'enableSecond', 'defaultHour', 'defaultMinute', 'defaultSecond'
@@ -7761,15 +7721,22 @@ var script$r = {
     }
   };
 
-const _hoisted_1$3 = /*#__PURE__*/createVNode("i", { class: "f-i f-i-minus" }, null, -1 /* HOISTED */);
-const _hoisted_2$2 = /*#__PURE__*/createVNode("i", { class: "f-i f-i-plus" }, null, -1 /* HOISTED */);
-const _hoisted_3$2 = /*#__PURE__*/createVNode("div", { class: "w-calendar-head-blank" }, null, -1 /* HOISTED */);
-const _hoisted_4$1 = { class: "w-calendar-body" };
-const _hoisted_5 = { class: "w-calendar-daytitle" };
-const _hoisted_6 = { class: "w-calendar-item-text" };
-const _hoisted_7 = { class: "w-calendar-time-th" };
-const _hoisted_8 = { class: "w-calendar-time-th" };
-const _hoisted_9 = { class: "w-calendar-time-th" };
+const _hoisted_1$4 = ["innerHTML"];
+const _hoisted_2$4 = /*#__PURE__*/createElementVNode("i", { class: "f-i f-i-minus" }, null, -1 /* HOISTED */);
+const _hoisted_3$2 = [
+  _hoisted_2$4
+];
+const _hoisted_4$1 = ["onClick"];
+const _hoisted_5$1 = /*#__PURE__*/createElementVNode("i", { class: "f-i f-i-plus" }, null, -1 /* HOISTED */);
+const _hoisted_6$1 = ["onClick"];
+const _hoisted_7 = /*#__PURE__*/createElementVNode("div", { class: "w-calendar-head-blank" }, null, -1 /* HOISTED */);
+const _hoisted_8 = { class: "w-calendar-body" };
+const _hoisted_9 = { class: "w-calendar-daytitle" };
+const _hoisted_10 = ["title", "onClick"];
+const _hoisted_11 = { class: "w-calendar-item-text" };
+const _hoisted_12 = { class: "w-calendar-time-th" };
+const _hoisted_13 = { class: "w-calendar-time-th" };
+const _hoisted_14 = { class: "w-calendar-time-th" };
 
 function render$4(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_w_html = resolveComponent("w-html");
@@ -7790,32 +7757,32 @@ function render$4(_ctx, _cache, $props, $setup, $data, $options) {
           }, {
             default: withCtx(() => [
               createVNode(_component_w_horizontal, {
-                class: ['w-calendar-head', {'f-h-gap': _ctx.dfish.br.compat.gap}],
+                class: normalizeClass(['w-calendar-head', {'f-h-gap': _ctx.dfish.br.compat.gap}]),
                 valign: "middle",
                 align: "center"
               }, {
                 default: withCtx(() => [
                   (_ctx.x.face == 'date')
-                    ? (openBlock(), createBlock("i", {
+                    ? (openBlock(), createElementBlock("i", {
                         key: 0,
                         class: "w-calendar-head-prev-year f-i f-i-angle-double-left f-pointer",
-                        onClick: _cache[1] || (_cache[1] = $event => ($options.clickStep(-12)))
+                        onClick: _cache[0] || (_cache[0] = $event => ($options.clickStep(-12)))
                       }))
                     : createCommentVNode("v-if", true),
-                  createVNode("i", {
+                  createElementVNode("i", {
                     class: "w-calendar-head-prev f-i f-i-angle-single-left f-pointer",
-                    onClick: _cache[2] || (_cache[2] = $event => ($options.clickStep(-1)))
+                    onClick: _cache[1] || (_cache[1] = $event => ($options.clickStep(-1)))
                   }),
                   createVNode(_component_w_horizontal, {
-                    class: ['w-calendar-head-pop', {'f-h-gap': _ctx.dfish.br.compat.gap}]
+                    class: normalizeClass(['w-calendar-head-pop', {'f-h-gap': _ctx.dfish.br.compat.gap}])
                   }, {
                     default: withCtx(() => [
-                      createVNode("div", {
+                      createElementVNode("div", {
                         class: "w-calendar-head-year f-link",
                         ref: "popYear",
-                        onClick: _cache[3] || (_cache[3] = $event => ($options.clickPopYear())),
+                        onClick: _cache[2] || (_cache[2] = $event => ($options.clickPopYear())),
                         innerHTML: $options.headYear
-                      }, null, 8 /* PROPS */, ["innerHTML"]),
+                      }, null, 8 /* PROPS */, _hoisted_1$4),
                       ($data.headPopYear)
                         ? (openBlock(), createBlock(_component_w_dialog, {
                             key: 0,
@@ -7825,35 +7792,33 @@ function render$4(_ctx, _cache, $props, $setup, $data, $options) {
                             "auto-hide": true,
                             ownproperty: true,
                             snap: _ctx.$refs.popYear,
-                            onClose: _cache[6] || (_cache[6] = $event => ($data.headPopYear=null))
+                            onClose: _cache[5] || (_cache[5] = $event => ($data.headPopYear=null))
                           }, {
                             default: withCtx(() => [
-                              createVNode("div", {
+                              createElementVNode("div", {
                                 class: "w-calendar-head-year-item",
-                                onClick: _cache[4] || (_cache[4] = $event => ($options.clickPopYearStep(-1)))
-                              }, [
-                                _hoisted_1$3
-                              ]),
+                                onClick: _cache[3] || (_cache[3] = $event => ($options.clickPopYearStep(-1)))
+                              }, _hoisted_3$2),
                               createVNode(_component_w_html, {
                                 height: "*",
                                 onWheelPassive: $options.mousewheelPopYear
                               }, {
                                 default: withCtx(() => [
-                                  (openBlock(true), createBlock(Fragment, null, renderList($data.headPopYear, (item) => {
-                                    return (openBlock(), createBlock("div", {
-                                      class: ['w-calendar-head-year-item', {'z-on': item == $data.dt.getFullYear()}],
+                                  (openBlock(true), createElementBlock(Fragment, null, renderList($data.headPopYear, (item) => {
+                                    return (openBlock(), createElementBlock("div", {
+                                      class: normalizeClass(['w-calendar-head-year-item', {'z-on': item == $data.dt.getFullYear()}]),
                                       onClick: $event => ($options.clickPopYearItem(item))
-                                    }, toDisplayString(item), 11 /* TEXT, CLASS, PROPS */, ["onClick"]))
+                                    }, toDisplayString(item), 11 /* TEXT, CLASS, PROPS */, _hoisted_4$1))
                                   }), 256 /* UNKEYED_FRAGMENT */))
                                 ]),
                                 _: 1 /* STABLE */
                               }, 8 /* PROPS */, ["onWheelPassive"]),
                               createVNode(_component_w_html, {
                                 class: "w-calendar-head-year-item",
-                                onClick: _cache[5] || (_cache[5] = $event => ($options.clickPopYearStep(1)))
+                                onClick: _cache[4] || (_cache[4] = $event => ($options.clickPopYearStep(1)))
                               }, {
                                 default: withCtx(() => [
-                                  _hoisted_2$2
+                                  _hoisted_5$1
                                 ]),
                                 _: 1 /* STABLE */
                               })
@@ -7883,16 +7848,16 @@ function render$4(_ctx, _cache, $props, $setup, $data, $options) {
                             "auto-hide": true,
                             ownproperty: true,
                             snap: _ctx.$refs.popMonth,
-                            onClose: _cache[7] || (_cache[7] = $event => ($data.headPopMonth=null))
+                            onClose: _cache[6] || (_cache[6] = $event => ($data.headPopMonth=null))
                           }, {
                             default: withCtx(() => [
                               createVNode(_component_w_html, { height: "*" }, {
                                 default: withCtx(() => [
-                                  (openBlock(true), createBlock(Fragment, null, renderList($data.headPopMonth, (item) => {
-                                    return (openBlock(), createBlock("div", {
-                                      class: ['w-calendar-head-year-item', {'z-on': item == $data.dt.getMonth() + 1}],
+                                  (openBlock(true), createElementBlock(Fragment, null, renderList($data.headPopMonth, (item) => {
+                                    return (openBlock(), createElementBlock("div", {
+                                      class: normalizeClass(['w-calendar-head-year-item', {'z-on': item == $data.dt.getMonth() + 1}]),
                                       onClick: $event => ($options.clickPopMonthItem(item))
-                                    }, toDisplayString(item), 11 /* TEXT, CLASS, PROPS */, ["onClick"]))
+                                    }, toDisplayString(item), 11 /* TEXT, CLASS, PROPS */, _hoisted_6$1))
                                   }), 256 /* UNKEYED_FRAGMENT */))
                                 ]),
                                 _: 1 /* STABLE */
@@ -7904,38 +7869,38 @@ function render$4(_ctx, _cache, $props, $setup, $data, $options) {
                     ]),
                     _: 1 /* STABLE */
                   }, 8 /* PROPS */, ["class"]),
-                  createVNode("i", {
+                  createElementVNode("i", {
                     class: "w-calendar-head-next f-i f-i-angle-single-right f-pointer",
-                    onClick: _cache[8] || (_cache[8] = $event => ($options.clickStep(1)))
+                    onClick: _cache[7] || (_cache[7] = $event => ($options.clickStep(1)))
                   }),
                   (_ctx.x.face == 'date')
-                    ? (openBlock(), createBlock("i", {
+                    ? (openBlock(), createElementBlock("i", {
                         key: 1,
                         class: "w-calendar-head-next-year f-i f-i-angle-double-right f-pointer",
-                        onClick: _cache[9] || (_cache[9] = $event => ($options.clickStep(12)))
+                        onClick: _cache[8] || (_cache[8] = $event => ($options.clickStep(12)))
                       }))
                     : createCommentVNode("v-if", true),
-                  _hoisted_3$2
+                  _hoisted_7
                 ]),
                 _: 1 /* STABLE */
               }, 8 /* PROPS */, ["class"]),
               renderSlot(_ctx.$slots, "head"),
-              createVNode("div", _hoisted_4$1, [
+              createElementVNode("div", _hoisted_8, [
                 (_ctx.x.face == 'date')
-                  ? (openBlock(true), createBlock(Fragment, { key: 0 }, renderList($options.loc.calendar.day_title_1, (item) => {
-                      return (openBlock(), createBlock("div", _hoisted_5, toDisplayString(item), 1 /* TEXT */))
+                  ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList($options.loc.calendar.day_title_1, (item) => {
+                      return (openBlock(), createElementBlock("div", _hoisted_9, toDisplayString(item), 1 /* TEXT */))
                     }), 256 /* UNKEYED_FRAGMENT */))
                   : createCommentVNode("v-if", true),
-                (openBlock(true), createBlock(Fragment, null, renderList($options.bodyList, (item) => {
-                  return (openBlock(), createBlock("div", {
+                (openBlock(true), createElementBlock(Fragment, null, renderList($options.bodyList, (item) => {
+                  return (openBlock(), createElementBlock("div", {
                     title: item.title,
-                    class: ['w-calendar-item', {'z-on': item.focus && !item.disabled, 'z-pad': item.pad, 'z-ds': item.disabled}],
+                    class: normalizeClass(['w-calendar-item', {'z-on': item.focus && !item.disabled, 'z-pad': item.pad, 'z-ds': item.disabled}]),
                     onClick: $event => ($options.clickItem($event,item))
                   }, [
                     renderSlot(_ctx.$slots, "default", { item: item }, () => [
-                      createVNode("div", _hoisted_6, toDisplayString(item.text), 1 /* TEXT */)
+                      createElementVNode("div", _hoisted_11, toDisplayString(item.text), 1 /* TEXT */)
                     ])
-                  ], 10 /* CLASS, PROPS */, ["title", "onClick"]))
+                  ], 10 /* CLASS, PROPS */, _hoisted_10))
                 }), 256 /* UNKEYED_FRAGMENT */))
               ])
             ]),
@@ -7955,7 +7920,7 @@ function render$4(_ctx, _cache, $props, $setup, $data, $options) {
                     width: "*"
                   }, {
                     default: withCtx(() => [
-                      createVNode("div", _hoisted_7, toDisplayString($options.loc.hour), 1 /* TEXT */),
+                      createElementVNode("div", _hoisted_12, toDisplayString($options.loc.hour), 1 /* TEXT */),
                       createVNode(_component_w_buttonbar, {
                         class: "w-calendar-time-body",
                         ref: "hour",
@@ -7966,7 +7931,7 @@ function render$4(_ctx, _cache, $props, $setup, $data, $options) {
                         height: "*"
                       }, {
                         default: withCtx(() => [
-                          (openBlock(true), createBlock(Fragment, null, renderList($options.bodyListHour, (h) => {
+                          (openBlock(true), createElementBlock(Fragment, null, renderList($options.bodyListHour, (h) => {
                             return (openBlock(), createBlock(_component_w_button, {
                               class: "w-calendar-time-item",
                               key: h,
@@ -7989,7 +7954,7 @@ function render$4(_ctx, _cache, $props, $setup, $data, $options) {
                     width: "*"
                   }, {
                     default: withCtx(() => [
-                      createVNode("div", _hoisted_8, toDisplayString($options.loc.minute), 1 /* TEXT */),
+                      createElementVNode("div", _hoisted_13, toDisplayString($options.loc.minute), 1 /* TEXT */),
                       createVNode(_component_w_buttonbar, {
                         class: "w-calendar-time-body",
                         ref: "minute",
@@ -8000,7 +7965,7 @@ function render$4(_ctx, _cache, $props, $setup, $data, $options) {
                         height: "*"
                       }, {
                         default: withCtx(() => [
-                          (openBlock(true), createBlock(Fragment, null, renderList($options.bodyListMinute, (m) => {
+                          (openBlock(true), createElementBlock(Fragment, null, renderList($options.bodyListMinute, (m) => {
                             return (openBlock(), createBlock(_component_w_button, {
                               class: "w-calendar-time-item",
                               key: m,
@@ -8023,7 +7988,7 @@ function render$4(_ctx, _cache, $props, $setup, $data, $options) {
                     width: "*"
                   }, {
                     default: withCtx(() => [
-                      createVNode("div", _hoisted_9, toDisplayString($options.loc.second), 1 /* TEXT */),
+                      createElementVNode("div", _hoisted_14, toDisplayString($options.loc.second), 1 /* TEXT */),
                       createVNode(_component_w_buttonbar, {
                         class: "w-calendar-time-body",
                         ref: "second",
@@ -8034,7 +7999,7 @@ function render$4(_ctx, _cache, $props, $setup, $data, $options) {
                         height: "*"
                       }, {
                         default: withCtx(() => [
-                          (openBlock(true), createBlock(Fragment, null, renderList($options.bodyListSecond, (s) => {
+                          (openBlock(true), createElementBlock(Fragment, null, renderList($options.bodyListSecond, (s) => {
                             return (openBlock(), createBlock(_component_w_button, {
                               class: "w-calendar-time-item",
                               key: s,
@@ -8057,25 +8022,25 @@ function render$4(_ctx, _cache, $props, $setup, $data, $options) {
       ($props.success)
         ? (openBlock(), createBlock(_component_w_horizontal, {
             key: 2,
-            class: ['w-calendar-foot', {'f-h-gap': _ctx.dfish.br.compat.gap}],
+            class: normalizeClass(['w-calendar-foot', {'f-h-gap': _ctx.dfish.br.compat.gap}]),
             align: "between",
             valign: "middle"
           }, {
             default: withCtx(() => [
-              createVNode("div", {
+              createElementVNode("div", {
                 class: "w-calendar-button-now f-link",
-                onClick: _cache[10] || (_cache[10] = (...args) => ($options.clickNow && $options.clickNow(...args)))
+                onClick: _cache[9] || (_cache[9] = (...args) => ($options.clickNow && $options.clickNow(...args)))
               }, toDisplayString($options.loc.calendar.now), 1 /* TEXT */),
-              createVNode("div", {
+              createElementVNode("div", {
                 class: "w-calendar-button-confirm f-link",
-                onClick: _cache[11] || (_cache[11] = (...args) => ($options.clickConfirm && $options.clickConfirm(...args)))
+                onClick: _cache[10] || (_cache[10] = (...args) => ($options.clickConfirm && $options.clickConfirm(...args)))
               }, toDisplayString($options.loc.confirm), 1 /* TEXT */)
             ]),
             _: 1 /* STABLE */
           }, 8 /* PROPS */, ["class"]))
         : createCommentVNode("v-if", true)
     ]),
-    _: 1 /* STABLE */
+    _: 3 /* FORWARDED */
   }, 16 /* FULL_PROPS */, ["class"]))
 }
 
@@ -8084,7 +8049,7 @@ script$r.__file = "src/widgets/Calendar.vue";
 
 var script$q = {
     name: 'w-timeline',
-    mixins: [script$18, script$S],
+    mixins: [script$1a, script$S],
     props: ['face', 'vertical'],
     methods: {
       indent() {
@@ -8217,7 +8182,7 @@ script$q.__file = "src/widgets/Timeline.vue";
 var script$p = {
     name: 'w-timeline-item',
     pubParentName: 'w-timeline',
-    mixins: [script$19],
+    mixins: [script$1b],
     inject: ['providePubParent'],
     props: ['position', 'index'],
     methods: {
@@ -8254,7 +8219,7 @@ script$p.__file = "src/widgets/TimelineItem.vue";
 
 var script$o = {
     name: 'w-slidepicker',
-    mixins: [script$19],
+    mixins: [script$1b],
     provide() {
       return {
         provideOptionParent: this,
@@ -8453,11 +8418,11 @@ var script$o = {
     }
   };
 
-const _hoisted_1$2 = {
+const _hoisted_1$3 = {
   ref: "options",
   class: "w-slidepicker-options"
 };
-const _hoisted_2$1 = {
+const _hoisted_2$3 = {
   key: 0,
   class: "w-slidepicker-bg-top"
 };
@@ -8467,15 +8432,15 @@ const _hoisted_3$1 = {
 };
 
 function render$3(_ctx, _cache, $props, $setup, $data, $options) {
-  return (openBlock(), createBlock("div", mergeProps({ ref: "root" }, _ctx.html_binds), [
-    createVNode("div", _hoisted_1$2, [
+  return (openBlock(), createElementBlock("div", mergeProps({ ref: "root" }, _ctx.html_binds), [
+    createElementVNode("div", _hoisted_1$3, [
       renderSlot(_ctx.$slots, "default")
     ], 512 /* NEED_PATCH */),
     (_ctx.x.cover)
-      ? (openBlock(), createBlock("div", _hoisted_2$1))
+      ? (openBlock(), createElementBlock("div", _hoisted_2$3))
       : createCommentVNode("v-if", true),
     (_ctx.x.cover)
-      ? (openBlock(), createBlock("div", _hoisted_3$1))
+      ? (openBlock(), createElementBlock("div", _hoisted_3$1))
       : createCommentVNode("v-if", true)
   ], 16 /* FULL_PROPS */))
 }
@@ -9371,12 +9336,12 @@ const suffixHooks = {
         this.$emit('update:modelValue', v);
         this.trigger('change', v);
       },
-      clickItem(e, item) {
+      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);
+          this.trigger(e, item.value, ctx);
         } else if (this.x.downloadSrc) {
           $$1.download($$1.urlServer(this.x.downloadSrc, item.value, this.x.data));
         }
@@ -9404,14 +9369,12 @@ const suffixHooks = {
             onclick: e => this.remove(item)
           })];
 					if (value && this.$slots.menu) {
-						button.push(h(script$W, null, {
-							default: () => h('div', {
+						button.push(h(script$X, null, {
+							target: () => h('div', {
 								class: 'w-fileupload-value-menu f-i f-i-ellipsis',
 								title: $$1.loc.more,
 							}),
-							pop: () => h(script$Y, {}, {
-								default: () => this.$slots.menu({item: value})
-							})
+							default: () => this.$slots.menu({item: value})
 						}));
 					}
           return h('div', {
@@ -9427,14 +9390,14 @@ const suffixHooks = {
           }, [
             h('i', {
               class: ['w-fileupload-value-icon f-i', 'f-i-file-' + getSuffix(name)],
-							onclick: e => this.clickItem(e, item)
+							onclick: e => this.clickItem(e, item, this)
             }),
             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)
+							onclick: e => this.clickItem(e, item, this)
             }, name),
 						button
           ])
@@ -9459,7 +9422,7 @@ const suffixHooks = {
           class: 'w-fileupload-bbr',
           gap: 10,
         }, {
-          default: () => [this.$slots.button ? this.$slots.button() : h(script$_, {
+          default: () => [this.$slots.button ? this.$slots.button() : h(script$Z, {
             text: '选择文件',
             icon: '.f-i .f-i-upload',
             class: 'w-fileupload-button',
@@ -9539,7 +9502,7 @@ var script$f = {
     },
     methods: {
       click(e) {
-        this.provideUpload.clickItem(e, this.item);
+        this.provideUpload.clickItem(e, this.item, this.provideUpload);
       },
       createImageThumbnail() {
         let r = new FileReader();
@@ -9630,8 +9593,8 @@ var script$f = {
     }
   };
 
-const _hoisted_1$1 = { class: "f-line-1" };
-const _hoisted_2 = {
+const _hoisted_1$2 = { class: "f-line-1" };
+const _hoisted_2$2 = {
   key: 0,
   ref: "loading",
   width: "34",
@@ -9643,14 +9606,15 @@ const _hoisted_3 = {
   class: "w-mediaupload-cover-play f-abs-center f-flex-center f-i f-i-play"
 };
 const _hoisted_4 = { class: "w-mediaupload-value-oper" };
+const _hoisted_5 = ["title"];
+const _hoisted_6 = ["title"];
 
 function render$2(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_w_menu = resolveComponent("w-menu");
-  const _component_w_pop = resolveComponent("w-pop");
   const _component_w_img = resolveComponent("w-img");
 
   return (openBlock(), createBlock(_component_w_img, {
-    class: ['w-mediaupload-value', {'z-loading': $props.item.loading, 'z-canplay': $options.canPlay, 'z-err': $props.item.error}],
+    class: normalizeClass(['w-mediaupload-value', {'z-loading': $props.item.loading, 'z-canplay': $options.canPlay, 'z-err': $props.item.error}]),
     ref: "thumbnail",
     src: $options.src,
     "data-url": $data.dataURL,
@@ -9662,36 +9626,31 @@ function render$2(_ctx, _cache, $props, $setup, $data, $options) {
   }, createSlots({
     cover: withCtx(() => [
       ($props.item.loading)
-        ? (openBlock(), createBlock("canvas", _hoisted_2, null, 512 /* NEED_PATCH */))
+        ? (openBlock(), createElementBlock("canvas", _hoisted_2$2, null, 512 /* NEED_PATCH */))
         : ($options.canPlay)
-          ? (openBlock(), createBlock("i", _hoisted_3))
+          ? (openBlock(), createElementBlock("i", _hoisted_3))
           : createCommentVNode("v-if", true),
-      createVNode("div", _hoisted_4, [
+      createElementVNode("div", _hoisted_4, [
         ($options.upload.isNormal)
-          ? (openBlock(), createBlock("i", {
+          ? (openBlock(), createElementBlock("i", {
               key: 0,
               class: "w-mediaupload-value-close f-flex-center f-i f-i-trash",
               title: $options.titleRemove,
-              onClick: _cache[1] || (_cache[1] = (...args) => ($options.remove && $options.remove(...args)))
-            }, null, 8 /* PROPS */, ["title"]))
+              onClick: _cache[0] || (_cache[0] = (...args) => ($options.remove && $options.remove(...args)))
+            }, null, 8 /* PROPS */, _hoisted_5))
           : createCommentVNode("v-if", true),
         ($props.item.value && $options.upload.$slots.menu)
-          ? (openBlock(), createBlock(_component_w_pop, { key: 1 }, {
-              pop: withCtx(() => [
-                createVNode(_component_w_menu, null, {
-                  default: withCtx(() => [
-                    (openBlock(true), createBlock(Fragment, null, renderList($options.menus, (menu) => {
-                      return (openBlock(), createBlock(resolveDynamicComponent(menu)))
-                    }), 256 /* UNKEYED_FRAGMENT */))
-                  ]),
-                  _: 1 /* STABLE */
-                })
-              ]),
-              default: withCtx(() => [
-                createVNode("i", {
+          ? (openBlock(), createBlock(_component_w_menu, { key: 1 }, {
+              target: withCtx(() => [
+                createElementVNode("i", {
                   class: "w-mediaupload-value-menu f-flex-center f-i f-i-ellipsis",
                   title: $options.titleMore
-                }, null, 8 /* PROPS */, ["title"])
+                }, null, 8 /* PROPS */, _hoisted_6)
+              ]),
+              default: withCtx(() => [
+                (openBlock(true), createElementBlock(Fragment, null, renderList($options.menus, (menu) => {
+                  return (openBlock(), createBlock(resolveDynamicComponent(menu)))
+                }), 256 /* UNKEYED_FRAGMENT */))
               ]),
               _: 1 /* STABLE */
             }))
@@ -9704,8 +9663,9 @@ function render$2(_ctx, _cache, $props, $setup, $data, $options) {
       ? {
           name: "default",
           fn: withCtx(() => [
-            createVNode("div", _hoisted_1$1, toDisplayString($options.name), 1 /* TEXT */)
-          ])
+            createElementVNode("div", _hoisted_1$2, toDisplayString($options.name), 1 /* TEXT */)
+          ]),
+          key: "0"
         }
       : undefined
   ]), 1032 /* PROPS, DYNAMIC_SLOTS */, ["class", "src", "data-url", "width", "img-width", "img-height", "tip", "onClick"]))
@@ -9730,7 +9690,7 @@ var script$e = {
           //valign: 'top',
           thumbnailWidth: 80,
           thumbnailHeight: 80,
-          gap: 10,
+          gap: 4,
         }
       },
       html_list() {
@@ -9743,14 +9703,14 @@ var script$e = {
           ref: 'uploadbbr',
           class: 'w-fileupload-bbr'
         }, {
-          default: () => [this.$slots.button ? this.$slots.button() : h(script$_, {
+          default: () => [this.$slots.button ? this.$slots.button() : h(script$Z, {
             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)
+              height: $$1.unitSize(this.x.thumbnailHeight),
             },
             onclick: this.chooseFile
           })]
@@ -9765,6 +9725,7 @@ var script$e = {
     computed: {
       html_style() {
         return {
+          '--w-thumbnail-width': $$1.unitSize(this.x.thumbnailWidth),
           '--w-label-min-height': $$1.unitSize(this.x.thumbnailHeight),
           '--w-gap': $$1.unitSize(this.x.gap),
         }
@@ -9799,7 +9760,7 @@ script$d.__file = "src/widgets/ImageUpload.vue";
 
 var script$c = {
     name: 'w-option',
-    mixins: [script$19],
+    mixins: [script$1b],
     props: ['value', 'text', 'disabled'],
     inject: ['provideOptionParent'],
     methods: {
@@ -9820,27 +9781,28 @@ var script$c = {
     }
   };
 
-const _hoisted_1 = { class: "f-flex-1 f-line-1" };
+const _hoisted_1$1 = ["disabled", "title"];
+const _hoisted_2$1 = { class: "f-flex-1 f-line-1" };
 
 function render$1(_ctx, _cache, $props, $setup, $data, $options) {
-  return (openBlock(), createBlock("button", mergeProps(_ctx.html_attrs, {
+  return (openBlock(), createElementBlock("button", mergeProps(_ctx.html_attrs, {
     class: ['f-flex-align', $options.provideOptionParent.$options.name + '-option', {'z-on': $options.isFocus, 'z-ds': $props.disabled, 'z-mul': $options.isMul}],
-    onClick: _cache[1] || (_cache[1] = (...args) => ($options.click && $options.click(...args))),
+    onClick: _cache[0] || (_cache[0] = (...args) => ($options.click && $options.click(...args))),
     disabled: $props.disabled,
     title: $props.text
   }), [
-    createVNode("div", _hoisted_1, [
+    createElementVNode("div", _hoisted_2$1, [
       renderSlot(_ctx.$slots, "default", {}, () => [
         createTextVNode(toDisplayString($props.text), 1 /* TEXT */)
       ])
     ]),
     ($options.isMul)
-      ? (openBlock(), createBlock("div", {
+      ? (openBlock(), createElementBlock("div", {
           key: 0,
-          class: ['w-option-checked', {'f-i f-i-check': $options.isFocus}]
+          class: normalizeClass(['w-option-checked', {'f-i f-i-check': $options.isFocus}])
         }, null, 2 /* CLASS */))
       : createCommentVNode("v-if", true)
-  ], 16 /* FULL_PROPS */, ["disabled", "title"]))
+  ], 16 /* FULL_PROPS */, _hoisted_1$1))
 }
 
 script$c.render = render$1;
@@ -10207,7 +10169,7 @@ var script$a = {
             onClose: this.onclose
           };
 					if (this.x.dropProps) dropProps = mergeProps(dropProps, this.x.dropProps);
-          r.push(h(script$13, dropProps, {
+          r.push(h(script$15, dropProps, {
             default: () => h(script$r, {
               height: '*',
               pad: true,
@@ -10367,7 +10329,7 @@ var script$9 = {
 					  onClose: () => this.showDrop = false
 					};
 					if (this.x.dropProps) dropProps = mergeProps(dropProps, this.x.dropProps);
-					r.push(h(script$13, dropProps, {default: () => h(script$15, {height: '*', scrollY: true, scrollView: '.z-on'}, this.$slots)}));
+					r.push(h(script$15, dropProps, {default: () => h(script$17, {height: '*', scrollY: true, scrollView: '.z-on'}, this.$slots)}));
 				}
 				return r
       },
@@ -10760,7 +10722,7 @@ var script$5 = {
             onClose: () => this.showSuggest = false
           };
 					if (this.x.dropProps) dropProps = mergeProps(dropProps, this.x.dropProps);
-					r.push(h(script$13, dropProps, {default: () => h(script$15, {height: '*', scrollY: true}, this.$slots)}));
+					r.push(h(script$15, dropProps, {default: () => h(script$17, {height: '*', scrollY: true}, this.$slots)}));
 				}
         return [
           this.html_input_hidden(),
@@ -11216,7 +11178,7 @@ var script$4 = {
             onClose: () => this.showSuggest = false
           };
 					if (this.x.dropProps) dropProps = mergeProps(dropProps, this.x.dropProps);
-					r.push(h(script$13, dropProps, {default: () => h(script$15, {height: '*', scrollY: true}, this.$slots)}));
+					r.push(h(script$15, dropProps, {default: () => h(script$17, {height: '*', scrollY: true}, this.$slots)}));
 				}
         return [
           this.html_input_hidden(),
@@ -11341,6 +11303,9 @@ var script$3 = {
     }
   };
 
+const _hoisted_1 = ["src"];
+const _hoisted_2 = ["src", "width"];
+
 function render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_w_dialog = resolveComponent("w-dialog");
 
@@ -11352,20 +11317,20 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
     context: $props.context
   }, {
     default: withCtx(() => [
-      createVNode("img", {
+      createElementVNode("img", {
         class: "w-jigsaw-big",
         src: $options.bigSrc
-      }, null, 8 /* PROPS */, ["src"]),
-      createVNode("img", {
+      }, null, 8 /* PROPS */, _hoisted_1),
+      createElementVNode("img", {
         class: "w-jigsaw-small",
         src: $options.smallSrc,
         width: $options.smallWidth,
-        style: {left: $data.smallLeft + 'px'},
-        onDragstart: _cache[1] || (_cache[1] = withModifiers((...args) => ($options.dragstart && $options.dragstart(...args)), ["prevent"])),
-        onMousedown: _cache[2] || (_cache[2] = (...args) => ($options.mousedown && $options.mousedown(...args)))
-      }, null, 44 /* STYLE, PROPS, HYDRATE_EVENTS */, ["src", "width"]),
-      createVNode("span", {
-        onClick: _cache[3] || (_cache[3] = (...args) => ($options.refresh && $options.refresh(...args))),
+        style: normalizeStyle({left: $data.smallLeft + 'px'}),
+        onDragstart: _cache[0] || (_cache[0] = withModifiers((...args) => ($options.dragstart && $options.dragstart(...args)), ["prevent"])),
+        onMousedown: _cache[1] || (_cache[1] = (...args) => ($options.mousedown && $options.mousedown(...args)))
+      }, null, 44 /* STYLE, PROPS, HYDRATE_EVENTS */, _hoisted_2),
+      createElementVNode("span", {
+        onClick: _cache[2] || (_cache[2] = (...args) => ($options.refresh && $options.refresh(...args))),
         class: "w-jigsaw-refresh"
       }, "刷新")
     ]),
@@ -11635,7 +11600,7 @@ var script = {
         this.x.modelValue = this.x.cancelable && this.x.modelValue == i ? '' : i;
       },
       html_star(i) {
-        return h(script$$, {
+        return h(script$_, {
           class: ['w-rate-star-icon', {'z-hv': this.hoverWrap && i <= this.hoverIndex, 'z-on': !this.hoverWrap && i <= this.x.modelValue}],
           src: '.f-i .f-i-star-full', 
           onMouseenter: e => this.hoverItem(e, i),
@@ -11679,9 +11644,9 @@ var script = {
 script.__file = "src/widgets/Rate.vue";
 
 const components = [
-  script$1a, script$14, script$13, script$12, script$11, script$10, script$Y, script$X, script$W,
-  script$M, script$15, script$16, script$V, script$U, script$T, script$Q, script$R, script$P, script$O, script$N, script$K, script$L, script$G, script$F,
-  script$E, script$$, script$J, script$_, script$Z, script$D, script$C, script$x, script$w, script$v, script$u, script$t, script$s, script$r, script$q, script$p, script$o,
+  script$1c, script$16, script$15, script$13, script$11, script$$, script$X, script$W, 
+  script$M, script$17, script$18, script$V, script$U, script$T, script$Q, script$R, script$P, script$O, script$N, script$K, script$L, script$G, script$F,
+  script$E, script$_, script$J, script$Z, script$Y, script$D, script$C, script$x, 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
 ];