efront 3.28.1 → 3.29.2

package/apis/docs/getAllComponents.js

@@ -1,7 +1,7 @@
 var fs = require("fs");
 var path = require("path");
-var test_file_reg = /_test\.[tj]sx?$/i;
-var comm_file_reg = /\.[tj]sx?$/i;
+var test_file_reg = /_test\.([tj]sx?|xht)$/i;
+var comm_file_reg = /\.([tj]sx?|xht)$/i;
 var readdir = function (a) {
     return new Promise(function (ok, oh) {
         a = path.join(__dirname, "../../coms", a);

package/apps/kugou/search/search.less

@@ -5,6 +5,7 @@
     top: 0;
     right: 0;
     bottom: 0;
+    width: 100%;
     background: inherit;
 }
 

package/coms/basic/Table.js

@@ -93,6 +93,7 @@ class Table extends Array {
         this.searched = 0;
         this.splice(0, this.length);
         var source = this.sorted ? this.sorted : this.source;
+        if (!source) return;
         var searchid = ++this.searchid;
         this.complete = false;
         this.coverCount = 0;

package/coms/{zimoli → basic}/compile_test.js

@@ -2,7 +2,7 @@
 var compile = require("./compile");
 var javascript = function () {
     "use strict";
-    var Enum = require("../basic/Enum");
+    var Enum = require("./Enum");
     var Tokens = new Enum;
     var {
         SingleLineComment,
@@ -62,9 +62,9 @@ var javascript = function () {
         entry: ProgramCodeBlock
     };
 }();
-var fs = require("fs");
-var path = require("path");
-var assert = require("../basic/assert");
+// var fs = require("fs");
+// var path = require("path");
+var assert = require("./assert");
 
 
 

package/coms/basic/strings.js

@@ -35,4 +35,9 @@ function decode(s) {
         return b;
     });
 }
-module.exports = { encode, decode };
+function recode(s) {
+    s = decode(s);
+    s = encode(s);
+    return s;
+}
+module.exports = { encode, decode, recode };

package/coms/explorer/context.js

@@ -17,7 +17,7 @@ var getPageScope = function (d) {
     return $scope;
 };
 var never = function () { return false };
-var popupEdit = function (d) {
+var popupRen = function (d) {
     var $scope = getPageScope(d);
     var selected = $scope.selected;
     var active;
@@ -28,8 +28,14 @@ var popupEdit = function (d) {
     else {
         active = d.$scope.d;
     }
-    if (d === $scope)
-        if (d.$scope.pending) return;
+    if (d.$scope.pending) return;
+    popupEdit($scope, active);
+};
+var popupAdd = function (d) {
+    var $scope = getPageScope(d);
+    popupEdit($scope, null);
+};
+var popupEdit = function ($scope, active) {
     var params = {
         path: $scope.pathlist.join('/'),
         hasName: $scope.hasName.bind($scope),
@@ -153,7 +159,7 @@ return extend([
     {
         name: "新建文件夹(D)",
         when: notGetActive,
-        do: popupEdit
+        do: popupAdd
     },
     {
         name: "添加文件(F)",
@@ -167,7 +173,7 @@ return extend([
         hotkey: "F2",
         name: '重命名(R)',
         when: getStable,
-        do: popupEdit
+        do: popupRen
     },
     {
         get name() {

package/coms/layer/leftCenter.js

@@ -13,7 +13,7 @@ appendChild(layer, leftLayer, centerLayer);
 onappend(centerLayer, function () {
     zimoli.switch("layer-left-center", layer);
     zimoli();
-    var cancel_resize = onresize(window, reshape);
+    var cancel_resize = on("resize")(window, reshape);
     once("remove")(centerLayer, cancel_resize);
 });
 function reshape() {

package/coms/zimoli/avatar.xht

@@ -0,0 +1,31 @@
+<img ng-src="user.avatar||'images/avatar.png'" draggable="false"/>
+<style>
+& {
+    border-radius: 50%;
+    display: inline-block;
+    background-repeat: no-repeat;
+    background-size: cover;
+    background-position: center;
+}
+</style>
+<script>
+    function main(elem) {
+        if (!isElement(elem)) {
+            elem = document.createElement("img");
+        }
+        if (!/^img$/i.test(elem.tagName)) {
+            care(elem, function (src) {
+                css(elem, { backgroundImage: `url('${src}')` });
+            })
+        }
+        var size = +elem.getAttribute('size');
+        if (size) {
+            css(elem, {
+                width: fromPixel(size),
+                height: fromPixel(size)
+            });
+        }
+        return elem;
+    }
+    main.toString = template.toString;
+</script>

package/coms/zimoli/back.xht

@@ -0,0 +1,33 @@
+<back onclick="history.back()">
+    <i></i><span>返回</span>
+</back>
+<style>
+    i:before {
+        content: "‹";
+        font-size: 28px;
+    }
+    
+    i {
+        font-style: normal;
+        margin-top: -12px;
+    }
+    
+    span {
+        font-size: 14px;
+        margin-left: 10px;
+        margin-top: -10px;
+    }
+
+    span,
+    i {
+        position: absolute;
+        left: 10px;
+        top: 50%;
+        height: 20px;
+        line-height: 20px;
+        font-style: normal;
+    }
+</style>
+<script>
+    var back = button;
+</script>

package/coms/zimoli/cloneVisible_test.xht

@@ -0,0 +1,110 @@
+<style>
+    /* less */
+    strong{
+        color: #666;
+    }
+    div span:before{
+        content: '<a>pseudo</a>';
+        display: 'inline-block';
+        padding: 0 16px;
+        color: blue;
+    }
+    caption,td,th {
+        position: relative;
+        padding: 10px 16px;
+        background: #fff;
+    }
+
+    clone,
+    canvas {
+        position: absolute !important;
+        left: 16px !important;
+        top: 10px !important;
+    }
+    border-collapse: collapse;
+
+    td,
+    th {
+        border: 2px solid #ccc;
+    }
+
+    td {
+        background: #fff;
+        @mask-color1 : rgba(255, 255, 255, .6);
+        @mask-color2 : rgba(0, 0, 0, 0);
+        @mask-color3 : rgba(0, 0, 0, .1);
+        background:
+            linear-gradient(45deg, @mask-color1, 25%, @mask-color1, 25%, @mask-color2, 75%, @mask-color1, 75%, @mask-color1),
+            linear-gradient(45deg, @mask-color1, 25%, @mask-color1, 25%, @mask-color2, 75%, @mask-color1, 75%, @mask-color1),
+            linear-gradient(45deg, @mask-color3, 25%, @mask-color3, 25%, @mask-color2, 75%, @mask-color3, 75%, @mask-color3),
+            linear-gradient(45deg, @mask-color3, 25%, @mask-color3, 25%, @mask-color2, 75%, @mask-color3, 75%, @mask-color3);
+        background-size: 20px 20px;
+        background-position: 0 0, 10px 10px, 10px 0, 0 10px;
+        background-repeat: repeat;
+        background-clip: border-box;
+
+    }
+</style>
+<table onmounted="update()">
+
+    <caption><strong>cloneVisible</strong>&nbsp;&nbsp;<i>vs.</i>&nbsp;&nbsp;<strong>html2canvas</strong></caption>
+    <thead>
+        <tr>
+            <th>原图</th>
+            <th>cloneVisible</th>
+            <th>html2canvas</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr #row>
+            <td>
+                <div
+                    style="width:100px;height:100px;position:relative;background-color:#223223;overflow:hidden;border-radius:100px;">
+                    <div
+                        style="border:5px dashed;line-height:40px;text-align:center;text-shadow:1px 3px 0 red;color:#ff3;text-indent:20px">
+                        abc
+                        <span class='cl-c'>cl-c</span>
+                        <input style="width:10px;height:10px;-webkit-appearance:none" />
+                        <span style="writing-mode:vertical-rl;letter-spacing:12px">
+                            书生<br />意气
+                        </span>
+                    </div>
+                    <style>
+                        .cl-c {
+                            display: block;
+                            float: right;
+                        }
+                    </style>
+
+                </div>
+            </td>
+            <td></td>
+            <td></td>
+        </tr>
+    </tbody>
+</table>
+<script>
+    function update() {
+        var [td1, td2, td3] = this.row.children;
+        var ele = td1.children[0]
+        setTimeout(function () {
+            var clone = cloneVisible(ele);
+            appendChild(td2, clone);
+            console.log(ele)
+            ele.with ? ele.with.push(clone) : ele.with = [clone];
+            var e1 = window.e1 = ele.querySelector("input");
+            var e2 = window.e2 = clone.querySelector("input");
+            var s1 = window.s1 = getComputedStyle(e1);
+            var s2 = window.s2 = getComputedStyle(e2);
+            for (var k in s1) {
+                if (s1[k] !== s2[k] && !/cssText/.test(k)) {
+                    console.warn(k, 'src:', s1[k], 'dst:', s2[k]);
+                }
+            }
+
+            html2canvas(ele, { backgroundColor: "rgba(0,0,0,0)" }).then(function (e) {
+                appendChild(td3, e);
+            });
+        });
+    }
+</script>

package/coms/zimoli/gallery.js

@@ -47,7 +47,6 @@ function gallery(element, minWidth, generator) {
             maxWidth: fromPixel(maxWidth),
         });
     };
-    resizingList.set(element);
     var createColumn = function (id) {
         var _box = list(function (index) {
             var realindex = index * boxCount + id;
@@ -95,7 +94,7 @@ function gallery(element, minWidth, generator) {
         this.clean();
         this.go(index || 0);
     });
-    on('resize')(element, element.resize);
+    resizingList.set(element, element.resize);
     return element;
 }
 function main() {

package/coms/zimoli/lattice.js

@@ -79,7 +79,7 @@ function lattice(element, minWidth, _maxWidth, layers) {
             go.call(_box, index);
         }
     });
-    resizingList.set(_box);
+    resizingList.set(_box, _box.resize);
     on('resize')(_box, _box.resize);
     return _box;
 }

package/coms/zimoli/onresize.js

@@ -1 +1,2 @@
-var onresize=on("resize");
+console.warn(`%c onresize(...) %c方法将在未来的版本中移除！使用%c on("resize")(window, handler) %c 或 %c resizingList.set(element, handler) %c 代替`,
+"color:red","color:#333","color:blue","color:#333","color:blue","color:#333"), on("resize");

package/coms/zimoli/render.js

@@ -797,6 +797,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
     }
     if (!isFirstRender) return element;
     renderRest(element, element.$struct, replacer);
+    var restons = element.$struct.ons;
     if (replacer) {
         if (!replacer.renders) replacer.renders = [];
         if (isElement(replacer)) createStructure(replacer);
@@ -810,7 +811,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         }
         element = replacer;
     }
-    if (element.$struct) element.$struct.ons.forEach(([on, key, value]) => on.call(element, element, key, value));
+    restons.forEach(([on, key, value]) => on.call(element, element, key, value));
     if (element.renders.length) {
         if (element.renderid !== 9) {
             onmounted(element, addRenderElement);
@@ -897,7 +898,7 @@ function createStructure(element) {
             value = name.slice(1).replace(/\./g, ' ')
             name = 'class';
             copys.push({ name, value });
-            element.setAttribute(name, value);
+            addClass(element, value);
             continue;
         }
         if (/^(?:class|style|src|\:|placeholder)$/i.test(name)) {

package/coms/zimoli/resizingList.js

@@ -1,3 +1,4 @@
+var onresize = on("resize");
 onresize(window, function () {
     for (var r of resizingList) {
         dispatch(r, 'resize');
@@ -11,9 +12,13 @@ var unmount = function () {
     removeFromList(resizingList, this);
 };
 var resizingList = [];
-resizingList.set = function (e) {
-    on('append')(e, mount);
-    on("remove")(e, unmount);
+resizingList.set = function (e, h) {
+    var off1 = onmounted(e, mount);
+    var off2 = on("remove")(e, unmount);
+    if (isFunction(h)) var off3 = onresize(e, h);
+    var offs = [off1, off2];
+    if (off3) offs.push(off3);
+    return function (offs) { for (var off of offs) off() };
 };
 resizingList.hit = function (e) {
     for (var a of this) {

package/coms/zimoli/slider.js

@@ -323,7 +323,7 @@ function slider(autoplay, circle = true) {
     var cancel_resize;
     onappend(outter, function () {
         cancel_resize && cancel_resize();
-        cancel_resize = onresize(window, function () {
+        cancel_resize = on("resize")(window, function () {
             switchBy(0);
         });
         if (isFinite(outter.index)) switchBy(0);

package/coms/zimoli/table.js

@@ -527,8 +527,7 @@ function table(elem) {
             })
         }
     );
-    resizingList.set(table);
-    on("resize")(table, setFixedColumn);
+    resizingList.set(table, setFixedColumn);
     on("scroll")(table, setFixedColumn);
     return table;
 }

package/coms/zimoli/view.less

@@ -3,6 +3,7 @@ body>& {
 }
 
 & {
+    display: block;
     max-width: 100%;
     width: 360px;
     height: auto;
@@ -22,7 +23,7 @@ body>& {
     position: absolute;
 }
 
-&>.body,
+>.body,
 >[body] {
     padding: 6px 20px 6px 6px;
     margin-right: -20px;
@@ -45,7 +46,7 @@ body>& {
 }
 
 
-&>.head,
+>.head,
 >[head] {
     top: 0;
     z-index: 2;
@@ -94,13 +95,13 @@ body>& {
     }
 }
 
-&>.foot,
+>.foot,
 >[foot] {
     white-space: nowrap;
     overflow: auto;
 }
 
-&>.foot,
+>.foot,
 >[foot] {
     z-index: 1;
     text-align: right;

package/package.json

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