efront 3.13.1 → 3.13.2

package/apps/pivot/api.yml

@@ -11,3 +11,4 @@
   version: options ::version
   uptime: options ::uptime
   count: options ::count
+  bootlog: options ::similar

package/apps/pivot/log/boot.html

@@ -0,0 +1,2 @@
+<table -src="[fields,items]">
+</talbe>

package/apps/pivot/log/boot.js

@@ -0,0 +1,24 @@
+var fields = refilm`
+地址/ip
+端口/port
+版本/version
+进程/pid
+时间/time date
+`;
+function main() {
+    var page = div();
+    page.innerHTML = template;
+    var items = data.from("bootlog", item => {
+        item.forEach(a => {
+            var [v, p] = a.ppid.split("/");
+            a.version = v;
+            a.pid = p;
+        })
+        return item;
+    });
+    renderWithDefaults(page, {
+        items,
+        fields
+    });
+    return page;
+}

package/apps/pivot/log/boot.less

@@ -0,0 +1,3 @@
+& {
+    height: 100%;
+}

package/apps/pivot/log/count.html

@@ -1 +1,5 @@
-<table -src="[fields,items]"></talbe>
+<div class="searchbox">
+    <input @input="filter" -model="searchText" />
+</div>
+<table -src="[fields,items]">
+</talbe>

package/apps/pivot/log/count.js

@@ -1,14 +1,21 @@
 var fields = refilm`
-路径/path
+路径/path html
 访问量/count
 `;
 function main() {
     var page = div();
     page.innerHTML = template;
+    var items = data.from("count", a => {
+        return Object.keys(a).map(b => ({ path: b, count: a[b] }));
+    });
     renderWithDefaults(page, {
-        items: data.from("count", a => {
-            return Object.keys(a).map(b => ({ path: b, count: a[b] }));
-        }),
+        items,
+        searchText: "",
+        filter() {
+            var text = this.searchText;
+            if (!text) return this.items = items;
+            this.items = search(text, items, 'path');
+        },
         fields
     });
     return page;

package/apps/pivot/log/count.less

@@ -3,6 +3,14 @@
 
 }
 
+.searchbox {
+    position: absolute;
+    top: 0;
+    right: 0;
+    z-index: 2;
+    padding: 8px 16px;
 
-tbody {
-}
+    >input {
+        background: #eee;
+    }
+}

package/apps/pivot/menu.yml

@@ -8,6 +8,10 @@ WEB:
   密钥管理: /token/list
   任务建立: /task/list
   定期执行: /tick/list
-# 用户列表: /user/list
+用户:
+  账号列表: /user/list
+  标签管理: /user/tag/list
 服务器日志:
-  访问计数: /log/count
+  访问计数: /log/count
+  启动记录: /log/boot
+  # 并发记忆: /log/lock

package/apps/pivot/user/edit.js

@@ -0,0 +1 @@
+pedit.bind(null, "用户信息", "user");

package/apps/pivot/user/list.js

@@ -0,0 +1,4 @@
+plist.bind(null, '用户管理', "user", refilm`
+*用户ID/key 100
+用户名/name input/300
+`, "/user/edit");

package/apps/pivot/user/tag/edit.js

@@ -0,0 +1 @@
+pedit.bind(null, "标签", "tag");

package/apps/pivot/user/tag/list.js

@@ -0,0 +1,3 @@
+plist.bind(null, '标签', "tag", refilm`
+*标签/key 100
+`, "/user/tag/edit");

package/coms/basic/renderExpress.js

@@ -3,7 +3,7 @@ function createSeek(express) {
     express.forEach(function (search) {
         if (dist) {
             if (/[\=]/.test(dist)) dist = `(${dist})`;
-            dist = `${dist}!==void 0&&${dist}!==null?${dist}${search}:''`
+            dist = `typeof ${dist}!=='undefined'&&${dist}!==null?${dist}${search}:''`
         } else {
             dist = search;
         }

package/coms/frame/route.js

@@ -75,6 +75,7 @@
                 if (/,/.test(name)) {
 
                 }
+                item.closed = true;
                 return item;
             });
             return items;
@@ -114,6 +115,7 @@
             actived = mmap[opened.active] || actived;
             if (actived) {
                 if (actived_value === historys.length) {
+                    setActive(actived, true);
                     result.active = actived;
                 };
             }
@@ -123,6 +125,7 @@
     var setActive = function (p, active) {
         while (p) {
             p.active = active;
+            if (active) p.closed = false;
             p = p.parent;
         }
     };

package/coms/pivot/plist.js

@@ -2,7 +2,7 @@
 function main(title, type, fields, edit_ref, options) {
     return frame$list(title, {
         load() {
-            return data.from("list", { type }, a => JSAM.parse(encode62.timedecode(a)));
+            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;

package/coms/zimoli/field.html

@@ -1,11 +1,16 @@
-<div class="head">
-    <span ng-bind=field.name></span>
-    <span class="required" ng-if="field.required">*</span>
-</div>
-<div class="body">
+<template v-if='field?.key'>
+    <div class="head">
+        <span ng-bind=field.name></span>
+        <span class="required" ng-if="field.required">*</span>
+    </div>
+    <div class="body">
+        <model _data=data _field=field></model>
+        <span class="error" ng-bind="error"></span>
+    </div>
+    <div class="foot" ng-if="field.msg">
+        <span ng-bind=field.msg></span>
+    </div>
+</template>
+<template v-else>
     <model _data=data _field=field></model>
-    <span class="error" ng-bind="error"></span>
-</div>
-<div class="foot" ng-if="field.msg">
-    <span ng-bind=field.msg></span>
-</div>
+</template>

package/coms/zimoli/model.js

@@ -48,6 +48,12 @@ var constructors = {
         }
         return e;
     },
+    success(e) {
+        success(e);
+        e.innerHTML = `<span ng-html="field.comment"></span>`;
+        render(e.children, e.$scope, e.$parentScopes);
+        return e;
+    },
     switch: swap,
     row: textarea,
     password,
@@ -149,16 +155,30 @@ var readonly_types = {
         var f = data[field.key];
         return size(f);
     },
+    html(a, data) {
+        var t = document.createElement("span");
+        t.innerHTML = seek(data, a.field.key);
+        return t;
+    },
     swap(e, data) {
         var { field } = e;
         var v = data[field.key];
         if (field.options) {
-            var o = field.options[v];
+            if (!field.optionsMap) field.optionsMap = createOptionsMap(field.options);
+            var o = field.optionsMap[v];
             if (o) return o.name;
         }
+        if (isEmpty(v)) v = '';
         return v;
     },
 };
+var createOptionsMap = function (options) {
+    var map = Object.create(null);
+    for (var o of options) {
+        map[o.key] = o;
+    }
+    return map;
+}
 readonly_types.select = readonly_types.swap;
 function main(elem) {
     var build = function () {

package/coms/zimoli/prompt.js

@@ -25,8 +25,10 @@ function prompt(msg = "请输入", check) {
         });
     })
     on("mousedown")(c, e => e.target !== ipt && e.preventDefault() | ipt.focus());
-    on("keydown.enter")(c, function () {
+    on("keydown.enter")(c, function (event) {
+        if (event.defaultPrevented) return;
         if (check && check(ipt.value) === false) return;
+        event.preventDefault();
         oked = true;
         remove(c);
         fire();

package/coms/zimoli/render.js

@@ -1,6 +1,15 @@
 var hasOwnProperty = {}.hasOwnProperty;
 var renderElements = Object.create(null);
 var presets = Object.create(null);
+presets.template = function (t) {
+    var node = document.createElement("div");
+    var comment = document.createComment('template');
+    node.innerHTML = t.innerHTML;
+    comment.with = [].slice.call(node.childNodes, 0);
+    renderElement(comment.with, t.$scope, t.$parentScopes);
+    remove(node.childNodes);
+    return comment;
+};
 window.renderElements = renderElements;
 var renderidOffset = 10;
 var renderidClosed = 0;
@@ -70,7 +79,6 @@ var initialComment = function (renders, type, expression) {
     onremove(comment, removeRenderElement);
     appendChild.after(this, comment);
     if (!/if/i.test(type)) remove(this);
-    this.with = comment;
     rebuild(comment);
     return comment;
 };
@@ -214,17 +222,12 @@ var createIf = function (search, id = 0) {
             var element = elements[cx];
             if (cx === shouldMount) {
                 appendChild.before(this, element);
-                element.with = this;
                 if (element.renderid < 0) {
                     element.renderid = id;
-                    var w = element.with;
-                    delete element.with;
-                    element = render(element);
-                    element.with = w;
+                    elements[cx] = render(element);
                 }
             }
             else {
-                delete element.with;
                 remove(element);
             }
         }
@@ -672,7 +675,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
             }
         }
     }
-    if (element.children.length) renderElement(element.children, scope, parentScopes);
+    if (element.children && element.children.length) renderElement(element.children, scope, parentScopes);
     if (!isFirstRender) return element;
     for (var k in binds) {
         if (directives.hasOwnProperty(k)) {

package/coms/zimoli/renderDefaults.js

@@ -34,6 +34,7 @@ extend(renderDefaults, {
     pic: img,
     image,
     back,
+    success,
     switch: swap,
     swap,
     password,

package/coms/zimoli/search.js

@@ -1,10 +1,11 @@
-function search(seartext, options) {
+function search(seartext, options, path = "name") {
     if (options instanceof Array) {
         var hasFullmatch = false;
         var a = options.map(o => {
-            if (o.name === seartext) hasFullmatch = true;
-            var [power, m] = mark.power(o.name, seartext);
-            return { power, name: m, value: o.value };
+            var name = seek(o, path);
+            if (name === seartext) hasFullmatch = true;
+            var [power, m] = mark.power(name, seartext);
+            return { power, [path]: m, value: o.value, item: o };
         }).filter(a => a.power > 0);
         a.sort(function (a, b) {
             return b.power - a.power;

package/coms/zimoli/select.js

@@ -24,6 +24,10 @@ var _remove = function () {
 var preventDefault = function (event) {
     event.preventDefault();
 };
+var preventDefault1 = function (event) {
+    if (saved_list) return;
+    event.preventDefault();
+}
 var lastTimeClick = 0;
 var removeByBlur = function () {
     if (!getTargetIn(this, document.activeElement)) _remove();
@@ -71,8 +75,8 @@ function select(target, list, removeOnSelect, direction) {
                     target.innerHTML = `<option selected value="${this.value}">${this.name || this.value}</option>`
                 }
                 target.value = this.value;
-                dispatch(target, "change");
             }
+            dispatch(target, "change");
         }
     };
     var onlistclick = function (event) {
@@ -96,8 +100,8 @@ function select(target, list, removeOnSelect, direction) {
         }
         on("keydown.up")(target, preventDefault);
         on("keydown.down")(target, preventDefault);
-        on("keydown.enter")(target, preventDefault);
-        on("keydown.space")(target, preventDefault);
+        on("keydown.enter")(target, preventDefault1);
+        on("keydown.space")(target, preventDefault1);
         var pop = function () {
             if (saved_list !== list) mousedown.call(this);
         };

package/coms/zimoli/selectList.js

@@ -60,7 +60,7 @@ function main() {
     function createItem(option) {
         var key = option.key || option.value;
         if (key in itemMap) return itemMap[key];
-        var item = itemMap[option.value] = document.createElement('div');
+        var item = itemMap[key] = document.createElement('div');
         item.setAttribute("item", '');
         item.innerHTML = option.innerHTML || option.name;
         item.name = option.name || option.innerHTML;
@@ -78,12 +78,12 @@ function main() {
             iconed = icon;
             if (multiple) {
                 item.setAttribute("selected", "");
-                page.value.push(option.value);
+                page.value.push(key);
             }
             else {
                 item.setAttribute("selected", "");
                 page.activeNode = item;
-                page.value = option.value
+                page.value = key
             }
         }
         if (option.disabled) {
@@ -142,10 +142,9 @@ function main() {
                     if (a in itemMap) return false;
                     cast(page.target, "add-option", a);
                     children.push({ name: a, key: a });
-                    page.insertBefore(createItem({
-                        name: a,
-                        value: a,
-                    }), adder);
+                    remove(page.children);
+                    page.go(children.length - 1);
+                    appendChild(page, adder);
                     break;
                 case this.children[1]:
                     var options = [].slice.call(children, 0, children.length);
@@ -216,6 +215,7 @@ function main() {
         moveFocus(0);
     })
     var enter = function (e) {
+        if (e.defaultPrevented) return;
         e.preventDefault();
         var e = page.getIndexedElement(focus);
         if (e) e.click();

package/coms/zimoli/selectListEdit.js

@@ -14,7 +14,7 @@ function main(options) {
         },
         del(o) {
             for (var cx = 0, dx = options.length; cx < dx; cx++) {
-                if (options[cx].value === o.value) {
+                if (options[cx] === o || options[cx] === o.item) {
                     var i = cx;
                     break;
                 }

package/coms/zimoli/success.js

@@ -0,0 +1,4 @@
+function success(e) {
+    if (!e) e = document.createElement('success');
+    return e;
+}

package/coms/zimoli/success.less

@@ -0,0 +1,13 @@
+& {
+    background: #2942;
+    color: #294;
+    font-size: 24px;
+    line-height: 2;
+    text-align: center;
+    display: block;
+    font-family: "仿宋", sans-serif;
+
+    &:before {
+        content: " ✓ ";
+    }
+}

package/coms/zimoli/view.less

@@ -127,4 +127,8 @@ body>& {
         padding: 0 20px;
         margin-left: 10px;
     }
+
+    a.button {
+        padding: 0;
+    }
 }

package/package.json

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