efront 3.28.0 → 3.29.1

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/cross_.js

@@ -286,16 +286,18 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                         }
                         location = getRequestProtocol(url) + "//" + location;
                     }
-                    var crs = cross_.call(cross, jsonp, digest, method, location, _headers);
-                    crs.isRedirected = (xhr.isRedirected || 0) + 1;
-                    crs.done(onload, false);
-                    crs.error(onerror, false);
-                    if (!isEmpty(datas)) crs.send(datas);
+                    if (!redirected) redirected = [];
+                    headers = _headers;
+                    url = location;
+                    var r = method + " " + url;
+                    if (redirected.indexOf(r) >= 0 || redirected.length > 10) onerror(xhr);
+                    else redirected.push(r), fire();
                     break;
                 default:
                     onerror(xhr);
             }
         };
+        var redirected = null;
         var cross = this;
         var xhr = cross(callback, onerror);
         var send = xhr.send;
@@ -327,6 +329,8 @@ function cross_(jsonp, digest = noop, method, url, headers) {
         };
         var fire = async function (code) {
             if (!~requests.indexOf(xhr)) return;
+            xhr.method = method;
+            xhr.url = url;
             xhr.encrypt = code;
             var isform = /^f/i.test(method);
             if (isform) {

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/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,30 @@
+<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>

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/package.json

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