Merge pull request #82 from JeremyYu-cn/feat-upgrade-vue3

feat: convert pageStyle component to composition API

src/components/modules/settings/colorSelect.vue

@@ -30,13 +30,19 @@ type TProps = {
 type TEmits = {
   (event: 'finish', data: string): void
   (event: 'update:modelValue', data: string): void
-  (event: 'change', data: string): void
+  (event: 'change', data: colorChangeData): void
 }
 
 type TState = {
   innerColor: string
 }
 
+export type colorChangeData = {
+  angle: number
+  color: string
+  mode: string
+}
+
 const props = withDefaults(defineProps<TProps>(), {
   label: '',
   modelValue: '',
@@ -118,7 +124,9 @@ const hide = () => {
   store.commit('setShowMoveable', true) // 恢复上一次的选择框
 }
 
-const colorChange = (color: string) => {
+
+const colorChange = (color: colorChangeData) => {
+  // console.log('color', color)
   emit('change', color)
 }
 

src/components/modules/widgets/pageStyle.vue

@@ -1,161 +1,175 @@
 <template>
   <div id="page-style">
-    <div v-if="showBgLib" style="width: 256px;height: 100%;">
+    <div v-if="state.showBgLib" style="width: 256px;height: 100%;">
-      <span class="header-back" @click="showBgLib = false">
+      <span class="header-back" @click="state.showBgLib = false">
         <i class="iconfont icon-right"></i> 选择背景
       </span>
       <bg-img-list-wrap style="padding-top: 2rem;" model="stylePanel" />
     </div>
-    <el-collapse v-else v-model="activeNames">
+    <el-collapse v-else v-model="state.activeNames">
       <el-collapse-item title="画布尺寸" name="1">
         <div class="position-size">
-          <number-input v-model="innerElement.width" label="宽" :maxValue="5000" @finish="(value) => finish('width', value)" />
+          <number-input v-model="state.innerElement.width" label="宽" :maxValue="5000" @finish="(value) => finish('width', value)" />
-          <number-input v-model="innerElement.height" label="高" :maxValue="5000" @finish="(value) => finish('height', value)" />
+          <number-input v-model="state.innerElement.height" label="高" :maxValue="5000" @finish="(value) => finish('height', value)" />
         </div>
       </el-collapse-item>
       <el-collapse-item title="背景设置" name="2">
-        <el-button style="width: 100%; margin: 0 0 1rem 0;" type="primary" link @click="showBgLib = true">在背景库中选择</el-button>
+        <el-button style="width: 100%; margin: 0 0 1rem 0;" type="primary" link @click="state.showBgLib = true">在背景库中选择</el-button>
-        <Tabs :value="mode" @update:value="onChangeMode">
+        <Tabs :value="state.mode" @update:value="onChangeMode">
-          <TabPanel v-for="label in modes" :key="label" :label="label"></TabPanel>
+          <TabPanel v-for="label in state.modes" :key="label" :label="label"></TabPanel>
         </Tabs>
-        <color-select v-show="mode === '颜色'" v-model="innerElement.backgroundColor" :modes="['纯色']" @change="colorChange" @finish="(value) => finish('backgroundColor', value)" />
+        <color-select v-show="state.mode === '颜色'" v-model="state.innerElement.backgroundColor" :modes="['纯色']" @change="colorChange" @finish="(value) => finish('backgroundColor', value)" />
         <!-- <bg-img-select :img="innerElement.backgroundImage"/> -->
-        <div v-if="mode === '图片' && innerElement.backgroundImage" style="margin-top: 2rem">
+        <div v-if="state.mode === '图片' && state.innerElement.backgroundImage" style="margin-top: 2rem">
-          <el-image style="max-height: 428px" :src="innerElement.backgroundImage" fit="contain"></el-image>
+          <el-image style="max-height: 428px" :src="state.innerElement.backgroundImage" fit="contain"></el-image>
           <el-button class="btn-wrap" size="small" @click="deleteBg">删除</el-button>
         </div>
-        <uploader v-show="mode === '图片'" class="btn-wrap" @done="uploadImgDone">
+        <uploader v-show="state.mode === '图片'" class="btn-wrap" @done="uploadImgDone">
-          <el-button style="width: 100%" plain>{{ innerElement.backgroundImage ? '更换背景' : '上传背景' }}图</el-button>
+          <el-button style="width: 100%" plain>{{ state.innerElement.backgroundImage ? '更换背景' : '上传背景' }}图</el-button>
         </uploader>
-        <el-button v-show="mode === '图片' && innerElement.backgroundImage" class="btn-wrap" size="small" @click="downloadBG">{{ downP ? downP + ' %' : '下载背景图' }}</el-button>
+        <el-button v-show="state.mode === '图片' && state.innerElement.backgroundImage" class="btn-wrap" size="small" @click="downloadBG">{{ state.downP ? state.downP + ' %' : '下载背景图' }}</el-button>
 
       </el-collapse-item>
     </el-collapse>
   </div>
 </template>
 
-<script>
+<script lang="ts" setup>
 // 画布组件样式
-const NAME = 'page-style'
+// const NAME = 'page-style'
-import { mapGetters, mapActions } from 'vuex'
+import { nextTick, onMounted, reactive, watch } from 'vue'
+import { mapGetters, mapActions, useStore } from 'vuex'
 import numberInput from '../settings/numberInput.vue'
-import colorSelect from '../settings/colorSelect.vue'
+import colorSelect, { colorChangeData } from '../settings/colorSelect.vue'
-import uploader from '@/components/common/Uploader/index.vue'
+import uploader, { TUploadDoneData } from '@/components/common/Uploader/index.vue'
 import api from '@/api'
 import _dl from '@/common/methods/download'
 // import ColorPipette from '@/utils/plugins/color-pipette'
 import Tabs from '@palxp/color-picker/comps/Tabs.vue'
 import TabPanel from '@palxp/color-picker/comps/TabPanel.vue'
+import { useSetupMapGetters } from '@/common/hooks/mapGetters'
 
-export default {
+type TState = {
-  name: NAME,
+  activeNames: string[]
-  components: { numberInput, colorSelect, uploader, Tabs, TabPanel },
+  innerElement: Record<string, any>
-  data() {
+  tag: boolean
-    return {
+  ingoreKeys: string[]
-      activeNames: ['1', '2', '3', '4'],
+  downP: number
-      innerElement: {},
+  mode: string
-      tag: false,
+  modes: string[]
-      ingoreKeys: ['backgroundColor', 'name', 'width', 'height'],
+  showBgLib: boolean
-      downP: 0,
+}
-      mode: '颜色',
+
-      modes: ['颜色', '图片'],
+const store = useStore()
-      showBgLib: false
+const state = reactive<TState>({
-    }
+  activeNames: ['1', '2', '3', '4'],
+  innerElement: {},
+  tag: false,
+  ingoreKeys: ['backgroundColor', 'name', 'width', 'height'],
+  downP: 0,
+  mode: '颜色',
+  modes: ['颜色', '图片'],
+  showBgLib: false
+})
+const { dActiveElement } = useSetupMapGetters(['dActiveElement'])
+let _localTempBG: string | null = null
+
+watch(
+  () => dActiveElement.value,
+  () => {
+    change()
   },
-  computed: {
+  { deep: true }
-    ...mapGetters(['dActiveElement']),
+)
+
+watch(
+  () => state.innerElement,
+  () => {
+    changeValue()
   },
-  watch: {
+  { deep: true }
-    dActiveElement: {
+)
-      handler(newValue, oldValue) {
+
-        this.change()
+onMounted(() => {
-      },
+  change()
-      deep: true,
+})
-    },
+
-    innerElement: {
+// ...mapActions(['updatePageData']),
-      handler(newValue, oldValue) {
+function colorChange(e: colorChangeData) {
-        this.changeValue()
+  if (e.mode === '渐变') {
-      },
+    // setTimeout(() => {
-      deep: true,
+    //   console.log(1, e)
-    },
+    //   this.finish('backgroundImage', e.color)
-  },
+    // }, 1000)
-  created() {
+  }
-    this.change()
+}
-  },
+function onChangeMode(value: string) {
-  methods: {
+  state.mode = value
-    ...mapActions(['updatePageData']),
+  if (value === '颜色') {
-    colorChange(e) {
+    _localTempBG = state.innerElement.backgroundImage
-      if (e.mode === '渐变') {
+    finish('backgroundImage', '')
-        // setTimeout(() => {
+  } else {
-        //   console.log(1, e)
+    _localTempBG && finish('backgroundImage', _localTempBG)
-        //   this.finish('backgroundImage', e.color)
+  }
-        // }, 1000)
+}
-      }
+function change() {
-    },
+  state.mode = state.modes[0]
-    onChangeMode(value) {
+  state.tag = true
-      this.mode = value
+  state.innerElement = JSON.parse(JSON.stringify(dActiveElement.value))
-      if (value === '颜色') {
+  state.innerElement.backgroundImage && (state.mode = state.modes[1])
-        this._localTempBG = this.innerElement.backgroundImage
+}
-        this.finish('backgroundImage', '')
+function changeValue() {
+  if (state.tag) {
+    state.tag = false
+    return
+  }
+  for (let key in state.innerElement) {
+    if (key !== 'setting' && key !== 'record' && state.innerElement[key] !== dActiveElement.value[key]) {
+      if (state.ingoreKeys.indexOf(key) !== -1) {
+        dActiveElement.value[key] = state.innerElement[key]
       } else {
-        this._localTempBG && this.finish('backgroundImage', this._localTempBG)
+        store.dispatch('updatePageData', {
+          key: key,
+          value: state.innerElement[key],
+        })
+        // updatePageData({
+        //   key: key,
+        //   value: this.innerElement[key],
+        // })
       }
-    },
+    }
-    change() {
+  }
-      this.mode = this.modes[0]
+}
-      this.tag = true
+
-      this.innerElement = JSON.parse(JSON.stringify(this.dActiveElement))
+function finish(key: string, value: string | number) {
-      this.innerElement.backgroundImage && (this.mode = this.modes[1])
+  store.dispatch('updatePageData', {
-    },
+    key: key,
-    changeValue() {
+    value: value,
-      if (this.tag) {
+    pushHistory: true,
-        this.tag = false
+  })
-        return
+}
-      }
+async function uploadImgDone(img: TUploadDoneData) {
-      for (let key in this.innerElement) {
+  await api.material.addMyPhoto(img)
-        if (key !== 'setting' && key !== 'record' && this.innerElement[key] !== this.dActiveElement[key]) {
+  store.dispatch('updatePageData', {
-          if (this.ingoreKeys.indexOf(key) !== -1) {
+    key: 'backgroundTransform',
-            this.dActiveElement[key] = this.innerElement[key]
+    value: {},
-          } else {
+  })
-            this.updatePageData({
+  finish('backgroundImage', img.url)
-              key: key,
+}
-              value: this.innerElement[key],
+async function deleteBg() {
-            })
+  _localTempBG = null
-          }
+  store.dispatch('updatePageData', {
-        }
+    key: 'backgroundImage',
-      }
+    value: '',
-    },
+    pushHistory: true,
-    finish(key, value) {
+  })
-      this.updatePageData({
+  await nextTick()
-        key: key,
+  state.mode = state.modes[1]
-        value: value,
+}
-        pushHistory: true,
+async function downloadBG() {
-      })
+  await _dl.downloadImg(state.innerElement.backgroundImage, (p) => {
-    },
+    state.downP = p < 99 ? p / 100 : 0
-    async uploadImgDone(img) {
+  })
-      await api.material.addMyPhoto(img)
-      this.updatePageData({
-        key: 'backgroundTransform',
-        value: {},
-      })
-      this.finish('backgroundImage', img.url)
-    },
-    async deleteBg() {
-      this._localTempBG = null
-      this.updatePageData({
-        key: 'backgroundImage',
-        value: '',
-        pushHistory: true,
-      })
-      await this.$nextTick()
-      this.mode = this.modes[1]
-    },
-    async downloadBG() {
-      await _dl.downloadImg(this.innerElement.backgroundImage, (p) => {
-        this.downP = p < 99 ? p / 100 : 0
-      })
-    },
-  },
 }
 </script>