efront 3.19.1 → 3.19.2

package/coms/basic/submit_.js

@@ -0,0 +1,40 @@
+function submit(fields, data) {
+    var params = {};
+    var inputs = [];
+    var select = [];
+    var checks = [];
+    var id = 0;
+    for (var f of fields) {
+        var error = valid(f, data);
+        if (error === "empty") {
+            if (f.options instanceof Array || /date|time|range|switch|swap|radio/i.test(f.type)) {
+                if (!select.id) select.id = ++id;
+                select.push(f);
+            }
+            else {
+                if (!inputs.id) inputs.id = ++id;
+                inputs.push(f);
+            }
+        }
+        else if (error) {
+            checks.push(f);
+        }
+        else {
+            params[f.key] = data[f.key];
+        }
+    }
+    if (checks.length + select.length + inputs.length) {
+        var errors = [];
+        if (inputs.length) errors.push("请输入" + inputs.map(f => f.name).join("、"));
+        if (select.length) errors.push("请选择" + select.map(f => f.name).join("、"));
+        if (select.id < inputs.id) {
+            errors = errors.reverse();
+        }
+        if (checks.length) {
+            errors.push(checks.map(f => f.name).join("、") + "格式错误");
+        }
+        errors = errors.join("，") + "！";
+        throw errors;
+    }
+    return params;
+}

package/coms/basic/valid.js

@@ -6,5 +6,13 @@ function valid(field, data) {
         }
         return;
     }
+    if (field.valid instanceof Function) {
+        var e = field.valid(data[field.key]);
+        if (e) return e;
+    }
+    if (field.options instanceof Function) {
+        var e = field.options(data[field.key]);
+        if (e) return e;
+    }
     return error;
 }

package/coms/zimoli/field.js

@@ -30,6 +30,8 @@ function main(elem) {
                 case "empty":
                     scope.error = `${f.name}是必填字段！`;
                     break;
+                default:
+                    scope.error = (f.name) + error;
             }
         }
         else {

package/coms/zimoli/submit.js

@@ -1,41 +1,8 @@
-function submit(fields, data) {
-    var params = {};
-    var inputs = [];
-    var select = [];
-    var checks = [];
-    var id = 0;
-    for (var f of fields) {
-        var error = valid(f, data);
-        if (error === "empty") {
-            if (f.options || /date|time|range|switch|swap|radio/i.test(f.type)) {
-                if (!select.id) select.id = ++id;
-                select.push(f);
-            }
-            else {
-                if (!inputs.id) inputs.id = ++id;
-                inputs.push(f);
-            }
-        }
-        else if (error) {
-            checks.push(f);
-        }
-        else {
-            params[f.key] = data[f.key];
-        }
+function submit() {
+    try {
+        submit_.apply(this, arguments);
+    } catch (e) {
+        alert(String(e), 'warn');
+        throw e;
     }
-    if (checks.length + select.length + inputs.length) {
-        var errors = [];
-        if (inputs.length) errors.push("请输入" + inputs.map(f => f.name).join("、"));
-        if (select.length) errors.push("请选择" + select.map(f => f.name).join("、"));
-        if (select.id < inputs.id) {
-            errors = errors.reverse();
-        }
-        if (checks.length) {
-            errors.push(checks.map(f => f.name).join("、") + "格式错误");
-        }
-        errors = errors.join("，") + "！";
-        alert(errors, 'error');
-        throw new Error(errors);
-    }
-    return params;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.19.1",
+    "version": "3.19.2",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {