@deanwu/vue-component-library 1.2.24 → 1.2.26

package/dist/vue-component-library.common.js

@@ -106737,8 +106737,7 @@ var formvue_type_template_id_78333b22_staticRenderFns = [];
 // CONCATENATED MODULE: ./src/assets/script/validate.js
 
 
-let app = new external_commonjs_vue_commonjs2_vue_root_Vue_default.a();
-const regexp = {
+const defauleRegexp = {
   phone: /^T?1[0-9]{10}$/,
   // 手机号
   tel: /^(0[0-9]{2,3}\-?)?([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$/,
@@ -106754,143 +106753,100 @@ const regexp = {
   password: /^[\@A-Za-z0-9\!\#\$\%\^\&\*\.\~]{6,20}$/ // 密码，6-20位，包含字母、数字以及!、@、#、$、%、^、&、*、.、~
 };
 
-var checkRule = function (data, value, rule) {
-  if (['regexp', 'range'].includes(rule.type) && (value === '' || value === undefined)) {
-    return true;
-  }
-  if (rule.skip && rule.skip(value, data)) {
-    return true;
-  }
-  switch (rule.type) {
-    case 'empty':
-      // 空值校验
-      if (Array.isArray(value) && !value.length) return false;
-      if (value === '' || value === undefined || value === null) return false;
-      break;
-    case 'regexp':
-      // 正则校验
-      var state = true;
-      for (var i in rule.regexp) {
-        var re = rule.regexp[i];
-        if (!regexp[re] && !re.test) continue;
-        if (regexp[re].test(value)) {
-          state = true;
-          if (rule.callback && rule.callback[re]) {
-            rule.callback[re](value);
-          }
-          break;
-        } else {
-          state = false;
-        }
-      }
-      return state;
-    case 'function':
-      // 自定义方法判断
-      return rule.fun(value, data) || false;
-  }
-  return true;
-};
-var checkItem = function (opt, data, name, next) {
-  var value = data[name],
-    rule = opt.rule[name];
-  if (typeof rule == 'string') {
-    rule = [{
-      type: 'empty',
-      message: rule
-    }];
-  }
-  if (typeof rule == 'function') {
-    next && next(!!rule());
-    return;
-  }
-  if (!rule || !rule.length) {
-    next && next(true);
-    return;
-  }
-  function loop(index) {
-    var r = rule[index];
-    if (r.type == 'async') {
-      opt.SYS_AJAX({
-        url: r.url,
-        data: function () {
-          var data = r.data || {};
-          data[r.name] = value;
-          return data;
-        }(),
-        success: function () {
-          callback(index, true, r);
-        }
-      });
-    } else {
-      callback(index, checkRule(data, value, r), r);
+function checkRule(value, data, rule) {
+  return new Promise(async resolve => {
+    if (['regexp'].includes(rule.type) && (value === '' || value === undefined)) {
+      resolve(true);
     }
-  }
-  function callback(index, state, r) {
-    if (state) {
-      if (!r.pass || r.pass(name) !== false) {
-        opt.pass && opt.pass(name, r.type);
-      }
-    } else {
-      if (!r.fail || r.fail(name, r.message || '提交数据有误，请检查后重试') !== false) {
-        r.message !== false && opt.fail && opt.fail(name, r.type, r.message || '提交数据有误，请检查后重试');
-      }
+    if (rule.skip && rule.skip(value, data)) {
+      resolve(true);
     }
-    if (index == rule.length - 1 || !state) {
-      next && next(state);
-    } else {
-      loop(++index);
+    switch (rule.type) {
+      case 'empty':
+        // 空值校验
+        if (Array.isArray(value) && !value.length) resolve(false);
+        if (value === '' || value === undefined || value === null) resolve(false);
+        break;
+      case 'regexp':
+        // 正则校验
+        let regexp = Object.assign(defauleRegexp, external_commonjs_vue_commonjs2_vue_root_Vue_default.a.prototype.$compsConfig.validate.regexp);
+        resolve(!!rule.regexp.find(item => {
+          let re = typeof item == 'string' ? regexp[item] : item;
+          return !re || re.test(value);
+        }));
+        break;
+      case 'function':
+        // 自定义方法判断
+        resolve((await rule.fun(value, data)) || false);
+        break;
     }
-  }
-  loop(0);
-};
-var vaildate = function (data, opt, callback) {
-  var arr = [];
-  var state = true;
-  for (var name in opt.rule) {
-    arr.push(name);
-  }
-  if (!arr.length) {
+    resolve(true);
+  });
+}
+function checkItem(data, name, opt) {
+  let rule = opt.rule[name];
+  return new Promise(async resolve => {
+    if (typeof rule == 'string') {
+      rule = [{
+        type: 'empty',
+        message: rule
+      }];
+    }
+    if (typeof rule == 'function') {
+      resolve(!!rule(data));
+    }
+    if (!rule || !rule.length) {
+      resolve(true);
+    }
+    for (let i in rule) {
+      if (!(await checkRule(data[name], data, rule[i]))) {
+        opt.fail(name, rule[i].type, rule[i].message || new external_commonjs_vue_commonjs2_vue_root_Vue_default.a({
+          i18n: components_i18n
+        }).$t('_t.validate.fail'));
+        resolve(false);
+        break;
+      }
+      ;
+    }
+    resolve(true);
+  });
+}
+;
+async function vaildate(data, opt, callback) {
+  if (!Object.keys(opt.rule).length) {
     callback(true);
     return;
   }
-  !function loop(index) {
-    var name = arr[index];
-    if (opt.skip && opt.skip[name] && opt.skip[name](data)) {
-      itemCallback(true);
-    } else {
-      checkItem(opt, data, name, itemCallback);
-    }
-    function itemCallback(s) {
-      if (!s) {
-        state = false;
-        if (!opt.vaildAll) {
-          callback && callback(false);
-          return;
-        }
-      }
-      if (index == arr.length - 1) {
-        callback && callback(state);
-      } else {
-        loop(++index);
-      }
+  for (let name in opt.rule) {
+    if (opt.skip[name] && opt.skip[name](data)) continue;
+    if (!(await checkItem(data, name, opt))) {
+      callback(false);
+      return;
     }
-  }(0);
-};
-var main = function (data, opt) {
+    ;
+  }
+  callback(true);
+}
+;
+/* harmony default export */ var validate = (function (data, opt) {
   opt = Object.assign({
     rule: {},
-    fail: (n, t, m) => {
-      app.$message({
-        message: m
+    skip: {},
+    fail: (name, type, message) => {
+      external_commonjs_vue_commonjs2_vue_root_Vue_default.a.prototype.$message({
+        message
       });
     },
     success: function () {}
   }, opt);
-  vaildate(data, opt, function (state) {
-    state && opt.success(data);
+  return new Promise(resolve => {
+    vaildate(data, opt, function (state) {
+      state && opt.success(data);
+      resolve(state);
+    });
   });
-};
-/* harmony default export */ var validate = (main);
+});
+;
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/index.vue?vue&type=script&lang=js&
 
 
@@ -110829,7 +110785,7 @@ var message_component = normalizeComponent(
   
 )
 
-/* harmony default export */ var message = (message_component.exports);
+/* harmony default export */ var popup_message = (message_component.exports);
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"c9e84250-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/popup/notice.vue?vue&type=template&id=73f5d106&scoped=true&
 var noticevue_type_template_id_73f5d106_scoped_true_render = function render() {
   var _vm = this,
@@ -113815,7 +113771,9 @@ function global_install(Vue, config) {
       opt.params = opt.data;
       delete opt.data;
     }
-    opt.loading && this.$loading();
+    opt.loading && this.$loading({
+      timeout: config.request.timeout
+    });
     const source = axios_default.a.CancelToken.source();
     axios_default.a.create({
       baseURL: config.request.baseUrl,
@@ -114075,7 +114033,7 @@ const GLOBAL_COMPS = [upload, public_clipboard, dialog_min];
 
 
 
-const DYNAMIC_COMPS = [loading, message, notice, popup_confirm, popup_preview];
+const DYNAMIC_COMPS = [loading, popup_message, notice, popup_confirm, popup_preview];