efront 3.20.10 → 3.20.14

package/coms/basic/cross_.js

@@ -29,7 +29,12 @@ function isChildPath(relative, path) {
 }
 
 var getCrossUrl = function (domain, headers, encrypt) {
-    if (notCross(domain, !!encrypt)) return domain;
+    if (notCross(domain, encrypt)) return domain;
+    var basehost = parseURL(base).host || parseURL(location_href).host;
+    if (parseURL(domain).host === basehost) {
+        if (!encrypt) return domain;
+        domain = domain.replace(domainReg, "/$3$4");
+    }
     var originDomain = getDomainPath(domain);
     var _cookies = getCookies(originDomain);
     var _headers = {};
@@ -102,7 +107,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
     };
     if (/^jsonp/i.test(method)) {
         var cb = method.split('\-')[1] || 'callback';
-        setTimeout(function () {
+        Promise.resolve().then(function () {
             if (!isEmpty(jsondata) && isEmpty(datas)) {
                 datas = serialize(jsondata);
             }
@@ -112,6 +117,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
         });
         var xhr = jsonp(url, {
             [cb](a) {
+                removeFromList(requests, this);
                 onload({ status: 200, response: JSON.stringify(a), toString: toResponse });
             }
         });
@@ -280,9 +286,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
             else send.call(xhr);
             digest();
         };
-
-        setTimeout(fire, 0);
-
+        Promise.resolve().then(fire);
     }
     var setRequestHeader = xhr.setRequestHeader;
     var realHeaders = Object.create(null);
@@ -335,7 +339,7 @@ function addDirect(a) {
 function notCross(domain, encrypt) {
     if (!location_href || !base || !/^https?\:\/\/|^s?\/\//.test(domain)) return true;
     if (location_href === domain.slice(0, location_href.length) ||
-        domain.replace(domainReg, '$2') === base.replace(domainReg, '$2')) return !encrypt;
+        domain.replace(domainReg, '$2') === base.replace(domainReg, '$2') || /^\/[^\/]/.test(domain)) return !encrypt;
     for (var cx = 0, dx = cors_hosts.length; cx < dx; cx++) {
         var host = cors_hosts[cx];
         if (host instanceof RegExp) {

package/coms/kugou/player.js

@@ -118,7 +118,6 @@ var $scope = {
         $scope.currentTheta = ((currentTime * 6 + 90) % 180 - 90) / 180 * Math.PI;
         playState.width = (currentTime * 100 / duration).toFixed(2) + `%`;
         $scope.currentProcess = `width:` + playState.width;
-        render.refresh();
     },
     effectPage(effect = !$scope.effect) {
         $scope.effect = effect;
@@ -302,6 +301,7 @@ var createControls = function () {
             touching = true;
             var { x } = value;
             let _audio = $scope.audio;
+            css(progress, { width: x });
             $scope.process(x / player.offsetWidth * _audio.duration, _audio.duration);
         }
         return { x: progress.offsetWidth };

package/coms/kugou/player.less

@@ -187,7 +187,7 @@
     >.info {
         width: 100%;
         margin-right: -200px;
-        line-height: 10px;
+        line-height: 1;
         text-align: left;
         padding: 46px 5px 0 5px;
         z-index: 2;
@@ -260,7 +260,7 @@
 
 &.page>.krc {
     text-align: center;
-    line-height: 36px;
+    line-height: 2.2;
     margin-bottom: -80px;
     bottom: 50%;
     height: 180px;

package/coms/layer/glance.js

@@ -13,7 +13,7 @@ var dragview = function (dragview) {
                 moving = false;
             } else {
                 var { childNodes } = target;
-                if (getComputedStyle(target).cursor === 'auto') for (var cx = 0, dx = childNodes.length; cx < dx; cx++) {
+                if (getComputedStyle(target).cursor === 'auto' && getComputedStyle(target).userSelect !== 'none') for (var cx = 0, dx = childNodes.length; cx < dx; cx++) {
                     var child = childNodes[cx];
                     if (child.nodeType === 3) {
                         moving = false;

package/coms/zimoli/AudioContext_test.js

@@ -56,7 +56,7 @@ function main() {
             return o.toFixed(5 - i);
         }
     });
-    on("append")(page, function () {
+    on("mounted")(page, function () {
         this.querySelector('[hz="440"]').scrollIntoViewIfNeeded();
     });
     on('contextmenu')(page, function (e) {

package/coms/zimoli/HexEditor.less

@@ -1,13 +1,16 @@
+*{
+    box-sizing: border-box;
+}
 & {
     background: #fff;
     display: inline-block;
     resize: both;
-    font-style: 16px;
+    font-size: 16px;
     position: relative;
     min-height: 100px;
     padding: 0 0 10px 16px;
     font-family: 宋体;
-    width: 438px;
+    width: 422px;
 
     >a {
         display: inline-block;

package/coms/zimoli/audio.js

@@ -1,6 +1,4 @@
 var alertError = alert.bind(null, 'error');
-var Context = window.webkitAudioContext || window.AudioContext;
-var globalContext = Context && new Context;
 
 var reportError = function (error) {
     switch (error.code || error.name) {
@@ -25,85 +23,68 @@ var reportError = function (error) {
 
 function init() {
     if (!this.audioPromise) {
-        this.audioPromise = new Promise((ok, oh) => {
-            navigator.mediaDevices.getUserMedia({
-                audio: { deviceId: this.deviceId }
-            }).then(ok).catch(oh);
-        }).then((stream) => {
-            var context = new Context;
+        this.audioPromise = navigator.mediaDevices.getUserMedia({
+            audio: { deviceId: this.deviceId }
+        }).then(async (stream) => {
+            var context = new AudioContext;
             this.gain = context.createGain();
+            var analyser = context.createAnalyser();
+            analyser.fftSize = 2048;
             context.resume();
-            var audioInput = context.createMediaStreamSource(stream);
-            console.log(stream);
-            var createScript = context.createScriptProcessor || context.createJavaScriptNode;
-            var recorder = createScript.apply(context, [0, 1, 1]);
-            return [recorder, audioInput, context];
+            var source = context.createMediaStreamSource(stream);
+            return [source, context, analyser];
         });
     }
     return this.audioPromise;
 }
-function stop() {
+
+async function stop() {
     var commandCount = ++this.commandCount;
     if (!this.running) return;
-    this.init().then(([recorder, audioInput, context]) => {
-
-        if (this.commandCount !== commandCount) return;
-        this.running = false;
-        if (this.gain) {
-            recorder.disconnect(this.gain);
-            this.gain.disconnect(context.destination);
-        } else {
-            recorder.disconnect(context.destination);
-        }
-        audioInput.disconnect(context.recorder);
-        if (this.audio) this.audio.pause();
-    });
-
+    var [source, context, analyser] = await this.init();
+    cancelAnimationFrame(analyser.frame);
+    if (this.commandCount !== commandCount) return;
+    this.running = false;
+    source.disconnect(analyser);
+    if (this.gain) {
+        source.disconnect(this.gain);
+        this.gain.disconnect(context.destination);
+    } else {
+        source.disconnect(context.destination);
+    }
+    this.context = null;
+    this.audioPromise = null;
+    this.gain = null;
+    context.suspend();
+    await context.close();
+    if (this.audio) this.audio.pause();
 }
-function start() {
+
+async function start() {
     if (this.running) return;
     var commandCount = ++this.commandCount;
-    this.init().then(([recorder, audioInput, context]) => {
-        if (commandCount !== this.commandCount) return;
-        this.context = context;
-        recorder.onaudioprocess = (e) => {
-            var buffer = copyData(e);
-            cast(this, buffer);
-            this.onprocess instanceof Function && this.onprocess(buffer);
-        };
-        this.running = true;
-        audioInput.connect(recorder);
-        recorder.connect(this.gain).connect(context.destination);
-        if (this.audio) this.audio.play();
-    }).catch(reportError);
-}
-function copyData(audioProcessingEvent) {
-    // The input buffer is the song we loaded earlier
-    var inputBuffer = audioProcessingEvent.inputBuffer;
-
-    // The output buffer contains the samples that will be modified and played
-    var outputBuffer = audioProcessingEvent.outputBuffer;
-    var distBuffer = [];
-    // Loop through the output channels (in this case there is only one)
-    var { numberOfChannels } = inputBuffer;
-    for (var channel = 0; channel < numberOfChannels; channel++) {
-        var inputData = inputBuffer.getChannelData(channel);
-        var outputData = outputBuffer.getChannelData(channel);
-
-        // Loop through the 4096 samples
-        for (var cx = 0, dx = inputData.length; cx < dx; cx++) {
-            // make output equal to the same as the input
-            outputData[cx] = inputData[cx];
-            if (!distBuffer[cx]) distBuffer[cx] = inputData[cx];
-            else distBuffer[cx] += inputData[cx];
-
-            // add noise to each output sample
-            // outputData[cx] += ((Math.random() * 2) - 1) * 0.2;
-
-        }
+    try {
+        var [source, context, analyser] = await this.init();
+    } catch (e) {
+        reportError(e);
     }
-    return distBuffer.map(a => a / numberOfChannels);
+    if (commandCount !== this.commandCount) return;
+    this.context = context;
+    var dancingArray = new Uint8Array(analyser.fftSize);
+    var animate = () => {
+        analyser.getByteTimeDomainData(dancingArray);
+        cast(this, dancingArray);
+        analyser.frame = requestAnimationFrame(animate);
+        this.onprocess instanceof Function && this.onprocess(dancingArray);
+    };
+    animate();
+    this.running = true;
+
+    source.connect(analyser);
+    source.connect(this.gain).connect(context.destination);
+    if (this.audio) this.audio.play();
 }
+
 class Source {
     running = false;
     audioPromise;
@@ -119,7 +100,7 @@ class Source {
     }
     init() {
         if (this.audioPromise) return this.audioPromise;
-        var context = new Context;
+        var context = new AudioContext;
         var audio = document.createElement("audio");
         this.gain = context.createGain();
         console.log(this.gain);
@@ -131,9 +112,10 @@ class Source {
 
         return this.audioPromise = Promise.resolve([recorder, source, context]);
     }
-    start = start;
-    stop = stop;
 }
+Source.prototype.start = start;
+Source.prototype.stop = stop;
+
 class Recorder {
     running = false;
     hasMicrophone = navigator.getUserMedia instanceof Function;
@@ -141,6 +123,8 @@ class Recorder {
     commandCount = 0;
     onprocess;
     context;
+    workletUrl;
+    workletName;
     constructor(device) {
         if (!device) device = {};
         var config = {
@@ -154,10 +138,11 @@ class Recorder {
 
         extend(this, config);
     }
-    init = init;
-    start = start;
-    stop = stop;
 }
+Recorder.prototype.init = init;
+Recorder.prototype.start = start;
+Recorder.prototype.stop = stop;
+
 class Monitor {
     running = false;
     context;
@@ -171,19 +156,16 @@ class Monitor {
         extend(this, config);
 
     }
-    init = init;
-    start = start;
-    stop = stop;
 }
+Monitor.prototype.init = init;
+Monitor.prototype.start = start;
+Monitor.prototype.stop = stop;
+
 var audio = {
     Recorder,
     Monitor,
     Source,
-    Context,
-    copyData,
-    getGlobalContext() {
-        return globalContext;
-    },
+    Context: AudioContext,
     getRecorder() {
         return new Recorder
     },

package/coms/zimoli/audio_test.html

@@ -1,3 +1,3 @@
 <canvas></canvas>
 <button ng-if=!running ng-click=start()>开启</button>
-<button ng-if=running ng-click=stop()>关闭</button>
+<button ng-else ng-click=stop()>关闭</button>

package/coms/zimoli/audio_test.js

@@ -13,10 +13,8 @@ function main() {
         context.beginPath();
         context.moveTo(0, canvas.offsetHeight / 2);
         var max = 2;
-        // [].forEach.call(buffer, function (db, cx) {
-        //     if (db > max) max = db;
-        // });
         [].forEach.call(buffer, function (db, cx) {
+            db = (db - 128) / 128;
             context.lineTo(cx * canvas.width / buffer.length, canvas.height / 2 - db / max * canvas.height);
         });
         context.stroke();

package/coms/zimoli/bind.js

@@ -5,12 +5,11 @@ function bind(eventName, bindTo = window) {
             if (off) off();
             off = on(eventName).call(bindTo, target, eventListener);
         };
-        if (isMounted(target)) mount();
-        var off1 = on("append")(target, mount);
+        var off1 = onmounted(target, mount);
         var off2 = on("remove")(target, function () {
             if (off) off();
             off = null;
         });
-        return function () { off1(); off2(); };
+        return function () { off1(); off2(); if (off) off(); };
     }
 }

package/coms/zimoli/lattice.js

@@ -53,18 +53,9 @@ function lattice(element, minWidth, maxWidth = minWidth << 1, layers) {
         if (element.with instanceof Array) element.with.forEach(build);
         else if (isElement(element.with)) build(element.with);
     };
-    var go = _box.go;
-    _box.go = function (value) {
-        resize();
-        if (!boxCount) return;
-        go.call(_box, value);
-    };
-    var _onappend = function () {
-        _box.resize();
-    };
-    onappend(_box, _onappend);
     _box.resize = lazy(function () {
         var savedCount = boxCount;
+        console.log(savedCount)
         var index = _box.index();
         resize();
         if (savedCount === boxCount) return;
@@ -74,8 +65,8 @@ function lattice(element, minWidth, maxWidth = minWidth << 1, layers) {
         [].forEach.call(_box.children, function (c) {
             build(c);
         });
-        go.call(_box, index);
-    }, 0);
+        _box.go(index);
+    });
     resizingList.set(_box);
     on('resize')(_box, _box.resize);
     return _box;

package/coms/zimoli/lattice_test.js

@@ -8,6 +8,6 @@ function main() {
     renderWithDefaults(layer, {
         data: items
     });
-    layer.querySelector("lattice").go(0);
+    layer.querySelector("lattice");
     return layer;
 }

package/coms/zimoli/model.less

@@ -0,0 +1,3 @@
+&{
+    word-break: break-all;
+}

package/coms/zimoli/onmounted.js

@@ -9,5 +9,5 @@ function onmounted(target, handle) {
     if (isMounted(target)) {
         handle.call(target);
     }
-    on("mounted")(target, handle);
+    return on("mounted")(target, handle);
 }

package/coms/zimoli/picture.js

@@ -38,7 +38,7 @@ var create = function (url, key) {
     image.shape = function (x, y, scaled, rotate) {
         var style = get_style(x, y, scaled, rotate);
         css(imgpic, style);
-        if (imgpic) dispatch(imgpic, 'scaled');
+        if (imgpic) dispatch(p, 'scaled');
     };
     image.close = function () {
         if (!p.touchclose) return false;

package/coms/zimoli/popup.js

@@ -99,8 +99,7 @@ var popup_path = function (path = "", parameters, target) {
         element.$reload = fullfill;
         if (!target && target !== false && parameters !== false) {
             element.style.opacity = 0;
-            if (element.parentNode) move.bindPosition(element, [.5, .5]), element.style.opacity = 1;
-            else once('append')(element, function () {
+            oncemount(element, function () {
                 move.bindPosition(element, [.5, .5]);
                 element.style.opacity = 1;
             });

package/coms/zimoli/render.js

@@ -573,6 +573,7 @@ var createEmiter = function (on) {
             getter1 = createGetter(search, false);
         }
         on(key)(this, function (e) {
+            digest();
             if (parsedSrc) {
                 var target = e.currentTarget || e.target;
                 var scopes = target && target.$parentScopes;
@@ -601,7 +602,6 @@ var createEmiter = function (on) {
                 res = getter0.call(this, e);
             }
             if (res && isFunction(res.then)) res.then(digest, digest);
-            digest();
             return res;
         });
     };

package/coms/zimoli/resize.js

@@ -135,39 +135,36 @@ function resize(elem, initialEvent) {
 }
 moveupon(window, handle);
 
+var offmousemove;
+var resizeh = lazy(function () {
+    // 用于刷新自定义的scrollbar/lattice/gallery组件
+    var elem = this;
+    var resized = false;
+    if (elem.scrollWidth > elem.clientWidth) {
+        css(elem, { width: elem.offsetWidth });
+        resized = true;
+    }
+    if (elem.scrollHeight > elem.clientHeight) {
+        css(elem, { height: elem.offsetHeight });
+        resized = true;
+    }
+    if (resized) dispatch(elem, 'resize'), resizingList.hit(elem);
+});
 
 resize.on = function (elem, dragHandle) {
     if (elem) {
         elem.dragHandle = dragHandle;
     }
     onmounted(elem, function () {
-        var off = onmousemove(window, getResizer);
-        onremove(elem, off);
-    });
-    var computed = getComputedStyle(elem);
-    var resizeh = function () {
-        var elem = this;
-        var resized = false;
-        if (elem.scrollWidth > elem.clientWidth) {
-            css(elem, { width: elem.offsetWidth });
-            resized = true;
+        if (!offmousemove) offmousemove = onmousemove(window, getResizer);
+        if (!~resizingElements.indexOf(elem)) {
+            resizingElements.push(elem);
         }
-        if (elem.scrollHeight > elem.clientHeight) {
-            css(elem, { height: elem.offsetHeight });
-            resized = true;
-        }
-        if (resized) dispatch(elem, 'resize'), resizingList.hit(elem);
-        if (unbind && parseInt(computed.height) && parseInt(computed.width)) {
-            unbind();
-            unbind = null;
-        };
-    }
-    if (!parseInt(computed.height) || !parseInt(computed.width)) var unbind = bind('render')(elem, resizeh);
-    if (!~resizingElements.indexOf(elem)) {
-        resizingElements.push(elem);
-        once('remove')(elem, function () {
-            var index = resizingElements.indexOf(this);
-            if (~index) resizingElements.splice(index, 1);
-        });
-    }
+        bind('render')(elem, resizeh);
+    });
+    on('remove')(elem, function () {
+        var index = resizingElements.indexOf(this);
+        if (~index) resizingElements.splice(index, 1);
+        if (!resizingElements.length && offmousemove) offmousemove(), offmousemove = null;
+    });
 };

package/coms/zimoli/script.js

@@ -67,7 +67,7 @@ function script(url, judger) {
         return promise.catch(f);
     };
     script.src = url;
-    setTimeout(function () {
+    Promise.resolve().then(function () {
         if (!script.parentNode) {
             if (judger) {
                 var res = seek(window, judger);

package/coms/zimoli/scrollbar.js

@@ -144,8 +144,8 @@ var scrollbary = function () {
     function bindTarget(_container, followResize = _container) {
         var _scrollbar = this;
         _container.with = _scrollbar;
-        onappend(_container, _scrollbar.reshape);
         _scrollbar.target = _container;
+        onmounted(_container, _scrollbar.reshape);
         on("scroll")(_container, function () {
             var top = getTargetTop(_container);
             _scrollbar.scrollTo(top);

package/coms/zimoli/selectList_test.html

@@ -9,6 +9,6 @@
     <option selected>600个选项</option>
 </select>
 <select -src="(o,i) in options6000">
+    <option value="" insert selected>60000个选项</option>
     <option -text="'选项'+o">选项</option>
-    <option insert selected>60000个选项</option>
 </select>

package/package.json

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