efront 4.17.0 → 4.18.3

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -1,3 +1,33 @@
+- zh-CN: $1已存在
+  en:    $1 already exists
+
+- zh-CN: $1不存在
+  en:    $1 does not exist
+
+- zh-CN: 数据不为空
+  en:    The data is not empty
+
+- zh-CN: 您没有权限访问此内容
+  en:    You do not have permission to access this content
+
+- zh-CN: 不存在名为$1的$2
+  en:    There is no $2 named $1
+
+- zh-CN: 请设置用户密码
+  en:    Please set a user password
+
+- zh-CN: 已存在名为$1的$2
+  en:    There already exists a $2 named $1
+
+- zh-CN: 文件夹名
+  en:    Folder Name
+
+- zh-CN: 请输入名称
+  en:    Please enter a name
+
+- zh-CN: 输入名称以确认删除
+  en:    Enter name to confirm deletion
+
 - zh-CN: 目标文件存在外部引用项$1
   en:    The target file has an external reference item of $1
 

package/apps/kugou/home.less

@@ -94,22 +94,8 @@
     font-size: 16px;
     width: auto;
     background: inherit;
-    margin-bottom: -60px;
 }
 
-.player+body>& {
-    >* {
-
-        >.vbox,
-        :not(.vbox)>.vbox {
-            padding-bottom: 60px;
-        }
-    }
-
-    transition: padding-bottom .2s ease-out;
-}
-
-
 .search-box {
     display: block;
     position: absolute;

package/apps/pivot/api.yml

@@ -13,6 +13,13 @@
   invoke: options ::invoke-:key?:params
   version: options ::version
   uptime: options ::uptime
+  status: options ::status
+  dball: get /
+  dbget: get /:id/
+  daadd: put /:dbid/
+  dbfind: get /:dbid/:last,:size
+  dbadd: put /:id
+  dbdel: delete /:id
   count: options ::count
   bootlog: options ::similar
   link: options ::link

package/apps/pivot/db/config.xht

@@ -0,0 +1,37 @@
+<style>
+    & {
+        width: 100%;
+        height: 100%;
+        display: block;
+        position: relative;
+        padding-right: 0!important;
+        overflow: hidden;
+    }
+
+    .design {
+        list {
+            height: 100%;
+        }
+
+        list,
+        .options {
+
+            width: 600px;
+            margin: 0 auto;
+        }
+    }
+</style>
+
+<div head>
+    <span -bind="db.name"></span>
+</div>
+<div body>
+    <div>权限</div>
+    <div>是否公开<swap -model="db.open"></swap></div>
+</div>
+<div foot>
+    <button>保存</button>
+</div>
+<script>
+    var [db] = arguments;
+</script>

package/apps/pivot/db/edit.xht

@@ -0,0 +1,47 @@
+<div>
+    编辑数据 - <span -bind="db.name"></span>
+    <a @click="add">添加</a>
+</div>
+
+<div>
+    <lattice -src="m in items">
+        <div -bind="m.id"></div>
+        <div -bind="m.name"></div>
+    </lattice>
+</div>
+<script>
+    var [db] = arguments;
+    var a = button;
+    var add = function () {
+        var elem = document.createElement('jsoncode');
+        elem.type = 'json';
+        elem.contentEditable = true;
+        return prompt(茨菰$编辑框(elem), '输入JSON格式的数据', function (text) {
+            try {
+                JSON.parse(text);
+                return true;
+            } catch (e) {
+                console.log(text, e)
+                return false;
+            }
+        }, {
+            wrap: true,
+            async submit(text) {
+                var d = JSON.parse(text);
+                if (db.id === '用户') {
+                    if (!d.id && !d.password) {
+                        return alert("缺少密码！");
+                    }
+                    if (d.password) {
+                        delete d.password;
+                        d.a = encode62.geta(d.password);
+                    }
+                }
+                data.from('daadd', { dbid: db.id, ...d })
+            }
+        });
+    };
+    var items = await data.from('dbfind', { dbid: db.id, size: 20 });
+
+    console.log(arguments)
+</script>

package/apps/pivot/db/list.xht

@@ -0,0 +1,63 @@
+<style>
+    & {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        padding: 0;
+    }
+
+    [db] {
+        display: block;
+        border: 1px solid #000;
+        padding: 10px 6px;
+
+        h2 {
+            display: inline-block;
+            padding: 2px 6px;
+            font-size: 40px;
+            margin: 0;
+            color: #333;
+        }
+
+        a {
+            margin-right: 6px;
+        }
+    }
+</style>
+<lattice body a-src="db in dbs">
+    <div insert><a @click="adddb">添加</a></div>
+    <padding db>
+        <div>
+            <h2> ⩸ </h2>
+            <h2 -bind="db.name"></h2>
+            <a @click="go('/db/edit',db)">查看</a>
+            <a @click="go('/db/config',db)">配置</a>
+            <drop @click.singly.stop="deldb(db)"></drop>
+        </div>
+    </padding>
+</lattice>
+<script>
+    var dbs = [];
+    var a = button;
+    var load = async function name(params) {
+        dbs = await data.from("dball");
+    };
+    load();
+    var adddb = async function () {
+        var a = await prompt(i18n`请输入名称`, {
+            async submit(a) {
+                await data.from('dbadd', { id: a, name: a });
+            }
+        });
+        await load();
+    };
+    var deldb = async function (db) {
+        var a = await prompt(i18n`输入名称以确认删除`, ["删除#danger", '取消'], a => a === db.name, {
+            async submit(v) {
+                await data.from('dbdel', { id: v });
+            }
+        });
+        await load();
+    };
+
+</script>

package/apps/pivot/home/welcome.html

@@ -25,4 +25,12 @@
     <padding>
         启动时间&nbsp;&nbsp;<span -text="filterTime(hrtime)"></span>
     </padding>
+</block>
+<block>
+    <padding>
+        内存 <progbar danger:="memery[0]/memery[1]<.05" :current="memeryUsed" :total="memery[1]"></progbar>
+        <span style="color: #999;">
+            可用<span -bind="size(memery[0])"></span> / 总内存<span -bind="size(memery[1])"></span>
+        </span>
+    </padding>
 </block>

package/apps/pivot/home/welcome.js

@@ -1,11 +1,15 @@
 function main() {
     var page = div();
     page.innerHTML = template;
-    renderWithDefaults(page, {
+    var scope = {
         status: [],
         version: data.from("version"),
         hrtime: data.from("uptime", a => new Date - a * 1000),
         filterTime,
+        memeryUsed: 0,
+        memery: [0, 1],
+        size,
+        progbar,
         async run(id) {
             await new Promise(ok => setTimeout(ok, 2000));
             var info = await data.from("run", {
@@ -19,6 +23,13 @@ function main() {
             zimoli.switch();
             zimoli();
         }
+    };
+    renderWithDefaults(page, scope);
+    data.from("status").then(a => {
+        var [mr, mt] = a.memery;
+        scope.memeryUsed = mt - mr;
+        scope.memery = a.memery;
+        console.log('status')
     });
     return page;
 }

package/apps/pivot/home/welcome.less

@@ -1,6 +1,9 @@
 &{
     line-height: 28px;
 }
+progbar{
+    width: 120px;
+}
 btn{
     padding: 0 16px;
     vertical-align: top;

package/apps/pivot/main.js

@@ -73,9 +73,6 @@ var layer = layer$glance({
     }),
     top: frame$top
 });
-on("append")(layer, function () {
-    frame$route.open();
-});
 on("dragover")(document, function (event) {
     event.preventDefault();
 });

package/apps/pivot/wow/root.js

@@ -27,13 +27,14 @@ async function upload(f, dist, token) {
         /**
          * @type {XMLHttpRequest}
          */
-        var xhr = cross(api.method, dist + f.name, { authorization });
-        var p = { percent: 0, pending: true, name: f.name, folder: dist, abort: xhr.abort.bind(xhr) };
+        var p = { percent: 0, pending: true, name: f.name, folder: dist };
         dist = dist.replace(/^\/+|\/+$/g, '');
         if (dist) p.url = api.base + dist + "/" + f.name;
         else p.url = api.base + f.name;
         this.data.push(p);
         pending.push(p);
+        var xhr = cross(api.method, p.url, { authorization });
+        p.abort = xhr.abort.bind(xhr);
         xhr.upload.onprogress = function ({ loaded, total }) {
             p.percent = loaded / total;
             render.refresh();
@@ -45,7 +46,6 @@ async function upload(f, dist, token) {
             removeFromList(pending, p);
         });
         await xhr;
-        removeFromList(this.data, p);
         removeFromList(pending, p);
     }
     return xhr;
@@ -74,9 +74,7 @@ class File {
     }
 }
 function main(path) {
-    var loaded = false;
     var page = explorer$main();
-
     extend(page.$scope, {
         pathlist: path ? path.split('/') : [],
         read(from, start, size) {
@@ -87,14 +85,13 @@ function main(path) {
             xhr.send();
             return xhr;
         },
-        load(p) {
-            if (loaded) {
-                location.href = "#/wow/root" + p;
+        load(p, force) {
+            if (!force) {
+                location.href = "#/wow/root" + p;;
                 return { then() { } };
             }
-            loaded = true;
             var base = data.getInstance("base").base;
-            var p = p.replace(/^\/+|\/+$/g, '');
+            var p = this.pathlist.join('/').replace(/^\/+|\/+$/g, '');
             var bp = p ? base + p + "/" : base;
             p = p + '/';
             return data.from("folder", { opt: 'list', path: encode62.timeencode(p) }, files => {

package/coms/basic/color.js

@@ -500,6 +500,7 @@ extend(color, {
 	angle,
 	parse,
 	equal,
+	format,
 	stringify,
 	pair(c, alpha) {
 		return doWith(gray4, c, alpha);

package/coms/basic/data.js

@@ -61,7 +61,9 @@ const formulaters = {
             data = data.map(function (item) {
                 if (typeof item === 'string') {
                     const res = {};
-                    item.split(/(?:\s+|,)/).map((value, cx) => res[keys[cx]] = value);
+                    if (/\s/.test(item)) item = item.split(/\s+/);
+                    else item = item.split(',');
+                    item.forEach((value, cx) => res[keys[cx]] = value);
                     return res;
                 }
                 return item;
@@ -385,7 +387,7 @@ function fixApi(api, href) {
     };
     api.transpile = getTranspile(api.url);
     api.url = api.url.replace(/#[\s\S]*$/, '');
-    if (!reg.test(api.url)) {
+    if (!/^\w+?\:\/\//i.test(api.url)) {
         if (href) {
             var paramReg = /(?:\?([\s\S]*?))?(?:#([\s\S]*))?$/, extraSearch, extraHash, search, hash;
             if (/[\?#]/.test(href)) {
@@ -416,7 +418,7 @@ function fixApi(api, href) {
     }
     api.method = api.method.replace(/^\w+/, a => a.toLowerCase());
 }
-const reg = /^(https?\:\/\/|\.?\/)/i;
+const reg = /^(\w+\:\/\/|\.?\/)/i;
 var ApiMap = function () { };
 ApiMap.prototype = Object.create(null);
 function createApiMap(data) {
@@ -457,7 +459,7 @@ function createApiMap(data) {
             _headers = undefined;
         }
         if (!base) continue;
-        href = /(https?\:)?|\.?\//i.test(base) ? base : '';
+        href = reg.test(base) ? base : '';
         var item1 = items1[key];
         var items = Object.keys(item1).map(buildItem);
         formulaters.string('id method url name comment', items).map(parseConfig).map(checkApi);

package/coms/basic/refilm_decode.js

@@ -241,11 +241,6 @@ var getComment = function (piece) {
 function spreadkey(name) {
     if (/^\([\s\S]*\)$/.test(name) && /,/.test(name)) {
         var [, name, rest_piece] = /^([\s\S]*?),([^\]]*)$/.exec(name.slice(1, name.length - 1));
-        if (rest_piece && !/=/.test(rest_piece)) {
-            var needs = { [name]: parseValue(rest_piece) };
-        } else {
-            var needs = scanNeeds(rest_piece);
-        }
     }
     if (/^\[[\s\S]*\]$/.test(name)) {
         repeat = true;
@@ -258,6 +253,13 @@ function spreadkey(name) {
         }
     }
     var [name, key, holder] = scanSlant(name, '/', 0, name.length + 1);
+    if (rest_piece) {
+        if (rest_piece && !/=/.test(rest_piece)) {
+            var needs = { [key || name]: parseValue(rest_piece) };
+        } else {
+            var needs = scanNeeds(rest_piece);
+        }
+    }
     return [name, key, needs, holder];
 }
 function parse(piece) {
@@ -290,6 +292,7 @@ function parse(piece) {
             size, unit, ratio,
             holder,
             do: action,
+            editable,
             needs, checks, repeat, endwith,
             required, inlist, hidden, readonly,
             delete_onempty, delete_onsubmit,
@@ -410,7 +413,11 @@ function parse(piece) {
             type = type.slice(1);
         }
         if (typeof options === "string" && !/^[\$#]+\d+$/.test(options)) {
-            options = is(options);
+            var editable = false;
+            if (/^[\+\-\*]|[\+\-\*]$/.test(options)) {
+                editable = true;
+                options = options.replace(/^[\+\-\*]|[\+\*\-]$/g, '');
+            }
             var needUnfold = /^\[|\]$/.test(options);
             options = options.replace(/^\[|\]$/g, '');
             if (needUnfold || /,/.test(options)) options = scanSlant(options, ',');
@@ -427,6 +434,7 @@ function parse(piece) {
     if (unit === type) unit = '';
     var field = {
         name, type, key, value, comment, options,
+        editable,
         size, unit, ratio, holder,
         needs, checks, repeat, endwith,
         required, inlist, hidden, readonly,

package/coms/basic/submit_.js

@@ -1,13 +1,20 @@
-function submit(fields, data) {
+var trimname = function (a) {
+    return a.name.replace(/^请?(输入|选择|填写)/, '')
+};
+function submit_() {
     var params = {};
     var inputs = [];
     var select = [];
     var checks = [];
     var id = 0;
-    var trimname = function (a) {
-        return a.name.replace(/^请?(输入|选择|填写)/, '')
-    };
-    for (var f of fields) {
+    var data = Object.create(null);
+    var fieldsList = [];
+    for (var arg of arguments) {
+        if (Array.isArray(arg)) fieldsList.push(arg);
+        else Object.assign(data, arg);
+    }
+    for (var fields of fieldsList) for (var f of fields) {
+        if (!check(data, field.needs)) continue;
         var error = valid(f, data);
         if (error === "empty") {
             if (f.options instanceof Array || /date|time|range|switch|swap|radio/i.test(f.type)) {

package/coms/compile/Program.js

@@ -867,7 +867,7 @@ class Program {
                     }
                     else if (last.type === STRAP) {
                         if (last.isend);
-                        else scope.isObject = last.transive;
+                        else scope.isObject = last.transive || last.text === 'default';
                     }
                     scope.brace = true;
                     scope.isExpress = queue.inExpress;

package/coms/compile/downLevel.js

@@ -1391,21 +1391,22 @@ var killarg = function (head, body, _getname, setarg = true) {
 var revar = function (body) {
     for (var i = 0; i < body.length; i++) {
         var o = body[i];
+
         if (o.type === STRAP) {
             if (/^(const|let|var)$/.test(o.text)) {
                 var q = body;
                 if (!q) return;
                 splice(q, i, 1)
                 o = o.next;
-                var s = i, v = o;
+                var s = i, n = o;
                 if (o) do {
-                    var n = snapExpressFoot(o).next;
+                    n = snapExpressFoot(n).next;
                     if (n && n.type === STRAP && /^(in|of)$/.test(n.text)) break;
                     if (n && n.text === '=') {
                         n = skipAssignment(n);
                     }
                     else {
-                        i = q.indexOf(o, i);
+                        i = q.indexOf(n, i);
                         var j = n ? q.indexOf(n, i) + 1 : q.length;
                         splice(q, i, j - i);
                     }

package/coms/docs/markdown.js

@@ -17,6 +17,10 @@ var h = function (text) {
     var level = text.length - t2.length;
     return new Element('h' + level, t2);
 };
+var block = function (text) {
+    text = text.replace(/^>\s*/, '');
+    if (text.length) return new Element("blockquote", text);
+};
 var p = function (text) {
     if (text.length) return new Element("p", text);
 };
@@ -82,6 +86,7 @@ function richtext(line) {
     });
     var a;
     if (/^#/.test(line)) content.push(h(line));
+    else if (/^>/.test(line)) content.push(block(line));
     else if (/^\*\s+/.test(line)) ul(line, tagIndent);
     else if (/^\d+\.\s+/.test(line)) ol(line, tagIndent);
     else if (/^\|/.test(line)) tr(line);

package/coms/explorer/Explorer.js

@@ -17,12 +17,13 @@ e.open = async function (p) {
         if (!p.isfolder) return;
         this.pathlist.push(p.name);
     }
+    var forceRefresh = p == null;
     p = "/" + this.pathlist.join("/").replace(/^\/+|\/+$/g, '');
     var cutedMap = Object.create(null);
     var selected = Object.create(null);
     for (var s of this.selected) selected[s.url] = true;
     for (var s of this.copyed) cutedMap[s.url] = s.cut;
-    var files = await this.load(p);
+    var files = await this.load(p, forceRefresh);
     for (var f of files) {
         if (cutedMap[f.url]) f.cut = true;
         if (selected[f.url]) f.selected = true;

package/coms/explorer/context.js

@@ -43,6 +43,8 @@ var popupEdit = function ($scope, active) {
         add: $scope.add,
         name: active ? active.name : '',
     };
+    if (active) params.isfolder = active.isfolder;
+    else params.isfolder = true;
 
     zimoli.prepare('explorer$edit', function () {
         var p = popup("#explorer$edit", params);

package/coms/explorer/edit.html

@@ -1,5 +1,6 @@
 <div head>
-    <span v-text="origin?${i18n`修改`}:${i18n`添加`}"></span>${i18n`文件夹`}
+    <span v-text="origin?'${i18n`修改`}':'${i18n`添加`}'"></span>
+    <span>${hasOrigin?isFolder?i18n`文件夹名`:i18n`文件名`:i18n`文件夹`}</span>
 </div>
 <div body>
     <field v-if="!f.readonly||!!data[f.key]" -repeat="f in fields" ng-src="[f,data]"></field>

package/coms/explorer/edit.js

@@ -1,6 +1,7 @@
+var isFolder = false;
+var hasOrigin = false;
 
-
-function main({ path: root, rename, add, name, hasName }) {
+function main({ path: root, rename, isfolder, add, name, hasName }) {
     var fields = refilm`
     &原始名称/origin read
     输入新名称/name input
@@ -11,16 +12,17 @@ function main({ path: root, rename, add, name, hasName }) {
         if (hasName(name)) return "命名冲突";
         return explorer$filetip(name);
     };
+    var origin = name.replace(/\/$/, '');
     var a = view();
+    isFolder = isfolder;
+    hasOrigin = !!origin;
     a.innerHTML = edit;
     drag.on(a.firstChild, a);
-    var origin = name.replace(/\/$/, '');
     renderWithDefaults(a, {
         fields,
         pathlist: root,
         origin,
         page: a,
-        isFolder: /\/$/.test(name),
         data: { name: origin, origin },
         remove() {
             remove(a);

package/coms/frame/route.js

@@ -190,8 +190,8 @@
     });
     result.open = function (menu) {
         if (!menu) {
-            menu = result.active || result[0];
-            delete result.active;
+            if (result.active) return;
+            menu = result[0];
         }
         if (!menu.path) {
             menu.closed = !menu.closed;
@@ -228,7 +228,7 @@
         }
     };
     result.reload = function () {
-        result.load(result.active);
+        zimoli();
         return result;
     };
     result.from = result.fetch = function (url) {

package/coms/kugou/parseSongsList.js

@@ -1,5 +1,5 @@
 var singerPhotosMap = Object.create(null);
-data.from("singer/list.jsp", function (a) {
+await data.from("singer/list.jsp", function (a) {
     a.forEach(a => {
         var b = a.replace(/\.\w+$/, '');
         singerPhotosMap[b] = a;

package/coms/reptile/readRequestAsJson.js

@@ -0,0 +1,26 @@
+function readRequestAsJson(req, limit = 6000000) {
+    var total = 0;
+    var data = [];
+    return new Promise(function (ok, oh) {
+        req.on('data', function (buff) {
+            if (total > limit) return;
+            total += buff.length;
+            if (total > limit) {
+                oh(`数据量过大`);
+                return;
+            }
+            data.push(buff);
+        });
+        req.once('error', oh);
+        req.on('end', function () {
+            if (total > limit) return;
+            try {
+                var str = Buffer.concat(data).toString();
+                ok(JSON.parse(str));
+            }
+            catch (e) {
+                oh(e);
+            }
+        });
+    })
+}