efront 3.24.3 → 3.24.5

package/apps/kugou/main.js

@@ -1,6 +1,4 @@
-init('/api',function(jsondata){
-    data.setConfig(jsondata);
-});
+data.setConfig(api);
 zimoli.switch("", null, "/home");
 css("body", "background-color:#f2f4f6;");
 zimoli();

package/coms/basic/submit_.js

@@ -24,10 +24,12 @@ function submit(fields, data) {
             var tmp = /\:(\d+)?(?:\.(\d+))?$/.exec(f.type);
             if (tmp) var [, , fixed] = tmp;
             else if (/^(money|price)$/i.test(f.type)) fixed = 2;
+            else fixed = undefined;
             fixed = +fixed;
             if (fixed) {
                 var v = params[f.key];
-                if (v) {
+                if (!isEmpty(v)) {
+                    v = String(v);
                     var d = v.replace(/^[^\.]*\.?/, '').length;
                     if (d === v.length - 1) v = "0" + v;
                     if (d > 0 && d < fixed) {

package/{apps → coms}/kugou/api.js

@@ -3,6 +3,8 @@
         "song-info": "get                                 app/i/getSongInfo.php?cmd=playInfo&from=mkugou&hash",
         "slider-src": "get:[].mod-slider>.swipe-wrap>div  .#src=img!src&href=a!href",
         "songs-list": "get:[].panel-songslist%20li          .#hash=!id&.panel-songs-item-name>span!innerText",
+        "songs-list": "get:[].m_cm_item1warp:nth-child(2)>div .#=a!href\\song-mix&a:nth-child(2)>p:first-child!innerText&singer=a:nth-child(2)>p:nth-child(2)!innerText&imgurl=img!_src",
+        "song-mix;": "mget:script:nth-last-child(2)           mixsong/:hashid.html",
         "rank-list": "get:[].panel-img-list%20li            rank/list#href=a!href&=a!href\\rank-info&imgurl=img!_src&name=p|innerText",
         "rank-info": "get:[].panel-songslist%20li           rank/info/:id#src=!id&name=.panel-songs-item-name|innerText&data=.panel-songs-item-download/innerText",
         "plist-index": "get:[].panel-img-list%20li          plist/index#href=a!href&=a!href\\plist-info&imgurl=img!_src&name=.panel-img-content-first|innerText&count=.panel-img-content-sub|innerText",

package/coms/kugou/buildList.js

@@ -7,7 +7,13 @@ function main(dataid, datapath) {
         song,
         loading,
         musicList,
-        run(s) {
+        async run(s) {
+            if (!s.hash && s.hashid) {
+                await data.from("song-mix", s, function (a) {
+                    var m = a.innerText.match(/(['"`]?)hash\1\s*:\s*(["'`])(.*?)\2/);
+                    if (m) s.hash = m[3];
+                });
+            }
             if (s.hash) {
                 kugou$player.play(s.hash);
             } else {

package/coms/kugou/player.js

@@ -179,6 +179,7 @@ var $scope = {
             cast($scope.dance, buf);
         }
     },
+    playid: 0,
     play(hash = musicList.active_hash) {
         render.refresh();
         var isPlayback = typeof hash === "number";

package/coms/kugou/song.html

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

package/coms/kugou/song.js

@@ -21,6 +21,7 @@ function main(elem) {
         $scope.song = {
             hash: item.hash,
             imgurl: item.imgurl,
+            singer: singerName,
             songMarked: mark(songName, elem.mark),
             singerMarked: mark(singerName, elem.mark)
         };

package/coms/kugou/song.less

@@ -24,19 +24,23 @@
     width: 40px;
     margin: -6px -4px;
 
+    &+.singer+.song,
     &+.song {
         margin-left: -38px;
         padding-left: 46px;
-        line-height: 30px;
         display: inline-block;
         vertical-align: top;
+
     }
+
+    &+.singer {
+        padding-left: 46px;
+    }
+
 }
 
 >.song {
-    width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
+    line-height: 30px;
 }
 
 b {
@@ -56,6 +60,10 @@ b {
     line-height: 12px;
     font-size: 12px;
     color: #888;
+
+    &+.song {
+        padding-top: 6px;
+    }
 }
 
 >.play-state {

package/coms/zimoli/data.js

@@ -268,8 +268,7 @@ function parseConfig(api) {
     var required = [];
     var prepared = [];
     var autotrim = false;
-
-    id = id.replace(/[\?\|\:;](.+?)$/, function (m, s) {
+    id = id.replace(/[\?\|\:;](.*?)$/, function (m, s) {
         autotrim = /^[\|;]/.test(m);
         if (/^[\|\/]/.test(s)) autotrim = true, s = s.slice(1);
         s = s.split('&');
@@ -709,6 +708,13 @@ var data = {
         data = this.parseConfig(data);
         configPormise = Promise.resolve(data);
     },
+    async addConfig(data) {
+        var p = configPormise;
+        var c = await p;
+        if (p !== configPormise) return;
+        data = this.parseConfig(data);
+        extend(c, data);
+    },
     getConfig() {
         return privates.getConfigPromise();
     },

package/coms/zimoli/input.js

@@ -67,10 +67,12 @@ var number = function (event) {
     }
 };
 var toFixed = function () {
-    if (this.value && this.fixed) var fixed = BigNumber.fix(this.value, this.fixed);
-    if (this.value !== fixed) {
-        this.value = fixed;
-        dispatch(this, 'change');
+    if (this.value && this.fixed) {
+        var fixed = BigNumber.fix(this.value, this.fixed);
+        if (this.value !== fixed) {
+            this.value = fixed;
+            dispatch(this, 'change');
+        }
     }
 };
 var positiveReg = /^\+|^positive\-?|\-?positive$|\+$/i;

package/package.json

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