efront 3.35.4 → 3.35.6

package/coms/basic/JSAM.md

@@ -0,0 +1,7 @@
+图状数据序列化工具，与JSON语法一致
+```javascript
+    JSAM.stringify(obj);
+    JSAM.parse(str);
+```
+该工具已单独发布至[](https://www.npmjs.com/package/jsam)，
+更多用法参考可参考该链接。

package/coms/basic/cross_.js

@@ -309,6 +309,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
         };
         var fire = async function (code) {
             if (!~requests.indexOf(xhr)) return;
+            prepareHeaders();
             xhr.method = method;
             xhr.url = url;
             xhr.encrypt = code;
@@ -365,25 +366,28 @@ function cross_(jsonp, digest = noop, method, url, headers) {
     }
     var setRequestHeader = xhr.setRequestHeader;
     var realHeaders = Object.create(null);
-    var cookie_ = this.hostCookie(xhr);
-    var _cookies = cookie_.getCookies(originDomain);
-    var _headers = {};
-    if (_cookies) {
-        _headers.Cookie = _cookies;
-    }
-    var cookobj = null;
-    for (var k in headers) {
-        if (/^\$/.test(headers[k])) {
-            var k2 = headers[k].slice(1);
-            if (!cookobj) cookobj = _cookies ? parseKV(_cookies, ';') : {};
-            if (k2 in cookobj) {
-                _headers[k] = cookobj[k2];
-            }
+    var cookie_;
+    var prepareHeaders = () => {
+        cookie_ = this.hostCookie(xhr);
+        var _cookies = cookie_.getCookies(originDomain);
+        if (_cookies) {
+            _headers.Cookie = _cookies;
         }
-        else {
-            _headers[k] = headers[k];
+        var cookobj = null;
+        for (var k in headers) {
+            if (/^\$/.test(headers[k])) {
+                var k2 = headers[k].slice(1);
+                if (!cookobj) cookobj = _cookies ? parseKV(_cookies, ';') : {};
+                if (k2 in cookobj) {
+                    _headers[k] = cookobj[k2];
+                }
+            }
+            else {
+                _headers[k] = headers[k];
+            }
         }
-    }
+    };
+    var _headers = {};
     if (/^[mc]/i.test(method)) {
         _headers["User-Agent"] = /^m/i.test(method)
             ? "efront/3.25 (iPhone) Safari/602.1"

package/coms/basic/parseYML.md

@@ -0,0 +1 @@
+`YAML`格式解析工具，目前尚不完善，解析个别数据可能出错。

package/coms/basic/queue.md

@@ -0,0 +1,10 @@
+依次传入数组中的数据，执行可能生成Promise的函数，类似如下代码：
+```javascript
+    for await(func());
+    或:
+    for (){await func();}
+```
+用法如下：
+```javascript
+queue.call(数组,func,最大并发数);
+```

package/coms/basic/serialize.md

@@ -0,0 +1,4 @@
+键值对序列化工具
+```javascript
+    serialize({ k1: v1, k2: v2 }, 分隔符, 等号);
+```

package/coms/basic/sortname.md

@@ -0,0 +1,4 @@
+文件名排序工具
+```javascript
+sortname(文件名数组)
+```

package/coms/basic/wait.md

@@ -0,0 +1,7 @@
+等待一个函数的返回值为真。用法如下：
+```javascript
+wait(function(){
+    return ...;
+}, 超时时长, 每次检查的时间间隔)
+```
+其中两个时间参数可不传入，超时时长默认为80毫秒，时间间隔按超时时长动态生成，约为其1/16。

package/coms/compile/Html.js

@@ -90,6 +90,7 @@ Html.prototype.createScoped = function (code) {
     dom.childNodes = childNodes;
     dom.children = children;
     var scriptNodes = [], styleNodes = [], tempNodes = [];
+    var inScript = false;
     for (var cx = 0, dx = code.length, c = code[0]; cx < dx; c = code[++cx])switch (c.type) {
         case LABEL:
             if (!/^(script|style|template)$/i.test(c.text)) {
@@ -100,6 +101,7 @@ Html.prototype.createScoped = function (code) {
             if (!c.isclose) {
                 var node = new Node;
                 node.tagName = c.text.toUpperCase();
+                if (node.tagName === 'SCRIPT' || node.tagName === 'STYLE') inScript = true;
                 nodePath.push(node);
                 node.childNodes = [];
                 node.children = [];
@@ -132,8 +134,8 @@ Html.prototype.createScoped = function (code) {
                 }
                 if (childNodes1.length) node.innerStart = childNodes1[0].outerStart;
                 else node.innerStart = innerEnd;
-                if (node.tagName === "SCRIPT") scriptNodes.push(node), tempNodes.push(node), node.isScript = true;
-                else if (node.tagName === "STYLE") styleNodes.push(node), tempNodes.push(node), node.isStyle = true;
+                if (node.tagName === "SCRIPT") scriptNodes.push(node), tempNodes.push(node), node.isScript = true, inScript = false;
+                else if (node.tagName === "STYLE") styleNodes.push(node), tempNodes.push(node), node.isStyle = true, inScript = false;
                 nodePath.pop();
                 node = nodePath[nodePath.length - 1];
                 childNodes = node.childNodes;
@@ -169,6 +171,7 @@ Html.prototype.createScoped = function (code) {
             }
             break;
         case EXPRESS:
+            if (inScript) continue;
             var t = c.text;
             t = parseExpress(t);
             var envs = createScoped(t).envs;

package/coms/compile/richcss.js

@@ -41,7 +41,7 @@ Richcss.prototype.setType = function (o) {
 };
 Richcss.prototype.createScoped = function (code) {
     var run = function (o) {
-        var props = Object.create(null);
+        var props = [];
         var values = null;
         loop: while (o) {
             switch (o.type) {
@@ -51,7 +51,10 @@ Richcss.prototype.createScoped = function (code) {
                         p.push(o.text);
                         o = o.next;
                     }
-                    props[p.join(" ")] = values = [];
+                    var pj = p.join(' ');
+                    props.push({ p: pj, v: values = [] });
+                    if (!props[pj]) props[pj] = [];
+                    props[pj].push(values);
                     if (!o) break loop;
                     if (o.type === STAMP) break;
                     continue;
@@ -65,15 +68,14 @@ Richcss.prototype.createScoped = function (code) {
                 case SCOPED:
                     var s = run(o.first);
                     var vars = null, used = null;
-                    for (var k in s) {
-                        var v = s[k];
+                    for (var { p: k, v } of s) {
                         if (/^\-\-/.test(k)) {
                             if (!vars) vars = {};
                             vars[k] = v.join(" ");
                         }
                         else {
                             if (!used) used = [];
-                            used[k] = v;
+                            used.push({ p: k, v });
                         }
                     }
                     values.used = used;
@@ -113,11 +115,13 @@ var fixBase = function (b, a) {
 function evalscoped(scoped, scopeNames, base = '') {
     var root = scoped[":root"], scope = scoped[":scope"];
     var vars = Object.create(null);
-    if (root) extend(vars, root.vars);
-    if (scope) extend(vars, scope.vars);
+    if (root) root.forEach(r => extend(vars, r.vars));
+    if (scope) scope.forEach(s => extend(vars, s.vars));
     scopeNames.forEach(s => {
         var ss = scoped[s];
-        if (ss) extend(vars, ss.vars), ss.rooted = true;
+        if (ss) ss.forEach(s => {
+            extend(vars, s.vars), s.rooted = true;
+        })
     });
     var vlist = [vars];
     var mlist = [];
@@ -154,8 +158,7 @@ function evalscoped(scoped, scopeNames, base = '') {
                 return q + getFromScopeList(b || a.trim(), vlist, m.slice(q.length));
             });
         };
-        for (var k in props) {
-            var p = props[k];
+        for (var { p: k, v: p } of props) {
             if (p.used) {
                 var match = /^(@[^\s,]+)\s*\(\s*(@[^\s,]+\s*(?:,\s*@[^\s,]+\s*)*)?\)/.exec(k);
                 if (!match) continue;
@@ -164,7 +167,8 @@ function evalscoped(scoped, scopeNames, base = '') {
                 args = args.split(",").map(a => a.trim());
                 p.args = args;
                 p.reg = new RegExp(args.join("|"), 'g');
-                methods[name] = function () {
+                if (!methods[name]) methods[name] = [];
+                methods[name].push(function () {
                     var body = evalthis(this);
                     var valueMap = {};
                     this.args.forEach((a, i) => {
@@ -178,12 +182,12 @@ function evalscoped(scoped, scopeNames, base = '') {
                     var body = body.map(replace);
                     body.rest = rest;
                     return body;
-                }.bind(p);
-                delete props[k];
+                }.bind(p));
+                p.isMethod = true;
             }
         }
-        for (var k in props) {
-            var p = props[k];
+        for (var { p: k, v: p } of props) {
+            if (p.isMethod) continue;
             if (p.used) {
                 if (base && !p.rooted) p.base = fixBase(base, k);
                 else p.base = k;
@@ -201,10 +205,12 @@ function evalscoped(scoped, scopeNames, base = '') {
                 var [, name, params] = match;
                 params = params.split(",").map(a => a.trim());
                 var method = getFromScopeList(name, mlist);
-                if (!isFunction(method)) throw `函数未定义：${name}`;
-                var res = method.apply(null, params);
-                if (res.rest.length) rest = rest.concat(res.rest);
-                if (res.length) result = result.concat(res);
+                if (!isArray(method)) throw `函数未定义：${name}`;
+                method.forEach(m => {
+                    var res = m.apply(null, params);
+                    if (res.rest.length) rest = rest.concat(res.rest);
+                    if (res.length) result = result.concat(res);
+                });
             }
         }
         mlist.pop();

package/coms/docs/markdown.js

@@ -70,8 +70,8 @@ function richtext(line) {
     line = line.trim();
     line = line.replace(/\[([\s\S]*?)\](?:\(([\s\S]*?)\))?|<(\w+)>[\s\S]*?<\/\3>/g, function (_, content, href) {
         if (/^\</.test(_)) return _;
-        if (href) href = ` href=${strings.recode(href)}`;
-        return `<a${href}>${content}</a>`;
+        if (href) var href1 = ` href=${strings.recode(href)}`;
+        return `<a${href1}>${content || href}</a>`;
     });
     var a;
     if (/^#/.test(line)) a = h(line);

package/coms/reptile/colored_console.js

@@ -34,7 +34,7 @@ var colorReg = /<(\/?)([a-z][\w]*)\>/ig;
 var renderColor = function (obj) {
     var colorpath = [];
     return String(obj).replace(colorReg, function (_, e, c) {
-        if (!getColor(c)) return _;
+        if (!c || c.length < 3 || !getColor(c)) return _;
         if (e) {
             colorpath.pop();
             c = colorpath[colorpath.length - 1];

package/coms/zimoli/arriswise.md

@@ -0,0 +1,12 @@
+替换已知函数中的方向属性(left,top,width,height,x,y等)，生成转置函数。
+如：
+```javascript
+var 水平方向操作 = function(elem,event){
+    var top = event.clientY - elem.offsetTop;
+};
+var 垂直方向操作 = function(elem,event){
+    var left = event.clientX - elem.offsetLeft;
+};
+等同于:
+var 垂直方向操作 = arriswise(水平方向操作,arguments);
+```

package/coms/zimoli/autodragchildren.md

@@ -0,0 +1,12 @@
+子项拖拽工具，两种用法可配合使用
+```javascript
+// 启用元素内的拖拽排序
+autodragchildren(元素, 子项过滤器, function(fromIndex,toIndex){
+    // 此回调函数可用于处理数据，也可以什么都不做
+    // 如果返回false 元素位置将不被调换
+});
+// 对已捕获的事件启用拖拽
+autodragchildren.hook(event, target/*用于向用户展示拖拽效果的元素*/,function (接收拖拽的元素/*此元素应具有 allowdrop 属性*/)  {
+});
+```
+更具体的用法可参考代码 [](https://github.com/yunxu1019/qfy/blob/master/page/home/edit.js)

package/coms/zimoli/cross.js

@@ -59,7 +59,8 @@ cross.setHost = function (host) {
     host = (/^https/.test(location_href) ? "https://" : "http://") + host;
     cross_.setHost(host);
 };
-cross.hostCookie = function () {
+cross.hostCookie = function (xhr) {
+    if (xhr.cookie) return xhr.cookie;
     return cookie;
 };
 cross.getCookies = function (dp) {

package/coms/zimoli/cross.md

@@ -0,0 +1,25 @@
+网络请求工具
+```javascript
+    var xhr = await cross(请求方法,请求路径,头信息).send(数据);
+    console.log(xhr.response) // 已对不存在response属性的浏览器做兼容，可放心使用
+```
+默认会通过当前服务器转发请求，请求结果会附加跨域头信息，可以通过`cross.addDirect`指定免转发的服务器
+如：
+```javascript
+    cross.addDirect('efront.cc');
+    或:
+    cross.addDirect(/efront\.cc$/);
+```
+对于无服务器项目或不使用efront做为服务器的项目，也可以通过`cross.setHost`指定用以转发的服务器，如：
+```javascript
+    cross.setHost('efront.cc');
+```
+可以用efront的编译开关区分生成环境和测试环境，如:
+```javascript
+    cross.setHost('efront.cc');
+    // <!--
+    // 这里的代码会在live命令中生效
+    // 会在build命令中移除
+    cross.setHost('localhost');
+    // -->
+```

package/coms/zimoli/inertia.md

@@ -0,0 +1,13 @@
+非线性减速插值工具，可用于用户的滚动或拖动操作平滑停止
+```javascript
+    var f = inertia(function(a){
+        // 一个参数或多个参数，都应为有限的数值，未对其他情况进行测试或排错
+        console.log(a);
+    });
+    f(2);
+    await new Promise(ok=>setTimeout(ok,20));
+    f(2);
+    f.smooth(function(){
+        // 结束时的回调，可不传入
+    }, 最小可用速度/*高维空间中参数向量的模，可不传入*/);
+```

package/coms/zimoli/lattice.md

@@ -0,0 +1,5 @@
+网格排列工具，每行元素最好有一样的高度，超出宽度后自动换行，其行为类似windows操作系统的文件管理窗口
+```html
+    <!-- 用法与list组件一致，增加一个 item-width 属性，可不设置 -->
+    <lattice efront-src="item in items" item-width=280 ></lattice>
+```

package/coms/zimoli/list.md

@@ -0,0 +1,10 @@
+列表工具，比ng-repeat或v-for的优势在于，它内置了大数据量的高效展示算法。
+```html
+    <!-- 语法与 ng-repeat 或 v-for 类似，前缀随意 -->
+    <list efront-src="item in items" >
+        <div>
+            <span -bind="item.name"></span>
+            <span -bind="item.silasiladi"></span>
+        </div>
+    </list>
+```

package/coms/zimoli/maps.md

@@ -0,0 +1 @@
+一个地图展示的小工具，目前只有展示瓦片地图（OSM、百度、高德、谷歌等）的功能，无任何其他附加功能。如果您在开发地图类应用，建议使用`openlayers`等已基本成熟的地图框架，不要使用这个可能在未来大修大补的模块。

package/coms/zimoli/prompt.js

@@ -33,9 +33,10 @@ function prompt() {
     };
     var buttons = [button("确认"), button("取消", 'white')];
     if (isFunction(check)) {
-        var setDisable = function () {
+        var setDisable = function (event) {
+            if (oked || ohed) return;
             var valid = validate(ipt.value, check, tip);
-            attr(body, "error", !valid);
+            if (event) attr(body, "error", !valid);
             attr(buttons[0], 'disabled', !valid);
         };
         on('keyup')(ipt, setDisable);
@@ -49,7 +50,7 @@ function prompt() {
     var c = confirm(msg, body, buttons, function (_) {
         if (oked || ohed) return;
         if (_ === buttons[0]) {
-            if (check && validate(ipt.value, check, tip)) return false;
+            if (check && !validate(ipt.value, check, tip)) return false;
             oked = true;
         } else {
             ohed = true;
@@ -65,11 +66,8 @@ function prompt() {
     on("mousedown")(c, e => e.target !== ipt && e.preventDefault() | ipt.focus());
     on("keydown.enter")(c, function (event) {
         if (event.defaultPrevented) return;
-        if (check && check(ipt.value) === false) return;
         event.preventDefault();
-        oked = true;
-        remove(c);
-        fire();
+        buttons[0].click();
     });
     c.then = function (ok, oh) {
         oks.push(ok);

package/coms/zimoli/render.js

@@ -648,7 +648,7 @@ var createEmiter = function (on) {
             digest();
             var parsedSrc = this.$src;
             if (parsedSrc instanceof Repeater) {
-                if (e.active || e.currentTarget) var target = e.active || e.currentTarget;
+                if (e.active || e.currentTarget) var target = e.active || (e.currentTarget === this ? e.target || e.srcElem || e.currentTarget : e.currentTarget);
                 else var target = e.target;
                 if (target === this) {
                     scope = parsedSrc.createScope();
@@ -906,7 +906,7 @@ function createStructure(element) {
             continue;
         }
         if (/^#/.test(name)) {
-            ids.push(name.slice(1));
+            ids.push(name.slice(1), name.slice(1).replace(/\-([a-z])/ig, (_, a) => a.toUpperCase()));
             element.removeAttribute(name);
             continue;
         };

package/coms/zimoli/selectList.js

@@ -170,9 +170,10 @@ function main() {
             switch (target) {
                 case this.children[0]:
                     var a = prompt("请输入", a => {
+                        if (!a) return false;
+                        console.log(itemMap, a);
                         if (a in itemMap) {
-                            alert(`选项 ${a} 已存在！`);
-                            return false;
+                            return `选项 ${a} 已存在！`;
                         }
                     });
                     page.with = a;
@@ -192,6 +193,7 @@ function main() {
                     var edit = selectListEdit(options.slice(0));
                     page.with = edit;
                     on("remove")(edit, function () {
+                        itemMap = Object.create(null);
                         page.with = null;
                         children.splice(0, children.length);
                         children.push.apply(children, edit.$scope.options.map(o => ({ key: o.key || o.value, name: o.name || o.innerHTML })))

package/coms/zimoli/zimoli.md

@@ -0,0 +1,7 @@
+```javascript
+    zimoli(pathname, params) // 跳转
+    zimoli.switch(historyName, targetElement, homePath) // 切换历史及目标挂载元素
+    zimoli() // 切换历史后初始化
+    zimoli.clearHistory() // 清空历史
+    zimoli.register(pathname) // 注册通用路由
+```

package/docs/main.xht

@@ -123,6 +123,7 @@
         var helps = await init("docs$helps");
         var m = {
             name: "命令参考",
+            closed: true,
             children: [
                 { name: "防御系", a: "f" },
                 { name: "强攻系", a: "q" },

package/package.json

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