Merge branch 'online' of http://git.dayaedu.com/huangqiyong/pptList into hqyNew

dist/assets/index-B3pVmhZT.js

@@ -0,0 +1 @@
+import{u as i,ab as l}from"./index-BtxWkYHn.js";import{w as p,bz as d,a5 as g,cx as m,R as t,ae as r,af as u,al as f,ag as S,bG as _}from"./index-FztzMJ0_.js";import"./shapes-E3FiLaW7.js";const b=()=>{function a(o){const{api:e,playState:n}=o.data||{};e==="headerTogge"?window.parent.postMessage({api:"headerTogge",playState:n},"*"):e==="changeTogge"&&window.parent.postMessage({api:"changeTogge"},"*")}p(()=>{window.addEventListener("message",a)}),d(()=>{window.removeEventListener("message",a)})},v=g({__name:"mobileScreen",setup(a){b();const o=m(),e=t(!0),n=t(!1),c=i();return o.setScreenMode("mobileScreen"),c.initPPTData().then(()=>{e.value=!1}),(w,s)=>(r(),u("div",{class:"mobileScreen",onClick:s[0]||(s[0]=k=>n.value=!1)},[e.value?S("",!0):(r(),f(l,{key:0}))]))}}),x=_(v,[["__scopeId","data-v-90b2692a"]]);export{x as default};

dist/assets/index-DVwjfV52.js → dist/assets/index-Be_iFCUi.js

@@ -1 +1 @@
-import{u as s,ab as r}from"./index-Lehg-uQL.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-BSgMIx3Z.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};
+import{u as s,ab as r}from"./index-BtxWkYHn.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-FztzMJ0_.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-Lehg-uQL.js → dist/assets/index-BtxWkYHn.js

@@ -1,4 +1,4 @@
-import{cC as $x,cD as Ux,aG as zx,cE as Hx,cF as Vx,cG as Gx,cH as jx,ah as Yt,cI as Wx,cJ as Xx,cK as Kx,cL as Yx,aM as Zx,aF as Qx,cM as Jx,aB as k0,be as qx,cN as ew,cO as tw,cP as rw,cQ as nw,cR as iw,cS as aw,cT as ow,aE as sw,cU as lw,s as Me,bj as uw,al as Je,ag as je,af as Se,ak as Y,cV as cw,cW as fw,cX as dw,cY as hw,bi as vw,cZ as B0,bo as ov,aq as Ge,c_ as pw,c$ as gw,a5 as Xe,d0 as mw,d1 as yw,d2 as Sw,d3 as bw,d4 as Cw,d5 as xw,d6 as ww,d7 as Tw,d8 as Iw,d9 as Aw,da as _w,v as Ew,db as Pw,dc as Mw,dd as Rw,aR as Dw,de as Lw,df as Ow,dg as kw,dh as Bw,di as Nw,ay as Wn,dj as Fw,dk as $w,dl as Uw,dm as zw,A as Hw,dn as Vw,dp as Gw,bp as jw,dq as Ww,dr as Xw,ds as Kw,ap as Yw,ac as N0,ai as ht,dt as Zw,au as Ie,du as Qw,X as F0,y as Jw,dv as qw,aP as eT,dw as tT,w as xr,dx as rT,dy as nT,H as iT,dz as aT,bz as un,aD as oT,ae as oe,bI as Oa,$ as mc,dA as sT,bH as ka,dB as lT,aC as uT,aO as cT,R as ge,dC as fT,bq as Ud,a_ as Vr,aj as Ns,aY as ct,aZ as il,an as sv,dD as dT,dE as hT,dF as vT,dG as pT,dH as gT,dI as mT,dJ as yT,Q as ST,dK as bT,dL as CT,dM as xT,at as $t,dN as wT,dO as TT,aT as IT,ad as al,aU as AT,dP as _T,dQ as ET,dR as PT,P as he,a6 as MT,dS as RT,dT as DT,dU as LT,dV as OT,a7 as kT,dW as BT,dX as NT,dY as FT,dZ as $T,d_ as UT,b0 as zT,aA as lv,d$ as HT,e0 as VT,E as hr,x as GT,e1 as jT,e2 as WT,e3 as XT,am as xn,e4 as KT,az as rn,a$ as zd,e5 as YT,as as Tn,e6 as ZT,bx as Hd,cn as Vd,co as QT,bG as tt,bt as Gd,e7 as Yi,bB as JT,bv as zt,e8 as qT,cA as $0,bA as U0,e9 as ai,cq as eI,ea as tI,eb as rI,ec as nI,ed as iI,ee as Mp,cp as vo,ef as aI,bE as Rp,cx as yc,cv as oI,eg as Dp,bD as Lp,cB as z0,bu as H0,bw as vr,eh as Cl}from"./index-BSgMIx3Z.js";/**
+import{cC as $x,cD as Ux,aG as zx,cE as Hx,cF as Vx,cG as Gx,cH as jx,ah as Yt,cI as Wx,cJ as Xx,cK as Kx,cL as Yx,aM as Zx,aF as Qx,cM as Jx,aB as k0,be as qx,cN as ew,cO as tw,cP as rw,cQ as nw,cR as iw,cS as aw,cT as ow,aE as sw,cU as lw,s as Me,bj as uw,al as Je,ag as je,af as Se,ak as Y,cV as cw,cW as fw,cX as dw,cY as hw,bi as vw,cZ as B0,bo as ov,aq as Ge,c_ as pw,c$ as gw,a5 as Xe,d0 as mw,d1 as yw,d2 as Sw,d3 as bw,d4 as Cw,d5 as xw,d6 as ww,d7 as Tw,d8 as Iw,d9 as Aw,da as _w,v as Ew,db as Pw,dc as Mw,dd as Rw,aR as Dw,de as Lw,df as Ow,dg as kw,dh as Bw,di as Nw,ay as Wn,dj as Fw,dk as $w,dl as Uw,dm as zw,A as Hw,dn as Vw,dp as Gw,bp as jw,dq as Ww,dr as Xw,ds as Kw,ap as Yw,ac as N0,ai as ht,dt as Zw,au as Ie,du as Qw,X as F0,y as Jw,dv as qw,aP as eT,dw as tT,w as xr,dx as rT,dy as nT,H as iT,dz as aT,bz as un,aD as oT,ae as oe,bI as Oa,$ as mc,dA as sT,bH as ka,dB as lT,aC as uT,aO as cT,R as ge,dC as fT,bq as Ud,a_ as Vr,aj as Ns,aY as ct,aZ as il,an as sv,dD as dT,dE as hT,dF as vT,dG as pT,dH as gT,dI as mT,dJ as yT,Q as ST,dK as bT,dL as CT,dM as xT,at as $t,dN as wT,dO as TT,aT as IT,ad as al,aU as AT,dP as _T,dQ as ET,dR as PT,P as he,a6 as MT,dS as RT,dT as DT,dU as LT,dV as OT,a7 as kT,dW as BT,dX as NT,dY as FT,dZ as $T,d_ as UT,b0 as zT,aA as lv,d$ as HT,e0 as VT,E as hr,x as GT,e1 as jT,e2 as WT,e3 as XT,am as xn,e4 as KT,az as rn,a$ as zd,e5 as YT,as as Tn,e6 as ZT,bx as Hd,cn as Vd,co as QT,bG as tt,bt as Gd,e7 as Yi,bB as JT,bv as zt,e8 as qT,cA as $0,bA as U0,e9 as ai,cq as eI,ea as tI,eb as rI,ec as nI,ed as iI,ee as Mp,cp as vo,ef as aI,bE as Rp,cx as yc,cv as oI,eg as Dp,bD as Lp,cB as z0,bu as H0,bw as vr,eh as Cl}from"./index-FztzMJ0_.js";/**
 * vue v3.4.34
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT

dist/assets/index-Bd3Y-_vx.css → dist/assets/index-COWqouEC.css

@@ -1 +1 @@
-.mobile-thumbnails[data-v-530fb6fe]{padding:10px;white-space:nowrap;overflow-x:auto;overflow-y:hidden}.thumbnail-item[data-v-530fb6fe]{position:relative;display:inline-block;outline:2px solid #aaa}.thumbnail-item+.thumbnail-item[data-v-530fb6fe]{margin-left:10px}.thumbnail-item.active[data-v-530fb6fe]{outline-color:#198cfe}.thumbnail-item.active .label[data-v-530fb6fe]{background-color:#198cfe}.thumbnail-item .label[data-v-530fb6fe]{min-width:20px;height:14px;line-height:14px;position:absolute;right:-1px;top:-1px;color:#fff;background-color:#aaa;z-index:1;font-size:12px;text-align:center;padding:0 5px}.sortable-chosen[data-v-530fb6fe]{top:-5px}[data-v-530fb6fe]::-webkit-scrollbar{width:0;height:0}.mobileScreen[data-v-2471f971]{width:100%;height:100%}.mobileScreen .thumbnails[data-v-2471f971]{width:100%;position:absolute;bottom:0;left:0;z-index:99;background-color:#1d1d1db3;overflow:auto!important;animation:slideInUp-2471f971 .15s}@keyframes slideInUp-2471f971{0%{transform:translateY(100%)}to{transform:translateY(0)}}.mobileScreen .tool-icon[data-v-2471f971]{position:fixed;bottom:8px;right:8px;font-size:25px;color:#666;z-index:10}
+.mobile-thumbnails[data-v-530fb6fe]{padding:10px;white-space:nowrap;overflow-x:auto;overflow-y:hidden}.thumbnail-item[data-v-530fb6fe]{position:relative;display:inline-block;outline:2px solid #aaa}.thumbnail-item+.thumbnail-item[data-v-530fb6fe]{margin-left:10px}.thumbnail-item.active[data-v-530fb6fe]{outline-color:#198cfe}.thumbnail-item.active .label[data-v-530fb6fe]{background-color:#198cfe}.thumbnail-item .label[data-v-530fb6fe]{min-width:20px;height:14px;line-height:14px;position:absolute;right:-1px;top:-1px;color:#fff;background-color:#aaa;z-index:1;font-size:12px;text-align:center;padding:0 5px}.sortable-chosen[data-v-530fb6fe]{top:-5px}[data-v-530fb6fe]::-webkit-scrollbar{width:0;height:0}.mobileScreen[data-v-90b2692a]{width:100%;height:100%}.mobileScreen .thumbnails[data-v-90b2692a]{width:100%;position:absolute;bottom:0;left:0;z-index:99;background-color:#1d1d1db3;overflow:auto!important;animation:slideInUp-90b2692a .15s}@keyframes slideInUp-90b2692a{0%{transform:translateY(100%)}to{transform:translateY(0)}}.mobileScreen .tool-icon[data-v-90b2692a]{position:fixed;bottom:8px;right:8px;font-size:25px;color:#666;z-index:10}

dist/assets/index-DcsdPdf7.js → dist/assets/index-D1ZYVrMR.js

@@ -1 +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-BSgMIx3Z.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,el as t,ae as r,af as c,bH as _,bI as d,ak as s,bG as p}from"./index-FztzMJ0_.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-DeZfnPEh.js

@@ -1 +0,0 @@
-import{u as c,ab as l}from"./index-Lehg-uQL.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-BSgMIx3Z.js";import"./shapes-DIB7l2CO.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-CNRUTgNt.js → dist/assets/index-Nn-e80Sz.js

@@ -1 +1 @@
-import{_ as t}from"./404-R0y5dkvZ.js";import{E as c}from"./index-CEUjMIB9.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-BSgMIx3Z.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-UoNhaH34.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-FztzMJ0_.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/shapes-DIB7l2CO.js → dist/assets/shapes-E3FiLaW7.js

@@ -1,4 +1,4 @@
-import{cA as O,bA as j1,cB as h2}from"./index-BSgMIx3Z.js";import{ac as W}from"./index-Lehg-uQL.js";var Y1={exports:{}};/*!
+import{cA as O,bA as j1,cB as h2}from"./index-FztzMJ0_.js";import{ac as W}from"./index-BtxWkYHn.js";var Y1={exports:{}};/*!
  * clipboard.js v2.0.11
  * https://clipboardjs.com/
  *

dist/index.html

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

src/components/Input.vue

@@ -19,9 +19,10 @@
       @input="$event => handleInput($event)"
       @focus="$event => handleFocus($event)"
       @blur="$event => handleBlur($event)"
-      @change="$event => emit('change', $event)"
+      @change="$event => emit('change', ($event.target as HTMLInputElement).value)"
       @keydown.enter="$event => emit('enter', $event)"
     />
+    <div v-if="clearable && value" v-show="focused" @click="handleClear" class="clear"></div>
     <span class="suffix">
       <slot name="suffix"></slot>
     </span>
@@ -37,21 +38,24 @@ withDefaults(
     disabled?: boolean
     placeholder?: string
     simple?: boolean
+    clearable?: boolean
   }>(),
   {
     disabled: false,
     placeholder: "",
-    simple: false
+    simple: false,
+    clearable: false
   }
 )
 
 const emit = defineEmits<{
   (event: "update:value", payload: string): void
   (event: "input", payload: Event): void
-  (event: "change", payload: Event): void
+  (event: "change", payload: string): void
   (event: "blur", payload: Event): void
   (event: "focus", payload: Event): void
   (event: "enter", payload: Event): void
+  (event: "clear"): void
 }>()
 
 const focused = ref(false)
@@ -68,6 +72,12 @@ const handleFocus = (e: Event) => {
   emit("focus", e)
 }
 
+function handleClear() {
+  emit("update:value", "")
+  emit("change", "")
+  emit("clear")
+}
+
 const inputRef = ref<HTMLInputElement>()
 const focus = () => {
   if (inputRef.value) inputRef.value.focus()
@@ -87,6 +97,22 @@ defineExpose({
   transition: border-color 0.25s;
   font-size: 13px;
   display: flex;
+  &:not(.disabled):hover {
+    .clear {
+      display: initial !important;
+    }
+  }
+  .clear {
+    width: 16px;
+    height: 16px;
+    background: url("./imgs/clear.png") no-repeat;
+    background-size: 100% 100%;
+    margin-right: 5px;
+    cursor: pointer;
+    &:hover {
+      opacity: 0.8;
+    }
+  }
 
   input {
     min-width: 0;

src/messageHooks/closePage.ts

@@ -0,0 +1,9 @@
+// 关闭 像父级派发 页面
+export const iframeExitMes = () => {
+  window.parent.postMessage(
+    {
+      api: "iframe_exit"
+    },
+    "*"
+  )
+}

src/messageHooks/mobileScreen.ts

@@ -0,0 +1,30 @@
+/* 移动端预览的时候 监听按键事件 传给学生端控制操作按钮 */
+import { onMounted, onUnmounted } from "vue"
+
+export const changeToggeMes = () => {
+  function handleMessage(event: any) {
+    const { api, playState } = event.data || {}
+    if (api === "headerTogge") {
+      window.parent.postMessage(
+        {
+          api: "headerTogge",
+          playState: playState
+        },
+        "*"
+      )
+    } else if (api === "changeTogge") {
+      window.parent.postMessage(
+        {
+          api: "changeTogge"
+        },
+        "*"
+      )
+    }
+  }
+  onMounted(() => {
+    window.addEventListener("message", handleMessage)
+  })
+  onUnmounted(() => {
+    window.removeEventListener("message", handleMessage)
+  })
+}

src/views/Editor/EditorHeader/index.vue

@@ -74,6 +74,7 @@ import PopoverMenuItem from "@/components/PopoverMenuItem.vue"
 import { ref, computed } from "vue"
 import { ElMessageBox } from "element-plus"
 import usePptWork from "@/store/pptWork"
+import { iframeExitMes } from "@/messageHooks/closePage"
 
 const slidesStore = useSlidesStore()
 const { title } = storeToRefs(slidesStore)
@@ -124,12 +125,7 @@ function handleSave() {
 /* 关闭页面 */
 function handleClose() {
   window.close()
-  window.parent.postMessage(
-    {
-      api: "iframe_exit",
-    },
-    "*"
-  );
+  iframeExitMes()
 }
 </script>
 

src/views/components/element/cloudCoachElement/cloudCoachList/cloudCoachList.vue

@@ -23,7 +23,7 @@
           </div>
         </div>
         <div class="query">
-          <Input :placeholder="'请输入搜索关键词'" v-model:value="queryData.name" @enter="handleQuery">
+          <Input :placeholder="'请输入搜索关键词'" v-model:value="queryData.name" clearable @enter="handleQuery" @clear="handleQuery">
             <template #prefix>
               <img class="img" src="./imgs/query.png" alt="" />
             </template>
@@ -140,7 +140,13 @@
             <Empty v-if="!musicList.length && !loading" />
           </div>
           <div class="pagination" v-show="musicList.length">
-            <el-pagination layout="prev, pager, next" :default-page-size="21" @current-change="handleCurrentChange" :total="queryData.total" />
+            <el-pagination
+              layout="prev, pager, next"
+              :default-page-size="queryData.rows"
+              :current-page="queryData.page"
+              @current-change="handleCurrentChange"
+              :total="queryData.total"
+            />
           </div>
         </div>
       </div>

src/views/components/element/enjoyElement/resourcesList/resourcesList.vue

@@ -36,7 +36,7 @@
           </div>
         </div>
         <div class="query">
-          <Input :placeholder="'请输入搜索关键词'" v-model:value="queryData.name" @enter="handleQuery">
+          <Input :placeholder="'请输入搜索关键词'" clearable v-model:value="queryData.name" @enter="handleQuery" @clear="handleQuery">
             <template #prefix>
               <img class="img" src="../../cloudCoachElement/cloudCoachList/imgs/query.png" alt="" />
             </template>
@@ -132,7 +132,13 @@
             <Empty v-if="!musicList.length && !loading" />
           </div>
           <div class="pagination" v-show="musicList.length">
-            <el-pagination layout="prev, pager, next" :default-page-size="20" @current-change="handleCurrentChange" :total="queryData.total" />
+            <el-pagination
+              layout="prev, pager, next"
+              :default-page-size="queryData.rows"
+              :current-page="queryData.page"
+              @current-change="handleCurrentChange"
+              :total="queryData.total"
+            />
           </div>
         </div>
       </div>

src/views/mobileScreen/mobileScreen.vue

@@ -14,7 +14,9 @@ import Screen from "../Screen/index.vue"
 import usePptWork from "@/store/pptWork"
 import { useScreenStore } from "@/store"
 import MobileThumbnails from "../Mobile/MobileThumbnails.vue"
+import { changeToggeMes } from "@/messageHooks/mobileScreen"
 
+changeToggeMes()
 const screenStore = useScreenStore()
 
 const initLoading = ref(true)