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 88%
rename from src/core/FormComponents/CardPicker/index.tsx
rename to src/components/FormComponents/CardPicker/index.tsx
index 9ba1293..ce50d45 100644
--- a/src/core/FormComponents/CardPicker/index.tsx
+++ b/src/components/FormComponents/CardPicker/index.tsx
@@ -1,9 +1,9 @@
 import { useState, useEffect, memo } from 'react';
 import classnames from 'classnames';
-import Icon from '@/components/BasicShop/BasicComponents/Icon';
+import Icon from '@/materials/base/Icon';
 import styles from './index.less';
 import React from 'react';
-import { IconTypes } from '@/components/BasicShop/BasicComponents/Icon/schema';
+import { IconTypes } from '@/materials/base/Icon/schema';
 import { ICardPickerConfigType } from '../types';
 
 interface CardPickerType extends Omit<ICardPickerConfigType<IconTypes>, 'type' | 'key' | 'name'> {
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 97%
rename from src/core/FormComponents/FormItems/FormItems.tsx
rename to src/components/FormComponents/FormItems/FormItems.tsx
index 8368d36..ff03f97 100644
--- a/src/core/FormComponents/FormItems/FormItems.tsx
+++ b/src/components/FormComponents/FormItems/FormItems.tsx
@@ -1,6 +1,6 @@
 import React, { memo, RefObject, useCallback, useEffect, useState } from 'react';
-import BaseForm from '@/components/BasicShop/BasicComponents/Form/BaseForm';
-import BasePopoverForm from '@/components/BasicShop/BasicComponents/Form/BasePopoverForm';
+import BaseForm from '@/materials/base/Form/BaseForm';
+import BasePopoverForm from '@/materials/base/Form/BasePopoverForm';
 import EditorModal from './EditorModal';
 import { MinusCircleFilled, EditFilled, PlusOutlined } from '@ant-design/icons';
 import styles from './formItems.less';
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/DynamicEngine.tsx b/src/core/DynamicEngine.tsx
index 29d6689..d514fda 100644
--- a/src/core/DynamicEngine.tsx
+++ b/src/core/DynamicEngine.tsx
@@ -8,18 +8,8 @@ export type componentsType = 'media' | 'base' | 'visible';
 const DynamicFunc = (type: string, componentsType: string) => {
   return dynamic({
     loader: async function() {
-      let Component: FC<{ isTpl: boolean }>;
-
-      if (componentsType === 'base') {
-        const { default: Graph } = await import(`@/components/BasicShop/BasicComponents/${type}`);
-        Component = Graph;
-      } else if (componentsType === 'media') {
-        const { default: Graph } = await import(`@/components/BasicShop/MediaComponents/${type}`);
-        Component = Graph;
-      } else {
-        const { default: Graph } = await import(`@/components/BasicShop/VisualComponents/${type}`);
-        Component = Graph;
-      }
+      const { default: Graph } = await import(`@/materials/${componentsType}/${type}`);
+      const Component = Graph;
       return (props: DynamicType) => {
         const { config, isTpl } = props;
         return <Component {...config} isTpl={isTpl} />;
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/components/BasicShop/ShopComponents/CardLabel/index.less b/src/materials/ShopComponents/CardLabel/index.less
similarity index 100%
rename from src/components/BasicShop/ShopComponents/CardLabel/index.less
rename to src/materials/ShopComponents/CardLabel/index.less
diff --git a/src/components/BasicShop/ShopComponents/CardLabel/index.tsx b/src/materials/ShopComponents/CardLabel/index.tsx
similarity index 100%
rename from src/components/BasicShop/ShopComponents/CardLabel/index.tsx
rename to src/materials/ShopComponents/CardLabel/index.tsx
diff --git a/src/components/BasicShop/ShopComponents/CardLabel/schema.ts b/src/materials/ShopComponents/CardLabel/schema.ts
similarity index 97%
rename from src/components/BasicShop/ShopComponents/CardLabel/schema.ts
rename to src/materials/ShopComponents/CardLabel/schema.ts
index fba972f..be265ec 100644
--- a/src/components/BasicShop/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/components/BasicShop/ShopComponents/CardLabel/template.ts b/src/materials/ShopComponents/CardLabel/template.ts
similarity index 100%
rename from src/components/BasicShop/ShopComponents/CardLabel/template.ts
rename to src/materials/ShopComponents/CardLabel/template.ts
diff --git a/src/components/BasicShop/ShopComponents/Coupons/index.less b/src/materials/ShopComponents/Coupons/index.less
similarity index 100%
rename from src/components/BasicShop/ShopComponents/Coupons/index.less
rename to src/materials/ShopComponents/Coupons/index.less
diff --git a/src/components/BasicShop/ShopComponents/Coupons/index.tsx b/src/materials/ShopComponents/Coupons/index.tsx
similarity index 100%
rename from src/components/BasicShop/ShopComponents/Coupons/index.tsx
rename to src/materials/ShopComponents/Coupons/index.tsx
diff --git a/src/components/BasicShop/ShopComponents/Coupons/schema.ts b/src/materials/ShopComponents/Coupons/schema.ts
similarity index 97%
rename from src/components/BasicShop/ShopComponents/Coupons/schema.ts
rename to src/materials/ShopComponents/Coupons/schema.ts
index 0169173..1f55f4b 100644
--- a/src/components/BasicShop/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/components/BasicShop/ShopComponents/Coupons/template.ts b/src/materials/ShopComponents/Coupons/template.ts
similarity index 100%
rename from src/components/BasicShop/ShopComponents/Coupons/template.ts
rename to src/materials/ShopComponents/Coupons/template.ts
diff --git a/src/components/BasicShop/ShopComponents/List/index.less b/src/materials/ShopComponents/List/index.less
similarity index 100%
rename from src/components/BasicShop/ShopComponents/List/index.less
rename to src/materials/ShopComponents/List/index.less
diff --git a/src/components/BasicShop/ShopComponents/List/index.tsx b/src/materials/ShopComponents/List/index.tsx
similarity index 100%
rename from src/components/BasicShop/ShopComponents/List/index.tsx
rename to src/materials/ShopComponents/List/index.tsx
diff --git a/src/components/BasicShop/ShopComponents/List/schema.ts b/src/materials/ShopComponents/List/schema.ts
similarity index 98%
rename from src/components/BasicShop/ShopComponents/List/schema.ts
rename to src/materials/ShopComponents/List/schema.ts
index 05eb371..9bb9fb7 100644
--- a/src/components/BasicShop/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/components/BasicShop/BasicComponents/List/template.ts b/src/materials/ShopComponents/List/template.ts
similarity index 100%
rename from src/components/BasicShop/BasicComponents/List/template.ts
rename to src/materials/ShopComponents/List/template.ts
diff --git a/src/components/BasicShop/ShopComponents/Tab/index.less b/src/materials/ShopComponents/Tab/index.less
similarity index 100%
rename from src/components/BasicShop/ShopComponents/Tab/index.less
rename to src/materials/ShopComponents/Tab/index.less
diff --git a/src/components/BasicShop/ShopComponents/Tab/index.tsx b/src/materials/ShopComponents/Tab/index.tsx
similarity index 100%
rename from src/components/BasicShop/ShopComponents/Tab/index.tsx
rename to src/materials/ShopComponents/Tab/index.tsx
diff --git a/src/components/BasicShop/ShopComponents/Tab/schema.ts b/src/materials/ShopComponents/Tab/schema.ts
similarity index 98%
rename from src/components/BasicShop/ShopComponents/Tab/schema.ts
rename to src/materials/ShopComponents/Tab/schema.ts
index bae755a..290e128 100644
--- a/src/components/BasicShop/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/components/BasicShop/BasicComponents/Tab/template.ts b/src/materials/ShopComponents/Tab/template.ts
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Tab/template.ts
rename to src/materials/ShopComponents/Tab/template.ts
diff --git a/src/components/BasicShop/ShopComponents/ZhuanLan/index.less b/src/materials/ShopComponents/ZhuanLan/index.less
similarity index 100%
rename from src/components/BasicShop/ShopComponents/ZhuanLan/index.less
rename to src/materials/ShopComponents/ZhuanLan/index.less
diff --git a/src/components/BasicShop/ShopComponents/ZhuanLan/index.tsx b/src/materials/ShopComponents/ZhuanLan/index.tsx
similarity index 100%
rename from src/components/BasicShop/ShopComponents/ZhuanLan/index.tsx
rename to src/materials/ShopComponents/ZhuanLan/index.tsx
diff --git a/src/components/BasicShop/ShopComponents/ZhuanLan/schema.ts b/src/materials/ShopComponents/ZhuanLan/schema.ts
similarity index 98%
rename from src/components/BasicShop/ShopComponents/ZhuanLan/schema.ts
rename to src/materials/ShopComponents/ZhuanLan/schema.ts
index bdd8a3a..9b8b4b0 100644
--- a/src/components/BasicShop/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/components/BasicShop/ShopComponents/ZhuanLan/template.ts b/src/materials/ShopComponents/ZhuanLan/template.ts
similarity index 100%
rename from src/components/BasicShop/ShopComponents/ZhuanLan/template.ts
rename to src/materials/ShopComponents/ZhuanLan/template.ts
diff --git a/src/components/BasicShop/ShopComponents/schema.ts b/src/materials/ShopComponents/schema.ts
similarity index 100%
rename from src/components/BasicShop/ShopComponents/schema.ts
rename to src/materials/ShopComponents/schema.ts
diff --git a/src/components/BasicShop/ShopComponents/template.ts b/src/materials/ShopComponents/template.ts
similarity index 100%
rename from src/components/BasicShop/ShopComponents/template.ts
rename to src/materials/ShopComponents/template.ts
diff --git a/src/components/BasicShop/BasicComponents/Carousel/index.less b/src/materials/base/Carousel/index.less
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Carousel/index.less
rename to src/materials/base/Carousel/index.less
diff --git a/src/components/BasicShop/BasicComponents/Carousel/index.tsx b/src/materials/base/Carousel/index.tsx
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Carousel/index.tsx
rename to src/materials/base/Carousel/index.tsx
diff --git a/src/components/BasicShop/BasicComponents/Carousel/schema.ts b/src/materials/base/Carousel/schema.ts
similarity index 98%
rename from src/components/BasicShop/BasicComponents/Carousel/schema.ts
rename to src/materials/base/Carousel/schema.ts
index cf0c9da..723e9b4 100644
--- a/src/components/BasicShop/BasicComponents/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/components/BasicShop/BasicComponents/Carousel/template.ts b/src/materials/base/Carousel/template.ts
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Carousel/template.ts
rename to src/materials/base/Carousel/template.ts
diff --git a/src/components/BasicShop/BasicComponents/Footer/index.tsx b/src/materials/base/Footer/index.tsx
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Footer/index.tsx
rename to src/materials/base/Footer/index.tsx
diff --git a/src/components/BasicShop/BasicComponents/Footer/schema.ts b/src/materials/base/Footer/schema.ts
similarity index 97%
rename from src/components/BasicShop/BasicComponents/Footer/schema.ts
rename to src/materials/base/Footer/schema.ts
index b01389f..8c6f432 100644
--- a/src/components/BasicShop/BasicComponents/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/components/BasicShop/BasicComponents/Footer/template.ts b/src/materials/base/Footer/template.ts
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Footer/template.ts
rename to src/materials/base/Footer/template.ts
diff --git a/src/components/BasicShop/BasicComponents/Form/BaseForm.tsx b/src/materials/base/Form/BaseForm.tsx
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Form/BaseForm.tsx
rename to src/materials/base/Form/BaseForm.tsx
diff --git a/src/components/BasicShop/BasicComponents/Form/BasePopoverForm.tsx b/src/materials/base/Form/BasePopoverForm.tsx
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Form/BasePopoverForm.tsx
rename to src/materials/base/Form/BasePopoverForm.tsx
diff --git a/src/components/BasicShop/BasicComponents/Form/baseForm.less b/src/materials/base/Form/baseForm.less
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Form/baseForm.less
rename to src/materials/base/Form/baseForm.less
diff --git a/src/components/BasicShop/BasicComponents/Form/index.less b/src/materials/base/Form/index.less
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Form/index.less
rename to src/materials/base/Form/index.less
diff --git a/src/components/BasicShop/BasicComponents/Form/index.tsx b/src/materials/base/Form/index.tsx
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Form/index.tsx
rename to src/materials/base/Form/index.tsx
diff --git a/src/components/BasicShop/BasicComponents/Form/schema.ts b/src/materials/base/Form/schema.ts
similarity index 98%
rename from src/components/BasicShop/BasicComponents/Form/schema.ts
rename to src/materials/base/Form/schema.ts
index 17c5828..2bbb128 100644
--- a/src/components/BasicShop/BasicComponents/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/components/BasicShop/BasicComponents/Form/template.ts b/src/materials/base/Form/template.ts
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Form/template.ts
rename to src/materials/base/Form/template.ts
diff --git a/src/components/BasicShop/BasicComponents/Header/index.less b/src/materials/base/Header/index.less
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Header/index.less
rename to src/materials/base/Header/index.less
diff --git a/src/components/BasicShop/BasicComponents/Header/index.tsx b/src/materials/base/Header/index.tsx
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Header/index.tsx
rename to src/materials/base/Header/index.tsx
diff --git a/src/components/BasicShop/BasicComponents/Header/schema.ts b/src/materials/base/Header/schema.ts
similarity index 97%
rename from src/components/BasicShop/BasicComponents/Header/schema.ts
rename to src/materials/base/Header/schema.ts
index b3ded9c..c981d55 100644
--- a/src/components/BasicShop/BasicComponents/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/components/BasicShop/BasicComponents/Header/template.ts b/src/materials/base/Header/template.ts
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Header/template.ts
rename to src/materials/base/Header/template.ts
diff --git a/src/components/BasicShop/BasicComponents/Icon/icon.ts b/src/materials/base/Icon/icon.ts
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Icon/icon.ts
rename to src/materials/base/Icon/icon.ts
diff --git a/src/components/BasicShop/BasicComponents/Icon/index.tsx b/src/materials/base/Icon/index.tsx
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Icon/index.tsx
rename to src/materials/base/Icon/index.tsx
diff --git a/src/components/BasicShop/BasicComponents/Icon/schema.ts b/src/materials/base/Icon/schema.ts
similarity index 98%
rename from src/components/BasicShop/BasicComponents/Icon/schema.ts
rename to src/materials/base/Icon/schema.ts
index e1215c8..ec19230 100644
--- a/src/components/BasicShop/BasicComponents/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/components/BasicShop/BasicComponents/Icon/template.ts b/src/materials/base/Icon/template.ts
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Icon/template.ts
rename to src/materials/base/Icon/template.ts
diff --git a/src/components/BasicShop/BasicComponents/Image/index.tsx b/src/materials/base/Image/index.tsx
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Image/index.tsx
rename to src/materials/base/Image/index.tsx
diff --git a/src/components/BasicShop/BasicComponents/Image/schema.ts b/src/materials/base/Image/schema.ts
similarity index 98%
rename from src/components/BasicShop/BasicComponents/Image/schema.ts
rename to src/materials/base/Image/schema.ts
index d11ddad..edc9906 100644
--- a/src/components/BasicShop/BasicComponents/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/components/BasicShop/BasicComponents/Image/template.ts b/src/materials/base/Image/template.ts
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Image/template.ts
rename to src/materials/base/Image/template.ts
diff --git a/src/components/BasicShop/BasicComponents/List/index.less b/src/materials/base/List/index.less
similarity index 100%
rename from src/components/BasicShop/BasicComponents/List/index.less
rename to src/materials/base/List/index.less
diff --git a/src/components/BasicShop/BasicComponents/List/index.tsx b/src/materials/base/List/index.tsx
similarity index 100%
rename from src/components/BasicShop/BasicComponents/List/index.tsx
rename to src/materials/base/List/index.tsx
diff --git a/src/components/BasicShop/BasicComponents/List/schema.ts b/src/materials/base/List/schema.ts
similarity index 98%
rename from src/components/BasicShop/BasicComponents/List/schema.ts
rename to src/materials/base/List/schema.ts
index 9529122..3c1e4c5 100644
--- a/src/components/BasicShop/BasicComponents/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/components/BasicShop/ShopComponents/List/template.ts b/src/materials/base/List/template.ts
similarity index 100%
rename from src/components/BasicShop/ShopComponents/List/template.ts
rename to src/materials/base/List/template.ts
diff --git a/src/components/BasicShop/BasicComponents/LongText/index.tsx b/src/materials/base/LongText/index.tsx
similarity index 100%
rename from src/components/BasicShop/BasicComponents/LongText/index.tsx
rename to src/materials/base/LongText/index.tsx
diff --git a/src/components/BasicShop/BasicComponents/LongText/schema.ts b/src/materials/base/LongText/schema.ts
similarity index 98%
rename from src/components/BasicShop/BasicComponents/LongText/schema.ts
rename to src/materials/base/LongText/schema.ts
index 1a2af73..ad2a11f 100644
--- a/src/components/BasicShop/BasicComponents/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/components/BasicShop/BasicComponents/LongText/template.ts b/src/materials/base/LongText/template.ts
similarity index 100%
rename from src/components/BasicShop/BasicComponents/LongText/template.ts
rename to src/materials/base/LongText/template.ts
diff --git a/src/components/BasicShop/BasicComponents/Notice/index.tsx b/src/materials/base/Notice/index.tsx
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Notice/index.tsx
rename to src/materials/base/Notice/index.tsx
diff --git a/src/components/BasicShop/BasicComponents/Notice/schema.ts b/src/materials/base/Notice/schema.ts
similarity index 97%
rename from src/components/BasicShop/BasicComponents/Notice/schema.ts
rename to src/materials/base/Notice/schema.ts
index c294503..fb1b0d1 100644
--- a/src/components/BasicShop/BasicComponents/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/components/BasicShop/BasicComponents/Notice/template.ts b/src/materials/base/Notice/template.ts
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Notice/template.ts
rename to src/materials/base/Notice/template.ts
diff --git a/src/components/BasicShop/BasicComponents/Qrcode/index.tsx b/src/materials/base/Qrcode/index.tsx
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Qrcode/index.tsx
rename to src/materials/base/Qrcode/index.tsx
diff --git a/src/components/BasicShop/BasicComponents/Qrcode/schema.ts b/src/materials/base/Qrcode/schema.ts
similarity index 96%
rename from src/components/BasicShop/BasicComponents/Qrcode/schema.ts
rename to src/materials/base/Qrcode/schema.ts
index ab9dfbb..8d53557 100644
--- a/src/components/BasicShop/BasicComponents/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/components/BasicShop/BasicComponents/Qrcode/template.ts b/src/materials/base/Qrcode/template.ts
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Qrcode/template.ts
rename to src/materials/base/Qrcode/template.ts
diff --git a/src/components/BasicShop/BasicComponents/RichText/index.less b/src/materials/base/RichText/index.less
similarity index 100%
rename from src/components/BasicShop/BasicComponents/RichText/index.less
rename to src/materials/base/RichText/index.less
diff --git a/src/components/BasicShop/BasicComponents/RichText/index.tsx b/src/materials/base/RichText/index.tsx
similarity index 100%
rename from src/components/BasicShop/BasicComponents/RichText/index.tsx
rename to src/materials/base/RichText/index.tsx
diff --git a/src/components/BasicShop/BasicComponents/RichText/schema.ts b/src/materials/base/RichText/schema.ts
similarity index 96%
rename from src/components/BasicShop/BasicComponents/RichText/schema.ts
rename to src/materials/base/RichText/schema.ts
index d6f088a..b06166f 100644
--- a/src/components/BasicShop/BasicComponents/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/components/BasicShop/BasicComponents/RichText/template.ts b/src/materials/base/RichText/template.ts
similarity index 100%
rename from src/components/BasicShop/BasicComponents/RichText/template.ts
rename to src/materials/base/RichText/template.ts
diff --git a/src/components/BasicShop/BasicComponents/Tab/index.less b/src/materials/base/Tab/index.less
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Tab/index.less
rename to src/materials/base/Tab/index.less
diff --git a/src/components/BasicShop/BasicComponents/Tab/index.tsx b/src/materials/base/Tab/index.tsx
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Tab/index.tsx
rename to src/materials/base/Tab/index.tsx
diff --git a/src/components/BasicShop/BasicComponents/Tab/schema.ts b/src/materials/base/Tab/schema.ts
similarity index 98%
rename from src/components/BasicShop/BasicComponents/Tab/schema.ts
rename to src/materials/base/Tab/schema.ts
index 6c147dd..02e443f 100644
--- a/src/components/BasicShop/BasicComponents/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/components/BasicShop/ShopComponents/Tab/template.ts b/src/materials/base/Tab/template.ts
similarity index 100%
rename from src/components/BasicShop/ShopComponents/Tab/template.ts
rename to src/materials/base/Tab/template.ts
diff --git a/src/components/BasicShop/BasicComponents/Text/index.tsx b/src/materials/base/Text/index.tsx
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Text/index.tsx
rename to src/materials/base/Text/index.tsx
diff --git a/src/components/BasicShop/BasicComponents/Text/schema.ts b/src/materials/base/Text/schema.ts
similarity index 97%
rename from src/components/BasicShop/BasicComponents/Text/schema.ts
rename to src/materials/base/Text/schema.ts
index cbbea30..d078aed 100644
--- a/src/components/BasicShop/BasicComponents/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/components/BasicShop/BasicComponents/Text/template.ts b/src/materials/base/Text/template.ts
similarity index 100%
rename from src/components/BasicShop/BasicComponents/Text/template.ts
rename to src/materials/base/Text/template.ts
diff --git a/src/components/BasicShop/BasicComponents/WhiteTpl/index.less b/src/materials/base/WhiteTpl/index.less
similarity index 100%
rename from src/components/BasicShop/BasicComponents/WhiteTpl/index.less
rename to src/materials/base/WhiteTpl/index.less
diff --git a/src/components/BasicShop/BasicComponents/WhiteTpl/index.tsx b/src/materials/base/WhiteTpl/index.tsx
similarity index 100%
rename from src/components/BasicShop/BasicComponents/WhiteTpl/index.tsx
rename to src/materials/base/WhiteTpl/index.tsx
diff --git a/src/components/BasicShop/BasicComponents/WhiteTpl/schema.ts b/src/materials/base/WhiteTpl/schema.ts
similarity index 96%
rename from src/components/BasicShop/BasicComponents/WhiteTpl/schema.ts
rename to src/materials/base/WhiteTpl/schema.ts
index 26a63c9..aa991b4 100644
--- a/src/components/BasicShop/BasicComponents/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<IColorConfigType | INumberConfigType | ITextConfigType>;
 export interface IWhiteTplConfig {
diff --git a/src/components/BasicShop/BasicComponents/WhiteTpl/template.ts b/src/materials/base/WhiteTpl/template.ts
similarity index 100%
rename from src/components/BasicShop/BasicComponents/WhiteTpl/template.ts
rename to src/materials/base/WhiteTpl/template.ts
diff --git a/src/components/BasicShop/BasicComponents/schema.ts b/src/materials/base/schema.ts
similarity index 100%
rename from src/components/BasicShop/BasicComponents/schema.ts
rename to src/materials/base/schema.ts
diff --git a/src/components/BasicShop/BasicComponents/template.ts b/src/materials/base/template.ts
similarity index 100%
rename from src/components/BasicShop/BasicComponents/template.ts
rename to src/materials/base/template.ts
diff --git a/src/components/BasicShop/common.ts b/src/materials/common.ts
similarity index 100%
rename from src/components/BasicShop/common.ts
rename to src/materials/common.ts
diff --git a/src/components/BasicShop/MediaComponents/Audio/index.less b/src/materials/media/Audio/index.less
similarity index 100%
rename from src/components/BasicShop/MediaComponents/Audio/index.less
rename to src/materials/media/Audio/index.less
diff --git a/src/components/BasicShop/MediaComponents/Audio/index.tsx b/src/materials/media/Audio/index.tsx
similarity index 100%
rename from src/components/BasicShop/MediaComponents/Audio/index.tsx
rename to src/materials/media/Audio/index.tsx
diff --git a/src/components/BasicShop/MediaComponents/Audio/schema.ts b/src/materials/media/Audio/schema.ts
similarity index 93%
rename from src/components/BasicShop/MediaComponents/Audio/schema.ts
rename to src/materials/media/Audio/schema.ts
index 3ae315b..4a7bc52 100644
--- a/src/components/BasicShop/MediaComponents/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<INumberConfigType | ITextConfigType>;
 export interface IAudioConfig {
diff --git a/src/components/BasicShop/MediaComponents/Audio/template.ts b/src/materials/media/Audio/template.ts
similarity index 100%
rename from src/components/BasicShop/MediaComponents/Audio/template.ts
rename to src/materials/media/Audio/template.ts
diff --git a/src/components/BasicShop/MediaComponents/Calendar/index.less b/src/materials/media/Calendar/index.less
similarity index 100%
rename from src/components/BasicShop/MediaComponents/Calendar/index.less
rename to src/materials/media/Calendar/index.less
diff --git a/src/components/BasicShop/MediaComponents/Calendar/index.tsx b/src/materials/media/Calendar/index.tsx
similarity index 100%
rename from src/components/BasicShop/MediaComponents/Calendar/index.tsx
rename to src/materials/media/Calendar/index.tsx
diff --git a/src/components/BasicShop/MediaComponents/Calendar/schema.ts b/src/materials/media/Calendar/schema.ts
similarity index 96%
rename from src/components/BasicShop/MediaComponents/Calendar/schema.ts
rename to src/materials/media/Calendar/schema.ts
index d1c50e1..8428b98 100644
--- a/src/components/BasicShop/MediaComponents/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<INumberConfigType | ITextConfigType | IColorConfigType>;
 export interface ICalendarConfig {
diff --git a/src/components/BasicShop/MediaComponents/Calendar/template.ts b/src/materials/media/Calendar/template.ts
similarity index 100%
rename from src/components/BasicShop/MediaComponents/Calendar/template.ts
rename to src/materials/media/Calendar/template.ts
diff --git a/src/components/BasicShop/MediaComponents/Map/index.less b/src/materials/media/Map/index.less
similarity index 100%
rename from src/components/BasicShop/MediaComponents/Map/index.less
rename to src/materials/media/Map/index.less
diff --git a/src/components/BasicShop/MediaComponents/Map/index.tsx b/src/materials/media/Map/index.tsx
similarity index 100%
rename from src/components/BasicShop/MediaComponents/Map/index.tsx
rename to src/materials/media/Map/index.tsx
diff --git a/src/components/BasicShop/MediaComponents/Map/schema.ts b/src/materials/media/Map/schema.ts
similarity index 95%
rename from src/components/BasicShop/MediaComponents/Map/schema.ts
rename to src/materials/media/Map/schema.ts
index bcdd459..e8e5e45 100644
--- a/src/components/BasicShop/MediaComponents/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<ITextConfigType | ITextAreaConfigType | IPosConfigType>;
 export interface IMapConfig {
diff --git a/src/components/BasicShop/MediaComponents/Map/template.ts b/src/materials/media/Map/template.ts
similarity index 100%
rename from src/components/BasicShop/MediaComponents/Map/template.ts
rename to src/materials/media/Map/template.ts
diff --git a/src/components/BasicShop/MediaComponents/Video/index.css b/src/materials/media/Video/index.css
similarity index 100%
rename from src/components/BasicShop/MediaComponents/Video/index.css
rename to src/materials/media/Video/index.css
diff --git a/src/components/BasicShop/MediaComponents/Video/index.tsx b/src/materials/media/Video/index.tsx
similarity index 100%
rename from src/components/BasicShop/MediaComponents/Video/index.tsx
rename to src/materials/media/Video/index.tsx
diff --git a/src/components/BasicShop/MediaComponents/Video/schema.ts b/src/materials/media/Video/schema.ts
similarity index 94%
rename from src/components/BasicShop/MediaComponents/Video/schema.ts
rename to src/materials/media/Video/schema.ts
index bdfb3eb..cdb5bd7 100644
--- a/src/components/BasicShop/MediaComponents/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<IUploadConfigType | ITextConfigType>;
 export interface IVideoConfig {
diff --git a/src/components/BasicShop/MediaComponents/Video/template.ts b/src/materials/media/Video/template.ts
similarity index 100%
rename from src/components/BasicShop/MediaComponents/Video/template.ts
rename to src/materials/media/Video/template.ts
diff --git a/src/components/BasicShop/MediaComponents/schema.ts b/src/materials/media/schema.ts
similarity index 100%
rename from src/components/BasicShop/MediaComponents/schema.ts
rename to src/materials/media/schema.ts
diff --git a/src/components/BasicShop/MediaComponents/template.ts b/src/materials/media/template.ts
similarity index 100%
rename from src/components/BasicShop/MediaComponents/template.ts
rename to src/materials/media/template.ts
diff --git a/src/components/BasicShop/schema.ts b/src/materials/schema.ts
similarity index 51%
rename from src/components/BasicShop/schema.ts
rename to src/materials/schema.ts
index 9e2ea5a..c8da183 100644
--- a/src/components/BasicShop/schema.ts
+++ b/src/materials/schema.ts
@@ -1,6 +1,6 @@
-import BasicSchema from './BasicComponents/schema';
-import MediaSchema from './MediaComponents/schema';
-import VisualSchema from './VisualComponents/schema';
+import BasicSchema from './base/schema';
+import MediaSchema from './media/schema';
+import VisualSchema from './visual/schema';
 import shopSchema from './ShopComponents/schema';
 
 const schema = {
diff --git a/src/components/BasicShop/VisualComponents/Area/index.less b/src/materials/visual/Area/index.less
similarity index 100%
rename from src/components/BasicShop/VisualComponents/Area/index.less
rename to src/materials/visual/Area/index.less
diff --git a/src/components/BasicShop/VisualComponents/Area/index.tsx b/src/materials/visual/Area/index.tsx
similarity index 100%
rename from src/components/BasicShop/VisualComponents/Area/index.tsx
rename to src/materials/visual/Area/index.tsx
diff --git a/src/components/BasicShop/VisualComponents/Area/schema.ts b/src/materials/visual/Area/schema.ts
similarity index 96%
rename from src/components/BasicShop/VisualComponents/Area/schema.ts
rename to src/materials/visual/Area/schema.ts
index 0fc7926..aff9675 100644
--- a/src/components/BasicShop/VisualComponents/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/components/BasicShop/VisualComponents/Area/template.ts b/src/materials/visual/Area/template.ts
similarity index 100%
rename from src/components/BasicShop/VisualComponents/Area/template.ts
rename to src/materials/visual/Area/template.ts
diff --git a/src/components/BasicShop/VisualComponents/Chart/index.less b/src/materials/visual/Chart/index.less
similarity index 100%
rename from src/components/BasicShop/VisualComponents/Chart/index.less
rename to src/materials/visual/Chart/index.less
diff --git a/src/components/BasicShop/VisualComponents/Chart/index.tsx b/src/materials/visual/Chart/index.tsx
similarity index 100%
rename from src/components/BasicShop/VisualComponents/Chart/index.tsx
rename to src/materials/visual/Chart/index.tsx
diff --git a/src/components/BasicShop/VisualComponents/Chart/schema.ts b/src/materials/visual/Chart/schema.ts
similarity index 96%
rename from src/components/BasicShop/VisualComponents/Chart/schema.ts
rename to src/materials/visual/Chart/schema.ts
index cd82c91..13b2d64 100644
--- a/src/components/BasicShop/VisualComponents/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/components/BasicShop/VisualComponents/Chart/template.ts b/src/materials/visual/Chart/template.ts
similarity index 100%
rename from src/components/BasicShop/VisualComponents/Chart/template.ts
rename to src/materials/visual/Chart/template.ts
diff --git a/src/components/BasicShop/VisualComponents/Line/index.less b/src/materials/visual/Line/index.less
similarity index 100%
rename from src/components/BasicShop/VisualComponents/Line/index.less
rename to src/materials/visual/Line/index.less
diff --git a/src/components/BasicShop/VisualComponents/Line/index.tsx b/src/materials/visual/Line/index.tsx
similarity index 100%
rename from src/components/BasicShop/VisualComponents/Line/index.tsx
rename to src/materials/visual/Line/index.tsx
diff --git a/src/components/BasicShop/VisualComponents/Line/schema.ts b/src/materials/visual/Line/schema.ts
similarity index 96%
rename from src/components/BasicShop/VisualComponents/Line/schema.ts
rename to src/materials/visual/Line/schema.ts
index cdd2b89..0bd8124 100644
--- a/src/components/BasicShop/VisualComponents/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/components/BasicShop/VisualComponents/Line/template.ts b/src/materials/visual/Line/template.ts
similarity index 100%
rename from src/components/BasicShop/VisualComponents/Line/template.ts
rename to src/materials/visual/Line/template.ts
diff --git a/src/components/BasicShop/VisualComponents/Pie/index.less b/src/materials/visual/Pie/index.less
similarity index 100%
rename from src/components/BasicShop/VisualComponents/Pie/index.less
rename to src/materials/visual/Pie/index.less
diff --git a/src/components/BasicShop/VisualComponents/Pie/index.tsx b/src/materials/visual/Pie/index.tsx
similarity index 100%
rename from src/components/BasicShop/VisualComponents/Pie/index.tsx
rename to src/materials/visual/Pie/index.tsx
diff --git a/src/components/BasicShop/VisualComponents/Pie/schema.ts b/src/materials/visual/Pie/schema.ts
similarity index 96%
rename from src/components/BasicShop/VisualComponents/Pie/schema.ts
rename to src/materials/visual/Pie/schema.ts
index 4178b00..3d7724c 100644
--- a/src/components/BasicShop/VisualComponents/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/components/BasicShop/VisualComponents/Pie/template.ts b/src/materials/visual/Pie/template.ts
similarity index 100%
rename from src/components/BasicShop/VisualComponents/Pie/template.ts
rename to src/materials/visual/Pie/template.ts
diff --git a/src/components/BasicShop/VisualComponents/XProgress/index.tsx b/src/materials/visual/XProgress/index.tsx
similarity index 100%
rename from src/components/BasicShop/VisualComponents/XProgress/index.tsx
rename to src/materials/visual/XProgress/index.tsx
diff --git a/src/components/BasicShop/VisualComponents/XProgress/schema.ts b/src/materials/visual/XProgress/schema.ts
similarity index 97%
rename from src/components/BasicShop/VisualComponents/XProgress/schema.ts
rename to src/materials/visual/XProgress/schema.ts
index 79f8da3..6b88ca7 100644
--- a/src/components/BasicShop/VisualComponents/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<
diff --git a/src/components/BasicShop/VisualComponents/XProgress/template.ts b/src/materials/visual/XProgress/template.ts
similarity index 100%
rename from src/components/BasicShop/VisualComponents/XProgress/template.ts
rename to src/materials/visual/XProgress/template.ts
diff --git a/src/components/BasicShop/VisualComponents/schema.ts b/src/materials/visual/schema.ts
similarity index 100%
rename from src/components/BasicShop/VisualComponents/schema.ts
rename to src/materials/visual/schema.ts
diff --git a/src/components/BasicShop/VisualComponents/template.ts b/src/materials/visual/template.ts
similarity index 100%
rename from src/components/BasicShop/VisualComponents/template.ts
rename to src/materials/visual/template.ts
diff --git a/src/pages/editor/Container.tsx b/src/pages/editor/Container.tsx
index acba064..05c5a85 100644
--- a/src/pages/editor/Container.tsx
+++ b/src/pages/editor/Container.tsx
@@ -10,17 +10,17 @@ import {
 import { connect } from 'dva';
 import HeaderComponent from './components/Header';
 import CanvasControl from './components/CanvasControl';
-import SourceBox from './SourceBox';
-import TargetBox from './TargetBox';
+import SourceBox from './TargetBox';
+import TargetBox from './SourceBox';
 import Calibration from 'components/Calibration';
 import DynamicEngine, { componentsType } from '@/core/DynamicEngine';
 import { FormRender } from '@/core';
 
-import template from 'components/BasicShop/BasicComponents/template';
-import mediaTpl from 'components/BasicShop/MediaComponents/template';
-import graphTpl from 'components/BasicShop/VisualComponents/template';
+import template from '@/materials/base/template';
+import mediaTpl from '@/materials/media/template';
+import graphTpl from '@/materials/visual/template';
 
-import schemaH5 from 'components/BasicShop/schema';
+import schemaH5 from '@/materials/schema';
 import { ActionCreators, StateWithHistory } from 'redux-undo';
 import { throttle, detectMobileBrowser, getBrowserNavigatorMetaInfo } from '@/utils/tool';
 
diff --git a/src/pages/editor/SourceBox.tsx b/src/pages/editor/SourceBox.tsx
index b91079d..cc8c5f6 100644
--- a/src/pages/editor/SourceBox.tsx
+++ b/src/pages/editor/SourceBox.tsx
@@ -1,216 +1,70 @@
-import React, { memo, useCallback, useEffect, useMemo, useState } from 'react';
-import { useDrop } from 'react-dnd';
-import Draggable, { DraggableData, DraggableEvent } from 'react-draggable';
-import { ItemCallback } from 'react-grid-layout';
-import { connect } from 'dva';
-import { ViewRender } from '@/core';
+import React, { useMemo, memo, ReactNode, useContext, CSSProperties } from 'react';
+import { useDrag } from 'react-dnd';
+import schema from '@/materials/schema';
 import styles from './index.less';
-import { uuid } from '@/utils/tool';
-import { Dispatch } from 'umi';
-import { StateWithHistory } from 'redux-undo';
-import { Menu, Item, MenuProvider } from 'react-contexify';
-import 'react-contexify/dist/ReactContexify.min.css';
-interface SourceBoxProps {
-  pstate: { pointData: { id: string; item: any; point: any; isMenu?: any }[]; curPoint: any };
-  cstate: { pointData: { id: string; item: any; point: any }[]; curPoint: any };
-  scaleNum: number;
+
+interface TargetBoxProps {
+  item: any;
+  children: ReactNode;
   canvasId: string;
-  allType: string[];
-  dispatch: Dispatch;
-  dragState: { x: number; y: number };
-  setDragState: React.Dispatch<
-    React.SetStateAction<{
-      x: number;
-      y: number;
-    }>
-  >;
 }
 
-const SourceBox = memo((props: SourceBoxProps) => {
-  const { pstate, scaleNum, canvasId, allType, dispatch, dragState, setDragState, cstate } = props;
+const SourceBox = memo((props: TargetBoxProps) => {
+  const { item } = props;
 
-  let pointData = pstate ? pstate.pointData : [];
-  const cpointData = cstate ? cstate.pointData : [];
-
-  const [canvasRect, setCanvasRect] = useState<number[]>([]);
-  const [isShowTip, setIsShowTip] = useState(true);
-  const [{ isOver }, drop] = useDrop({
-    accept: allType,
-    drop: (item: { h: number; type: string; x: number }, monitor) => {
-      let parentDiv = document.getElementById(canvasId),
-        pointRect = parentDiv!.getBoundingClientRect(),
-        top = pointRect.top,
-        pointEnd = monitor.getSourceClientOffset(),
-        y = pointEnd!.y < top ? 0 : pointEnd!.y - top,
-        col = 24, // 网格列数
-        cellHeight = 2,
-        w = item.type === 'Icon' ? 3 : col;
-      // 转换成网格规则的坐标和大小
-      let gridY = Math.ceil(y / cellHeight);
-      dispatch({
-        type: 'editorModal/addPointData',
-        payload: {
-          id: uuid(6, 10),
-          item,
-          point: { i: `x-${pointData.length}`, x: 0, y: gridY, w, h: item.h, isBounded: true },
-          status: 'inToCanvas',
-        },
-      });
+  const [{ isDragging }, drag] = useDrag({
+    item: {
+      type: item.type,
+      config: schema[item.type as keyof typeof schema].config,
+      h: item.h,
+      editableEl: schema[item.type as keyof typeof schema].editData,
+      category: item.category,
+      x: item.x || 0,
     },
     collect: monitor => ({
-      isOver: monitor.isOver(),
-      canDrop: monitor.canDrop(),
-      item: monitor.getItem(),
+      isDragging: monitor.isDragging(),
     }),
   });
 
-  const dragStop: ItemCallback = useMemo(() => {
-    return (layout, oldItem, newItem, placeholder, e, element) => {
-      const curPointData = pointData.filter(item => item.id === newItem.i)[0];
-      dispatch({
-        type: 'editorModal/modPointData',
-        payload: { ...curPointData, point: newItem, status: 'inToCanvas' },
-      });
-    };
-  }, [cpointData, dispatch, pointData]);
-
-  const onDragStart: ItemCallback = useMemo(() => {
-    return (layout, oldItem, newItem, placeholder, e, element) => {
-      const curPointData = pointData.filter(item => item.id === newItem.i)[0];
-      dispatch({
-        type: 'editorModal/modPointData',
-        payload: { ...curPointData, status: 'inToCanvas' },
-      });
-    };
-  }, [dispatch, pointData]);
-
-  const onResizeStop: ItemCallback = useMemo(() => {
-    return (layout, oldItem, newItem, placeholder, e, element) => {
-      const curPointData = pointData.filter(item => item.id === newItem.i)[0];
-      dispatch({
-        type: 'editorModal/modPointData',
-        payload: { ...curPointData, point: newItem, status: 'inToCanvas' },
-      });
-    };
-  }, [dispatch, pointData]);
-
-  const handleContextMenuDel = () => {
-    if (pstate.curPoint) {
-      dispatch({
-        type: 'editorModal/delPointData',
-        payload: { id: pstate.curPoint.id },
-      });
-    }
-  };
-
-  const handleContextMenuCopy = () => {
-    if (pstate.curPoint) {
-      dispatch({
-        type: 'editorModal/copyPointData',
-        payload: { id: pstate.curPoint.id },
-      });
-    }
-  };
-
-  const onConTextClick = (type: string) => {
-    if (type === 'del') {
-      handleContextMenuDel();
-    } else if (type === 'copy') {
-      handleContextMenuCopy();
-    }
-  };
-
-  const MyAwesomeMenu = useCallback(
-    () => (
-      <Menu id="menu_id">
-        <Item onClick={() => onConTextClick('copy')}>复制</Item>
-        <Item onClick={() => onConTextClick('del')}>删除</Item>
-      </Menu>
-    ),
-    [onConTextClick],
+  const containerStyle: CSSProperties = useMemo(
+    () => ({
+      opacity: isDragging ? 0.4 : 1,
+      cursor: 'move',
+      height: '140px',
+    }),
+    [isDragging],
   );
-
-  useEffect(() => {
-    let { width, height } = document.getElementById(canvasId)!.getBoundingClientRect();
-    setCanvasRect([width, height]);
-  }, [canvasId]);
-
-  useEffect(() => {
-    let timer = window.setTimeout(() => {
-      setIsShowTip(false);
-    }, 3000);
-    return () => {
-      window.clearTimeout(timer);
-    };
-  }, []);
-  const opacity = isOver ? 0.7 : 1;
-
-  const render = useMemo(() => {
-    return (
-      <Draggable
-        position={dragState}
-        handle=".js_box"
-        onStop={(e: DraggableEvent, data: DraggableData) => {
-          setDragState({ x: data.x, y: data.y });
-        }}
-      >
-        <div className={styles.canvasBox}>
-          <MenuProvider id="menu_id">
-            <div
-              style={{
-                transform: `scale(${scaleNum})`,
-                position: 'relative',
-                width: '100%',
-                height: '100%',
-              }}
-            >
-              <div
-                id={canvasId}
-                className={styles.canvas}
-                style={{
-                  opacity,
-                }}
-                ref={drop}
-              >
-                {pointData.length > 0 ? (
-                  <ViewRender
-                    pointData={pointData}
-                    width={canvasRect[0] || 0}
-                    dragStop={dragStop}
-                    onDragStart={onDragStart}
-                    onResizeStop={onResizeStop}
-                  />
-                ) : null}
-              </div>
-            </div>
-          </MenuProvider>
-        </div>
-      </Draggable>
-    );
-  }, [
-    canvasId,
-    canvasRect,
-    dragState,
-    dragStop,
-    drop,
-    isShowTip,
-    onDragStart,
-    onResizeStop,
-    opacity,
-    pointData,
-    scaleNum,
-    setDragState,
-  ]);
-
   return (
     <>
-      {render}
-      <MyAwesomeMenu />
+      <div className={styles.listWrap}>
+        <div className={styles.module} style={{ ...containerStyle }} ref={drag}>
+          <div
+            style={{
+              height: '110px',
+              display: 'flex',
+              justifyContent: 'center',
+              alignItems: 'center',
+              flexDirection: 'column',
+              overflow: 'hidden',
+            }}
+          >
+            {props.children}
+          </div>
+          <div
+            style={{
+              height: '30px',
+              lineHeight: '30px',
+              textAlign: 'center',
+              backgroundColor: 'rgba(245, 245, 245, 1)',
+              color: 'rgba(118, 118, 118, 1)',
+            }}
+          >
+            {props.item.displayName}
+          </div>
+        </div>
+      </div>
     </>
   );
 });
 
-export default connect((state: StateWithHistory<any>) => ({
-  pstate: state.present.editorModal,
-  cstate: state.present.editorPcModal,
-}))(SourceBox);
+export default SourceBox;
diff --git a/src/pages/editor/TargetBox.tsx b/src/pages/editor/TargetBox.tsx
index 6465939..47c0962 100644
--- a/src/pages/editor/TargetBox.tsx
+++ b/src/pages/editor/TargetBox.tsx
@@ -1,71 +1,216 @@
-import React, { useMemo, memo, ReactNode, useContext, CSSProperties } from 'react';
-import { useDrag } from 'react-dnd';
-import schema from 'components/BasicShop/schema';
+import React, { memo, useCallback, useEffect, useMemo, useState } from 'react';
+import { useDrop } from 'react-dnd';
+import Draggable, { DraggableData, DraggableEvent } from 'react-draggable';
+import { ItemCallback } from 'react-grid-layout';
+import { connect } from 'dva';
+import { ViewRender } from '@/core';
 import styles from './index.less';
-import { dooringContext } from '@/layouts';
-
-interface TargetBoxProps {
-  item: any;
-  children: ReactNode;
+import { uuid } from '@/utils/tool';
+import { Dispatch } from 'umi';
+import { StateWithHistory } from 'redux-undo';
+import { Menu, Item, MenuProvider } from 'react-contexify';
+import 'react-contexify/dist/ReactContexify.min.css';
+interface SourceBoxProps {
+  pstate: { pointData: { id: string; item: any; point: any; isMenu?: any }[]; curPoint: any };
+  cstate: { pointData: { id: string; item: any; point: any }[]; curPoint: any };
+  scaleNum: number;
   canvasId: string;
+  allType: string[];
+  dispatch: Dispatch;
+  dragState: { x: number; y: number };
+  setDragState: React.Dispatch<
+    React.SetStateAction<{
+      x: number;
+      y: number;
+    }>
+  >;
 }
 
-const TargetBox = memo((props: TargetBoxProps) => {
-  const { item } = props;
+const TargetBox = memo((props: SourceBoxProps) => {
+  const { pstate, scaleNum, canvasId, allType, dispatch, dragState, setDragState, cstate } = props;
 
-  const [{ isDragging }, drag] = useDrag({
-    item: {
-      type: item.type,
-      config: schema[item.type as keyof typeof schema].config,
-      h: item.h,
-      editableEl: schema[item.type as keyof typeof schema].editData,
-      category: item.category,
-      x: item.x || 0,
+  let pointData = pstate ? pstate.pointData : [];
+  const cpointData = cstate ? cstate.pointData : [];
+
+  const [canvasRect, setCanvasRect] = useState<number[]>([]);
+  const [isShowTip, setIsShowTip] = useState(true);
+  const [{ isOver }, drop] = useDrop({
+    accept: allType,
+    drop: (item: { h: number; type: string; x: number }, monitor) => {
+      let parentDiv = document.getElementById(canvasId),
+        pointRect = parentDiv!.getBoundingClientRect(),
+        top = pointRect.top,
+        pointEnd = monitor.getSourceClientOffset(),
+        y = pointEnd!.y < top ? 0 : pointEnd!.y - top,
+        col = 24, // 网格列数
+        cellHeight = 2,
+        w = item.type === 'Icon' ? 3 : col;
+      // 转换成网格规则的坐标和大小
+      let gridY = Math.ceil(y / cellHeight);
+      dispatch({
+        type: 'editorModal/addPointData',
+        payload: {
+          id: uuid(6, 10),
+          item,
+          point: { i: `x-${pointData.length}`, x: 0, y: gridY, w, h: item.h, isBounded: true },
+          status: 'inToCanvas',
+        },
+      });
     },
     collect: monitor => ({
-      isDragging: monitor.isDragging(),
+      isOver: monitor.isOver(),
+      canDrop: monitor.canDrop(),
+      item: monitor.getItem(),
     }),
   });
 
-  const containerStyle: CSSProperties = useMemo(
-    () => ({
-      opacity: isDragging ? 0.4 : 1,
-      cursor: 'move',
-      height: '140px',
-    }),
-    [isDragging],
+  const dragStop: ItemCallback = useMemo(() => {
+    return (layout, oldItem, newItem, placeholder, e, element) => {
+      const curPointData = pointData.filter(item => item.id === newItem.i)[0];
+      dispatch({
+        type: 'editorModal/modPointData',
+        payload: { ...curPointData, point: newItem, status: 'inToCanvas' },
+      });
+    };
+  }, [cpointData, dispatch, pointData]);
+
+  const onDragStart: ItemCallback = useMemo(() => {
+    return (layout, oldItem, newItem, placeholder, e, element) => {
+      const curPointData = pointData.filter(item => item.id === newItem.i)[0];
+      dispatch({
+        type: 'editorModal/modPointData',
+        payload: { ...curPointData, status: 'inToCanvas' },
+      });
+    };
+  }, [dispatch, pointData]);
+
+  const onResizeStop: ItemCallback = useMemo(() => {
+    return (layout, oldItem, newItem, placeholder, e, element) => {
+      const curPointData = pointData.filter(item => item.id === newItem.i)[0];
+      dispatch({
+        type: 'editorModal/modPointData',
+        payload: { ...curPointData, point: newItem, status: 'inToCanvas' },
+      });
+    };
+  }, [dispatch, pointData]);
+
+  const handleContextMenuDel = () => {
+    if (pstate.curPoint) {
+      dispatch({
+        type: 'editorModal/delPointData',
+        payload: { id: pstate.curPoint.id },
+      });
+    }
+  };
+
+  const handleContextMenuCopy = () => {
+    if (pstate.curPoint) {
+      dispatch({
+        type: 'editorModal/copyPointData',
+        payload: { id: pstate.curPoint.id },
+      });
+    }
+  };
+
+  const onConTextClick = (type: string) => {
+    if (type === 'del') {
+      handleContextMenuDel();
+    } else if (type === 'copy') {
+      handleContextMenuCopy();
+    }
+  };
+
+  const MyAwesomeMenu = useCallback(
+    () => (
+      <Menu id="menu_id">
+        <Item onClick={() => onConTextClick('copy')}>复制</Item>
+        <Item onClick={() => onConTextClick('del')}>删除</Item>
+      </Menu>
+    ),
+    [onConTextClick],
   );
+
+  useEffect(() => {
+    let { width, height } = document.getElementById(canvasId)!.getBoundingClientRect();
+    setCanvasRect([width, height]);
+  }, [canvasId]);
+
+  useEffect(() => {
+    let timer = window.setTimeout(() => {
+      setIsShowTip(false);
+    }, 3000);
+    return () => {
+      window.clearTimeout(timer);
+    };
+  }, []);
+  const opacity = isOver ? 0.7 : 1;
+
+  const render = useMemo(() => {
+    return (
+      <Draggable
+        position={dragState}
+        handle=".js_box"
+        onStop={(e: DraggableEvent, data: DraggableData) => {
+          setDragState({ x: data.x, y: data.y });
+        }}
+      >
+        <div className={styles.canvasBox}>
+          <MenuProvider id="menu_id">
+            <div
+              style={{
+                transform: `scale(${scaleNum})`,
+                position: 'relative',
+                width: '100%',
+                height: '100%',
+              }}
+            >
+              <div
+                id={canvasId}
+                className={styles.canvas}
+                style={{
+                  opacity,
+                }}
+                ref={drop}
+              >
+                {pointData.length > 0 ? (
+                  <ViewRender
+                    pointData={pointData}
+                    width={canvasRect[0] || 0}
+                    dragStop={dragStop}
+                    onDragStart={onDragStart}
+                    onResizeStop={onResizeStop}
+                  />
+                ) : null}
+              </div>
+            </div>
+          </MenuProvider>
+        </div>
+      </Draggable>
+    );
+  }, [
+    canvasId,
+    canvasRect,
+    dragState,
+    dragStop,
+    drop,
+    isShowTip,
+    onDragStart,
+    onResizeStop,
+    opacity,
+    pointData,
+    scaleNum,
+    setDragState,
+  ]);
+
   return (
     <>
-      <div className={styles.listWrap}>
-        <div className={styles.module} style={{ ...containerStyle }} ref={drag}>
-          <div
-            style={{
-              height: '110px',
-              display: 'flex',
-              justifyContent: 'center',
-              alignItems: 'center',
-              flexDirection: 'column',
-              overflow: 'hidden',
-            }}
-          >
-            {props.children}
-          </div>
-          <div
-            style={{
-              height: '30px',
-              lineHeight: '30px',
-              textAlign: 'center',
-              backgroundColor: 'rgba(245, 245, 245, 1)',
-              color: 'rgba(118, 118, 118, 1)',
-            }}
-          >
-            {props.item.displayName}
-          </div>
-        </div>
-      </div>
+      {render}
+      <MyAwesomeMenu />
     </>
   );
 });
 
-export default TargetBox;
+export default connect((state: StateWithHistory<any>) => ({
+  pstate: state.present.editorModal,
+  cstate: state.present.editorPcModal,
+}))(TargetBox);