efront 3.3.7 → 3.4.2

package/coms/frame/left.less

@@ -1,43 +1,45 @@
 & {
-    padding : 50px 0 0 0;
+    padding: 50px 0 0 0;
     position: relative;
 }
 
 .navbar-header {
-    height        : 50px;
-    padding       : 10px 15px 10px 25px;
-    font-size     : 25px;
-    line-height   : 25px;
+    height: 50px;
+    padding: 10px 15px 10px 25px;
+    font-size: 25px;
+    line-height: 25px;
     text-transform: uppercase;
-    color         : #b8c7ce;
-    margin-top    : -50px;
+    color: #b8c7ce;
+    margin-top: -50px;
 }
 
 .dashboard_text {
-    font-size     : 12px;
+    font-size: 12px;
     text-transform: capitalize;
-    display       : block;
+    display: block;
     letter-spacing: 1px;
-    padding-left  : 35px;
-    display       : none;
+    padding-left: 35px;
+    display: none;
 }
 
-
+ylist {
+    width: 100%;
+}
 
 .sidebar-menu {
-    height    : 100%;
+    height: 100%;
     box-shadow: none;
 }
 
 .label {
     border-radius: 4px;
-    height       : 18px;
-    line-height  : 18px;
-    margin       : 12px 2px;
-    float        : right;
-    top          : 50%;
-    padding      : 0 8px;
-    color        : #fff;
+    height: 18px;
+    line-height: 18px;
+    margin: 12px 2px;
+    float: right;
+    top: 50%;
+    padding: 0 8px;
+    color: #fff;
 
     &.label-primary {
         background-color: #cd3213;
@@ -57,9 +59,9 @@
 }
 
 .fa-angle-left {
-    width      : auto;
-    height     : auto;
-    padding    : 0;
+    width: auto;
+    height: auto;
+    padding: 0;
     line-height: inherit;
 }
 
@@ -72,10 +74,10 @@
 }
 
 .tab1.header {
-    font-size  : 12px;
-    color      : #4b646f;
-    background : #1a2226;
-    height     : 32px;
+    font-size: 12px;
+    color: #4b646f;
+    background: #1a2226;
+    height: 32px;
     line-height: 32px;
 
     &:hover {
@@ -84,18 +86,18 @@
 }
 
 &>.setting {
-    position   : absolute;
-    bottom     : 0;
-    right      : 0;
-    left       : 0;
-    background : transparent;
-    text-align : left;
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    left: 0;
+    background: transparent;
+    text-align: left;
     line-height: 40px;
-    height     : 40px;
+    height: 40px;
 
     i {
-        height     : 40px;
-        opacity    : .9;
+        height: 40px;
+        opacity: .9;
         margin-right: 10px;
         line-height: inherit;
     }

package/coms/frame/main.js

@@ -2,7 +2,7 @@ function main(mainpath) {
     var page = layer$glance({
         left: 'frame$left',
         top: 'frame$top',
-        main: mainpath || 'page$grinch'
+        main: mainpath
     });
     return page;
 }

package/coms/frame/route.js

@@ -1,4 +1,4 @@
-(document.body.hasAttribute("config-path") ? data.fromURL(document.body.getAttribute('config-path') || 'config/menus.json').loading_promise : Promise.resolve([])).then(function (items) {
+(document.body.hasAttribute('menu-path') || document.body.hasAttribute("menu") || document.body.hasAttribute("config-path") ? data.fromURL(document.body.getAttribute('menu-path') || document.body.getAttribute('menu') || document.body.getAttribute('config-path') || 'menu.yml').loading_promise : Promise.resolve([])).then(function (items) {
     var result = [];
     var menuid = 0;
     var savedChildren = Object.create(null);
@@ -10,6 +10,9 @@
         if (!savedMenus[menu.id]) {
             savedMenus[menu.id] = menu;
         }
+        if (!menu.name) {
+            menu.name = Object.keys(menu)[0];
+        }
         if (!(menu.id in savedChildren)) {
             savedChildren[menu.id] = menu.children;
             if (menu.children instanceof Array) {
@@ -28,8 +31,46 @@
             }
         }
     };
-    items.map(getChildren);
-    result.update = function () {
+    var parseMenuList = function (items) {
+        if (items instanceof Array) {
+            console.log(items)
+            return items;
+        }
+        if (items instanceof Object) {
+            var keys = Object.keys(items);
+            items = keys.map(k => {
+                var c = items[k];
+                var item = {};
+                if (c instanceof Object) {
+                    item.children = parseMenuList(c);
+                }
+                else if (typeof c === 'string') {
+                    var [path, data] = c.split(/\?/);
+                }
+                var [icon] = k.split(/\s+/);
+                if (icon.length < k.length) {
+                    item.icon = icon;
+                    var name = k.slice(icon.length).trim();
+                } else name = k;
+                if (/,/.test(name)) {
+                    var [name, ...roles] = name.split(',');
+                }
+                item.name = name;
+                if (roles) item.roles = roles;
+                if (path) item.path = path;
+                if (data) item.params = parseKV(data);
+                if (/,/.test(name)) {
+
+                }
+                return item;
+            });
+            return items;
+        }
+        return [];
+    };
+    result.update = function (items) {
+        items = parseMenuList(items);
+        items.map(getChildren);
         var opened = data.getInstance("menu-opened");
         var historys = zimoli.getCurrentHistory();
         var map = {}, mmap = {};
@@ -62,6 +103,7 @@
                 result.open(result[0]);
             }
         }
+        return result;
     };
     var setActive = function (p, active) {
         while (p) {
@@ -71,6 +113,7 @@
     };
     result.load = function (menu) {
         zimoli.go(menu);
+        return result;
     };
     on("zimoli")(window, function (event) {
         var { zimoli } = event;
@@ -127,8 +170,13 @@
     };
     result.reload = function () {
         result.load(result.active);
+        return result;
+    };
+    result.fetch = function (url) {
+        data.from(url).loading_promise.then(result.update);
+        return result;
     };
-    result.update();
+    if (items.length) result.update(items);
 
     return result;
 });

package/coms/frame/top.less

@@ -1,12 +1,10 @@
-@import "../config.less";
-
 & {
     // background-color    : #fff;
     user-select: none;
     position: relative;
     z-index: 1;
-    line-height: 44px;
-    height: 44px;
+    padding: 4px 0;
+    line-height: 0;
     -webkit-backdrop-filter: saturate(180%) blur(20px);
     backdrop-filter: saturate(180%) blur(20px);
     background: rgba(255, 255, 255, .7);
@@ -87,6 +85,7 @@
         line-height: 24px;
         text-align: center;
         color: #666;
+        z-index: 2;
 
         &:hover {
             color: #f24;
@@ -102,17 +101,17 @@
         border-radius: 10px;
     }
 
-    &:nth-child(2)>span {
-        background-color: @primary-dot-color;
-    }
+    // &:nth-child(2)>span {
+    //     background-color: @primary-dot-color;
+    // }
 
-    &:nth-child(3)>span {
-        background-color: @extra-dot-color1;
-    }
+    // &:nth-child(3)>span {
+    //     background-color: @extra-dot-color1;
+    // }
 
-    &:nth-child(4)>span {
-        background-color: @extra-dot-color2;
-    }
+    // &:nth-child(4)>span {
+    //     background-color: @extra-dot-color2;
+    // }
 }
 
 .option-items {

package/coms/kugou/buildList.js

@@ -6,6 +6,7 @@ function main(dataid, datapath) {
         padding,
         song,
         loading,
+        musicList,
         run(s) {
             if (s.hash) {
                 kugou$player.play(s.hash);

package/coms/kugou/player.js

@@ -85,6 +85,9 @@ var $scope = {
     effect: false,
     playing: null,
     page: false,
+    currentProcess: null,
+    currentRotate: 0,
+    totalTime: 0,
     canvas: kugou$dance,
     activeList: playList,
     index: 0,

package/coms/layer/glance.less

@@ -3,14 +3,12 @@
     width: 100%;
     height: 100%;
     max-width: 100%;
-    // margin    : 0 auto;
     position: relative;
     border-radius: 3px;
     overflow: hidden;
     border-left: @left-width solid transparent;
     box-sizing: border-box;
     overflow: visible;
-    border-top: 44px solid transparent;
     transition: border-left-width 0.2s ease-out, margin-left .2s ease-out, left .2s ease-out;
 }
 
@@ -36,6 +34,10 @@
     border-bottom: 1px solid rgba(0, 0, 0, .16);
 }
 
+>:not([layer]) {
+    padding: 50px 10px 20px 10px;
+}
+
 &.close {
     border-left-width: 0 !important;
 }

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) || '';
         });
@@ -912,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>