16 次代碼提交 c54d14f96e ... e1436d0891

作者 SHA1 備註 提交日期
  黄琪勇 e1436d0891 样式修改 2 月之前
  黄琪勇 3f4e9d77fd build 2 月之前
  黄琪勇 caf9a2fe13 Merge branch 'hqyNew' of http://git.dayaedu.com/huangqiyong/pptList into test-online 2 月之前
  黄琪勇 0a53a1b952 build 2 月之前
  黄琪勇 45eb8b57fc Merge branch 'hqyNew' of http://git.dayaedu.com/huangqiyong/pptList into test-online 2 月之前
  黄琪勇 6e7e94d4dd build 2 月之前
  黄琪勇 9bd99c12e4 Merge branch 'hqyNew' of http://git.dayaedu.com/huangqiyong/pptList into test-online 2 月之前
  黄琪勇 9f41b6aee0 build 3 月之前
  黄琪勇 5fdcd123a8 Merge branch 'hqyDev' of http://git.dayaedu.com/huangqiyong/pptList into test-online 3 月之前
  黄琪勇 3defcdc0d4 build 3 月之前
  黄琪勇 b0afc701db Merge branch 'hqyDev' of http://git.dayaedu.com/huangqiyong/pptList into test-online 3 月之前
  黄琪勇 f753a0b8be build 3 月之前
  黄琪勇 1d52d7639d Merge branch 'hqyDev' of http://git.dayaedu.com/huangqiyong/pptList into test-online 3 月之前
  黄琪勇 c4113f5fed build 3 月之前
  黄琪勇 e8c8425e03 Merge branch 'hqyDev' of http://git.dayaedu.com/huangqiyong/pptList into test-online 3 月之前
  黄琪勇 ba9859e2eb build 3 月之前
共有 33 個文件被更改,包括 43 次插入41 次删除
  1. 二進制
      dist/assets/icon_default-w-E8tW2f.png
  2. 0 1
      dist/assets/index-2ozVxlgV.js
  3. 0 4
      dist/assets/index-6ldn4hSR.js
  4. 1 1
      dist/assets/index-BHez2RiI.js
  5. 0 0
      dist/assets/index-BJIiNyUc.css
  6. 0 0
      dist/assets/index-BodUf9WO.js
  7. 1 0
      dist/assets/index-BqGrjwop.js
  8. 0 0
      dist/assets/index-CiwqWoI3.js
  9. 0 1
      dist/assets/index-CtXERsYB.js
  10. 4 0
      dist/assets/index-CvJulF-g.js
  11. 1 1
      dist/assets/index-D-_9dgad.js
  12. 0 0
      dist/assets/index-D3_zl--p.css
  13. 0 0
      dist/assets/index-D6BR3Hjv.css
  14. 0 1
      dist/assets/index-DKmzOQH8.js
  15. 0 0
      dist/assets/index-DjaP4Mno.js
  16. 1 0
      dist/assets/index-Do0egyfl.js
  17. 0 0
      dist/assets/index-DocUFjyI.css
  18. 1 0
      dist/assets/index-ss5lT_qo.js
  19. 二進制
      dist/assets/musicBg-Bp_Zsq0h.png
  20. 5 0
      dist/assets/shapes-DQzdLktJ.js
  21. 0 5
      dist/assets/shapes-GaKprgT0.js
  22. 1 1
      dist/index.html
  23. 1 1
      src/assets/styles/global.scss
  24. 1 1
      src/views/Editor/CanvasTool/index.vue
  25. 1 1
      src/views/Screen/BaseView.vue
  26. 1 1
      src/views/components/element/cloudCoachElement/cloudCoachList/cloudCoachList.vue
  27. 1 1
      src/views/components/element/enjoyElement/resourcesList/resourcesList.vue
  28. 5 5
      src/views/components/element/musicResourcesElement/musicResourcesList/components/instrumentList.vue
  29. 4 4
      src/views/components/element/musicResourcesElement/musicResourcesList/components/musicList.vue
  30. 5 5
      src/views/components/element/musicResourcesElement/musicResourcesList/components/musicianList.vue
  31. 3 3
      src/views/components/element/musicResourcesElement/musicResourcesList/musicResourcesList.vue
  32. 4 1
      src/views/components/element/musicResourcesElement/musicTheoryList/courseCollapse.vue
  33. 2 3
      src/views/components/element/musicResourcesElement/musicTheoryList/musicTheoryList.vue

二進制
dist/assets/icon_default-w-E8tW2f.png


+ 0 - 1
dist/assets/index-2ozVxlgV.js

@@ -1 +0,0 @@
-import{_ as t}from"./404-R0y5dkvZ.js";import{E as c}from"./index-DJCWf0z5.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-CT4f4PW9.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};

File diff suppressed because it is too large
+ 0 - 4
dist/assets/index-6ldn4hSR.js


File diff suppressed because it is too large
+ 1 - 1
dist/assets/index-BHez2RiI.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-BJIiNyUc.css


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-BodUf9WO.js


+ 1 - 0
dist/assets/index-BqGrjwop.js

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

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-CiwqWoI3.js


+ 0 - 1
dist/assets/index-CtXERsYB.js

@@ -1 +0,0 @@
-import{u as s,ad as r}from"./index-6ldn4hSR.js";import{a5 as c,cx as n,R as p,ae as t,af as _,al as u,ag as i,bG as d}from"./index-CT4f4PW9.js";const l={class:"pptScreen"},m=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",l,[e.value?i("",!0):(t(),u(r,{key:0}))]))}}),P=d(m,[["__scopeId","data-v-678905e9"]]);export{P as default};

File diff suppressed because it is too large
+ 4 - 0
dist/assets/index-CvJulF-g.js


+ 1 - 1
dist/assets/index-CN48yuxX.js → dist/assets/index-D-_9dgad.js

@@ -1 +1 @@
-import{_ as a}from"./404-R0y5dkvZ.js";import{a5 as o,em as t,ae as r,af as c,bH as _,bI as d,ak as s,bG as p}from"./index-CT4f4PW9.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,en as t,ae as r,af as c,bI as _,bJ as d,ak as s,bH as p}from"./index-BHez2RiI.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};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-D3_zl--p.css


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-D6BR3Hjv.css


+ 0 - 1
dist/assets/index-DKmzOQH8.js

@@ -1 +0,0 @@
-import{u as c,ad as l}from"./index-6ldn4hSR.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 w,bG as k}from"./index-CT4f4PW9.js";import"./shapes-GaKprgT0.js";const S=()=>{function a(o){const{api:e,playState:s}=o.data||{};e==="headerTogge"?window.parent.postMessage({api:"headerTogge",playState:s},"*"):e==="changeTogge"?window.parent.postMessage({api:"changeTogge"},"*"):["clickTempo","clickViewFigner"].includes(e)&&window.parent.postMessage({api:e},"*")}p(()=>{window.addEventListener("message",a)}),d(()=>{window.removeEventListener("message",a)})},_=g({__name:"mobileScreen",setup(a){S();const o=m(),e=t(!0),s=t(!1),i=c();return o.setScreenMode("mobileScreen"),i.initPPTData().then(()=>{e.value=!1}),(v,n)=>(r(),u("div",{class:"mobileScreen",onClick:n[0]||(n[0]=b=>s.value=!1)},[e.value?w("",!0):(r(),f(l,{key:0}))]))}}),x=k(_,[["__scopeId","data-v-90b2692a"]]);export{x as default};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-DjaP4Mno.js


+ 1 - 0
dist/assets/index-Do0egyfl.js

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

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-DocUFjyI.css


+ 1 - 0
dist/assets/index-ss5lT_qo.js

@@ -0,0 +1 @@
+import{_ as t}from"./404-R0y5dkvZ.js";import{E as c}from"./index-BodUf9WO.js";import{a5 as n,ae as i,af as r,ak as o,aq as _,am as d,P as l,aS as p,bI as m,bJ as f,bH as u}from"./index-BHez2RiI.js";const s=a=>(m("data-v-340bbdaa"),a=a(),f(),a),h={class:"login"},b={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",h,[o("div",b,[g,k,_(l(c),{class:"backBtn",type:"primary",plain:"",onClick:e},{default:d(()=>[p("关闭页面")]),_:1})])]))}}),C=u(v,[["__scopeId","data-v-340bbdaa"]]);export{C as default};

二進制
dist/assets/musicBg-Bp_Zsq0h.png


File diff suppressed because it is too large
+ 5 - 0
dist/assets/shapes-DQzdLktJ.js


File diff suppressed because it is too large
+ 0 - 5
dist/assets/shapes-GaKprgT0.js


+ 1 - 1
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-CT4f4PW9.js"></script>
+    <script type="module" crossorigin src="./assets/index-BHez2RiI.js"></script>
     <link rel="stylesheet" crossorigin href="./assets/index-C0x2lxv7.css">
   </head>
   <body>

+ 1 - 1
src/assets/styles/global.scss

@@ -149,7 +149,7 @@ textarea {
 }
 
 ::-webkit-scrollbar {
-  width: 5px;
+  width: 4px;
   height: 5px;
   background-color: transparent;
 }

+ 1 - 1
src/views/Editor/CanvasTool/index.vue

@@ -390,7 +390,7 @@
     </Modal>
     <Modal
       :contentStyle="{
-        width: '70%',
+        width: '72%',
         minWidth: '1200px',
         height: '86%',
         boxShadow: '0px 2px 10px 0px rgba(0,0,0,0.08)',

+ 1 - 1
src/views/Screen/BaseView.vue

@@ -246,7 +246,7 @@ const contextmenus = (): ContextmenuItem[] => {
     height: 66px;
     position: absolute;
     left: 0;
-    top: -66px;
+    bottom: 0;
   }
 
   .content {

+ 1 - 1
src/views/components/element/cloudCoachElement/cloudCoachList/cloudCoachList.vue

@@ -73,7 +73,7 @@
                 >
                   {{ item.instruments[0].name }}
                 </div>
-                <Popover v-model:value="item.isExpand" trigger="mouseenter" v-else :offset="-4" :key="item.id + '_'">
+                <Popover v-model:value="item.isExpand" trigger="mouseenter" :placement="'bottom-start'" v-else :offset="-4" :key="item.id + '_'">
                   <template #content>
                     <PopoverMenuItem
                       @click="

+ 1 - 1
src/views/components/element/enjoyElement/resourcesList/resourcesList.vue

@@ -60,7 +60,7 @@
                 >
                   {{ item.instruments[0].name }}
                 </div>
-                <Popover v-model:value="item.isExpand" trigger="mouseenter" v-else :offset="-4" :key="item.id + '_'">
+                <Popover v-model:value="item.isExpand" trigger="mouseenter" :placement="'bottom-start'" v-else :offset="-4" :key="item.id + '_'">
                   <template #content>
                     <PopoverMenuItem
                       @click="

+ 5 - 5
src/views/components/element/musicResourcesElement/musicResourcesList/components/instrumentList.vue

@@ -37,15 +37,15 @@ const emits = defineEmits<{
   .musicCon {
     width: calc(16.6666% - 40px);
     margin-left: 40px;
-    margin-bottom: 32px;
+    margin-top: 32px;
     display: flex;
     flex-direction: column;
     align-items: center;
     border-radius: 12px;
     cursor: pointer;
     position: relative;
-    &:nth-last-child(-n + 6) {
-      margin-bottom: 0;
+    &:nth-child(-n + 6) {
+      margin-top: 0;
     }
     &:hover {
       .avatar {
@@ -75,8 +75,8 @@ const emits = defineEmits<{
       border-radius: 12px;
     }
     .addBtn {
-      top: 6px;
-      right: 6px;
+      top: 8px;
+      right: 8px;
       position: absolute;
       font-weight: 600;
       font-size: 12px;

+ 4 - 4
src/views/components/element/musicResourcesElement/musicResourcesList/components/musicList.vue

@@ -37,7 +37,7 @@ const emits = defineEmits<{
   .musicCon {
     width: calc(33.3333% - 24px);
     margin-left: 24px;
-    margin-bottom: 24px;
+    margin-top: 24px;
     padding: 16px;
     display: flex;
     align-items: center;
@@ -50,8 +50,8 @@ const emits = defineEmits<{
       transform: scale(1.02);
       transition: all 0.2s ease;
     }
-    &:nth-last-child(-n + 3) {
-      margin-bottom: 0;
+    &:nth-child(-n + 3) {
+      margin-top: 0;
     }
     .highName {
       overflow: hidden;
@@ -78,7 +78,7 @@ const emits = defineEmits<{
       font-size: 13px;
       color: #ffffff;
       line-height: 19px;
-      padding: 4px 12px;
+      padding: 4px 14px;
       background: #198cfe;
       border-radius: 4px;
       &:hover {

+ 5 - 5
src/views/components/element/musicResourcesElement/musicResourcesList/components/musicianList.vue

@@ -37,15 +37,15 @@ const emits = defineEmits<{
   .musicCon {
     width: calc(16.6666% - 40px);
     margin-left: 40px;
-    margin-bottom: 32px;
+    margin-top: 32px;
     display: flex;
     flex-direction: column;
     align-items: center;
     border-radius: 12px;
     cursor: pointer;
     position: relative;
-    &:nth-last-child(-n + 6) {
-      margin-bottom: 0;
+    &:nth-child(-n + 6) {
+      margin-top: 0;
     }
     &:hover {
       .avatar {
@@ -75,8 +75,8 @@ const emits = defineEmits<{
       border-radius: 12px;
     }
     .addBtn {
-      top: 6px;
-      right: 6px;
+      top: 8px;
+      right: 8px;
       position: absolute;
       font-weight: 600;
       font-size: 12px;

+ 3 - 3
src/views/components/element/musicResourcesElement/musicResourcesList/musicResourcesList.vue

@@ -67,7 +67,7 @@
                 >
                   {{ item.name }}
                 </div>
-                <Popover v-model:value="item.isExpand" trigger="mouseenter" v-else :offset="-4" :key="item.id + '_'">
+                <Popover v-model:value="item.isExpand" trigger="mouseenter" :placement="'bottom-start'" v-else :offset="-4" :key="item.id + '_'">
                   <template #content>
                     <PopoverMenuItem
                       @click="
@@ -115,9 +115,9 @@
   </div>
   <Modal
     :contentStyle="{
-      width: '70%',
+      width: '86%',
       minWidth: '1200px',
-      height: '86%',
+      height: '90%',
       boxShadow: '0px 2px 10px 0px rgba(0,0,0,0.08)',
       borderRadius: '16px',
       border: '1px solid #DEDEDE',

+ 4 - 1
src/views/components/element/musicResourcesElement/musicTheoryList/courseCollapse.vue

@@ -61,6 +61,7 @@ function handleCollapseItem(item: Record<string, any>) {
 
 <style lang="scss" scoped>
 .courseCollapse {
+  --el-collapse-header-height: 50px !important;
   border: none;
   ::v-deep(.el-collapse-item) {
     padding: 0 8px;
@@ -142,7 +143,9 @@ function handleCollapseItem(item: Record<string, any>) {
         margin-top: 0;
       }
       &:hover {
-        opacity: 0.8;
+        .itemName {
+          color: #0482ff;
+        }
       }
       &.active {
         background: rgba(16, 31, 87, 0.06);

+ 2 - 3
src/views/components/element/musicResourcesElement/musicTheoryList/musicTheoryList.vue

@@ -110,15 +110,14 @@ function handleAdd() {
     height: calc(100% - 130px);
     background: #f5f6fa;
     display: flex;
-    padding: 24px 12px 0 12px;
+    padding: 24px 0 24px 30px;
     .leftCon {
       overflow-y: auto;
       width: 360px;
       height: 100%;
       flex-shrink: 0;
       background: #ffffff;
-      border-top-left-radius: 16px;
-      border-top-right-radius: 16px;
+      border-radius: 16px;
       padding: 12px;
     }
     .rightCon {

Some files were not shown because too many files changed in this diff