调整目录结构

src/iscs_new/core/abstractShape.js

@@ -1,7 +1,7 @@
 import shapeType from '../constant/shapeType';
 
 // 图形抽象层
-export default class AbstractShape {
+class AbstractShape {
 	constructor({model, defaultStyle, option, shapeFactory}) {
 		this.model = model;
 		this.option = option;
@@ -29,3 +29,4 @@ export default class AbstractShape {
 	setState(state) {}
 }
 
+export default AbstractShape;

src/iscs_new/draggable/Image.js

@@ -1,6 +1,6 @@
 
 import _ from 'lodash';
-import * as graphic from '../utils/graphic';
+import * as graphic from '../core/graphic';
 import * as eventTool from 'zrender/src/core/event';
 import shapeRender from  '../constant/shapeRender';
 

src/iscs_new/draggable/Line.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import * as graphic from '../utils/graphic';
+import * as graphic from '../core/graphic';
 import * as eventTool from 'zrender/src/core/event';
 import shapeRender from  '../constant/shapeRender';
 

src/iscs_new/factory/compose.js

@@ -1,4 +1,4 @@
-import AbstractShape from './Shape';
+import AbstractShape from '../core/abstractShape';
 import Group from 'zrender/src/container/Group';
 
 class Compose extends AbstractShape {

src/iscs_new/factory/element.js

@@ -1,5 +1,5 @@
-import AbstractShape from './Shape';
+import AbstractShape from '../core/abstractShape';
-import * as graphic from '../utils/graphic';
+import * as graphic from '../core/graphic';
 class Element extends AbstractShape {
 	constructor(args) {
 		super(args);

src/iscs_new/factory/index.js

@@ -9,6 +9,7 @@ const shapeBuilderMap = {
 	[shapeType.Element]: Element,
 	[shapeType.Compose]: Compose
 }
+
 class ShapeFactory {
 	constructor(map) {
 		this.$map = map;

src/iscs_new/map.js

@@ -6,7 +6,7 @@ import Painter from './painter';
 import Option from './option';
 import Controller from './controller'; // 事件集合
 import DefaultStyle from './config/defaultStyle'; // 样式集合
-import ShapeFactory from './parser';
+import ShapeFactory from './factory';
 
 const renderer = 'canvas';
 const devicePixelRatio = 1;

src/iscs_new/option.js

@@ -1,4 +1,4 @@
-class Options {
+class Option {
 	constructor(opts, trigger) {
 		this.scaleIndex = 0;
 		this.scaleList = [
@@ -82,4 +82,4 @@ class Options {
 	}
 }
 
-export default Options;
+export default Option;

src/iscs_new/painter.js

@@ -4,7 +4,7 @@ import Group from 'zrender/src/container/Group';
 import TransformHandle from './transformHandle';
 import StateHandle from './stateHandle';
 import TipsHandle from './tipsHandle';
-import * as graphic from './utils/graphic';
+import * as graphic from './core/graphic';
 
 class Painter extends Group {
 	constructor(map) {

src/iscs_new/selectHandle.js

@@ -1,6 +1,6 @@
 import LineDraggable from './draggable/Line';
 import ImageDraggable from './draggable/Image';
-import * as graphic from './utils/graphic';
+import * as graphic from './core/graphic';
 
 export default class SelectHandle {
 	constructor(map, controller) {

src/iscs_new/selectingHandle.js

@@ -1,4 +1,4 @@
-import * as graphic from './utils/graphic.js';
+import * as graphic from './core/graphic.js';
 import shapeRender from  './constant/shapeRender';
 
 function shapeStyleBuilder() {

src/iscs_new/tipsHandle.js

@@ -1,4 +1,4 @@
-import * as graphic from './utils/graphic';
+import * as graphic from './core/graphic';
 import Eventful from 'zrender/src/mixin/Eventful';
 import shapeRender from  './constant/shapeRender';