Merge pull request MrXujiang#95 from mokinzhao/master

refactor: move BasicShop to Materials

src/core/FormComponents/CardPicker/index.tsx → 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'> {

src/core/FormComponents/FormItems/FormItems.tsx → 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';

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} />;

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)) {

src/components/BasicShop/ShopComponents/CardLabel/schema.ts → 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';
 

src/components/BasicShop/ShopComponents/Coupons/schema.ts → 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';
 

src/components/BasicShop/ShopComponents/List/schema.ts → 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';
 

src/components/BasicShop/ShopComponents/Tab/schema.ts → 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';
 

src/components/BasicShop/ShopComponents/ZhuanLan/schema.ts → 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';
 

src/components/BasicShop/BasicComponents/Carousel/schema.ts → 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';
 

src/components/BasicShop/BasicComponents/Footer/schema.ts → 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';

src/components/BasicShop/BasicComponents/Form/schema.ts → 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';
 

src/components/BasicShop/BasicComponents/Header/schema.ts → 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<

src/components/BasicShop/BasicComponents/Icon/schema.ts → 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

src/components/BasicShop/BasicComponents/Image/schema.ts → 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';

src/components/BasicShop/BasicComponents/List/schema.ts → 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<

src/components/BasicShop/BasicComponents/LongText/schema.ts → 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<

src/components/BasicShop/BasicComponents/Notice/schema.ts → 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<

src/components/BasicShop/BasicComponents/Qrcode/schema.ts → 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

src/components/BasicShop/BasicComponents/RichText/schema.ts → 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

src/components/BasicShop/BasicComponents/Tab/schema.ts → 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

src/components/BasicShop/BasicComponents/Text/schema.ts → 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<

src/components/BasicShop/BasicComponents/WhiteTpl/schema.ts → 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 {

src/components/BasicShop/MediaComponents/Audio/schema.ts → 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 {

src/components/BasicShop/MediaComponents/Calendar/schema.ts → 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 {

src/components/BasicShop/MediaComponents/Map/schema.ts → 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 {

src/components/BasicShop/MediaComponents/Video/schema.ts → 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 {

src/components/BasicShop/schema.ts → 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 = {

src/components/BasicShop/VisualComponents/Area/schema.ts → 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

src/components/BasicShop/VisualComponents/Chart/schema.ts → 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

src/components/BasicShop/VisualComponents/Line/schema.ts → 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

src/components/BasicShop/VisualComponents/Pie/schema.ts → 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

src/components/BasicShop/VisualComponents/XProgress/schema.ts → 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<

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';