From 885387cb5af904e36350ec070572fa5e76b22d5f Mon Sep 17 00:00:00 2001 From: tnt group Date: Thu, 29 Sep 2022 10:32:17 +0800 Subject: [PATCH 01/16] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E9=80=9A?= =?UTF-8?q?=E7=94=A8=E7=BF=BB=E7=89=8C=E5=99=A8=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Flipper/index.ts | 3 + src/components/Flipper/index.vue | 257 +++++++++++++++++++++++++++++++ 2 files changed, 260 insertions(+) create mode 100644 src/components/Flipper/index.ts create mode 100644 src/components/Flipper/index.vue diff --git a/src/components/Flipper/index.ts b/src/components/Flipper/index.ts new file mode 100644 index 00000000..bf785165 --- /dev/null +++ b/src/components/Flipper/index.ts @@ -0,0 +1,3 @@ +import Flipper from './index.vue' + +export { Flipper } diff --git a/src/components/Flipper/index.vue b/src/components/Flipper/index.vue new file mode 100644 index 00000000..8ccc7696 --- /dev/null +++ b/src/components/Flipper/index.vue @@ -0,0 +1,257 @@ + + + + + From 144ef06cd127e02ffbc9d7f013960c6de67d7161 Mon Sep 17 00:00:00 2001 From: tnt group Date: Thu, 29 Sep 2022 10:34:29 +0800 Subject: [PATCH 02/16] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=80=92?= =?UTF-8?q?=E8=AE=A1=E6=97=B6=E7=BB=84=E4=BB=B6(=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=B8=AD)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Decorates/Mores/CountDown/config.ts | 38 +++++++++ .../Decorates/Mores/CountDown/config.vue | 68 ++++++++++++++++ .../Decorates/Mores/CountDown/index.ts | 14 ++++ .../Decorates/Mores/CountDown/index.vue | 77 +++++++++++++++++++ .../components/Decorates/Mores/index.ts | 3 +- 5 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 src/packages/components/Decorates/Mores/CountDown/config.ts create mode 100644 src/packages/components/Decorates/Mores/CountDown/config.vue create mode 100644 src/packages/components/Decorates/Mores/CountDown/index.ts create mode 100644 src/packages/components/Decorates/Mores/CountDown/index.vue diff --git a/src/packages/components/Decorates/Mores/CountDown/config.ts b/src/packages/components/Decorates/Mores/CountDown/config.ts new file mode 100644 index 00000000..ee3c5193 --- /dev/null +++ b/src/packages/components/Decorates/Mores/CountDown/config.ts @@ -0,0 +1,38 @@ +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { CountDownConfig } from './index' +import cloneDeep from 'lodash/cloneDeep' +import { chartInitConfig } from '@/settings/designSetting' + +export enum FontWeightEnum { + NORMAL = '常规', + BOLD = '加粗' +} + +export const FontWeightObject = { + [FontWeightEnum.NORMAL]: 'normal', + [FontWeightEnum.BOLD]: 'bold' +} + +export const option = { + // 数据说明 + timeSize: 24, + timeLineHeight: 50, + timeTextIndent: 2, + timeColor: '#E6F7FF', + fontWeight: 'normal', + + //阴影 + showShadow: true, + hShadow: 0, + vShadow: 0, + blurShadow: 8, + colorShadow: '#0075ff' +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = CountDownConfig.key + public attr = { ...chartInitConfig, w: 300, h: 200, zIndex: -1 } + public chartConfig = cloneDeep(CountDownConfig) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Decorates/Mores/CountDown/config.vue b/src/packages/components/Decorates/Mores/CountDown/config.vue new file mode 100644 index 00000000..208cbedb --- /dev/null +++ b/src/packages/components/Decorates/Mores/CountDown/config.vue @@ -0,0 +1,68 @@ + + diff --git a/src/packages/components/Decorates/Mores/CountDown/index.ts b/src/packages/components/Decorates/Mores/CountDown/index.ts new file mode 100644 index 00000000..b745355c --- /dev/null +++ b/src/packages/components/Decorates/Mores/CountDown/index.ts @@ -0,0 +1,14 @@ +import image from '@/assets/images/chart/decorates/time.png' +import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' + +export const CountDownConfig: ConfigType = { + key: 'CountDown', + chartKey: 'VCountDown', + conKey: 'VCCountDown', + title: '倒计时', + category: ChatCategoryEnum.MORE, + categoryName: ChatCategoryEnumName.MORE, + package: PackagesCategoryEnum.DECORATES, + image +} diff --git a/src/packages/components/Decorates/Mores/CountDown/index.vue b/src/packages/components/Decorates/Mores/CountDown/index.vue new file mode 100644 index 00000000..d151fe9a --- /dev/null +++ b/src/packages/components/Decorates/Mores/CountDown/index.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/src/packages/components/Decorates/Mores/index.ts b/src/packages/components/Decorates/Mores/index.ts index 9aff3b7d..bc6a3849 100644 --- a/src/packages/components/Decorates/Mores/index.ts +++ b/src/packages/components/Decorates/Mores/index.ts @@ -1,5 +1,6 @@ import { NumberConfig } from './Number/index' import { TimeCommonConfig } from './TimeCommon/index' import { ClockConfig } from './Clock/index' +import { CountDownConfig } from './CountDown/index' -export default [TimeCommonConfig, NumberConfig, ClockConfig] +export default [TimeCommonConfig, CountDownConfig, NumberConfig, ClockConfig] From e3d5860a4179dd139fbae8fd642e005ba80a2653 Mon Sep 17 00:00:00 2001 From: tnt group Date: Thu, 29 Sep 2022 15:20:23 +0800 Subject: [PATCH 03/16] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E7=BF=BB?= =?UTF-8?q?=E7=89=8C=E5=99=A8=E6=A0=B7=E5=BC=8F=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Flipper/index.vue | 60 ++++++-------------------------- 1 file changed, 10 insertions(+), 50 deletions(-) diff --git a/src/components/Flipper/index.vue b/src/components/Flipper/index.vue index 8ccc7696..1e1d86de 100644 --- a/src/components/Flipper/index.vue +++ b/src/components/Flipper/index.vue @@ -1,7 +1,7 @@ @@ -51,7 +51,6 @@ const flipType = ref('down') const frontTextFromData = ref(props.frontText) const backTextFromData = ref(props.backText) -const _textClass = (number: string | number) => `number${number}` const _flip = (type: FlipType, front: string | number, back: string | number) => { // 如果处于翻转中，则不执行 if (isFlipping.value) return @@ -150,12 +149,14 @@ $radius: v-bind('props.radius'); overflow: hidden; box-sizing: border-box; } - // .digital.front:after { - // content: v-bind(frontTextFromData) !important; - // } - // .digital.back:after { - // content: v-bind(backTextFromData) !important; - // } + .digital.front:before, + .digital.front:after { + content: attr(data-front) !important; + } + .digital.back:before, + .digital.back:after { + content: attr(data-back) !important; + } .digital:before { top: 0; bottom: 50%; @@ -212,46 +213,5 @@ $radius: v-bind('props.radius'); &.up.go .back:before { animation: backFlipUp v-bind('`${props.duration / 1000}s`') ease-in-out both; } - - .number0:before, - .number0:after { - content: '0'; - } - .number1:before, - .number1:after { - content: '1'; - } - .number2:before, - .number2:after { - content: '2'; - } - .number3:before, - .number3:after { - content: '3'; - } - .number4:before, - .number4:after { - content: '4'; - } - .number5:before, - .number5:after { - content: '5'; - } - .number6:before, - .number6:after { - content: '6'; - } - .number7:before, - .number7:after { - content: '7'; - } - .number8:before, - .number8:after { - content: '8'; - } - .number9:before, - .number9:after { - content: '9'; - } } From d0260041ce2adc1faeb8f9731bd55b1eb03cd069 Mon Sep 17 00:00:00 2001 From: tnt group Date: Thu, 29 Sep 2022 15:21:04 +0800 Subject: [PATCH 04/16] =?UTF-8?q?fix:=20=E5=BC=95=E5=85=A5=20naiveui=20NCo?= =?UTF-8?q?untdown=20=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/naive.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/plugins/naive.ts b/src/plugins/naive.ts index a1e03c3a..9354a285 100644 --- a/src/plugins/naive.ts +++ b/src/plugins/naive.ts @@ -1,4 +1,4 @@ -import type { App } from 'vue'; +import type { App } from 'vue' import { create, NA, @@ -8,6 +8,7 @@ import { NH3, NH4, NCode, + NCountdown, NText, NTime, NEllipsis, @@ -98,7 +99,7 @@ import { NWatermark, NEmpty, NCollapseTransition -} from 'naive-ui'; +} from 'naive-ui' const naive = create({ components: [ @@ -109,6 +110,7 @@ const naive = create({ NH3, NH4, NCode, + NCountdown, NText, NTime, NEllipsis, @@ -199,9 +201,9 @@ const naive = create({ NWatermark, NEmpty, NCollapseTransition - ], -}); + ] +}) export function setupNaive(app: App) { - app.use(naive); + app.use(naive) } From 4a75cc4d1108af443fe99c2fef213cbc3ec2d3a1 Mon Sep 17 00:00:00 2001 From: tnt group Date: Thu, 29 Sep 2022 15:21:22 +0800 Subject: [PATCH 05/16] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=E5=80=92?= =?UTF-8?q?=E8=AE=A1=E6=97=B6=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Decorates/Mores/CountDown/config.ts | 21 ++--- .../Decorates/Mores/CountDown/config.vue | 85 +++++++---------- .../Decorates/Mores/CountDown/index.vue | 91 +++++++++++++++---- 3 files changed, 113 insertions(+), 84 deletions(-) diff --git a/src/packages/components/Decorates/Mores/CountDown/config.ts b/src/packages/components/Decorates/Mores/CountDown/config.ts index ee3c5193..118797ff 100644 --- a/src/packages/components/Decorates/Mores/CountDown/config.ts +++ b/src/packages/components/Decorates/Mores/CountDown/config.ts @@ -15,24 +15,17 @@ export const FontWeightObject = { } export const option = { - // 数据说明 - timeSize: 24, - timeLineHeight: 50, - timeTextIndent: 2, - timeColor: '#E6F7FF', - fontWeight: 'normal', - - //阴影 - showShadow: true, - hShadow: 0, - vShadow: 0, - blurShadow: 8, - colorShadow: '#0075ff' + flipperBgColor: '#ee6600FF', + flipperTextColor: '#336600FF', + flipperWidth: 60, + flipperHeight: 100, + flipperRadius: 10, + flipperSpeed: 600 } export default class Config extends PublicConfigClass implements CreateComponentType { public key = CountDownConfig.key - public attr = { ...chartInitConfig, w: 300, h: 200, zIndex: -1 } + public attr = { ...chartInitConfig, w: 500, h: 200, zIndex: -1 } public chartConfig = cloneDeep(CountDownConfig) public option = cloneDeep(option) } diff --git a/src/packages/components/Decorates/Mores/CountDown/config.vue b/src/packages/components/Decorates/Mores/CountDown/config.vue index 208cbedb..bd8efe1c 100644 --- a/src/packages/components/Decorates/Mores/CountDown/config.vue +++ b/src/packages/components/Decorates/Mores/CountDown/config.vue @@ -1,53 +1,40 @@ diff --git a/src/packages/components/Decorates/Mores/CountDown/index.vue b/src/packages/components/Decorates/Mores/CountDown/index.vue index d151fe9a..3a7d0b04 100644 --- a/src/packages/components/Decorates/Mores/CountDown/index.vue +++ b/src/packages/components/Decorates/Mores/CountDown/index.vue @@ -1,9 +1,73 @@ @@ -24,18 +88,9 @@ let boxShadow = ref('none') const { w, h } = toRefs(props.chartConfig.attr) -let { - timeColor, - timeSize, - timeLineHeight, - timeTextIndent, - fontWeight, - showShadow, - hShadow, - vShadow, - blurShadow, - colorShadow -} = toRefs(props.chartConfig.option) +let { flipperBgColor, flipperTextColor, flipperWidth, flipperHeight, flipperRadius, flipperSpeed } = toRefs( + props.chartConfig.option +) watch( props.chartConfig.option, @@ -58,7 +113,7 @@ let interval = 0 onMounted(() => { const interval = window.setInterval(() => { COUNT-- - if (COUNT === 0) window.clearInterval(interval) + if (COUNT <= 1) window.clearInterval(interval) const flipperCON: any = flipperRef.value flipperCON?.flipDown(COUNT, COUNT - 1) }, 1000) @@ -73,5 +128,9 @@ useChartDataFetch(props.chartConfig, useChartEditStore) @include go('decorates-more-countdown') { width: v-bind('`${w}px`'); height: v-bind('`${h}px`'); + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; } From a56ddc9415d285b5f975a6b7d76c7e575f2ef3f5 Mon Sep 17 00:00:00 2001 From: tnt group Date: Thu, 29 Sep 2022 19:11:54 +0800 Subject: [PATCH 06/16] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=BF=BB?= =?UTF-8?q?=E7=89=8C=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Flipper/index.vue | 114 +++++++++++++++++-------------- 1 file changed, 61 insertions(+), 53 deletions(-) diff --git a/src/components/Flipper/index.vue b/src/components/Flipper/index.vue index 1e1d86de..63f5b55f 100644 --- a/src/components/Flipper/index.vue +++ b/src/components/Flipper/index.vue @@ -1,24 +1,28 @@ diff --git a/src/packages/components/Decorates/Mores/FlipperNumber/config.ts b/src/packages/components/Decorates/Mores/FlipperNumber/config.ts new file mode 100644 index 00000000..347e3681 --- /dev/null +++ b/src/packages/components/Decorates/Mores/FlipperNumber/config.ts @@ -0,0 +1,39 @@ +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { FlipperNumberConfig } from './index' +import cloneDeep from 'lodash/cloneDeep' +import { chartInitConfig } from '@/settings/designSetting' +import { FlipType } from '@/components/Flipper' + +export interface OptionType { + dataset: number | string + flipperLength: number + flipperBgColor: string + flipperTextColor: string + flipperWidth: number + flipperHeight: number + flipperRadius: number + flipperGap: number + flipperType: FlipType + flipperSpeed: number +} + +export const option: OptionType = { + dataset: 203234, + flipperLength: 6, + flipperBgColor: '#253E4E', + flipperTextColor: '#7CFFB2FF', + flipperWidth: 60, + flipperHeight: 100, + flipperRadius: 10, + flipperGap: 10, + flipperType: 'down', + flipperSpeed: 450 +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = FlipperNumberConfig.key + public attr = { ...chartInitConfig, w: 500, h: 200, zIndex: -1 } + public chartConfig = cloneDeep(FlipperNumberConfig) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Decorates/Mores/FlipperNumber/config.vue b/src/packages/components/Decorates/Mores/FlipperNumber/config.vue new file mode 100644 index 00000000..a7478250 --- /dev/null +++ b/src/packages/components/Decorates/Mores/FlipperNumber/config.vue @@ -0,0 +1,72 @@ + + diff --git a/src/packages/components/Decorates/Mores/FlipperNumber/index.ts b/src/packages/components/Decorates/Mores/FlipperNumber/index.ts new file mode 100644 index 00000000..2e3d883b --- /dev/null +++ b/src/packages/components/Decorates/Mores/FlipperNumber/index.ts @@ -0,0 +1,14 @@ +import image from '@/assets/images/chart/decorates/time.png' +import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' + +export const FlipperNumberConfig: ConfigType = { + key: 'FlipperNumber', + chartKey: 'VFlipperNumber', + conKey: 'VCFlipperNumber', + title: '数字翻牌2', + category: ChatCategoryEnum.MORE, + categoryName: ChatCategoryEnumName.MORE, + package: PackagesCategoryEnum.DECORATES, + image +} diff --git a/src/packages/components/Decorates/Mores/FlipperNumber/index.vue b/src/packages/components/Decorates/Mores/FlipperNumber/index.vue new file mode 100644 index 00000000..34a6defa --- /dev/null +++ b/src/packages/components/Decorates/Mores/FlipperNumber/index.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/packages/components/Decorates/Mores/index.ts b/src/packages/components/Decorates/Mores/index.ts index bc6a3849..855f6e27 100644 --- a/src/packages/components/Decorates/Mores/index.ts +++ b/src/packages/components/Decorates/Mores/index.ts @@ -2,5 +2,6 @@ import { NumberConfig } from './Number/index' import { TimeCommonConfig } from './TimeCommon/index' import { ClockConfig } from './Clock/index' import { CountDownConfig } from './CountDown/index' +import { FlipperNumberConfig } from './FlipperNumber' -export default [TimeCommonConfig, CountDownConfig, NumberConfig, ClockConfig] +export default [NumberConfig, FlipperNumberConfig, TimeCommonConfig, CountDownConfig, ClockConfig] From 4048d4a418d2d2e1616230a6f80a391a47609479 Mon Sep 17 00:00:00 2001 From: tnt group Date: Fri, 30 Sep 2022 11:39:41 +0800 Subject: [PATCH 10/16] =?UTF-8?q?feat:=20=E5=8A=A0=E5=85=A5=E7=BC=A9?= =?UTF-8?q?=E7=95=A5=E5=9B=BE=EF=BC=8C=E5=AE=8C=E6=88=90=E5=80=92=E8=AE=A1?= =?UTF-8?q?=E6=97=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../images/chart/decorates/countdown.png | Bin 0 -> 18163 bytes .../images/chart/decorates/flipper-number.png | Bin 0 -> 12441 bytes .../Decorates/Mores/CountDown/config.ts | 20 ++- .../Decorates/Mores/CountDown/config.vue | 37 ++++- .../Decorates/Mores/CountDown/index.ts | 2 +- .../Decorates/Mores/CountDown/index.vue | 136 +++++++++++++++--- .../Decorates/Mores/FlipperNumber/config.ts | 4 +- .../Decorates/Mores/FlipperNumber/config.vue | 4 +- .../Decorates/Mores/FlipperNumber/index.ts | 4 +- .../Decorates/Mores/Number/index.ts | 4 +- 10 files changed, 172 insertions(+), 39 deletions(-) create mode 100644 src/assets/images/chart/decorates/countdown.png create mode 100644 src/assets/images/chart/decorates/flipper-number.png diff --git a/src/assets/images/chart/decorates/countdown.png b/src/assets/images/chart/decorates/countdown.png new file mode 100644 index 0000000000000000000000000000000000000000..06d168117cb46d85ab9197f562a3230edfa64281 GIT binary patch literal 18163 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�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 VwvJst{lWoIl2etfls5nTzW|4)_V)k) literal 0 HcmV?d00001 diff --git a/src/packages/components/Decorates/Mores/CountDown/config.ts b/src/packages/components/Decorates/Mores/CountDown/config.ts index 5440a13a..7131bcaf 100644 --- a/src/packages/components/Decorates/Mores/CountDown/config.ts +++ b/src/packages/components/Decorates/Mores/CountDown/config.ts @@ -5,8 +5,14 @@ import cloneDeep from 'lodash/cloneDeep' import { chartInitConfig } from '@/settings/designSetting' import { FlipType } from '@/components/Flipper' +type STYLE = '时分秒' | '冒号' + export interface OptionType { - dataset: number | string + dataset: number + fixedDate: boolean + endDate: number + style: STYLE + showDay: boolean flipperLength: number flipperBgColor: string flipperTextColor: string @@ -19,10 +25,14 @@ export interface OptionType { } export const option: OptionType = { - dataset: 203234, + dataset: 10 * 60, // 10分钟 + fixedDate: false, + endDate: new Date().getTime(), // 当前时间 + style: '时分秒', + showDay: true, flipperLength: 6, - flipperBgColor: '#ee6600', - flipperTextColor: '#FFFFFFFF', + flipperBgColor: '#253E4E', + flipperTextColor: '#7CFFB2FF', flipperWidth: 60, flipperHeight: 100, flipperRadius: 10, @@ -33,7 +43,7 @@ export const option: OptionType = { export default class Config extends PublicConfigClass implements CreateComponentType { public key = CountDownConfig.key - public attr = { ...chartInitConfig, w: 500, h: 200, zIndex: -1 } + public attr = { ...chartInitConfig, w: 950, h: 160, zIndex: -1 } public chartConfig = cloneDeep(CountDownConfig) public option = cloneDeep(option) } diff --git a/src/packages/components/Decorates/Mores/CountDown/config.vue b/src/packages/components/Decorates/Mores/CountDown/config.vue index a7478250..00aae7df 100644 --- a/src/packages/components/Decorates/Mores/CountDown/config.vue +++ b/src/packages/components/Decorates/Mores/CountDown/config.vue @@ -1,14 +1,24 @@ @@ -77,5 +174,8 @@ useChartDataFetch(props.chartConfig, useChartEditStore, (newVal: string | number @include go('decorates-more-countdown') { width: v-bind('`${w}px`'); height: v-bind('`${h}px`'); + font-size: v-bind('`${flipperWidth}px`'); + line-height: v-bind('`${flipperHeight}px`'); + color: v-bind('flipperTextColor'); } diff --git a/src/packages/components/Decorates/Mores/FlipperNumber/config.ts b/src/packages/components/Decorates/Mores/FlipperNumber/config.ts index 347e3681..ef074f7c 100644 --- a/src/packages/components/Decorates/Mores/FlipperNumber/config.ts +++ b/src/packages/components/Decorates/Mores/FlipperNumber/config.ts @@ -19,7 +19,7 @@ export interface OptionType { } export const option: OptionType = { - dataset: 203234, + dataset: 3234, flipperLength: 6, flipperBgColor: '#253E4E', flipperTextColor: '#7CFFB2FF', @@ -33,7 +33,7 @@ export const option: OptionType = { export default class Config extends PublicConfigClass implements CreateComponentType { public key = FlipperNumberConfig.key - public attr = { ...chartInitConfig, w: 500, h: 200, zIndex: -1 } + public attr = { ...chartInitConfig, w: 500, h: 160, zIndex: -1 } public chartConfig = cloneDeep(FlipperNumberConfig) public option = cloneDeep(option) } diff --git a/src/packages/components/Decorates/Mores/FlipperNumber/config.vue b/src/packages/components/Decorates/Mores/FlipperNumber/config.vue index a7478250..f2c65a96 100644 --- a/src/packages/components/Decorates/Mores/FlipperNumber/config.vue +++ b/src/packages/components/Decorates/Mores/FlipperNumber/config.vue @@ -4,7 +4,7 @@ - + @@ -46,7 +46,7 @@ ]" > - + Date: Fri, 30 Sep 2022 12:18:46 +0800 Subject: [PATCH 11/16] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=B1=9E=E6=80=A7=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Decorates/Mores/CountDown/config.vue | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/src/packages/components/Decorates/Mores/CountDown/config.vue b/src/packages/components/Decorates/Mores/CountDown/config.vue index 00aae7df..43827977 100644 --- a/src/packages/components/Decorates/Mores/CountDown/config.vue +++ b/src/packages/components/Decorates/Mores/CountDown/config.vue @@ -1,5 +1,5 @@