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

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