Merge pull request #95 from mokinzhao/master

refactor: move BasicShop to Materials

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