efront 3.3.6 → 3.4.1

package/coms/zimoli/radio.less

@@ -1,43 +1,31 @@
-& {    
-    vertical-align: top;
-}
-
 >a {
     line-height: inherit;
     margin-right: 10px;
-    vertical-align: top;
 
     >r {
+        font-family: sans-serif;
         display: inline-block;
-        height: 1em;
-        width: 1em;
-        border-radius: 50%;
-        border: .1em solid;
         position: relative;
-        vertical-align: middle;
         margin-right: 4px;
-
+        line-height: 1;
+        text-align: center;
+        
         >s {
             display: none;
-            border-radius: 50%;
-            border: .2em solid;
-            width: .4em;
-            height: .4em;
             position: absolute;
-            margin: -.2em;
-            top: 50%;
-            left: 50%;
+            text-decoration: none;
+            left: 0;
+            right: 0;
+            top: 0;
+            bottom: 0;
         }
     }
 
-    >span {
-        vertical-align: middle;
-    }
 
     &.activate {
         >r {
             >s {
-                display: block;
+                display: inline;
             }
         }
     }

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/coms/zimoli/zimoli.js

@@ -58,7 +58,7 @@ if (/MSIE\s*[2-7]/.test(navigator.userAgent)) {
             if (currentHash && currentHash === targetHash) return;
             var targetHashIndex = targetHash.indexOf("#" + current_history);
             if (targetHashIndex < 0) return;
-            var targetpath = targetHash.slice(targetHashIndex + current_history.length + 1);
+            var targetpath = targetHash.slice(targetHashIndex + current_history.length);
             go(targetpath);
             return;
         }
@@ -110,7 +110,7 @@ var setZimoliParams = function (pagepath, args) {
 };
 var fullfill_is_dispatched = 0;
 function go(pagepath, args, history_name, oldpagepath) {
-    if (!history_name)
+    if (history_name === undefined)
         history_name = current_history;
     if (isNumber(pagepath)) {
         if (isString(history_name)) {
@@ -297,7 +297,7 @@ function prepare(pgpath, ok) {
         // rolesA中的role1,role2,...等所有身份都必须具备才可以确定一种访问权限
         // 符合rolesA,rolesB,rolesC任意一种权限都可以访问
         if (!roles) roles = [];
-        for (var cx = 0, dx = arguments.length; cx < dx; cx++) {
+        if (arguments.length) for (var cx = 0, dx = arguments.length; cx < dx; cx++) {
             roles.push(arguments[cx]);
         }
     };
@@ -408,6 +408,7 @@ function zimoli(pagepath, args, history_name, oldpagepath) {
         args = data;
         oldpagepath = from;
     }
+
     if (page_generators[pagepath]) return go(pagepath, args, history_name, oldpagepath);
     return prepare(pagepath, function () {
         if (isNode(history_name)) {
@@ -418,7 +419,7 @@ function zimoli(pagepath, args, history_name, oldpagepath) {
 }
 var global = {};
 var history = {};
-var current_history, default_history = current_history = "zimoli";
+var current_history, default_history = current_history = "";
 history[current_history] = [];
 var history_session_object_key = `_zimoli_history_key:${location_pathname}`;
 try {
@@ -428,7 +429,7 @@ try {
 var root_path;
 var pushstate = function (path_name, history_name, oldpagepath) {
     var isDestroy = false;
-    if (!history_name) {
+    if (history_name === undefined) {
         history_name = current_history;
     }
     if (!isString(history_name)) return;
@@ -454,7 +455,7 @@ var pushstate = function (path_name, history_name, oldpagepath) {
     return isDestroy;
 };
 var popstate = function (path_name, history_name) {
-    if (!history_name) history_name = current_history;
+    if (history_name === undefined) history_name = current_history;
     if (!isString(history_name)) return;
     if (!history[history_name]) return;
     var _history = history[history_name];
@@ -467,11 +468,12 @@ var popstate = function (path_name, history_name) {
 };
 var getCurrentHash = function () {
     var _historylist = history[current_history];
+    var history_name = current_history.replace(/\/$/, '');
     if (rootElements.length) {
-        return `#${current_history}/`;
+        return `#${history_name}/`;
     }
     if (_historylist.length < 2) return "";
-    var targeturl = `#${current_history}${_historylist.length ? _historylist[_historylist.length - 1] : ""}`;
+    var targeturl = `#${history_name}${_historylist.length ? _historylist[_historylist.length - 1] : ""}`;
     return targeturl;
 };
 
@@ -575,7 +577,7 @@ function addGlobal(element, name = null, isDestroy) {
 }
 var _switch = zimoli.switch = function (history_name = default_history, target_body = document.body, emptyState) {
     if (isString(history_name))
-        current_history = history_name;
+        current_history = history_name = history_name.replace(/\/$/, '') + "/";
     if (target_body)
         body = target_body;
     if (emptyState !== false && !history[history_name]) root_path = (history[history_name] = [].concat(emptyState || ":empty"))[0];

package/data/mime.json

@@ -60,6 +60,9 @@
         "text/css:css",
         "application/json:json"
     ],
+    ".yml":[
+        "text/plain;charset=utf-8:yml|yaml"
+    ],
     ".tomcat": [
         "application/vnd.lotus-1-2-3:123",
         "text/vnd.in3d.3dml:3dml",

package/package.json

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