efront 3.34.12 → 3.35.1

package/coms/zimoli/html.js

@@ -1,5 +1,5 @@
 function html(target, innerHTML) {
-    if (arguments.length == 2) {
+    if (arguments.length >= 2) {
         target.innerHTML = innerHTML;
     }
     return target.innerHTML;

package/coms/zimoli/menu.js

@@ -139,7 +139,7 @@ function main(elem, mode) {
                     });
                     tree(elem, function (index, item, menu) {
                         var e = generator(index, item);
-                        if (!e || e.children.length) return e;
+                        if (!e || !e.children || e.children.length) return e;
                         var m = menuItem(null, menu, elem.useIcon[0]);
                         return m;
                     });

package/coms/zimoli/menuItem.html

@@ -1,4 +1,4 @@
-<template -if='useIcon||hasIcon||icon'>
+<template -if='useIcon?||hasIcon?||icon?'>
     <i -class="icon?" -style="{color:color?}"></i>
     <template -if="name?">
         &nbsp;&nbsp;

package/coms/zimoli/menuItem.js

@@ -7,7 +7,7 @@ function main(elem, scope, hasIcon) {
     else if (item.$scope) {
         var scope = item.$scope;
     }
-    if (scope.menu) scope = scope.menu;
+    if (scope.menu || scope.$item) scope = scope.menu || scope.$item;
     if (hasIcon === undefined) hasIcon = !!scope.icon;
     if (scope.disabled || scope.enabled === false) {
         item.setAttribute('disabled', '');

package/coms/zimoli/render.js

@@ -244,7 +244,7 @@ var createRepeat = function (search, id = 0) {
             }
             else {
                 var c = changes[k];
-                if (clonedElements[k]) if (!c || !isObject(c.previous) && !isObject(c.current)) return clonedElements1[k] = clonedElements[k];
+                if (clonedElements[k]) if (!c) return clonedElements1[k] = clonedElements[k];
             }
             var clone = element.cloneNode();
             clone.innerHTML = element.innerHTML;
@@ -443,6 +443,7 @@ var createBinder = function (binder) {
         this.renders.push(function () {
             var value = getter(this);
             if (deepEqual.shallow(value, oldValue)) return;
+            var oldv = oldValue;
             oldValue = value;
             if (isNode(value) || isArray(value)) {
                 if (value !== this.firstChild) {
@@ -451,7 +452,7 @@ var createBinder = function (binder) {
                 }
             } else {
                 if (isEmpty(value)) value = '';
-                if (binder(this) !== value) binder(this, value);
+                if (binder(this) !== value) binder(this, value, oldv);
             }
         });
 
@@ -489,7 +490,17 @@ var directives = {
         if (arguments.length === 1) return elem.style.display !== 'none';
         elem.style.display = value ? '' : 'none';
     }),
-    style: createBinder(css),
+    style: createBinder(function (elem, value, oldValue) {
+        if (isString(value)) value = parseKV(value, ';', ':');
+        if (isString(oldValue)) oldValue = parseKV(oldValue, ";", ":");
+        var changed = getChanges(value, oldValue);
+        var targetValue = Object.create(null);
+        for (var k in changed) {
+            targetValue[k] = isEmpty(value[k]) ? "" : value[k];
+        }
+        value = targetValue;
+        css(elem, value);
+    }),
     src(src) {
         var parsedSrc = this.$src;
         return src2.call(this, parsedSrc ? parsedSrc.srcName : src);

package/coms/zimoli/text.js

@@ -1,5 +1,5 @@
 function text(node, text) {
-    if (arguments.length === 2) {
+    if (arguments.length >= 2) {
         if (isFunction(text)) text = text();
         if (isFunction(node.setText)) {
             node.setText(text)

package/coms/zimoli/tree.js

@@ -44,9 +44,9 @@ function tree() {
     }
     var dom = [], root = null;
     var changed_index, changed_offset;
-    var saved_top, saved_offset, timer = 0, timeout = function () {
+    var saved_top, saved_offset, timer = 0, timeout = function (call, time) {
         clearTimeout(timer);
-        timer = setTimeout.apply(this, arguments);
+        timer = setTimeout(call, time + 100);
     };
     var banner = list(element, function (index) {
         var coms = dom;
@@ -216,9 +216,7 @@ function tree() {
                 }
                 setState(false);
                 z0();
-                console.log(change_elem.getAttribute("style"),margin_top)
                 var res = transition(change_elem, { transition: `margin-top ${time(margin_top)}s ease-out`, marginTop: fromOffset(margin_top) }, false);
-                console.log(change_elem.getAttribute("style"),margin_top)
                 timeout(z1, res);
             }
         });

package/coms/zimoli/zimoli.js

@@ -134,16 +134,20 @@ function go(pagepath, args, history_name, oldpagepath) {
         }
         return true;
     }
+    var realpath = getpgpath(pagepath);
+    if (realpath.length > 1) var [pgpath, args0] = realpath;
+    else pgpath = pagepath;
     setZimoliParams(pagepath, { data: args, from: oldpagepath, options, roles, id });
-    prepare(pagepath, function (res) {
+    prepare(pgpath, function (res) {
         if (!res.roles || res.roles === true) res.roles = !!roles;
     });
-    if (!page_generators[pagepath]) {
+    if (!page_generators[pgpath]) {
         return zimoli(pagepath, args, history_name, oldpagepath);
     }
-    var page_object = page_generators[pagepath];
+    var page_object = page_generators[pgpath];
+    if (!isEmpty(args0)) page_object.state.data = args, args = args0;
     var fullfill = function () {
-        var _page = create(pagepath, args, oldpagepath);
+        var _page = create(pgpath, args, oldpagepath);
         var isDestroy = pushstate(pagepath, history_name, oldpagepath);
         if (isNode(history_name)) {
             if (history_name.activate === pagepath && history_name.activateNode === _page) return fullfill_is_dispatched--;
@@ -188,13 +192,28 @@ var page_generators = {};
  * 如果args是bool值true，那么当执行history.back()时，此对象被清除
  */
 var loading_tree = {};
+var pathmaped = Object.create(null);
 var getpgpath = function (pagepath) {
     pagepath = /^[@#!]/.test(pagepath) ? pagepath.slice(1) : pagepath;
     if (pagepath === 'main') pagepath = modules.efrontPath || "/main";
-    return pagepath;
+    var pathlist = pagepath.split("/");
+    var params = [];
+    while (pathlist.length && !pathmaped[pathlist.join("/")]) params.push(pathlist.pop());
+    if (pathlist.length) {
+        pagepath = pathlist.join("/");
+        var mparams = pathmaped[pagepath];
+        var argobj = {};
+        if (!mparams.length) argobj = params.reverse().join("/");
+        else {
+            for (var m of mparams) argobj[m] = params.pop();
+            if (params.length) argobj[m] += "/" + params.reverse().join("/");
+        }
+        return [pagepath, argobj];
+    }
+    return [pagepath];
 };
 function createState(pgpath) {
-    var pgpath = getpgpath(pgpath);
+    var [pgpath] = getpgpath(pgpath);
     var _zimoli_state_key = _zimoli_state_prefix + pgpath;
     var state = function state(condition, setAsAdditional = condition !== null) {
         var state_string = hostoryStorage.getItem(_zimoli_state_key);
@@ -233,7 +252,7 @@ function prepare(pgpath, ok) {
         for (var p of pgpath) prepare(p);
         return;
     }
-    var pgpath = getpgpath(pgpath);
+    var [pgpath] = getpgpath(pgpath);
     if (page_generators[pgpath]) {
         if (isFunction(ok)) {
             var res = page_generators[pgpath];
@@ -377,7 +396,7 @@ function prepare(pgpath, ok) {
 }
 function create(pagepath, args, from, needroles) {
     if (typeof pagepath === 'string') {
-        var page_object = isObject(pagepath) ? pagepath : page_generators[getpgpath(pagepath)];
+        var page_object = page_generators[pagepath];
         if (!page_object) {
             throw new Error(`调用create前请确保prepare执行完毕:${pagepath}`);
         }
@@ -405,7 +424,7 @@ function create(pagepath, args, from, needroles) {
     var _page = pg.call(state, args, from);
     if (undefined === args || null === args) args = {};
     if (_page) {
-        _page.with = _with_elements;
+        if (_with_elements.length) _page.with = _with_elements.concat(_page.with || []);
         if (args.initialStyle) _page.initialStyle = args.initialStyle;
         if (args.holdupStyle) _page.holdupStyle = args.holdupStyle;
         if (_page.initialStyle && !_page.holdupStyle) {
@@ -483,7 +502,7 @@ var pushstate = function (path_name, history_name, oldpagepath) {
         history[history_name] = [path_name];
     } else {
         var _history = history[history_name];
-        if ([].indexOf.call(_history, oldpagepath, 0) < 0) {
+        if (oldpagepath && [].indexOf.call(_history, oldpagepath, 0) < 0) {
             _history.splice(root_path === _history[0], _history.length);
             isDestroy = true;
         }
@@ -513,14 +532,14 @@ var popstate = function (path_name, history_name) {
     }
 };
 var getCurrentHash = function () {
-    var _historylist = history[current_history];
+    var _historylist = history[current_history] || [];
     var history_name = current_history.replace(/\/$/, '');
     if (rootElements.length) {
         return `#${history_name}/`;
     }
     if (_historylist.length < 2) return "";
     var targeturl = `#${history_name}${_historylist.length ? _historylist[_historylist.length - 1] : ""}`;
-    return targeturl;
+    return encodeURI(targeturl);
 };
 
 var fixurl = function () {
@@ -669,6 +688,14 @@ zimoli.setStorage = function (storage) {
     } catch (e) {
     }
 };
+zimoli.register = function (pathlike) {
+    var params = [];
+    pathlike = pathlike.replace(/\/\:(^[^\/]+)?/g, function (_, id) {
+        params.push(id);
+        return '';
+    });
+    pathmaped[pathlike] = params;
+};
 zimoli.clearHistory = function () {
     hostoryStorage.removeItem(history_session_object_key);
     history = {};

package/docs/compare.md

@@ -258,10 +258,10 @@ function main(elem){
     styles:[],
 })
 class ComponentName implements OnChanges,AfterViewInit,OnInit,OnDestroy{
-    @Input() params1,
-    @Input() params2,
-    @Output() event1,
-    @Output() event2,
+    @Input() params1;
+    @Input() params2;
+    @Output() event1;
+    @Output() event2;
     constructor(){
     }
     ngOnInit(){
@@ -272,7 +272,7 @@ class ComponentName implements OnChanges,AfterViewInit,OnInit,OnDestroy{
     }
     ngOnChanges(){
         // 参数变化时触发
-    },
+    }
     ngAfterViewInit(){
         // 渲染完成后触发
     }

package/docs/components.jsp

@@ -0,0 +1,24 @@
+<script serverside>
+
+    var fs = require("fs").promises;
+    var path = require("path");
+    var comm_file_reg = /\.([tj]sx?|xht|md|less)$/i;
+    var basepath = path.join(String(__efront), 'coms');
+    if (req.id) {
+        var compath = path.join(basepath, req.id);
+        if (!comm_file_reg.test(req.id) || !/^\.\./.test(path.relative(compath, basepath))) return forbidden("禁止访问");
+        return fs.readFile(compath);
+    }
+
+    var readdir = async function (a) {
+        var b = path.join(basepath, a);
+        var names = await fs.readdir(b);
+        names = names.filter(name => {
+            if (/#/.test(name) || !comm_file_reg.test(name)) return false;
+            return true;
+        });
+        return { children: names, name: a };
+    };
+    var data = await queue.call(["basic", "zimoli", "reptile", "frame"], readdir);
+    return JSON.stringify(data);
+</script>

package/docs/index.html

@@ -1,29 +1,6 @@
 <!DOCTYPE html>
 <!--
-    过了8点整，
-    进入8点钟，
-    外边已是黑夜，
-    时不时地传来一阵寒冷。
-    天空由蔚蓝变成深蓝，
-    蓝得深邃，
-    蓝得发黑，
-    蓝得让人感到遥不可及。
-    我的心似乎已经冰凉，
-    几乎找不到一丁点的暖意，
-    望着远方的天空，
-    看不到星星，
-    也看不到月亮，
-    不知星在何方，
-    不知月在何方。
-　　
-    心又在何方？
-    理想变得遥远，
-    远处已经渺茫。
-    总是想知道，
-    但又不能知道：
-    以后会怎样。
-
-    http://efront.cc
+    http://efront.cc/docs/
 -->
 <html lang="zh-CN">
 
@@ -33,7 +10,20 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link rel="Shortcut Icon" href="/favicon.ico" type="image/x-icon" />
     <meta name="viewport" content="initial-scale=1,maximum-scale=1,width=device-width" />
-    <title>Efront内置组件加载工具</title>
+    <title>efront 文档</title>
+    <style>
+        body,
+        html {
+            height: 100%;
+            margin: 0;
+            overflow: hidden;
+        }
+        *,
+        ::before,
+        ::after {
+            box-sizing: border-box;
+        }
+    </style>
     <script deleteoncompile>
         -function (body, window) {
             body.removeChild(body.getElementsByTagName("script")[0]);
@@ -49,6 +39,8 @@
     </script>
 </head>
 
-<body scroll=no max-render=1440 main-path="/main"></body>
+<body scroll=no max-render=1440>
+    走过多少路口，听过多少叹息，我认真着你的不知所措..
+</body>
 
 </html>

package/docs/main.xht

@@ -0,0 +1,207 @@
+<style>
+    :root {
+        --leftwidth: 260px;
+        display: block;
+        width: auto;
+        top: 0;
+        left: 0;
+        right: 0;
+        margin-right: -16px;
+        height: 100%;
+        position: absolute;
+        padding-left: var(--leftwidth);
+        overflow: hidden;
+    }
+
+    :root+scrollbar {
+        right: 0;
+        background: transparent;
+    }
+
+    :root>* {
+        vertical-align: top;
+    }
+
+    :root>menu f {
+        margin-left: 6px;
+    }
+
+    :root>menu f[test]:before {
+        color: #fc0;
+        content: "测";
+    }
+
+    :root>menu f[dang]:before {
+        color: #2cf;
+        content: "档";
+    }
+
+    :root>menu f[less]:before {
+        color: #2c9;
+        content: "样";
+    }
+
+    menu {
+        width: var(--leftwidth);
+        margin-left: -var(--leftwidth);
+        height: 100%;
+        display: inline-block;
+        min-width: 200px;
+        max-width: 600px;
+    }
+
+    div1 {
+        display: inline-block;
+        width: 100%;
+        height: 100%;
+        font-size: 16px;
+        vertical-align: top;
+        overflow-x: hidden;
+        overflow-y: scroll;
+        position: relative;
+        background: linear-gradient(#f2f4ff, 70%, #e9fff2);
+    }
+    :root>menu v{
+        display: inline-block;
+        font-size: 12px;
+        color: #79a;
+        margin-left: 12px;
+    }
+</style>
+<menu #mulu inline -src="m in menus" @active="openMenu(m)">
+    <div2></div2>
+</menu>
+<div1 #content></div1>
+<script>
+    var menus = [
+        {
+            name: "efront 简介",
+            children: [
+                { name: "使用说明", md: "readme.md" },
+                { name: "兼容性说明", md: "coms/basic_/readme.md" },
+                { name: "版本说明", md: "docs/版本说明.md" },
+                { name: "与前端框架对比", md: "docs/compare.md" },
+                // { name: "notive", md: "docs/notive.md" },
+            ]
+        },
+        {
+            name: "组件库",
+            closed: true,
+            children: []
+        },
+        // {
+        //     name: "小工具"
+        // }
+    ];
+    zimoli.register("/mark");
+    zimoli.register("/命令");
+    zimoli.register("/组件");
+    contextmenu(document, function (event) {
+        if (!window.require) return;
+        return menuList(null, [
+            {
+                "name": "开发者选项",
+                do() {
+                    window.require("electron").ipcRenderer.send("window", "open-dev-tools");
+                    window.resizeBy(400, 0);
+                }
+            }
+        ]);
+    })
+    var initVersionInfo = async function () {
+        var xhr = await cross("get", "version");
+        console.log(xhr)
+        var version = xhr.response.split(",");
+        menus[0].name += ` <v>${version[0]}</v>`;
+    }
+    var initCommandsDocs = async function () {
+        var helps = await init("docs$helps");
+        var m = {
+            name: "命令参考",
+            children: [
+                { name: "防御系", a: "f" },
+                { name: "强攻系", a: "q" },
+                { name: "辅助系", a: "z" },
+                { name: "控制系", a: "k" },
+                { name: "暗器系", a: "a" }
+            ]
+        };
+        m.children.forEach(a => {
+            a.children = helps.helps.filter(h => h.type === a.a);
+            a.children.forEach(c => {
+                c.name = c.info;
+                c.path = `/命令/${c.name}`;
+            });
+            a.closed = true;
+        });
+        menus.splice(1, 0, m);
+    };
+    var initComponentDocs = async function () {
+        var m = await cross("get", "components");
+        m = JSON.parse(m.response);
+        for (var c of m) {
+            var map = Object.create(null);
+            var children = [];
+            for (var a of c.children) {
+                if (!/\.([jt]sx?|xht)$/i.test(a) || /_test\.([tj]sx?|xht)$/i.test(a)) {
+                    map[a.replace(/\.\w+$/g, a => a.toLowerCase())] = a;
+                    continue;
+                }
+                children.push({ name: a, path: `/组件/${c.name}/${a}` });
+            }
+            for (var cc of children) {
+                cc.data = {
+                    mark: !!map[cc.name.replace(/\.[tj]sx?$/i, ".md")],
+                    test: !!map[cc.name.replace(/\.[tj]sx?$/i, "_test.js")],
+                    less: !!map[cc.name.replace(/\.[tj]sx?$/i, ".less")]
+                }
+                if (cc.data.less) cc.name += "<f less></f>"
+                if (cc.data.mark) cc.name += "<f dang></f>"
+                if (cc.data.test) cc.name += "<f test></f>"
+            }
+            c.children = children;
+            c.closed = true;
+        }
+
+        menus[2].children = m;
+    };
+    var initMenus = async function () {
+        menus[0].children.forEach(c => { c.path = "/mark/" + c.md });
+        zimoli.switch('', scope.content, menus[0].children[0].path);
+        await initVersionInfo();
+        await initCommandsDocs();
+        await initComponentDocs();
+        var route = await init("frame$route");
+        scope.menus = route.update(menus);
+        zimoli();
+        render.refresh();
+    }
+    var scope = {
+        menus,
+        div2(elem, scope) {
+            if (scope.m.data?.mark) elem.setAttribute("mark", '');
+            if (scope.m.data?.test) elem.setAttribute("test", '');
+            return menuItem.apply(this, arguments);
+        },
+        grid,
+        menu,
+        openMenu(m) {
+            this.menus.open(m);
+        }
+    };
+    var page = document.createElement('grid');
+    page.innerHTML = template;
+    render(page, scope);
+    var s = scrollbar();
+    on("mounted")(page, initMenus);
+    s.bindTarget(scope.content);
+    page.with = s;
+    bind("render")(page, function () {
+        requestAnimationFrame(function () {
+            s.reshape();
+        })
+    });
+    function main() {
+        return page;
+    }
+</script>