From 96e5d065ce3df32f0cda8cd093b3769566c547f1 Mon Sep 17 00:00:00 2001 From: yehuozhili Date: Thu, 17 Sep 2020 21:10:32 +0800 Subject: [PATCH] refactor --- .../BasicComponents/Carousel/index.tsx | 4 +- .../BasicComponents/Carousel/schema.ts | 29 +- .../BasicComponents/Footer/index.tsx | 4 +- .../BasicComponents/Footer/schema.ts | 32 +- .../BasicComponents/Form/BaseForm.tsx | 30 +- .../BasicShop/BasicComponents/Form/index.tsx | 16 +- .../BasicShop/BasicComponents/Form/schema.ts | 32 +- .../BasicComponents/Header/index.tsx | 4 +- .../BasicComponents/Header/schema.ts | 30 +- .../BasicShop/BasicComponents/Icon/index.tsx | 6 +- .../BasicShop/BasicComponents/Icon/schema.ts | 28 +- .../BasicShop/BasicComponents/Image/index.tsx | 4 +- .../BasicShop/BasicComponents/Image/schema.ts | 20 +- .../BasicShop/BasicComponents/List/index.tsx | 6 +- .../BasicShop/BasicComponents/List/schema.ts | 41 +- .../BasicComponents/LongText/index.tsx | 4 +- .../BasicComponents/LongText/schema.ts | 34 +- .../BasicComponents/Notice/index.tsx | 4 +- .../BasicComponents/Notice/schema.ts | 30 +- .../BasicComponents/Qrcode/index.tsx | 4 +- .../BasicComponents/Qrcode/schema.ts | 28 +- .../BasicShop/BasicComponents/Tab/index.tsx | 4 +- .../BasicShop/BasicComponents/Tab/schema.ts | 30 +- .../BasicShop/BasicComponents/Text/index.tsx | 4 +- .../BasicShop/BasicComponents/Text/schema.ts | 29 +- .../BasicShop/MediaComponents/Video/index.tsx | 4 +- .../BasicShop/MediaComponents/Video/schema.ts | 20 +- .../VisualComponents/Chart/index.tsx | 19 +- .../VisualComponents/Chart/schema.ts | 29 +- .../VisualComponents/XProgress/index.tsx | 4 +- .../VisualComponents/XProgress/schema.ts | 30 +- .../PanelComponents/CardPicker/index.tsx | 11 +- .../PanelComponents/DataList/editorModal.tsx | 7 +- .../PanelComponents/DataList/index.tsx | 14 +- .../PanelComponents/FormEditor/index.tsx | 15 +- .../PanelComponents/FormEditor/types.ts | 193 +- .../PanelComponents/FormItems/EditorModal.tsx | 138 +- .../PanelComponents/FormItems/FormItems.tsx | 39 +- .../PanelComponents/MutiText/index.tsx | 6 +- yarn.lock | 29145 ++++++++-------- 40 files changed, 15364 insertions(+), 14767 deletions(-) diff --git a/src/components/BasicShop/BasicComponents/Carousel/index.tsx b/src/components/BasicShop/BasicComponents/Carousel/index.tsx index 30411e8..a2a5ee9 100644 --- a/src/components/BasicShop/BasicComponents/Carousel/index.tsx +++ b/src/components/BasicShop/BasicComponents/Carousel/index.tsx @@ -1,9 +1,9 @@ -import { CarouselConfigType } from '@/components/DynamicEngine/schema'; import React, { memo, PropsWithChildren } from 'react'; import { Carousel } from 'zarm'; import styles from './index.less'; +import { ICarouselConfig } from './schema'; -interface CarouselTypes extends CarouselConfigType { +interface CarouselTypes extends ICarouselConfig { isTpl: boolean; } diff --git a/src/components/BasicShop/BasicComponents/Carousel/schema.ts b/src/components/BasicShop/BasicComponents/Carousel/schema.ts index 0d55d43..a8ade45 100644 --- a/src/components/BasicShop/BasicComponents/Carousel/schema.ts +++ b/src/components/BasicShop/BasicComponents/Carousel/schema.ts @@ -1,4 +1,31 @@ -const Carousel = { +import { + IDataListConfigType, + IRadioConfigType, + ISwitchConfigType, + TDataListDefaultType, + TRadioDefaultType, + TSwitchDefaultType, +} from '@/components/PanelComponents/FormEditor/types'; + +export type CarouselDirectionKeyType = 'down' | 'left'; + +export type TCarouselEditData = Array< + IRadioConfigType | ISwitchConfigType | IDataListConfigType +>; +export interface ICarouselConfig { + direction: TRadioDefaultType; + swipeable: TSwitchDefaultType; + autoPlay: TSwitchDefaultType; + imgList: TDataListDefaultType; + tplImg: string; +} + +export interface ICarouselSchema { + editData: TCarouselEditData; + config: ICarouselConfig; +} + +const Carousel: ICarouselSchema = { editData: [ { key: 'direction', diff --git a/src/components/BasicShop/BasicComponents/Footer/index.tsx b/src/components/BasicShop/BasicComponents/Footer/index.tsx index 898457f..70197d5 100644 --- a/src/components/BasicShop/BasicComponents/Footer/index.tsx +++ b/src/components/BasicShop/BasicComponents/Footer/index.tsx @@ -1,6 +1,6 @@ -import { FooterConfigType } from '@/components/DynamicEngine/schema'; import React, { memo } from 'react'; -const Footer = memo((props: FooterConfigType) => { +import { IFooterConfig } from './schema'; +const Footer = memo((props: IFooterConfig) => { const { bgColor, text, color, align, fontSize, height } = props; return (