efront 3.7.6 → 3.7.7

package/apps/pivot/api.yml

@@ -4,5 +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
+  list: options :::type
+  edit: options :::type-:key?:value

package/apps/pivot/menu.yml

@@ -1,7 +1,11 @@
 首页: /home/welcome
-共享目录管理: /share/list
-短链接: /home/short
-WEB文件管理: /wow/root
-长连接管理: /link/list
-密钥管理: /token/list
+WEB:
+  共享目录: /share/list
+  短链接: /home/short
+  文件管理: /wow/root
+  长连接管理: /link/list
+任务:
+  密钥管理: /token/list
+  任务建立: /task/list
+  定期执行: /tick/list
 # 用户列表: /user/list

package/apps/pivot/task/edit.js

@@ -0,0 +1 @@
+pedit.bind(null, "任务", "task");

package/apps/pivot/task/list.js

@@ -0,0 +1,6 @@
+plist.bind(null, '任务管理', "task", refilm`
+*任务ID/key 100
+*任务名/name 100
+*启用/status swap [关闭,开启]
+任务代码/code text
+`, '/task/edit');

package/apps/pivot/tick/list.js

@@ -0,0 +1,5 @@
+function main() {
+    var a = div();
+    a.innerHTML = "定时任务管理，敬请期待";
+    return a;
+}

package/apps/pivot/token/edit.js

@@ -1,10 +1 @@
-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;
-    },
-
-});
+pedit.bind(null, "密钥", "private");

package/apps/pivot/token/list.js

@@ -1,13 +1,6 @@
-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`
+plist.bind(null, '密钥管理', "private", refilm`
 *键名/key 100
 显示名/name input/300
 密钥/value text/100
 备注/comment text/200
-`}, "/token/edit");
+`, "/token/edit");

package/coms/crypt/encode62.js

@@ -79,7 +79,7 @@ Object.assign(encode62, {
         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];
+                var c = c << 8 | sign[(delta += 6) / 8 % sign.length | 0];
                 result[cx] = result[cx] ^ (c >> 8 - delta % 8 & 0x3f);
             }
         }

package/coms/frame/list.js

@@ -1,4 +1,4 @@
-function main(title, { fields, load, remove }, edit_ref) {
+function main(title, { fields, options: options0, load, remove }, edit_ref) {
     prepare(edit_ref);
     var page = document.createElement("div");
     var edit = function (o) {
@@ -11,6 +11,40 @@ function main(title, { fields, load, remove }, edit_ref) {
         })
     };
     page.innerHTML = template;
+    var 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();
+            }
+        }
+    ];
+    if (options0) options = options.concat(options0);
     renderWithDefaults(page, {
         title,
         load() {
@@ -18,39 +52,7 @@ function main(title, { fields, load, remove }, edit_ref) {
         },
         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();
-                    }
-                }
-            ]
+            options
         }),
         data: [],
         add() {

package/coms/frame/list.less

@@ -10,7 +10,9 @@ btn {
 table {
 
     td {
-        >span {
+
+        >span,
+        >model {
             white-space: normal;
             word-break: break-all;
             overflow: hidden;

package/coms/pivot/pedit.js

@@ -0,0 +1,13 @@
+function main(title, type, params) {
+    return frame$edit(title, {
+        submit(a, fields) {
+            a = submit(fields, a);
+            return data.from("edit", {
+                type,
+                key: encode62.timeencode(a.key),
+                value: encode62.timeencode(JSON.stringify(a)),
+            }).loading_promise;
+        },
+
+    }, params);
+}

package/coms/pivot/plist.js

@@ -0,0 +1,13 @@
+
+function main(title, type, fields, edit_ref, options) {
+    return frame$list(title, {
+        load() {
+            return data.from("list", { type }, a => JSAM.parse(encode62.timedecode(a)));
+        },
+        remove(o) {
+            return data.from("edit", { type, key: encode62.timeencode(o.key), value: encode62.timeencode("") }).loading_promise;
+        },
+        fields,
+        options,
+    }, edit_ref);
+}

package/coms/zimoli/model.js

@@ -37,6 +37,17 @@ var renderModel = function (field, data) {
 var constructors = {
     input,
     raw: input,
+    swap(e) {
+        var { field } = e;
+        e = swap(e);
+        if (field.options) {
+            e.getValue = function () {
+                return field.options[+this.checked].value;
+            };
+        }
+        return e;
+    },
+    switch: swap,
     row: textarea,
     password,
     text: textarea,
@@ -134,8 +145,18 @@ var readonly_types = {
     "size"({ field }, data) {
         var f = data[field.key];
         return size(f);
-    }
+    },
+    swap(e, data) {
+        var { field } = e;
+        var v = data[field.key];
+        if (field.options) {
+            var o = field.options[v];
+            if (o) return o.name;
+        }
+        return v;
+    },
 };
+readonly_types.select = readonly_types.swap;
 function main(elem) {
     var build = function () {
         var { data, readonly, field } = elem;
@@ -222,7 +243,6 @@ function main(elem) {
         }
     };
     on("changes")(elem, function ({ changes }) {
-
         if (changes.data || changes.field || changes.readonly) {
             build();
         }

package/coms/zimoli/render.js

@@ -565,7 +565,8 @@ function getFromScopes(key, scope, parentScopes) {
     if (key in scope) {
         return scope[key];
     }
-    if (parentScopes) for (var o of parentScopes) {
+    if (parentScopes) for (var cx = parentScopes.length - 1; cx >= 0; cx--) {
+        var o = parentScopes[cx];
         if (key in o) {
             return o[key];
         }

package/coms/zimoli/swap.less

@@ -30,7 +30,7 @@
     -o-appearance: none;
     appearance: none;
     &:before {
-        background-color: #26f;
+        background-color: #28c;
         transition: all .1s ease-out;
         left: 50%;
         top: 50%;

package/coms/zimoli/table.html

@@ -8,8 +8,8 @@
 <tbody -src="d in data">
     <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 instanceof Function?o.type(d):o.type"
+            <model -if="f.key" :field=f :data=d readonly ></model>
+            <a on-click="o.do(d)" -if="!f.key&&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>

package/coms/zimoli/table.js

@@ -215,6 +215,7 @@ function table(elem) {
             fields,
             tbody: list,
             data,
+            model,
             setWidth(target, f) {
                 css(target, { width: f.width });
             },

package/package.json

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