efront 3.20.13 → 3.20.16

package/coms/kugou/player.js

@@ -101,6 +101,7 @@ var $scope = {
         }
     },
     process(currentTime, duration) {
+        render.refresh();
         if (currentTime === duration) {
             $scope.pause();
             return false;
@@ -118,7 +119,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;
@@ -180,6 +180,7 @@ var $scope = {
         }
     },
     play(hash = musicList.active_hash) {
+        render.refresh();
         var isPlayback = typeof hash === "number";
         if (isPlayback) {
             if (hash < 0) {
@@ -233,7 +234,6 @@ var $scope = {
             return alert("暂不支持在您的浏览器中播放！");
         }
         musicList.active_hash = hash;
-        render.refresh();
         $scope.playing = true;
         playState.width = 0;
         getMusicInfo(hash).loading_promise.then((response) => {
@@ -296,15 +296,13 @@ var createControls = function () {
     var player = document.createElement("music-player");
     player.setAttribute("ng-class", "{play:playing===true,pause:playing===false,page:page,effect:effect}");
     player.innerHTML = Player;
-    var [background, progress] = player.children;
-    bindtouch(player, function (value) {
-        if (value) {
-            touching = true;
-            var { x } = value;
-            let _audio = $scope.audio;
-            $scope.process(x / player.offsetWidth * _audio.duration, _audio.duration);
-        }
-        return { x: progress.offsetWidth };
+    var [, progress] = player.children;
+    bindtouch(player, function (_, event) {
+        touching = true;
+        var x = event.clientX - getScreenPosition(player).left;
+        let _audio = $scope.audio
+        css(progress, { width: x });
+        $scope.process(x / player.offsetWidth * _audio.duration, _audio.duration);
     }, "x");
     bindtouch(player, function (value) {
         var top = getScreenPosition(player).top;

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

@@ -7,6 +7,7 @@ function lattice(element, minWidth, maxWidth = minWidth << 1, layers) {
         if (!_layers.length) return;
         var clientWidth = parseFloat(freePixel(_box.clientWidth));
         if (!clientWidth) return;
+        var savedCount = boxCount;
         boxCount = clientWidth / minWidth | 0;
         if (boxCount >= _layers.length) {
             boxCount = _layers.length;
@@ -21,6 +22,12 @@ function lattice(element, minWidth, maxWidth = minWidth << 1, layers) {
         else removeClass(_box, inadequate_class);
         _box.paddingMax = boxCount;
         _box.group = boxCount;
+        if (savedCount === boxCount) return;
+        _box.clean();
+        [].forEach.call(_box.children, function (c) {
+            build(c);
+        });
+        return true;
     };
     if (layers) {
         var _box = list(element, function (index) {
@@ -54,28 +61,19 @@ function lattice(element, minWidth, maxWidth = minWidth << 1, layers) {
         else if (isElement(element.with)) build(element.with);
     };
     var go = _box.go;
-    _box.go = function (value) {
+    _box.go = function () {
         resize();
-        if (!boxCount) return;
-        go.call(_box, value);
-    };
-    var _onappend = function () {
-        _box.resize();
+        go.apply(this, arguments);
     };
-    onappend(_box, _onappend);
     _box.resize = lazy(function () {
-        var savedCount = boxCount;
         var index = _box.index();
-        resize();
-        if (savedCount === boxCount) return;
-        var realIndex = index * (savedCount || 1);
-        index = realIndex / boxCount || 0;
-        _box.clean();
-        [].forEach.call(_box.children, function (c) {
-            build(c);
-        });
-        go.call(_box, index);
-    }, 0);
+        var savedCount = boxCount;
+        if (resize()) {
+            var realIndex = index * (savedCount || 1);
+            index = realIndex / boxCount || 0;
+            go.call(_box, 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/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/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.13",
+    "version": "3.20.16",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {