feat: convert wTextStyle component to composition API

src/assets/data/TextIconsData.ts

@@ -14,6 +14,7 @@ export type TStyleIconData = {
   tip: string
   value: string[]
   select: boolean
+  extraIcon?: boolean,
 }
 
 export const styleIconList1 = [

src/components/modules/settings/iconItemSelect.vue

@@ -28,7 +28,7 @@ export type TIconItemSelectData = {
   extraIcon?: boolean,
   tip?: string
   icon?: string
-  value?: string | number
+  value?: string | number | number[] | string[]
 }
 
 type TProps = {

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

@@ -8,8 +8,8 @@
 import store from '@/store'
 import { toRaw } from 'vue'
 export default () => {
-  const collector = new Set()
+  const collector = new Set<string>()
-  const fonts: any = {}
+  const fonts: Record<string, any> = {}
   const { dWidgets: widgets } = store.getters
   for (let i = 0; i < widgets.length; i++) {
     const { type, fontClass } = widgets[i]
@@ -18,5 +18,5 @@ export default () => {
       fonts[fontClass.id] = toRaw(fontClass)
     }
   }
-  return Array.from(collector).map((id: any) => fonts[id])
+  return Array.from(collector).map((id: string) => fonts[id])
 }

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

@@ -60,6 +60,9 @@ export type TwTextData = {
       y: number
     }
   }[]
+  width?: number
+  height?: number
+  degree?: number
 }
 
 export const wTextSetting: TwTextData = {

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

@@ -1,18 +1,18 @@
 <template>
   <div id="w-text-style">
-    <el-collapse v-model="activeNames">
+    <el-collapse v-model="state.activeNames">
       <el-collapse-item title="位置尺寸" name="1">
         <div class="line-layout">
-          <number-input v-model="innerElement.left" label="X" @finish="(value) => finish('left', value)" />
+          <number-input v-model="state.innerElement.left" label="X" @finish="(value) => finish('left', value)" />
-          <number-input v-model="innerElement.top" label="Y" @finish="(value) => finish('top', value)" />
+          <number-input v-model="state.innerElement.top" label="Y" @finish="(value) => finish('top', value)" />
-          <number-input v-model="innerElement.width" style="margin-top: 0.5rem" label="宽" :editable="true" @finish="(value) => finish('width', value)" />
+          <number-input v-model="state.innerElement.width" style="margin-top: 0.5rem" label="宽" :editable="true" @finish="(value) => finish('width', value)" />
-          <number-input v-model="innerElement.height" style="margin-top: 0.5rem" label="高" :editable="true" @finish="(value) => finish('height', value)" />
+          <number-input v-model="state.innerElement.height" style="margin-top: 0.5rem" label="高" :editable="true" @finish="(value) => finish('height', value)" />
         </div>
       </el-collapse-item>
       <!-- <el-collapse-item title="样式设置" name="2"> -->
       <div class="line-layout style-item">
-        <value-select v-model="innerElement.fontClass" label="文字" :data="fontClassList" inputWidth="152px" :readonly="true" @finish="(font) => finish('fontClass', font)" />
+        <value-select v-model="state.innerElement.fontClass" label="文字" :data="state.fontClassList" inputWidth="152px" :readonly="true" @finish="(font) => finish('fontClass', font)" />
-        <value-select v-model="innerElement.fontSize" label="大小" suffix="px" :data="fontSizeList" @finish="(value) => finish('fontSize', value)" />
+        <value-select v-model="state.innerElement.fontSize" label="大小" suffix="px" :data="state.fontSizeList" @finish="(value) => finish('fontSize', value)" />
       </div>
 
       <icon-item-select class="style-item" :data="styleIconList1" @finish="textStyleAction" />
@@ -24,90 +24,102 @@
       </div> -->
       <!-- <el-collapse-item title="位置尺寸" name="1"> -->
       <div class="style-item slide-wrap">
-        <number-slider v-model="innerElement.letterSpacing" style="font-size: 14px" label="字距" labelWidth="40px" :step="0.05" :minValue="-innerElement.fontSize" :maxValue="innerElement.fontSize * 2" @finish="(value) => finish('letterSpacing', value)" />
+        <number-slider v-model="state.innerElement.letterSpacing" style="font-size: 14px" label="字距" labelWidth="40px" :step="0.05" :minValue="-state.innerElement.fontSize" :maxValue="state.innerElement.fontSize * 2" @finish="(value) => finish('letterSpacing', value)" />
-        <number-slider v-model="innerElement.lineHeight" style="font-size: 14px" label="行距" labelWidth="40px" :step="0.05" :minValue="0" :maxValue="2.5" @finish="(value) => finish('lineHeight', value)" />
+        <number-slider v-model="state.innerElement.lineHeight" style="font-size: 14px" label="行距" labelWidth="40px" :step="0.05" :minValue="0" :maxValue="2.5" @finish="(value) => finish('lineHeight', value)" />
       </div>
       <!-- </el-collapse-item> -->
 
       <div style="flex-wrap: nowrap" class="line-layout style-item">
-        <color-select v-model="innerElement.color" label="颜色" @finish="(value) => finish('color', value)" />
+        <color-select v-model="state.innerElement.color" label="颜色" @finish="(value) => finish('color', value)" />
         <!-- <color-select v-model="innerElement.backgroundColor" label="背景颜色" @finish="(value) => finish('backgroundColor', value)" /> -->
       </div>
       <div class="line-layout style-item">
-        <effect-wrap v-model="innerElement.textEffects" :data="innerElement" :degree="innerElement.degree" @select="selectTextEffect" />
+        <effect-wrap v-model="state.innerElement.textEffects" :data="state.innerElement" :degree="state.innerElement.degree" @select="selectTextEffect" />
       </div>
       <icon-item-select class="style-item" :data="layerIconList" @finish="layerAction" />
       <icon-item-select class="style-item" :data="alignIconList" @finish="alignAction" />
 
       <!-- v-show="!innerElement.editable"  -->
       <div style="margin-top: 10px" class="line-layout style-item">
-        <text-input-area v-model="innerElement.text" @finish="(value) => finish('text', value)" />
+        <text-input-area v-model="state.innerElement.text" @finish="(value) => finish('text', value)" />
       </div>
       <!-- </el-collapse-item> -->
     </el-collapse>
   </div>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
 // 文本组件样式
 const NAME = 'w-text-style'
 import { defineComponent, reactive, toRefs, computed, watch, nextTick, onMounted } from 'vue'
 import { useStore } from 'vuex'
 import { useRoute } from 'vue-router'
-import { styleIconList1, styleIconList2, alignIconList } from '@/assets/data/TextIconsData'
+import { styleIconList1, styleIconList2, alignIconList, TStyleIconData, TStyleIconData2 } from '@/assets/data/TextIconsData'
 import layerIconList from '@/assets/data/LayerIconList'
 import numberInput from '../../settings/numberInput.vue'
 import numberSlider from '../../settings/numberSlider.vue'
 import colorSelect from '../../settings/colorSelect.vue'
-import iconItemSelect from '../../settings/iconItemSelect.vue'
+import iconItemSelect, { TIconItemSelectData } from '../../settings/iconItemSelect.vue'
 import textInputArea from '../../settings/textInputArea.vue'
 import valueSelect from '../../settings/valueSelect.vue'
 import effectWrap from '../../settings/EffectSelect/TextWrap.vue'
 import { useFontStore } from '@/common/methods/fonts'
-import usePageFontsFilter from './pageFontsFilter.ts'
+import usePageFontsFilter from './pageFontsFilter'
+import { wTextSetting ,TwTextData } from './wTextSetting';
 
-export default defineComponent({
+type TState = {
-  name: NAME,
+  activeNames: string[],
-    components: { numberInput, colorSelect, iconItemSelect, textInputArea, valueSelect, effectWrap, numberSlider },
+  innerElement: TwTextData,
-    setup() {
+  tag: boolean,
-      const store = useStore()
+  ingoreKeys: string[],
-      const route = useRoute()
+  fontSizeList: number[],
-      const state = reactive({
+  fontClassList: Record<string, any>, // 不能设空字体系统默认字体，因为截图服务的默认字体无法保证一致
+  lineHeightList: number[],
+  letterSpacingList: number[],
+  layerIconList: TIconItemSelectData[],
+  styleIconList1: TStyleIconData[],
+  styleIconList2: TStyleIconData2[],
+  alignIconList: TIconItemSelectData[],
+}
+
+const store = useStore()
+const route = useRoute()
+const state = reactive<TState>({
   activeNames: [],
-        innerElement: {},
+  innerElement: JSON.parse(JSON.stringify(wTextSetting)),
   tag: false,
   ingoreKeys: ['left', 'top', 'name', 'width', 'height', 'text', 'color', 'backgroundColor'],
   fontSizeList: [12, 14, 24, 26, 28, 30, 36, 48, 60, 72, 96, 108, 120, 140, 180, 200, 250, 300, 400, 500],
-        fontClassList: [], // 不能设空字体系统默认字体，因为截图服务的默认字体无法保证一致
+  fontClassList: {}, // 不能设空字体系统默认字体，因为截图服务的默认字体无法保证一致
   lineHeightList: [1, 1.5, 2],
   letterSpacingList: [0, 10, 25, 50, 75, 100, 200],
   layerIconList,
   styleIconList1,
   styleIconList2,
   alignIconList,
-      })
+})
-      const dActiveElement = computed(() => store.getters.dActiveElement)
+const dActiveElement = computed(() => store.getters.dActiveElement)
-      const dMoving = computed(() => store.getters.dMoving)
+const dMoving = computed(() => store.getters.dMoving)
-      // const isDraw = computed(() => route.name === 'Draw')
+// const isDraw = computed(() => route.name === 'Draw')
 
-      watch(() => dActiveElement.value, () => {
+watch(() => dActiveElement.value, () => {
   change()
-      }, { deep: true })
+}, { deep: true })
 
-      watch(() => state.innerElement, () => {
+watch(() => state.innerElement, () => {
   changeValue()
-      }, { deep: true })
+}, { deep: true })
 
-      let timer: any = null
+let timer: boolean | null = null
 
-      onMounted(() => {
+onMounted(() => {
   change()
   setTimeout(() => {
     loadFonts()
   }, 100)
-      })
+})
 
-      function change() {
+function change() {
   if (timer) {
     return
   }
@@ -118,9 +130,9 @@ export default defineComponent({
   state.tag = true
   state.innerElement = JSON.parse(JSON.stringify(dActiveElement.value))
   changeStyleIconList()
-      }
+}
 
-      function changeValue() {
+function changeValue() {
   if (state.tag) {
     state.tag = false
     return
@@ -130,31 +142,32 @@ export default defineComponent({
   }
   // TODO 修改数值
   for (let key in state.innerElement) {
-          if (state.ingoreKeys.indexOf(key) !== -1) {
+    const itemKey = key as keyof TwTextData
-            dActiveElement.value[key] = state.innerElement[key]
+    if (state.ingoreKeys.indexOf(itemKey) !== -1) {
-          } else if (key !== 'setting' && key !== 'record' && state.innerElement[key] !== dActiveElement.value[key]) {
+      dActiveElement.value[itemKey] = state.innerElement[itemKey]
+    } else if (key !== 'setting' && key !== 'record' && state.innerElement[itemKey] !== dActiveElement.value[itemKey]) {
       // const pushHistory = !['textEffects', 'transformData', 'fontClass'].includes(key)
       store.dispatch('updateWidgetData', {
         uuid: dActiveElement.value.uuid,
         key,
-              value: state.innerElement[key],
+        value: state.innerElement[itemKey],
         pushHistory: false,
       })
     }
   }
-      }
+}
 
-      function selectTextEffect({ key, value, style }: any) {
+function selectTextEffect({ key, value, style }: any) {
   const uuid = dActiveElement.value.uuid
   store.commit('setWidgetStyle', { uuid, key, value })
   if (style) {
     finish('color', style.color || '')
   }
-      }
+}
 
-      function loadFonts() {
+function loadFonts() {
   const localFonts = useFontStore.list
-        const fontLists = { 当前页面: [], 中文: [], 英文: [] }
+  const fontLists: Record<string, any> = { 当前页面: [], 中文: [], 英文: [] }
   for (const font of localFonts) {
     const { id, oid, value, url, alias, preview, lang } = font
     const item = { id, oid, value, url, alias, preview }
@@ -162,9 +175,9 @@ export default defineComponent({
   }
   fontLists['当前页面'] = usePageFontsFilter()
   state.fontClassList = fontLists
-      }
+}
 
-      function finish(key, value) {
+function finish(key: string, value: number | Record<string, any> | string) {
   store.dispatch('updateWidgetData', {
     uuid: dActiveElement.value.uuid,
     key,
@@ -174,34 +187,34 @@ export default defineComponent({
   setTimeout(() => {
     key === 'fontClass' && (state.fontClassList['当前页面'] = usePageFontsFilter())
   }, 300)
-      }
+}
 
-      function layerAction(item) {
+function layerAction(item: TIconItemSelectData) {
   store.dispatch('updateLayerIndex', {
     uuid: dActiveElement.value.uuid,
     value: item.value,
   })
-      }
+}
 
-      async function textStyleAction(item) {
+async function textStyleAction(item: TIconItemSelectData) {
-        let value = item.key === 'textAlign' ? item.value : item.value[item.select ? 1 : 0]
+  let value = item.key === 'textAlign' ? item.value : (item.value as number[])[item.select ? 1 : 0];
-        state.innerElement[item.key] = value
+  (state.innerElement as Record<string, any>)[item.key || ""] = value
   // TODO: 对竖版文字的特殊处理
   item.key === 'writingMode' && relationChange()
   await nextTick()
   store.commit('updateRect')
-      }
+}
 
-      async function alignAction(item) {
+async function alignAction(item: TIconItemSelectData) {
   store.dispatch('updateAlign', {
     align: item.value,
     uuid: dActiveElement.value.uuid,
   })
   await nextTick()
   store.commit('updateRect')
-      }
+}
 
-      function changeStyleIconList() {
+function changeStyleIconList() {
   for (let i = 0; i < state.styleIconList1.length; ++i) {
     let key = state.styleIconList1[i].key
     state.styleIconList1[i].select = false
@@ -229,9 +242,9 @@ export default defineComponent({
       continue
     }
   }
-      }
+}
 
-      function relationChange() {
+function relationChange() {
   setTimeout(() => {
     if (dActiveElement.value.writingMode) {
       const w_record = dActiveElement.value.width
@@ -239,17 +252,14 @@ export default defineComponent({
       state.innerElement.height = w_record
     }
   }, 10)
-      }
+}
 
-      return {
+defineExpose({
-        ...toRefs(state),
   selectTextEffect,
   textStyleAction,
   finish,
   layerAction,
   alignAction
-      }
-    }
 })
 </script>