efront 3.17.2 → 3.18.0

package/coms/frame/design.js

@@ -0,0 +1,23 @@
+function design(fields, types) {
+
+    var e = document.createElement("fields-designer");
+    e.innerHTML = template;
+    var e = view(e);
+    renderWithDefaults(e, {
+        fields: fields ? JSAM.parse(JSAM.stringify(fields)) : [],
+        design() {
+            return zimoli$design(this.fields, types);
+        },
+        remove() {
+            remove(e);
+        },
+        save() {
+            e.value = this.fields;
+            dispatch(e, 'changed');
+            remove(e);
+        }
+    });
+    drag.on(e.firstChild, e);
+    resize.on(e);
+    return e;
+}

package/coms/frame/design.less

@@ -0,0 +1,17 @@
+& {
+    width: 420px;
+
+}
+
+>[body] {
+    >.options>.button {
+        z-index: 2;
+        margin-top: -56px;
+    }
+    >.options{
+        height: 0;
+        line-height: 0;
+    }
+
+    overflow: visible;
+}

package/coms/frame/dict.js

@@ -0,0 +1,21 @@
+function main(types, elem) {
+    var { field, data, readonly } = elem;
+    elem.innerHTML = `<span -text="text()"></span>` + (readonly ? "" : '<a @click="edit()">修改</a>');
+    renderWithDefaults(elem.children, {
+        text() {
+            if (data[field.key]) return data[field.key].map(k => `${k.name} ${isEmpty(k.key) ? "" : `(${k.key})`}`).join(", ");
+            return '';
+        },
+        edit() {
+            var editer = frame$design(data[field.key], types);
+            css(editer, { position: 'absolute' });
+            popup(editer);
+            move.bindPosition(editer, [.5, .5]);
+            on("changed")(editer, function () {
+                console.log(this.value, field)
+                data[field.key] = this.value;
+            });
+        }
+    })
+    return elem;
+};

package/coms/frame/edit.js

@@ -10,7 +10,7 @@ function main(title, { submit }, { data: origin, fields, }) {
     renderWithDefaults(page, {
         fields,
         title,
-        origin: item,
+        origin,
         data: item,
         remove() {
             remove(page);

package/coms/frame/list.js

@@ -49,7 +49,7 @@ function main(title, { fields, options: options0, load, remove }, edit_ref) {
         load() {
             this.data = load();
         },
-        fields: fields.concat({
+        fields: fields.filter(f => !f.hidden && f.inlist !== false).concat({
             name: "操作",
             options
         }),

package/coms/frame/route.js

@@ -162,6 +162,7 @@
         }
     };
     result.load = function (menu) {
+        data.abortAll();
         zimoli.go(menu);
         return result;
     };

package/coms/kugou/song.html

@@ -3,6 +3,6 @@
 <div class="song" ng-model=song.songMarked></div>
 <div class="singer" ng-model=song.singerMarked></div>
 <div class="filterTime(song.timeLength)"></div>
-<div class="play-state" ng-if="song.hash===musicList.active_hash" ng-class={error:playState.error}>
+<div refresh class="play-state" ng-if="song.hash===musicList.active_hash" ng-class={error:playState.error}>
     <div ng-style="{width:playState.width}"></div>
 </div>

package/coms/kugou/song.js

@@ -1,5 +1,6 @@
 function main(elem) {
     elem = elem || document.createElement("song");
+    elem.renderid = 9;
     var $scope = {
         filterTime,
         png: img,
@@ -23,7 +24,7 @@ function main(elem) {
             songMarked: mark(songName, elem.mark),
             singerMarked: mark(singerName, elem.mark)
         };
-        render(elem.children, $scope);
+        render(elem.children, $scope, 0);
     });
     return block(elem);
 }

package/coms/pivot/pedit.js

@@ -1,10 +1,10 @@
-function main(title, type, params) {
+function main(title, type, params, idkey = params.fields[0].key) {
     return frame$edit(title, {
         submit(a, fields) {
             a = submit(fields, a);
-            return data.from("edit", {
+            return data.from(params.data ? "edit" : "add", {
                 type,
-                key: encode62.timeencode(a.key),
+                key: encode62.timeencode(a[idkey]),
                 value: encode62.timeencode(JSON.stringify(a)),
             }).loading_promise;
         },

package/coms/pivot/plist.js

@@ -1,11 +1,11 @@
 
-function main(title, type, fields, edit_ref, options) {
+function main(title, type, fields, edit_ref, options, idkey = fields[0].key) {
     return frame$list(title, {
         load() {
             return data.from("list", { type }, a => JSAM.parse(encode62.timedecode(a || '')));
         },
         remove(o) {
-            return data.from("edit", { type, key: encode62.timeencode(o.key), value: encode62.timeencode("") }).loading_promise;
+            return data.from("edit", { type, key: encode62.timeencode(o[idkey]), value: encode62.timeencode("") }).loading_promise;
         },
         fields,
         options,

package/coms/zimoli/cloneVisible.js

@@ -88,6 +88,7 @@ var isMaybeVisible = function (node) {
     }
     if (node.offsetParent) {
         var parent = node.offsetParent;
+        if (getComputedStyle(parent).overflow === 'visible') return true;
         return !(node.offsetLeft + node.offsetWidth - parent.scrollLeft <= parent.clientLeft ||
             node.offsetTop + node.offsetHeight - parent.scrollTop <= parent.clientTop ||
             node.offsetLeft - parent.scrollLeft >= (parent.clientWidth || parent.offsetWidth) ||

package/coms/zimoli/data.js

@@ -433,15 +433,11 @@ function LoadingArray_then(ok, oh) {
     else if (this.is_errored) oh(this.error_message);
     else ok();
 }
+function LoadingArray_abort(ok, oh) {
+    if (this.loading) this.loading.abort();
+}
 
 var privates = {
-    loadAfterConfig(serviceId, params) {
-        var promise = this.getApi(serviceId).then((api) => {
-            params = this.pack(serviceId, params);
-            return this.fromApi(api, params);
-        });
-        return promise;
-    },
     pack(serviceId, params) {
         if (/\?/.test(serviceId)) {
             params = extend({}, getParamsFromUrl(serviceId), params);
@@ -565,12 +561,13 @@ var privates = {
         var promise = cachedLoadingPromise[id];
         var temp = JSON.stringify(params);
         var currentTime = +new Date;
+        var loading = null;
         if (!promise || currentTime - promise.time > 60 || temp !== promise.params || promise.search !== search) {
             var promise = new Promise(function (ok, oh) {
                 if (headers) {
                     headers = seekFromSource(headers, api.base);
                 }
-                cross(realmethod, uri, headers).send(params).done(e => {
+                loading = cross(realmethod, uri, headers).send(params).done(e => {
                     ok(e.response || e.responseText);
                 }).error(xhr => {
                     try {
@@ -581,12 +578,13 @@ var privates = {
                     }
                 });
             });
+            promise.loading = loading;
             promise.search = search;
             promise.params = temp;
             promise.time = currentTime;
             cachedLoadingPromise[id] = promise;
         }
-        return promise.then(function (response) {
+        var p = promise.then(function (response) {
             if (/\*$/.test(coinmethod)) return response;
             var data = parseData(response);
             var checked = error_check(data);
@@ -598,6 +596,8 @@ var privates = {
             }
             return data;
         });
+        p.loading = loading;
+        return p;
     },
 
     getConfigPromise() {
@@ -659,6 +659,7 @@ var data = {
             response.is_loaded = true;
             response.is_loading = false;
             if (response.then === LoadingArray_then) delete response.then;
+            if (response.abort === LoadingArray_abort) delete response.abort;
         }
     },
     responseCrash,
@@ -667,6 +668,7 @@ var data = {
             response.is_loaded = false;
             response.is_loading = true;
             response.then = LoadingArray_then;
+            response.abort = LoadingArray_abort;
         }
     },
     setReporter(report, checker) {
@@ -758,7 +760,10 @@ var data = {
         var response = this.getInstance(id || url);
         if (!isObject(response)) response = new LoadingArray;
         this.responseLoading(response);
-        var p = response.loading_promise = privates.fromApi(api, params).then((data) => {
+        var p = privates.fromApi(api, params);
+        response.loading = p.loading;
+        p = response.loading_promise = p.then((data) => {
+            response.loading = null;
             if (id) {
                 data = parse(data);
                 this.setInstance(id, data, false);
@@ -781,7 +786,10 @@ var data = {
         var response = this.getInstance(id || url);
         if (!isObject(response)) response = new LoadingArray;
         this.responseLoading(response);
-        var p = response.loading_promise = privates.loadIgnoreConfig('get', url).then((data) => {
+        var p = privates.loadIgnoreConfig('get', url);
+        response.loading = p.loading;
+        p = response.loading_promise = p.then((data) => {
+            response.loading = null;
             if (id) {
                 data = parse(data);
                 this.setInstance(id, data, false);
@@ -806,7 +814,13 @@ var data = {
         var response = this.getInstance(id || sid);
         if (!isObject(response)) response = new LoadingArray;
         this.responseLoading(response);
-        var p = response.loading_promise = privates.loadAfterConfig(sid, params).then((data) => {
+        var p = response.loading_promise = privates.getApi(sid).then((api) => {
+            params = privates.pack(sid, params);
+            var p = privates.fromApi(api, params);
+            response.loading = p.loading;
+            return p;
+        }).then((data) => {
+            response.loading = null;
             if (id) {
                 data = parse instanceof Function ? parse(data) : data;
                 this.setInstance(id, data, false);

package/coms/zimoli/design.html

@@ -5,12 +5,13 @@
     <padding>
         <div class="field-item">
             <span class="index" ng-bind='field.id'></span>
-            <input @focus="focus(this.parentNode)" @blur="blur(this.parentNode)" placeholder="请输入字段名称"
+            <input @focus="focus(this.parentNode)" @blur="blur(this.parentNode)" placeholder="显示名称"
                 ng-model=field.name />
-            <select @focus="focus(this.parentNode)" @blur="blur(this.parentNode)" aria-placeholder=""
-                ng-model=field.type>
+            <input @focus="focus(this.parentNode)" @blur="blur(this.parentNode)" placeholder="键名" ng-model=field.key />
+            <select @focus="focus(this.parentNode)" -model="field.type" @blur="blur(this.parentNode)"
+                ng-model=field.type >
                 <option value="">请选择字段类型</option>
-                <option ng-repeat="type in types"></option>
+                <option _value="type.key" ng-repeat="type in types" -text="type.name"></option>
             </select>
             <btn ng-click=remove(field)>移除</btn>
         </div>

package/coms/zimoli/design.less

@@ -10,12 +10,12 @@
 >.options {
     text-align: right;
     padding: 0 16px;
-    width: 392px;
+    width: 412px;
 }
 
 .padding {
     display: block;
-    padding: 8px 10px 0;
+    padding: 8px 0 0;
 }
 
 .field-item {
@@ -37,7 +37,7 @@
     border-radius: 3px;
     text-align: right;
     display: block;
-    width: 360px;
+    width: 390px;
     max-width: 100%;
     position: relative;
     border: 1px solid #0006;
@@ -70,6 +70,11 @@
     >input {
         border-radius: 3px 0 0 3px;
         padding-left: 6px;
+        width: 130px;
+    }
+
+    >select {
+        width: 80px;
     }
 
     >btn {

package/coms/zimoli/drag.js

@@ -33,7 +33,7 @@ var setZIndex = function () {
     }
 };
 function drag(target, initialEvent, preventOverflow, isMovingSource) {
-    if (/^(?:select|input|textarea)$/i.test(initialEvent.target.tagName)) return;
+    if (/^(?:select|input|textarea)$/i.test(initialEvent.target.tagName) || getTargetIn(a => a.nodrag || a.hasAttribute('nodrag') || a.dragable === false, initialEvent.target)) return;
     if (target.dragable === false) return;
     initialEvent.preventDefault();
     if (isArray(target)) {

package/coms/zimoli/field.html

@@ -1,4 +1,4 @@
-<template v-if='field?.key'>
+<template v-if='field?.name'>
     <div class="head">
         <span ng-bind=field.name></span>
         <span class="required" ng-if="field.required">*</span>

package/coms/zimoli/list.js

@@ -379,12 +379,12 @@ function ylist(container, generator, $Y) {
         if (deltay >= delta) {
             return false;
         }
-        if (deltay < 1) y = target_y;
-        else if (deltay > count || deltay > 3) {
-            y = last_y + Math.max(2 * (target_y > last_y ? .8 : -.8));
-        }
+        if (deltay < 2) y = target_y;
         else {
-            y = (target_y + last_y) / 2;
+            var speed = Math.abs(spd.read()[0]);
+            if (speed < 1) speed = 1;
+            if (deltay < 3) speed = .5;
+            y = last_y + (target_y > last_y ? speed : -speed);
         }
         list.Top(y);
         if (target_y === y) {

package/coms/zimoli/model.js

@@ -212,9 +212,9 @@ function main(elem) {
                     if (create) {
                         var e = create(elem, data, field_ref);
                         if (isNode(e)) {
-                            appendChild(elem, e);
+                            if (e !== elem) appendChild(elem, e);
                         }
-                        else {
+                        else if (!isEmpty(e)) {
                             elem.innerHTML = e;
                         }
                         return;
@@ -222,6 +222,7 @@ function main(elem) {
                     elem.innerHTML = '<span ng-bind=get()></span>';
                     render(elem, {
                         get() {
+                            if (!field.key) return;
                             var value = seek(data, field.key);
                             if (field.options) {
                                 if (!field.optionsMap) {
@@ -243,7 +244,7 @@ function main(elem) {
                 }
             } else {
                 var create = field_type === "function" ? field_editor : constructors[field_type];
-                var ipt = create ? create(elem, field_ref) : input();
+                var ipt = create ? create(elem, field_ref) : field.key ? input() : null;
 
                 if (ipt) {
                     if (ipt !== elem) appendChild(elem, ipt);

package/coms/zimoli/render.js

@@ -10,7 +10,7 @@ presets.template = function (t) {
         node.innerHTML = t.innerHTML;
         comment.with = [].slice.call(node.childNodes, 0);
         appendChild.after(comment, comment.with);
-        renderElement(comment.with, comment.$scope, comment.$parentScopes);
+        renderElement(comment.with, comment.$scope, comment.$parentScopes, this.renderid === 9);
     });
     return comment;
 };
@@ -20,8 +20,11 @@ var renderidClosed = 0;
 var addRenderElement = function () {
     var element = this;
     if (!isNode(element)) return;
-    if (element.renderid < 10 && element.renderid > 0) element.renderid = ++renderidOffset;
-    renderElements[element.renderid] = element;
+    if (element.renderid !== 9) {
+        // 只渲染一次
+        if (element.renderid < 10 && element.renderid > 0) element.renderid = ++renderidOffset;
+        renderElements[element.renderid] = element;
+    }
     rebuild(element);
 };
 var removeRenderElement = function () {
@@ -78,12 +81,19 @@ var createGetter = function (search, isprop = true) {
 var initialComment = function (renders, type, expression) {
     var comment = document.createComment(`${type} ${expression}`);
     comment.renders = renders;
-    comment.renderid = ++renderidOffset;
-    onappend(comment, addRenderElement);
-    onremove(comment, removeRenderElement);
     appendChild.after(this, comment);
     if (!/if/i.test(type)) remove(this);
-    rebuild(comment);
+    if (!this.$struct.once) {
+        comment.renderid = ++renderidOffset;
+        onmounted(comment, addRenderElement);
+        onremove(comment, removeRenderElement);
+        if (isMounted(comment) || eagermount) rebuild(comment);
+    }
+    else {
+        comment.renderid = 9;
+        rebuild(comment);
+        remove(comment);
+    }
     return comment;
 };
 var parseRepeat = function (expression) {
@@ -442,7 +452,7 @@ var directives = {
         } else if (/^(select|input|textarea)$/i.test(this.tagName) || "value" in this) {
             this.renders.push(setter || function () {
                 var value = getter();
-                if (value === undefined) value = "";
+                if (isEmpty(value)) value = "";
                 if (deepEqual(oldValue, value)) return;
                 oldValue = value;
                 if (this.value !== value) this.value = value;
@@ -599,17 +609,17 @@ function getFromScopes(key, scope, parentScopes) {
     }
 }
 
-function renderElement(element, scope = element.$scope, parentScopes = element.$parentScopes, eager) {
+function renderElement(element, scope = element.$scope, parentScopes = element.$parentScopes, once) {
     if (!isNode(element) && element.length) {
         return [].concat.apply([], element).map(function (element) {
-            return renderElement(element, scope, parentScopes);
+            return renderElement(element, scope, parentScopes, once);
         });
     }
     if (!isElement(element)) {
         return element;
     }
     if (!isNumber(element.renderid)) {
-        renderStructure(element, scope, parentScopes);
+        renderStructure(element, scope, parentScopes, once);
     }
     var elementid = element.getAttribute("renderid") || element.getAttribute("elementid") || element.getAttribute("id");
     if (elementid) {
@@ -631,7 +641,8 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
             if (parentNode.renderid > 1 || isMounted(parentNode)) element.renderid = 2;
         }
         element.renders = element.renders ? [].concat(element.renders) : [];
-        var { ons, copys, attrs, props, binds, context: withContext, ids } = element.$struct;
+        var { ons, copys, attrs, props, binds, context: withContext, ids, once } = element.$struct;
+        if (once) element.renderid = 9;
         delete element.$struct;
         if (binds.src) {
             element.$src = parseRepeat(binds.src);
@@ -679,7 +690,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
             }
         }
     }
-    if (element.children && element.children.length) renderElement(element.children, scope, parentScopes);
+    if (element.children && element.children.length) renderElement(element.children, scope, parentScopes, once);
     if (!isFirstRender) return element;
     for (var k in binds) {
         if (directives.hasOwnProperty(k)) {
@@ -699,10 +710,15 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
     }
     ons.forEach(([on, key, value]) => on.call(element, key, [withContext, value]));
     if (element.renders.length) {
-        onmounted(element, addRenderElement);
-        onremove(element, removeRenderElement);
-        if (isMounted(element) || element.renderid > 1) addRenderElement.call(element);
-        else if (eagermount) rebuild(element);
+        if (element.renderid !== 9) {
+            onmounted(element, addRenderElement);
+            onremove(element, removeRenderElement);
+            if (isMounted(element) || element.renderid > 1) addRenderElement.call(element);
+            else if (eagermount) rebuild(element);
+        }
+        else {
+            rebuild(element);
+        }
     }
     if (elementid) scope[elementid] = element;
     for (var id of ids) {
@@ -710,7 +726,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
     }
     return element;
 }
-function renderStructure(element, scope, parentScopes = []) {
+function renderStructure(element, scope, parentScopes = [], once) {
     // 处理结构流
     if (parentScopes !== null && !isArray(parentScopes)) {
         throw new Error('父级作用域链应以数组的类型传入');
@@ -791,25 +807,33 @@ function renderStructure(element, scope, parentScopes = []) {
             if (!/\-/.test(name) || value === '') {
                 copys.push(attr);
             }
-            props[name.replace(/\-(\w)/g, (_, w) => w.toUpperCase())] = value === "" ? true : value;
+            var k = name.replace(/\-(\w)/g, (_, w) => w.toUpperCase());
+            if (!(k in element)) {
+                props[k] = value === "" ? true : value;
+            }
+            else {
+                props[k] = element[k];
+            }
         }
     }
-    if (!element.$struct) element.$struct = { ons, copys, binds, attrs: attr1, props, context: withContext, ids };
+    if (props["zimoli"] || props["fresh"] || props["once"]) once = true;
+    else if (props["refresh"] || props["digest"] || props["mount"]) once = false;
+    if (!element.$struct) element.$struct = { ons, copys, binds, attrs: attr1, props, context: withContext, ids, once };
     if (element.renderid <= -1) createStructure.call(element, types.if, types.repeat, withContext);
 }
 var eagermount = false, renderlock = false;
 function render(element, scope, parentScopes, lazy = true) {
     var if_top_length = if_top.length;
     var haslock = false;
+    if (isFinite(scope) && arguments.length === 2) lazy = scope, scope = undefined;
+    else if (isFinite(parentScopes) && arguments.length === 3) lazy = parentScopes, parentScopes = undefined;
+    var renderonce = lazy === 0;
     if (!renderlock) {
         haslock = true;
         renderlock = true;
-        if (isBoolean(scope) && arguments.length === 2) lazy = +scope, scope = undefined;
-        else if (isBoolean(parentScopes) && arguments.length === 3) lazy = +parentScopes, parentScopes = undefined;
-        else lazy = +lazy;
-        eagermount = !lazy;
+        eagermount = !+lazy;
     }
-    var e = renderElement(element, scope, parentScopes);
+    var e = renderElement(element, scope, parentScopes, renderonce);
     if (haslock) {
         renderlock = false;
         eagermount = false;

package/coms/zimoli/vbox.js

@@ -84,7 +84,7 @@ function ybox(generator) {
     var stop = _box.stopY;
     var stop2 = lazy(function () {
         scrollY.smooth(stop);
-    }, 60);
+    }, 40);
     var decrease = function () {
         var res = _decrease(increaser_t) + _decrease(increaser_b);
         if (!res) {
@@ -128,7 +128,7 @@ function ybox(generator) {
     } else {
         var wheelTime = 0;
         onmousewheel(_box, function (event) {
-            if (event.timeStamp - wheelTime > 60 && Math.abs(event.deltaY) < 12) {
+            if (event.timeStamp - wheelTime > 40 && Math.abs(event.deltaY) < 12) {
                 wheelTime = event.timeStamp;
                 return;
             }

package/package.json

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