efront 3.35.0 → 3.35.2

package/docs/main.xht

@@ -3,6 +3,7 @@
         --leftwidth: 260px;
         display: block;
         width: auto;
+        top: 0;
         left: 0;
         right: 0;
         margin-right: -16px;
@@ -10,6 +11,7 @@
         position: absolute;
         padding-left: var(--leftwidth);
         overflow: hidden;
+        background: #fff;
     }
 
     :root+scrollbar {
@@ -21,16 +23,25 @@
         vertical-align: top;
     }
 
-    div2 test:before {
+    :root>menu f {
+        margin-left: 6px;
+    }
+
+    :root>menu f[test]:before {
         color: #fc0;
         content: "测";
     }
-    
-    div2 dang:before {
+
+    :root>menu f[dang]:before {
         color: #2cf;
         content: "档";
     }
 
+    :root>menu f[less]:before {
+        color: #2c9;
+        content: "样";
+    }
+
     menu {
         width: var(--leftwidth);
         margin-left: -var(--leftwidth);
@@ -51,6 +62,13 @@
         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>
@@ -92,10 +110,15 @@
             }
         ]);
     })
+    var initVersionInfo = async function () {
+        var xhr = await cross("get", "version");
+        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: "命令详解",
+            name: "命令参考",
             children: [
                 { name: "防御系", a: "f" },
                 { name: "强攻系", a: "q" },
@@ -129,11 +152,13 @@
             }
             for (var cc of children) {
                 cc.data = {
-                    mark: !!map[cc.name.replace(/\.js$/i, ".md")],
-                    test: !!map[cc.name.replace(/\.js$/i, "_test.js")]
+                    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.mark)cc.name+="<dang></dang>"
-                if(cc.data.test)cc.name+="<test></test>"
+                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;
@@ -144,6 +169,7 @@
     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");

package/docs/mark.xht

@@ -143,11 +143,16 @@
             var target = this;
             var href = target.getAttribute("href");
             event.preventDefault();
-            if (!/^\w+:/.test(href) && /\.md$/i.test(href)) {
-                href = md.replace(/[^\/]+$/, "") + href;
-                href = decodeURI(href);
-                console.log(href)
-                go('/mark/' + href);
+            if (!/^\w+:/.test(href)) {
+                if (/\.md$/i.test(href)) {
+                    href = md.replace(/[^\/]+$/, "") + href;
+                    href = decodeURI(href);
+                    console.log(href)
+                    go('/mark/' + href);
+                }
+                else {
+                    window.open('https://github.com/yunxu1019/efront/blob/develop/' + md.replace(/[^\/]+$/, "") + href);
+                }
             }
             else {
                 window.open(href);
@@ -155,7 +160,7 @@
         };
         var page = document.createElement("markdown");
         on("mounted")(page, async function () {
-            var xhr = await cross('get', "./welcome:" + md);
+            var xhr = await cross('get', "./welcome:" + encodeURI(md));
             page.innerHTML = markdown(xhr.response, md);
             for (var target of page.querySelectorAll("a")) {
                 onclick(target, clickAnchor);

package/docs/version.jsp

@@ -0,0 +1,3 @@
+<script serverside>
+    return __efront.version;
+</script>

package/docs/welcome.jsp

@@ -1,4 +1,5 @@
 <script serverside>
+    __efront = String(__efront);
     var fullpath = path.join(__efront, req.id);
     if (!/^\.\./.test(path.relative(fullpath, __efront)) || !/\.md$/.test(req.id)) {
         return forbidden("禁止访问！");

package/docs//347/273/204/344/273/266.xht

@@ -5,11 +5,13 @@
         display: block;
     }
 
-    p {
+    p4 {
         line-height: 1.8;
+        display: block;
+        margin: 20px 0;
     }
 
-    m {
+    p4 m{
         line-height: 1.2;
         display: inline-block;
         margin-right: 6px;
@@ -34,46 +36,68 @@
         color: #29f;
     }
 
+    b[l] {
+        color: #29c;
+    }
+
     h2 b {
         font-size: 14px;
         display: inline-block;
         border: 1.2px solid;
+        margin-left: 6px;
+        padding: 2px 4px;
     }
-    markdown{
+
+    markdown {
         margin: 0 -20px;
     }
 </style>
 <h2>
     <span -bind="name"></span>
+    <b -if="doc?.less" l>有样式表</b>
     <b -if="doc?.mark" w>有文档</b>
     <b -if="doc?.test" t>有测试代码</b>
 </h2>
 <container -if="doc?.url" .src="doc.url">
 </container>
-<p envs>
-    <span -if="com?.args.length">
-        环境依赖项:&nbsp; <m -repeat="c in com.args" -bind="c"> </m>
+<p4 envs>
+    <span -if="envs?.length">
+        环境依赖项:&nbsp; <m -repeat="c in envs" -bind="c"> </m>
     </span>
     <span -else> 无环境依赖项 </span>
-</p>
-<p imported>
-    <span -if="com?.required.length">
-        导入项:&nbsp;<m -repeat="c in com.required" -bind="c"></m>
+</p4>
+<p4 imported>
+    <span -if="required?.length">
+        导入项:&nbsp;<m -repeat="c in required" -bind="c"></m>
     </span>
     <span -else>
         无导入项
     </span>
-</p>
+</p4>
 <script>
-    var 分析 = async function (com, props) {
-        scope.name = com;
-        await new Promise(ok => load(com, ok));
-        var loaded = loadedModules[com];
-        scope.com = loaded;
-        scope.doc = props;
+    var 分析 = lazy(async function (com, props) {
         if (props.mark) props.url = '/mark/coms/' + com.replace(/\.js$/i, '.md');
+        scope.doc = props;
+        scope.name = com;
+        var xhr = await cross("get", "./components:" + com);
+        var code = compile$scanner2(xhr.response);
+        code.fix();
+        var envs = code.envs;
+        if (props.less) envs.cless = true;
+        var required = [];
+        if (envs.require) code.used.require.forEach(r => {
+            var next = r.next;
+            if (!next) return;
+            if (next.type !== code.SCOPED || next.entry !== '(') return;
+            var first = next.first;
+            if (!first || first.type !== code.QUOTED) return;
+            var req = code.program.createString([first]);
+            required.push(req);
+        });
+        scope.required = required;
+        scope.envs = Object.keys(envs);
         render.refresh();
-    };
+    });
     var page = document.createElement("component");
     page.innerHTML = template;
     var scope = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.35.0",
+    "version": "3.35.2",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {