efront 3.7.0 → 3.7.6

package/apps/pivot/auth/login.js

@@ -4,7 +4,6 @@ var fields = refilm`
 服务器地址/host* select?a ${hosts}
 密码/password* password
 `;
-console.log(fields)
 function main() {
     var page = view();
     page.innerHTML = login;

package/apps/pivot/link/list.html

@@ -1,5 +1,5 @@
 <div class="clusters">
-    <a -repeat="(c,i) in clusters" @click="active(i)">
+    <a -repeat="(c,i) in clusters" ng-class="{current:i===index}" @click="active(i,c)">
         <span -text="c"></span>
     </a>
 </div>
@@ -7,6 +7,6 @@
     <padding>
         <span -text=c.id></span>
         <span class="time" -text=filterTime(c.optime)></span>
-        
+
     </padding>
 </lattice>

package/apps/pivot/link/list.js

@@ -3,21 +3,21 @@ function main() {
     page.innerHTML = template;
     renderWithDefaults(page, {
         async load() {
-            var cs = this.clusters = data.from("cluster", { opt: "list" });
-            await cs.loading_promise;
+            this.clusters = data.from("cluster", { opt: "list" });
+            await this.clusters;
             this.active();
         },
-        index: 0,
+        index: data.getInstance("index").index || 0,
         clusters: [],
         filterTime(d) {
             return ((new Date - d) / 1000 | 0) + "秒";
         },
         clients: [],
-        async active() {
-            var index = this.index;
+        active(index = this.index) {
+            data.setInstance('index', { index });
             var clusters = this.clusters;
             if (index >= clusters.length) index = clusters.length - 1;
-            this.clients = data.lazyInstance("cluster", { opt: "list", id: clusters[index] });
+            this.clients = data.from("cluster", { opt: "list", id: clusters[index] });
         },
     });
     page.$scope.load();

package/apps/pivot/link/list.less

@@ -6,4 +6,9 @@
 
 .time {
     color: #bbb;
+}
+
+.button.current {
+    background: #28c;
+    color: #fff;
 }

package/apps/pivot/token/edit.js

@@ -1,5 +1,6 @@
 frame$edit.bind(null, "密钥", {
-    submit(a) {
+    submit(a, fields) {
+        a = submit(fields, a);
         return data.from("private-edit", {
             key: encode62.timeencode(a.key),
             value: encode62.timeencode(JSON.stringify(a)),

package/apps/pivot/token/list.js

@@ -6,8 +6,8 @@ frame$list.bind(null, "密钥管理", {
         return data.from("private-edit", { key: encode62.timeencode(o.key), value: encode62.timeencode("") }).loading_promise;
     },
     fields: refilm`
-显示名/name input
-*键名/key
-密钥/value
-备注/comment
+*键名/key 100
+显示名/name input/300
+密钥/value text/100
+备注/comment text/200
 `}, "/token/edit");

package/coms/basic/encodeUTF8.js

@@ -1,6 +1,6 @@
 var d = 0b10000000, s = 0b00111111;
 function numberUTF8(t, dist = []) {
-    if (t < 127) {//0b0xxxxxxx - 0b10xxxxxx
+    if (t < 128) {//0b0xxxxxxx - 0b10xxxxxx
         dist.push(0b00000000 | t)
     }
     else if (t < 2048) {// 0b110xxxxx 10xxxxxx

package/coms/crypt/encode62.js

@@ -1,5 +1,7 @@
 "use strict";
 module.exports = encode62;
+var encodeUTF8 = require("../basic/encodeUTF8");
+var decodeUTF8 = require("../basic/decodeUTF8");
 var src = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
 var map = {};
 src.split("").forEach((s, i) => map[s] = i);
@@ -69,6 +71,20 @@ Object.assign(encode62, {
         });
         return result;
     },
+    encodestr(data, sign) {
+        if (!sign) return data;
+        var result = encodeUTF8(data);
+        sign = Buffer.from(sign);
+        var delta = 0, c = 0;
+        for (var cx = 0, dx = data.length; cx < dx; cx++) {
+            if (result[cx] < 128) result[cx] = result[cx] ^ sign[cx % sign.length];
+            else if (result[cx] < 192) {
+                var c = c << 8 | sign[(delta += 6) / 8 | 0];
+                result[cx] = result[cx] ^ (c >> 8 - delta % 8 & 0x3f);
+            }
+        }
+        return decodeUTF8(result);
+    },
     decode(data, sign) {
         if (!sign) return data;
         var result = Buffer.from(data);
@@ -101,5 +117,6 @@ Object.assign(encode62, {
 encode62.ab2c = encode62.ba2d = encode62.huan;
 encode62.db2a = encode62.ca2b = encode62.yuan;
 encode62.da2b = encode62.cb2a = encode62.suan;
+encode62.decodestr = encode62.encodestr;
 encode62.encode = encode62.decode;
 encode62.decode62 = encode62.encode62;

package/coms/frame/edit.js

@@ -18,7 +18,7 @@ function main(title, { submit }, { data: origin, fields, }) {
     });
     on('submit')(page, async function (e) {
         e.preventDefault();
-        await submit(item);
+        await submit(item, fields);
         dispatch(this, 'submited');
         remove(this);
     });

package/coms/frame/edit.less

@@ -0,0 +1,3 @@
+&{
+    width: 600px;
+}

package/coms/frame/list.less

@@ -1,3 +1,23 @@
-btn{
+btn {
     padding: 0 16px;
+}
+
+& {
+    height: 100%;
+    overflow: auto;
+}
+
+table {
+
+    td {
+        >span {
+            white-space: normal;
+            word-break: break-all;
+            overflow: hidden;
+            display: -webkit-box;
+            -webkit-line-clamp: 2;
+            -webkit-box-orient: vertical;
+            text-overflow: ellipsis;
+        }
+    }
 }

package/coms/frame/main.less

@@ -1,4 +1,5 @@
 & {
     border-top-width: 0;
     width: 100%;
+    overflow: auto;
 }

package/coms/zimoli/LoadingArray.js

@@ -0,0 +1,27 @@
+// class LoadingArray extends Array {
+//     totalCount = 0;
+//     data = [];
+//     is_errored = null;
+//     error_message = null;
+//     is_loading = true;
+//     is_loaded = false;
+//     is_readonly = null;
+//     loading = null;
+//     loading_promise = null;
+//     then (ok, oh) {
+//         if (this.loading_promise) this.loading_promise.then(ok, oh);
+//     }
+// }
+function LoadingArray() {
+    var this0 = [];
+    this0.totalCount = 0;
+    this0.data = [];
+    this0.is_errored = null;
+    this0.error_message = null;
+    this0.is_loading = true;
+    this0.is_loaded = false;
+    this0.is_readonly = null;
+    this0.loading = null;
+    this0.loading_promise = null;
+    return this0;
+};

package/coms/zimoli/data.js

@@ -402,6 +402,12 @@ function createApiMap(data) {
 }
 var _configfileurl;
 var configPormise;
+function LoadingArray_then(ok, oh) {
+    if (this.loading_promise) this.loading_promise.then(ok, oh);
+    else if (this.is_errored) oh(this.error_message);
+    else ok();
+}
+
 var privates = {
     loadAfterConfig(serviceId, params) {
         var promise = this.getApi(serviceId).then((api) => {
@@ -622,6 +628,7 @@ var data = {
         if (isObject(response)) {
             response.is_loaded = true;
             response.is_loading = false;
+            if (response.then === LoadingArray_then) delete response.then;
         }
         this.loading_count--;
     },
@@ -630,6 +637,7 @@ var data = {
         if (isObject(response)) {
             response.is_loaded = false;
             response.is_loading = true;
+            response.then = LoadingArray_then;
         }
         this.loading_count++;
     },

package/coms/zimoli/render.js

@@ -90,7 +90,7 @@ var initialComment = function (renders, type, expression) {
 var parseRepeat = function (expression) {
     var reg =
         // /////////////////////////////////////////// i //       r       /////////////////////////  o  ///// a ///////////////////// t /////
-        /^(?:let\b|var\b|const\b)?\s*(?:[\(\{\[]\s*)?(.+?)((?:\s*,\s*.+?)*)?(?:\s*[\)\}\]]\s*|\s+)(in|of)\s+(.+?)(\s+?:track\s*by\s+(.+?))?$/i;
+        /^(?:let\b|var\b|const\b)?\s*(?:[\(\{\[]\s*)?(.+?)((?:\s*,\s*.+?)*)?(?:\s*[\)\}\]]\s*|\s+)(in|of)\s+(.+?)(?:\s+track\s*by\s+(.+?))?$/i;
     var res = reg.exec(expression);
     if (!res) return res;
     var [_, i, k, r, s, t] = res;
@@ -125,7 +125,7 @@ var createRepeat = function (search, id = 0) {
     var [context, expression] = search;
     var res = parseRepeat(expression);
     if (!res) throw new Error(`不能识别循环表达式: ${expression} `);
-    var { keyName, itemName, indexName, srcName } = res;
+    var { keyName, itemName, indexName, srcName, trackBy } = res;
     // 懒渲染
     var getter = createGetter([context, srcName]).bind(this);
     var element = this, clonedElements = [], savedValue, savedOrigin;
@@ -151,17 +151,26 @@ var createRepeat = function (search, id = 0) {
         var clonedElements1 = Object.create(null);
         var cloned = keys.map(function (key, cx) {
             var k = isArrayResult ? cx : key;
-            var c = changes[k];
-            if (clonedElements[k]) if (!c || !isObject(c.previous) && !isObject(c.current)) return clonedElements1[k] = clonedElements[k];
-            var clone = element.cloneNode();
-            clone.innerHTML = element.innerHTML;
-            clone.renderid = id;
-            clone.$parentScopes = $parentScopes;
             var $scope = {
                 [keyName || '$key']: k,
                 [itemName || '$item']: result[k],
                 [indexName || '$index']: cx
             };
+            if (trackBy) {
+                k = seek($scope, trackBy);
+                if (clonedElements[k]) {
+                    clonedElements[k].$scope = $scope;
+                    return clonedElements1[k] = clonedElements[k];
+                }
+            }
+            else {
+                var c = changes[k];
+                if (clonedElements[k]) if (!c || !isObject(c.previous) && !isObject(c.current)) return clonedElements1[k] = clonedElements[k];
+            }
+            var clone = element.cloneNode();
+            clone.innerHTML = element.innerHTML;
+            clone.renderid = id;
+            clone.$parentScopes = $parentScopes;
             clone.$scope = $scope;
             clone.$parentScopes = $parentScopes;
             clone.$struct = $struct;

package/coms/zimoli/table.html

@@ -1,6 +1,7 @@
 <thead>
     <tr>
-        <td -repeat="f in fields"><i -if="f.icon" -class="f.icon"></i></span><span -if="f.name" -html="f.name"></span>
+        <td -repeat="f in fields track by f.id" :style="{width:f.width}"><i -if="f.icon"
+                -class="f.icon"></i></span><span -if="f.name" -html="f.name"></span>
         </td>
     </tr>
 </thead>

package/coms/zimoli/table.js

@@ -91,11 +91,11 @@ var adaptTarget = function (event) {
             }
             if (target) target = getFirstSingleColCell(this, target.colend);
             if (target) {
-                if (position.right >= getSelection(this).right - 7) {
+                if (position.right >= getScreenPosition(this).right - 7) {
                     target = this;
                     return;
                 }
-                css(this, { 'cursor': 'e-resize' });
+                css(document.body, { 'cursor': 'col-resize' });
                 result = {
                     target,
                     restX: event.clientX - target.offsetWidth
@@ -106,18 +106,66 @@ var adaptTarget = function (event) {
     }
     if (!result) {
         this.resizing = false;
-        css(this, { 'cursor': 'default' });
+        css(document.body, { 'cursor': '' });
     }
 };
 var tdElementReg = /^t[hd]$/i;
 var trElementReg = /^tr$/i;
+var id = 0;
+function enrichField(f) {
+    if (!f.id) f.id = ++id;
+    if (f.width) return;
+    var width;
+    if (f.size) {
+        width = f.size;
+        if (width < 40) width = width * 16;
+    }
+    else switch (f.type) {
+        case "text":
+            width = 30;
+            break;
+        case "input":
+            width = 200;
+            break;
+        case "date":
+            width = 180;
+        case "datetime":
+            width = 200;
+            break;
+        case "time":
+            width = 120;
+            break;
+        default:
+            if (f.options) {
+                width = f.options.map(o => o.name instanceof Function ? o.name() : o.name).join(" ").length * 20;
+            } else {
+                width = String(f.name || f.key).length * 16;
+            }
+    }
+    if (width > 600) width = 600;
+    f.width = width + 60;
+}
+
 
 function table(elem) {
     var tableElement = isElement(elem) ? elem : document.createElement("table");
     var activeCols = [];
-    onmousemove(tableElement, adaptTarget);
+    var adaptCursor = adaptTarget.bind(tableElement);
+    var off;
+    tableElement.init = function () {
+        off = on("mousemove")(window, adaptCursor);
+    };
+    tableElement.dispose = tableElement.destroy = function () {
+        off();
+    };
+    on("append")(tableElement, tableElement.init);
+    on("remove")(tableElement, tableElement.destroy);
+    if (isMounted(tableElement)) tableElement.init();
+
     moveupon(tableElement, {
-        start() { },
+        start(event) {
+            if (this.resizing) event.preventDefault();
+        },
         move: resizeTarget,
     });
     onmousemove(tableElement, function (event) {
@@ -142,7 +190,7 @@ function table(elem) {
             removeClass(td, "y-ing");
         });
     });
-    var table = tableElement.hasAttribute("ng-src") || tableElement.hasAttribute("src") ? list(tableElement) : tableElement;
+    var table = tableElement;
     var thead;
     var cellMatchManager = function (element) {
         if (!thead) [thead] = table.getElementsByTagName("thead");
@@ -162,10 +210,14 @@ function table(elem) {
     care(table, function ([fields, data]) {
         thead = null;
         this.innerHTML = template;
+        fields.forEach(enrichField);
         render(this, {
             fields,
             tbody: list,
             data,
+            setWidth(target, f) {
+                css(target, { width: f.width });
+            },
             a: button,
         }, this.$parentScopes.concat(this.$scope));
     })

package/coms/zimoli/table.less

@@ -1,4 +1,5 @@
 &[dragchildren] {
+
     >thead,
     >tbody,
     & {
@@ -74,8 +75,9 @@ table,
     line-height: 32px;
     height: 100%;
     min-height: 30px;
-
+    user-select: auto;
     display: table-row-group;
+    overflow: auto;
 
     >tr {
 

package/coms/zimoli/textarea.less

@@ -16,6 +16,5 @@
 model>& {
     width: 100% !important;
     display: block;
-    margin: 10px 0;
     height: 120px;
 }

package/coms/zimoli/zimoli.js

@@ -249,9 +249,11 @@ function prepare(pgpath, ok) {
         return _with_elements;
     };
     state.path = function (url) {
-        if (isString(url) && /^\.+[\\\/]/.test(url)) {
-            url = url.replace(/^\.[\\\/]/, '');
+        if (/^\.+\//.test(url)) {
             url = pgpath.replace(/[^\/]*$/, url);
+        }
+        if (isString(url) && /[\\\/\.]/.test(url)) {
+            url = url.replace(/^\.[\\\/]/, '');
             var ps = url.split(/[\\\/]/);
             var ds = [];
             for (var p of ps) {
@@ -262,7 +264,7 @@ function prepare(pgpath, ok) {
                     ds.push(p);
                 }
             }
-            url = ds.join('/');
+            url = "/" + ds.join('/').replace(/^\//, '');
         }
         return url;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.7.0",
+    "version": "3.7.6",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {