hookehuyr

refactor(组件): 优化默认对象初始化和组件定义

修复reserveCard组件中默认对象的初始化方式
为time-picker-data/picker组件添加name属性
简化PosterBuilder组件的类型定义和Promise使用
...@@ -7,10 +7,9 @@ ...@@ -7,10 +7,9 @@
7 ${debug ? '' : 'transform:translate3d(-9999rpx, 0, 0)'}`" 7 ${debug ? '' : 'transform:translate3d(-9999rpx, 0, 0)'}`"
8 /> 8 />
9 </template> 9 </template>
10 -<script lang="ts"> 10 +<script>
11 import Taro from "@tarojs/taro" 11 import Taro from "@tarojs/taro"
12 -import { defineComponent, onMounted, PropType, ref } from "vue" 12 +import { defineComponent, onMounted, ref } from "vue"
13 -import { Image, DrawConfig } from "./types"
14 import { drawImage, drawText, drawBlock, drawLine } from "./utils/draw" 13 import { drawImage, drawText, drawBlock, drawLine } from "./utils/draw"
15 import { 14 import {
16 toPx, 15 toPx,
...@@ -28,7 +27,7 @@ export default defineComponent({ ...@@ -28,7 +27,7 @@ export default defineComponent({
28 default: false, 27 default: false,
29 }, 28 },
30 config: { 29 config: {
31 - type: Object as PropType<DrawConfig>, 30 + type: Object,
32 default: () => ({}), 31 default: () => ({}),
33 }, 32 },
34 }, 33 },
...@@ -52,7 +51,7 @@ export default defineComponent({ ...@@ -52,7 +51,7 @@ export default defineComponent({
52 * @param {Array} images = imgTask 51 * @param {Array} images = imgTask
53 * @return {Promise} downloadImagePromise 52 * @return {Promise} downloadImagePromise
54 */ 53 */
55 - const initImages = (images: Image[]) => { 54 + const initImages = (images) => {
56 const imagesTemp = images.filter((item) => item.url) 55 const imagesTemp = images.filter((item) => item.url)
57 const drawList = imagesTemp.map((item, index) => 56 const drawList = imagesTemp.map((item, index) =>
58 getImageInfo(item, index) 57 getImageInfo(item, index)
...@@ -65,7 +64,7 @@ export default defineComponent({ ...@@ -65,7 +64,7 @@ export default defineComponent({
65 * @return {Promise} resolve 里返回其 dom 和实例 64 * @return {Promise} resolve 里返回其 dom 和实例
66 */ 65 */
67 const initCanvas = () => 66 const initCanvas = () =>
68 - new Promise<any>((resolve) => { 67 + new Promise((resolve) => {
69 setTimeout(() => { 68 setTimeout(() => {
70 const pageInstance = Taro.getCurrentInstance()?.page || {} // 拿到当前页面实例 69 const pageInstance = Taro.getCurrentInstance()?.page || {} // 拿到当前页面实例
71 const query = Taro.createSelectorQuery().in(pageInstance) // 确定在当前页面内匹配子元素 70 const query = Taro.createSelectorQuery().in(pageInstance) // 确定在当前页面内匹配子元素
......
...@@ -37,7 +37,7 @@ const go = useGo(); ...@@ -37,7 +37,7 @@ const go = useGo();
37 const props = defineProps({ 37 const props = defineProps({
38 data: { 38 data: {
39 type: Object, 39 type: Object,
40 - default: {}, 40 + default: () => ({}),
41 }, 41 },
42 }); 42 });
43 43
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
7 <script> 7 <script>
8 import { dateTimePicker, dateDate } from "./dateTimePicker.js"; 8 import { dateTimePicker, dateDate } from "./dateTimePicker.js";
9 export default { 9 export default {
10 + name: "TimePickerDataPicker",
10 props: { 11 props: {
11 startTime: { 12 startTime: {
12 type: [Object, Date], 13 type: [Object, Date],
......