Merge branch 'hqyDev' of http://git.dayaedu.com/huangqiyong/pptList into test-online

src/assets/styles/global.scss

@@ -24,6 +24,22 @@ time, mark, audio, video {
   box-sizing: border-box;
 }
 
+* {
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+img {
+  user-select: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  -webkit-touch-callout: none;
+  -webkit-user-drag: none;
+  -moz-user-drag: none;
+  -ms-user-drag: none;
+  user-drag: none;
+}
+
 article,
 aside,
 details,

src/views/Editor/Toolbar/ElementPositionPanel.vue

@@ -2,55 +2,43 @@
   <div class="element-positopn-panel">
     <div class="title">层级：</div>
     <ButtonGroup class="row">
-      <Button style="flex: 1;" @click="orderElement(handleElement!, ElementOrderCommands.TOP)"><IconSendToBack class="btn-icon" /> 置顶</Button>
-      <Button style="flex: 1;" @click="orderElement(handleElement!, ElementOrderCommands.BOTTOM)"><IconBringToFrontOne class="btn-icon" /> 置底</Button>
+      <Button style="flex: 1" @click="orderElement(handleElement!, ElementOrderCommands.TOP)"><IconSendToBack class="btn-icon" /> 置顶</Button>
+      <Button style="flex: 1" @click="orderElement(handleElement!, ElementOrderCommands.BOTTOM)"
+        ><IconBringToFrontOne class="btn-icon" /> 置底</Button
+      >
     </ButtonGroup>
     <ButtonGroup class="row">
-      <Button style="flex: 1;" @click="orderElement(handleElement!, ElementOrderCommands.UP)"><IconBringToFront class="btn-icon" /> 上移</Button>
-      <Button style="flex: 1;" @click="orderElement(handleElement!, ElementOrderCommands.DOWN)"><IconSentToBack class="btn-icon" /> 下移</Button>
+      <Button style="flex: 1" @click="orderElement(handleElement!, ElementOrderCommands.UP)"><IconBringToFront class="btn-icon" /> 上移</Button>
+      <Button style="flex: 1" @click="orderElement(handleElement!, ElementOrderCommands.DOWN)"><IconSentToBack class="btn-icon" /> 下移</Button>
     </ButtonGroup>
 
     <Divider />
 
     <div class="title">对齐：</div>
     <ButtonGroup class="row">
-      <Button style="flex: 1;" v-tooltip="'左对齐'" @click="alignElementToCanvas(ElementAlignCommands.LEFT)"><IconAlignLeft /></Button>
-      <Button style="flex: 1;" v-tooltip="'水平居中'" @click="alignElementToCanvas(ElementAlignCommands.HORIZONTAL)"><IconAlignVertically /></Button>
-      <Button style="flex: 1;" v-tooltip="'右对齐'" @click="alignElementToCanvas(ElementAlignCommands.RIGHT)"><IconAlignRight /></Button>
+      <Button style="flex: 1" v-tooltip="'左对齐'" @click="alignElementToCanvas(ElementAlignCommands.LEFT)"><IconAlignLeft /></Button>
+      <Button style="flex: 1" v-tooltip="'水平居中'" @click="alignElementToCanvas(ElementAlignCommands.HORIZONTAL)"><IconAlignVertically /></Button>
+      <Button style="flex: 1" v-tooltip="'右对齐'" @click="alignElementToCanvas(ElementAlignCommands.RIGHT)"><IconAlignRight /></Button>
     </ButtonGroup>
     <ButtonGroup class="row">
-      <Button style="flex: 1;" v-tooltip="'上对齐'" @click="alignElementToCanvas(ElementAlignCommands.TOP)"><IconAlignTop /></Button>
-      <Button style="flex: 1;" v-tooltip="'垂直居中'" @click="alignElementToCanvas(ElementAlignCommands.VERTICAL)"><IconAlignHorizontally /></Button>
-      <Button style="flex: 1;" v-tooltip="'下对齐'" @click="alignElementToCanvas(ElementAlignCommands.BOTTOM)"><IconAlignBottom /></Button>
+      <Button style="flex: 1" v-tooltip="'上对齐'" @click="alignElementToCanvas(ElementAlignCommands.TOP)"><IconAlignTop /></Button>
+      <Button style="flex: 1" v-tooltip="'垂直居中'" @click="alignElementToCanvas(ElementAlignCommands.VERTICAL)"><IconAlignHorizontally /></Button>
+      <Button style="flex: 1" v-tooltip="'下对齐'" @click="alignElementToCanvas(ElementAlignCommands.BOTTOM)"><IconAlignBottom /></Button>
     </ButtonGroup>
 
     <Divider />
 
     <div class="row">
-      <NumberInput
-        :step="5"
-        :value="left"
-        @update:value="value => updateLeft(value)"
-        style="width: 45%;"
-      >
-        <template #prefix>
-          水平：
-        </template>
+      <NumberInput :step="5" :value="left" @update:value="value => updateLeft(value)" style="width: 45%">
+        <template #prefix> 水平： </template>
       </NumberInput>
-      <div style="width: 10%;"></div>
-      <NumberInput
-        :step="5"
-        :value="top"
-        @update:value="value => updateTop(value)"
-        style="width: 45%;"
-      >
-        <template #prefix>
-          垂直：
-        </template>
+      <div style="width: 10%"></div>
+      <NumberInput :step="5" :value="top" @update:value="value => updateTop(value)" style="width: 45%">
+        <template #prefix> 垂直： </template>
       </NumberInput>
     </div>
 
-    <template v-if="handleElement!.type !== 'line'">
+    <template v-if="handleElement!.type !== 'line' && !(handleElement!.type === 'elf' && handleElement!.subtype === 'elf-enjoy')">
       <div class="row">
         <NumberInput
           :min="minSize"
@@ -59,17 +47,15 @@
           :disabled="isVerticalText"
           :value="width"
           @update:value="value => updateWidth(value)"
-          style="width: 45%;"
+          style="width: 45%"
         >
-          <template #prefix>
-            宽度：
-          </template>
+          <template #prefix> 宽度： </template>
         </NumberInput>
         <template v-if="['image', 'shape'].includes(handleElement!.type) || ['elf-audio'].includes(handleElement!.subtype)">
-          <IconLock style="width: 10%;" class="icon-btn active" v-tooltip="'解除宽高比锁定'" @click="updateFixedRatio(false)" v-if="fixedRatio" />
-          <IconUnlock style="width: 10%;" class="icon-btn" v-tooltip="'宽高比锁定'" @click="updateFixedRatio(true)" v-else />
+          <IconLock style="width: 10%" class="icon-btn active" v-tooltip="'解除宽高比锁定'" @click="updateFixedRatio(false)" v-if="fixedRatio" />
+          <IconUnlock style="width: 10%" class="icon-btn" v-tooltip="'宽高比锁定'" @click="updateFixedRatio(true)" v-else />
         </template>
-        <div style="width: 10%;" v-else></div>
+        <div style="width: 10%" v-else></div>
         <NumberInput
           :min="minSize"
           :max="800"
@@ -77,11 +63,9 @@
           :disabled="isHorizontalText || handleElement!.type === 'table'"
           :value="height"
           @update:value="value => updateHeight(value)"
-          style="width: 45%;"
+          style="width: 45%"
         >
-          <template #prefix>
-            高度：
-          </template>
+          <template #prefix> 高度： </template>
         </NumberInput>
       </div>
     </template>
@@ -90,42 +74,33 @@
       <Divider />
 
       <div class="row">
-        <NumberInput
-          :min="-180"
-          :max="180"
-          :step="5"
-          :value="rotate"
-          @update:value="value => updateRotate(value)"
-          style="width: 45%;"
-        >
-          <template #prefix>
-            旋转：
-          </template>
+        <NumberInput :min="-180" :max="180" :step="5" :value="rotate" @update:value="value => updateRotate(value)" style="width: 45%">
+          <template #prefix> 旋转： </template>
         </NumberInput>
-        <div style="width: 7%;"></div>
-        <div class="text-btn" @click="updateRotate45('-')" style="width: 24%;"><IconRotate /> -45°</div>
-        <div class="text-btn" @click="updateRotate45('+')"  style="width: 24%;"><IconRotate :style="{ transform: 'rotateY(180deg)' }" /> +45°</div>
+        <div style="width: 7%"></div>
+        <div class="text-btn" @click="updateRotate45('-')" style="width: 24%"><IconRotate /> -45°</div>
+        <div class="text-btn" @click="updateRotate45('+')" style="width: 24%"><IconRotate :style="{ transform: 'rotateY(180deg)' }" /> +45°</div>
       </div>
     </template>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { computed, ref, watch } from 'vue'
-import { round } from 'lodash'
-import { storeToRefs } from 'pinia'
-import { useMainStore, useSlidesStore } from '@/store'
-import type { PPTElement } from '@/types/slides'
-import { ElementAlignCommands, ElementOrderCommands } from '@/types/edit'
-import { MIN_SIZE } from '@/configs/element'
-import { SHAPE_PATH_FORMULAS } from '@/configs/shapes'
-import useOrderElement from '@/hooks/useOrderElement'
-import useAlignElementToCanvas from '@/hooks/useAlignElementToCanvas'
-import useHistorySnapshot from '@/hooks/useHistorySnapshot'
-import Divider from '@/components/Divider.vue'
-import Button from '@/components/Button.vue'
-import ButtonGroup from '@/components/ButtonGroup.vue'
-import NumberInput from '@/components/NumberInput.vue'
+import { computed, ref, watch } from "vue"
+import { round } from "lodash"
+import { storeToRefs } from "pinia"
+import { useMainStore, useSlidesStore } from "@/store"
+import type { PPTElement } from "@/types/slides"
+import { ElementAlignCommands, ElementOrderCommands } from "@/types/edit"
+import { MIN_SIZE } from "@/configs/element"
+import { SHAPE_PATH_FORMULAS } from "@/configs/shapes"
+import useOrderElement from "@/hooks/useOrderElement"
+import useAlignElementToCanvas from "@/hooks/useAlignElementToCanvas"
+import useHistorySnapshot from "@/hooks/useHistorySnapshot"
+import Divider from "@/components/Divider.vue"
+import Button from "@/components/Button.vue"
+import ButtonGroup from "@/components/ButtonGroup.vue"
+import NumberInput from "@/components/NumberInput.vue"
 
 const slidesStore = useSlidesStore()
 const { handleElement, handleElementId } = storeToRefs(useMainStore())
@@ -143,26 +118,30 @@ const minSize = computed(() => {
 })
 
 const isHorizontalText = computed(() => {
-  return handleElement.value?.type === 'text' && !handleElement.value.vertical
+  return handleElement.value?.type === "text" && !handleElement.value.vertical
 })
 const isVerticalText = computed(() => {
-  return handleElement.value?.type === 'text' && handleElement.value.vertical
+  return handleElement.value?.type === "text" && handleElement.value.vertical
 })
 
-watch(handleElement, () => {
-  if (!handleElement.value) return
+watch(
+  handleElement,
+  () => {
+    if (!handleElement.value) return
 
-  left.value = round(handleElement.value.left, 1)
-  top.value = round(handleElement.value.top, 1)
+    left.value = round(handleElement.value.left, 1)
+    top.value = round(handleElement.value.top, 1)
 
-  fixedRatio.value = 'fixedRatio' in handleElement.value && !!handleElement.value.fixedRatio
+    fixedRatio.value = "fixedRatio" in handleElement.value && !!handleElement.value.fixedRatio
 
-  if (handleElement.value.type !== 'line') {
-    width.value = round(handleElement.value.width, 1)
-    height.value = round(handleElement.value.height, 1)
-    rotate.value = 'rotate' in handleElement.value && handleElement.value.rotate !== undefined ? round(handleElement.value.rotate, 1) : 0
-  }
-}, { deep: true, immediate: true })
+    if (handleElement.value.type !== "line") {
+      width.value = round(handleElement.value.width, 1)
+      height.value = round(handleElement.value.height, 1)
+      rotate.value = "rotate" in handleElement.value && handleElement.value.rotate !== undefined ? round(handleElement.value.rotate, 1) : 0
+    }
+  },
+  { deep: true, immediate: true }
+)
 
 const { orderElement } = useOrderElement()
 const { alignElementToCanvas } = useAlignElementToCanvas()
@@ -184,16 +163,16 @@ const updateTop = (value: number) => {
 // 设置元素宽度、高度、旋转角度
 // 对形状设置宽高时，需要检查是否需要更新形状路径
 const updateShapePathData = (width: number, height: number) => {
-  if (handleElement.value && handleElement.value.type === 'shape' && 'pathFormula' in handleElement.value && handleElement.value.pathFormula) {
+  if (handleElement.value && handleElement.value.type === "shape" && "pathFormula" in handleElement.value && handleElement.value.pathFormula) {
     const pathFormula = SHAPE_PATH_FORMULAS[handleElement.value.pathFormula]
 
-    let path = ''
-    if ('editable' in pathFormula && pathFormula.editable) path = pathFormula.formula(width, height, handleElement.value.keypoints!)
+    let path = ""
+    if ("editable" in pathFormula && pathFormula.editable) path = pathFormula.formula(width, height, handleElement.value.keypoints!)
     else path = pathFormula.formula(width, height)
 
     return {
       viewBox: [width, height],
-      path,
+      path
     }
   }
   return null
@@ -201,13 +180,13 @@ const updateShapePathData = (width: number, height: number) => {
 
 const updateWidth = (value: number) => {
   if (!handleElement.value) return
-  if (handleElement.value.type === 'line' || isVerticalText.value) return
+  if (handleElement.value.type === "line" || isVerticalText.value) return
 
   let h = height.value
 
   if (fixedRatio.value) {
     const ratio = width.value / height.value
-    h = (value / ratio) < minSize.value ? minSize.value : (value / ratio)
+    h = value / ratio < minSize.value ? minSize.value : value / ratio
   }
   let props: Partial<PPTElement> = { width: value, height: h }
 
@@ -216,7 +195,7 @@ const updateWidth = (value: number) => {
     props = {
       width: value,
       height: h,
-      ...shapePathData,
+      ...shapePathData
     }
   }
 
@@ -226,13 +205,13 @@ const updateWidth = (value: number) => {
 
 const updateHeight = (value: number) => {
   if (!handleElement.value) return
-  if (handleElement.value.type === 'line' || handleElement.value.type === 'table' || isHorizontalText.value) return
+  if (handleElement.value.type === "line" || handleElement.value.type === "table" || isHorizontalText.value) return
 
   let w = width.value
 
   if (fixedRatio.value) {
     const ratio = width.value / height.value
-    w = (value * ratio) < minSize.value ? minSize.value : (value * ratio)
+    w = value * ratio < minSize.value ? minSize.value : value * ratio
   }
   let props: Partial<PPTElement> = { width: w, height: value }
 
@@ -241,7 +220,7 @@ const updateHeight = (value: number) => {
     props = {
       width: w,
       height: value,
-      ...shapePathData,
+      ...shapePathData
     }
   }
 
@@ -263,10 +242,10 @@ const updateFixedRatio = (value: boolean) => {
 }
 
 // 将元素旋转45度（顺时针或逆时针）
-const updateRotate45 = (command: '+' | '-') => {
+const updateRotate45 = (command: "+" | "-") => {
   let _rotate = Math.floor(rotate.value / 45) * 45
-  if (command === '+') _rotate = _rotate + 45
-  else if (command === '-') _rotate = _rotate - 45
+  if (command === "+") _rotate = _rotate + 45
+  else if (command === "-") _rotate = _rotate - 45
 
   if (_rotate < -180) _rotate = -180
   if (_rotate > 180) _rotate = 180

src/views/components/element/AudioElement/AudioPlayer.vue

@@ -89,12 +89,10 @@ const props = withDefaults(
 watch(
   () => props.needWaitAnimation,
   () => {
-    if (props.autoplay) {
-      if (!props.needWaitAnimation) {
-        play()
-      } else {
-        pause()
-      }
+    if (props.autoplay && !props.needWaitAnimation) {
+      play()
+    } else if (props.needWaitAnimation) {
+      pause()
     }
   }
 )

src/views/components/element/VideoElement/VideoPlayer/index.vue

@@ -145,12 +145,10 @@ const props = withDefaults(
 watch(
   () => props.needWaitAnimation,
   () => {
-    if (props.autoplay) {
-      if (!props.needWaitAnimation) {
-        play()
-      } else {
-        pause()
-      }
+    if (props.autoplay && !props.needWaitAnimation) {
+      play()
+    } else if (props.needWaitAnimation) {
+      pause()
     }
   }
 )

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

@@ -10,7 +10,7 @@
   >
     <div class="rotate-wrapper" :style="{ transform: `rotate(${elementInfo.rotate}deg)` }">
       <div class="element-content">
-        <enjoyPlayer v-if="inCurrentSlide" :elementInfo="elementInfo" :scale="scale" :isScreening="true" />
+        <enjoyPlayer v-if="inCurrentSlide" :elementInfo="elementInfo" :scale="scale" :isScreening="true" :needWaitAnimation="needWaitAnimation" />
       </div>
     </div>
   </div>
@@ -26,6 +26,7 @@ import { injectKeySlideScale, injectKeySlideId } from "@/types/injectKey"
 
 defineProps<{
   elementInfo: PPTEnjoyElement
+  needWaitAnimation: boolean
 }>()
 
 const { currentSlide } = storeToRefs(useSlidesStore())

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

@@ -73,7 +73,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref, onUnmounted } from "vue"
+import { computed, ref, onUnmounted, watch } from "vue"
 import message from "@/utils/message"
 import type { PPTEnjoyElement } from "@/types/slides"
 import { useSlidesStore, useMainStore } from "@/store"
@@ -85,6 +85,7 @@ const props = withDefaults(
   defineProps<{
     scale?: number
     elementInfo: PPTEnjoyElement
+    needWaitAnimation?: boolean
     isScreening?: boolean
     isBase?: boolean
   }>(),
@@ -95,6 +96,15 @@ const props = withDefaults(
   }
 )
 
+watch(
+  () => props.needWaitAnimation,
+  () => {
+    if (props.needWaitAnimation) {
+      pause()
+    }
+  }
+)
+
 function handleListOutside() {
   if (!props.isBase && isShowEnjoyPlayerList.value) {
     hanleEnjoyList()
@@ -340,7 +350,7 @@ const handleMousedownPlayBar = () => {
   .playerCon {
     background: linear-gradient(180deg, #ffffff 0%, #dfdfdf 100%);
     box-shadow:
-      0px 4px 22px 0px rgba(0, 0, 0, 0.08),
+      0px 4px 22px 0px rgba(0, 0, 0, 0.12),
       inset 0px -8px 8px 0px rgba(0, 0, 0, 0.08);
     border-radius: 157px;
     padding: 14px 24px 14px 20px;