From b8209228885c916fff5d5f0ee6a56b520e101d78 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Wed, 10 Jan 2024 16:16:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E5=8F=B0=E8=BD=A6=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/drawApp/commonApp.ts | 14 +++----------- src/drawApp/lineScene.ts | 14 +++----------- src/graphics/platform/Platform.ts | 4 ++-- src/graphics/station/Station.ts | 4 ++-- 5 files changed, 11 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index b0fe428..e697bb8 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "echarts": "^5.4.3", "google-protobuf": "^3.21.2", "jl-graphic": "git+https://git.code.tencent.com/jl-framework/graphic-pixi.git#v0.1.3", - "rt-graphic-component": "git+https://git.code.tencent.com/jl-framework/rt-graphic-component.git#v0.0.12", + "rt-graphic-component": "git+https://git.code.tencent.com/jl-framework/rt-graphic-component.git#3c3a0a2", "js-base64": "^3.7.5", "pinia": "^2.0.11", "quasar": "^2.6.0", diff --git a/src/drawApp/commonApp.ts b/src/drawApp/commonApp.ts index 97ea2a4..a576b68 100644 --- a/src/drawApp/commonApp.ts +++ b/src/drawApp/commonApp.ts @@ -20,7 +20,7 @@ import { ConcentrationDividingLineDraw } from 'src/graphics/concentrationDividin import { Polygon, PolygonTemplate } from 'src/graphics/polygon/Polygon'; import { PolygonData } from './graphics/PolygonInteraction'; import { PolygonDraw } from 'src/graphics/polygon/PolygonDrawAssistant'; -import { CategoryType as StyleType } from 'rt-graphic-component/components/packages/Platform/PlatformConfig'; +import { StyleType } from 'rt-graphic-component/components/common/common'; import { Platform } from 'src/graphics/platform/Platform'; import { PlatformData, PlatformState } from './graphics/PlatformInteraction'; import { PlatformTemplate } from 'rt-graphic-component/components/packages/Platform/PlatformTemplate'; @@ -160,11 +160,7 @@ export const DefaultCanvasMenu = new ContextMenu({ export function initCommonDrawApp(app: IDrawApp) { new PlatformDraw( app, - new PlatformTemplate( - new PlatformData(), - new PlatformState(), - StyleType.BeiJing - ), + new PlatformTemplate(new PlatformData(), new PlatformState(), StyleType.GP), 'svguse:../../drawIcon.svg#icon-platform' ); new ScreenDoorDraw( @@ -173,11 +169,7 @@ export function initCommonDrawApp(app: IDrawApp) { ); new StationDraw( app, - new StationTemplate( - new StationData(), - new StationState(), - StyleType.BeiJing - ), + new StationTemplate(new StationData(), new StationState(), StyleType.GP), 'svguse:../../drawIcon.svg#icon-station' ); // new SignalDraw(app, new SignalTemplate(new SignalData(), new SignalState())); diff --git a/src/drawApp/lineScene.ts b/src/drawApp/lineScene.ts index e87ec73..81ddf2c 100644 --- a/src/drawApp/lineScene.ts +++ b/src/drawApp/lineScene.ts @@ -27,7 +27,7 @@ import { PlatformOperateInteraction, PlatformState, } from './graphics/PlatformInteraction'; -import { CategoryType as StyleType } from 'rt-graphic-component/components/packages/Platform/PlatformConfig'; +import { StyleType } from 'rt-graphic-component/components/common/common'; import { Platform } from 'src/graphics/platform/Platform'; import { PlatformTemplate } from 'rt-graphic-component/components/packages/Platform/PlatformTemplate'; import { @@ -236,17 +236,9 @@ export function initLineScene(lineApp: IGraphicApp, sceneName: string) { const graphicTemplate = [ new TrainTemplate(new TrainState()), new SignalTemplate(new SignalData(), new SignalState()), - new PlatformTemplate( - new PlatformData(), - new PlatformState(), - StyleType.BeiJing - ), + new PlatformTemplate(new PlatformData(), new PlatformState(), StyleType.GP), new ScreenDoorTemplate(new ScreenDoorData(), new ScreenDoorState()), - new StationTemplate( - new StationData(), - new StationState(), - StyleType.BeiJing - ), + new StationTemplate(new StationData(), new StationState(), StyleType.GP), new TurnoutTemplate(new TurnoutData(), new TurnoutStates()), new SectionTemplate(new SectionData(), new SectionStates()), new AxleCountingTemplate(new AxleCountingData()), diff --git a/src/graphics/platform/Platform.ts b/src/graphics/platform/Platform.ts index 2992e1c..966faee 100644 --- a/src/graphics/platform/Platform.ts +++ b/src/graphics/platform/Platform.ts @@ -1,6 +1,6 @@ -import { XiAnPlatform as Platform } from 'rt-graphic-component/components/packages/Platform/XiAnPlatform'; +import { GPPlatform as Platform } from 'rt-graphic-component/components/packages/Platform/GPPlatform'; import { IPlatformData } from 'rt-graphic-component/components/packages/Platform/PlatformConfig'; -import { IXiAnPlatformState as IPlatformState } from 'rt-graphic-component/components/packages/Platform/XiAnPlatform'; +import { IGPPlatformState as IPlatformState } from 'rt-graphic-component/components/packages/Platform/GPPlatform'; export { Platform }; export type { IPlatformState, IPlatformData }; diff --git a/src/graphics/station/Station.ts b/src/graphics/station/Station.ts index fda2310..928d0b8 100644 --- a/src/graphics/station/Station.ts +++ b/src/graphics/station/Station.ts @@ -1,6 +1,6 @@ -import { BeiJingStation as Station } from 'rt-graphic-component/components/packages/Station/BeiJingStation'; +import { GPStation as Station } from 'rt-graphic-component/components/packages/Station/GPStation'; import { IStationData } from 'rt-graphic-component/components/packages/Station/StationConfig'; -import { IBeiJingStationState as IStationState } from 'rt-graphic-component/components/packages/Station/BeiJingStation'; +import { IGPStationState as IStationState } from 'rt-graphic-component/components/packages/Station/GPStation'; export { Station }; export type { IStationState, IStationData };