From d245de2a40567756a53ba095dff71fe15d1409ff Mon Sep 17 00:00:00 2001
From: pipipi-pikachu <pipipi_pikachu@163.com>
Date: Fri, 19 Aug 2022 20:03:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=AB=96=E5=90=91?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components.d.ts                           | 14 ++-
 src/hooks/useCreateElement.ts                 | 11 ++-
 src/hooks/useExport.ts                        |  1 +
 src/hooks/usePasteTextClipboardData.ts        |  2 +-
 src/plugins/component.ts                      |  2 +-
 src/plugins/icon.ts                           |  4 +
 src/types/edit.ts                             |  1 +
 src/types/slides.ts                           |  3 +
 .../Canvas/Operate/TextElementOperate.vue     |  5 +-
 .../Editor/Canvas/hooks/useCommonOperate.ts   |  7 ++
 .../Editor/Canvas/hooks/useDropImageOrText.ts |  2 +-
 .../hooks/useInsertFromCreateSelection.ts     |  6 +-
 src/views/Editor/CanvasTool/index.vue         | 85 +++++++++++++++++--
 .../Mobile/MobileEditor/SlideToolbar.vue      |  2 +-
 .../element/TextElement/BaseTextElement.vue   |  6 +-
 .../components/element/TextElement/index.vue  | 44 +++++++---
 16 files changed, 167 insertions(+), 28 deletions(-)

diff --git a/src/components.d.ts b/src/components.d.ts
index a7754f85..9696e83d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -1,11 +1,21 @@
 import { icons } from '@/plugins/icon'
 import { components } from '@/plugins/component'
 
+import FileInput from '@/components/FileInput.vue'
+import CheckboxButton from '@/components/CheckboxButton.vue'
+import CheckboxButtonGroup from '@/components/CheckboxButtonGroup.vue'
+import ColorPicker from '@/components/ColorPicker/index.vue'
+import FullscreenSpin from '@/components/FullscreenSpin.vue'
+
 type Icon = typeof icons
-type CustomComponent = typeof components
 
 declare module 'vue' {
-  export interface GlobalComponents extends Icon, CustomComponent {
+  export interface GlobalComponents extends Icon {
+    FileInput: typeof FileInput
+    CheckboxButton: typeof CheckboxButton
+    CheckboxButtonGroup: typeof CheckboxButtonGroup
+    ColorPicker: typeof ColorPicker
+    FullscreenSpin: typeof FullscreenSpin
 
     // antd 组件
     InputNumber: typeof import('ant-design-vue')['InputNumber']
diff --git a/src/hooks/useCreateElement.ts b/src/hooks/useCreateElement.ts
index d05a30c6..780f7e4f 100644
--- a/src/hooks/useCreateElement.ts
+++ b/src/hooks/useCreateElement.ts
@@ -172,8 +172,16 @@ export default () => {
    * @param position 位置大小信息
    * @param content 文本内容
    */
-  const createTextElement = (position: CommonElementPosition, content = '') => {
+  
+  interface CreateTextData {
+    content?: string
+    vertical?: boolean
+  }
+  const createTextElement = (position: CommonElementPosition, data?: CreateTextData) => {
     const { left, top, width, height } = position
+    const content = data?.content || ''
+    const vertical = data?.vertical || false
+
     const id = nanoid(10)
     createElement({
       type: 'text',
@@ -186,6 +194,7 @@ export default () => {
       rotate: 0,
       defaultFontName: theme.value.fontName,
       defaultColor: theme.value.fontColor,
+      vertical,
     }, () => {
       setTimeout(() => {
         const editorRef: HTMLElement | null = document.querySelector(`#editable-element-${id} .ProseMirror`)
diff --git a/src/hooks/useExport.ts b/src/hooks/useExport.ts
index 38f77c78..173d1bbe 100644
--- a/src/hooks/useExport.ts
+++ b/src/hooks/useExport.ts
@@ -442,6 +442,7 @@ export default () => {
           if (el.outline?.width) options.line = getOutlineOption(el.outline)
           if (el.opacity !== undefined) options.transparency = (1 - el.opacity) * 100
           if (el.paragraphSpace !== undefined) options.paraSpaceBefore = el.paragraphSpace * 0.75
+          if (el.vertical) options.vert = 'eaVert'
 
           pptxSlide.addText(textProps, options)
         }
diff --git a/src/hooks/usePasteTextClipboardData.ts b/src/hooks/usePasteTextClipboardData.ts
index ec37d3e7..3348384b 100644
--- a/src/hooks/usePasteTextClipboardData.ts
+++ b/src/hooks/usePasteTextClipboardData.ts
@@ -22,7 +22,7 @@ export default () => {
       top: 0,
       width: 600,
       height: 50,
-    }, text)
+    }, { content: text })
   }
 
   /**
diff --git a/src/plugins/component.ts b/src/plugins/component.ts
index ce0d9549..f9a47f1a 100644
--- a/src/plugins/component.ts
+++ b/src/plugins/component.ts
@@ -6,7 +6,7 @@ import CheckboxButtonGroup from '@/components/CheckboxButtonGroup.vue'
 import ColorPicker from '@/components/ColorPicker/index.vue'
 import FullscreenSpin from '@/components/FullscreenSpin.vue'
 
-export const components = {
+const components = {
   FileInput,
   CheckboxButton,
   CheckboxButtonGroup,
diff --git a/src/plugins/icon.ts b/src/plugins/icon.ts
index 7a38604d..45f9b8a4 100644
--- a/src/plugins/icon.ts
+++ b/src/plugins/icon.ts
@@ -107,6 +107,8 @@ import {
   Square,
   Round,
   Needle,
+  TextRotationNone,
+  TextRotationDown,
 } from '@icon-park/vue-next'
 
 export const icons = {
@@ -215,6 +217,8 @@ export const icons = {
   IconSquare: Square,
   IconRound: Round,
   IconNeedle: Needle,
+  IconTextRotationNone: TextRotationNone,
+  IconTextRotationDown: TextRotationDown,
 }
 
 export default {
diff --git a/src/types/edit.ts b/src/types/edit.ts
index 9c4b05ef..91202b6c 100644
--- a/src/types/edit.ts
+++ b/src/types/edit.ts
@@ -80,6 +80,7 @@ export interface CreateElementSelectionData {
 
 export interface CreatingTextElement {
   type: 'text'
+  vertical?: boolean
 }
 export interface CreatingShapeElement {
   type: 'shape'
diff --git a/src/types/slides.ts b/src/types/slides.ts
index 36dfe1d7..f3e3dcb8 100644
--- a/src/types/slides.ts
+++ b/src/types/slides.ts
@@ -139,6 +139,8 @@ interface PPTBaseElement {
  * textIndent?: 段落首行缩进
  * 
  * paragraphSpace?: 段间距，默认 5px
+ * 
+ * vertical?: 竖向文本
  */
 export interface PPTTextElement extends PPTBaseElement {
   type: 'text'
@@ -153,6 +155,7 @@ export interface PPTTextElement extends PPTBaseElement {
   shadow?: PPTElementShadow
   textIndent?: number
   paragraphSpace?: number
+  vertical?: boolean
 }
 
 
diff --git a/src/views/Editor/Canvas/Operate/TextElementOperate.vue b/src/views/Editor/Canvas/Operate/TextElementOperate.vue
index b11a51c0..38c169f8 100644
--- a/src/views/Editor/Canvas/Operate/TextElementOperate.vue
+++ b/src/views/Editor/Canvas/Operate/TextElementOperate.vue
@@ -10,7 +10,7 @@
     <template v-if="handlerVisible">
       <ResizeHandler
         class="operate-resize-handler" 
-        v-for="point in textElementResizeHandlers"
+        v-for="point in resizeHandlers"
         :key="point.direction"
         :type="point.direction"
         :rotate="elementInfo.rotate"
@@ -68,5 +68,6 @@ const { canvasScale } = storeToRefs(useMainStore())
 const scaleWidth = computed(() => props.elementInfo.width * canvasScale.value)
 const scaleHeight = computed(() => props.elementInfo.height * canvasScale.value)
 
-const { textElementResizeHandlers, borderLines } = useCommonOperate(scaleWidth, scaleHeight)
+const { textElementResizeHandlers, verticalTextElementResizeHandlers, borderLines } = useCommonOperate(scaleWidth, scaleHeight)
+const resizeHandlers = computed(() => props.elementInfo.vertical ? verticalTextElementResizeHandlers.value : textElementResizeHandlers.value)
 </script>
\ No newline at end of file
diff --git a/src/views/Editor/Canvas/hooks/useCommonOperate.ts b/src/views/Editor/Canvas/hooks/useCommonOperate.ts
index a89acbe2..cfca968f 100644
--- a/src/views/Editor/Canvas/hooks/useCommonOperate.ts
+++ b/src/views/Editor/Canvas/hooks/useCommonOperate.ts
@@ -23,6 +23,12 @@ export default (width: Ref<number>, height: Ref<number>) => {
       { direction: OperateResizeHandlers.RIGHT, style: {left: width.value + 'px', top: height.value / 2 + 'px'} },
     ]
   })
+  const verticalTextElementResizeHandlers = computed(() => {
+    return [
+      { direction: OperateResizeHandlers.TOP, style: {left: width.value / 2 + 'px'} },
+      { direction: OperateResizeHandlers.BOTTOM, style: {left: width.value / 2 + 'px', top: height.value + 'px'} },
+    ]
+  })
 
   // 元素选中边框线
   const borderLines = computed(() => {
@@ -37,6 +43,7 @@ export default (width: Ref<number>, height: Ref<number>) => {
   return {
     resizeHandlers,
     textElementResizeHandlers,
+    verticalTextElementResizeHandlers,
     borderLines,
   }
 }
\ No newline at end of file
diff --git a/src/views/Editor/Canvas/hooks/useDropImageOrText.ts b/src/views/Editor/Canvas/hooks/useDropImageOrText.ts
index 0e93bd5f..64502c05 100644
--- a/src/views/Editor/Canvas/hooks/useDropImageOrText.ts
+++ b/src/views/Editor/Canvas/hooks/useDropImageOrText.ts
@@ -31,7 +31,7 @@ export default (elementRef: Ref<HTMLElement | undefined>) => {
           top: 0,
           width: 600,
           height: 50,
-        }, string)
+        }, { content: string })
       })
     }
   }
diff --git a/src/views/Editor/Canvas/hooks/useInsertFromCreateSelection.ts b/src/views/Editor/Canvas/hooks/useInsertFromCreateSelection.ts
index 85ca30e6..b3b24a92 100644
--- a/src/views/Editor/Canvas/hooks/useInsertFromCreateSelection.ts
+++ b/src/views/Editor/Canvas/hooks/useInsertFromCreateSelection.ts
@@ -75,15 +75,15 @@ export default (viewportRef: Ref<HTMLElement | undefined>) => {
     const type = creatingElement.value.type
     if (type === 'text') {
       const position = formatCreateSelection(selectionData)
-      position && createTextElement(position)
+      position && createTextElement(position, { vertical: creatingElement.value.vertical })
     }
     else if (type === 'shape') {
       const position = formatCreateSelection(selectionData)
-      position && createShapeElement(position, (creatingElement.value as CreatingShapeElement).data)
+      position && createShapeElement(position, creatingElement.value.data)
     }
     else if (type === 'line') {
       const position = formatCreateSelectionForLine(selectionData)
-      position && createLineElement(position, (creatingElement.value as CreatingLineElement).data)
+      position && createLineElement(position, creatingElement.value.data)
     }
     mainStore.setCreatingElement(null)
   }
diff --git a/src/views/Editor/CanvasTool/index.vue b/src/views/Editor/CanvasTool/index.vue
index 7bf0d852..97d140ad 100644
--- a/src/views/Editor/CanvasTool/index.vue
+++ b/src/views/Editor/CanvasTool/index.vue
@@ -11,7 +11,17 @@
 
     <div class="add-element-handler">
       <Tooltip :mouseLeaveDelay="0" :mouseEnterDelay="0.5" title="插入文字">
-        <IconFontSize class="handler-item" :class="{ 'active': creatingElement?.type === 'text' }" @click="drawText()" />
+        <div class="handler-item group-btn">
+          <IconFontSize class="icon" :class="{ 'active': creatingElement?.type === 'text' }" @click="drawText()" />
+          
+          <Popover trigger="click" v-model:visible="textTypeSelectVisible">
+            <template #content>
+              <div class="text-type-item" @click="() => { drawText(); textTypeSelectVisible = false }"><IconTextRotationNone /> 横向文本框</div>
+              <div class="text-type-item" @click="() => { drawText(true); textTypeSelectVisible = false }"><IconTextRotationDown /> 竖向文本框</div>
+            </template>
+            <IconDown class="arrow" />
+          </Popover>
+        </div>
       </Tooltip>
       <FileInput @change="files => insertImageElement(files)">
         <Tooltip :mouseLeaveDelay="0" :mouseEnterDelay="0.5" title="插入图片">
@@ -166,11 +176,13 @@ const chartPoolVisible = ref(false)
 const tableGeneratorVisible = ref(false)
 const mediaInputVisible = ref(false)
 const latexEditorVisible = ref(false)
+const textTypeSelectVisible = ref(false)
 
 // 绘制文字范围
-const drawText = () => {
+const drawText = (vertical = false) => {
   mainStore.setCreatingElement({
     type: 'text',
+    vertical,
   })
 }
 
@@ -214,18 +226,69 @@ const drawLine = (line: LinePoolItem) => {
   left: 50%;
   transform: translate(-50%, -50%);
   display: flex;
+
+  .handler-item {
+    width: 32px;
+    height: 24px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin: 0 2px;
+    border-radius: $borderRadius;
+
+    &:not(.group-btn):hover {
+      background-color: #f1f1f1;
+    }
+
+    &.active {
+      color: $themeColor;
+    }
+
+    &.group-btn {
+      width: auto;
+      margin-right: 4px;
+
+      &:hover {
+        background-color: #f3f3f3;
+      }
+
+      .icon, .arrow {
+        height: 100%;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+
+      .icon {
+        width: 26px;
+        padding: 0 2px;
+
+        &:hover {
+          background-color: #e9e9e9;
+        }
+        &.active {
+          color: $themeColor;
+        }
+      }
+      .arrow {
+        font-size: 12px;
+
+        &:hover {
+          background-color: #e9e9e9;
+        }
+      }
+    }
+  }
 }
 .handler-item {
   margin: 0 10px;
   font-size: 14px;
+  overflow: hidden;
   cursor: pointer;
 
   &.disable {
     opacity: .5;
   }
-  &.active {
-    color: $themeColor;
-  }
 }
 .right-handler {
   display: flex;
@@ -250,4 +313,16 @@ const drawLine = (line: LinePoolItem) => {
     color: $themeColor;
   }
 }
+.text-type-item {
+  padding: 5px 10px;
+  cursor: pointer;
+
+  &:hover {
+    background-color: #f1f1f1;
+  }
+
+  & + .text-type-item {
+    margin-top: 3px;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/Mobile/MobileEditor/SlideToolbar.vue b/src/views/Mobile/MobileEditor/SlideToolbar.vue
index 378af6ca..f1255abe 100644
--- a/src/views/Mobile/MobileEditor/SlideToolbar.vue
+++ b/src/views/Mobile/MobileEditor/SlideToolbar.vue
@@ -56,7 +56,7 @@ const insertTextElement = () => {
     top: (VIEWPORT_SIZE * viewportRatio.value - height) / 2,
     width,
     height,
-  }, '<p>新添加文本</p>')
+  }, { content: '<p>新添加文本</p>' })
 }
 
 const insertImageElement = (files: FileList) => {
diff --git a/src/views/components/element/TextElement/BaseTextElement.vue b/src/views/components/element/TextElement/BaseTextElement.vue
index ea1553a8..f9efdebb 100644
--- a/src/views/components/element/TextElement/BaseTextElement.vue
+++ b/src/views/components/element/TextElement/BaseTextElement.vue
@@ -4,7 +4,8 @@
     :style="{
       top: elementInfo.top + 'px',
       left: elementInfo.left + 'px',
-      width: elementInfo.width + 'px',
+      width: elementInfo.vertical ? 'auto' : elementInfo.width + 'px',
+      height: elementInfo.vertical ? elementInfo.height + 'px' : 'auto',
     }"
   >
     <div
@@ -14,6 +15,8 @@
       <div 
         class="element-content"
         :style="{
+          width: elementInfo.vertical ? 'auto' : elementInfo.width + 'px',
+          height: elementInfo.vertical ? elementInfo.height + 'px' : 'auto',
           backgroundColor: elementInfo.fill,
           opacity: elementInfo.opacity,
           textShadow: shadowStyle,
@@ -21,6 +24,7 @@
           letterSpacing: (elementInfo.wordSpace || 0) + 'px',
           color: elementInfo.defaultColor,
           fontFamily: elementInfo.defaultFontName,
+          writingMode: elementInfo.vertical ? 'vertical-rl' : 'horizontal-tb',
         }"
       >
         <ElementOutline
diff --git a/src/views/components/element/TextElement/index.vue b/src/views/components/element/TextElement/index.vue
index a5946b74..f620c340 100644
--- a/src/views/components/element/TextElement/index.vue
+++ b/src/views/components/element/TextElement/index.vue
@@ -1,12 +1,12 @@
 <template>
   <div 
     class="editable-element-text" 
-    ref="elementRef"
     :class="{ 'lock': elementInfo.lock }"
     :style="{
       top: elementInfo.top + 'px',
       left: elementInfo.left + 'px',
-      width: elementInfo.width + 'px',
+      width: elementInfo.vertical ? 'auto' : elementInfo.width + 'px',
+      height: elementInfo.vertical ? elementInfo.height + 'px' : 'auto',
     }"
   >
     <div
@@ -15,7 +15,10 @@
     >
       <div 
         class="element-content"
+        ref="elementRef"
         :style="{
+          width: elementInfo.vertical ? 'auto' : elementInfo.width + 'px',
+          height: elementInfo.vertical ? elementInfo.height + 'px' : 'auto',
           backgroundColor: elementInfo.fill,
           opacity: elementInfo.opacity,
           textShadow: shadowStyle,
@@ -23,6 +26,7 @@
           letterSpacing: (elementInfo.wordSpace || 0) + 'px',
           color: elementInfo.defaultColor,
           fontFamily: elementInfo.defaultFontName,
+          writingMode: elementInfo.vertical ? 'vertical-rl' : 'horizontal-tb',
         }"
         v-contextmenu="contextmenus"
         @mousedown="$event => handleSelectElement($event)"
@@ -104,16 +108,26 @@ const handleSelectElement = (e: MouseEvent | TouchEvent, canMove = true) => {
 // 监听文本元素的尺寸变化，当高度变化时，更新高度到vuex
 // 如果高度变化时正处在缩放操作中，则等待缩放操作结束后再更新
 const realHeightCache = ref(-1)
+const realWidthCache = ref(-1)
 
 watch(isScaling, () => {
   if (handleElementId.value !== props.elementInfo.id) return
 
-  if (!isScaling.value && realHeightCache.value !== -1) {
-    slidesStore.updateElement({
-      id: props.elementInfo.id,
-      props: { height: realHeightCache.value },
-    })
-    realHeightCache.value = -1
+  if (!isScaling.value) {
+    if (!props.elementInfo.vertical && realHeightCache.value !== -1) {
+      slidesStore.updateElement({
+        id: props.elementInfo.id,
+        props: { height: realHeightCache.value },
+      })
+      realHeightCache.value = -1
+    }
+    if (props.elementInfo.vertical && realWidthCache.value !== -1) {
+      slidesStore.updateElement({
+        id: props.elementInfo.id,
+        props: { width: realWidthCache.value },
+      })
+      realWidthCache.value = -1
+    }
   }
 })
 
@@ -121,9 +135,10 @@ const updateTextElementHeight = (entries: ResizeObserverEntry[]) => {
   const contentRect = entries[0].contentRect
   if (!elementRef.value) return
 
-  const realHeight = contentRect.height
+  const realHeight = contentRect.height + 20
+  const realWidth = contentRect.width + 20
 
-  if (props.elementInfo.height !== realHeight) {
+  if (!props.elementInfo.vertical && props.elementInfo.height !== realHeight) {
     if (!isScaling.value) {
       slidesStore.updateElement({
         id: props.elementInfo.id,
@@ -132,6 +147,15 @@ const updateTextElementHeight = (entries: ResizeObserverEntry[]) => {
     }
     else realHeightCache.value = realHeight
   }
+  if (props.elementInfo.vertical && props.elementInfo.width !== realWidth) {
+    if (!isScaling.value) {
+      slidesStore.updateElement({
+        id: props.elementInfo.id,
+        props: { width: realWidth },
+      })
+    }
+    else realWidthCache.value = realWidth
+  }
 }
 const resizeObserver = new ResizeObserver(updateTextElementHeight)