efront 3.5.9 → 3.5.13

package/apps/pivot/api.yml

@@ -1,5 +1,6 @@
 ./aapi/ authorization: 
   login: options /::login-:a
   run: options /:::run
-  share: options /::share-:opt
+  share: options /::share-:opt?:path
   folder: options /::file-:opt:::path?:to
+  cluster: options /::cluster-:opt?:id

package/apps/pivot/link/list.html

@@ -0,0 +1,12 @@
+<div class="clusters">
+    <a -repeat="(c,i) in clusters" @click="active(i)">
+        <span -text="c"></span>
+    </a>
+</div>
+<lattice -src="c in clients">
+    <padding>
+        <span -text=c.id></span>
+        <span class="time" -text=filterTime(c.optime)></span>
+        
+    </padding>
+</lattice>

package/apps/pivot/link/list.js

@@ -0,0 +1,25 @@
+function main() {
+    var page = div();
+    page.innerHTML = template;
+    renderWithDefaults(page, {
+        async load() {
+            var cs = this.clusters = data.from("cluster", { opt: "list" });
+            await cs.loading_promise;
+            this.active();
+        },
+        index: 0,
+        clusters: [],
+        filterTime(d) {
+            return ((new Date - d) / 1000 | 0) + "秒";
+        },
+        clients: [],
+        async active() {
+            var index = this.index;
+            var clusters = this.clusters;
+            if (index >= clusters.length) index = clusters.length - 1;
+            this.clients = data.lazyInstance("cluster", { opt: "list", id: clusters[index] });
+        },
+    });
+    page.$scope.load();
+    return page;
+}

package/apps/pivot/link/list.less

@@ -0,0 +1,9 @@
+.clusters a {
+    display: inline-block;
+    margin-right: 20px;
+    padding: 0 6px;
+}
+
+.time {
+    color: #bbb;
+}

package/apps/pivot/main.js

@@ -13,8 +13,8 @@ setInterval(function () {
 }, 2000);
 login();
 var layer = layer$glance({
-    left: "frame$left",
-    top: 'frame$top'
+    left: frame$left,
+    top: frame$top
 });
 function main() {
     return layer;

package/apps/pivot/main.less

@@ -1,3 +1,4 @@
 >:not([layer]) {
     padding: 50px 10px 0;
+    min-height: 100%;
 }

package/apps/pivot/menu.yml

@@ -2,5 +2,5 @@
 共享目录管理: /share/list
 短链接: /home/short
 WEB文件管理: /wow/root
-# 用户: /home/short
+长连接管理: /link/list
 # 用户列表: /user/list

package/apps/pivot/share/edit.html

@@ -5,6 +5,6 @@
     </form>
 </div>
 <div foot>
-    <button white @click="close()">取消</button>
+    <btn white @click="close()">取消</btn>
     <button @click="save()"> 保存 </button>
 </div>

package/apps/pivot/share/edit.js

@@ -6,8 +6,10 @@ function main({ fields, item }) {
         close() {
             return remove(page);
         },
-        save() {
-            return data.from("share", { opt: item ? 'update' : 'create', data: this.data }).loading_promise;
+        async save() {
+            await data.from("share", { opt: 'create', path: this.data.path }).loading_promise;
+            dispatch(page, 'submited');
+            remove(page);
         },
         data: Object.assign({}, item)
     });

package/apps/pivot/share/list.js

@@ -1,36 +1,56 @@
 var fields = refilm`
 路径/path
-挂载点/name
 `;
-var options = [
-    {
-        name: "删除",
-        do(e) {
-            data.from('share', { opt: 'delete', item: e });
-        }
-    },
-    {
-        name: "修改",
-        do(e) {
-            popup('/share/edit', { fields, item: e });
-        }
-    }
-];
-console.log(fields)
 function main() {
+    var options = [
+        {
+            name(e) {
+                return this.confirm === e ? "确认取消" : "取消"
+            },
+            type: 'danger',
+            confirm: false,
+            timer: 0,
+            async do(e) {
+                if (this.confirm !== e) {
+                    this.confirm = e;
+                    clearTimeout(this.timer);
+                    this.timer = setTimeout(() => render.refresh(this.confirm = null), 2000);
+                    return;
+                }
+                await data.from('share', { opt: 'delete', path: e.path }).loading_promise;
+                page.$scope.load();
+            }
+        }
+    ];
     var page = div();
     page.innerHTML = list;
-    var a = data.from("share", { opt: 'list' }, a => {
-        if (a) return a.map(b => ({ path: b }));
-    });
     renderWithDefaults(page, {
-        data: a,
+        data: [],
+        load() {
+            this.data = data.from("share", { opt: 'list' }, a => {
+                if (a) return a.map(b => ({ path: b }));
+            });
+        },
         fields: fields.concat({
             name: "操作",
+            width: 200,
             type: 'button',
             options,
         }),
     });
-    console.log(a)
+    page.$scope.load();
+    contextmenu(page, [
+        {
+            name: "添加",
+            do(e) {
+                zimoli.prepare("/share/edit", function () {
+                    var p = popup("/share/edit", { fields });
+                    on('submited')(p, function () {
+                        page.$scope.load();
+                    })
+                })
+            }
+        },
+    ])
     return page;
 }

package/apps/pivot/share/list.less

@@ -0,0 +1,7 @@
+>table {
+    width: 100%;
+}
+
+& {
+    height: 100%;
+}

package/apps/pivot/wow/root.js

@@ -24,7 +24,7 @@ function main() {
             if (p) p = String(p.name || '').replace(/\/$/, '');
             if (p) this.pathlist.push(p);
             this.data = data.from("folder", { opt: 'list', path: "/" + this.pathlist.join('/') }, files => {
-                if (files) return files.map(f => {
+                if (files) return sortname(files).map(f => {
                     return {
                         name: f,
                         type: /\/$/.test(f) ? 'folder' : 'file'

package/coms/basic/JSAM.js

@@ -40,6 +40,10 @@ function stringify(memery) {
     if (memery instanceof Date) return date(memery);
     if (memery instanceof RegExp) return regexp(memery);
     if (!convertReg.test(typeof memery)) return string(memery);
+    m: if (typeof memery === 'function') {
+        for (var k in memery) break m;
+        return '';
+    }
     var dist = [memery];
     var rest = [memery];
     var trimed = [memery instanceof Array ? [] : {}];
@@ -51,7 +55,11 @@ function stringify(memery) {
         o[""] = arr;
         for (var k in memery) {
             var m = memery[k];
-            if (inc === +k) {
+            f: if (typeof m === 'function') {
+                for (var k in m) break f;
+                continue;
+            }
+            if (inc === +k && k !== '') {
                 var kindex = "";
                 inc++;
             } else {

package/coms/basic/sortname.js

@@ -0,0 +1,119 @@
+var minus = function (d1, d2) {
+    d1 = d1.split(".");
+    d2 = d2.split(".");
+    for (var cx = 0, dx = Math.max(d1.length, d2.length); cx < dx; cx++) {
+        var a = +d1[cx] || 0;
+        var b = +d2[cx] || 0;
+        if (a !== b) {
+            return a - b;
+        }
+    }
+    return 0;
+};
+
+var createMap = function (str) {
+    str = str.split('');
+    var map = {};
+    for (var cx = 0, dx = str.length; cx < dx; cx++) {
+        map[str[cx]] = cx;
+    }
+    return map;
+};
+var 甲乙丙丁戊己庚辛壬癸 = "甲乙丙丁戊己庚辛壬癸";
+
+var map一二三 = extend(createMap("零一二三四五六七八九"), createMap("〇壹贰叁肆伍陆柒捌玖"));
+var power = {
+    拾: 10,
+    十: 10,
+    佰: 100,
+    百: 100,
+    仟: 1000,
+    千: 1000,
+    万: 10000,
+    萬: 10000,
+    亿: 100000000,
+};
+var parse一二三 = function (a) {
+    if (!/[十百千万亿拾佰仟萬]/.test(a)) return parseInt(a.split("").map(a => map一二三[a]).join(''));
+    var base = 0;
+    a.replace(/([^十百千万亿拾佰仟萬零〇]*)([十百千万亿拾佰仟萬]*)/g, function (_, a, b) {
+        if (!_) return;
+        if (!a) a = 1;
+        else a = map一二三[a];
+        var r = 1;
+        b.split('').forEach(b => r *= power[b]);
+        base += a * r;
+    })
+    return base;
+};
+var map甲乙丙 = createMap("甲乙丙丁戊己庚辛壬癸");
+var map子丑寅 = createMap("子丑寅卯辰巳午未申酉戌亥");
+
+var reg123 = /^(\d+|\d+[\.\d]+\d+)[\s\S]*$/;
+var reg一二三 = /^([一二三四五六七八九十百千万亿壹贰叁肆伍陆柒捌玖拾佰仟萬零〇]+)[\s\S]*$/;
+var reg甲乙丙 = /^([甲乙丙丁戊己庚辛壬癸])[\s\S]*$/;
+var reg子丑寅 = /^([子丑寅卯辰巳午未申酉戌亥])[\s\S]*$/;
+var reg天干地支 = /^([甲乙丙丁戊己庚辛壬癸][子丑寅卯辰巳午未申酉戌亥])[\s\S]*$/;
+
+var getDelta = function (a, b, reg, parse) {
+    var match1 = reg.exec(a);
+    var match2 = reg.exec(b);
+    if (match1 && match2) {
+        var [, d1] = match1;
+        var [, d2] = match2;
+        if (parse) {
+            d1 = parse(d1);
+            d2 = parse(d2);
+            var delta = d1 - d2;
+        } else {
+
+            var delta = minus(d1, d2);
+        }
+        if (delta) return delta;
+    }
+    if (match1) return -1;
+    if (match2) return 1;
+    return 0;
+};
+var parse干支 = function (a) {
+    var [g, z] = a;
+    g = map甲乙丙[g];
+    z = map子丑寅[z];
+    return (12 + g - z) % 12 / 2 * 10 + g + 1;
+};
+var compare = function (a, b) {
+    for (var cx1 = a.length - 1, cx2 = a.length - 1; cx1 >= 0 && cx2 >= 0; cx1--, cx2--) {
+        while (/\s\u00a0/.test(a[cx1])) cx1--;
+        while (/\s\u00a0/.test(b[cx2])) cx2--;
+        if (a[cx1] !== b[cx2] || a[cx1] in map子丑寅 || a[cx1] in map一二三 || a in power) break;
+    }
+    a = a.slice(0, cx1 + 1);
+    b = b.slice(0, cx2 + 1);
+    for (var cx1 = 0, cx2 = 0, dx1 = a.length, dx2 = b.length; cx1 < dx1 && cx2 < dx2; cx1++, cx2++) {
+        while (/[\s\u00a0]/.test(a[cx1])) cx1++;
+        while (/[\s\u00a0]/.test(b[cx2])) cx2++;
+        if (a[cx1] !== b[cx2] || a[cx1] in map甲乙丙 || a[cx1] in map一二三 || a in power) break;
+    }
+    if (cx1) a = a.slice(cx1);
+    if (cx2) b = b.slice(cx2);
+    if (!a) return -1;
+    if (!b) return 1;
+    var delta = getDelta(a, b, reg123);
+    if (delta) return delta;
+    delta = getDelta(a, b, reg一二三, parse一二三);
+    if (delta) return delta;
+    delta = getDelta(a, b, reg天干地支, parse干支);
+    if (delta) return delta;
+    delta = getDelta(a, b, reg甲乙丙, d => map甲乙丙[d]);
+    if (delta) return delta;
+    delta = getDelta(a, b, reg子丑寅, d => map子丑寅[d]);
+    if (delta) return delta;
+    return 0;
+}
+function sortname(list = this) {
+    if (this !== arguments[1] && arguments.length === 2) {
+        return compare(arguments[0], arguments[1]);
+    }
+    list = list.sort(compare);
+    return list;
+}

package/coms/frame/left.js

@@ -1,7 +1,6 @@
 var page = document.createElement("都说我负天下人_可你们天下人_又何曾善待过我");
 page.innerHTML = left;
 if (!user.avatar) user.avatar = "user/avatar.png";
-frame$route.fetch('menu.yml')
 render(page, {
     ylist: menu,
     btn: button,
@@ -11,6 +10,9 @@ render(page, {
     popup,
     menus: frame$route,
 });
+on('append')(page, function () {
+    frame$route.open();
+});
 function main() {
     return page;
 }

package/coms/frame/route.js

@@ -98,9 +98,9 @@
         if (!active || result.indexOf(active) < 0) {
             actived = mmap[opened.active] || actived;
             if (actived) {
-                if (actived_value === historys.length) result.open(actived);
-            } else {
-                result.open(result[0]);
+                if (actived_value === historys.length) {
+                    result.active = actived;
+                };
             }
         }
         return result;
@@ -133,7 +133,10 @@
         }
     });
     result.open = function (menu) {
-        if (!menu) return;
+        if (!menu) {
+            menu = result.active || result[0];
+            delete result.active;
+        }
         if (!menu.path) {
             menu.closed = !menu.closed;
             return;
@@ -176,7 +179,6 @@
         data.from(url).loading_promise.then(result.update);
         return result;
     };
-    if (items.length) result.update(items);
-
+    result.update(items);
     return result;
 });

package/coms/layer/glance.js

@@ -104,10 +104,10 @@ function main(mainPath, historyName = "") {
             }
             zimoli();
         };
-        if (leftPath) {
+        if (typeof leftPath === 'string') {
             zimoli.prepare(leftPath, hook);
         } else hook();
-        if (topPath) {
+        if (typeof topPath === 'string') {
             zimoli.prepare(topPath, hook);
         } else hook();
     });

package/coms/zimoli/table.html

@@ -8,8 +8,8 @@
     <tr>
         <td -repeat="f in fields">
             <span -if="f.key" -text="d[f.key]"></span>
-            <a on-click="o.do(d)" -if="f.options" -repeat="o in f.options">
-                <span -text=o.name></span>
+            <a on-click="o.do(d)" -if="f.options" _type="o.type" -repeat="o in f.options">
+                <span -text="o.name instanceof Function?o.name(d):o.name"></span>
             </a>
         </td>
     </tr>

package/coms/zimoli/zimoli.js

@@ -337,11 +337,17 @@ function prepare(pgpath, ok) {
     }, state);
 }
 function create(pagepath, args, from, needroles) {
-    var page_object = isObject(pagepath) ? pagepath : page_generators[getpgpath(pagepath)];
-    if (!page_object) {
-        throw new Error(`调用create前请确保prepare执行完毕:${pagepath}`);
+    if (typeof pagepath === 'string') {
+        var page_object = isObject(pagepath) ? pagepath : page_generators[getpgpath(pagepath)];
+        if (!page_object) {
+            throw new Error(`调用create前请确保prepare执行完毕:${pagepath}`);
+        }
+        var { pg, "with": _with_elements, state, onback: _pageback_listener, roles } = page_object;
+    }
+    else if (isFunction(pagepath)) {
+        var pg = pagepath;
+        var { with: _with_elements, state = {}, onback: _pageback_listener, roles } = pg;
     }
-    var { pg, "with": _with_elements, state, onback: _pageback_listener, roles } = page_object;
     if (!checkroles(user.roles, roles) || !checkroles(user.roles, needroles)) {
         // 检查权限
         if (!user.isLogin && user.loginPath) {

package/package.json

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