efront 2.44.11 → 2.45.0

package/coms/compile/scanner2.js

@@ -315,7 +315,7 @@ var detour = function (o, ie) {
 class Program extends Array {
     COMMENT = COMMENT
     SPACE = SPACE
-    STAMP = STRAP
+    STRAP = STRAP
     STAMP = STAMP
     VALUE = VALUE
     QUOTED = QUOTED

package/coms/zimoli/alert.js

@@ -1,9 +1,13 @@
 var styles = {
-    log: "#2a53cd",
-    info: "#228B22",
-    warn: "#dd6a16",
-    error: "#dc352e"
+    blue: "#2a53cd",
+    green: "#228B22",
+    orange: "#dd6a16",
+    red: "#dc352e"
 };
+styles.success = styles.pass = styles.green;
+styles.info = styles.blue;
+styles.error = styles.danger = styles.red;
+styles.warn = styles.orange;
 var alerts = [];
 var clean = Cleanup(alerts);
 var build = function () {

package/coms/zimoli/avatar.js

@@ -4,7 +4,6 @@ function main(elem) {
     }
     if (!/^img$/i.test(elem.tagName)) {
         care(elem, function (src) {
-            console.log(elem);
             css(elem, { backgroundImage: `url('${src}')` });
         })
     }

package/coms/zimoli/checker.html

@@ -1 +1 @@
-<s>✓</s>
+▢<s>✓</s>

package/coms/zimoli/checker.less

@@ -1,32 +1,27 @@
 & {
-    display: inline-block;
     height: 1em;
     width: 1em;
-    border-radius: 2px;
-    border: .1em solid;
     position: relative;
-    vertical-align: middle;
     margin-right: 4px;
+    font-family: sans-serif;
+    display: inline-block;
+    line-height: 1;
+    text-align: center;
 
     >s {
         display: none;
-        border-radius: 50%;
-        width: 1em;
-        height: 1em;
-        line-height: 1;
         text-decoration: none;
-        text-align: center;
         position: absolute;
-        margin: -.5em;
         font-weight: bold;
-        top: 50%;
-        left: 50%;
+        left: 0;
+        right: 0;
+        top: -.15em;
     }
 }
 
 
 &.checked {
     >s {
-        display: block;
+        display: inline;
     }
 }

package/coms/zimoli/cross.js

@@ -323,7 +323,7 @@ function addDirect(a) {
     if (typeof a === 'string' || a instanceof RegExp) cors_hosts.push(a);
 }
 function notCross(domain) {
-    if (location_host === domain.slice(0, location_host.length)) return true;
+    if (location_host === domain.slice(0, location_host.length) || !/^https?\:\/\/|^s?\/\//.test(domain)) return true;
     for (var cx = 0, dx = cors_hosts.length; cx < dx; cx++) {
         var host = cors_hosts[cx];
         if (host instanceof RegExp) {

package/coms/zimoli/css.js

@@ -166,6 +166,7 @@ function cssTargetStyleSheet(stylesheet, innerCss) {
  * @param {|string} oValue 
  */
 var css = function (target, oStyle, oValue) {
+    if (!oStyle) return;
     if (isElement(target)) {
         if (/^style$/i.test(target.tagName)) {
             cssTargetStyleSheet(target, oStyle, oValue);

package/coms/zimoli/data.js

@@ -269,9 +269,9 @@ function parseConfig(api) {
         });
         return '';
     });
-    url.replace(/[\?\#][\s\S]*$/, '').replace(/\:\w+/g, function (p) {
+    url.replace(/[\?\#][\s\S]*$/, '').replace(/([\:\\]\:|\:\w+)/g, function (p) {
         p = p.slice(1);
-        if (!required[p]) {
+        if (!required[p] && p !== ':') {
             required.push(p);
             required[p] = p;
         }
@@ -495,8 +495,9 @@ var privates = {
         var coinmethod = method.slice(0, spliterIndex).toLowerCase();
         var realmethod = coinmethod.replace(/\W+$/g, '');
         var rest = [];
-        var uri = url.replace(/#[\s\S]*$/, "").replace(/\:[a-z\_][\w]*/gi, function (d) {
+        var uri = url.replace(/#[\s\S]*$/, "").replace(/[\\\:]\:|\:[a-z\_][\w]*/gi, function (d) {
             d = d.slice(1);
+            if (d === ":") return d;
             rest.push(d);
             return seekResponse(params, d) || '';
         });
@@ -829,7 +830,6 @@ var data = {
             this.responseLoading(instance);
             var params = privates.pack(sid, params1);
             if (!privates.validApi(api, params)) throw aborted;
-
             var { method, uri, params, selector } = privates.prepare(api.method, api.url, params);
             var promise = new Promise(function (ok, oh) {
                 var headers = api.headers;
@@ -850,7 +850,6 @@ var data = {
                     }
                 });
             }).then(function (response) {
-
                 return transpile(seekResponse(parseData(response), selector), api.transpile, api.root);
             });
             return promise;
@@ -914,6 +913,10 @@ var data = {
             localStorage.setItem(sourceDataId, JSAM.stringify(dataSourceMap));
         }
     },
+    getSource(sourceid) {
+        if (sourceid) return dataSourceMap[sourceid];
+        return dataSourceMap;
+    },
     clearSource() {
         localStorage.removeItem(sourceDataId);
         sessionStorage.removeItem(sourceDataId);

package/coms/zimoli/encode62.js

@@ -5,6 +5,19 @@ var encode62 = {
     src,
     map,
     time_delta: parseInt("zzzzz", 36),
+    geta(string) {
+        string = String(string)
+        string = string.length + string + "2017-08-19";
+        var buff = src.split('');
+        for (var cx = 0, dx = buff.length + src.length, sl = string.length, cl = buff.length; cx < dx; cx++) {
+            var s1 = string.charCodeAt(cx % sl) % cl;
+            var s2 = cx % cl;
+            var btemp = buff[s1];
+            buff[s1] = buff[s2];
+            buff[s2] = btemp;
+        }
+        return buff.join('');
+    },
     timedecode(string) {
         var { time_delta } = this;
         var time_rest = string.slice(string.length - time_delta.toString(36).length, string.length);

package/coms/zimoli/field.html

@@ -1,8 +1,10 @@
 <div class="head">
     <span ng-bind=field.name></span>
+    <span class="required" ng-if="field.required">*</span>
 </div>
 <div class="body">
     <model _data=data _field=field></model>
+    <span class="error" ng-bind="error"></span>
 </div>
 <div class="foot" ng-if="field.msg">
     <span ng-bind=field.msg></span>

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/menu.js

@@ -101,6 +101,14 @@ function main(elem, mode) {
         // }
         // elem.setAttribute('browser', os);
         var mode = elem.getAttribute('mode') || elem.getAttribute('type');
+        if (!mode) {
+            if (/^[xyhvtci]/i.test(elem.tagName)) {
+                mode = elem.tagName.slice(0, 1);
+            }
+            else if (/[xyhvtci]$/i.test(elem.tagName)) {
+                mode = elem.tagName.slice(0, 1);
+            }
+        }
         mode = mode ? mode.toLowerCase() : "horizonal";
         var src = elem.getAttribute("src") || elem.getAttribute("ng-src") || elem.getAttribute("v-src");
         if (src) {
@@ -133,12 +141,14 @@ function main(elem, mode) {
                     });
                     elem.renders.push(function () {
                         var src = this.src;
+                        var hasIcon = false;
                         for (var cx = 0, dx = src; cx < dx; cx++) {
                             if (src[cx].icon) {
+                                hasIcon = true;
                                 break;
                             }
                         }
-                        elem.useIcon = true;
+                        elem.useIcon = hasIcon;
                     });
                 } else {
                     var nodes = getTreeNodes(elem);

package/coms/zimoli/menu.less

@@ -160,7 +160,7 @@ body:active & {
             background: #1e282c;
 
             & s:after {
-                top: -10px;
+                top: -9.2px;
             }
         }
 

package/coms/zimoli/menuItem.js

@@ -2,7 +2,10 @@ function main(elem, scope, hasIcon) {
     var item = elem || document.createElement('menu-item');
     item.innerHTML = menuItem;
     if (isObject(scope) && scope !== elem.$scope) {
-        render(item, { menu: scope, useIcon: hasIcon })
+        render(item, { menu: scope, useIcon: hasIcon, hasIcon })
+    }
+    else {
+        extendIfNeeded(elem.$scope, { useIcon: false, hasIcon: false })
     }
     return item;
 }

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/radio.html

@@ -1,6 +1,4 @@
 <a ng-repeat="o in options" ng-click="select(o)" ng-class="{activate:o===options.active}">
-    <r>
-        <s></s>
-    </r>
+    <r>◯<s>●</s></r>
     <span ng-bind=o.name||o></span>
 </a>

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;
     }
 }