From f7c69af6c4e70664885d86240851ded6159955bd Mon Sep 17 00:00:00 2001 From: kangwei Date: Tue, 18 Feb 2020 20:04:38 +0800 Subject: [PATCH] optimize structure --- .../simulator/host/auxilary/outline-selecting.tsx | 2 +- .../designer/src/builtins/simulator/host/host.ts | 6 +++--- .../src/builtins/simulator/host/viewport.ts | 4 ++-- .../src/builtins/simulator/renderer/renderer.ts | 2 +- .../{document/node => }/component-config.ts | 4 ++-- packages/designer/src/designer/designer.ts | 14 +++++++------- .../src/designer/document/document-model.ts | 4 ++-- .../designer/src/designer/document/node/node.ts | 2 +- .../src/designer/{ => helper}/active-tracker.ts | 2 +- .../designer/src/designer/{ => helper}/dragon.ts | 10 +++++----- .../designer/src/designer/{ => helper}/history.ts | 0 .../designer/src/designer/{ => helper}/hovering.ts | 4 ++-- .../designer/src/designer/{ => helper}/location.ts | 4 ++-- .../src/designer/{ => helper}/offset-observer.ts | 4 ++-- .../designer/src/designer/{ => helper}/scroller.ts | 2 +- packages/designer/src/designer/simulator.ts | 8 ++++---- 16 files changed, 36 insertions(+), 36 deletions(-) rename packages/designer/src/designer/{document/node => }/component-config.ts (98%) rename packages/designer/src/designer/{ => helper}/active-tracker.ts (90%) rename packages/designer/src/designer/{ => helper}/dragon.ts (97%) rename packages/designer/src/designer/{ => helper}/history.ts (100%) rename packages/designer/src/designer/{ => helper}/hovering.ts (86%) rename packages/designer/src/designer/{ => helper}/location.ts (96%) rename packages/designer/src/designer/{ => helper}/offset-observer.ts (93%) rename packages/designer/src/designer/{ => helper}/scroller.ts (98%) diff --git a/packages/designer/src/builtins/simulator/host/auxilary/outline-selecting.tsx b/packages/designer/src/builtins/simulator/host/auxilary/outline-selecting.tsx index 3b8dfd6fb..db486276c 100644 --- a/packages/designer/src/builtins/simulator/host/auxilary/outline-selecting.tsx +++ b/packages/designer/src/builtins/simulator/host/auxilary/outline-selecting.tsx @@ -4,7 +4,7 @@ import { observer } from '@recore/core-obx'; import { SimulatorContext } from '../context'; import { SimulatorHost } from '../host'; import { computed } from '@recore/obx'; -import OffsetObserver from '../../../../designer/offset-observer'; +import OffsetObserver from '../../../../designer/helper/offset-observer'; @observer export class OutlineSelectingInstance extends Component<{ observed: OffsetObserver; highlight?: boolean }> { diff --git a/packages/designer/src/builtins/simulator/host/host.ts b/packages/designer/src/builtins/simulator/host/host.ts index 0127adcbb..11e9688b5 100644 --- a/packages/designer/src/builtins/simulator/host/host.ts +++ b/packages/designer/src/builtins/simulator/host/host.ts @@ -7,10 +7,10 @@ import Node, { NodeParent } from '../../../designer/document/node/node'; import DocumentModel from '../../../designer/document/document-model'; import ResourceConsumer from './resource-consumer'; import { AssetLevel, Asset, assetBundle, assetItem, AssetType } from '../utils/asset'; -import { DragObjectType, isShaken, LocateEvent, DragNodeObject, DragNodeDataObject } from '../../../designer/dragon'; -import { LocationData } from '../../../designer/location'; +import { DragObjectType, isShaken, LocateEvent, DragNodeObject, DragNodeDataObject } from '../../../designer/helper/dragon'; +import { LocationData } from '../../../designer/helper/location'; import { NodeData } from '../../../designer/schema'; -import { ComponentDescriptionSpec } from '../../../designer/document/node/component-config'; +import { ComponentDescriptionSpec } from '../../../designer/component-config'; import { ReactInstance } from 'react'; export interface SimulatorProps { diff --git a/packages/designer/src/builtins/simulator/host/viewport.ts b/packages/designer/src/builtins/simulator/host/viewport.ts index 0c1af7ea6..1f3728066 100644 --- a/packages/designer/src/builtins/simulator/host/viewport.ts +++ b/packages/designer/src/builtins/simulator/host/viewport.ts @@ -1,6 +1,6 @@ import { obx, computed } from '@recore/obx'; -import { Point } from '../../../designer/location'; -import { ScrollTarget } from '../../../designer/scroller'; +import { Point } from '../../../designer/helper/location'; +import { ScrollTarget } from '../../../designer/helper/scroller'; import { AutoFit, IViewport } from '../../../designer/simulator'; export default class Viewport implements IViewport { diff --git a/packages/designer/src/builtins/simulator/renderer/renderer.ts b/packages/designer/src/builtins/simulator/renderer/renderer.ts index c4c67159b..ccf6f95aa 100644 --- a/packages/designer/src/builtins/simulator/renderer/renderer.ts +++ b/packages/designer/src/builtins/simulator/renderer/renderer.ts @@ -7,7 +7,7 @@ import { RootSchema, NpmInfo } from '../../../designer/schema'; import { isElement, getClientRects } from '../../../utils/dom'; import { Asset } from '../utils/asset'; import loader from '../utils/loader'; -import { ComponentDescriptionSpec } from '../../../designer/document/node/component-config'; +import { ComponentDescriptionSpec } from '../../../designer/component-config'; import { findDOMNodes } from '../utils/react'; let REACT_KEY = ''; diff --git a/packages/designer/src/designer/document/node/component-config.ts b/packages/designer/src/designer/component-config.ts similarity index 98% rename from packages/designer/src/designer/document/node/component-config.ts rename to packages/designer/src/designer/component-config.ts index a296f896d..fde51b636 100644 --- a/packages/designer/src/designer/document/node/component-config.ts +++ b/packages/designer/src/designer/component-config.ts @@ -1,6 +1,6 @@ import { ReactNode, ReactElement, ComponentType } from 'react'; -import Node, { NodeParent } from './node'; -import { NodeData, NodeSchema } from '../../schema'; +import Node, { NodeParent } from './document/node/node'; +import { NodeData, NodeSchema } from './schema'; export type BasicTypes = 'array' | 'bool' | 'func' | 'number' | 'object' | 'string' | 'node' | 'element' | 'any'; export interface CompositeType { diff --git a/packages/designer/src/designer/designer.ts b/packages/designer/src/designer/designer.ts index 1ccdaf127..0cbded379 100644 --- a/packages/designer/src/designer/designer.ts +++ b/packages/designer/src/designer/designer.ts @@ -3,17 +3,17 @@ import { obx, computed } from '@recore/obx'; import BuiltinSimulatorView from '../builtins/simulator'; import Project from './project'; import { ProjectSchema } from './schema'; -import Dragon, { isDragNodeObject, isDragNodeDataObject, LocateEvent, DragObject } from './dragon'; -import ActiveTracker from './active-tracker'; -import Hovering from './hovering'; -import Location, { LocationData, isLocationChildrenDetail } from './location'; +import Dragon, { isDragNodeObject, isDragNodeDataObject, LocateEvent, DragObject } from './helper/dragon'; +import ActiveTracker from './helper/active-tracker'; +import Hovering from './helper/hovering'; +import Location, { LocationData, isLocationChildrenDetail } from './helper/location'; import DocumentModel from './document/document-model'; import Node, { insertChildren } from './document/node/node'; import { isRootNode } from './document/node/root-node'; -import { ComponentDescriptionSpec, ComponentConfig } from './document/node/component-config'; -import Scroller, { IScrollable } from './scroller'; +import { ComponentDescriptionSpec, ComponentConfig } from './component-config'; +import Scroller, { IScrollable } from './helper/scroller'; import { INodeInstance } from './simulator'; -import OffsetObserver, { createOffsetObserver } from './offset-observer'; +import OffsetObserver, { createOffsetObserver } from './helper/offset-observer'; export interface DesignerProps { className?: string; diff --git a/packages/designer/src/designer/document/document-model.ts b/packages/designer/src/designer/document/document-model.ts index 3f9d7d64e..40d8ee2bd 100644 --- a/packages/designer/src/designer/document/document-model.ts +++ b/packages/designer/src/designer/document/document-model.ts @@ -5,8 +5,8 @@ import { Selection } from './selection'; import RootNode from './node/root-node'; import { ISimulator, ComponentInstance, Component } from '../simulator'; import { computed, obx } from '@recore/obx'; -import Location from '../location'; -import { ComponentConfig } from './node/component-config'; +import Location from '../helper/location'; +import { ComponentConfig } from '../component-config'; import { isElement } from '../../utils/dom'; export default class DocumentModel { diff --git a/packages/designer/src/designer/document/node/node.ts b/packages/designer/src/designer/document/node/node.ts index f913b15eb..abb6c16d1 100644 --- a/packages/designer/src/designer/document/node/node.ts +++ b/packages/designer/src/designer/document/node/node.ts @@ -6,7 +6,7 @@ import NodeChildren from './node-children'; import Prop from './props/prop'; import NodeContent from './node-content'; import { Component } from '../../simulator'; -import { ComponentConfig } from './component-config'; +import { ComponentConfig } from '../../component-config'; const DIRECTIVES = ['condition', 'conditionGroup', 'loop', 'loopArgs', 'title', 'ignore', 'hidden', 'locked']; diff --git a/packages/designer/src/designer/active-tracker.ts b/packages/designer/src/designer/helper/active-tracker.ts similarity index 90% rename from packages/designer/src/designer/active-tracker.ts rename to packages/designer/src/designer/helper/active-tracker.ts index 3bcdc7b7e..a9af68aa0 100644 --- a/packages/designer/src/designer/active-tracker.ts +++ b/packages/designer/src/designer/helper/active-tracker.ts @@ -1,6 +1,6 @@ import { EventEmitter } from 'events'; import { LocationDetail } from './location'; -import Node, { isNode } from './document/node/node'; +import Node, { isNode } from '../document/node/node'; interface ActiveTarget { node: Node; diff --git a/packages/designer/src/designer/dragon.ts b/packages/designer/src/designer/helper/dragon.ts similarity index 97% rename from packages/designer/src/designer/dragon.ts rename to packages/designer/src/designer/helper/dragon.ts index 2aaca11d2..f47fc9a89 100644 --- a/packages/designer/src/designer/dragon.ts +++ b/packages/designer/src/designer/helper/dragon.ts @@ -1,11 +1,11 @@ import { EventEmitter } from 'events'; import { obx } from '@recore/obx'; import Location from './location'; -import DocumentModel from './document/document-model'; -import { NodeData } from './schema'; -import { ISimulator } from './simulator'; -import Node from './document/node/node'; -import Designer from './designer'; +import DocumentModel from '../document/document-model'; +import { NodeData } from '../schema'; +import { ISimulator } from '../simulator'; +import Node from '../document/node/node'; +import Designer from '../designer'; export interface LocateEvent { readonly type: 'LocateEvent'; diff --git a/packages/designer/src/designer/history.ts b/packages/designer/src/designer/helper/history.ts similarity index 100% rename from packages/designer/src/designer/history.ts rename to packages/designer/src/designer/helper/history.ts diff --git a/packages/designer/src/designer/hovering.ts b/packages/designer/src/designer/helper/hovering.ts similarity index 86% rename from packages/designer/src/designer/hovering.ts rename to packages/designer/src/designer/helper/hovering.ts index 4c0cd0d9c..7af2493c3 100644 --- a/packages/designer/src/designer/hovering.ts +++ b/packages/designer/src/designer/helper/hovering.ts @@ -1,6 +1,6 @@ import { obx } from '@recore/obx'; -import Node from './document/node/node'; -import DocumentModel from './document/document-model'; +import Node from '../document/node/node'; +import DocumentModel from '../document/document-model'; export default class Hovering { @obx.ref private _enable: boolean = true; diff --git a/packages/designer/src/designer/location.ts b/packages/designer/src/designer/helper/location.ts similarity index 96% rename from packages/designer/src/designer/location.ts rename to packages/designer/src/designer/helper/location.ts index 121200a03..22eac5dc3 100644 --- a/packages/designer/src/designer/location.ts +++ b/packages/designer/src/designer/helper/location.ts @@ -1,5 +1,5 @@ -import ComponentNode, { NodeParent } from './document/node/node'; -import DocumentModel from './document/document-model'; +import ComponentNode, { NodeParent } from '../document/node/node'; +import DocumentModel from '../document/document-model'; export interface LocationData { target: NodeParent; // shadowNode | ConditionFlow | ElementNode | RootNode diff --git a/packages/designer/src/designer/offset-observer.ts b/packages/designer/src/designer/helper/offset-observer.ts similarity index 93% rename from packages/designer/src/designer/offset-observer.ts rename to packages/designer/src/designer/helper/offset-observer.ts index 7b29d572e..981d0e28c 100644 --- a/packages/designer/src/designer/offset-observer.ts +++ b/packages/designer/src/designer/helper/offset-observer.ts @@ -1,6 +1,6 @@ import { obx, computed } from '@recore/obx'; -import { INodeInstance, IViewport } from './simulator'; -import Viewport from '../builtins/simulator/host/viewport'; +import { INodeInstance, IViewport } from '../simulator'; +import Viewport from '../../builtins/simulator/host/viewport'; export default class OffsetObserver { @obx.ref hasOffset = false; diff --git a/packages/designer/src/designer/scroller.ts b/packages/designer/src/designer/helper/scroller.ts similarity index 98% rename from packages/designer/src/designer/scroller.ts rename to packages/designer/src/designer/helper/scroller.ts index cba629927..ecef91f4b 100644 --- a/packages/designer/src/designer/scroller.ts +++ b/packages/designer/src/designer/helper/scroller.ts @@ -1,4 +1,4 @@ -import { isElement } from '../utils/dom'; +import { isElement } from '../../utils/dom'; export class ScrollTarget { get left() { diff --git a/packages/designer/src/designer/simulator.ts b/packages/designer/src/designer/simulator.ts index 07dfc5635..7f3b68ad4 100644 --- a/packages/designer/src/designer/simulator.ts +++ b/packages/designer/src/designer/simulator.ts @@ -1,9 +1,9 @@ import { Component as ReactComponent, ComponentType } from 'react'; -import { LocateEvent, ISensor } from './dragon'; -import { Point } from './location'; +import { LocateEvent, ISensor } from './helper/dragon'; +import { Point } from './helper/location'; import Node from './document/node/node'; -import { ScrollTarget, IScrollable } from './scroller'; -import { ComponentDescriptionSpec } from './document/node/component-config'; +import { ScrollTarget, IScrollable } from './helper/scroller'; +import { ComponentDescriptionSpec } from './component-config'; export type AutoFit = '100%'; export const AutoFit = '100%';