efront 3.3.5 → 3.4.0

package/coms/zimoli/field.js

@@ -1,19 +1,43 @@
 function main(elem) {
-    var result = elem;
-    if (isElement(elem) && elem.hasAttribute("ng-src")) {
-        elem = option(elem);
-        care(elem, function (p) {
-            var [f, data] = p;
-            elem.innerHTML = field;
-            render(elem, {
-                model,
-                data,
-                field: f
-            });
-        }, false);
-    } else {
-        result = option.apply(null, arguments);
-    }
-    result.removeAttribute("tabindex");
-    return result;
+    elem = option.apply(null, arguments);
+    var scope = {};
+    care(elem, function (p) {
+        if (elem.childNodes.length) return;
+        var [f, data] = p;
+        elem.innerHTML = field;
+        render(elem, scope = {
+            model,
+            data,
+            error: null,
+            field: f
+        });
+        elem.oldValue = data[f.key];
+        elem.setAttribute("field", f.key);
+    }, false);
+    elem.setAttribute("field", '');
+    elem.renders = [function () {
+        if (!this.src) return;
+        var [f, data] = this.src;
+        if (!f || !data) return;
+        var v = data[f.key];
+        if (!this.checked) if (v === this.oldValue || isEmpty(this.oldValue) && isEmpty(v)) return;
+        this.checked = false;
+        this.setAttribute("dirty", '');
+        var error = valid(f, data);
+        if (error) {
+            this.setAttribute("error", error);
+            switch (error) {
+                case "empty":
+                    scope.error = `${f.name}是必填字段！`;
+                    break;
+            }
+        }
+        else {
+            this.removeAttribute('error');
+            scope.error = null;
+        }
+        this.oldValue = data[f.key];
+    }]
+    elem.removeAttribute("tabindex");
+    return elem;
 }

package/coms/zimoli/field.less

@@ -32,4 +32,23 @@
 
 .input {
     width: 100%;
+}
+
+.required {
+    color: #c24;
+    display: inline-block;
+}
+
+&.error,
+&[error] {
+    background: #f322;
+
+    model>* {
+        background: #f322;
+        border-color: #f32;
+        outline: 1px solid #f32;
+    }
+    .error{
+        color:#c32;
+    }
 }

package/coms/zimoli/form.js

@@ -2,5 +2,13 @@ function form(elem) {
     if (!elem) {
         elem = document.createElement("form");
     }
+    if (/form/i.test(elem.tagName)) {
+        on("submit")(elem, function (event) {
+            event.preventDefault();
+            var fields = elem.querySelectorAll(".field");
+            for (var f of fields) f.checked = true;
+            render.refresh();
+        });
+    }
     return elem;
 }

package/coms/zimoli/getChanges.js

@@ -1,8 +1,8 @@
 function getChanges(current_props, previous_props) {
     if (!isObject(current_props) && !isObject(previous_props)) return !deepEqual.shallow(current_props, previous_props);
-    if (!isObject(current_props)) return true;
-    if (!isObject(previous_props)) return current_props;
     var changes = null;
+    if (!isObject(current_props)) current_props = Object.create(null), changes = {};
+    if (!isObject(previous_props)) previous_props = Object.create(null), changes = {};
     keys(previous_props, current_props).forEach(function (key) {
         if (!deepEqual.shallow(current_props[key], previous_props[key])) {
             if (!changes) changes = {};

package/coms/zimoli/model.js

@@ -38,6 +38,7 @@ var constructors = {
     input,
     raw: input,
     row: textarea,
+    password,
     text: textarea,
     date() {
         var elem = document.createElement("input");

package/coms/zimoli/render.js

@@ -71,7 +71,7 @@ var createGetter = function (search, isprop = true) {
         });
     }
     if (isprop) {
-        return new Function('event', `try{${withContext}with(this.$scope){${ret}${searchContext}}}catch(e){/*console.warn(String(e))*/}`);
+        return new Function('event', `${withContext}with(this.$scope){${ret}${searchContext}}`);
     }
     return new Function("event", `${withContext}with(this.$scope){${/([\=\(\+\-])/.test(searchContext) ? ret + searchContext : `${ret}${searchContext}.call(this.$scope,event)`}}`);
 };
@@ -346,13 +346,42 @@ var structures = {
 };
 structures["else-if"] = structures.elseif = structures.else;
 structures["for-each"] = structures.foreach = structures.for = structures.each = structures.repeat;
-var changed = function () {
-    if (!this.dirty) this.dirty = true, this.setAttribute('dirty', '');
-};
+var createBinder = function (binder) {
+    return function (search) {
+        var getter = createGetter(search).bind(this);
+        var oldValue;
+        this.renders.push(function () {
+            var value = getter();
+            if (deepEqual.shallow(value, oldValue)) return;
+            oldValue = value;
+            if (isNode(value) || isArray(value)) {
+                if (value !== this.firstChild) {
+                    remove(this.childNodes);
+                    appendChild(this, value);
+                }
+            } else {
+                if (isEmpty(value)) value = '';
+                if (binder(this) !== value) binder(this, value);
+            }
+        });
+
+    }
+}
 var directives = {
+    bind: createBinder(text),
+    html: createBinder(html),
+    hide: createBinder(function (elem, value) {
+        if (arguments.length === 1) return elem.style.display === 'none';
+        elem.style.display = value ? 'none' : '';
+    }),
+    show: createBinder(function (elem, value) {
+        if (arguments.length === 1) return elem.style.display !== 'none';
+        elem.style.display = value ? '' : 'none';
+    }),
+    style: createBinder(css),
     src(search) {
         var getter = createGetter(search).bind(this);
-        var savedValue, savedOrigin, pending;
+        var savedValue, pending;
         var refresh = function () {
             that.src = savedValue;
             removeClass(that, "pending");
@@ -372,10 +401,8 @@ var directives = {
             }
             var changes = getChanges(temp, savedValue);
             if (!changes) return;
-            savedOrigin = origin;
             savedValue = temp;
             if (/^img$/i.test(this.tagName)) {
-                // this.setAttribute("src", "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQYV2NgAAIAAAUAAarVyFEAAAAASUVORK5CYII=");
                 if (!isString(origin)) {
                     return;
                 }
@@ -394,23 +421,6 @@ var directives = {
             }
         });
     },
-    bind(search) {
-        var getter = createGetter(search).bind(this);
-        var oldValue;
-        this.renders.push(function () {
-            var value = getter();
-            if (deepEqual(value, oldValue)) return;
-            oldValue = value;
-            if (isNode(value) || isArray(value)) {
-                if (value !== this.firstChild) {
-                    remove(this.childNodes);
-                    appendChild(this, value);
-                }
-            } else {
-                if (text(this) !== value) text(this, value);
-            }
-        });
-    },
     model(search) {
         var getter = createGetter(search).bind(this);
         var oldValue;
@@ -462,35 +472,6 @@ var directives = {
         }
         var onchange = change;
         eventsHandlers.map(on => on(this, onchange));
-        eventsHandlers.map(on => on(this, changed));
-    },
-    hide(search) {
-        var getter = createGetter(search).bind(this);
-        var oldValue;
-        this.renders.push(function () {
-            var value = !!getter();
-            if (deepEqual(oldValue, value)) return;
-            oldValue = value;
-            if (value) {
-                this.style.display = "none";
-            } else {
-                this.style.display = "";
-            }
-        });
-    },
-    show(search) {
-        var getter = createGetter(search).bind(this);
-        var oldValue;
-        this.renders.push(function () {
-            var value = !!getter();
-            if (deepEqual(oldValue, value)) return;
-            oldValue = value;
-            if (value) {
-                this.style.display = "";
-            } else {
-                this.style.display = "none";
-            }
-        });
     },
 
     "class"(search) {
@@ -528,16 +509,6 @@ var directives = {
             }
         });
     },
-    style(search) {
-        var getter = createGetter(search).bind(this);
-        var oldValue;
-        this.renders.push(function () {
-            var stylesheet = getter();
-            if (deepEqual(oldValue, stylesheet)) return;
-            oldValue = stylesheet;
-            css(this, stylesheet);
-        });
-    }
 };
 // property binder
 var binders = {

package/coms/zimoli/renderDefaults.js

@@ -38,4 +38,5 @@ extend(renderDefaults, {
     swap,
     password,
     table,
+    form,
 });

package/coms/zimoli/submit.js

@@ -0,0 +1,41 @@
+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];
+        }
+    }
+    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/coms/zimoli/view.js

@@ -94,11 +94,6 @@ var init = function () {
 function view(element) {
     var window = isNode(element) ? element : document.createElement("form");
     init();
-    if (/form/i.test(window.tagName)) {
-        on("submit")(window, function (event) {
-            event.preventDefault();
-        });
-    }
     extend(window, prototype);
     if (window !== element) {
         extend(window, element);

package/coms/zimoli/view.less

@@ -13,13 +13,15 @@ body>& {
     -ms-user-select: none;
     -moz-user-select: none;
     -webkit-user-select: none;
+    border: 1px solid #0006;
 }
 
 &[dragable] {
     position: absolute;
 }
 
-&>.body {
+&>.body,
+>[body] {
     padding: 6px 0;
     background: #f2f4f6;
     display: block;
@@ -42,7 +44,8 @@ body>& {
 }
 
 
-&>.head {
+&>.head,
+>[head] {
     z-index: 2;
     background: #fffc;
     position: relative;
@@ -83,12 +86,14 @@ body>& {
     }
 }
 
-&>.foot {
+&>.foot,
+>[foot] {
     white-space: nowrap;
     overflow: auto;
 }
 
-&>.foot {
+&>.foot,
+>[foot] {
     z-index: 1;
     text-align: right;
     line-height: 1;
@@ -101,13 +106,14 @@ body>& {
     bottom: 0;
     margin-top: -42px;
 
-    .button {
-        padding: 0 20px;
-        min-width: 60px;
-        vertical-align: middle;
+}
 
-        &+.button {
-            margin-left: 10px;
-        }
+.button {
+    padding: 0 20px;
+    min-width: 60px;
+    vertical-align: middle;
+
+    &+.button {
+        margin-left: 10px;
     }
 }

package/package.json

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