Merge pull request MrXujiang#94 from mokinzhao/master

refactor：optmize core structure
liuliu66666 · Mar 27, 2021 · 8360916 · 8360916
2 parents 7d8ea3c + 72d5b88
commit 8360916
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 12 deletions.
diff --git a/src/core/index.ts b/src/core/index.ts
@@ -0,0 +1,4 @@
+import DynamicEngine from './DynamicEngine';
+import ViewRender from './renderer/ViewRender';
+import FormRender from './renderer/FormRender';
+export { DynamicEngine, ViewRender, FormRender };
diff --git a/src/core/FormRender.tsx → src/core/renderer/FormRender.tsx b/src/core/FormRender.tsx → 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 '../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 { Store } from 'antd/lib/form/interface';
-import RichText from './FormComponents/XEditor';
-import FormItems from './FormComponents/FormItems';
+import RichText from '../FormComponents/XEditor';
+import FormItems from '../FormComponents/FormItems';
 const normFile = (e: any) => {
   console.log('Upload event:', e);
   if (Array.isArray(e)) {

diff --git a/src/core/ViewRender.tsx → src/core/renderer/ViewRender.tsx b/src/core/ViewRender.tsx → src/core/renderer/ViewRender.tsx
diff --git a/src/core/viewRender.less → src/core/renderer/viewRender.less b/src/core/viewRender.less → src/core/renderer/viewRender.less
diff --git a/src/pages/editor/Container.tsx b/src/pages/editor/Container.tsx
@@ -14,7 +14,7 @@ import SourceBox from './SourceBox';
 import TargetBox from './TargetBox';
 import Calibration from 'components/Calibration';
 import DynamicEngine, { componentsType } from '@/core/DynamicEngine';
-import FormRender from '@/core/FormRender';
+import { FormRender } from '@/core';
 
 import template from 'components/BasicShop/BasicComponents/template';
 import mediaTpl from 'components/BasicShop/MediaComponents/template';

diff --git a/src/pages/editor/SourceBox.tsx b/src/pages/editor/SourceBox.tsx
@@ -3,7 +3,7 @@ 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/ViewRender';
+import { ViewRender } from '@/core';
 import styles from './index.less';
 import { uuid } from '@/utils/tool';
 import { Dispatch } from 'umi';

diff --git a/src/pages/editor/preview.tsx b/src/pages/editor/preview.tsx
@@ -1,5 +1,5 @@
 import React, { CSSProperties, memo, useEffect, useMemo, useRef, useState } from 'react';
-import ViewRender from '@/core/ViewRender';
+import { ViewRender } from '@/core';
 import domtoimage from 'dom-to-image';
 import req from '@/utils/req';
 import { useGetScrollBarWidth } from '@/utils/tool';