diff --git a/src/core/FormComponents/CardPicker/index.less b/src/components/FormComponents/CardPicker/index.less similarity index 100% rename from src/core/FormComponents/CardPicker/index.less rename to src/components/FormComponents/CardPicker/index.less diff --git a/src/core/FormComponents/CardPicker/index.tsx b/src/components/FormComponents/CardPicker/index.tsx similarity index 100% rename from src/core/FormComponents/CardPicker/index.tsx rename to src/components/FormComponents/CardPicker/index.tsx diff --git a/src/core/FormComponents/Color/index.tsx b/src/components/FormComponents/Color/index.tsx similarity index 100% rename from src/core/FormComponents/Color/index.tsx rename to src/components/FormComponents/Color/index.tsx diff --git a/src/core/FormComponents/DataList/editorModal.tsx b/src/components/FormComponents/DataList/editorModal.tsx similarity index 100% rename from src/core/FormComponents/DataList/editorModal.tsx rename to src/components/FormComponents/DataList/editorModal.tsx diff --git a/src/core/FormComponents/DataList/index.less b/src/components/FormComponents/DataList/index.less similarity index 100% rename from src/core/FormComponents/DataList/index.less rename to src/components/FormComponents/DataList/index.less diff --git a/src/core/FormComponents/DataList/index.tsx b/src/components/FormComponents/DataList/index.tsx similarity index 100% rename from src/core/FormComponents/DataList/index.tsx rename to src/components/FormComponents/DataList/index.tsx diff --git a/src/core/FormComponents/FormItems/EditorModal.tsx b/src/components/FormComponents/FormItems/EditorModal.tsx similarity index 100% rename from src/core/FormComponents/FormItems/EditorModal.tsx rename to src/components/FormComponents/FormItems/EditorModal.tsx diff --git a/src/core/FormComponents/FormItems/FormItems.tsx b/src/components/FormComponents/FormItems/FormItems.tsx similarity index 100% rename from src/core/FormComponents/FormItems/FormItems.tsx rename to src/components/FormComponents/FormItems/FormItems.tsx diff --git a/src/core/FormComponents/FormItems/formItems.less b/src/components/FormComponents/FormItems/formItems.less similarity index 100% rename from src/core/FormComponents/FormItems/formItems.less rename to src/components/FormComponents/FormItems/formItems.less diff --git a/src/core/FormComponents/FormItems/index.tsx b/src/components/FormComponents/FormItems/index.tsx similarity index 100% rename from src/core/FormComponents/FormItems/index.tsx rename to src/components/FormComponents/FormItems/index.tsx diff --git a/src/core/FormComponents/MutiText/index.less b/src/components/FormComponents/MutiText/index.less similarity index 100% rename from src/core/FormComponents/MutiText/index.less rename to src/components/FormComponents/MutiText/index.less diff --git a/src/core/FormComponents/MutiText/index.tsx b/src/components/FormComponents/MutiText/index.tsx similarity index 100% rename from src/core/FormComponents/MutiText/index.tsx rename to src/components/FormComponents/MutiText/index.tsx diff --git a/src/core/FormComponents/Pos/index.less b/src/components/FormComponents/Pos/index.less similarity index 100% rename from src/core/FormComponents/Pos/index.less rename to src/components/FormComponents/Pos/index.less diff --git a/src/core/FormComponents/Pos/index.tsx b/src/components/FormComponents/Pos/index.tsx similarity index 100% rename from src/core/FormComponents/Pos/index.tsx rename to src/components/FormComponents/Pos/index.tsx diff --git a/src/core/FormComponents/Table/index.less b/src/components/FormComponents/Table/index.less similarity index 100% rename from src/core/FormComponents/Table/index.less rename to src/components/FormComponents/Table/index.less diff --git a/src/core/FormComponents/Table/index.tsx b/src/components/FormComponents/Table/index.tsx similarity index 100% rename from src/core/FormComponents/Table/index.tsx rename to src/components/FormComponents/Table/index.tsx diff --git a/src/core/FormComponents/Upload/index.less b/src/components/FormComponents/Upload/index.less similarity index 100% rename from src/core/FormComponents/Upload/index.less rename to src/components/FormComponents/Upload/index.less diff --git a/src/core/FormComponents/Upload/index.tsx b/src/components/FormComponents/Upload/index.tsx similarity index 100% rename from src/core/FormComponents/Upload/index.tsx rename to src/components/FormComponents/Upload/index.tsx diff --git a/src/core/FormComponents/XEditor/index.less b/src/components/FormComponents/XEditor/index.less similarity index 100% rename from src/core/FormComponents/XEditor/index.less rename to src/components/FormComponents/XEditor/index.less diff --git a/src/core/FormComponents/XEditor/index.tsx b/src/components/FormComponents/XEditor/index.tsx similarity index 100% rename from src/core/FormComponents/XEditor/index.tsx rename to src/components/FormComponents/XEditor/index.tsx diff --git a/src/core/FormComponents/types.ts b/src/components/FormComponents/types.ts similarity index 100% rename from src/core/FormComponents/types.ts rename to src/components/FormComponents/types.ts diff --git a/src/core/renderer/FormRender.tsx b/src/core/renderer/FormRender.tsx index 75ea83d..9e96096 100644 --- a/src/core/renderer/FormRender.tsx +++ b/src/core/renderer/FormRender.tsx @@ -1,15 +1,15 @@ import React, { memo, RefObject, useEffect } from 'react'; import { Form, Select, InputNumber, Input, Switch, Radio } from 'antd'; -import Upload from '../FormComponents/Upload'; -import DataList from '../FormComponents/DataList'; -import MutiText from '../FormComponents/MutiText'; -import Color from '../FormComponents/Color'; -import CardPicker from '../FormComponents/CardPicker'; -import Table from '../FormComponents/Table'; -import Pos from '../FormComponents/Pos'; +import Upload from '../../components/FormComponents/Upload'; +import DataList from '../../components/FormComponents/DataList'; +import MutiText from '../../components/FormComponents/MutiText'; +import Color from '../../components/FormComponents/Color'; +import CardPicker from '../../components/FormComponents/CardPicker'; +import Table from '../../components/FormComponents/Table'; +import Pos from '../../components/FormComponents/Pos'; import { Store } from 'antd/lib/form/interface'; -import RichText from '../FormComponents/XEditor'; -import FormItems from '../FormComponents/FormItems'; +import RichText from '../../components/FormComponents/XEditor'; +import FormItems from '../../components/FormComponents/FormItems'; const normFile = (e: any) => { console.log('Upload event:', e); if (Array.isArray(e)) { diff --git a/src/materials/ShopComponents/CardLabel/schema.ts b/src/materials/ShopComponents/CardLabel/schema.ts index fba972f..be265ec 100644 --- a/src/materials/ShopComponents/CardLabel/schema.ts +++ b/src/materials/ShopComponents/CardLabel/schema.ts @@ -9,7 +9,7 @@ import { TNumberDefaultType, TTextDefaultType, TUploadDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; import { serverUrl } from '@/utils/tool'; diff --git a/src/materials/ShopComponents/Coupons/schema.ts b/src/materials/ShopComponents/Coupons/schema.ts index 0169173..1f55f4b 100644 --- a/src/materials/ShopComponents/Coupons/schema.ts +++ b/src/materials/ShopComponents/Coupons/schema.ts @@ -11,7 +11,7 @@ import { TUploadDefaultType, TTextAreaDefaultType, TRichTextDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; import { serverUrl } from '@/utils/tool'; diff --git a/src/materials/ShopComponents/List/schema.ts b/src/materials/ShopComponents/List/schema.ts index 05eb371..9bb9fb7 100644 --- a/src/materials/ShopComponents/List/schema.ts +++ b/src/materials/ShopComponents/List/schema.ts @@ -9,7 +9,7 @@ import { TNumberDefaultType, TSelectDefaultType, TSwitchDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; import { serverUrl } from '@/utils/tool'; diff --git a/src/materials/ShopComponents/Tab/schema.ts b/src/materials/ShopComponents/Tab/schema.ts index bae755a..290e128 100644 --- a/src/materials/ShopComponents/Tab/schema.ts +++ b/src/materials/ShopComponents/Tab/schema.ts @@ -7,7 +7,7 @@ import { TDataListDefaultType, TMutiTextDefaultType, TNumberDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; import { serverUrl } from '@/utils/tool'; diff --git a/src/materials/ShopComponents/ZhuanLan/schema.ts b/src/materials/ShopComponents/ZhuanLan/schema.ts index bdd8a3a..9b8b4b0 100644 --- a/src/materials/ShopComponents/ZhuanLan/schema.ts +++ b/src/materials/ShopComponents/ZhuanLan/schema.ts @@ -11,7 +11,7 @@ import { TUploadDefaultType, TTextAreaDefaultType, TRichTextDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; import { serverUrl } from '@/utils/tool'; diff --git a/src/materials/base/Carousel/schema.ts b/src/materials/base/Carousel/schema.ts index cf0c9da..723e9b4 100644 --- a/src/materials/base/Carousel/schema.ts +++ b/src/materials/base/Carousel/schema.ts @@ -7,7 +7,7 @@ import { TRadioDefaultType, TSwitchDefaultType, TNumberDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; import { serverUrl } from '@/utils/tool'; diff --git a/src/materials/base/Footer/schema.ts b/src/materials/base/Footer/schema.ts index b01389f..8c6f432 100644 --- a/src/materials/base/Footer/schema.ts +++ b/src/materials/base/Footer/schema.ts @@ -7,7 +7,7 @@ import { TNumberDefaultType, TSelectDefaultType, TTextDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; import { baseConfig, baseDefault, ICommonBaseType } from '../../common'; export type TfooterSelectKeyType = 'left' | 'center' | 'right'; diff --git a/src/materials/base/Form/schema.ts b/src/materials/base/Form/schema.ts index 17c5828..2bbb128 100644 --- a/src/materials/base/Form/schema.ts +++ b/src/materials/base/Form/schema.ts @@ -9,7 +9,7 @@ import { TSelectDefaultType, ISelectConfigType, TTextDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; export type TTextWeightSelectKeyType = '300' | '400' | '500' | '600'; diff --git a/src/materials/base/Header/schema.ts b/src/materials/base/Header/schema.ts index b3ded9c..c981d55 100644 --- a/src/materials/base/Header/schema.ts +++ b/src/materials/base/Header/schema.ts @@ -7,7 +7,7 @@ import { TNumberDefaultType, TTextDefaultType, TUploadDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; import { baseConfig, baseDefault, ICommonBaseType } from '../../common'; export type THeaderEditData = Array< diff --git a/src/materials/base/Icon/schema.ts b/src/materials/base/Icon/schema.ts index e1215c8..ec19230 100644 --- a/src/materials/base/Icon/schema.ts +++ b/src/materials/base/Icon/schema.ts @@ -9,7 +9,7 @@ import { TNumberDefaultType, TSwitchDefaultType, TTextDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; export type TIconEditData = Array< | IColorConfigType diff --git a/src/materials/base/Image/schema.ts b/src/materials/base/Image/schema.ts index d11ddad..edc9906 100644 --- a/src/materials/base/Image/schema.ts +++ b/src/materials/base/Image/schema.ts @@ -11,7 +11,7 @@ import { TPosDefaultType, TTextDefaultType, ITextConfigType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; import { baseConfig, baseDefault, ICommonBaseType } from '../../common'; export type TTextSelectKeyType = 'left' | 'right' | 'center'; diff --git a/src/materials/base/List/schema.ts b/src/materials/base/List/schema.ts index 9529122..3c1e4c5 100644 --- a/src/materials/base/List/schema.ts +++ b/src/materials/base/List/schema.ts @@ -7,7 +7,7 @@ import { TDataListDefaultType, TNumberDefaultType, TSelectDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; import { baseConfig, baseDefault, ICommonBaseType } from '../../common'; export type TListSelectKeyType = '60' | '80' | '100' | '120' | '150'; export type TListEditData = Array< diff --git a/src/materials/base/LongText/schema.ts b/src/materials/base/LongText/schema.ts index 1a2af73..ad2a11f 100644 --- a/src/materials/base/LongText/schema.ts +++ b/src/materials/base/LongText/schema.ts @@ -7,7 +7,7 @@ import { TNumberDefaultType, TSelectDefaultType, TTextAreaDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; export type TLongTextSelectKeyType = 'left' | 'center' | 'right'; export type TLongTextEditData = Array< diff --git a/src/materials/base/Notice/schema.ts b/src/materials/base/Notice/schema.ts index c294503..fb1b0d1 100644 --- a/src/materials/base/Notice/schema.ts +++ b/src/materials/base/Notice/schema.ts @@ -7,7 +7,7 @@ import { TSelectDefaultType, TSwitchDefaultType, TTextDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; export type TNoticeSelectKeyType = 'default' | 'warning' | 'primary' | 'success' | 'danger'; export type TNoticeEditData = Array< diff --git a/src/materials/base/Qrcode/schema.ts b/src/materials/base/Qrcode/schema.ts index ab9dfbb..8d53557 100644 --- a/src/materials/base/Qrcode/schema.ts +++ b/src/materials/base/Qrcode/schema.ts @@ -7,7 +7,7 @@ import { TNumberDefaultType, TTextDefaultType, TUploadDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; export type TQrcodeEditData = Array< IUploadConfigType | ITextConfigType | IColorConfigType | INumberConfigType diff --git a/src/materials/base/RichText/schema.ts b/src/materials/base/RichText/schema.ts index d6f088a..b06166f 100644 --- a/src/materials/base/RichText/schema.ts +++ b/src/materials/base/RichText/schema.ts @@ -7,7 +7,7 @@ import { TTextDefaultType, IRichTextConfigType, TRichTextDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; export type TButtonEditData = Array< ITextConfigType | IColorConfigType | INumberConfigType | IRichTextConfigType diff --git a/src/materials/base/Tab/schema.ts b/src/materials/base/Tab/schema.ts index 6c147dd..02e443f 100644 --- a/src/materials/base/Tab/schema.ts +++ b/src/materials/base/Tab/schema.ts @@ -7,7 +7,7 @@ import { TDataListDefaultType, TMutiTextDefaultType, TNumberDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; export type TTabEditData = Array< IMutiTextConfigType | IColorConfigType | INumberConfigType | IDataListConfigType diff --git a/src/materials/base/Text/schema.ts b/src/materials/base/Text/schema.ts index cbbea30..d078aed 100644 --- a/src/materials/base/Text/schema.ts +++ b/src/materials/base/Text/schema.ts @@ -7,7 +7,7 @@ import { TNumberDefaultType, TSelectDefaultType, TTextDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; export type TTextSelectKeyType = 'left' | 'right' | 'center'; export type TTextEditData = Array< diff --git a/src/materials/base/WhiteTpl/schema.ts b/src/materials/base/WhiteTpl/schema.ts index 26a63c9..aa991b4 100644 --- a/src/materials/base/WhiteTpl/schema.ts +++ b/src/materials/base/WhiteTpl/schema.ts @@ -5,7 +5,7 @@ import { TColorDefaultType, TNumberDefaultType, TTextDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; export type TWhiteTplEditData = Array; export interface IWhiteTplConfig { diff --git a/src/materials/media/Audio/schema.ts b/src/materials/media/Audio/schema.ts index 3ae315b..4a7bc52 100644 --- a/src/materials/media/Audio/schema.ts +++ b/src/materials/media/Audio/schema.ts @@ -3,7 +3,7 @@ import { INumberConfigType, TTextDefaultType, TNumberDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; export type TAudioEditData = Array; export interface IAudioConfig { diff --git a/src/materials/media/Calendar/schema.ts b/src/materials/media/Calendar/schema.ts index d1c50e1..8428b98 100644 --- a/src/materials/media/Calendar/schema.ts +++ b/src/materials/media/Calendar/schema.ts @@ -4,7 +4,7 @@ import { TTextDefaultType, TNumberDefaultType, IColorConfigType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; export type TCalendarEditData = Array; export interface ICalendarConfig { diff --git a/src/materials/media/Map/schema.ts b/src/materials/media/Map/schema.ts index bcdd459..e8e5e45 100644 --- a/src/materials/media/Map/schema.ts +++ b/src/materials/media/Map/schema.ts @@ -5,7 +5,7 @@ import { TTextDefaultType, TPosDefaultType, TTextAreaDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; export type TMapEditData = Array; export interface IMapConfig { diff --git a/src/materials/media/Video/schema.ts b/src/materials/media/Video/schema.ts index bdfb3eb..cdb5bd7 100644 --- a/src/materials/media/Video/schema.ts +++ b/src/materials/media/Video/schema.ts @@ -3,7 +3,7 @@ import { IUploadConfigType, TTextDefaultType, TUploadDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; export type TVideoEditData = Array; export interface IVideoConfig { diff --git a/src/materials/visual/Area/schema.ts b/src/materials/visual/Area/schema.ts index 0fc7926..aff9675 100644 --- a/src/materials/visual/Area/schema.ts +++ b/src/materials/visual/Area/schema.ts @@ -7,7 +7,7 @@ import { TNumberDefaultType, TTableDefaultType, TTextDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; export type TChartEditData = Array< ITextConfigType | INumberConfigType | IColorConfigType | ITableConfigType diff --git a/src/materials/visual/Chart/schema.ts b/src/materials/visual/Chart/schema.ts index cd82c91..13b2d64 100644 --- a/src/materials/visual/Chart/schema.ts +++ b/src/materials/visual/Chart/schema.ts @@ -7,7 +7,7 @@ import { TNumberDefaultType, TTableDefaultType, TTextDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; export type TChartEditData = Array< ITextConfigType | INumberConfigType | IColorConfigType | ITableConfigType diff --git a/src/materials/visual/Line/schema.ts b/src/materials/visual/Line/schema.ts index cdd2b89..0bd8124 100644 --- a/src/materials/visual/Line/schema.ts +++ b/src/materials/visual/Line/schema.ts @@ -7,7 +7,7 @@ import { TNumberDefaultType, TTableDefaultType, TTextDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; export type TChartEditData = Array< ITextConfigType | INumberConfigType | IColorConfigType | ITableConfigType diff --git a/src/materials/visual/Pie/schema.ts b/src/materials/visual/Pie/schema.ts index 4178b00..3d7724c 100644 --- a/src/materials/visual/Pie/schema.ts +++ b/src/materials/visual/Pie/schema.ts @@ -7,7 +7,7 @@ import { TNumberDefaultType, TTableDefaultType, TTextDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; export type TChartEditData = Array< ITextConfigType | INumberConfigType | IColorConfigType | ITableConfigType diff --git a/src/materials/visual/XProgress/schema.ts b/src/materials/visual/XProgress/schema.ts index 79f8da3..6b88ca7 100644 --- a/src/materials/visual/XProgress/schema.ts +++ b/src/materials/visual/XProgress/schema.ts @@ -5,7 +5,7 @@ import { TNumberDefaultType, TRadioDefaultType, TSelectDefaultType, -} from '@/core/FormComponents/types'; +} from '@/components/FormComponents/types'; export type TXProgressSelectKeyType = 'success' | 'warning' | 'danger'; export type TXProgressRadiotKeyType = 'circle' | 'line' | 'semi-circle'; export type TXProgressEditData = Array<