build

dist/assets/index-6zinoh_3.js

@@ -1,5 +0,0 @@
-<<<<<<<< HEAD:dist/assets/index-BNXYm0uS.js
-import{u as c,a9 as l}from"./index-CRsF8WVD.js";import{a5 as i,cw as m,R as t,ae as a,af as p,al as u,ag as f,bG as _}from"./index-BuyCAPrN.js";import"./vuedraggable.umd-iAuH7yoq.js";const S=i({__name:"mobileScreen",setup(d){const s=m(),e=t(!0),n=t(!1),r=c();return s.setScreenMode("mobileScreen"),r.initPPTData().then(()=>{e.value=!1}),(k,o)=>(a(),p("div",{class:"mobileScreen",onClick:o[0]||(o[0]=b=>n.value=!1)},[e.value?f("",!0):(a(),u(l,{key:0}))]))}}),B=_(S,[["__scopeId","data-v-2471f971"]]);export{B as default};
-========
-import{u as c,a9 as l}from"./index-CyZlGVz7.js";import{a5 as i,cw as m,R as t,ae as a,af as p,al as u,ag as f,bG as _}from"./index-vudbuaSr.js";import"./vuedraggable.umd-D-p0Zul4.js";const S=i({__name:"mobileScreen",setup(d){const s=m(),e=t(!0),n=t(!1),r=c();return s.setScreenMode("mobileScreen"),r.initPPTData().then(()=>{e.value=!1}),(k,o)=>(a(),p("div",{class:"mobileScreen",onClick:o[0]||(o[0]=b=>n.value=!1)},[e.value?f("",!0):(a(),u(l,{key:0}))]))}}),B=_(S,[["__scopeId","data-v-2471f971"]]);export{B as default};
->>>>>>>> 1a387b7762cec8e6bfd2183e7939a6142fff3bf8:dist/assets/index-6zinoh_3.js

dist/assets/index-9dPgZjYh.js

@@ -0,0 +1 @@
+import{_ as t}from"./404-R0y5dkvZ.js";import{E as c}from"./index-CjRZ_TNp.js";import{a5 as n,ae as i,af as r,ak as o,aq as _,am as d,P as l,bo as p,bH as m,bI as f,bG as u}from"./index-DIQ_4pkN.js";const s=a=>(m("data-v-340bbdaa"),a=a(),f(),a),b={class:"login"},h={class:"error"},g=s(()=>o("img",{src:t,class:"img",alt:""},null,-1)),k=s(()=>o("div",{class:"tit"},"登录已过期或服务器错误!",-1)),v=n({__name:"login",setup(a){function e(){window.close()}return(x,B)=>(i(),r("div",b,[o("div",h,[g,k,_(l(c),{class:"backBtn",type:"primary",plain:"",onClick:e},{default:d(()=>[p("关闭页面")]),_:1})])]))}}),E=u(v,[["__scopeId","data-v-340bbdaa"]]);export{E as default};

dist/assets/index-BIv8gRAy.js

@@ -1,5 +0,0 @@
-<<<<<<<< HEAD:dist/assets/index-BIv8gRAy.js
-import{_ as t}from"./404-R0y5dkvZ.js";import{E as c}from"./index-Bwu_lt1j.js";import{a5 as n,ae as i,af as r,ak as o,aq as _,am as d,P as l,bo as p,bH as m,bI as f,bG as u}from"./index-BuyCAPrN.js";const s=a=>(m("data-v-340bbdaa"),a=a(),f(),a),b={class:"login"},h={class:"error"},g=s(()=>o("img",{src:t,class:"img",alt:""},null,-1)),k=s(()=>o("div",{class:"tit"},"登录已过期或服务器错误!",-1)),v=n({__name:"login",setup(a){function e(){window.close()}return(x,B)=>(i(),r("div",b,[o("div",h,[g,k,_(l(c),{class:"backBtn",type:"primary",plain:"",onClick:e},{default:d(()=>[p("关闭页面")]),_:1})])]))}}),E=u(v,[["__scopeId","data-v-340bbdaa"]]);export{E as default};
-========
-import{_ as t}from"./404-R0y5dkvZ.js";import{E as c}from"./index-Q0AHEMXj.js";import{a5 as n,ae as i,af as r,ak as o,aq as _,am as d,P as l,bo as p,bH as m,bI as f,bG as u}from"./index-vudbuaSr.js";const s=a=>(m("data-v-340bbdaa"),a=a(),f(),a),b={class:"login"},h={class:"error"},g=s(()=>o("img",{src:t,class:"img",alt:""},null,-1)),k=s(()=>o("div",{class:"tit"},"登录已过期或服务器错误!",-1)),v=n({__name:"login",setup(a){function e(){window.close()}return(x,B)=>(i(),r("div",b,[o("div",h,[g,k,_(l(c),{class:"backBtn",type:"primary",plain:"",onClick:e},{default:d(()=>[p("关闭页面")]),_:1})])]))}}),E=u(v,[["__scopeId","data-v-340bbdaa"]]);export{E as default};
->>>>>>>> 1a387b7762cec8e6bfd2183e7939a6142fff3bf8:dist/assets/index-BRmBk2sE.js

dist/assets/index-BNXYm0uS.js

@@ -1,5 +0,0 @@
-<<<<<<<< HEAD:dist/assets/index-BNXYm0uS.js
-import{u as c,a9 as l}from"./index-CRsF8WVD.js";import{a5 as i,cw as m,R as t,ae as a,af as p,al as u,ag as f,bG as _}from"./index-BuyCAPrN.js";import"./vuedraggable.umd-iAuH7yoq.js";const S=i({__name:"mobileScreen",setup(d){const s=m(),e=t(!0),n=t(!1),r=c();return s.setScreenMode("mobileScreen"),r.initPPTData().then(()=>{e.value=!1}),(k,o)=>(a(),p("div",{class:"mobileScreen",onClick:o[0]||(o[0]=b=>n.value=!1)},[e.value?f("",!0):(a(),u(l,{key:0}))]))}}),B=_(S,[["__scopeId","data-v-2471f971"]]);export{B as default};
-========
-import{u as c,a9 as l}from"./index-CyZlGVz7.js";import{a5 as i,cw as m,R as t,ae as a,af as p,al as u,ag as f,bG as _}from"./index-vudbuaSr.js";import"./vuedraggable.umd-D-p0Zul4.js";const S=i({__name:"mobileScreen",setup(d){const s=m(),e=t(!0),n=t(!1),r=c();return s.setScreenMode("mobileScreen"),r.initPPTData().then(()=>{e.value=!1}),(k,o)=>(a(),p("div",{class:"mobileScreen",onClick:o[0]||(o[0]=b=>n.value=!1)},[e.value?f("",!0):(a(),u(l,{key:0}))]))}}),B=_(S,[["__scopeId","data-v-2471f971"]]);export{B as default};
->>>>>>>> 1a387b7762cec8e6bfd2183e7939a6142fff3bf8:dist/assets/index-6zinoh_3.js

dist/assets/index-BQW_vyhJ.js

@@ -0,0 +1 @@
+import{u as s,ab as r}from"./index-nqQQoxha.js";import{a5 as c,cx as n,R as p,ae as t,af as _,al as u,ag as i,bG as l}from"./index-DIQ_4pkN.js";const m={class:"pptScreen"},d=c({__name:"pptScreen",setup(f){const a=n(),e=p(!0),o=s();return a.setScreenMode("pptScreen"),o.initPPTData().then(()=>{e.value=!1}),(S,k)=>(t(),_("div",m,[e.value?i("",!0):(t(),u(r,{key:0}))]))}}),P=l(d,[["__scopeId","data-v-678905e9"]]);export{P as default};

dist/assets/index-BRmBk2sE.js

@@ -1,5 +0,0 @@
-<<<<<<<< HEAD:dist/assets/index-BIv8gRAy.js
-import{_ as t}from"./404-R0y5dkvZ.js";import{E as c}from"./index-Bwu_lt1j.js";import{a5 as n,ae as i,af as r,ak as o,aq as _,am as d,P as l,bo as p,bH as m,bI as f,bG as u}from"./index-BuyCAPrN.js";const s=a=>(m("data-v-340bbdaa"),a=a(),f(),a),b={class:"login"},h={class:"error"},g=s(()=>o("img",{src:t,class:"img",alt:""},null,-1)),k=s(()=>o("div",{class:"tit"},"登录已过期或服务器错误!",-1)),v=n({__name:"login",setup(a){function e(){window.close()}return(x,B)=>(i(),r("div",b,[o("div",h,[g,k,_(l(c),{class:"backBtn",type:"primary",plain:"",onClick:e},{default:d(()=>[p("关闭页面")]),_:1})])]))}}),E=u(v,[["__scopeId","data-v-340bbdaa"]]);export{E as default};
-========
-import{_ as t}from"./404-R0y5dkvZ.js";import{E as c}from"./index-Q0AHEMXj.js";import{a5 as n,ae as i,af as r,ak as o,aq as _,am as d,P as l,bo as p,bH as m,bI as f,bG as u}from"./index-vudbuaSr.js";const s=a=>(m("data-v-340bbdaa"),a=a(),f(),a),b={class:"login"},h={class:"error"},g=s(()=>o("img",{src:t,class:"img",alt:""},null,-1)),k=s(()=>o("div",{class:"tit"},"登录已过期或服务器错误!",-1)),v=n({__name:"login",setup(a){function e(){window.close()}return(x,B)=>(i(),r("div",b,[o("div",h,[g,k,_(l(c),{class:"backBtn",type:"primary",plain:"",onClick:e},{default:d(()=>[p("关闭页面")]),_:1})])]))}}),E=u(v,[["__scopeId","data-v-340bbdaa"]]);export{E as default};
->>>>>>>> 1a387b7762cec8e6bfd2183e7939a6142fff3bf8:dist/assets/index-BRmBk2sE.js

dist/assets/index-BxP2iNbm.js

@@ -0,0 +1 @@
+import{u as c,ab as l}from"./index-nqQQoxha.js";import{a5 as i,cx as m,R as t,ae as a,af as p,al as u,ag as f,bG as _}from"./index-DIQ_4pkN.js";import"./shapes-BaHA2WR8.js";const S=i({__name:"mobileScreen",setup(d){const s=m(),e=t(!0),n=t(!1),r=c();return s.setScreenMode("mobileScreen"),r.initPPTData().then(()=>{e.value=!1}),(k,o)=>(a(),p("div",{class:"mobileScreen",onClick:o[0]||(o[0]=b=>n.value=!1)},[e.value?f("",!0):(a(),u(l,{key:0}))]))}}),B=_(S,[["__scopeId","data-v-2471f971"]]);export{B as default};

dist/assets/index-C-2s70dP.js

@@ -0,0 +1 @@
+import{_ as a}from"./404-R0y5dkvZ.js";import{a5 as o,el as t,ae as r,af as c,bH as _,bI as d,ak as s,bG as p}from"./index-DIQ_4pkN.js";const i=e=>(_("data-v-dda25179"),e=e(),d(),e),n={class:"errorPage"},m=i(()=>s("div",{class:"error"},[s("img",{src:a,class:"img",alt:""}),s("div",{class:"tit"},"页面找不到了～")],-1)),l=[m],f=o({__name:"errorPage",setup(e){return t(),(u,h)=>(r(),c("div",n,l))}}),I=p(f,[["__scopeId","data-v-dda25179"]]);export{I as default};

dist/assets/index-CEVZW5va.js

@@ -1,5 +0,0 @@
-<<<<<<<< HEAD:dist/assets/index-CEVZW5va.js
-import{_ as a}from"./404-R0y5dkvZ.js";import{a5 as o,ek as t,ae as r,af as c,bH as _,bI as d,ak as s,bG as p}from"./index-BuyCAPrN.js";const i=e=>(_("data-v-dda25179"),e=e(),d(),e),n={class:"errorPage"},m=i(()=>s("div",{class:"error"},[s("img",{src:a,class:"img",alt:""}),s("div",{class:"tit"},"页面找不到了～")],-1)),l=[m],f=o({__name:"errorPage",setup(e){return t(),(u,h)=>(r(),c("div",n,l))}}),I=p(f,[["__scopeId","data-v-dda25179"]]);export{I as default};
-========
-import{_ as a}from"./404-R0y5dkvZ.js";import{a5 as o,ek as t,ae as r,af as c,bH as _,bI as d,ak as s,bG as p}from"./index-vudbuaSr.js";const i=e=>(_("data-v-dda25179"),e=e(),d(),e),n={class:"errorPage"},m=i(()=>s("div",{class:"error"},[s("img",{src:a,class:"img",alt:""}),s("div",{class:"tit"},"页面找不到了～")],-1)),l=[m],f=o({__name:"errorPage",setup(e){return t(),(u,h)=>(r(),c("div",n,l))}}),I=p(f,[["__scopeId","data-v-dda25179"]]);export{I as default};
->>>>>>>> 1a387b7762cec8e6bfd2183e7939a6142fff3bf8:dist/assets/index-D0gDx8o2.js

dist/assets/index-D0gDx8o2.js

@@ -1,5 +0,0 @@
-<<<<<<<< HEAD:dist/assets/index-CEVZW5va.js
-import{_ as a}from"./404-R0y5dkvZ.js";import{a5 as o,ek as t,ae as r,af as c,bH as _,bI as d,ak as s,bG as p}from"./index-BuyCAPrN.js";const i=e=>(_("data-v-dda25179"),e=e(),d(),e),n={class:"errorPage"},m=i(()=>s("div",{class:"error"},[s("img",{src:a,class:"img",alt:""}),s("div",{class:"tit"},"页面找不到了～")],-1)),l=[m],f=o({__name:"errorPage",setup(e){return t(),(u,h)=>(r(),c("div",n,l))}}),I=p(f,[["__scopeId","data-v-dda25179"]]);export{I as default};
-========
-import{_ as a}from"./404-R0y5dkvZ.js";import{a5 as o,ek as t,ae as r,af as c,bH as _,bI as d,ak as s,bG as p}from"./index-vudbuaSr.js";const i=e=>(_("data-v-dda25179"),e=e(),d(),e),n={class:"errorPage"},m=i(()=>s("div",{class:"error"},[s("img",{src:a,class:"img",alt:""}),s("div",{class:"tit"},"页面找不到了～")],-1)),l=[m],f=o({__name:"errorPage",setup(e){return t(),(u,h)=>(r(),c("div",n,l))}}),I=p(f,[["__scopeId","data-v-dda25179"]]);export{I as default};
->>>>>>>> 1a387b7762cec8e6bfd2183e7939a6142fff3bf8:dist/assets/index-D0gDx8o2.js

dist/assets/index-DWzZR4MJ.js

@@ -1,5 +0,0 @@
-<<<<<<<< HEAD:dist/assets/index-DWzZR4MJ.js
-import{u as s,a9 as r}from"./index-CRsF8WVD.js";import{a5 as c,cw as n,R as p,ae as t,af as _,al as u,ag as i,bG as l}from"./index-BuyCAPrN.js";const m={class:"pptScreen"},d=c({__name:"pptScreen",setup(f){const a=n(),e=p(!0),o=s();return a.setScreenMode("pptScreen"),o.initPPTData().then(()=>{e.value=!1}),(S,k)=>(t(),_("div",m,[e.value?i("",!0):(t(),u(r,{key:0}))]))}}),h=l(d,[["__scopeId","data-v-678905e9"]]);export{h as default};
-========
-import{u as s,a9 as r}from"./index-CyZlGVz7.js";import{a5 as c,cw as n,R as p,ae as t,af as _,al as u,ag as i,bG as l}from"./index-vudbuaSr.js";const m={class:"pptScreen"},d=c({__name:"pptScreen",setup(f){const a=n(),e=p(!0),o=s();return a.setScreenMode("pptScreen"),o.initPPTData().then(()=>{e.value=!1}),(S,k)=>(t(),_("div",m,[e.value?i("",!0):(t(),u(r,{key:0}))]))}}),h=l(d,[["__scopeId","data-v-678905e9"]]);export{h as default};
->>>>>>>> 1a387b7762cec8e6bfd2183e7939a6142fff3bf8:dist/assets/index-UAsWcCF9.js

dist/assets/index-UAsWcCF9.js

@@ -1,5 +0,0 @@
-<<<<<<<< HEAD:dist/assets/index-DWzZR4MJ.js
-import{u as s,a9 as r}from"./index-CRsF8WVD.js";import{a5 as c,cw as n,R as p,ae as t,af as _,al as u,ag as i,bG as l}from"./index-BuyCAPrN.js";const m={class:"pptScreen"},d=c({__name:"pptScreen",setup(f){const a=n(),e=p(!0),o=s();return a.setScreenMode("pptScreen"),o.initPPTData().then(()=>{e.value=!1}),(S,k)=>(t(),_("div",m,[e.value?i("",!0):(t(),u(r,{key:0}))]))}}),h=l(d,[["__scopeId","data-v-678905e9"]]);export{h as default};
-========
-import{u as s,a9 as r}from"./index-CyZlGVz7.js";import{a5 as c,cw as n,R as p,ae as t,af as _,al as u,ag as i,bG as l}from"./index-vudbuaSr.js";const m={class:"pptScreen"},d=c({__name:"pptScreen",setup(f){const a=n(),e=p(!0),o=s();return a.setScreenMode("pptScreen"),o.initPPTData().then(()=>{e.value=!1}),(S,k)=>(t(),_("div",m,[e.value?i("",!0):(t(),u(r,{key:0}))]))}}),h=l(d,[["__scopeId","data-v-678905e9"]]);export{h as default};
->>>>>>>> 1a387b7762cec8e6bfd2183e7939a6142fff3bf8:dist/assets/index-UAsWcCF9.js

dist/index.html

@@ -10,11 +10,7 @@
     <meta name="description" content="ppt编辑器" />
     <meta name="keywords" content="ppt,powerpoint,office powerpoint,在线ppt,幻灯片,演示文稿,ppt在线制作,Vue3,TypeScript" />
     <title>PPT</title>
-<<<<<<< HEAD
-    <script type="module" crossorigin src="./assets/index-BuyCAPrN.js"></script>
-=======
-    <script type="module" crossorigin src="./assets/index-vudbuaSr.js"></script>
->>>>>>> 1a387b7762cec8e6bfd2183e7939a6142fff3bf8
+    <script type="module" crossorigin src="./assets/index-DIQ_4pkN.js"></script>
     <link rel="stylesheet" crossorigin href="./assets/index-BrUV76Xx.css">
   </head>
   <body>