dfish-widget 1.0.34 → 1.0.36

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, 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 { 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();
@@ -1417,8 +1417,12 @@ $$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 = $$1.view = (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);
@@ -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,17 +1885,22 @@ 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, options) {
         return $$1.vm(this).createPop(this, template, props, options)
@@ -2202,10 +2208,10 @@ var script$1g = {
         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);
           }
@@ -2213,14 +2219,14 @@ var script$1g = {
         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);
@@ -3650,7 +3656,7 @@ const O = {},
             } 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);
         }
       },
@@ -5595,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) {
@@ -5975,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: {
@@ -6016,15 +6025,30 @@ 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();
+          if (typeof v !== 'string')
+            v = Array.isArray(v) ? v.join(',') : v == null ? '' : ('' + v);
+          v = v.trim();
+          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 = await hs[q.type](v, rv, q);
+            if (e) return e
+          }
+        }
+      },
+      getValidErrorSync(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();
@@ -6226,10 +6250,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}})
+              }
             }
           }
         }
@@ -9859,8 +9886,9 @@ var script$b = {
         }
         this.x.format && this.doFormat();
       },
+      // #fixme: 暂时用getValidErrorSync
       isUsableVal(v) {
-        return !this.getValidError(null, v)
+        return !this.getValidErrorSync(null, v)
       },
       isFocusTarget(el) { // implement
         return (this.$refs.buttonMinus && this.$refs.buttonMinus.contains(el)) || (this.$refs.buttonPlus && this.$refs.buttonPlus.contains(el))