efront 4.19.7 → 4.20.1

package/coms/kugou//346/255/214/350/257/215/347/274/226/350/276/221/345/231/250.xht

@@ -0,0 +1,153 @@
+<style>
+    & {
+        position: absolute;
+        left: 0;
+        top: 0;
+        height: auto;
+        width: auto;
+        bottom: 0;
+        right: 0;
+        overflow: hidden;
+    }
+
+    [insert] {
+        height: 12px;
+    }
+
+    w {
+        margin-right: 2px;
+        background: #fce;
+        display: inline-block;
+        padding: 2px;
+        line-height: 1;
+    }
+
+    [line] {
+        display: inline-block;
+    }
+
+    [row] {
+        margin-top: 12px;
+        line-height: 1.6;
+    }
+
+    [editing] {
+        outline: 1px solid #0009;
+        background: #0002;
+    }
+
+    [dark] {
+        color: red;
+    }
+
+    [foot] {
+        >a.button {
+            float: left;
+            margin: 0 16px 0 0;
+        }
+    }
+</style>
+<xmenu head -src="menuitems"></xmenu>
+<list body# @click="editTime(null)" -src="row in krc">
+    <div row @click.stop="editTime(row)" editing_="row.editing">
+        <span -bind="toOffsetTime(row.startTime)" dark_="row.startTime!==row.value"></span>
+        &nbsp;
+        <span line>
+            <w -repeat="w in row.words" -bind="w.label"></w>
+        </span>
+    </div>
+</list>
+<div foot>
+    <a -if="currentRow" @click="对齐">对齐</a>
+    <a -if="currentRow" @click="编辑">编辑</a>
+    <!-- <a -if="currentRow">试听</a> -->
+    <button @click="保存">保存</button>
+</div>
+<script>
+    var a = button;
+    var xmenu = zimoli$menu;
+    var menuitems = [{
+        name: "歌词",
+        actived: true,
+        do() {
+
+        }
+    }, {
+        name: "属性",
+        do() { }
+    }];
+    var timeEditor = '增加延时节点';
+    var 对齐 = async function () {
+        var time = await prompt("输入对齐差值(毫秒)", function (a) {
+            if (!isFinite(a)) return false;
+            a = +a;
+            if (a !== (a | 0)) return false;
+        });
+        var i = krc.indexOf(currentRow);
+        for (var cx = i, dx = krc.length; cx < dx; cx++) {
+            var r = krc[cx];
+            r.startTime = r.startTime + +time;
+        }
+    };
+    var 编辑 = async function () {
+        var time = await prompt('修改当前节点的启始时间', { value: toOffsetTime(currentRow.startTime) },
+            /^(\d+\:)*\d+(\.\d+)?$/);
+        currentRow.startTime = fromOffsetTime(time) | 0;
+    };
+    var 保存 = async function () {
+
+    }
+    var currentRow = null;
+    var editTime = function (row) {
+        if (currentRow === row) return;
+        if (currentRow) currentRow.editing = false;
+        if (row) row.editing = true;
+        currentRow = row;
+    }
+    var fromOffsetTime = function (t) {
+        var mili = /\d+\.\d+$/.exec(t);
+        if (mili) {
+            t = t.slice(mili[0].length);
+            mili = mili[0] * 1000;
+        }
+        var sum = 0;
+        t = t.split(':').reverse();
+        while (t.length) {
+            sum *= 60;
+            sum += +t.pop();
+        }
+        if (mili) sum += mili;
+        if (extra.offset) sum -= extra.offset;
+        return sum;
+    }
+    var toOffsetTime = function (a) {
+        if (extra.offset) a += extra.offset;
+        var d = [a % 1000];
+        a /= 1000;
+        a |= 0;
+        while (a) {
+            d.push(a % 60);
+            a /= 60;
+            a |= 0;
+        }
+        while (d.length < offsetLength) d.push(0);
+        d.reverse();
+        var time = d.slice(0, d.length - 1).map(a => a < 10 ? '0' + a : a).join(':');
+        d = d[d.length - 1];
+        if (d < 10) d = "00" + d;
+        else if (d < 100) d = '0' + d;
+        time += '.' + d;
+        return time;
+    }
+    view(this);
+    var [{ krc_text }] = arguments;
+    var krc = krc_parse(krc_text);
+    var extra = krc.extra;
+    var offsetLength = 3;
+    if (extra.total) {
+        offsetLength = Math.ceil(Math.log(extra.total) / Math.log(60));
+        if (offsetLength < 3) offsetLength = 3;
+    }
+    function 歌词编辑器() {
+    }
+</script>

package/coms/zimoli/button.js

@@ -1,77 +1,10 @@
 var _label = document.createElement("span");
 var track = document.createElement("div");
-var onmouseenter = on("mouseenter");
 track.className = "track";
 _label.className = "label";
 
 var btn = document.createElement("button");
 btn.tabIndex = 0;
-var __addClass = function () {
-    if (firedTime + 60 > +new Date) return;
-    addClass.apply(this, arguments);
-};
-var hover = function () {
-    __addClass(this, "hover");
-};
-var active = function () {
-    __addClass(this, "hover active");
-};
-var checkclick = function () {
-    if (this.hasAttribute("disabled") || this.disabled || this.hasAttribute("loading") || this.loading || this.hasAttribute("pending") || this.pending) {
-        onclick.preventClick = true;
-        return;
-    }
-    if (this.hasAttribute("confirm") || this.confirm) {
-        if (!this.confirm_sign) {
-            addClass(this, 'confirm');
-            var that = this;
-            that.confirm_sign = true;
-            setTimeout(function () {
-                removeClass(that, "confirm");
-                delete that.confirm_sign;
-            }, 2000);
-            onclick.preventClick = true;
-            return;
-        }
-        delete this.confirm_sign;
-        removeClass(this, "confirm");
-    }
-};
-var resetactive = function () {
-    removeClass(this, "active");
-};
-var resetall = function () {
-    removeClass(this, "active hover");
-};
-var mousedown = function () {
-    var that = this;
-    var cancelmouseup = onmouseup(window, function () {
-        cancelmouseup();
-        resetactive.call(that);
-        checkclick.call(that);
-    });
-    active.call(this);
-};
-var mouseleave = function (event) {
-    removeClass(this, "hover");
-};
-var mousemove = function (event) {
-    if (onclick.preventClick && event.which) resetall.call(this);
-};
-var firedTime = +new Date;
-var touchstart = function () {
-    var that = this;
-    var cancel = function () {
-        firedTime = +new Date;
-        canceltouchcancel();
-        canceltouchend();
-        resetall.call(that);
-        checkclick.call(that);
-    };
-    var canceltouchcancel = ontouchcancel(this, cancel);
-    var canceltouchend = ontouchend(this, cancel);
-    active.call(this);
-};
 function button(texter, type) {
     var tracker = track.cloneNode();
     var _texter;
@@ -110,16 +43,10 @@ function button(texter, type) {
         appendChild(button, tracker, _texter);
     }
     bindAccesskey(button);
-    onremove(button, resetall);
-    onmouseenter(button, hover);
-    onmouseleave(button, mouseleave);
-    onmousemove(button, mousemove);
-    onmousedown(button, mousedown);
-    ontouchmove(button, resetall);
-    ontouchstart(button, touchstart);
+    patchHover(button);
     button.setText = function (_text) {
         if (_text && _text.length === 2) {
-            __addClass(button, "space");
+            addClass(button, "space");
         } else {
             removeClass(button, "space");
         }
@@ -130,7 +57,7 @@ function button(texter, type) {
         return html(_texter);
     };
     if (texter && texter.length === 2) {
-        __addClass(button, "space");
+        addClass(button, "space");
     } else {
         removeClass(button, "space");
     }

package/coms/zimoli/button.less

@@ -254,8 +254,7 @@ a&,
         .clear();
     }
 
-    &.active,
-    &:active {
+    &.active {
         color: darken(@default-color, 10%);
         .clear();
     }
@@ -286,7 +285,6 @@ a&,
             color: @hover;
         }
 
-        &:active,
         &.active {
             color: darken(@color, 10%);
         }

package/coms/zimoli/confirm.js

@@ -97,7 +97,7 @@ function confirm() {
                     element.removeAttribute('locked');
                     this.removeAttribute('loading');
                     if (res === false) return;
-                    element.result = res;
+                    if (!("result" in element)) element.result = res;
                     remove(element);
                 }, () => {
                     this.removeAttribute('loading');
@@ -105,7 +105,7 @@ function confirm() {
                 });
             }
             else {
-                element.result = res;
+                if (!('result' in element)) element.result = res;
                 remove(element);
             }
         }
@@ -115,7 +115,8 @@ function confirm() {
         }
     };
     on('remove')(element, function () {
-        this.onload();
+        if (this.errored || !("result" in element)) this.onerror(this.errored);
+        else this.onload();
     });
     var buttons = options.map(function (label, index, options) {
         if (isNode(label)) {

package/coms/zimoli/img.less

@@ -5,4 +5,5 @@
     width: 100px;
     height: 100px;
     display: inline-block;
+    vertical-align: top;
 }

package/coms/zimoli/menu.less

@@ -176,10 +176,6 @@ body:active & {
             }
         }
 
-        i {
-            margin-right: 10px;
-        }
-
 
         &.hover {
             text-shadow: none;

package/coms/zimoli/menuItem.html

@@ -1,7 +1,7 @@
 <template -if='hasIcon?'>
     <i -class="menu.icon" -style="{color:menu.color}"></i>
     <template -if="menu.name">
-        &nbsp;&nbsp;
+        &ensp;&ensp;
     </template>
 </template>
 <span -html="menu.name" -style="{color:menu.color}"></span>

package/coms/zimoli/patchHover.js

@@ -0,0 +1,74 @@
+var onmouseenter = on("mouseenter");
+
+var hover = function () {
+    addClass(this, "hover");
+};
+var active = function () {
+    addClass(this, "hover active");
+};
+var checkclick = function () {
+    if (this.hasAttribute("disabled") || this.disabled || this.hasAttribute("loading") || this.loading || this.hasAttribute("pending") || this.pending) {
+        onclick.preventClick = true;
+        return;
+    }
+    if (this.hasAttribute("confirm") || this.confirm) {
+        if (!this.confirm_sign) {
+            addClass(this, 'confirm');
+            var that = this;
+            that.confirm_sign = true;
+            setTimeout(function () {
+                removeClass(that, "confirm");
+                delete that.confirm_sign;
+            }, 2000);
+            onclick.preventClick = true;
+            return;
+        }
+        delete this.confirm_sign;
+        removeClass(this, "confirm");
+    }
+};
+var resetactive = function () {
+    removeClass(this, "active");
+};
+var resetall = function () {
+    removeClass(this, "active hover");
+};
+var mousedown = function () {
+    var that = this;
+    var cancelmouseup = onmouseup(window, function () {
+        cancelmouseup();
+        resetactive.call(that);
+        checkclick.call(that);
+    });
+    active.call(this);
+};
+var mouseleave = function (event) {
+    removeClass(this, "hover");
+};
+var mousemove = function (event) {
+    if (onclick.preventClick && event.which) resetall.call(this);
+};
+var firedTime = +new Date;
+var touchstart = function () {
+    var that = this;
+    var cancel = function () {
+        firedTime = +new Date;
+        canceltouchcancel();
+        canceltouchend();
+        resetall.call(that);
+        checkclick.call(that);
+    };
+    var canceltouchcancel = ontouchcancel(this, cancel);
+    var canceltouchend = ontouchend(this, cancel);
+    active.call(this);
+};
+function patchHover(button) {
+    onremove(button, resetall);
+    onmouseenter(button, hover);
+    onmouseleave(button, mouseleave);
+    onmousemove(button, mousemove);
+    onmousedown(button, mousedown);
+    ontouchmove(button, resetall);
+    ontouchstart(button, touchstart);
+    return button;
+};

package/coms/zimoli/popup.js

@@ -354,7 +354,23 @@ var popup_fixup = function (element, x, y) {
     css(element, {
         position: 'absolute',
     });
+    css(element, {
+        position: 'fixed'
+    });
+    var body = document.body;
     popup_as_single(element);
+    if (getComputedStyle(element).position !== 'fixed') {
+        var clientTop = body.clientTop;
+        var clientBottom = clientTop + body.clientHeight;
+        var clientLeft = body.clientLeft;
+        var clientRight = clientLeft + body.clientWidth;
+        css(element, {
+            marginTop: -clientTop,
+            marginLeft: -clientLeft,
+            marginRight: clientRight - window.innerWidth,
+            marginBottom: clientBottom - window.innerHeight
+        })
+    }
     var left = "left", top = 'top';
     if (y + element.offsetHeight > window.innerHeight && y << 1 > window.innerHeight) {
         top = "bottom";

package/coms/zimoli/prompt.js

@@ -8,7 +8,7 @@ var settip = function (tip, res) {
 }
 var validate = function (text, checker, tip) {
     var valid;
-    if (checker instanceof RegExp) {
+    if (isFunction(checker.test)) {
         valid = checker.test(text);
     }
     if (isFunction(checker)) {
@@ -22,6 +22,7 @@ function prompt() {
     var opts = [];
     var submit = null;
     var wrap = false;
+    var value = '';
     for (var arg of arguments) {
         if (isNode(arg)) ipt = arg;
         else if (typeof arg === 'string') msg = arg;
@@ -31,6 +32,7 @@ function prompt() {
             if (isFunction(arg.test)) check = arg;
             if (isFunction(arg.submit)) submit = arg;
             if (isString(arg.msg || arg.title)) msg = arg.msg || arg.title;
+            if (isHandled(arg.value)) value = arg.value;
             if (arg.multiple || arg.wrap) wrap = true;
         }
     }
@@ -41,6 +43,7 @@ function prompt() {
             ipt.contentEditable = true;
         }
         else ipt = input();
+        ipt.value = value;
     }
     else {
         ipt.setAttribute('textarea', '');
@@ -48,7 +51,7 @@ function prompt() {
     var tip = document.createElement("tip");
     var buttons = [isNode(opts[0]) ? opts[0] : button(opts[0] || i18n`确认`), isNode(opts[1]) ? opts[1] : button(opts[1] || i18n`取消`, 'white')];
     var getValue = () => isFunction(ipt.getValue) ? ipt.getValue() : ipt.value;
-    if (isFunction(check) || wrap) {
+    if (check || wrap) {
         var setDisable = function (event) {
             var bd = c.body;
             if (wrap && bd) {
@@ -95,6 +98,9 @@ function prompt() {
                 var res = await submit.submit(value);
                 if (!settip(tip, res)) return false;
             }
+            c.result = value;
+        } else {
+            c.errored = true;
         }
     });
     on('mounted')(ipt, function () {

package/coms/zimoli/textarea.less

@@ -7,6 +7,7 @@
     outline: none;
     padding: 4px 6px;
     -webkit-appearance: none;
+    max-height: 360px;
 
     &:focus {
         border-color: @border-focus;

package/coms/zimoli/touchList.js

@@ -98,6 +98,7 @@ var scrollToRight = function () {
     scrollTo.call(this, 0);
 };
 var touchend = function () {
+    if (!currentTarget) return;
     var marginLeft = -parseInt(currentTarget.scrollLeft) || 0;
     moving = false;
     if (direction < 0 && marginLeft < -7) {

package/coms/zimoli/view.js

@@ -122,12 +122,6 @@ var resize2 = function () {
             marginTop: fromOffset(-height)
         })
     }
-    if (changed) {
-        css(body, { height: '' });
-        if (body.scrollHeight + body.offsetTop > this.clientHeight + 1) {
-            css(body, { height: fromOffset(this.clientHeight) });
-        }
-    }
 };
 function view(element) {
     var w = isNode(element) ? element : document.createElement("form");

package/coms/zimoli/vscroll.js

@@ -26,7 +26,8 @@ var scroll = function () {
         if (!offsetParent) return deltay;
         var _boxPosition = getScreenPosition(_box);
         var _parentPosition = getScreenPosition(offsetParent);
-        if (_boxPosition.bottom - 1 >= _parentPosition.bottom && deltay > 0) {
+        if (!/^(auto|scroll)$/.test(getComputedStyle(offsetParent).overflowY) && !offsetParent.YScrollBoxId);
+        else if (_boxPosition.bottom - 1 >= _parentPosition.bottom && deltay > 0) {
             var deltaScroll = _boxPosition.bottom - _parentPosition.bottom;
             deltaScroll = min(deltay, deltaScroll);
             scrollY.call(offsetParent, deltaScroll, false);

package/coms/zimoli/zimoli.js

@@ -147,7 +147,7 @@ function go(pagepath, args, history_name, oldpagepath) {
     var fullfill = function () {
         zimoliad = zimoliid;
         var _page = create(pgpath, args, oldpagepath);
-        var isDestroy = pushstate(pagepath, history_name, oldpagepath);
+        var isRecover = pushstate(pagepath, history_name, oldpagepath);
         if (isNode(history_name)) {
             if (history_name.activate === pagepath && history_name.activateNode === _page) return fullfill_is_dispatched--;
             else remove(history_name.activateNode);
@@ -170,7 +170,8 @@ function go(pagepath, args, history_name, oldpagepath) {
             dispatch(document, event);
             fullfill_is_dispatched = 0;
         }
-        addGlobal(_page, history_name, isDestroy);
+        if (isRecover) setWithStyle(_page, false);
+        addGlobal(_page, history_name, isRecover);
         page_object.prepares.splice(0, page_object.prepares.length).forEach(function (url) {
             if (isNumber(url)) {
                 url = _history[url < 1 ? _history.length + url - 1 : url];
@@ -478,7 +479,7 @@ try {
 }
 var root_path;
 var pushstate = function (path_name, history_name) {
-    var isDestroy = false;
+    var isBack = false;
     if (history_name === undefined) {
         history_name = current_history;
     }
@@ -490,7 +491,7 @@ var pushstate = function (path_name, history_name) {
         for (var cx = 0, dx = _history.length; cx < dx; cx++) {
             if (_history[cx] === path_name) {
                 _history.splice(cx, dx - cx);
-                isDestroy = true;
+                isBack = cx < dx - 1;
                 break;
             }
         }
@@ -498,7 +499,7 @@ var pushstate = function (path_name, history_name) {
         if (_history.length) fixurl();
     }
     hostoryStorage.setItem(history_session_object_key, JSAM.stringify(history) || null);
-    return isDestroy;
+    return isBack;
 };
 var popstate = function (path_name, history_name) {
     if (history_name === undefined) history_name = current_history;
@@ -592,17 +593,17 @@ function setWithStyle(target, isDestroy) {
     }
 
 }
-function addGlobal(element, name = null, isDestroy) {
+function addGlobal(element, name = null, isBack) {
     if (isString(name)) {
         if (global[name] === element) return;
         var oldElement = global[name];
         if (oldElement) {
-            setWithStyle(oldElement, isDestroy);
+            setWithStyle(oldElement, isBack);
         }
         if (isFunction(body.layer)) {
             body.layer(element, oldElement, history);
         } else if (body !== element) {
-            if (isDestroy || !oldElement) appendChild.insert(body, element);
+            if (isBack || !oldElement) appendChild.insert(body, element);
             else appendChild.after(oldElement, element);
             remove(oldElement);
         }
@@ -613,7 +614,7 @@ function addGlobal(element, name = null, isDestroy) {
             appendChild.after(name, element);
             name.with = [element];
         }
-        else if (isDestroy) appendChild.insert(name, element);
+        else if (isBack) appendChild.insert(name, element);
         else appendChild(name, element);
     } else if (isFunction(name)) {
         name(element);
@@ -621,7 +622,7 @@ function addGlobal(element, name = null, isDestroy) {
         if (isFunction(body.layer)) {
             body.layer(element);
         } else {
-            if (isDestroy) appendChild.insert(body, element);
+            if (isBack) appendChild.insert(body, element);
             else appendChild(body, element);
         }
         rootElements.push(element);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.19.7",
+    "version": "4.20.1",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {