efront 3.6.0 → 3.7.5

package/apps/pivot/api.yml

@@ -4,3 +4,5 @@
   share: options ::share-:opt?:path
   folder: options ::file-:opt:::path?:to
   cluster: options ::cluster-:opt?:id
+  private-list: options ::private
+  private-edit: options ::private-:key?:value

package/apps/pivot/home/welcome.html

@@ -1,4 +1,3 @@
-
 <div>
     已登录到服务器，您可以进行如下操作
 </div>
@@ -7,6 +6,11 @@
         清理服务器缓存 <btn @click="run('clear-cache',this)">清理</btn>
     </padding>
 </block>
+<block>
+    <padding>
+        重启服务器 <btn @click="run('rehost',this)" type="danger">重启</btn>
+    </padding>
+</block>
 <block>
     <padding>
         退出登录 <btn @click="logout()">退出</btn>

package/apps/pivot/main.js

@@ -16,6 +16,9 @@ var layer = layer$glance({
     left: frame$left,
     top: frame$top
 });
+on("append")(layer, function () {
+    frame$route.open();
+});
 function main() {
     return layer;
 }

package/apps/pivot/menu.yml

@@ -3,4 +3,5 @@
 短链接: /home/short
 WEB文件管理: /wow/root
 长连接管理: /link/list
+密钥管理: /token/list
 # 用户列表: /user/list

package/apps/pivot/token/edit.js

@@ -0,0 +1,10 @@
+frame$edit.bind(null, "密钥", {
+    submit(a, fields) {
+        a = submit(fields, a);
+        return data.from("private-edit", {
+            key: encode62.timeencode(a.key),
+            value: encode62.timeencode(JSON.stringify(a)),
+        }).loading_promise;
+    },
+
+});

package/apps/pivot/token/list.js

@@ -0,0 +1,13 @@
+frame$list.bind(null, "密钥管理", {
+    load() {
+        return data.from("private-list", a => JSAM.parse(encode62.timedecode(a)));
+    },
+    remove(o) {
+        return data.from("private-edit", { key: encode62.timeencode(o.key), value: encode62.timeencode("") }).loading_promise;
+    },
+    fields: refilm`
+*键名/key 100
+显示名/name input/300
+密钥/value text/100
+备注/comment text/200
+`}, "/token/edit");

package/coms/basic/encodeUTF8.js

@@ -1,6 +1,6 @@
 var d = 0b10000000, s = 0b00111111;
 function numberUTF8(t, dist = []) {
-    if (t < 127) {//0b0xxxxxxx - 0b10xxxxxx
+    if (t < 128) {//0b0xxxxxxx - 0b10xxxxxx
         dist.push(0b00000000 | t)
     }
     else if (t < 2048) {// 0b110xxxxx 10xxxxxx

package/coms/basic/loader.js

@@ -521,39 +521,63 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
         return exec.apply(_this, args);
     });
 };
-var bindthen = function (callback) {
-    return function (data) {
-        if (Promise && data instanceof Promise) {
-            data.then(callback);
-        } else {
-            callback(data);
-        }
-    };
-};
-
 
 var init = function (name, then, prebuilds) {
-    then = bindthen(then);
+    // then = bindthen(then);
     var key = keyprefix + name;
     if (prebuilds) {
         if (name in prebuilds) {
-            return then(prebuilds[name]);
+            if (then) then(prebuilds[name]);
+            return prebuilds[name];
         }
     }
     if (hasOwnProperty.call(modules, name)) {
-        then(modules[name]);
-        return;
+        if (then) then(modules[name]);
+        return modules[name];
     }
     if (window[name] !== null && window[name] !== void 0 && !hasOwnProperty.call(forceRequest, name)) {
-        then(modules[name] = window[name]);
-        return;
+        modules[name] = window[name]
+        if (then) then(modules[name]);
+        return modules[name];
     }
+    var oks = [];
+    if (then) oks.push(then);
+    var ohs = [];
+    var res = {
+        oks,
+        ohs,
+        resolved: null,
+        errored: null,
+        then(ok, oh) {
+            if (ok) this.oks.push(ok);
+            if (oh) this.ohs.push(oh);
+            this.fire();
+        },
+        fire() {
+            if (this.resolved || this.errored) {
+                var oks = this.oks.splice(0, this.oks.length);
+                var ohs = this.ohs.splice(0, this.ohs.length);
+                if (this.resolved) for (var o of oks) o(this.resolved);
+                if (this.errored) for (var o of ohs) o(this.errored);
+            }
+        },
+    };
+    then = function (created) {
+        if (Promise && created instanceof Promise) return created.then(then, crack);
+        res.resolved = created;
+        res.fire();
+    };
+    var crack = function (error) {
+        res.errored = error;
+        res.fire();
+    };
     loadModule(name, function (error) {
         if (hasOwnProperty.call(modules, name)) {
             then(modules[name]);
             return;
         }
-        if (error) return;
+        if (error) return crack(error);
+
         var module = loadedModules[key];
         var args = module.args || [];
 
@@ -593,6 +617,7 @@ var init = function (name, then, prebuilds) {
 
         then(created);
     }, prebuilds);
+    return res;
 };
 var forceRequest = {};
 var removeGlobalProperty = function (property) {

package/coms/crypt/encode62.js

@@ -1,5 +1,7 @@
 "use strict";
 module.exports = encode62;
+var encodeUTF8 = require("../basic/encodeUTF8");
+var decodeUTF8 = require("../basic/decodeUTF8");
 var src = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
 var map = {};
 src.split("").forEach((s, i) => map[s] = i);
@@ -31,7 +33,8 @@ Object.assign(encode62, {
         var time_rest = string.slice(string.length - time_delta.toString(36).length, string.length);
         var time_start = parseInt((new Date() - parseInt(time_rest, 36)) / time_delta) * time_delta;
         var time_stamp = time_start + parseInt(time_rest, 36);
-        return this.decode62(string.slice(0, string.length - time_delta.toString(36).length), time_stamp.toString(36));
+        string = this.decode62(string.slice(0, string.length - time_delta.toString(36).length), time_stamp.toString(36)).replace(/\.\.?/g, a => a === '.' ? "%" : ".");
+        return decodeURIComponent(string);
     },
     timeencode(string) {
         var { time_delta } = this;
@@ -40,6 +43,7 @@ Object.assign(encode62, {
         var time_rest = time_stamp % time_delta;
         var time_rest_str = time_rest.toString(36);
         var time_delta_str = time_delta.toString(36);
+        string = encodeURIComponent(string).replace(/\./g, '..').replace(/%/g, '.');
         return this.encode62(string, time_stamp.toString(36)) + repeat("0", time_delta_str.length - time_rest_str.length) + time_rest_str;
     },
     timeupdate(string) {
@@ -67,6 +71,20 @@ Object.assign(encode62, {
         });
         return result;
     },
+    encodestr(data, sign) {
+        if (!sign) return data;
+        var result = encodeUTF8(data);
+        sign = Buffer.from(sign);
+        var delta = 0, c = 0;
+        for (var cx = 0, dx = data.length; cx < dx; cx++) {
+            if (result[cx] < 128) result[cx] = result[cx] ^ sign[cx % sign.length];
+            else if (result[cx] < 192) {
+                var c = c << 8 | sign[(delta += 6) / 8 | 0];
+                result[cx] = result[cx] ^ (c >> 8 - delta % 8 & 0x3f);
+            }
+        }
+        return decodeUTF8(result);
+    },
     decode(data, sign) {
         if (!sign) return data;
         var result = Buffer.from(data);
@@ -99,5 +117,6 @@ Object.assign(encode62, {
 encode62.ab2c = encode62.ba2d = encode62.huan;
 encode62.db2a = encode62.ca2b = encode62.yuan;
 encode62.da2b = encode62.cb2a = encode62.suan;
+encode62.decodestr = encode62.encodestr;
 encode62.encode = encode62.decode;
 encode62.decode62 = encode62.encode62;

package/coms/frame/edit.html

@@ -0,0 +1,10 @@
+<div head>
+    <span v-text="origin?'修改':'添加'"></span><span -text="title"></span>
+</div>
+<div body>
+    <field v-if="!f.readonly||!!data[f.key]" -repeat="f in fields" ng-src="[f,data]"></field>
+</div>
+<div foot>
+    <btn @click="remove()" class="white">取消</btn>
+    <button type="submit">保存</button>
+</div>

package/coms/frame/edit.js

@@ -0,0 +1,29 @@
+function main(title, { submit }, { data: origin, fields, }) {
+    var page = view();
+    var item = Object.assign({}, origin);
+    page.innerHTML = edit;
+    drag.on(page.firstChild, page);
+    resize.on(page);
+    page.onback = function () {
+        return false;
+    };
+    renderWithDefaults(page, {
+        fields,
+        title,
+        origin: item,
+        data: item,
+        remove() {
+            remove(page);
+        },
+    });
+    on('submit')(page, async function (e) {
+        e.preventDefault();
+        await submit(item, fields);
+        dispatch(this, 'submited');
+        remove(this);
+    });
+    on("append")(page, lazy(function () {
+        page.querySelector("input").focus();
+    }));
+    return page;
+}

package/coms/frame/edit.less

@@ -0,0 +1,3 @@
+&{
+    width: 600px;
+}

package/coms/frame/list.html

@@ -0,0 +1,4 @@
+<div>
+    <btn @click="add()">添加</btn>
+</div>
+<table -src="[fields,data]"></table>

package/coms/frame/list.js

@@ -0,0 +1,64 @@
+function main(title, { fields, load, remove }, edit_ref) {
+    prepare(edit_ref);
+    var page = document.createElement("div");
+    var edit = function (o) {
+        zimoli.prepare(edit_ref, function () {
+            var p = popup(edit_ref, { fields, data: o })
+            on("submited")(p, function () {
+                console.log("submited")
+                page.$scope.load();
+            })
+        })
+    };
+    page.innerHTML = template;
+    renderWithDefaults(page, {
+        title,
+        load() {
+            this.data = load();
+        },
+        fields: fields.concat({
+            name: "操作",
+            options: [
+                {
+                    name: "修改",
+                    do(o) {
+                        edit(o);
+                    },
+                },
+                {
+                    type: "danger",
+                    name(o) {
+                        return this.confirm === o ? "确认删除" : "删除";
+                    },
+                    type(o) {
+                        return this.confirm === o ? "dark" : "danger";
+                    },
+                    confirm: false,
+                    timer: 0,
+                    async do(o) {
+                        if (this.confirm !== o) {
+                            this.confirm = o;
+                            clearTimeout(this.timer);
+                            var that = this;
+                            this.timer = setTimeout(function () {
+                                that.confirm = null;
+                                render.refresh();
+                            }, 2000);
+                            return;
+                        }
+                        await remove(o);
+                        page.$scope.load();
+                    }
+                }
+            ]
+        }),
+        data: [],
+        add() {
+            edit();
+        },
+    });
+    on("append")(page, function () {
+        page.$scope.load();
+    });
+    return page;
+}

package/coms/frame/list.less

@@ -0,0 +1,23 @@
+btn {
+    padding: 0 16px;
+}
+
+& {
+    height: 100%;
+    overflow: auto;
+}
+
+table {
+
+    td {
+        >span {
+            white-space: normal;
+            word-break: break-all;
+            overflow: hidden;
+            display: -webkit-box;
+            -webkit-line-clamp: 2;
+            -webkit-box-orient: vertical;
+            text-overflow: ellipsis;
+        }
+    }
+}

package/coms/frame/main.less

@@ -1,4 +1,5 @@
 & {
     border-top-width: 0;
     width: 100%;
+    overflow: auto;
 }

package/coms/zimoli/LoadingArray.ts

@@ -8,4 +8,7 @@ class LoadingArray extends Array {
     is_readonly = null;
     loading = null;
     loading_promise = null;
+    then(ok, oh) {
+        if (this.loading_promise) this.loading_promise.then(ok, oh);
+    }
 }

package/coms/zimoli/data.js

@@ -434,8 +434,6 @@ var privates = {
         let url = api.url;
         var base = api.base;
         if (base) url = base + api.path;
-        console.log(url, base);
-
         if (this.validApi(api, params)) {
             params = this.repare(api, params);
             return this.loadIgnoreConfig(api.method, url, params, api);

package/coms/zimoli/encode62.js

@@ -23,8 +23,8 @@ var encode62 = {
         var time_rest = string.slice(string.length - time_delta.toString(36).length, string.length);
         var time_start = parseInt((new Date() - parseInt(time_rest, 36)) / time_delta) * time_delta;
         var time_stamp = time_start + parseInt(time_rest, 36);
-
-        return this.encode(string.slice(0, string.length - time_delta.toString(36).length), time_stamp.toString(36));
+        string = this.encode(string.slice(0, string.length - time_delta.toString(36).length), time_stamp.toString(36)).replace(/\.\.?/g, a => a === '.' ? "%" : ".");
+        return decodeURIComponent(string);
     },
     timeencode(string) {
         var { time_delta } = this;
@@ -33,6 +33,7 @@ var encode62 = {
         var time_rest = time_stamp % time_delta;
         var time_rest_str = time_rest.toString(36);
         var time_delta_str = time_delta.toString(36);
+        string = encodeURIComponent(string).replace(/\./g, '..').replace(/%/g, '.');
         return this.encode(string, time_stamp.toString(36)) + repeat("0", time_delta_str.length - time_rest_str.length) + time_rest_str;
     },
     timeupdate(string) {

package/coms/zimoli/render.js

@@ -90,7 +90,7 @@ var initialComment = function (renders, type, expression) {
 var parseRepeat = function (expression) {
     var reg =
         // /////////////////////////////////////////// i //       r       /////////////////////////  o  ///// a ///////////////////// t /////
-        /^(?:let\b|var\b|const\b)?\s*(?:[\(\{\[]\s*)?(.+?)((?:\s*,\s*.+?)*)?(?:\s*[\)\}\]]\s*|\s+)(in|of)\s+(.+?)(\s+?:track\s*by\s+(.+?))?$/i;
+        /^(?:let\b|var\b|const\b)?\s*(?:[\(\{\[]\s*)?(.+?)((?:\s*,\s*.+?)*)?(?:\s*[\)\}\]]\s*|\s+)(in|of)\s+(.+?)(?:\s+track\s*by\s+(.+?))?$/i;
     var res = reg.exec(expression);
     if (!res) return res;
     var [_, i, k, r, s, t] = res;
@@ -125,7 +125,7 @@ var createRepeat = function (search, id = 0) {
     var [context, expression] = search;
     var res = parseRepeat(expression);
     if (!res) throw new Error(`不能识别循环表达式: ${expression} `);
-    var { keyName, itemName, indexName, srcName } = res;
+    var { keyName, itemName, indexName, srcName, trackBy } = res;
     // 懒渲染
     var getter = createGetter([context, srcName]).bind(this);
     var element = this, clonedElements = [], savedValue, savedOrigin;
@@ -151,17 +151,26 @@ var createRepeat = function (search, id = 0) {
         var clonedElements1 = Object.create(null);
         var cloned = keys.map(function (key, cx) {
             var k = isArrayResult ? cx : key;
-            var c = changes[k];
-            if (clonedElements[k]) if (!c || !isObject(c.previous) && !isObject(c.current)) return clonedElements1[k] = clonedElements[k];
-            var clone = element.cloneNode();
-            clone.innerHTML = element.innerHTML;
-            clone.renderid = id;
-            clone.$parentScopes = $parentScopes;
             var $scope = {
                 [keyName || '$key']: k,
                 [itemName || '$item']: result[k],
                 [indexName || '$index']: cx
             };
+            if (trackBy) {
+                k = seek($scope, trackBy);
+                if (clonedElements[k]) {
+                    clonedElements[k].$scope = $scope;
+                    return clonedElements1[k] = clonedElements[k];
+                }
+            }
+            else {
+                var c = changes[k];
+                if (clonedElements[k]) if (!c || !isObject(c.previous) && !isObject(c.current)) return clonedElements1[k] = clonedElements[k];
+            }
+            var clone = element.cloneNode();
+            clone.innerHTML = element.innerHTML;
+            clone.renderid = id;
+            clone.$parentScopes = $parentScopes;
             clone.$scope = $scope;
             clone.$parentScopes = $parentScopes;
             clone.$struct = $struct;

package/coms/zimoli/table.html

@@ -1,6 +1,7 @@
 <thead>
     <tr>
-        <td -repeat="f in fields"><i -if="f.icon" -class="f.icon"></i></span><span -if="f.name" -html="f.name"></span>
+        <td -repeat="f in fields track by f.id" :style="{width:f.width}"><i -if="f.icon"
+                -class="f.icon"></i></span><span -if="f.name" -html="f.name"></span>
         </td>
     </tr>
 </thead>
@@ -8,7 +9,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" _type="o.type" -repeat="o in f.options">
+            <a on-click="o.do(d)" -if="f.options" _type="o.type instanceof Function?o.type(d):o.type"
+                -repeat="o in f.options">
                 <span -text="o.name instanceof Function?o.name(d):o.name"></span>
             </a>
         </td>

package/coms/zimoli/table.js

@@ -91,11 +91,11 @@ var adaptTarget = function (event) {
             }
             if (target) target = getFirstSingleColCell(this, target.colend);
             if (target) {
-                if (position.right >= getSelection(this).right - 7) {
+                if (position.right >= getScreenPosition(this).right - 7) {
                     target = this;
                     return;
                 }
-                css(this, { 'cursor': 'e-resize' });
+                css(document.body, { 'cursor': 'col-resize' });
                 result = {
                     target,
                     restX: event.clientX - target.offsetWidth
@@ -106,18 +106,66 @@ var adaptTarget = function (event) {
     }
     if (!result) {
         this.resizing = false;
-        css(this, { 'cursor': 'default' });
+        css(document.body, { 'cursor': '' });
     }
 };
 var tdElementReg = /^t[hd]$/i;
 var trElementReg = /^tr$/i;
+var id = 0;
+function enrichField(f) {
+    if (!f.id) f.id = ++id;
+    if (f.width) return;
+    var width;
+    if (f.size) {
+        width = f.size;
+        if (width < 40) width = width * 16;
+    }
+    else switch (f.type) {
+        case "text":
+            width = 30;
+            break;
+        case "input":
+            width = 200;
+            break;
+        case "date":
+            width = 180;
+        case "datetime":
+            width = 200;
+            break;
+        case "time":
+            width = 120;
+            break;
+        default:
+            if (f.options) {
+                width = f.options.map(o => o.name instanceof Function ? o.name() : o.name).join(" ").length * 20;
+            } else {
+                width = String(f.name || f.key).length * 16;
+            }
+    }
+    if (width > 600) width = 600;
+    f.width = width + 60;
+}
+
 
 function table(elem) {
     var tableElement = isElement(elem) ? elem : document.createElement("table");
     var activeCols = [];
-    onmousemove(tableElement, adaptTarget);
+    var adaptCursor = adaptTarget.bind(tableElement);
+    var off;
+    tableElement.init = function () {
+        off = on("mousemove")(window, adaptCursor);
+    };
+    tableElement.dispose = tableElement.destroy = function () {
+        off();
+    };
+    on("append")(tableElement, tableElement.init);
+    on("remove")(tableElement, tableElement.destroy);
+    if (isMounted(tableElement)) tableElement.init();
+
     moveupon(tableElement, {
-        start() { },
+        start(event) {
+            if (this.resizing) event.preventDefault();
+        },
         move: resizeTarget,
     });
     onmousemove(tableElement, function (event) {
@@ -142,7 +190,7 @@ function table(elem) {
             removeClass(td, "y-ing");
         });
     });
-    var table = tableElement.hasAttribute("ng-src") || tableElement.hasAttribute("src") ? list(tableElement) : tableElement;
+    var table = tableElement;
     var thead;
     var cellMatchManager = function (element) {
         if (!thead) [thead] = table.getElementsByTagName("thead");
@@ -162,10 +210,14 @@ function table(elem) {
     care(table, function ([fields, data]) {
         thead = null;
         this.innerHTML = template;
+        fields.forEach(enrichField);
         render(this, {
             fields,
             tbody: list,
             data,
+            setWidth(target, f) {
+                css(target, { width: f.width });
+            },
             a: button,
         }, this.$parentScopes.concat(this.$scope));
     })

package/coms/zimoli/table.less

@@ -1,4 +1,5 @@
 &[dragchildren] {
+
     >thead,
     >tbody,
     & {
@@ -74,8 +75,9 @@ table,
     line-height: 32px;
     height: 100%;
     min-height: 30px;
-
+    user-select: auto;
     display: table-row-group;
+    overflow: auto;
 
     >tr {
 

package/coms/zimoli/textarea.less

@@ -16,6 +16,5 @@
 model>& {
     width: 100% !important;
     display: block;
-    margin: 10px 0;
     height: 120px;
 }

package/coms/zimoli/zimoli.js

@@ -249,11 +249,33 @@ function prepare(pgpath, ok) {
         return _with_elements;
     };
     state.path = function (url) {
-        if (isString(url) && /^[^\\\/]/.test(url)) {
+        if (/^\.+\//.test(url)) {
             url = pgpath.replace(/[^\/]*$/, url);
         }
+        if (isString(url) && /[\\\/\.]/.test(url)) {
+            url = url.replace(/^\.[\\\/]/, '');
+            var ps = url.split(/[\\\/]/);
+            var ds = [];
+            for (var p of ps) {
+                if (p === "..") {
+                    ds.pop();
+                }
+                else if (p !== ".") {
+                    ds.push(p);
+                }
+            }
+            url = "/" + ds.join('/').replace(/^\//, '');
+        }
         return url;
-    }
+    };
+    state.popup = function (a) {
+        a = state.path(a);
+        return popup.apply(this, [a].concat([].slice.call(arguments, 1)));
+    };
+    state.init = function (a) {
+        a = state.path(a);
+        return init.apply(this, [a].concat([].slice.call(arguments, 1)));
+    };
     state.go = function (url, args, _history_name) {
         // if (arguments.length === 1 && isFinite(url)) return window_history.go(url | 0);
         var to = function (_url, args, _history_name) {

package/package.json

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