efront 3.16.1 → 3.18.0

package/coms/frame/chat.less

@@ -0,0 +1,125 @@
+@height: 320px;
+@width: 360px;
+@margin-top: -160px;
+@margin-left: -180px;
+
+& {
+    margin: @margin-top @margin-left;
+    top: 50%;
+    left: 50%;
+    width: @width;
+    height: @height;
+    position: absolute;
+    border: 1px solid #000;
+    box-shadow: 0 0 20px -6px #0003;
+    min-width: 200px;
+    min-height: 200px;
+    max-width: 100%;
+    max-height: 100%;
+}
+
+
+msg {
+    display: block;
+}
+
+
+>[head] {
+    padding: 9px 16px;
+    line-height: 24px;
+}
+
+>grid[body] {
+    padding-top: 0;
+    margin-bottom: 0;
+
+    >div {
+        height: 100%;
+        position: relative;
+    }
+}
+
+
+.editor-height(@height) {
+    >grid[body]:not(:last-child) {
+        padding-bottom: @height;
+    }
+
+    [textarea] {
+        margin-bottom: -@height;
+        height: @height;
+    }
+}
+
+chat {
+    height: 100%;
+}
+
+.editor-height(80px);
+
+[textarea] {
+    display: block;
+    position: relative;
+    resize: none;
+    width: 100%;
+    line-height: 20px;
+    font-size: 16px;
+    border: none;
+    outline: none;
+    border-top: 1px solid #000;
+    ime-mode: active;
+
+    >div {
+        height: 100%;
+        width: 100%;
+        vertical-align: top;
+        padding: 6px 16px 30px;
+        overflow: auto;
+        outline: none;
+    }
+}
+
+>[foot] {
+    pointer-events: none;
+    background: transparent;
+    backdrop-filter: none;
+    box-shadow: none;
+    box-shadow: none;
+    border-top: none;
+
+    >btn {
+        pointer-events: all;
+    }
+}
+
+
+.max-size() {
+    margin-top: 0 !important;
+    top: 0 !important;
+    height: 100% !important;
+    margin-left: 0 !important;
+    left: 0 !important;
+    width: 100% !important;
+    border: none;
+    .editor-height(36px);
+
+    [textarea] {
+        border: none;
+        outline: none;
+        >div{
+            padding-right: 80px;
+        }
+    }
+}
+
+@media(max-height: @height) {
+    & {
+        .max-size();
+    }
+}
+
+@media(max-width: @width) {
+    & {
+        .max-size();
+    }
+}

package/coms/frame/design.html

@@ -0,0 +1,7 @@
+<div head>编辑字段</div>
+<design body>
+</design>
+<div foot>
+    <btn type="white" @click="remove()">取消</btn>
+    <btn @click="save()">确定</btn>
+</div>

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/left.html

@@ -9,5 +9,5 @@
         <span ng-bind="user.roles"></span>
     </span>
 </header>
-<ylist mode=inline ng-src="menu in menus" class="sidebar-menu" ng-active="menus.open(event.value)">
+<ylist mode=inline ng-src="menu in menus" class="sidebar-menu" ng-active="menus.open(menu)">
 </ylist>

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,15 +1,15 @@
 function main(elem) {
     elem = elem || document.createElement("song");
-    if (!elem.innerHTML) elem.innerHTML = song;
+    elem.renderid = 9;
     var $scope = {
         filterTime,
         png: img,
         playState: kugou$playState,
         song: {},
-        musicList:kugou$musicList,
+        musicList: kugou$musicList,
     };
-    render(elem, $scope);
     care(elem, function (item) {
+        if (!elem.innerHTML) elem.innerHTML = song;
         var songName = String(item.name || item.songName || item.songname_original || '');
         var singerName = String(item.singer || item.singerName || item.singername || '');
         if (~songName.indexOf(singerName)) {
@@ -24,6 +24,7 @@ function main(elem) {
             songMarked: mark(songName, elem.mark),
             singerMarked: mark(singerName, elem.mark)
         };
+        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/Item.js

@@ -1,32 +1,39 @@
 var id = 0;
 function Item(value) {
-    this.value = isObject(value) ? value : Object.create(value);
-    this.valueOf = function () {
-        return value;
-    };
-    this.toString = function () {
-        return String(value);
-    };
     this.children = this;
-    if (value.children instanceof Array) {
-        var children = value.children.map(item => new Item(item));
-        children.forEach(item => item.parent = item);
-        this.push.apply(this, children);
-    }
-    if (isObject(value)) {
-        this.name = value.name;
-        this.tab = value.tab;
-        this.icon = value.icon;
-        this.color = value.color;
-        this.test = value.test;
-        this.line = value.line;
-    }
     this.count = 0;//子项中的叶子节点数
     this.total = 0;//子项中的节点数
     this.crack = 0;
     this.id = ++id;
+    this.extends(value);
 }
 Item.prototype = extend([], {
+    extends(value) {
+        this.value = value;
+        if (value.children instanceof Array) {
+            var children = value.children.map(item => new Item(item));
+            children.forEach(item => item.parent = item);
+            this.push.apply(this, children);
+        }
+        if (isObject(value)) {
+            this.name = value.name;
+            this.tab = value.tab;
+            this.icon = value.icon;
+            this.color = value.color;
+            this.test = value.test;
+            this.line = value.line;
+        }
+        else {
+            this.name = value;
+        }
+    },
+
+    valueOf() {
+        return this.value;
+    },
+    toString() {
+        return String(this.value);
+    },
     isClosed() {
         return !!this.value.closed;
     },
@@ -34,14 +41,21 @@ Item.prototype = extend([], {
         this.value.closed = value;
     },
     isActive() {
-        return !!(this.value.active || this.value.actived);
+        if (isObject(this.value)) {
+            if ("active" in this.value) return this.value.active;
+            if ('actived' in this.value) return this.value.actived;
+        }
+        return !!this.actived;
     },
     setActive(value) {
-        if ('active' in this.value) {
-            this.value.active = value;
-        } else {
-            this.value.actived = value;
+        if (isObject(this.value)) {
+            if ('active' in this.value) {
+                this.value.active = value;
+            } else {
+                this.value.actived = value;
+            }
         }
+        this.actived = value;
     },
     isSelected() {
         return !!this.value.selected;
@@ -53,3 +67,4 @@ Item.prototype = extend([], {
         return !!this.value.class;
     }
 });
+Item.prototype.isActived = Item.prototype.isActive;

package/coms/zimoli/appendChild.js

@@ -11,26 +11,24 @@ function hasEnterStyle(e) {
     return e.initialStyle || e.enterStyle || e.leavingStyle || e.leaveStyle;
 }
 
-function _onappend(node, event) {
+function _onappend(node, append = createEvent("append"), mount = createEvent("mounted")) {
     if (node.isMounted) return;
     if (node.nodeType === 1 || node.nodeType === 8) node.isMounted = true;
-    if (!event) {
-        event = createEvent("append");
-    }
-    dispatch(node, event);
+    dispatch(node, append);
     var onappend = node.onappend;
     if (isArray(onappend)) {
         onappend.map(function (append_handler) {
-            append_handler.call(this, event);
+            append_handler.call(this, append);
         }, node);
     }
     if (isFunction(onappend)) {
-        onappend.call(node, event);
+        onappend.call(node, append);
     }
     var children = [].concat.apply([], node.childNodes);
     if (children) for (var cx = 0, dx = children.length; cx < dx; cx++) {
-        _onappend(children[cx], event);
+        _onappend(children[cx], append, mount);
     }
+    dispatch(node, mount);
 }
 function appendChild(parent, obj, transition) {
     if (transition === false) {

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

@@ -1,7 +1,17 @@
 var change = function (data) {
     zimoli.go(data, this.params, this);
 };
+var gosrc = function () {
+    if (this.hasAttribute('src')) {
+        var src = this.getAttribute('src');
+        if (src !== this.src) {
+            this.src = src;
+            if (src) cast(this, this.getAttribute('src'));
+        }
+    }
+};
 function container(element) {
     care(element, change);
+    element.renders = [gosrc];
     return element;
 }

package/coms/zimoli/createItemTarget.js

@@ -0,0 +1,7 @@
+function createItemTarget(item) {
+    var $scope = {};
+    var { itemName } = this.$src;
+    if (itemName) $scope[itemName] = item;
+    else $scope.$item = item;
+    return { $scope };
+}

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

@@ -22,15 +22,18 @@ var setZIndex = function () {
     if (!isElement(target)) return;
     var computed = getComputedStyle(target);
     var z0 = zIndex(0);
-    if (!z || computed.zIndex < z0) {
+    if (!z || +computed.zIndex < z0) {
         z = zIndex();
         if (/^(absolute|fixed)$/i.test(computed.position)) {
             css(target, { zIndex: z });
         }
     }
+    else if (z < +computed.zIndex) {
+        z = +computed.zIndex;
+    }
 };
 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)) {
@@ -39,7 +42,6 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
     } else {
         var extraTargets = target.with ? [].concat(target.with) : [];
     }
-
     var target_offset = getOffset(target);
     var saved_delta = { x: target_offset[0] - initialEvent.screenX, y: target_offset[1] - initialEvent.screenY };
     var clone;

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>