diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index 3cdbe555..cf4beadd 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -731,18 +731,11 @@ export class BrowserWindow { details.requestHeaders["user-agent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Cider/1.0.0 Chrome/96.0.4664.45 Electron/16.0.0 Safari/537.36"; } if (details.url.includes("https://qq.com")) { - (details.requestHeaders["Accept"] = "*/*"), - (details.requestHeaders["Accept-Encoding"] = "gzip, deflate, br"), - (details.requestHeaders["Accept-Language"] = "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6"), - (details.requestHeaders["Referer"] = "https://y.qq.com/"), - (details.requestHeaders["User-Agent"] = "Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X; zh-CN) AppleWebKit/537.51.1 ("); + (details.requestHeaders["Accept"] = "*/*"), (details.requestHeaders["Accept-Encoding"] = "gzip, deflate, br"), (details.requestHeaders["Accept-Language"] = "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6"), (details.requestHeaders["Referer"] = "https://y.qq.com/"), (details.requestHeaders["User-Agent"] = "Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X; zh-CN) AppleWebKit/537.51.1 ("); ("KHTML, like Gecko) Mobile/17D50 UCBrowser/12.8.2.1268 Mobile AliApp(TUnionSDK/0.1.20.3) "); } if (details.url.includes("https://c.y.qq.com/lyric/fcgi-bin/fcg_query_lyric_new.fcg")) { - (details.requestHeaders["Accept"] = "*/*"), - (details.requestHeaders["Accept-Encoding"] = "gzip, deflate, br"), - (details.requestHeaders["Accept-Language"] = "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6"), - (details.requestHeaders["User-Agent"] = "Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X; zh-CN) AppleWebKit/537.51.1 ("); + (details.requestHeaders["Accept"] = "*/*"), (details.requestHeaders["Accept-Encoding"] = "gzip, deflate, br"), (details.requestHeaders["Accept-Language"] = "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6"), (details.requestHeaders["User-Agent"] = "Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X; zh-CN) AppleWebKit/537.51.1 ("); ("KHTML, like Gecko) Mobile/17D50 UCBrowser/12.8.2.1268 Mobile AliApp(TUnionSDK/0.1.20.3) "); details.requestHeaders["Referer"] = "https://y.qq.com/portal/player.html"; } @@ -1504,11 +1497,7 @@ export class BrowserWindow { if (details.family === "IPv4" && !details.internal) { if (!/(loopback|vmware|internal|hamachi|vboxnet|virtualbox)/gi.test(dev + (alias ? ":" + alias : ""))) { if (details.address.substring(0, 8) === "192.168." || details.address.substring(0, 7) === "172.16." || details.address.substring(0, 3) === "10.") { - if ( - !ip.startsWith("192.168.") || - (String(ip2).startsWith("192.168.") && !ip.startsWith("192.168.") && String(ip2).startsWith("172.16.") && !ip.startsWith("192.168.") && !ip.startsWith("172.16.")) || - (String(ip2).startsWith("10.") && !ip.startsWith("192.168.") && !ip.startsWith("172.16.") && !ip.startsWith("10.")) - ) { + if (!ip.startsWith("192.168.") || (String(ip2).startsWith("192.168.") && !ip.startsWith("192.168.") && String(ip2).startsWith("172.16.") && !ip.startsWith("192.168.") && !ip.startsWith("172.16.")) || (String(ip2).startsWith("10.") && !ip.startsWith("192.168.") && !ip.startsWith("172.16.") && !ip.startsWith("10."))) { ip = details.address; } ++alias; diff --git a/src/main/plugins/chromecast.ts b/src/main/plugins/chromecast.ts index 46110e4e..84dc9321 100644 --- a/src/main/plugins/chromecast.ts +++ b/src/main/plugins/chromecast.ts @@ -200,11 +200,7 @@ export default class ChromecastPlugin { if (details.family === "IPv4" && !details.internal) { if (!/(loopback|vmware|internal|hamachi|vboxnet|virtualbox)/gi.test(dev + (alias ? ":" + alias : ""))) { if (details.address.substring(0, 8) === "192.168." || details.address.substring(0, 7) === "172.16." || details.address.substring(0, 3) === "10.") { - if ( - !ip.startsWith("192.168.") || - (ip2.startsWith("192.168.") && !ip.startsWith("192.168.") && ip2.startsWith("172.16.") && !ip.startsWith("192.168.") && !ip.startsWith("172.16.")) || - (ip2.startsWith("10.") && !ip.startsWith("192.168.") && !ip.startsWith("172.16.") && !ip.startsWith("10.")) - ) { + if (!ip.startsWith("192.168.") || (ip2.startsWith("192.168.") && !ip.startsWith("192.168.") && ip2.startsWith("172.16.") && !ip.startsWith("192.168.") && !ip.startsWith("172.16.")) || (ip2.startsWith("10.") && !ip.startsWith("192.168.") && !ip.startsWith("172.16.") && !ip.startsWith("10."))) { ip = details.address; } ++alias; diff --git a/src/renderer/main/components/i18n-editor.js b/src/renderer/main/components/i18n-editor.js index 24cbb25f..f64a3517 100644 --- a/src/renderer/main/components/i18n-editor.js +++ b/src/renderer/main/components/i18n-editor.js @@ -12,20 +12,24 @@ export const i18nEditor = Vue.component("i18n-editor", { @@ -35,7 +39,8 @@ export const i18nEditor = Vue.component("i18n-editor", { diff --git a/src/renderer/main/components/sidebar-library-item.js b/src/renderer/main/components/sidebar-library-item.js index 419343eb..db9f687b 100644 --- a/src/renderer/main/components/sidebar-library-item.js +++ b/src/renderer/main/components/sidebar-library-item.js @@ -5,11 +5,13 @@ export const sidebarLibraryItem = Vue.component("sidebar-library-item", { `, diff --git a/src/renderer/main/components/svg-icon.js b/src/renderer/main/components/svg-icon.js index 8ed68095..99671d07 100644 --- a/src/renderer/main/components/svg-icon.js +++ b/src/renderer/main/components/svg-icon.js @@ -6,7 +6,8 @@ export const svgIcon = Vue.component("svg-icon", { class="_svg-icon" :class="classes" :svg-name="name" - :style="{'--icon': 'url(' + url + ')'}"> + :style="{'--icon': 'url(' + url + ')'}" + > `, props: { name: { diff --git a/src/web-remote/vue.js b/src/web-remote/vue.js index a58f80cc..12f41ec6 100644 --- a/src/web-remote/vue.js +++ b/src/web-remote/vue.js @@ -262,29 +262,7 @@ ue.pop(), (ce.target = ue[ue.length - 1]); } var pe = function (e, t, n, r, i, o, a, s) { - (this.tag = e), - (this.data = t), - (this.children = n), - (this.text = r), - (this.elm = i), - (this.ns = void 0), - (this.context = o), - (this.fnContext = void 0), - (this.fnOptions = void 0), - (this.fnScopeId = void 0), - (this.key = t && t.key), - (this.componentOptions = a), - (this.componentInstance = void 0), - (this.parent = void 0), - (this.raw = !1), - (this.isStatic = !1), - (this.isRootInsert = !0), - (this.isComment = !1), - (this.isCloned = !1), - (this.isOnce = !1), - (this.asyncFactory = s), - (this.asyncMeta = void 0), - (this.isAsyncPlaceholder = !1); + (this.tag = e), (this.data = t), (this.children = n), (this.text = r), (this.elm = i), (this.ns = void 0), (this.context = o), (this.fnContext = void 0), (this.fnOptions = void 0), (this.fnScopeId = void 0), (this.key = t && t.key), (this.componentOptions = a), (this.componentInstance = void 0), (this.parent = void 0), (this.raw = !1), (this.isStatic = !1), (this.isRootInsert = !0), (this.isComment = !1), (this.isCloned = !1), (this.isOnce = !1), (this.asyncFactory = s), (this.asyncMeta = void 0), (this.isAsyncPlaceholder = !1); }, de = { child: { configurable: !0 } }; (de.child.get = function () { @@ -722,20 +700,7 @@ ? (function e(o, a) { var s = []; var c, u, l, f; - for (c = 0; c < o.length; c++) - t((u = o[c])) || - "boolean" == typeof u || - ((l = s.length - 1), - (f = s[l]), - Array.isArray(u) - ? u.length > 0 && (ct((u = e(u, (a || "") + "_" + c))[0]) && ct(f) && ((s[l] = he(f.text + u[0].text)), u.shift()), s.push.apply(s, u)) - : i(u) - ? ct(f) - ? (s[l] = he(f.text + u)) - : "" !== u && s.push(he(u)) - : ct(u) && ct(f) - ? (s[l] = he(f.text + u.text)) - : (r(o._isVList) && n(u.tag) && t(u.key) && n(a) && (u.key = "__vlist" + a + "_" + c + "__"), s.push(u))); + for (c = 0; c < o.length; c++) t((u = o[c])) || "boolean" == typeof u || ((l = s.length - 1), (f = s[l]), Array.isArray(u) ? u.length > 0 && (ct((u = e(u, (a || "") + "_" + c))[0]) && ct(f) && ((s[l] = he(f.text + u[0].text)), u.shift()), s.push.apply(s, u)) : i(u) ? (ct(f) ? (s[l] = he(f.text + u)) : "" !== u && s.push(he(u))) : ct(u) && ct(f) ? (s[l] = he(f.text + u.text)) : (r(o._isVList) && n(u.tag) && t(u.key) && n(a) && (u.key = "__vlist" + a + "_" + c + "__"), s.push(u))); return s; })(e) : void 0; @@ -1883,9 +1848,7 @@ Mn = function (e, t) { return Bn(t) || "false" === t ? "false" : "contenteditable" === e && In(t) ? t : "true"; }, - Fn = p( - "allowfullscreen,async,autofocus,autoplay,checked,compact,controls,declare,default,defaultchecked,defaultmuted,defaultselected,defer,disabled,enabled,formnovalidate,hidden,indeterminate,inert,ismap,itemscope,loop,multiple,muted,nohref,noresize,noshade,novalidate,nowrap,open,pauseonexit,readonly,required,reversed,scoped,seamless,selected,sortable,truespeed,typemustmatch,visible" - ), + Fn = p("allowfullscreen,async,autofocus,autoplay,checked,compact,controls,declare,default,defaultchecked,defaultmuted,defaultselected,defer,disabled,enabled,formnovalidate,hidden,indeterminate,inert,ismap,itemscope,loop,multiple,muted,nohref,noresize,noshade,novalidate,nowrap,open,pauseonexit,readonly,required,reversed,scoped,seamless,selected,sortable,truespeed,typemustmatch,visible"), Pn = "http://www.w3.org/1999/xlink", Rn = function (e) { return ":" === e.charAt(5) && "xlink" === e.slice(0, 5); @@ -2105,19 +2068,7 @@ } } function hr(e, t, n, r) { - r || e.tagName.indexOf("-") > -1 - ? mr(e, t, n) - : Fn(t) - ? Bn(n) - ? e.removeAttribute(t) - : ((n = "allowfullscreen" === t && "EMBED" === e.tagName ? "true" : t), e.setAttribute(t, n)) - : Ln(t) - ? e.setAttribute(t, Mn(t, n)) - : Rn(t) - ? Bn(n) - ? e.removeAttributeNS(Pn, Hn(t)) - : e.setAttributeNS(Pn, t, n) - : mr(e, t, n); + r || e.tagName.indexOf("-") > -1 ? mr(e, t, n) : Fn(t) ? (Bn(n) ? e.removeAttribute(t) : ((n = "allowfullscreen" === t && "EMBED" === e.tagName ? "true" : t), e.setAttribute(t, n))) : Ln(t) ? e.setAttribute(t, Mn(t, n)) : Rn(t) ? (Bn(n) ? e.removeAttributeNS(Pn, Hn(t)) : e.setAttributeNS(Pn, t, n)) : mr(e, t, n); } function mr(e, t, n) { if (Bn(n)) e.removeAttribute(t); @@ -2260,11 +2211,7 @@ } function Mr(t, n, r, i, o, a, s, c) { var u; - (i = i || e).right ? (c ? (n = "(" + n + ")==='click'?'contextmenu':(" + n + ")") : "click" === n && ((n = "contextmenu"), delete i.right)) : i.middle && (c ? (n = "(" + n + ")==='click'?'mouseup':(" + n + ")") : "click" === n && (n = "mouseup")), - i.capture && (delete i.capture, (n = Ir("!", n, c))), - i.once && (delete i.once, (n = Ir("~", n, c))), - i.passive && (delete i.passive, (n = Ir("&", n, c))), - i.native ? (delete i.native, (u = t.nativeEvents || (t.nativeEvents = {}))) : (u = t.events || (t.events = {})); + (i = i || e).right ? (c ? (n = "(" + n + ")==='click'?'contextmenu':(" + n + ")") : "click" === n && ((n = "contextmenu"), delete i.right)) : i.middle && (c ? (n = "(" + n + ")==='click'?'mouseup':(" + n + ")") : "click" === n && (n = "mouseup")), i.capture && (delete i.capture, (n = Ir("!", n, c))), i.once && (delete i.once, (n = Ir("~", n, c))), i.passive && (delete i.passive, (n = Ir("&", n, c))), i.native ? (delete i.native, (u = t.nativeEvents || (t.nativeEvents = {}))) : (u = t.events || (t.events = {})); var l = Hr({ value: r.trim(), dynamic: c }, s); i !== e && (l.modifiers = i); var f = u[n]; @@ -2628,30 +2575,7 @@ n(i._leaveCb) && ((i._leaveCb.cancelled = !0), i._leaveCb()); var a = $i(e.data.transition); if (!t(a) && !n(i._enterCb) && 1 === i.nodeType) { - for ( - var s = a.css, - c = a.type, - u = a.enterClass, - l = a.enterToClass, - p = a.enterActiveClass, - d = a.appearClass, - v = a.appearToClass, - h = a.appearActiveClass, - m = a.beforeEnter, - y = a.enter, - g = a.afterEnter, - _ = a.enterCancelled, - b = a.beforeAppear, - $ = a.appear, - w = a.afterAppear, - C = a.appearCancelled, - x = a.duration, - k = Zt, - A = Zt.$vnode; - A && A.parent; - - ) - (k = A.context), (A = A.parent); + for (var s = a.css, c = a.type, u = a.enterClass, l = a.enterToClass, p = a.enterActiveClass, d = a.appearClass, v = a.appearToClass, h = a.appearActiveClass, m = a.beforeEnter, y = a.enter, g = a.afterEnter, _ = a.enterCancelled, b = a.beforeAppear, $ = a.appear, w = a.afterAppear, C = a.appearCancelled, x = a.duration, k = Zt, A = Zt.$vnode; A && A.parent; ) (k = A.context), (A = A.parent); var O = !k._isMounted || !e.isRootInsert; if (!O || $ || "" === $) { var S = O && d ? d : u, @@ -3361,9 +3285,7 @@ }, $o = p("area,base,br,col,embed,frame,hr,img,input,isindex,keygen,link,meta,param,source,track,wbr"), wo = p("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr,source"), - Co = p( - "address,article,aside,base,blockquote,body,caption,col,colgroup,dd,details,dialog,div,dl,dt,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,legend,li,menuitem,meta,optgroup,option,param,rp,rt,source,style,summary,tbody,td,tfoot,th,thead,title,tr,track" - ), + Co = p("address,article,aside,base,blockquote,body,caption,col,colgroup,dd,details,dialog,div,dl,dt,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,legend,li,menuitem,meta,optgroup,option,param,rp,rt,source,style,summary,tbody,td,tfoot,th,thead,title,tr,track"), xo = /^\s*([^\s"'<>\/=]+)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/, ko = /^\s*((?:v-[\w-]+:|@|:|#)\[[^=]+?\][^\s"'<>\/=]*)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/, Ao = "[a-zA-Z_][\\-\\.0-9_a-zA-Z" + P.source + "]*", @@ -3765,14 +3687,7 @@ for (t = 0, n = u.length; t < n; t++) if (((r = i = u[t].name), (o = u[t].value), Xo.test(r))) if (((e.hasBindings = !0), (a = ma(r.replace(Xo, ""))) && (r = r.replace(ia, "")), ra.test(r))) - (r = r.replace(ra, "")), - (o = Or(o)), - (c = ta.test(r)) && (r = r.slice(1, -1)), - a && - (a.prop && !c && "innerHtml" === (r = b(r)) && (r = "innerHTML"), - a.camel && !c && (r = b(r)), - a.sync && ((s = Ur(o, "$event")), c ? Mr(e, '"update:"+(' + r + ")", s, null, !1, 0, u[t], !0) : (Mr(e, "update:" + b(r), s, null, !1, 0, u[t]), C(r) !== b(r) && Mr(e, "update:" + C(r), s, null, !1, 0, u[t])))), - (a && a.prop) || (!e.component && Wo(e.tag, e.attrsMap.type, r)) ? Er(e, r, o, u[t], c) : jr(e, r, o, u[t], c); + (r = r.replace(ra, "")), (o = Or(o)), (c = ta.test(r)) && (r = r.slice(1, -1)), a && (a.prop && !c && "innerHtml" === (r = b(r)) && (r = "innerHTML"), a.camel && !c && (r = b(r)), a.sync && ((s = Ur(o, "$event")), c ? Mr(e, '"update:"+(' + r + ")", s, null, !1, 0, u[t], !0) : (Mr(e, "update:" + b(r), s, null, !1, 0, u[t]), C(r) !== b(r) && Mr(e, "update:" + C(r), s, null, !1, 0, u[t])))), (a && a.prop) || (!e.component && Wo(e.tag, e.attrsMap.type, r)) ? Er(e, r, o, u[t], c) : jr(e, r, o, u[t], c); else if (Go.test(r)) (r = r.replace(Go, "")), (c = ta.test(r)) && (r = r.slice(1, -1)), Mr(e, r, o, a, !1, 0, u[t], c); else { var l = (r = r.replace(Xo, "")).match(na), @@ -3876,28 +3791,7 @@ i = Fr(e, "value") || "null", o = Fr(e, "true-value") || "true", a = Fr(e, "false-value") || "false"; - Er(e, "checked", "Array.isArray(" + t + ")?_i(" + t + "," + i + ")>-1" + ("true" === o ? ":(" + t + ")" : ":_q(" + t + "," + o + ")")), - Mr( - e, - "change", - "var $$a=" + - t + - ",$$el=$event.target,$$c=$$el.checked?(" + - o + - "):(" + - a + - ");if(Array.isArray($$a)){var $$v=" + - (r ? "_n(" + i + ")" : i) + - ",$$i=_i($$a,$$v);if($$el.checked){$$i<0&&(" + - Ur(t, "$$a.concat([$$v])") + - ")}else{$$i>-1&&(" + - Ur(t, "$$a.slice(0,$$i).concat($$a.slice($$i+1))") + - ")}}else{" + - Ur(t, "$$c") + - "}", - null, - !0 - ); + Er(e, "checked", "Array.isArray(" + t + ")?_i(" + t + "," + i + ")>-1" + ("true" === o ? ":(" + t + ")" : ":_q(" + t + "," + o + ")")), Mr(e, "change", "var $$a=" + t + ",$$el=$event.target,$$c=$$el.checked?(" + o + "):(" + a + ");if(Array.isArray($$a)){var $$v=" + (r ? "_n(" + i + ")" : i) + ",$$i=_i($$a,$$v);if($$el.checked){$$i<0&&(" + Ur(t, "$$a.concat([$$v])") + ")}else{$$i>-1&&(" + Ur(t, "$$a.slice(0,$$i).concat($$a.slice($$i+1))") + ")}}else{" + Ur(t, "$$c") + "}", null, !0); })(e, r, i); else if ("input" === o && "radio" === a) !(function (e, t, n) { @@ -4225,19 +4119,7 @@ for (r = 0, i = n.length; r < i; r++) { (o = n[r]), (a = !0); var u = t.directives[o.name]; - u && (a = !!u(e, o, t.warn)), - a && - ((c = !0), - (s += - '{name:"' + - o.name + - '",rawName:"' + - o.rawName + - '"' + - (o.value ? ",value:(" + o.value + "),expression:" + JSON.stringify(o.value) : "") + - (o.arg ? ",arg:" + (o.isDynamicArg ? o.arg : '"' + o.arg + '"') : "") + - (o.modifiers ? ",modifiers:" + JSON.stringify(o.modifiers) : "") + - "},")); + u && (a = !!u(e, o, t.warn)), a && ((c = !0), (s += '{name:"' + o.name + '",rawName:"' + o.rawName + '"' + (o.value ? ",value:(" + o.value + "),expression:" + JSON.stringify(o.value) : "") + (o.arg ? ",arg:" + (o.isDynamicArg ? o.arg : '"' + o.arg + '"') : "") + (o.modifiers ? ",modifiers:" + JSON.stringify(o.modifiers) : "") + "},")); } if (c) return s.slice(0, -1) + "]"; })(e, t);