\n\n ${6===e.type?this.mkLoading(e.load):""}\n \n ${this.mkCtrl()}\n ${i}\n `,delete e.wrap,o.appendChild(s),[o,s]}mkLoading(e){return`\n \n \n ${(1===e?' \n
\n `}mkMenubar(){let{menubar:e,fixed:t}=this.init.state,o="";return e&&(o=`\n \n
\n `),o}mkCtrl(){let{type:e}=this.init.state;if(e>3)return"";{let t="",o='\n \n ${o}\n
\n `}}append(){let{state:e,$id:t}=this.init,o=e.container;return e.type<4&&(unique&&close(unique),unique=t),layerDom[t]=this.create(),delete e.toast,this.toast=!0,o||(o=document.body),o.appendChild(layerDom[t][0]),this.vm=Anot(this.init),this}show(){let{state:e,$id:t}=this.init,o=(this.vm,e.container);setTimeout(function(){let s={background:e.background},n=Anot(layerDom[t][1]);if(5===e.type){let i=getComputedStyle(layerDom[t][1]);s.color=e.color,s.opacity=1;let a=Anot(o),r=a[0].querySelector(".arrow"),l=a.innerWidth(),c=a.innerHeight(),d=a.offset().left-$doc.scrollLeft(),p=a.offset().top-$doc.scrollTop(),y=parseInt(i.width),f=parseInt(i.height),u=["top"];Anot(layerDom[t][1]).css(s),a.bind("mouseenter",t=>{let o={visibility:"visible"};d=a.offset().left-$doc.scrollLeft(),(p=a.offset().top-$doc.scrollTop())+18window.innerWidth?(o.left=d+.3*l-y,u[1]="left"):o.left=d+.7*l,r.classList.add("offset-"+u.join("-")),n.css(o)}),a.bind("mouseleave",()=>{setTimeout(()=>{r.classList.remove("offset-"+u.join("-")),u=["top"],r.style.borderBottomColor="",r.style.borderTopColor="",layerDom[t][1].style.visibility="hidden"},100)})}else{let o={opacity:1};e.offset&&(fixOffset(e.offset),Object.assign(o,e.offset)),n.css(s),setTimeout(()=>{document.body.style.overflow="hidden",layerDom[t][1].classList.add("shift"),setTimeout(e=>{n.css(o),setTimeout(e=>{try{layerDom[t][1].classList.remove("shift")}catch(e){}},500)},50)},50)}},4),e.type>3&&(e.timeout>0?(clearTimeout(this.timeout),this.timeout=setTimeout(()=>{clearTimeout(this.timeout),close(t),6===e.type&&this.vm.props.yes.call(this.vm,t)},e.timeout)):6===e.type&&this.vm.props.yes.call(this.vm,t))}}const _layer={alert(e,t,o){let s={content:e,fixed:!0};return"function"==typeof t?s.yes=t:(t&&(s.title=t+""),o&&"function"==typeof o&&(s.yes=o)),_layer.open(s)},confirm(e,t,o,s){let n={content:e,fixed:!0,type:2};return"function"==typeof t?(n.yes=t,"function"==typeof o&&(n.no=o)):(t&&(n.title=t+""),o&&"function"==typeof o&&(n.yes=o),s&&"function"==typeof s&&(n.no=s)),_layer.open(n)},frame(e,t={}){let o={content:``,menubar:!1,maskClose:!0,type:4,...t};return _layer.open(o)},toast(e,t="info",o=2500){switch("number"==typeof t&&(o=t,t="info"),t){case"info":case"warn":break;case"error":t="deny";break;default:t="info"}let s={content:`\n \n `,menubar:!1,mask:!1,type:7,shift:{top:0},timeout:o,offset:{top:50},fixed:!0,toast:!0};return _layer.open(s)},load:(e,t,o)=>(e=(e>>>=0)<1?1:e>4?4:e,"function"==typeof t?(o=t,t=null):(t instanceof HTMLElement||(t=null),"function"!=typeof o&&(o=Anot.noop)),_layer.open({container:t,type:6,load:e,yes:o,menubar:!1,background:"none",fixed:!0})),tips:(e,t,o={})=>t instanceof HTMLElement?(o.background||(o.background="rgba(0,0,0,.5)"),o.color||(o.color="#fff"),Object.assign(o,{container:t,content:e,type:5,fixed:!0,mask:!1,menubar:!1,timeout:0}),_layer.open(o)):Anot.error(lang.NEED_CONTAINER),prompt(e,t){if("function"!=typeof t)return console.error("argument [callback] requires a function, but "+typeof t+" given");let o={type:3,prompt:"",title:e,content:'window.innerWidth?(s.left=.3*l-a,d[1]="left"):s.left=.7*l,n.classList.add("offset-"+d.join("-")),Anot(o).css(s)}),i.bind("mouseleave",()=>{setTimeout(()=>{n.classList.remove("offset-"+d.join("-")),d=["top"],n.style.borderBottomColor="",n.style.borderTopColor="",o.style.visibility="hidden"},100)})}}else{let o={$id:"layerwrap-"+e,state:t,props:{}};t.hasOwnProperty("area")&&(t.area=t.area.split(",")),t.hasOwnProperty("shift")&&(t.shift=fixOffset(new Function(`return ${t.shift}`)())),t.hasOwnProperty("offset")&&(t.offset=fixOffset(new Function(`return ${t.offset}`)())),t.hasOwnProperty("btns")&&(t.btns=t.btns.split(",")),t.hasOwnProperty("menubar")||(t.menubar=!1);let s=(new __layer__).__init__(o);for(let e in this.element.dataset)delete this.element.dataset[e];layerObj[s.init.$id]={obj:s,parentElem:this.element.parentNode,wrap:this.element,show:!1},layerDom[s.init.$id]=s.create()}}}),window.layer=_layer;export default _layer;
\ No newline at end of file
+/**
+ *
+ * @authors yutent (yutent@doui.cc)
+ * @date 2019-09-07 23:35:03
+ * @version v2.0.1
+ *
+ */
+
+'use strict'
+
+import"../form/input.js";import Drag from"../drag/core.js";import{nextTick,bind,unbind,clickOutside}from"../utils.js";const LANGUAGES={en:{TITLE:"Dialog",BTNS:["Cancel","OK"]},zh:{TITLE:"提示",BTNS:["取消","确定"]}};LANGUAGES["zh-CN"]=LANGUAGES.zh;const lang=LANGUAGES[window.__ENV_LANG__||navigator.language]||LANGUAGES.en;let uniqueInstance=null,toastInstance=null;const UNIQUE_TYPES=["alert","confirm","prompt"];function renderBtns(t){var e="";return t.forEach((t,s)=>{e+=`${t||lang.BTNS[s]} `}),e}class Layer extends HTMLElement{static get observedAttributes(){return["left","right","top","bottom","from","to","btns","type","title","blur","background","mask","mask-close","mask-color","fixed"]}constructor(){super(),Object.defineProperty(this,"root",{value:this.attachShadow({mode:"open"}),writable:!0,enumerable:!1,configurable:!0}),Object.defineProperty(this,"props",{value:{left:"auto",right:"auto",top:"auto",bottom:"auto",from:Object.create(null),to:Object.create(null),btns:[],type:"",title:"",blur:!1,background:null,mask:!1,"mask-close":!1,"mask-color":null,fixed:!0},writable:!0,enumerable:!1,configurable:!0}),this.root.innerHTML=' ',this.__TITLE__=this.root.children[1].firstElementChild,this.__BODY__=this.root.children[1].children[1],this.__CTRL__=this.root.children[1].lastElementChild,this.promise=new Promise((t,e)=>{this.resolve=t,this.reject=e})}set title(t){this.props.title=t,t?(this.__TITLE__.firstElementChild?this.__TITLE__.insertBefore(document.createTextNode(t),this.__TITLE__.firstElementChild):this.__TITLE__.textContent=t,this.__TITLE__.style.display="flex"):this.__TITLE__.style.display=""}set type(t){var{btns:e}=this.props;if(t&&!this._handleBtnClick){switch(t){case"alert":for(;e.length>1;)e.splice(0,1);break;case"confirm":case"prompt":for(;e.length>2;)e.splice(0,1);break;case"toast":case"notify":case"frame":if("notify"===t){var s=document.createElement("wc-icon");s.setAttribute("is","close"),this.__TITLE__.appendChild(s)}e=[];break;default:t="common"}this.props.type=t,e.length?(this.__CTRL__.innerHTML=renderBtns(e),this.__CTRL__.style.display="flex"):this.__CTRL__.style.display="",this.setAttribute(t,"")}}set fixed(t){this.props.fixed=!!t,this._updateFixedStat()}_updateFixedStat(){UNIQUE_TYPES.includes(this.props.type)||(this.props.fixed?this._dragIns&&(this._dragIns.destroy(),this._dragIns=null):(this._dragIns=new Drag(this.root.children[1]).by(this.__TITLE__,{overflow:!!this.props.hasOwnProperty("overflow")&&this.props.overflow}),this.removeAttribute("fixed")))}_intercept(t){this.props.intercept?this.props.intercept(t,e=>{delete this.props.intercept,this.resolve(t),this.close()}):(this.resolve(t),this.close())}close(t){if(!1===this.wrapped)if(this._dragIns&&this._dragIns.destroy(),UNIQUE_TYPES.includes(this.props.type)&&(uniqueInstance=null),delete this.promise,unbind(this.__CTRL__,"click",this._handleBtnClick),this.props.from&&!t){let t="opacity:0;";for(let e in this.props.from)t+=`${e}:${this.props.from[e]};`;this.root.children[1].style.cssText+=t,this.timer=setTimeout(()=>{this.parentNode.removeChild(this)},200)}else clearTimeout(this.timer),this.parentNode.removeChild(this);else this.removeAttribute("common")}show(){!1!==this.wrapped&&this.setAttribute("common","")}connectedCallback(){this.type=this.props.type,this.title=this.props.title,this._handleBtnClick=bind(this.__CTRL__,"click",t=>{if("BUTTON"===t.target.tagName){var e=+t.target.dataset.idx,{type:s}=this.props;switch(s){case"alert":this.resolve(),this.close();break;case"confirm":case"prompt":if(0===e)this.reject(),this.close();else{let t="prompt"===s?this.__INPUT__.value:null;this._intercept(t)}break;default:this._intercept(e)}}}),"prompt"===this.props.type&&(this.__INPUT__=this.__BODY__.firstElementChild.assignedNodes().pop(),this._handleSubmit=bind(this.__INPUT__,"submit",t=>{this._intercept(t.detail)})),this.props.mask&&this.setAttribute("mask",""),this._updateFixedStat(),this.props.mask&&(this._handlMask=clickOutside(this.root.children[1],t=>{this.props["mask-close"]?(!1===this.wrapped&&this.reject(null),this.close()):UNIQUE_TYPES.includes(this.props.type)&&(this.root.children[1].classList.toggle("scale",!0),setTimeout(t=>{this.root.children[1].classList.remove("scale")},100))}),this.props["mask-color"]&&(this.style.backgroundColor=this.props["mask-color"])),this.props.blur&&this.root.children[1].classList.toggle("blur",!0);let t=this.props.from?"":"opacity:1;";if(this.props.background&&(t+=`background: ${this.props.background};`),(this.props.radius||0===this.props.radius)&&(t+=`border-radius: ${this.props.radius};`),this.props.size)for(let e in this.props.size)t+=`${e}:${this.props.size[e]};`;if(this.props.from){for(let e in this.props.from)t+=`${e}:${this.props.from[e]};`;setTimeout(t=>{let e="opacity:1;";for(let t in this.props.to)e+=`${t}:${this.props.to[t]};`;this.root.children[1].style.cssText+=e},50)}t&&(this.root.children[1].style.cssText+=t),"toast"===this.props.type&&(this.timer=setTimeout(()=>{toastInstance=null,this.close()},3e3)),"notify"===this.props.type&&(this._handleClose=bind(this.__TITLE__,"click",t=>{"WC-ICON"===t.target.tagName&&this.close()}))}disconnectedCallback(){unbind(document,"mousedown",this._handlMask),unbind(this.__TITLE__,"click",this._handleClose)}attributeChangedCallback(t,e,s){if(null!==s&&e!==s)switch(t){case"title":case"type":this[t]=s;break;case"mask-color":case"background":this.props[t]=s;break;case"mask":case"mask-close":case"blur":this.props[t]=!0;break;case"left":case"right":case"top":case"bottom":null!==s&&(this.props.from[t]=s,this.props.to=this.props.from,this.removeAttribute(t));break;case"fixed":this.fixed=!0}}}function _layer(t){var e=document.createElement("wc-layer");if("toast"===t.type){var{type:s,content:o}=t;t={type:s,content:o,from:{top:0},to:{top:"30px"}},toastInstance&&toastInstance.close(!0),toastInstance=e}else e.props.mask=t.mask,!1===t.btns?e.props.btns=[]:t.btns&&t.btns.length?e.props.btns=t.btns:e.props.btns=lang.BTNS.concat(),t.intercept&&"function"==typeof t.intercept&&(e.props.intercept=t.intercept),e.props.mask=t.mask,e.props["mask-close"]=t["mask-close"],t.hasOwnProperty("overflow")&&(e.props.overflow=t.overflow),e.props["mask-color"]=t["mask-color"],e.props.blur=t.blur,e.props.radius=t.radius,e.props.background=t.background,t.size&&"object"==typeof t.size&&(e.props.size=t.size),UNIQUE_TYPES.includes(t.type)&&(uniqueInstance&&uniqueInstance.close(!0),uniqueInstance=e);return t.to&&"object"==typeof t.to&&(e.props.to=t.to,t.from&&"object"==typeof t.from?e.props.from=t.from:e.props.from=t.to),e.props.type=t.type,e.props.fixed=t.fixed,e.props.title=t.title,e.innerHTML=t.content,e.wrapped=!1,document.body.appendChild(e),e.promise}Object.assign(_layer,{alert(t,e=lang.TITLE){return this({type:"alert",title:e,content:t,mask:!0})},confirm(t,e=lang.TITLE,s){return"function"==typeof e&&(s=e,e=lang.TITLE),this({type:"confirm",title:e,content:t,mask:!0,intercept:s})},prompt(t=lang.TITLE,e){return this({type:"prompt",title:t,content:'\n
`,type:"toast"})}}),window.layer=_layer;export default _layer;
+
+if(!customElements.get('wc-layer')){
+ customElements.define('wc-layer', Layer)
+}
diff --git a/src/lib/lyrics/index.js b/src/lib/lyrics/index.js
index 325a8a3..c10d621 100644
--- a/src/lib/lyrics/index.js
+++ b/src/lib/lyrics/index.js
@@ -21,7 +21,7 @@ class Lyrics {
r: { bg: '', txt: '' }
}
- let lrc = ipcRenderer.sendSync('read-lrc', id)
+ let lrc = ipcRenderer.sendSync('sonist', { type: 'read-lrc', id })
if (!id || lrc === null) {
log('no lrc file', id)
return false
@@ -29,8 +29,6 @@ class Lyrics {
this.__ID__ = id
- log(id)
-
this.lib = lrc
.split('\n')
.map(it => {
@@ -106,7 +104,11 @@ class Lyrics {
// 延时3秒写入
this.__TIMER__ = setTimeout(() => {
- ipcRenderer.send('save-lrc', { id: this.__ID__, lrc })
+ ipcRenderer.send('sonist', {
+ type: 'save-lrc',
+ id: this.__ID__,
+ data: lrc
+ })
}, 3000)
}
diff --git a/src/lib/pager/index.js b/src/lib/pager/index.js
index 66b4d80..f178af6 100644
--- a/src/lib/pager/index.js
+++ b/src/lib/pager/index.js
@@ -1 +1,15 @@
-"use strict";importCss("/css/pager.css");function calculate({currPage:t,maxPageShow:e,totalPage:a}){let s=[],r=0,o=t1&&s.push("..."),a-t0&&s.push(e);return t+o1?e.pageList.pushArray(calculate({currPage:t,totalPage:a,maxPageShow:s})):e.pageList.pushArray([1])}Anot.ui.pager="1.0.0";const tmpls={home:'共 {{totalPage}} 页 {{totalItem}} 条 ',jumper:'前往\n
',slot:""};export default Anot.component("pager",{__init__:function(t,e,a){this.classList.add("do-pager"),this.classList.add("do-fn-noselect"),this.setAttribute(":class","{{classList.join(' ')}}"),t.theme=+t.theme||1,t.simpleMode&&(t.theme=1),e.classList=e.classList.concat("skin-"+t.theme,t.color||"plain",t.size||"mini"),t.total&&(e.totalItem=+t.total),t.pageSize&&(e.pageSize=+t.pageSize),t.layout||(t.layout="total,home,prev,pager,next,end,jumper"),2===t.theme&&(t.radius=null),delete t.total,delete t.pageSize,delete t.color,delete t.size,a()},render:function(t){let{layout:e,theme:a,simpleMode:s}=this.props;return s?e=["prev","curr","next"]:(e=e.replace(/\s/g,""),2===a&&(e=e.replace(/total|jumper/g,"")),e=e.split(",")),(e=e.map(e=>"slot"!==e?tmpls[e]||"":t&&t.extra?t.extra.join(""):void 0)).join("\n")},componentWillMount:function(){const{currPage:t,totalPage:e,props:a}=this;this.pageList.clear(),this.pageList.pushArray(calculate({currPage:t,totalPage:e,maxPageShow:a.maxPageShow}))},componentDidMount:function(){"function"==typeof this.props.created&&this.props.created(this)},state:{classList:[],currPage:1,totalItem:1,pageSize:20,inputPage:1,pageList:[]},computed:{totalPage:function(){return Math.ceil(this.totalItem/this.pageSize)}},props:{url:null,maxPageShow:5,simpleMode:!1,radius:3,pageChanged:Anot.PropsTypes.isFunction(),created:Anot.PropsTypes.isFunction()},skip:["classList"],methods:{parseUrl(t){return(t>>>=0)<1||!this.props.url||this.currPage===t?"":this.props.url.replace("{id}",t)},go(t,e){let{inputPage:a,totalPage:s,currPage:r}=this,o=e&&e.target||null;if(!(o&&o.disabled||r===t))if(t&&o){if("..."!==t){let e=o.dataset.to;e?location.href=e:t>>>=0,update(t,this)}}else if(null===t){if(a>>>=0,e&&13===e.keyCode){if(a<1||r===a)return this.inputPage=r;a>s&&(a=s),this.inputPage=a,update(a,this)}}else update(t>>>=0,this)},setSize(t){t=+t,this.pageSize!==t&&(this.pageSize=+t,update(1,this))},setTotal(t){t=+t,this.totalItem!==t&&(this.totalItem=+t,update(1,this))}}});
\ No newline at end of file
+/**
+ *
+ * @authors yutent (yutent@doui.cc)
+ * @date 2019-09-01 23:16:06
+ * @version v2.0.1
+ *
+ */
+
+'use strict'
+
+function calculate(t,e,r){var o,a=[],s=0,i=t<3?6-t:2;if(e<2||r)return a.push({to:t,txt:t}),a;t-i>1&&e>5&&(o=(o=t-2*i)<1?1:o,a.push({to:o,txt:"..."}));e-t0&&a.push({to:n,txt:n});t+ie?e:o,a.push({to:o,txt:"..."}));return a}export default class Pager extends HTMLElement{static get observedAttributes(){return["layout","total","curr","pagesize","simple"]}constructor(){super(),Object.defineProperty(this,"root",{value:this.attachShadow({mode:"open"}),writable:!0,enumerable:!1,configurable:!0}),Object.defineProperty(this,"props",{value:{layout:"home, prev, next, end",total:0,curr:1,pagesize:20,simple:!1},writable:!0,enumerable:!1,configurable:!0}),this.root.innerHTML=' |< < > >|
',this.__LAYOUT__=this.root.children[1],this.__HOME__=this.__LAYOUT__.children[0],this.__PREV__=this.__LAYOUT__.children[1],this.__PAGE__=this.__LAYOUT__.children[2],this.__NEXT__=this.__LAYOUT__.children[3],this.__END__=this.__LAYOUT__.children[4]}update(){var{curr:t,totalpage:e,simple:r}=this.props,o=calculate(t,e,r);this.__PAGE__.innerHTML=o.map(e=>`${e.txt} `).join("")}connectedCallback(){var{pagesize:t,total:e}=this.props;this.props.totalpage=Math.ceil(e/t),this.update(),this.__LAYOUT__.addEventListener("click",t=>{if("BUTTON"===t.target.tagName){var{curr:e,totalpage:r}=this.props,o=t.target.dataset.page,a=+o;if(a==a){if(a===e)return}else switch(o){case"prev":if((a=e-1)<1)return;break;case"next":if((a=e+1)>r)return;break;case"end":if(r===e)return;a=r}this.props.curr=a,this.update(),this.dispatchEvent(new CustomEvent("pick",{detail:a}))}},!1)}attributeChangedCallback(t,e,r){if(e!==r)switch(t){case"total":case"pagesize":case"curr":this.props[t]=+r||this.props[t];var{pagesize:o,total:a}=this.props;this.props.totalpage=Math.ceil(a/o),this.update();break;case"simple":this.props.simple=!0}}};
+
+if(!customElements.get('wc-pager')){
+ customElements.define('wc-pager', Pager)
+}
diff --git a/src/lib/request/index.js b/src/lib/request/index.js
index 5a615eb..a97aa5d 100644
--- a/src/lib/request/index.js
+++ b/src/lib/request/index.js
@@ -1 +1,447 @@
-"use strict";import Format from "./lib/format.js";import format from "./lib/format.js";const rlocalProtocol=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,log=console.log,noop=function(t,e){this.defer.resolve(e)};let isLocal=!1;try{isLocal=rlocalProtocol.test(location.ptyperotocol)}catch(t){}let originAnchor=document.createElement("a");originAnchor.href=location.href;const NOBODY_METHODS=["GET","HEAD"],ERRORS={10001:"Argument url is required",10012:"Parse error",10100:"Request canceled",10104:"Request pending...",10200:"Ok",10204:"No content",10304:"Not modified",10500:"Internal Server Error",10504:"Connected timeout"},FORM_TYPES={form:"application/x-www-form-urlencoded; charset=UTF-8",json:"application/json; charset=UTF-8",text:"text/plain; charset=UTF-8"},convert={text:t=>t,xml:(t,e)=>void 0!==e?e:Format.parseXML(t),html:t=>Format.parseHTML(t),json:t=>JSON.parse(t),script:t=>Format.parseJS(t)};class _Request{constructor(t="",e="GET",s={}){if(!t)throw new Error(ERRORS[10001]);return t=t.replace(/#.*$/,"").replace(/^\/\//,location.protocol+"//"),e=e.toUpperCase(),this.xhr=new XMLHttpRequest,this.defer=Promise.defer(),this.opt={url:t,method:e,headers:{},data:{},dataType:"text",withCredentials:!1},this.defer.promise.abort=(()=>{this.cancel=!0,this.xhr.abort()}),this.__next__(Object.assign({},request.__INIT__,s)),this.defer.promise}__next__(t){t.headers&&Object.assign(this.opt.headers,t.headers);let e=!1;if(t.formType)switch(t.formType){case"form":this.__set__("form");break;case"json":this.__set__("json");break;case"form-data":this.opt.method="POST",e=!0;break;default:NOBODY_METHODS.includes(this.opt.method)?this.__set__("form"):this.__set__("text")}else this.__set__("form");if(t.cache&&NOBODY_METHODS.includes(this.opt.method)&&(this.opt.cache=!0),t.timeout=t.timeout>>>0,t.timeout>0&&(this.opt.timeout=t.timeout),t.data){switch(typeof t.data){case"number":case"string":this.__set__("text"),this.opt.data=t.data;break;case"object":"FORM"===t.data.nodeName?(this.opt.method=t.data.method.toUpperCase()||"POST",this.opt.data=Format.parseForm(t.data),(e=this.opt.data.constructor===FormData)&&delete this.opt.headers["content-type"]):t.data.constructor===FormData?(e=!0,this.opt.method="POST",delete this.opt.headers["content-type"],this.opt.data=t.data):this.opt.data=e?Format.mkFormData(t.data):t.data}}t.withCredentials&&(this.opt.withCredentials=!0);try{let t=document.createElement("a");t.href=this.opt.url,this.opt.crossDomain=originAnchor.protocol!==t.protocol||originAnchor.host!==t.host}catch(t){}this.opt.crossDomain?this.opt.withCredentials&&(this.xhr.withCredentials=!0,this.opt.headers["X-Requested-With"]="XMLHttpRequest"):this.opt.headers["X-Requested-With"]="XMLHttpRequest",!NOBODY_METHODS.includes(this.opt.method)?e||("json"===t.formType?this.opt.data=JSON.stringify(this.opt.data):this.opt.data=Format.param(this.opt.data)):(this.opt.data=Format.param(this.opt.data),this.opt.url+=(/\?/.test(this.opt.url)?"&":"?")+this.opt.data,!1===this.opt.cache&&(this.opt.url+=(/\?/.test(this.opt.url)?"&":"?")+"_="+Math.random())),t.dataType&&(this.opt.dataType=t.dataType.toLowerCase()),this.xhr.responseType=this.opt.dataType,this.xhr.onreadystatechange=(t=>{this.opt.timeout>0&&(this.opt["time"+this.xhr.readyState]=t.timeStamp,4===this.xhr.readyState&&(this.opt.isTimeout=this.opt.time4-this.opt.time1>this.opt.timeout)),4===this.xhr.readyState&&this.__dispatch__(this.opt.isTimeout)}),this.xhr.open(this.opt.method,this.opt.url,!0);for(let t in this.opt.headers)this.xhr.setRequestHeader(t,this.opt.headers[t]);this.xhr.send(this.opt.data),this.opt.timeout&&this.opt.timeout>0&&(this.xhr.timeout=this.opt.timeout)}__set__(t){this.opt.headers["content-type"]=FORM_TYPES[t]}__dispatch__(t){let e={status:200,statusText:"ok",text:"",body:"",error:null};if(this.cancel)return this.__cancel__(e);if(t)return this.__timeout__(e);let s=this.xhr.status>=200&&this.xhr.status<400,o=this.xhr.getAllResponseHeaders().split("\n")||[],r="";for(let t of o)if(t=t.trim()){if("content-type"===(t=t.split(":")).shift().toLowerCase()){r=t.join(":").trim().toLowerCase();break}}switch(s?(e.status=this.xhr.status,204===e.status?e.statusText=ERRORS[10204]:304===e.status&&(e.statusText=ERRORS[10304])):(e.status=this.xhr.status||500,e.statusText=this.xhr.statusText||ERRORS[10500],e.error=new Error(e.statusText)),this.opt.dataType){case"arraybuffer":case"blob":case"document":case"json":e.text=e.body=this.xhr.response;break;default:try{let t=r.match(/json|xml|script|html/);t=t&&t[0].toLowerCase()||"text",e.text=this.xhr.response,e.body=convert[t](e.text,this.xhr.response)}catch(t){e.error=t,e.statusText=ERRORS[10012]}}this.__success__(s,e)}__success__(t,e){t?this.defer.resolve(e):this.defer.reject(e),delete this.xhr,delete this.opt,delete this.defer}__cancel__(t){t.status=0,t.statusText=ERRORS[10100],t.error=new Error(ERRORS[10100]),this.defer.reject(t),delete this.xhr,delete this.opt,delete this.defer}__timeout__(t){t.status=504,t.statusText=ERRORS[10504],t.error=new Error(ERRORS[10504]),this.defer.reject(t),delete this.xhr,delete this.opt,delete this.defer}}window.request||(window.request={get:(t,e={})=>new _Request(t,"GET",e),post:(t,e={})=>new _Request(t,"POST",e),upload(t,e={}){return e.formType="form-data",this.post(t,e)},download(t,e={}){return e.dataType="blob",this.get(t,e)},open:(t,e="GET",s={})=>("object"==typeof e&&(s=e,e="GET"),new _Request(t,e,s)),version:"2.0.0-normal",init(t={}){this.__INIT__=t}},Anot.ui.request=request.version);export default request;
\ No newline at end of file
+/**
+ *
+ * @authors yutent (yutent@doui.cc)
+ * @date 2018-03-25 23:59:13
+ * @version $Id$
+ */
+
+'use strict'
+import Format from "./lib/format.js"
+
+// 本地协议/头 判断正则
+const rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/
+const log = console.log
+
+const noop = function(e, res) {
+ this.defer.resolve(res)
+}
+
+let isLocal = false
+try {
+ isLocal = rlocalProtocol.test(location.protocol)
+} catch (e) {}
+
+let originAnchor = document.createElement('a')
+originAnchor.href = location.href
+
+const NOBODY_METHODS = ['GET', 'HEAD']
+const ERRORS = {
+ 10001: 'Argument url is required',
+ 10012: 'Parse error',
+ 10100: 'Request canceled',
+ 10104: 'Request pending...',
+ 10200: 'Ok',
+ 10204: 'No content',
+ 10304: 'Not modified',
+ 10500: 'Internal Server Error',
+ 10504: 'Connected timeout'
+}
+
+const FORM_TYPES = {
+ form: 'application/x-www-form-urlencoded; charset=UTF-8',
+ json: 'application/json; charset=UTF-8',
+ text: 'text/plain; charset=UTF-8'
+}
+
+const convert = {
+ text(val) {
+ return val
+ },
+ xml(val, xml) {
+ return xml !== undefined ? xml : Format.parseXML(val)
+ },
+ html(val) {
+ return Format.parseHTML(val)
+ },
+ json(val) {
+ return JSON.parse(val)
+ },
+ script(val) {
+ return Format.parseJS(val)
+ }
+}
+
+class _Request {
+ constructor(url = '', method = 'GET', param = {}) {
+ if (!url) {
+ throw new Error(ERRORS[10001])
+ }
+
+ // url规范化
+ url = url.replace(/#.*$/, '')
+
+ if (request.BASE_URL) {
+ if (!/^([a-z]+:|\/\/)/.test(url)) {
+ url = request.BASE_URL + url
+ }
+ }
+
+ method = method.toUpperCase()
+
+ this.xhr = new XMLHttpRequest()
+ this.defer = Promise.defer()
+ this.opt = {
+ url,
+ method,
+ headers: {},
+ data: {},
+ dataType: 'text',
+ withCredentials: false // 跨域选项,是否验证凭证
+ }
+
+ // 取消网络请求
+ this.defer.promise.abort = () => {
+ this.cancel = true
+ this.xhr.abort()
+ }
+ this.__next__(Object.assign({}, request.__INIT__, param))
+ return this.defer.promise
+ }
+
+ __next__(param) {
+ /* -------------------------------------------------------------- */
+ /* ------------------------ 1»» 配置头信息 ---------------------- */
+ /* -------------------------------------------------------------- */
+ if (param.headers) {
+ Object.assign(this.opt.headers, param.headers)
+ }
+
+ /* -------------------------------------------------------------- */
+ /* --------- 2»» 设置表单类型, 其中 form-data不能手动设置 ---------- */
+ /* -------------------------------------------------------------- */
+ let hasAttach = false
+ if (param.formType) {
+ switch (param.formType) {
+ case 'form':
+ this.__set__('form')
+ break
+ case 'json':
+ this.__set__('json')
+ break
+ case 'form-data':
+ this.opt.method = 'POST'
+ hasAttach = true
+ break
+ default:
+ if (NOBODY_METHODS.includes(this.opt.method)) {
+ this.__set__('form')
+ } else {
+ this.__set__('text')
+ }
+ }
+ } else {
+ this.__set__('form')
+ }
+
+ /* -------------------------------------------------------------- */
+ /* ------------------- 3»» 设置缓存 ---------------------------- */
+ /* -------------------------------------------------------------- */
+ if (param.cache) {
+ if (NOBODY_METHODS.includes(this.opt.method)) {
+ this.opt.cache = true
+ }
+ }
+
+ /* -------------------------------------------------------------- */
+ /* ------------------- 4»» 设置超时时间(毫秒) --------------------- */
+ /* -------------------------------------------------------------- */
+ param.timeout = param.timeout >>> 0
+ if (param.timeout > 0) {
+ this.opt.timeout = param.timeout
+ }
+
+ /* -------------------------------------------------------------- */
+ /* -------------------------- 5»» 请求的内容 --------------------- */
+ /* -------------------------------------------------------------- */
+ if (param.data) {
+ let type = typeof param.data
+
+ switch (type) {
+ case 'number':
+ case 'string':
+ this.__set__('text')
+ this.opt.data = param.data
+ break
+ case 'object':
+ // 解析表单DOM
+ if (param.data.nodeName === 'FORM') {
+ this.opt.method = param.data.method.toUpperCase() || 'POST'
+
+ this.opt.data = Format.parseForm(param.data)
+ hasAttach = this.opt.data.constructor === FormData
+
+ if (hasAttach) {
+ delete this.opt.headers['content-type']
+ }
+ // 如果是一个 FormData对象
+ // 则直接改为POST
+ } else if (param.data.constructor === FormData) {
+ hasAttach = true
+ this.opt.method = 'POST'
+ delete this.opt.headers['content-type']
+ this.opt.data = param.data
+ } else {
+ // 有附件,则改为FormData
+ if (hasAttach) {
+ this.opt.data = Format.mkFormData(param.data)
+ } else {
+ this.opt.data = param.data
+ }
+ }
+ }
+ }
+
+ /* -------------------------------------------------------------- */
+ /* -------------------------- 6»» 处理跨域 --------------------- */
+ /* -------------------------------------------------------------- */
+ if (param.withCredentials) {
+ this.opt.withCredentials = true
+ }
+ try {
+ let anchor = document.createElement('a')
+ anchor.href = this.opt.url
+
+ this.opt.crossDomain =
+ originAnchor.protocol !== anchor.protocol ||
+ originAnchor.host !== anchor.host
+ } catch (err) {}
+
+ // 6.1»» 进一步处理跨域
+ // 非跨域或跨域但支持Cors时自动加上一条header信息，用以标识这是ajax请求
+ // 如果是跨域,开启Cors会需要服务端额外返回一些headers
+
+ if (this.opt.crossDomain) {
+ if (this.opt.withCredentials) {
+ this.xhr.withCredentials = true
+ this.opt.headers['X-Requested-With'] = 'XMLHttpRequest'
+ }
+ } else {
+ this.opt.headers['X-Requested-With'] = 'XMLHttpRequest'
+ }
+
+ /* -------------------------------------------------------------- */
+ /* ------------- 7»» 根据method类型, 处理g表单数据 ---------------- */
+ /* -------------------------------------------------------------- */
+ // 是否允许发送body
+ let allowBody = !NOBODY_METHODS.includes(this.opt.method)
+ if (allowBody) {
+ if (!hasAttach) {
+ if (param.formType === 'json') {
+ this.opt.data = JSON.stringify(this.opt.data)
+ } else {
+ this.opt.data = Format.param(this.opt.data)
+ }
+ }
+ } else {
+ // 否则拼接到url上
+ this.opt.data = Format.param(this.opt.data)
+
+ if (this.opt.data) {
+ this.opt.url += (/\?/.test(this.opt.url) ? '&' : '?') + this.opt.data
+ }
+
+ if (this.opt.cache === false) {
+ this.opt.url +=
+ (/\?/.test(this.opt.url) ? '&' : '?') + '_=' + Math.random()
+ }
+ }
+
+ /* -------------------------------------------------------------- */
+ /* ------------- 8»» 设置响应的数据类型 ---------------- */
+ /* -------------------------------------------------------------- */
+ // arraybuffer | blob | document | json | text
+ if (param.dataType) {
+ this.opt.dataType = param.dataType.toLowerCase()
+ }
+ this.xhr.responseType = this.opt.dataType
+
+ /* -------------------------------------------------------------- */
+ /* ------------- 9»» 构造请求 ---------------- */
+ /* -------------------------------------------------------------- */
+
+ // response ready
+ this.xhr.onreadystatechange = ev => {
+ if (this.opt.timeout > 0) {
+ this.opt['time' + this.xhr.readyState] = ev.timeStamp
+ if (this.xhr.readyState === 4) {
+ this.opt.isTimeout =
+ this.opt.time4 - this.opt.time1 > this.opt.timeout
+ }
+ }
+
+ if (this.xhr.readyState !== 4) {
+ return
+ }
+
+ this.__dispatch__(this.opt.isTimeout)
+ }
+
+ // 9.1»» 初始化xhr
+ this.xhr.open(this.opt.method, this.opt.url, true)
+
+ // 9.2»» 设置头信息
+ for (let i in this.opt.headers) {
+ this.xhr.setRequestHeader(i, this.opt.headers[i])
+ }
+
+ // 9.3»» 发起网络请求
+ this.xhr.send(this.opt.data)
+
+ // 9.4»» 超时处理
+ if (this.opt.timeout && this.opt.timeout > 0) {
+ this.xhr.timeout = this.opt.timeout
+ }
+ }
+
+ __set__(type) {
+ this.opt.headers['content-type'] = FORM_TYPES[type]
+ }
+
+ __dispatch__(isTimeout) {
+ let result = {
+ status: 200,
+ statusText: 'ok',
+ text: '',
+ body: '',
+ error: null
+ }
+
+ // 主动取消
+ if (this.cancel) {
+ return this.__cancel__(result)
+ }
+
+ // 超时
+ if (isTimeout) {
+ return this.__timeout__(result)
+ }
+
+ // 是否请求成功(resful规范)
+ let isSucc = this.xhr.status >= 200 && this.xhr.status < 400
+
+ let headers = this.xhr.getAllResponseHeaders().split('\n') || []
+ let contentType = ''
+
+ //处理返回的 Header, 拿到content-type
+ for (let it of headers) {
+ it = it.trim()
+ if (it) {
+ it = it.split(':')
+ let tmp = it.shift().toLowerCase()
+ if (tmp === 'content-type') {
+ contentType = it
+ .join(':')
+ .trim()
+ .toLowerCase()
+ break
+ }
+ }
+ }
+
+ if (isSucc) {
+ result.status = this.xhr.status
+ if (result.status === 204) {
+ result.statusText = ERRORS[10204]
+ } else if (result.status === 304) {
+ result.statusText = ERRORS[10304]
+ }
+ } else {
+ result.status = this.xhr.status || 500
+ result.statusText = this.xhr.statusText || ERRORS[10500]
+ result.error = new Error(result.statusText)
+ }
+ // log(this.opt.dataType, this.xhr)
+ switch (this.opt.dataType) {
+ case 'arraybuffer':
+ case 'blob':
+ case 'document':
+ case 'json':
+ result.text = result.body = this.xhr.response
+ break
+ // text
+ default:
+ try {
+ //处理返回的数据
+ let dataType = contentType.match(/json|xml|script|html/)
+
+ dataType = (dataType && dataType[0].toLowerCase()) || 'text'
+
+ result.text = this.xhr.response
+ result.body = convert[dataType](result.text, this.xhr.response)
+ } catch (err) {
+ result.error = err
+ result.statusText = ERRORS[10012]
+ }
+ break
+ }
+ this.__success__(isSucc, result)
+ }
+
+ __success__(isSucc, result) {
+ if (isSucc) {
+ this.defer.resolve(result)
+ } else {
+ this.defer.reject(result)
+ }
+ delete this.xhr
+ delete this.opt
+ delete this.defer
+ }
+
+ __cancel__(result) {
+ result.status = 0
+ result.statusText = ERRORS[10100]
+ result.error = new Error(ERRORS[10100])
+
+ this.defer.reject(result)
+
+ delete this.xhr
+ delete this.opt
+ delete this.defer
+ }
+
+ __timeout__(result) {
+ result.status = 504
+ result.statusText = ERRORS[10504]
+ result.error = new Error(ERRORS[10504])
+
+ this.defer.reject(result)
+
+ delete this.xhr
+ delete this.opt
+ delete this.defer
+ }
+}
+
+if (!window.request) {
+ window.request = {
+ get(url, param = {}) {
+ return new _Request(url, 'GET', param)
+ },
+ post(url, param = {}) {
+ return new _Request(url, 'POST', param)
+ },
+ upload(url, param = {}) {
+ param.formType = 'form-data'
+ return this.post(url, param)
+ },
+ download(url, param = {}) {
+ param.dataType = 'blob'
+ return this.get(url, param)
+ },
+ open(url, method = 'GET', param = {}) {
+ if (typeof method === 'object') {
+ param = method
+ method = 'GET'
+ }
+ return new _Request(url, method, param)
+ },
+ version: '2.0.0-normal',
+ init(param = {}) {
+ this.__INIT__ = param
+ }
+ }
+ Anot.ui.request = request.version
+}
+
+export default request
diff --git a/src/lib/request/lib/format.js b/src/lib/request/lib/format.js
index 4f48fb0..ce5d8a7 100644
--- a/src/lib/request/lib/format.js
+++ b/src/lib/request/lib/format.js
@@ -1 +1,225 @@
-"use strict";function serialize(e,t,r){let o;if(Array.isArray(t))t.forEach(function(t,a){o=e?`${e}[${Array.isArray(t)?a:""}]`:a,"object"==typeof t?serialize(o,t,r):r(o,t)});else for(let a in t)o=e?`${e}[${a}]`:a,"object"==typeof t[a]?serialize(o,t[a],r):r(o,t[a])}const toS=Object.prototype.toString,doc=window.document,encode=encodeURIComponent,decode=decodeURIComponent,TagHooks=function(){this.option=doc.createElement("select"),this.thead=doc.createElement("table"),this.td=doc.createElement("tr"),this.area=doc.createElement("map"),this.tr=doc.createElement("tbody"),this.col=doc.createElement("colgroup"),this.legend=doc.createElement("fieldset"),this._default=doc.createElement("div"),this.g=doc.createElementNS("http://www.w3.org/2000/svg","svg"),this.optgroup=this.option,this.tbody=this.tfoot=this.colgroup=this.caption=this.thead,this.th=this.td,"circle,defs,ellipse,image,line,path,polygon,polyline,rect,symbol,text,use".replace(/,/g,e=>{this[e]=this.g})},Helper={tagHooks:new TagHooks,rtagName:/<([\w:]+)/,rxhtml:/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,scriptTypes:{"text/javascript":1,"text/ecmascript":1,"application/ecmascript":1,"application/javascript":1},rhtml:/<|&#?\w+;/};export default{parseJS:function(code){if(code=(code+"").trim(),code)if(1===code.indexOf("use strict")){let e=doc.createElement("script");e.text=code,doc.head.appendChild(e).parentNode.removeChild(e)}else eval(code)},parseXML:function(e,t,r){try{t=(new DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&t.documentElement&&!t.getElementsByTagName("parsererror").length||console.error("Invalid XML: "+e),t},parseHTML:function(e){let t=doc.createDocumentFragment().cloneNode(!1);if("string"!=typeof e)return t;if(!Helper.rhtml.test(e))return t.appendChild(document.createTextNode(e)),t;e=e.replace(Helper.rxhtml,"<$1>").trim();let r=(Helper.rtagName.exec(e)||["",""])[1].toLowerCase(),o=Helper.tagHooks[r]||Helper.tagHooks._default,a=null;o.innerHTML=e;let i=o.getElementsByTagName("script");if(i.length)for(let e,t=0;e=i[t++];)if(Helper.scriptTypes[e.type]){let t=doc.createElement("script").cloneNode(!1);e.attributes.forEach(function(e){t.setAttribute(e.name,e.value)}),t.text=e.text,e.parentNode.replaceChild(t,e)}for(;a=o.firstChild;)t.appendChild(a);return t},parseForm:function(e){let t={},r=!1;for(let o,a=0;o=e.elements[a++];)switch(o.type){case"select-one":case"select-multiple":if(o.name.length&&!o.disabled)for(let e,r=0;e=o.options[r++];)e.selected&&(t[o.name]=e.value||e.text);break;case"file":o.name.length&&!o.disabled&&(t[o.name]=o.files[0],r=!0);break;case void 0:case"submit":case"reset":case"button":break;case"radio":case"checkbox":if(!o.checked)break;default:o.name.length&&!o.disabled&&(t[o.name]=o.value)}return r?this.mkFormData(t):t},mkFormData(e){let t=new FormData;for(let r in e){let o=e[r];Array.isArray(o)?o.forEach(function(e){t.append(r+"[]",e)}):t.append(r,e[r])}return t},param:function(e){if(!e||"string"==typeof e||"number"==typeof e)return e;let t=[];return"object"==typeof e&&serialize("",e,function(e,r){/native code/.test(r)||(r="function"==typeof r?r():r,r="[object File]"!==toS.call(r)?encode(r):r,t.push(encode(e)+"="+r))}),t.join("&")}};
\ No newline at end of file
+/**
+ *
+ * @authors yutent (yutent@doui.cc)
+ * @date 2016-11-26 16:35:45
+ *
+ */
+
+'use strict'
+
+function serialize(p, obj, q) {
+ let k
+ if (Array.isArray(obj)) {
+ obj.forEach(function(it, i) {
+ k = p ? `${p}[${Array.isArray(it) ? i : ''}]` : i
+ // k = p ? p + '[' + (Array.isArray(it) ? i : '') + ']' : i
+ if (typeof it === 'object') {
+ serialize(k, it, q)
+ } else {
+ q(k, it)
+ }
+ })
+ } else {
+ for (let i in obj) {
+ k = p ? `${p}[${i}]` : i
+ // k = p ? p + '[' + i + ']' : i
+ if (typeof obj[i] === 'object') {
+ serialize(k, obj[i], q)
+ } else {
+ q(k, obj[i])
+ }
+ }
+ }
+}
+
+const toS = Object.prototype.toString
+const doc = window.document
+const encode = encodeURIComponent
+const decode = decodeURIComponent
+
+const TagHooks = function() {
+ this.option = doc.createElement('select')
+ this.thead = doc.createElement('table')
+ this.td = doc.createElement('tr')
+ this.area = doc.createElement('map')
+ this.tr = doc.createElement('tbody')
+ this.col = doc.createElement('colgroup')
+ this.legend = doc.createElement('fieldset')
+ this._default = doc.createElement('div')
+ this.g = doc.createElementNS('http://www.w3.org/2000/svg', 'svg')
+
+ this.optgroup = this.option
+ this.tbody = this.tfoot = this.colgroup = this.caption = this.thead
+ this.th = this.td
+
+ 'circle,defs,ellipse,image,line,path,polygon,polyline,rect,symbol,text,use'.replace(
+ /,/g,
+ m => {
+ this[m] = this.g //处理svg
+ }
+ )
+}
+
+const Helper = {
+ tagHooks: new TagHooks(),
+ rtagName: /<([\w:]+)/,
+ rxhtml: /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
+ scriptTypes: {
+ 'text/javascript': 1,
+ 'text/ecmascript': 1,
+ 'application/ecmascript': 1,
+ 'application/javascript': 1
+ },
+ rhtml: /<|&#?\w+;/
+}
+
+export default {
+ parseJS: function(code) {
+ code = (code + '').trim()
+ if (code) {
+ if (code.indexOf('use strict') === 1) {
+ let script = doc.createElement('script')
+ script.text = code
+ doc.head.appendChild(script).parentNode.removeChild(script)
+ } else {
+ eval(code)
+ }
+ }
+ },
+ parseXML: function(data, xml, tmp) {
+ try {
+ tmp = new DOMParser()
+ xml = tmp.parseFromString(data, 'text/xml')
+ } catch (e) {
+ xml = void 0
+ }
+
+ if (
+ !xml ||
+ !xml.documentElement ||
+ xml.getElementsByTagName('parsererror').length
+ ) {
+ console.error('Invalid XML: ' + data)
+ }
+ return xml
+ },
+ parseHTML: function(html) {
+ let fragment = doc.createDocumentFragment().cloneNode(false)
+
+ if (typeof html !== 'string') {
+ return fragment
+ }
+
+ if (!Helper.rhtml.test(html)) {
+ fragment.appendChild(document.createTextNode(html))
+ return fragment
+ }
+
+ html = html.replace(Helper.rxhtml, '<$1>').trim()
+ let tag = (Helper.rtagName.exec(html) || ['', ''])[1].toLowerCase()
+ let wrap = Helper.tagHooks[tag] || Helper.tagHooks._default
+ let firstChild = null
+
+ //使用innerHTML生成的script节点不会触发请求与执行text属性
+ wrap.innerHTML = html
+ let script = wrap.getElementsByTagName('script')
+ if (script.length) {
+ for (let i = 0, el; (el = script[i++]); ) {
+ if (Helper.scriptTypes[el.type]) {
+ let tmp = doc.createElement('script').cloneNode(false)
+ el.attributes.forEach(function(attr) {
+ tmp.setAttribute(attr.name, attr.value)
+ })
+ tmp.text = el.text
+ el.parentNode.replaceChild(tmp, el)
+ }
+ }
+ }
+
+ while ((firstChild = wrap.firstChild)) {
+ fragment.appendChild(firstChild)
+ }
+
+ return fragment
+ },
+ parseForm: function(form) {
+ let data = {}
+ let hasAttach = false
+ for (let i = 0, field; (field = form.elements[i++]); ) {
+ switch (field.type) {
+ case 'select-one':
+ case 'select-multiple':
+ if (field.name.length && !field.disabled) {
+ for (let j = 0, opt; (opt = field.options[j++]); ) {
+ if (opt.selected) {
+ data[field.name] = opt.value || opt.text
+ }
+ }
+ }
+ break
+ case 'file':
+ if (field.name.length && !field.disabled) {
+ data[field.name] = field.files[0]
+ hasAttach = true
+ }
+ break
+ case undefined:
+ case 'submit':
+ case 'reset':
+ case 'button':
+ break //按钮啥的, 直接忽略
+ case 'radio':
+ case 'checkbox':
+ // 只处理选中的
+ if (!field.checked) break
+ default:
+ if (field.name.length && !field.disabled) {
+ data[field.name] = field.value
+ }
+ }
+ }
+ // 如果有附件, 改为FormData
+ if (hasAttach) {
+ return this.mkFormData(data)
+ } else {
+ return data
+ }
+ },
+ mkFormData(data) {
+ let form = new FormData()
+ for (let i in data) {
+ let el = data[i]
+ if (Array.isArray(el)) {
+ el.forEach(function(it) {
+ form.append(i + '[]', it)
+ })
+ } else {
+ form.append(i, data[i])
+ }
+ }
+ return form
+ },
+ param: function(obj) {
+ if (!obj || typeof obj === 'string' || typeof obj === 'number') {
+ return obj
+ }
+
+ let arr = []
+ let q = function(k, v) {
+ if (/native code/.test(v)) {
+ return
+ }
+
+ v = typeof v === 'function' ? v() : v
+ v = toS.call(v) !== '[object File]' ? encode(v) : v
+
+ arr.push(encode(k) + '=' + v)
+ }
+
+ if (typeof obj === 'object') {
+ serialize('', obj, q)
+ }
+
+ return arr.join('&')
+ }
+}
diff --git a/src/lib/scroll/index.js b/src/lib/scroll/index.js
new file mode 100644
index 0000000..73ceeda
--- /dev/null
+++ b/src/lib/scroll/index.js
@@ -0,0 +1,15 @@
+/**
+ *
+ * @authors yutent (yutent@doui.cc)
+ * @date 2019-09-07 23:35:03
+ * @version v2.0.1
+ *
+ */
+
+'use strict'
+
+import{bind,ebind,unbind}from"../utils.js";const IS_FF=!!window.sidebar;export default class Scroll extends HTMLElement{static get observedAttributes(){return[]}constructor(){super(),Object.defineProperty(this,"root",{value:this.attachShadow({mode:"open"}),writable:!0,enumerable:!1,configurable:!0}),Object.defineProperty(this,"props",{value:{},writable:!0,enumerable:!1,configurable:!0}),this.root.innerHTML='
',this.__BOX__=this.root.children[1],this.__X__=this.root.children[2].children[0],this.__Y__=this.root.children[3].children[0]}get scrollTop(){return this.__BOX__.scrollTop}set scrollTop(t){if((t=+t)==t){var{sh:s,oh:i,yh:e}=this.props;this.__BOX__.scrollTop=t;var o=this.__BOX__.scrollTop/(s-i)*(i-e);this.props.thumbY=o,this.__Y__.style.transform=`translateY(${o}px)`}}get scrollLeft(){return this.__BOX__.scrollLeft}set scrollLeft(t){if(n=+n,n==n){var{sw:s,ow:i,xw:e}=this.props;this.__BOX__.scrollLeft=n;var o=this.__BOX__.scrollLeft/(s-i)*(i-e);this.props.thumbX=o,this.__X__.style.transform=`translateX(${o}px)`}}get scrollHeight(){return this.__BOX__.scrollHeight}_fetchScrollX(t){var{sw:s,ow:i,xw:e}=this.props;return t<0?t=0:t>i-e&&(t=i-e),this.__BOX__.scrollLeft=t/(i-e)*(s-i),this.__X__.style.transform=`translateX(${t}px)`,t}_fetchScrollY(t){var{sh:s,oh:i,yh:e}=this.props;return t<0?t=0:t>i-e&&(t=i-e),this.__BOX__.scrollTop=t/(i-e)*(s-i),this.__Y__.style.transform=`translateY(${t}px)`,t}connectedCallback(){this._initFn=bind(this.__BOX__,"mouseenter",t=>{var s=this.__BOX__.offsetWidth,i=this.__BOX__.scrollWidth,e=this.__BOX__.offsetHeight,o=this.__BOX__.scrollHeight,r=e*e/o>>0,h=s*s/i>>0;r<50&&(r=50),h<50&&(h=50),h===s&&(h=0),r===e&&(r=0),this.props.oh=e,this.props.sh=o,this.props.ow=s,this.props.sw=i,this.props.yh=r,this.props.xw=h,this.__X__.style.width=h+"px",this.__Y__.style.height=r+"px"}),this._wheelFn=ebind(this.__BOX__,"wheel",t=>{t.preventDefault();var{sh:s,oh:i,yh:e,sw:o,ow:r,xw:h}=this.props;if(h||e){var l,_;if(IS_FF)l=t.deltaMode?10*t.deltaX:t.deltaX,_=t.deltaMode?10*t.deltaY:t.deltaY;else{var n=Math.abs(t.wheelDelta);n<120?(l=t.deltaX,_=t.deltaY):(l=t.deltaX/(n/120),_=t.deltaY/(n/120))}if(this.__BOX__.scrollTop+=_,this.__BOX__.scrollLeft+=l,h){var a=this.__BOX__.scrollLeft/(o-r)*(r-h);this.props.thumbX=a,this.__X__.style.transform=`translateX(${a}px)`}if(e){var p=this.__BOX__.scrollTop/(s-i)*(i-e);this.props.thumbY=p,this.__Y__.style.transform=`translateY(${p}px)`}}});var t,s,i,e,o=o=>{var{thumbY:r,thumbX:h}=this.props;null!==t&&(i=this._fetchScrollX(h+o.pageX-t)),null!==s&&(e=this._fetchScrollY(r+o.pageY-s))},r=h=>{t=null,s=null,this.props.thumbX=i,this.props.thumbY=e,unbind(document,"mousemove",o),unbind(document,"mouseup",r)};bind(this.__Y__,"mousedown",t=>{s=t.pageY,this.props.thumbY||(this.props.thumbY=0),bind(document,"mousemove",o),bind(document,"mouseup",r)}),bind(this.__X__,"mousedown",s=>{t=s.pageX,this.props.thumbX||(this.props.thumbX=0),bind(document,"mousemove",o),bind(document,"mouseup",r)})}disconnectedCallback(){unbind(this.__BOX__,"mouseenter",this._initFn),unbind(this.__BOX__,"wheel",this._wheelFn)}};
+
+if(!customElements.get('wc-scroll')){
+ customElements.define('wc-scroll', Scroll)
+}
diff --git a/src/lib/utils.js b/src/lib/utils.js
new file mode 100644
index 0000000..51fe828
--- /dev/null
+++ b/src/lib/utils.js
@@ -0,0 +1 @@
+function noop(){}export const nextTick=function(){let t=[];let n=document.createTextNode("\x3c!-- --\x3e");new MutationObserver(function(){let n=t.length;for(let e=0;e{if(e)if(e.path){for(var o=e.path.concat();o.length>3;)if(o.shift()===t)return}else{var r=e.explicitOriginalTarget||e.target;if(t===r||t.contains(r)||t.root&&t.root.contains(r))return}n(e)})};
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index ce63966..3b3dd4b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -26,7 +26,7 @@ const MIME_TYPES = {
require('./tools/init')
const createTray = require('./tools/tray')
const createMenu = require('./tools/menu')
-const Shortcut = require('./tools/shortcut')
+
const { createMainWindow, createErrorWindow } = require('./tools/windows')
const ROOT = __dirname
@@ -35,7 +35,9 @@ const ROOT = __dirname
app.commandLine.appendSwitch('--lang', 'zh-CN')
app.commandLine.appendSwitch('--autoplay-policy', 'no-user-gesture-required')
-protocol.registerStandardSchemes(['app'], { secure: true })
+protocol.registerSchemesAsPrivileged([
+ { scheme: 'app', privileges: { secure: true, standard: true } }
+])
/* ----------------------------------------------------- */
@@ -69,7 +71,6 @@ app.once('ready', () => {
win.webContents.send('dock-click')
}
})
- Shortcut.__init__(win)
} else {
createErrorWindow()
}
diff --git a/src/tools/init.js b/src/tools/init.js
index 1b07ad9..e956a4a 100644
--- a/src/tools/init.js
+++ b/src/tools/init.js
@@ -6,10 +6,10 @@
'use strict'
-const { app, ipcMain } = require('electron')
+const { app, ipcMain, globalShortcut: GS } = require('electron')
const path = require('path')
-// const http = require('http')
const fs = require('iofs')
+const Shortcut = require('./shortcut')
/* ********** 修复环境变量 start *********** */
let PATH_SET = new Set()
@@ -43,92 +43,97 @@ if (!fs.exists(APP_ROOT)) {
}
const SUPPORTED_EXTS = ['.mp3', '.webm', '.ogg', '.flac', '.m4a', '.aac']
+const DB = {
+ read(file) {
+ let cache = (fs.cat(file) || '[]').toString('utf-8')
+ try {
+ return JSON.parse(cache)
+ } catch (err) {
+ return cache
+ }
+ },
+ save(file, data) {
+ fs.echo(JSON.stringify(data), file)
+ }
+}
/* ----------------------------------------------------------------- */
/* --------------------- 事件开始 ------------------------- */
/* ---------------------------------------------------------------- */
-// 获取应用配置
-ipcMain.on('get-init', (ev, val) => {
- let cache = fs.cat(INIT_FILE).toString('utf-8')
- cache = JSON.parse(cache)
- ev.returnValue = cache
-})
-
-// 设置应用配置
-ipcMain.on('set-init', (ev, val) => {
- fs.echo(JSON.stringify(val), INIT_FILE)
-})
-
-// 获取音乐数据库
-ipcMain.on('get-music', (ev, val) => {
- let cache = fs.cat(DB_FILE).toString('utf-8')
- cache = JSON.parse(cache)
- ev.returnValue = cache
-})
-
-// 更新音乐数据库
-ipcMain.on('set-music', (ev, val) => {
- fs.echo(JSON.stringify(val), DB_FILE)
-})
-
-// 获取临时音乐数据库
-ipcMain.on('get-temp', (ev, val) => {
- let cache = (fs.cat(TEMP_DB) || '[]').toString('utf-8')
- cache = JSON.parse(cache)
- ev.returnValue = cache
-})
-
-// 更新临时音乐数据库
-ipcMain.on('set-temp', (ev, val) => {
- fs.echo(JSON.stringify(val), TEMP_DB)
-})
-
-/**
- * 保存歌词文件
- */
-ipcMain.on('save-lrc', (ev, obj) => {
- fs.echo(obj.lrc, path.join(LRC_DIR, `${obj.id}.lrc`))
-})
-
-/**
- * 读取歌词文件
- */
-ipcMain.on('read-lrc', (ev, id) => {
- let file = path.join(LRC_DIR, `${id}.lrc`)
- if (fs.exists(file)) {
- ev.returnValue = fs.cat(file).toString('utf8')
- } else {
- ev.returnValue = null
- }
-})
-
-/**
- * 保存音乐文件
- */
-ipcMain.on('save-cache', (ev, obj) => {
- let savefile = path.join(CACHE_DIR, obj.file)
- fs.echo(obj.buff, savefile)
- ev.returnValue = `file://${savefile}`
-})
-
-/**
- * 扫描目录
- */
-ipcMain.on('scan-dir', (ev, dir) => {
- if (fs.isdir(dir)) {
- let list = fs.ls(dir, true).filter(_ => {
- if (fs.isdir(_)) {
- return false
+ipcMain.on('sonist', (ev, conn) => {
+ switch (conn.type) {
+ // 获取应用配置
+ case 'get-init':
+ ev.returnValue = DB.read(INIT_FILE)
+ break
+ // 设置应用配置
+ case 'set-init':
+ DB.save(INIT_FILE, conn.data)
+ break
+ // 获取音乐数据库
+ case 'get-music':
+ ev.returnValue = DB.read(DB_FILE)
+ break
+ // 更新音乐数据库
+ case 'set-music':
+ DB.save(DB_FILE, conn.data)
+ break
+ // 获取临时音乐数据库
+ case 'get-temp':
+ ev.returnValue = DB.read(TEMP_DB)
+ break
+ // 更新临时音乐数据库
+ case 'set-temp':
+ DB.save(TEMP_DB, conn.data)
+ break
+ // 读取歌词文件
+ case 'read-lrc':
+ let lrc = path.join(LRC_DIR, `${conn.id}.lrc`)
+ if (fs.exists(lrc)) {
+ ev.returnValue = DB.read(lrc)
} else {
- let { ext, name } = path.parse(_)
- if (!ext || name.startsWith('.')) {
- return false
- }
- return SUPPORTED_EXTS.includes(ext)
+ ev.returnValue = null
}
- })
- ev.returnValue = list
- } else {
- ev.returnValue = null
+ break
+ // 保存歌词文件
+ case 'save-lrc':
+ fs.echo(conn.data, path.join(LRC_DIR, `${conn.id}.lrc`))
+ break
+ // 保存音乐文件
+ case 'save-cache':
+ let file = path.join(CACHE_DIR, conn.file)
+ fs.echo(conn.data, file)
+ ev.returnValue = `file://${file}`
+ break
+
+ // 扫描目录
+ case 'scan-dir':
+ if (fs.isdir(conn.path)) {
+ let list = fs.ls(conn.path, true).filter(_ => {
+ if (fs.isdir(_)) {
+ return false
+ } else {
+ let { ext, name } = path.parse(_)
+ if (!ext || name.startsWith('.')) {
+ return false
+ }
+ return SUPPORTED_EXTS.includes(ext)
+ }
+ })
+ ev.returnValue = list
+ } else {
+ ev.returnValue = null
+ }
+ break
+
+ // 启用全局快捷键
+ case 'enable-gs':
+ Shortcut.__init__()
+ break
+
+ // 禁用全局快捷键
+ case 'disable-gs':
+ GS.unregisterAll()
+ break
}
})
diff --git a/src/tools/shortcut.js b/src/tools/shortcut.js
index 6d549c3..666c2c0 100644
--- a/src/tools/shortcut.js
+++ b/src/tools/shortcut.js
@@ -6,52 +6,52 @@
'use strict'
-const { globalShortcut: GS } = require('electron')
+const { app, globalShortcut: GS } = require('electron')
module.exports = {
- __init__(win) {
+ __init__() {
// 播放控制...
GS.register('MediaNextTrack', _ => {
- win.emit('gs-ctrl', 'next')
+ app.__MAIN__.emit('gs-ctrl', 'next')
})
GS.register('MediaPreviousTrack', _ => {
- win.emit('gs-ctrl', 'prev')
+ app.__MAIN__.emit('gs-ctrl', 'prev')
})
GS.register('MediaStop', _ => {
- win.emit('gs-ctrl', 'stop')
+ app.__MAIN__.emit('gs-ctrl', 'stop')
})
GS.register('MediaPlayPause', _ => {
- win.emit('gs-ctrl', 'play')
+ app.__MAIN__.emit('gs-ctrl', 'play')
})
// others
GS.register('Super+Alt+Space', _ => {
- win.emit('gs-ctrl', 'play')
+ app.__MAIN__.emit('gs-ctrl', 'play')
})
GS.register('Super+Alt+Left', _ => {
- win.emit('gs-ctrl', 'prev')
+ app.__MAIN__.emit('gs-ctrl', 'prev')
})
GS.register('Super+Alt+Right', _ => {
- win.emit('gs-ctrl', 'next')
+ app.__MAIN__.emit('gs-ctrl', 'next')
})
GS.register('Super+Alt+Up', _ => {
- win.emit('gs-ctrl', 'vu')
+ app.__MAIN__.emit('gs-ctrl', 'vu')
})
GS.register('Super+Alt+Down', _ => {
- win.emit('gs-ctrl', 'vd')
+ app.__MAIN__.emit('gs-ctrl', 'vd')
})
GS.register('Super+Alt+R', _ => {
- win.emit('gs-ctrl', 'lrc')
+ app.__MAIN__.emit('gs-ctrl', 'lrc')
})
GS.register('Super+Alt+Shift+M', _ => {
- win.emit('gs-ctrl', 'mini')
+ app.__MAIN__.emit('gs-ctrl', 'mini')
})
}
}
diff --git a/src/tools/windows.js b/src/tools/windows.js
index 951560a..7c017d5 100644
--- a/src/tools/windows.js
+++ b/src/tools/windows.js
@@ -22,7 +22,8 @@ exports.createMainWindow = function(icon) {
icon,
webPreferences: {
webSecurity: false,
- experimentalFeatures: true
+ experimentalFeatures: true,
+ nodeIntegration: true
},
show: false
})
@@ -33,7 +34,7 @@ exports.createMainWindow = function(icon) {
win.on('ready-to-show', _ => {
win.show()
- // win.openDevTools()
+ win.openDevTools()
})
return win
@@ -74,12 +75,15 @@ exports.createDesktopLrcWindow = function(screen) {
resizable: false,
alwaysOnTop: true,
skipTaskbar: true,
- x: (screen.size.width - 1024) / 2,
- y: screen.size.height - 100,
+ x: (screen.width - 1024) / 2,
+ y: screen.height - 100,
transparent: true,
hasShadow: false,
thickFrame: false,
- show: false
+ show: false,
+ webPreferences: {
+ nodeIntegration: true
+ }
})
win.loadURL('app://local/desktop-lrc.html')
@@ -98,10 +102,13 @@ exports.createMiniWindow = function(screen) {
resizable: false,
alwaysOnTop: true,
skipTaskbar: true,
- x: screen.size.width - 320,
+ x: screen.width - 320,
y: 0,
thickFrame: false,
- show: false
+ show: false,
+ webPreferences: {
+ nodeIntegration: true
+ }
})
win.loadURL('app://local/mini-win.html')
diff --git a/src/views/local.htm b/src/views/local.htm
index 6110c85..93eccdb 100644
--- a/src/views/local.htm
+++ b/src/views/local.htm
@@ -14,17 +14,17 @@
时长
-
+
-
diff --git a/src/views/profile.htm b/src/views/profile.htm
index a4ed989..d6124ab 100644
--- a/src/views/profile.htm
+++ b/src/views/profile.htm
@@ -91,6 +91,14 @@
+
+
+
关于Sonist
diff --git a/src/views/search.htm b/src/views/search.htm
index 5638639..e435169 100644
--- a/src/views/search.htm
+++ b/src/views/search.htm
@@ -26,16 +26,16 @@
时长
-
+