efront 3.18.3 → 3.19.2

package/apps/pivot/api.yml

@@ -14,8 +14,10 @@
   count: options ::count
   bootlog: options ::similar
   link: options ::link
+  room: options ::link-:id
   care: options ::care-:id
   cast: options ::cast-:id?:msg
+  upload: put :path
 https://www.ip.cn/:
   iplocation: get https://www.ip.cn/api/index?ip=:ip&type=1
 # https://ipchaxun.com/ :

package/apps/pivot/link/chat.js

@@ -2,7 +2,7 @@ async function link(id, page) {
     if (!id) {
         id = await data.from("link");
     }
-    page.$scope.title = `会话窗口(<span nodrag>${id}</span>)`;
+    if (!page.name) page.$scope.title = `会话窗口(<span nodrag>${id}</span>)`;
     page.roomid = id;
     var removed = false;
     on("remove")(page, function () {
@@ -16,8 +16,11 @@ async function link(id, page) {
         page.push(await xhr);
     }
 }
-function main(id) {
-    var page = frame$chat();
+function main(params) {
+    if (isObject(params)) var { linkid: id, name } = params;
+    else id = params;
+    var page = frame$chat(name);
+    if (name) page.name = name;
     care(page, 'send', function (msg) {
         data.from("cast", { id: page.roomid, msg });
     });

package/apps/pivot/link/index.html

@@ -0,0 +1,2 @@
+<menu -src="m in menus" #navbar></menu>
+<container -src="navbar.selected?.path"></container>

package/apps/pivot/link/index.js

@@ -0,0 +1,13 @@
+function index() {
+    var page = document.createElement('link-index');
+    page.innerHTML = template;
+    renderWithDefaults(page, {
+        menus: "房间 /link/room, 会话 /link/list".split(/\s*,\s*/).map(a => {
+            var [name, path] = a.split(/\s+/);
+            return { name, path };
+        }),
+        menu,
+    });
+    page.$scope.menus[0].actived = true;
+    return page;
+}

package/apps/pivot/link/room.js

@@ -0,0 +1,10 @@
+plist.bind(null, '房间', "room", refilm`
+*房间名/name 100
+/ $ ${[{
+        name: "连接",
+        async do(o) {
+            var linkid = await data.from("room", { id: encode62.timeencode(o.name) });
+            popup("/link/chat", { linkid, name: o.name });
+        }
+    }]}
+`);

package/apps/pivot/main.js

@@ -26,7 +26,7 @@ data.bindInstance("base", async function (base) {
     cross.addDirect(base.base);
     var apimap = await data.getConfig();
     for (var k in apimap) {
-        if (apimap[k].method === 'options') apimap[k].base = base.base;
+        if (/options|put/.test(apimap[k].method)) apimap[k].base = base.base;
     }
 });
 var base = data.getInstance('base').base;
@@ -53,6 +53,12 @@ var layer = layer$glance({
 on("append")(layer, function () {
     frame$route.open();
 });
+on("dragover")(document, function (event) {
+    event.preventDefault();
+});
+on("drop")(document, function (event) {
+    event.preventDefault();
+});
 function main() {
     return layer;
 }

package/apps/pivot/menu.yml

@@ -3,7 +3,7 @@ WEB:
   共享目录: /share/list
   短链接: /proxy/list
   文件管理: /wow/root
-  长连接管理: /link/list
+  长连接管理: /link/index
   字典: /dict/list
   接口: /api/list
 任务:

package/apps/pivot/wow/edit.js

@@ -10,6 +10,7 @@ function main({ path: root, name }) {
     renderWithDefaults(a, {
         fields,
         pathlist: root,
+        origin,
         isFolder: /\/$/.test(name),
         data: { name: origin, origin },
         remove() {
@@ -19,9 +20,11 @@ function main({ path: root, name }) {
     on('submit')(a, async function (e) {
         e.preventDefault();
         var path = root.concat(a.$scope.data.name).join('/');
+        path = encode62.timeencode(path);
         if (origin) {
             var to = path;
             path = origin;
+            path = encode62.timeencode(path);
         }
         await data.from("folder", { opt: origin ? 'mov' : 'add', path, to }).loading_promise;
         dispatch(this, 'submited');

package/apps/pivot/wow/root.js

@@ -1,8 +1,21 @@
 var fields = refilm`
 文件
 `;
-
+var passport = encode62.timeencode(encode62.decode62(user._passport, user.session));
+async function upload(f, base) {
+    var api = await data.getApi('upload');
+    var authorization = await data.getSource(api.base);
+    var xhr = cross(api.method, api.base + base + f.name, { authorization: authorization });
+    xhr.setRequestHeader('range', 'bytes=1-' + f.size);
+    return xhr.send(f);
+}
 function main() {
+    async function uploadAll(files) {
+        await queue.call(files, function (f) {
+            return upload(f, page.$scope.pathlist.join("/"));
+        });
+        page.$scope.open();
+    }
     var page = div();
     page.innerHTML = root;
     page.onback = function () {
@@ -15,15 +28,24 @@ function main() {
         return false;
     }
     page.setAttribute('ng-mousedown', 'setActive')
+    bind('drop')(page, async function (event) {
+        event.preventDefault();
+        var files = event.dataTransfer.files;
+        uploadAll(files);
+    });
 
     renderWithDefaults(page, {
         lattice,
         pathlist: data.getInstance("pathlist"),
         active: null,
         open(p) {
+            if (p && !/\/$/.test(p.name)) {
+                // window.open("/" + this.pathlist.concat(p.name).join('/'))
+                return;
+            }
             if (p) p = String(p.name || '').replace(/\/$/, '');
             if (p) data.setInstance("pathlist", this.pathlist.concat(p));
-            this.data = data.from("folder", { opt: 'list', path: "/" + this.pathlist.join('/') }, files => {
+            this.data = data.from("folder", { opt: 'list', path: encode62.timeencode("/" + this.pathlist.join('/')) }, files => {
                 if (files) return sortname(files).map(f => {
                     return {
                         name: f,
@@ -66,7 +88,14 @@ function main() {
             }
         },
         {
-            name: '编辑',
+            name: "添加文件",
+            when: e => !getActive(e),
+            do() {
+                return chooseFile().then(uploadAll);
+            }
+        },
+        {
+            name: '重命名',
             when,
             do(e) {
                 popupEdit(e.$scope.d.name);
@@ -91,7 +120,7 @@ function main() {
                     }, 2000);
                     return false;
                 }
-                await data.from("folder", { opt: 'del', path: "/" + page.$scope.pathlist.concat(e.$scope.d.name).join("/") }).loading_promise;
+                await data.from("folder", { opt: 'del', path: encode62.timeencode("/" + page.$scope.pathlist.concat(e.$scope.d.name).join("/")) }).loading_promise;
                 page.$scope.open();
             }
         }

package/coms/basic/submit_.js

@@ -0,0 +1,40 @@
+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 instanceof Array || /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("，") + "！";
+        throw errors;
+    }
+    return params;
+}

package/coms/basic/valid.js

@@ -6,5 +6,13 @@ function valid(field, data) {
         }
         return;
     }
+    if (field.valid instanceof Function) {
+        var e = field.valid(data[field.key]);
+        if (e) return e;
+    }
+    if (field.options instanceof Function) {
+        var e = field.options(data[field.key]);
+        if (e) return e;
+    }
     return error;
 }

package/coms/frame/chat.js

@@ -19,6 +19,7 @@ function chat(title = '会话窗口') {
     page.innerHTML = template;
     drag.on(page.firstElementChild, page);
     resize.on(page);
+    var localid = Date.now() + Math.sin(Math.random());
     page.push = function (msgs) {
         var { msglist } = this.$scope;
         msglist.push.apply(msglist, msgs);
@@ -37,7 +38,7 @@ function chat(title = '会话窗口') {
         grid,
         msglist: [],
         text: '',
-        localid: Math.random(),
+        localid,
         msg,
         remove() {
             remove(page);

package/coms/random/{sfz.js → /350/272/253/344/273/275/350/257/201.js}

@@ -128,7 +128,7 @@ var parse = function (r) {
 function sex(r = Math.random()) {
     return r < .5 | 0;
 }
-function sfz(r) {
+function 身份证(r) {
     var p17, middle;
     if (typeof r === 'string' || r === 1 || r === 0) {
         var r0 = Math.random();

package/coms/zimoli/Item.js

@@ -1,13 +1,14 @@
 var id = 0;
-function Item(value) {
-    this.children = this;
-    this.count = 0;//子项中的叶子节点数
-    this.total = 0;//子项中的节点数
-    this.crack = 0;
-    this.id = ++id;
-    this.extends(value);
-}
-Item.prototype = extend([], {
+class Item extends Array {
+    constructor(value) {
+        super();
+        this.children = this;
+        this.count = 0;//子项中的叶子节点数
+        this.total = 0;//子项中的节点数
+        this.crack = 0;
+        this.id = ++id;
+        this.extends(value);
+    }
     extends(value) {
         this.value = value;
         if (value.children instanceof Array) {
@@ -16,7 +17,6 @@ Item.prototype = extend([], {
             this.push.apply(this, children);
         }
         if (isObject(value)) {
-            this.name = value.name;
             this.tab = value.tab;
             this.icon = value.icon;
             this.color = value.color;
@@ -28,30 +28,38 @@ Item.prototype = extend([], {
             if (value.href) this.href = value.href;
             if (value.src) this.src = value.src;
         }
-        else {
-            this.name = value;
-        }
-    },
+    }
 
     valueOf() {
         return this.value;
-    },
+    }
     toString() {
         return String(this.value);
-    },
+    }
+    get warn() {
+        if (isObject(this.value)) {
+            return /danger|red|warn/.test(this.value.type) || this.value.warn;
+        }
+        return false;
+    }
+    get name() {
+        if (isObject(this.value)) return this.value.name;
+        return this.value;
+    }
+
     isClosed() {
         return !!this.value.closed;
-    },
+    }
     setClosed(value) {
         this.value.closed = value;
-    },
+    }
     isActive() {
         if (isObject(this.value)) {
             if ("active" in this.value) return this.value.active;
             if ('actived' in this.value) return this.value.actived;
         }
         return !!this.actived;
-    },
+    }
     setActive(value) {
         if (isObject(this.value)) {
             if ('active' in this.value) {
@@ -61,15 +69,16 @@ Item.prototype = extend([], {
             }
         }
         this.actived = value;
-    },
+    }
     isSelected() {
         return !!this.value.selected;
-    },
+    }
     isChecked() {
         return !!this.value.checked;
-    },
+    }
     getClass() {
         return !!this.value.class;
     }
-});
+
+}
 Item.prototype.isActived = Item.prototype.isActive;

package/coms/zimoli/contextmenu.js

@@ -8,10 +8,11 @@ var createMenu = function (event, items) {
         if (!item.when(event)) return false;
         return true;
     });
-    var elem = menuList(menulist, items, async function (item) {
-        if (await action.call(this, item, event.target) !== false) {
-            remove(elem);
-        }
+    var elem = menuList(menulist, items, function (item) {
+        action.call(this, item, event.target).then(function (e) {
+            if (e !== false) remove(elem);
+        });
+        return false;
     });
 
     return elem;

package/coms/zimoli/drag.js

@@ -146,5 +146,4 @@ drag.on = function (target, actionTarget = target.dragTarget) {
     on("drop")(actionTarget || target, setZIndex);
     onmousedown(target, _mousedrag);
     ontouchstart(target, _touchdrag);
-    move.bindPosition(actionTarget || target);
 };

package/coms/zimoli/field.js

@@ -30,6 +30,8 @@ function main(elem) {
                 case "empty":
                     scope.error = `${f.name}是必填字段！`;
                     break;
+                default:
+                    scope.error = (f.name) + error;
             }
         }
         else {

package/coms/zimoli/menuItem.html

@@ -1,4 +1,4 @@
-<i ng-class="icon" ng-if='useIcon||hasIcon'></i>
+<i ng-class="icon?" ng-if='useIcon||hasIcon'></i>
 <span ng-html="name?"></span>
 <template -if="hotkey?">
     &nbsp;&nbsp; <span ng-repeat="k of hotkey" class="hotkey" ng-html="k"></span>

package/coms/zimoli/menuItem.js

@@ -8,16 +8,14 @@ function main(elem, scope, hasIcon) {
         var scope = item.$scope;
     }
     if (scope.menu) scope = scope.menu;
-    var name = scope.name;
-    var icon = scope.icon;
-    if (hasIcon === undefined) hasIcon = !!icon;
+    if (hasIcon === undefined) hasIcon = !!scope.icon;
     if (scope.disabled || scope.enabled === false) {
         item.setAttribute('disabled', '');
     }
     else {
         item.removeAttribute("disabled");
     }
-    render(item.children, scope, hasIcon instanceof Array ? hasIcon : [{ useIcon: hasIcon, hasIcon, name, icon }], 0);
+    render(item.children, scope, hasIcon instanceof Array ? hasIcon : [{ useIcon: hasIcon, hasIcon }]);
     if (scope.line) item.setAttribute("line", ''), on("click")(item, preventDefault);
     if (scope.hotkey) bindAccesskey(item, scope.hotkey);
     return item;

package/coms/zimoli/menuList.html

@@ -1,6 +1,6 @@
 <menu-item ng-repeat="menu in menus" ng-if="!menu.hidden" ng-click="open.call(this)" ng-mouseleave="cancel()"
     ng-mouseenter="popMenu.call(this)" ng-mousedown="popMenu1.call(this,event)" ng-class="{'has-children':menu.children&&menu.children.length,
-    'warn':menu.type==='danger'||menu.type==='warn'||menu.type==='red',
+    'warn':menu.warn,
     'actived':menu.isActived()
 }">
 </menu-item>

package/coms/zimoli/menuList.js

@@ -226,7 +226,7 @@ function main(page, items, active, direction = 'y') {
         clear();
         clearTimeout(popTimer);
     }
-    var fire = function () {
+    var fire = async function () {
         cancel();
         if (this.menu.line) return;
         if (byMousedown) return;
@@ -297,7 +297,6 @@ function main(page, items, active, direction = 'y') {
                 a.menu = s;
                 return a;
             },
-            menus: items.map(i => i instanceof Item ? i : new Item(i)),
             hasIcon: hasIcon(),
             open: fire,
             cancel,
@@ -308,7 +307,7 @@ function main(page, items, active, direction = 'y') {
             var src = page.$src;
             var itemName = src.itemName;
             var className = `{'has-children':${itemName}.children&&${itemName}.children.length,
-            'warn':${itemName}.type==='danger'||${itemName}.type==='warn'||${itemName}.type==='red',
+            'warn':${itemName}.warn,
             actived:${itemName}.isActived()
         }`;
             var notHidden = `!${itemName}.hidden`;
@@ -335,6 +334,7 @@ function main(page, items, active, direction = 'y') {
         }
         else {
             page.innerHTML = menuList;
+            $scope.menus = items.map(i => i instanceof Item ? i : new Item(i));
             render(page, $scope);
             vbox(page);
         }

package/coms/zimoli/menuList.less

@@ -23,6 +23,11 @@
 
         &.warn {
             color: #c28;
+
+            &.focus {
+                color: #c28;
+                background: #c282;
+            }
         }
 
         &.focus {

package/coms/zimoli/move.js

@@ -152,30 +152,12 @@ var fixPosition = move.fixPosition = function (target) {
 };
 move.coordIn = coordIn;
 move.trimCoord = trimCoord;
-var resizingTargets = [];
-on('resize')(window, function () {
-    resizingTargets.forEach(fixPosition);
-});
-var off;
-var resizeTarget = function () {
-    var target = this;
-    var index = resizingTargets.indexOf(target);
-    if (index < 0) index = resizingTargets.push(target);
-    return index;
+var fixTarget = function () {
+    fixPosition(this);
 };
-var removeResize = function () {
-    removeFromList(resizingTargets, this);
-};
-
 move.bindPosition = function (target, position) {
-    if (position) {
+    oncemount(target, function () {
         setPosition(target, position);
-    }
-    var index = resizingTargets.indexOf(target);
-    if (index >= 0) return;
-    on("append")(target, resizeTarget);
-    on("remove")(target, removeResize);
-    if (isMounted(target)) {
-        resizeTarget.call(target);
-    }
+    });
+    on("resize")(target, fixTarget);
 }

package/coms/zimoli/oncemount.js

@@ -3,5 +3,5 @@ function oncemount(target, handle) {
         handle.call(target);
         return;
     }
-    once("append")(target, handle);
+    once("mounted")(target, handle);
 }

package/coms/zimoli/render.js

@@ -190,7 +190,6 @@ var createRepeat = function (search, id = 0) {
             var clone = element.cloneNode();
             clone.innerHTML = element.innerHTML;
             clone.renderid = id;
-            clone.$parentScopes = $parentScopes;
             clone.$scope = $scope;
             clone.$parentScopes = $parentScopes;
             clone.$struct = $struct;
@@ -202,7 +201,7 @@ var createRepeat = function (search, id = 0) {
             if (a.previousSibling !== last) appendChild.after(last, a);
             last = a;
         }, this);
-        cloned.forEach(a => render(a))
+        cloned.forEach(a => render(a));
         for (var k in clonedElements) {
             if (clonedElements1[k] !== clonedElements[k]) remove(clonedElements[k]);
         }
@@ -214,27 +213,40 @@ var createRepeat = function (search, id = 0) {
         once("append")(this, initialComment.bind(this, renders, "repeat", expression));
     }
 };
+var comment = function (elements) {
+    for (var cx = elements.length - 2; cx > 1; cx -= 2) {
+        var e = elements[cx];
+        if (e.previousSibling === this) var c = this;
+        else {
+            var c = document.createComment('else' + (cx < elements.length - 2 ? "if .." : ''));
+            e.parentNode.insertBefore(c, e);
+        }
+        elements.splice(cx, 0, c);
+        remove(e);
+    }
+};
+var initIf = function (ifs) {
+    for (var s of ifs) {
+        comment(s);
+        if (s.parent) {
+            initialComment.call(s[0], s.renders, "if", s.comment);
+        } else {
+            once("append")(s[0], initialComment.bind(s[0], s.renders, "if", s.comment));
+        }
+    }
+};
 var createIf = function (search, id = 0) {
     // 懒渲染
     var getter = createGetter(search).bind(this);
     var element = this;
-    var p = element;
-    if (p.parentNode) {
-        p = p.parentNode;
-        for (var cx = 0, dx = if_top.length; cx < dx; cx++) {
-            if (if_top[cx].parent === p) {
-                break;
-            }
-        }
-    }
-    cx++;
-    if (cx > 0) if_top.splice(cx, if_top.length - cx);
     var elements = [element, getter];
     if_top.push(elements);
     var savedValue;
-    var renders = [function () {
+    elements.parent = this.parentNode;
+    elements.comment = search[1];
+    elements.renders = [function () {
         var shouldMount = -1;
-        for (var cx = 0, dx = elements.length; cx < dx; cx += 2) {
+        for (var cx = 0, dx = elements.length; cx < dx; cx += 3) {
             var getter = elements[cx + 1];
             if (!getter || getter()) {
                 shouldMount = cx;
@@ -243,10 +255,10 @@ var createIf = function (search, id = 0) {
         }
         if (savedValue === shouldMount) return;
         savedValue = shouldMount;
-        for (var cx = 0, dx = elements.length; cx < dx; cx += 2) {
+        for (var cx = 0, dx = elements.length; cx < dx; cx += 3) {
             var element = elements[cx];
             if (cx === shouldMount) {
-                appendChild.before(this, element);
+                appendChild.after(cx > 0 ? elements[cx - 1] : this, element);
                 if (element.renderid < 0) {
                     element.renderid = id;
                     elements[cx] = render(element, this.$scope, this.$parentScopes);
@@ -258,12 +270,6 @@ var createIf = function (search, id = 0) {
         }
 
     }];
-    if (this.parentNode) {
-        elements.parent = this.parentNode;
-        initialComment.call(this, renders, "if", search[1]);
-    } else {
-        once("append")(this, initialComment.bind(this, renders, "if", search[1]));
-    }
 };
 var parseIfWithRepeat = function (ifExpression, repeatExpression) {
     var repeater = parseRepeat(repeatExpression);
@@ -357,15 +363,18 @@ var structures = {
         createIf.call(this, search);
     },
     "else"(search) {
-        var top = if_top[if_top.length - 1];
-        if (!top || top.parent !== this.parentNode) {
+        for (var cx = if_top.length - 1; cx >= 0; cx--) {
+            if (if_top[cx].parent === this.parentNode) break;
+        }
+        if (cx < 0) {
             throw new Error("else/elseif前缺少同级if！");
         }
+        initIf(if_top.splice(cx + 1, if_top.length - cx - 1));
+        var top = if_top[cx];
         if (search && search[1]) {
             var getter = createGetter(search).bind(this);
         }
         top.push(this, getter);
-        remove(this);
     },
     repeat(search) {
         createRepeat.call(this, search);
@@ -854,7 +863,7 @@ function render(element, scope, parentScopes, lazy = true) {
         renderlock = false;
         eagermount = false;
     }
-    if (if_top_length < if_top.length) if_top.splice(if_top_length, if_top.length - if_top_length);
+    if (if_top_length < if_top.length) initIf(if_top.splice(if_top_length, if_top.length - if_top_length));
     return e;
 }
 var digest = lazy(refresh, -{});