feat: convert wText component to compositionAPI

src/components/modules/widgets/wGroup/wGroup.vue

@@ -26,7 +26,7 @@
 // 组合组件
 const NAME = 'w-group'
 import { nextTick, onBeforeUnmount, onMounted, onUpdated, ref } from 'vue'
-import { mapGetters, mapActions, useStore } from 'vuex'
+import { useStore } from 'vuex'
 import { setTransformAttribute } from '@/common/methods/handleTransform'
 import { useSetupMapGetters } from '@/common/hooks/mapGetters';
 
@@ -55,26 +55,26 @@ const widget = ref<HTMLElement | null>(null)
 const ratio = ref(0)
 const temp = ref<Record<string, any>>({})
 const compWidgetsRecord = ref<Record<string, any>>({})
-const setting = {
+// const setting = {
-  name: '组合',
+//   name: '组合',
-  type: NAME,
+//   type: NAME,
-  uuid: -1,
+//   uuid: -1,
-  width: 0,
+//   width: 0,
-  height: 0,
+//   height: 0,
-  left: 0,
+//   left: 0,
-  top: 0,
+//   top: 0,
-  transform: '',
+//   transform: '',
-  opacity: 1,
+//   opacity: 1,
-  parent: '-1',
+//   parent: '-1',
-  isContainer: true,
+//   isContainer: true,
-  record: {
+//   record: {
-    width: 0,
+//     width: 0,
-    height: 0,
+//     height: 0,
-    minWidth: 0,
+//     minWidth: 0,
-    minHeight: 0,
+//     minHeight: 0,
-    dir: 'none',
+//     dir: 'none',
-  },
+//   },
-}
+// }
 
 const timer = ref<number | null>(null)
 const { dActiveElement, dWidgets } = useSetupMapGetters(['dActiveElement', 'dWidgets'])
@@ -235,9 +235,9 @@ function keySetValue(uuid: string, key: keyof TParamsData, value: number) {
   }, 10)
 }
 
-defineExpose({
+// defineExpose({
-  setting
+//   setting
-})
+// })
 
 </script>
 

src/components/modules/widgets/wText/wText.vue

@@ -1,9 +1,9 @@
 <template>
   <div
-    :id="params.uuid"
+    :id="`${params.uuid}`"
     ref="widget"
-    v-loading="loading"
+    v-loading="state.loading"
-    :class="['w-text', { editing: editable, 'layer-lock': params.lock }, params.uuid]"
+    :class="['w-text', { editing: state.editable, 'layer-lock': params.lock }, params.uuid]"
     :style="{
       position: 'absolute',
       left: params.left - parent.left + 'px',
@@ -27,17 +27,17 @@
     }"
     @dblclick="(e) => dblclickText(e)"
   >
-    <template v-if="params.textEffects && !editable">
+    <template v-if="params.textEffects && !state.editable">
       <div
         v-for="(ef, efi) in params.textEffects"
         :key="efi + 'effect'"
         :style="{
           fontFamily: `'${params.fontClass.value}'`,
           color: ef.filling && ef.filling.enable && ef.filling.type === 0 ? ef.filling.color : 'transparent',
-          webkitTextStroke: ef.stroke && ef.stroke.enable ? `${ef.stroke.width}px ${ef.stroke.color}` : undefined,
+          WebkitTextStroke: ef.stroke && ef.stroke.enable ? `${ef.stroke.width}px ${ef.stroke.color}` : undefined,
           textShadow: ef.shadow && ef.shadow.enable ? `${ef.shadow.offsetX}px ${ef.shadow.offsetY}px ${ef.shadow.blur}px ${ef.shadow.color}` : undefined,
           backgroundImage: ef.filling && ef.filling.enable ? (ef.filling.type === 0 ? undefined : getGradientOrImg(ef)) : undefined,
-          webkitBackgroundClip: ef.filling && ef.filling.enable ? (ef.filling.type === 0 ? undefined : 'text') : undefined,
+          WebkitBackgroundClip: ef.filling && ef.filling.enable ? (ef.filling.type === 0 ? undefined : 'text') : undefined,
           transform: ef.offset && ef.offset.enable ? `translate(${ef.offset.x}px, ${ef.offset.y}px)` : undefined,
         }"
         class="edit-text effect-text"
@@ -45,203 +45,188 @@
         v-html="params.text"
       ></div>
     </template>
-    <div ref="editWrap" :style="{ fontFamily: `'${params.fontClass.value}'` }" class="edit-text" spellcheck="false" :contenteditable="editable ? 'plaintext-only' : false" @input="writingText($event)" @blur="writeDone($event)" v-html="params.text"></div>
+    <div
+      ref="editWrap" :style="{ fontFamily: `'${params.fontClass.value}'` }"
+      class="edit-text" spellcheck="false" 
+      :contenteditable="state.editable ? 'plaintext-only' : false"
+      @input="writingText($event)"
+      @blur="writeDone($event)"
+      v-html="params.text"></div>
   </div>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
 // 文本组件
-const NAME = 'w-text'
+// const NAME = 'w-text'
 
-import { defineComponent, reactive, toRefs, computed, onUpdated, watch, onMounted, ref } from 'vue'
+import { reactive, toRefs, computed, onUpdated, watch, onMounted, ref } from 'vue'
 import { useStore } from 'vuex'
 import { useRoute } from 'vue-router'
 import { fontWithDraw } from '@/utils/widgets/loadFontRule'
-import getGradientOrImg from './getGradientOrImg.ts'
+import getGradientOrImg from './getGradientOrImg'
+import { wTextSetting } from './wTextSetting'
 
-export default defineComponent({
+export type TwTextParams = {
-  name: NAME,
+  rotate?: number
-  setting: {
+  lock?: boolean
-    name: '文本',
+  width?: number
-    type: NAME,
+  height?: number
-    uuid: -1,
+} & typeof wTextSetting
-    editable: false,
-    left: 0,
-    top: 0,
-    transform: '',
-    lineHeight: 1.5,
-    letterSpacing: 0,
-    fontSize: 24,
-    zoom: 1,
-    fontClass: {
-      alias: '站酷快乐体',
-      id: 543,
-      value: 'zcool-kuaile-regular',
-      url: 'https://lib.baomitu.com/fonts/zcool-kuaile/zcool-kuaile-regular.woff2',
-    },
-    fontFamily: 'SourceHanSansSC-Regular',
-    fontWeight: 'normal',
-    fontStyle: 'normal',
-    writingMode: 'horizontal-tb',
-    textDecoration: 'none',
-    color: '#000000ff',
-    textAlign: 'left',
-    text: '',
-    opacity: 1,
-    backgroundColor: '',
-    parent: '-1',
-    record: {
-      width: 0,
-      height: 0,
-      minWidth: 0,
-      minHeight: 0,
-      dir: 'horizontal',
-    },
-  },
-  props: ['params', 'parent'],
-  setup(props) {
-    const store = useStore()
-    const route = useRoute()
-    const state = reactive({
-      loading: false,
-      editable: false,
-      loadFontDone: false,
-    })
-    const widget = ref(null)
-    const editWrap = ref(null)
 
-    const dActiveElement = computed(() => store.getters.dActiveElement)
+type TProps = {
-    const isDraw = computed(() => route.name === 'Draw' && fontWithDraw)
+  params: TwTextParams
+  parent: {
+    left: number
+    top: number
+  }
+}
 
-    onUpdated(() => {
+const props = defineProps<TProps>()
-      updateRecord()
-    })
 
-    onMounted(() => {
+const store = useStore()
-      updateRecord()
+const route = useRoute()
-      props.params.transform && (widget.value.style.transform = props.params.transform)
+const state = reactive({
-      props.params.rotate && (widget.value.style.transform += `translate(0px, 0px) rotate(${props.params.rotate}) scale(1, 1)`)
+  loading: false,
-      // store.commit('updateRect')
+  editable: false,
-    })
+  loadFontDone: '',
+})
+const widget = ref<HTMLElement | null>(null)
+const editWrap = ref<HTMLElement | null>(null)
 
-    watch(
+const dActiveElement = computed(() => store.getters.dActiveElement)
-      () => props.params,
+const isDraw = computed(() => route.name === 'Draw' && fontWithDraw)
-      async (nval) => {
-        updateText()
-        if (state.loading) {
-          return
-        }
-        let font = nval.fontClass
-        const isDone = font.value === state.loadFontDone
 
-        if (font.url && !isDone) {
+onUpdated(() => {
-          if (font.id && isDraw.value) {
+  updateRecord()
-            // 如果为绘制模式，且开启了字体抽取，那么会跳过加载字体url的逻辑
+})
-            // 此前该功能在demo中存在换行bug，实际上是由于抽取字体时忽略了空格导致的
-            state.loading = false
-            return
-          }
-          state.loading = !isDraw.value
-          const loadFont = new window.FontFace(font.value, `url(${font.url})`)
-          await loadFont.load()
-          document.fonts.add(loadFont)
-          state.loadFontDone = font.value
-          state.loading = false
-        } else {
-          state.loading = false
-        }
-      },
-      { immediate: true, deep: true },
-    )
 
-    watch(
+onMounted(() => {
-      () => state.editable,
+  updateRecord()
-      (value) => {
-        store.dispatch('updateWidgetData', {
-          uuid: props.params.uuid,
-          key: 'editable',
-          value,
-          pushHistory: false,
-        })
-      },
-    )
 
-    function updateRecord() {
+  if (!widget.value) return
-      if (dActiveElement.value.uuid === props.params.uuid) {
+  props.params.transform && (widget.value.style.transform = props.params.transform)
-        let record = dActiveElement.value.record
+  props.params.rotate && (widget.value.style.transform += `translate(0px, 0px) rotate(${props.params.rotate}) scale(1, 1)`)
-        record.width = widget.value.offsetWidth
+  // store.commit('updateRect')
-        record.height = widget.value.offsetHeight
+})
-        record.minWidth = props.params.fontSize
+
-        record.minHeight = props.params.fontSize * props.params.lineHeight
+watch(
-        writingText()
+  () => props.params,
+  async (nval) => {
+    updateText()
+    if (state.loading) {
+      return
+    }
+    let font = nval.fontClass
+    const isDone = font.value === state.loadFontDone
+
+    if (font.url && !isDone) {
+      if (font.id && isDraw.value) {
+        // 如果为绘制模式，且开启了字体抽取，那么会跳过加载字体url的逻辑
+        // 此前该功能在demo中存在换行bug，实际上是由于抽取字体时忽略了空格导致的
+        state.loading = false
+        return
       }
-    }
+      state.loading = !isDraw.value
-
+      const loadFont = new window.FontFace(font.value, `url(${font.url})`)
-    function updateText(e) {
+      await loadFont.load()
-      const value = e ? e.target.innerHTML : props.params.text.replace(/\n/g, '<br/>')
+      document.fonts.add(loadFont)
-      // const value = (e ? e.target.innerText : props.params.text).replace(/<br\/>/g, '\r\n').replace(/&nbsp;/g, ' ')
+      state.loadFontDone = font.value
-      if (value !== props.params.text) {
+      state.loading = false
-        store.dispatch('updateWidgetData', {
+    } else {
-          uuid: props.params.uuid,
+      state.loading = false
-          key: 'text',
-          value,
-          pushHistory: false,
-        })
-      }
-    }
-
-    function writingText(e) {
-      // updateText(e)
-      // TODO: 修正文字选框高度
-      const el = editWrap.value || widget.value
-      store.dispatch('updateWidgetData', {
-        uuid: props.params.uuid,
-        key: 'height',
-        value: el.offsetHeight,
-        pushHistory: false,
-      })
-      store.commit('updateRect')
-    }
-
-    function writeDone(e) {
-      state.editable = false
-      setTimeout(() => {
-        store.dispatch('pushHistory', '文字修改')
-      }, 100)
-      updateText(e)
-    }
-
-    function dblclickText(e) {
-      // store.commit('setShowMoveable', false)
-      state.editable = true
-      const el = editWrap.value || widget.value
-      setTimeout(() => {
-        el.focus()
-        if (document.selection) {
-          const range = document.body.createTextRange()
-          range.moveToElementText(el)
-          range.select()
-        } else if (window.getSelection) {
-          const range = document.createRange()
-          range.selectNodeContents(el)
-          window.getSelection().removeAllRanges()
-          window.getSelection().addRange(range)
-        }
-      }, 100)
-    }
-
-    return {
-      ...toRefs(state),
-      getGradientOrImg,
-      updateRecord,
-      writingText,
-      updateText,
-      writeDone,
-      dblclickText,
-      widget,
-      editWrap,
     }
   },
+  { immediate: true, deep: true },
+)
+
+watch(
+  () => state.editable,
+  (value) => {
+    store.dispatch('updateWidgetData', {
+      uuid: props.params.uuid,
+      key: 'editable',
+      value,
+      pushHistory: false,
+    })
+  },
+)
+
+function updateRecord() {
+  if (!widget.value) return
+  if (dActiveElement.value.uuid === props.params.uuid) {
+    let record = dActiveElement.value.record
+    record.width = widget.value.offsetWidth
+    record.height = widget.value.offsetHeight
+    record.minWidth = props.params.fontSize
+    record.minHeight = props.params.fontSize * props.params.lineHeight
+    writingText()
+  }
+}
+
+function updateText(e?: Event) {
+  const value = e && e.target ? (e.target as HTMLElement).innerHTML : props.params.text.replace(/\n/g, '<br/>')
+  // const value = (e ? e.target.innerText : props.params.text).replace(/<br\/>/g, '\r\n').replace(/&nbsp;/g, ' ')
+  if (value !== props.params.text) {
+    store.dispatch('updateWidgetData', {
+      uuid: props.params.uuid,
+      key: 'text',
+      value,
+      pushHistory: false,
+    })
+  }
+}
+
+function writingText(e?: Event) {
+  // updateText(e)
+  // TODO: 修正文字选框高度
+  const el = editWrap.value || widget.value
+  if (!el) return
+  store.dispatch('updateWidgetData', {
+    uuid: props.params.uuid,
+    key: 'height',
+    value: el.offsetHeight,
+    pushHistory: false,
+  })
+  store.commit('updateRect')
+}
+
+function writeDone(e: Event) {
+  state.editable = false
+  setTimeout(() => {
+    store.dispatch('pushHistory', '文字修改')
+  }, 100)
+  updateText(e)
+}
+
+function dblclickText(_: MouseEvent) {
+  // store.commit('setShowMoveable', false)
+  state.editable = true
+  const el = editWrap.value || widget.value
+  setTimeout(() => {
+    if (!el) return
+    el.focus()
+    if (document.selection) {
+      const range = document.body.createTextRange()
+      range.moveToElementText(el)
+      range.select()
+    } else {
+      const range = document.createRange()
+      range.selectNodeContents(el);
+      window.getSelection()?.removeAllRanges();
+      window.getSelection()?.addRange(range);
+    }
+  }, 100)
+}
+
+defineExpose({
+  getGradientOrImg,
+  updateRecord,
+  writingText,
+  updateText,
+  writeDone,
+  dblclickText,
+  widget,
+  editWrap,
 })
 </script>
 

src/components/modules/widgets/wText/wTextSetting.ts

@@ -0,0 +1,101 @@
+import { StyleValue } from "vue"
+
+export type TwTextData = {
+  name: string
+  type: string
+  uuid: number
+  editable: boolean,
+  left: number
+  top: number
+  transform: string
+  lineHeight: number
+  letterSpacing: number
+  fontSize: number
+  zoom: number
+  fontClass: {
+    alias: string
+    id: number
+    value: string
+    url: string
+  },
+  fontFamily: string
+  fontWeight: string
+  fontStyle: string
+  writingMode: StyleProperty.WritingMode
+  textDecoration: string
+  color: string
+  textAlign: StyleProperty.TextAlign
+  text: string
+  opacity: number
+  backgroundColor: string
+  parent: string
+  record: {
+    width: number
+    height: number
+    minWidth: number
+    minHeight: number
+    dir: string
+  },
+  textEffects?: {
+    filling: {
+      enable: boolean
+      type: number
+      color: string
+    }
+    stroke: {
+      enable: boolean
+      width: number
+      color: string
+    }
+    shadow: {
+      enable: boolean
+      offsetY: number
+      offsetX: number
+      blur: number
+      color: string
+    }
+    offset: {
+      enable: boolean
+      x: number
+      y: number
+    }
+  }[]
+}
+
+export const wTextSetting: TwTextData = {
+  name: '文本',
+  type: 'w-text',
+  uuid: -1,
+  editable: false,
+  left: 0,
+  top: 0,
+  transform: '',
+  lineHeight: 1.5,
+  letterSpacing: 0,
+  fontSize: 24,
+  zoom: 1,
+  fontClass: {
+    alias: '站酷快乐体',
+    id: 543,
+    value: 'zcool-kuaile-regular',
+    url: 'https://lib.baomitu.com/fonts/zcool-kuaile/zcool-kuaile-regular.woff2',
+  },
+  fontFamily: 'SourceHanSansSC-Regular',
+  fontWeight: 'normal',
+  fontStyle: 'normal',
+  writingMode: 'horizontal-tb',
+  textDecoration: 'none',
+  color: '#000000ff',
+  textAlign: 'left',
+  text: '',
+  opacity: 1,
+  backgroundColor: '',
+  parent: '-1',
+  record: {
+    width: 0,
+    height: 0,
+    minWidth: 0,
+    minHeight: 0,
+    dir: 'horizontal',
+  },
+}

src/mixins/methods/handlePaste.ts

@@ -17,7 +17,8 @@ import Qiniu from '@/common/methods/QiNiu'
 import _config from '@/config'
 import { getImage } from '@/common/methods/getImgDetail'
 import wImage from '@/components/modules/widgets/wImage/wImage.vue'
-import wText from '@/components/modules/widgets/wText/wText.vue'
+// import wText from '@/components/modules/widgets/wText/wText.vue'
+import { wTextSetting } from '@/components/modules/widgets/wText/wTextSetting'
 
 export default () => {
   navigator.clipboard
@@ -47,7 +48,7 @@ export default () => {
           break
         } else if (item.types.toString().indexOf('text') !== -1) {
           store.commit('setShowMoveable', false) // 清理掉上一次的选择
-          const setting = JSON.parse(JSON.stringify(wText.setting))
+          const setting = JSON.parse(JSON.stringify(wTextSetting))
           setting.text = await navigator.clipboard.readText()
           store.dispatch('addWidget', setting)
           break

src/types/global.d.ts

@@ -63,3 +63,14 @@ interface MouseEvent {
   layerY: number
 }
 
+interface Document {
+  selection?: Selection
+}
+
+interface HTMLElement {
+  createTextRange(): {
+    moveToElementText(el: HTMLElement): void
+    select(): void
+  }
+}
+

src/types/style.d.ts

@@ -0,0 +1,6 @@
+
+
+namespace StyleProperty {
+  type TextAlign = "center" | "end" | "left" | "right" | "start";
+  type WritingMode = Globals | "horizontal-tb" | "sideways-lr" | "sideways-rl" | "vertical-lr" | "vertical-rl";
+}

src/views/Psd.vue

@@ -60,7 +60,7 @@ import { useStore } from 'vuex'
 import RightClickMenu from '@/components/business/right-click-menu/RcMenu.vue'
 import Moveable from '@/components/business/moveable/Moveable.vue'
 import shortcuts from '@/mixins/shortcuts'
-import wText from '@/components/modules/widgets/wText/wText.vue'
+// import wText from '@/components/modules/widgets/wText/wText.vue'
 import wImage from '@/components/modules/widgets/wImage/wImage.vue'
 import useLoading from '@/common/methods/loading'
 import uploader from '@/components/common/Uploader/index.vue'
@@ -71,6 +71,7 @@ import ProgressLoading from '@/components/common/ProgressLoading/index.vue'
 // import MyWorker from '@/utils/plugins/webWorker'
 import { processPSD2Page } from '@/utils/plugins/psd'
 import { useSetupMapGetters } from '@/common/hooks/mapGetters'
+import { wTextSetting } from '@/components/modules/widgets/wText/wTextSetting'
 
 type TState = {
   isDone: boolean
@@ -124,7 +125,7 @@ async function loadPSD(file: File) {
 
   setTimeout(async () => {
     const types: any = {
-      text: wText.setting,
+      text: wTextSetting,
       image: wImage.setting,
     }
     for (let i = 0; i < data.clouds.length; i++) {