efront 3.26.15 → 3.26.16

package/apps/pivot/api.yml

@@ -3,7 +3,8 @@
   run: options :::run
   share: options ::share-:opt?:path
   folder: options ::file-:opt:::path?:to
-  cluster: options ::cluster-:opt?:id
+  cluster: options ::cluster-list
+  clients: options ::cluster-list?:id
   list: options :::type
   edit: options :::type-:key?:value
   add: options :::type-:key+:value

package/apps/pivot/link/index.html

@@ -1,2 +1,2 @@
-<menu -src="m in menus" #navbar></menu>
+<menu @active="saveIndex(i)" -src="(m,i) in menus" #navbar></menu>
 <container -src="navbar.selected?.path"></container>

package/apps/pivot/link/index.js

@@ -6,8 +6,11 @@ function index() {
             var [name, path] = a.split(/\s+/);
             return { name, path };
         }),
+        saveIndex(index) {
+            data.setInstance('link-index', index);
+        },
         menu,
     });
-    page.$scope.menus[0].actived = true;
+    page.$scope.menus[+data.getInstance("link-index")].actived = true;
     return page;
 }

package/apps/pivot/link/list.js

@@ -4,7 +4,7 @@ function main() {
     page.innerHTML = template;
     renderWithDefaults(page, {
         load: lazy(async function () {
-            this.clusters = data.lazyInstance("cluster", { opt: "list" });
+            this.clusters = data.lazyInstance("cluster");
             await this.clusters;
             this.active();
         }, -1000),
@@ -25,11 +25,12 @@ function main() {
             return ((new Date - d) / 1000 | 0) + "秒";
         },
         clients: [],
-        active(index = this.index.index | 0) {
+        async active(index = this.index.index | 0, c) {
             data.setInstance('index', { index });
             var clusters = this.clusters;
             if (index >= clusters.length) index = clusters.length - 1;
-            this.clients = data.from("cluster", { opt: "list", id: clusters[index] });
+            if (c) this.clients = [];
+            this.clients = await data.asyncInstance("clients", { id: clusters[index] });
         },
     });
     var loadid = 0;

package/coms/frame/chat.html

@@ -3,7 +3,7 @@
     </template>
     <close @click="remove()"></close>
 </div>
-<grid body #body>
+<grid #body disabled>
     <chat -src="m in msglist">
         <padding>
             <msg class="msg"></msg>

package/coms/frame/chat.js

@@ -14,14 +14,36 @@ function msg(elem, { m: data }, parentScopes) {
             elem.innerText = data;
     }
 }
+var userManager = function (users, m) {
+    for (var cx = 0, dx = users.length; cx < dx; cx++) {
+        var u = users[cx];
+        if (u.id === m.id) {
+            if (m.deleted) users.splice(cx, 1);
+            else Object.assign(u, m);
+            return;
+        }
+    }
+    if (!m.deleted) users.push(m);
+};
 function chat(title = '会话窗口') {
     var page = view();
     page.innerHTML = template;
     drag.on(page.firstElementChild, page);
     resize.on(page);
     var localid = Date.now() + Math.sin(Math.random());
+    var users = [];
     page.push = function (msgs) {
         var { msglist } = this.$scope;
+        msgs = msgs.filter(m => {
+            if (!m) return false;
+            if (isString(m)) return true;
+            switch (m.type) {
+                case 'user':
+                    userManager(users, m);
+                    break;
+            }
+            return false;
+        });
         msglist.push.apply(msglist, msgs);
         var chat = page.querySelector("chat");
         var lastmsg = chat.getLastVisibleElement();
@@ -35,8 +57,8 @@ function chat(title = '会话窗口') {
     renderWithDefaults(page, {
         chat: list,
         title,
-        grid,
         msglist: [],
+        users,
         text: '',
         localid,
         msg,
@@ -47,8 +69,7 @@ function chat(title = '会话窗口') {
             var textarea = body.querySelector("[textarea]");
             var lastElementChild = textarea.lastElementChild;
             var targetHeight = Math.min(textarea.scrollHeight, body.clientHeight * .6, lastElementChild.offsetTop + lastElementChild.offsetHeight);
-            if (Math.abs(targetHeight - textarea.clientHeight) < 2) return;
-
+            if (Math.abs(targetHeight - textarea.clientHeight - textarea.clientTop) < 2) return;
             body.resizeCell(textarea, 'top', textarea.clientHeight - targetHeight - 2);
         },
         send() {
@@ -61,8 +82,7 @@ function chat(title = '会话窗口') {
 
             data = encode62.timeencode(data);
             if (this.text.length > 2000) {
-                alert("信息太长，无法发送！");
-                return;
+                return alert("信息太长，无法发送！");
             }
             cast(page, "send", data);
             this.body.lastElementChild.focus();

package/coms/frame/chat.less

@@ -76,19 +76,26 @@ msg {
     line-height: 24px;
 }
 
->grid[body] {
+>grid {
     padding-top: 0;
     margin-bottom: 0;
+    height: 100%;
+    background-color: #f2f4f6;
+    width: 100%;
 
     >div {
         height: 100%;
         position: relative;
     }
+
+    >chat {
+        padding-top: 50px;
+    }
 }
 
 
 .editor-height(@height) {
-    >grid[body]:not(:last-child) {
+    >grid:not(:last-child) {
         padding-bottom: @height;
     }
 

package/coms/zimoli/data.js

@@ -811,12 +811,12 @@ var data = {
     },
     fromApi(api, params, parse) {
         var id = parse instanceof Function ? getInstanceId() : 0;
+        var p = privates.fromApi(api, params);
         if (id) this.removeInstance(id);
         var url = api.url;
         var response = this.getInstance(id || url);
         if (!isObject(response)) response = new LoadingArray;
         this.responseLoading(response);
-        var p = privates.fromApi(api, params);
         response.loading = p.loading;
         p = response.loading_promise = p.then((data) => {
             response.loading = null;
@@ -838,11 +838,11 @@ var data = {
     },
     fromURL(url, parse) {
         var id = parse instanceof Function ? getInstanceId() : 0;
+        var p = privates.loadIgnoreConfig('get', url);
         if (id) this.removeInstance(id);
         var response = this.getInstance(id || url);
         if (!isObject(response)) response = new LoadingArray;
         this.responseLoading(response);
-        var p = privates.loadIgnoreConfig('get', url);
         response.loading = p.loading;
         p = response.loading_promise = p.then((data) => {
             response.loading = null;
@@ -925,6 +925,7 @@ var data = {
         }
         var outdate = new Error("request outdate.");
         var aborted = new Error("request aborted.");
+        this.responseLoading(instance);
         promise1 = instance.loading_promise = new Promise(function (ok) {
             if (!instance.loading) {
                 instance.loading = false;
@@ -938,7 +939,6 @@ var data = {
             if (instance.loading) {
                 instance.loading.abort();
             }
-            this.responseLoading(instance);
             var params2 = privates.pack(sid, params1);
             if (!privates.validApi(api, params2)) throw aborted;
             let url = api.url;
@@ -979,6 +979,7 @@ var data = {
             this.responseLoaded(instance);
             return data;
         });
+        promise1.params = params;
         promise1.catch((e) => {
             if (e === outdate || e === aborted) return;
             this.responseCrash(e, instance);

package/coms/zimoli/grid.js

@@ -203,6 +203,7 @@ var resizeView = function (event) {
     grid.reshape();
 };
 var clearResizer = function (grid) {
+    if (!grid.editting) return;
     var target = grid.editting.target;
     if (target) target.style.zIndex = null;
     var { clientX, clientY } = grid.editting;
@@ -758,7 +759,6 @@ var createPointsWithChildren = function () {
         points = [0, points];
     }
     grid.setData(points);
-    console.log(grid.clientHeight, elements)
     grid.reshape();
 };
 function main(elem) {

package/coms/zimoli/render.js

@@ -381,7 +381,7 @@ var renderStructure = function (element) {
     if ($struct.repeat) var { value: repeat } = $struct.repeat;
     if (!ifkey) return createRepeat.call(element, repeat);
     if (!ifexp || !repeat) {
-        delete $struct.if;
+        if (repeat) delete $struct.if;
         return structures[key].call(element, ifexp);
     }
     var { before, after } = parseIfWithRepeat(ifexp, repeat);

package/package.json

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