efront 3.35.12 → 3.35.13

package/apps/kugou/singer/keywords.less

@@ -60,6 +60,7 @@
     >group {
 
         >padding {
+            margin-bottom: 12px;
             width: 33.3333%;
             line-height: 40px;
             font-size: 24px;

package/coms/basic_/Promise.js

@@ -34,7 +34,7 @@ if (!Promise) {
                 if (t.ohed) {
                     var throwed = t.throwed;
                     t.throwed = true;
-                    if (!throwed && PromiseRejectReactions.length) {
+                    if (!throwed && !PromiseRejectReactions.length) {
                         // <!--
                         console.warn("在异步过程中发现未处理的异常：", t.ohed[0], t.ohed[1], t.ohed[2]);
                         // -->

package/coms/basic_/Promise_test.js

@@ -0,0 +1,19 @@
+var Promise0 = window.Promise;
+delete modules.Promise;
+window.Promise = null;
+var Promise1 = await init("Promise")
+window.Promise = Promise0;
+async function testCatch(Promise) {
+    console.log(Promise.toString().slice(0, 30), 'then')
+    try {
+        await Promise.reject(1).then(function () { }, function () {
+            console.log('catch1');
+        }).then(null, function () {
+            console.log("catch2");
+        });
+    } catch (e) {
+        console.log(e)
+    }
+}
+await testCatch(Promise0);
+await testCatch(Promise1);

package/coms/frame/edit.js

@@ -18,7 +18,11 @@ function main(title, { submit }, { data: origin, fields, }) {
     });
     on('submit')(page, async function (e) {
         e.preventDefault();
-        await submit(item, fields, origin);
+        var res = await submit(item, fields, origin);
+        if (typeof res === 'string') {
+            return alert(res, 'error');
+        }
+        if (res === false) return;
         dispatch(this, 'submited');
         remove(this);
     });

package/coms/kugou/bg.less

@@ -1,4 +1,19 @@
+:active>& {
+    &:after {
+        width: 300px;
+        height: 140px;
+        margin: -150x -70px;
+    }
+
+    &:before {
+        width: 160px;
+        height: 180px;
+        margin: -80px -90px;
+    }
+}
+
 & {
+    z-index: 1;
     border: 1px solid rgba(0, 0, 0, .1);
     border-radius: inherit;
     position: absolute;
@@ -30,5 +45,7 @@
         background-color: #2873;
         position: absolute;
         border-radius: 50%;
+        backdrop-filter: invert(1);
+        transition: all .2s;
     }
 }

package/coms/kugou/song.less

@@ -6,17 +6,17 @@
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-    background: #101216;
+    background: #202226;
     color: #fffc;
 
     border: 2px solid transparent;
 
     &:hover {
-        border-color: #276;
+        border-color: #acb;
     }
 
     &:active {
-        border-color: #253;
+        border-color: #ccc;
     }
 }
 

package/coms/zimoli/data.js

@@ -714,6 +714,8 @@ var unbindInstance = function (instanceId, callback) {
         delete instanceListenerMap[instanceId];
     }
 };
+var OUTDATE = new Error("请求被覆盖");
+var ABORTED = new Error("请求已取消");
 var data = {
     decodeStructure,
     encodeStructure,
@@ -938,8 +940,6 @@ var data = {
                 return instance;
             }
         }
-        var outdate = new Error("request outdate.");
-        var aborted = new Error("request aborted.");
         this.responseLoading(instance);
         promise1 = instance.loading_promise = new Promise(function (ok) {
             if (!instance.loading) {
@@ -947,15 +947,15 @@ var data = {
             }
             setTimeout(ok, timeout);
         }).then(function () {
-            if (promise1 !== instance.loading_promise) throw outdate;
+            if (promise1 !== instance.loading_promise) throw OUTDATE;
             return privates.getApi(sid);
         }).then((api) => {
-            if (promise1 !== instance.loading_promise) throw outdate;
+            if (promise1 !== instance.loading_promise) throw OUTDATE;
             if (instance.loading) {
                 instance.loading.abort();
             }
             var params2 = privates.pack(sid, params1);
-            if (!privates.validApi(api, params2)) throw aborted;
+            if (!privates.validApi(api, params2)) throw ABORTED;
             let url = api.url;
             var base = api.base;
             if (base) url = base + api.path;
@@ -966,11 +966,11 @@ var data = {
                     headers = seekFromSource(headers, api.base);
                 }
                 instance.loading = cross(method, uri, headers).send(params).done(xhr => {
-                    if (instance.loading !== xhr) return oh(aborted);
+                    if (instance.loading !== xhr) return oh(ABORTED);
                     instance.loading = null;
                     ok(xhr.responseText || xhr.response);
                 }).error(xhr => {
-                    if (instance.loading !== xhr) return oh(aborted);
+                    if (instance.loading !== xhr) return oh(ABORTED);
                     instance.loading = null;
                     try {
                         var e = getErrorMessage(parseData(xhr.response || xhr.responseText || xhr.statusText || xhr.status));
@@ -984,7 +984,7 @@ var data = {
             });
             return promise;
         }).then((data) => {
-            if (instance.loading_promise !== promise1) throw aborted;
+            if (instance.loading_promise !== promise1) throw ABORTED;
             if (id) {
                 data = parse instanceof Function ? parse(data) : data;
                 this.setInstance(id, data, false);
@@ -993,10 +993,12 @@ var data = {
             }
             this.responseLoaded(instance);
             return data;
+        }).catch(function (e) {
+            if (e === OUTDATE || e === ABORTED) return;
+            throw e;
         });
         promise1.params = params;
         promise1.catch((e) => {
-            if (e === outdate || e === aborted) return;
             this.responseCrash(e, instance);
         });
 

package/coms/zimoli/menuItem.html

@@ -6,7 +6,7 @@
 </template>
 <span -html="menu.name" -style="{color:menu.color}"></span>
 <template -if="typeof menu.hotkey==='string'">
-    &nbsp;&nbsp; <span class="hotkey" -html="hotkey"></span>
+    &nbsp;&nbsp; <span class="hotkey" -html="menu.hotkey"></span>
 </template>
 <template -elseif="menu.hotkey?.length">
     &nbsp;&nbsp; <span ng-repeat="k of menu.hotkey" class="hotkey" ng-html="k"></span>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.35.12",
+    "version": "3.35.13",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {