change tuple type

.eslintrc

@@ -1,6 +1,3 @@
 {
-  "extends": "react-app",
+  "extends": "react-app"
-  "rules": {
-    "react/react-in-jsx-scope": "off"
-  }
 }

src/components/DynamicEngine/index.tsx

@@ -2,7 +2,7 @@ import { dynamic } from 'umi';
 import Loading from '../LoadingCp';
 import { useMemo, memo, FC } from 'react';
 import React from 'react';
-import { UnionData, AllTemplateType } from './schema';
+import { AllTemplateType } from './schema';
 const needList = ['Tab', 'Carousel', 'Upload', 'Video', 'Icon'];
 
 const DynamicFunc = (type: AllTemplateType) =>
@@ -33,11 +33,12 @@ const DynamicFunc = (type: AllTemplateType) =>
 
 type DynamicType = {
   isTpl: boolean;
-  config: UnionData<'config'>;
+  config: { [key: string]: any };
   type: AllTemplateType;
 };
 const DynamicEngine = memo((props: DynamicType) => {
   const { type, config, isTpl } = props;
+  console.log(config);
   const Dynamic = useMemo(() => {
     return (DynamicFunc(type) as unknown) as FC<DynamicType>;
     // eslint-disable-next-line react-hooks/exhaustive-deps

src/components/DynamicEngine/schema.ts

@@ -75,12 +75,7 @@ export type CarouselImgTypeItem = BasicDataImgUrl;
 
 export type CarouselImgType = BasicDataSource;
 export interface CarouselSchema extends SchemaBasicImplement {
-  editData: [
+  editData: Array<CarouselEditItem<CraouselKeyType>>;
-    CarouselEditItem<'direction'>,
-    CarouselEditItem<'swipeable'>,
-    CarouselEditItem<'autoPlay'>,
-    CarouselEditItem<'imgList'>,
-  ];
   config: CarouselConfigType;
 }
 //__________________________________________
@@ -104,13 +99,7 @@ export interface TextEditItem<T extends TextKeyType> {
 }
 
 export interface TextSchema extends SchemaBasicImplement {
-  editData: [
+  editData: Array<TextEditItem<TextKeyType>>;
-    TextEditItem<'text'>,
-    TextEditItem<'color'>,
-    TextEditItem<'fontSize'>,
-    TextEditItem<'align'>,
-    TextEditItem<'lineHeight'>,
-  ];
   config: TextConfigType;
 }
 
@@ -140,14 +129,7 @@ export type TabEditItem<T extends TabKeyType> = {
 };
 
 export interface TabSchema extends SchemaBasicImplement {
-  editData: [
+  editData: Array<TabEditItem<TabKeyType>>;
-    TabEditItem<'tabs'>,
-    TabEditItem<'activeColor'>,
-    TabEditItem<'color'>,
-    TabEditItem<'fontSize'>,
-    TabEditItem<'imgSize'>,
-    TabEditItem<'sourceData'>,
-  ];
   config: TabConfigType;
 }
 //__________________________________________
@@ -173,12 +155,7 @@ export type NoticeEditItem<T extends NoticeKeyType> = {
   range?: Array<NoticeThemeRageItem>;
 };
 export interface NoticeSchema extends SchemaBasicImplement {
-  editData: [
+  editData: Array<NoticeEditItem<NoticeKeyType>>;
-    NoticeEditItem<'text'>,
-    NoticeEditItem<'speed'>,
-    NoticeEditItem<'theme'>,
-    NoticeEditItem<'isClose'>,
-  ];
   config: NoticeConfigType;
 }
 
@@ -202,12 +179,7 @@ export type QRCodeEditItem<T extends QRCodeKeyType> = {
 };
 
 export interface QRCodeSchema extends SchemaBasicImplement {
-  editData: [
+  editData: Array<QRCodeEditItem<QRCodeKeyType>>;
-    QRCodeEditItem<'qrcode'>,
-    QRCodeEditItem<'text'>,
-    QRCodeEditItem<'color'>,
-    QRCodeEditItem<'fontSize'>,
-  ];
   config: QRCodeConfigType;
 }
 
@@ -233,14 +205,7 @@ export type FooterEditItem<T extends FooterKeyType> = {
 };
 
 export interface FooterSchema extends SchemaBasicImplement {
-  editData: [
+  editData: Array<FooterEditItem<FooterKeyType>>;
-    FooterEditItem<'bgColor'>,
-    FooterEditItem<'height'>,
-    FooterEditItem<'text'>,
-    FooterEditItem<'fontSize'>,
-    FooterEditItem<'color'>,
-    FooterEditItem<'align'>,
-  ];
   config: FooterConfigType;
 }
 
@@ -262,7 +227,7 @@ export type ImageEditItem<T extends ImageKeyType> = {
 };
 
 export interface ImageSchema extends SchemaBasicImplement {
-  editData: [ImageEditItem<'imgUrl'>, ImageEditItem<'round'>];
+  editData: Array<ImageEditItem<ImageKeyType>>;
   config: ImageConfigType;
 }
 
@@ -289,14 +254,7 @@ export type HeaderEditItem<T extends HeaderKeyType> = {
 };
 
 export interface HeaderSchema extends SchemaBasicImplement {
-  editData: [
+  editData: Array<HeaderEditItem<HeaderKeyType>>;
-    HeaderEditItem<'bgColor'>,
-    HeaderEditItem<'height'>,
-    HeaderEditItem<'logo'>,
-    HeaderEditItem<'logoText'>,
-    HeaderEditItem<'color'>,
-    HeaderEditItem<'fontSize'>,
-  ];
   config: HeaderConfigType;
 }
 
@@ -320,13 +278,7 @@ export type ListEditItem<T extends ListKeyType> = {
 };
 
 export interface ListSchema extends SchemaBasicImplement {
-  editData: [
+  editData: Array<ListEditItem<ListKeyType>>;
-    ListEditItem<'sourceData'>,
-    ListEditItem<'round'>,
-    ListEditItem<'imgSize'>,
-    ListEditItem<'fontSize'>,
-    ListEditItem<'color'>,
-  ];
   config: ListConfigType;
 }
 //__________________________________________
@@ -392,12 +344,7 @@ export type IconEditItem<T extends IconKeyType> = {
 };
 
 export interface IconSchema extends SchemaBasicImplement {
-  editData: [
+  editData: Array<IconEditItem<IconKeyType>>;
-    IconEditItem<'color'>,
-    IconEditItem<'size'>,
-    IconEditItem<'spin'>,
-    IconEditItem<'type'>,
-  ];
   config: IconConfigType;
 }
 
@@ -418,7 +365,7 @@ export type VideoEditItem<T extends VideoKeyType> = {
 };
 
 export interface VideoSchema extends SchemaBasicImplement {
-  editData: [VideoEditItem<'poster'>, VideoEditItem<'url'>];
+  editData: Array<VideoEditItem<VideoKeyType>>;
   config: VideoConfigType;
 }
 
@@ -444,13 +391,7 @@ export type XProgressEditItem<T extends XProgressKeyType> = {
 };
 
 export interface XProgressSchema extends SchemaBasicImplement {
-  editData: [
+  editData: Array<XProgressEditItem<XProgressKeyType>>;
-    XProgressEditItem<'theme'>,
-    XProgressEditItem<'shape'>,
-    XProgressEditItem<'size'>,
-    XProgressEditItem<'percent'>,
-    XProgressEditItem<'strokeWidth'>,
-  ];
   config: XProgressConfigType;
 }
 
@@ -472,20 +413,6 @@ export interface SchemaType extends SchemaImplement {
   XProgress: XProgressSchema;
 }
 
-export type UnionData<T extends keyof SchemaBasicImplement> =
-  | CarouselSchema[T]
-  | TextSchema[T]
-  | TabSchema[T]
-  | NoticeSchema[T]
-  | QRCodeSchema[T]
-  | FooterSchema[T]
-  | ImageSchema[T]
-  | HeaderSchema[T]
-  | ListSchema[T]
-  | IconSchema[T]
-  | VideoSchema[T]
-  | XProgressSchema[T];
-
 const schema: SchemaType = {
   Carousel: {
     editData: [

src/components/FormEditor/index.tsx

@@ -6,7 +6,7 @@ import MutiText from '../MutiText';
 import Color from '../Color';
 import CardPicker from '../CardPicker';
 import { Store } from 'antd/lib/form/interface';
-import { UnionData, BasicRangeType, IconSchema } from '../DynamicEngine/schema';
+import { BasicRangeType, IconSchema } from '../DynamicEngine/schema';
 // import styles from './index.less';
 const normFile = (e: any) => {
   console.log('Upload event:', e);
@@ -34,7 +34,6 @@ interface FormEditorProps {
 
 const FormEditor = (props: FormEditorProps) => {
   const { config, defaultValue, onSave, onDel, uid } = props;
-  console.log(config, defaultValue, uid);
   const onFinish = (values: Store) => {
     onSave && onSave(values);
   };