diff --git a/components/packages/Platform/GPPlatform.d.ts b/components/packages/Platform/GPPlatform.d.ts index 9f28cf3..05f9d08 100644 --- a/components/packages/Platform/GPPlatform.d.ts +++ b/components/packages/Platform/GPPlatform.d.ts @@ -1,5 +1,5 @@ import { GraphicState } from 'jl-graphic'; -import { JlPlatform } from './JlPlatform'; +import { JlPlatform } from './common/JlPlatform'; export interface IGPPlatformState extends GraphicState { id?: number; } diff --git a/components/packages/Platform/GPPlatform.js b/components/packages/Platform/GPPlatform.js index 6ba7f1a..c0231d7 100644 --- a/components/packages/Platform/GPPlatform.js +++ b/components/packages/Platform/GPPlatform.js @@ -1,5 +1,5 @@ -import { GPConsts } from './PlatformConfig.js'; -import { JlPlatform } from './JlPlatform.js'; +import { GPConsts } from './common/PlatformConfig.js'; +import { JlPlatform } from './common/JlPlatform.js'; class GPPlatform extends JlPlatform { constructor() { diff --git a/components/packages/Platform/THPlatform.d.ts b/components/packages/Platform/THPlatform.d.ts index af8a24b..2a03871 100644 --- a/components/packages/Platform/THPlatform.d.ts +++ b/components/packages/Platform/THPlatform.d.ts @@ -1,5 +1,5 @@ import { GraphicState } from 'jl-graphic'; -import { JlPlatform, DoorCodeLozenge } from './JlPlatform'; +import { JlPlatform, DoorCodeLozenge } from './common/JlPlatform'; export interface ITHPlatformState extends GraphicState { get emergstop(): boolean; set emergstop(v: boolean); diff --git a/components/packages/Platform/THPlatform.js b/components/packages/Platform/THPlatform.js index 8387c1a..3e79d9d 100644 --- a/components/packages/Platform/THPlatform.js +++ b/components/packages/Platform/THPlatform.js @@ -1,5 +1,5 @@ -import { THConsts } from './PlatformConfig.js'; -import { JlPlatform, DoorCodeLozenge } from './JlPlatform.js'; +import { THConsts } from './common/PlatformConfig.js'; +import { JlPlatform, DoorCodeLozenge } from './common/JlPlatform.js'; import { THStation } from '../Station/THStation.js'; class THPlatform extends JlPlatform { diff --git a/components/packages/Platform/JlPlatform.d.ts b/components/packages/Platform/common/JlPlatform.d.ts similarity index 100% rename from components/packages/Platform/JlPlatform.d.ts rename to components/packages/Platform/common/JlPlatform.d.ts diff --git a/components/packages/Platform/JlPlatform.js b/components/packages/Platform/common/JlPlatform.js similarity index 98% rename from components/packages/Platform/JlPlatform.js rename to components/packages/Platform/common/JlPlatform.js index c193271..6e19071 100644 --- a/components/packages/Platform/JlPlatform.js +++ b/components/packages/Platform/common/JlPlatform.js @@ -1,7 +1,7 @@ import { calculateMirrorPoint, JlGraphic, distance2, getRectangleCenter, VectorText } from 'jl-graphic'; import { Container, Point, Graphics, Color, Rectangle } from 'pixi.js'; -import { JlSection } from '../Section/common/Section.js'; -import { JlStation } from '../Station/JlStation.js'; +import { JlSection } from '../../Section/common/Section.js'; +import { JlStation } from '../../Station/common/JlStation.js'; //子元素--矩形 class RectGraphic extends Container { diff --git a/components/packages/Platform/PlatformConfig.d.ts b/components/packages/Platform/common/PlatformConfig.d.ts similarity index 100% rename from components/packages/Platform/PlatformConfig.d.ts rename to components/packages/Platform/common/PlatformConfig.d.ts diff --git a/components/packages/Platform/PlatformConfig.js b/components/packages/Platform/common/PlatformConfig.js similarity index 100% rename from components/packages/Platform/PlatformConfig.js rename to components/packages/Platform/common/PlatformConfig.js diff --git a/components/packages/Platform/PlatformDrawAssistant.d.ts b/components/packages/Platform/common/PlatformDrawAssistant.d.ts similarity index 100% rename from components/packages/Platform/PlatformDrawAssistant.d.ts rename to components/packages/Platform/common/PlatformDrawAssistant.d.ts diff --git a/components/packages/Platform/PlatformDrawAssistant.js b/components/packages/Platform/common/PlatformDrawAssistant.js similarity index 98% rename from components/packages/Platform/PlatformDrawAssistant.js rename to components/packages/Platform/common/PlatformDrawAssistant.js index 6350078..fa420b2 100644 --- a/components/packages/Platform/PlatformDrawAssistant.js +++ b/components/packages/Platform/common/PlatformDrawAssistant.js @@ -1,6 +1,6 @@ import { GraphicDrawAssistant, GraphicInteractionPlugin, AbsorbableLine } from 'jl-graphic'; import { JlPlatform } from './JlPlatform.js'; -import { StyleType } from '../../common/common.js'; +import { StyleType } from '../../../common/common.js'; class PlatformDraw extends GraphicDrawAssistant { platformGraphic; diff --git a/components/packages/Platform/PlatformTemplate.d.ts b/components/packages/Platform/common/PlatformTemplate.d.ts similarity index 82% rename from components/packages/Platform/PlatformTemplate.d.ts rename to components/packages/Platform/common/PlatformTemplate.d.ts index f06e4ab..a083894 100644 --- a/components/packages/Platform/PlatformTemplate.d.ts +++ b/components/packages/Platform/common/PlatformTemplate.d.ts @@ -1,8 +1,8 @@ import { JlGraphicTemplate } from 'jl-graphic'; import { JlPlatform } from './JlPlatform'; import { IPlatformData } from './PlatformConfig'; -import { ITHPlatformState } from './THPlatform'; -import { IGPPlatformState } from './GPPlatform'; +import { ITHPlatformState } from '../THPlatform'; +import { IGPPlatformState } from '../GPPlatform'; import { StyleType } from 'common/common'; export declare class PlatformTemplate extends JlGraphicTemplate { hasdoor?: boolean; diff --git a/components/packages/Platform/PlatformTemplate.js b/components/packages/Platform/common/PlatformTemplate.js similarity index 86% rename from components/packages/Platform/PlatformTemplate.js rename to components/packages/Platform/common/PlatformTemplate.js index 5527872..67e8f66 100644 --- a/components/packages/Platform/PlatformTemplate.js +++ b/components/packages/Platform/common/PlatformTemplate.js @@ -1,8 +1,8 @@ import { JlGraphicTemplate } from 'jl-graphic'; import { JlPlatform } from './JlPlatform.js'; -import { THPlatform } from './THPlatform.js'; -import { GPPlatform } from './GPPlatform.js'; -import { StyleType } from '../../common/common.js'; +import { THPlatform } from '../THPlatform.js'; +import { GPPlatform } from '../GPPlatform.js'; +import { StyleType } from '../../../common/common.js'; class PlatformTemplate extends JlGraphicTemplate { hasdoor; diff --git a/components/packages/Section/GPSection.d.ts b/components/packages/Section/GPSection.d.ts new file mode 100644 index 0000000..42beef4 --- /dev/null +++ b/components/packages/Section/GPSection.d.ts @@ -0,0 +1,5 @@ +import { JlSection as SectionBase } from './common/Section'; +export declare class Section extends SectionBase { + constructor(); +} +export { SectionTemplate } from './common/Section'; diff --git a/components/packages/Section/bjrtss/Section.js b/components/packages/Section/GPSection.js similarity index 69% rename from components/packages/Section/bjrtss/Section.js rename to components/packages/Section/GPSection.js index c91e867..acbab2d 100644 --- a/components/packages/Section/bjrtss/Section.js +++ b/components/packages/Section/GPSection.js @@ -1,5 +1,5 @@ -import { JlSection } from '../common/Section.js'; -export { SectionTemplate } from '../common/Section.js'; +import { JlSection } from './common/Section.js'; +export { SectionTemplate } from './common/Section.js'; const displayConfig = { lineColor: '#5578b6', diff --git a/components/packages/Section/bjrtss/Section.d.ts b/components/packages/Section/bjrtss/Section.d.ts deleted file mode 100644 index 095ddf2..0000000 --- a/components/packages/Section/bjrtss/Section.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { JlSection as SectionBase } from '../common/Section'; -export declare class Section extends SectionBase { - constructor(); -} -export { SectionTemplate } from '../common/Section'; diff --git a/components/packages/Section/common/SectionDrawAssistant.d.ts b/components/packages/Section/common/SectionDrawAssistant.d.ts index 0ad1ca6..42ca07a 100644 --- a/components/packages/Section/common/SectionDrawAssistant.d.ts +++ b/components/packages/Section/common/SectionDrawAssistant.d.ts @@ -1,7 +1,7 @@ import { GraphicDrawAssistant, GraphicInteractionPlugin, IDrawApp, IGraphicApp, JlGraphic, KeyListener, MenuItemOptions } from 'jl-graphic'; import { ISectionData, SectionTemplate } from './Section'; import { Point, Graphics, type FederatedMouseEvent, type IHitArea, type DisplayObject } from 'pixi.js'; -import { Section } from '../bjrtss/Section'; +import { Section } from '../GPSection'; export declare class SectionDraw extends GraphicDrawAssistant { points: Point[]; graphic: Graphics; diff --git a/components/packages/Section/common/SectionDrawAssistant.js b/components/packages/Section/common/SectionDrawAssistant.js index 175dbf4..df5515d 100644 --- a/components/packages/Section/common/SectionDrawAssistant.js +++ b/components/packages/Section/common/SectionDrawAssistant.js @@ -2,7 +2,7 @@ import { ContextMenu, GraphicDrawAssistant, KeyListener, calculateMirrorPoint, c import { SectionType, defaultDisplayConfig } from './Section.js'; import { Graphics, Point } from 'pixi.js'; import { Turnout } from '../../Turnout/Turnout.js'; -import { Section } from '../bjrtss/Section.js'; +import { Section } from '../GPSection.js'; class SectionDraw extends GraphicDrawAssistant { points = []; diff --git a/components/packages/Station/GPStation.d.ts b/components/packages/Station/GPStation.d.ts index a9644fa..918e7c5 100644 --- a/components/packages/Station/GPStation.d.ts +++ b/components/packages/Station/GPStation.d.ts @@ -1,5 +1,5 @@ import { GraphicState } from 'jl-graphic'; -import { JlStation } from './JlStation'; +import { JlStation } from './common/JlStation'; export interface IGPStationState extends GraphicState { id: number; } diff --git a/components/packages/Station/GPStation.js b/components/packages/Station/GPStation.js index 8b6de09..5967a67 100644 --- a/components/packages/Station/GPStation.js +++ b/components/packages/Station/GPStation.js @@ -1,4 +1,4 @@ -import { JlStation } from './JlStation.js'; +import { JlStation } from './common/JlStation.js'; import { StyleType } from '../../common/common.js'; class GPStation extends JlStation { diff --git a/components/packages/Station/THStation.d.ts b/components/packages/Station/THStation.d.ts index 0547bda..86ac0d1 100644 --- a/components/packages/Station/THStation.d.ts +++ b/components/packages/Station/THStation.d.ts @@ -1,5 +1,5 @@ import { GraphicState } from 'jl-graphic'; -import { ConstrolGraphic, JlStation } from './JlStation'; +import { ConstrolGraphic, JlStation } from './common/JlStation'; export interface ITHStationState extends GraphicState { get ipRtuStusDown(): boolean; set ipRtuStusDown(v: boolean); diff --git a/components/packages/Station/THStation.js b/components/packages/Station/THStation.js index 4331893..5c36728 100644 --- a/components/packages/Station/THStation.js +++ b/components/packages/Station/THStation.js @@ -1,5 +1,5 @@ -import { JlStation, ConstrolGraphic } from './JlStation.js'; -import { THConsts } from './StationConfig.js'; +import { JlStation, ConstrolGraphic } from './common/JlStation.js'; +import { THConsts } from './common/StationConfig.js'; import { StyleType } from '../../common/common.js'; class THStation extends JlStation { diff --git a/components/packages/Station/JlStation.d.ts b/components/packages/Station/common/JlStation.d.ts similarity index 100% rename from components/packages/Station/JlStation.d.ts rename to components/packages/Station/common/JlStation.d.ts diff --git a/components/packages/Station/JlStation.js b/components/packages/Station/common/JlStation.js similarity index 99% rename from components/packages/Station/JlStation.js rename to components/packages/Station/common/JlStation.js index 19d9877..67ad6d4 100644 --- a/components/packages/Station/JlStation.js +++ b/components/packages/Station/common/JlStation.js @@ -1,7 +1,7 @@ import { Container, Point, Graphics, Color } from 'pixi.js'; import { VectorText, JlGraphic } from 'jl-graphic'; import { stationConstsMap } from './StationConfig.js'; -import { StyleType } from '../../common/common.js'; +import { StyleType } from '../../../common/common.js'; class ConstrolGraphic extends Container { constrolConfig; diff --git a/components/packages/Station/StationConfig.d.ts b/components/packages/Station/common/StationConfig.d.ts similarity index 100% rename from components/packages/Station/StationConfig.d.ts rename to components/packages/Station/common/StationConfig.d.ts diff --git a/components/packages/Station/StationConfig.js b/components/packages/Station/common/StationConfig.js similarity index 97% rename from components/packages/Station/StationConfig.js rename to components/packages/Station/common/StationConfig.js index aa1e19c..3860192 100644 --- a/components/packages/Station/StationConfig.js +++ b/components/packages/Station/common/StationConfig.js @@ -1,4 +1,4 @@ -import { StyleType } from '../../common/common.js'; +import { StyleType } from '../../../common/common.js'; const GPConsts = { codeColor: '0xF48815', diff --git a/components/packages/Station/StationDrawAssistant.d.ts b/components/packages/Station/common/StationDrawAssistant.d.ts similarity index 100% rename from components/packages/Station/StationDrawAssistant.d.ts rename to components/packages/Station/common/StationDrawAssistant.d.ts diff --git a/components/packages/Station/StationDrawAssistant.js b/components/packages/Station/common/StationDrawAssistant.js similarity index 97% rename from components/packages/Station/StationDrawAssistant.js rename to components/packages/Station/common/StationDrawAssistant.js index 891d9aa..edb7b18 100644 --- a/components/packages/Station/StationDrawAssistant.js +++ b/components/packages/Station/common/StationDrawAssistant.js @@ -1,6 +1,6 @@ import { GraphicDrawAssistant, GraphicInteractionPlugin, AbsorbableLine } from 'jl-graphic'; import { JlStation } from './JlStation.js'; -import { StyleType } from '../../common/common.js'; +import { StyleType } from '../../../common/common.js'; class StationDraw extends GraphicDrawAssistant { codeGraph; diff --git a/components/packages/Station/StationTemplate.d.ts b/components/packages/Station/common/StationTemplate.d.ts similarity index 82% rename from components/packages/Station/StationTemplate.d.ts rename to components/packages/Station/common/StationTemplate.d.ts index ca66bf1..5594f8a 100644 --- a/components/packages/Station/StationTemplate.d.ts +++ b/components/packages/Station/common/StationTemplate.d.ts @@ -1,8 +1,8 @@ import { JlGraphicTemplate } from 'jl-graphic'; import { JlStation } from './JlStation'; import { IStationData } from './StationConfig'; -import { ITHStationState } from './THStation'; -import { IGPStationState } from './GPStation'; +import { ITHStationState } from '../THStation'; +import { IGPStationState } from '../GPStation'; import { StyleType } from 'common/common'; export declare class StationTemplate extends JlGraphicTemplate { hasControl?: boolean; diff --git a/components/packages/Station/StationTemplate.js b/components/packages/Station/common/StationTemplate.js similarity index 86% rename from components/packages/Station/StationTemplate.js rename to components/packages/Station/common/StationTemplate.js index edf9980..3077126 100644 --- a/components/packages/Station/StationTemplate.js +++ b/components/packages/Station/common/StationTemplate.js @@ -1,8 +1,8 @@ import { JlGraphicTemplate } from 'jl-graphic'; import { JlStation } from './JlStation.js'; -import { THStation } from './THStation.js'; -import { GPStation } from './GPStation.js'; -import { StyleType } from '../../common/common.js'; +import { THStation } from '../THStation.js'; +import { GPStation } from '../GPStation.js'; +import { StyleType } from '../../../common/common.js'; class StationTemplate extends JlGraphicTemplate { hasControl; diff --git a/src/packages/Section/common/SectionDrawAssistant.ts b/src/packages/Section/common/SectionDrawAssistant.ts index bb0a1aa..a10aa0f 100644 --- a/src/packages/Section/common/SectionDrawAssistant.ts +++ b/src/packages/Section/common/SectionDrawAssistant.ts @@ -46,7 +46,7 @@ import { import { Turnout } from 'src/packages/Turnout/Turnout'; import { AxleCounting } from 'src/packages/AxleCounting/AxleCounting'; import { DevicePort } from 'common/common'; -import { Section } from '../bjrtss/Section'; +import { Section } from '../GPSection'; export class SectionDraw extends GraphicDrawAssistant< SectionTemplate,