微调

src/components/draw-app/properties/PlatformProperty.vue

@@ -13,23 +13,29 @@
     <q-select
       outlined
       @blur="onUpdate"
-      v-model="hasDoor"
+      v-model="platformModel.hasdoor"
       :options="optionsDoor"
       label="是否有屏蔽门"
+      map-options
+      emit-value
     />
     <q-select
       outlined
       @blur="onUpdate"
-      v-model="direction"
+      v-model="platformModel.direction"
       :options="optionsDirection"
       label="方向"
+      map-options
+      emit-value
     />
     <q-select
       outlined
       @blur="onUpdate"
-      v-model="upAndDown"
+      v-model="platformModel.up"
       :options="optionsUpAndDown"
       label="上下行"
+      map-options
+      emit-value
     />
     <q-list bordered separator class="rounded-borders">
       <q-item>
@@ -55,42 +61,25 @@ import { onMounted, onUnmounted, reactive, ref } from 'vue';
 
 const drawStore = useDrawStore();
 const platformModel = reactive(new PlatformData());
-const hasDoor = ref('是');
-const optionsDoor = ['是', '否'];
-const direction = ref('向上');
-const upAndDown = ref('');
-const optionsDirection = ['向上', '向下'];
-const optionsUpAndDown = ['上行', '下行'];
 const stationName = ref('');
-enum showSelect {
-  是 = 'true',
-  否 = 'false',
-  向上 = 'up',
-  向下 = 'down',
-}
-enum showUp {
-  上行 = 'true',
-  下行 = 'false',
-}
-enum showSelectData {
-  true = '是',
-  false = '否',
-  up = '向上',
-  down = '向下',
-}
-enum showUpData {
-  true = '上行',
-  false = '下行',
-}
+const optionsDoor = [
+  { label: '是', value: true },
+  { label: '否', value: false },
+];
+const optionsDirection = [
+  { label: '向上', value: 'up' },
+  { label: '向下', value: 'down' },
+];
+const optionsUpAndDown = [
+  { label: '上行', value: true },
+  { label: '下行', value: false },
+];
 
 onMounted(() => {
   const platform = drawStore.selectedGraphic as Platform;
   if (platform) {
     platformModel.copyFrom(platform.saveData());
     drawStore.bindFormData(platformModel);
-    hasDoor.value = (showSelectData as never)[platformModel.hasdoor + ''];
-    direction.value = (showSelectData as never)[platformModel.direction];
-    upAndDown.value = (showUpData as never)[platformModel.up + ''];
     if (platformModel.refStation) {
       const refStation = platform.queryStore.queryById<Station>(
         platformModel.refStation
@@ -101,9 +90,6 @@ onMounted(() => {
 });
 
 function onUpdate() {
-  platformModel.hasdoor = JSON.parse((showSelect as never)[hasDoor.value]);
-  platformModel.direction = (showSelect as never)[direction.value];
-  platformModel.up = JSON.parse((showUp as never)[upAndDown.value]);
   const platform = drawStore.selectedGraphic as Platform;
   if (platform) {
     drawStore.getDrawApp().updateGraphicAndRecord(platform, platformModel);

src/components/draw-app/properties/StationLineProperty.vue

@@ -24,9 +24,11 @@
     <q-select
       outlined
       @blur="onUpdate"
-      v-model="hasTransfer"
+      v-model="stationLineModel.hasTransfer"
       :options="optionsCircle"
       label="是否有换乘"
+      map-options
+      emit-value
     />
   </q-form>
 </template>
@@ -39,32 +41,20 @@ import { onMounted, onUnmounted, reactive, ref } from 'vue';
 
 const drawStore = useDrawStore();
 const stationLineModel = reactive(new StationLineData());
-const hasTransfer = ref('是');
-const optionsCircle = ['是', '否'];
-enum showSelect {
-  是 = 'true',
-  否 = 'false',
-}
-enum showSelectData {
-  true = '是',
-  false = '否',
-}
+const optionsCircle = [
+  { label: '是', value: true },
+  { label: '否', value: false },
+];
 
 onMounted(() => {
   const stationLine = drawStore.selectedGraphic as StationLine;
   if (stationLine) {
     stationLineModel.copyFrom(stationLine.saveData());
     drawStore.bindFormData(stationLineModel);
-    hasTransfer.value = (showSelectData as never)[
-      stationLineModel.hasTransfer + ''
-    ];
   }
 });
 
 function onUpdate() {
-  stationLineModel.hasTransfer = JSON.parse(
-    (showSelect as never)[hasTransfer.value]
-  );
   const stationLine = drawStore.selectedGraphic as StationLine;
   if (stationLine) {
     drawStore

src/components/draw-app/properties/StationProperty.vue

@@ -40,16 +40,20 @@
     <q-select
       outlined
       @blur="onUpdate"
-      v-model="hasControl"
+      v-model="stationModel.hasControl"
       :options="optionsControl"
       label="是否有控制"
+      map-options
+      emit-value
     />
     <q-select
       outlined
       @blur="onUpdate"
-      v-model="concentrationStations"
+      v-model="stationModel.concentrationStations"
       :options="optionsControl"
       label="是否集中站"
+      map-options
+      emit-value
     />
   </q-form>
 </template>
@@ -58,21 +62,14 @@
 import { StationData } from 'src/drawApp/graphics/StationInteraction';
 import { Station } from 'src/graphics/station/Station';
 import { useDrawStore } from 'src/stores/draw-store';
-import { onMounted, onUnmounted, reactive, ref } from 'vue';
+import { onMounted, onUnmounted, reactive } from 'vue';
 
 const drawStore = useDrawStore();
 const stationModel = reactive(new StationData());
-const hasControl = ref('是');
-const concentrationStations = ref('否');
-const optionsControl = ['是', '否'];
-enum showSelect {
-  是 = 'true',
-  否 = 'false',
-}
-enum showSelectData {
-  true = '是',
-  false = '否',
-}
+const optionsControl = [
+  { label: '是', value: true },
+  { label: '否', value: false },
+];
 const kilometerSystem = reactive({ coordinateSystem: '', kilometer: 0 });
 
 const CoordinateSystemOptions = [
@@ -87,10 +84,6 @@ onMounted(() => {
   if (station) {
     stationModel.copyFrom(station.saveData());
     drawStore.bindFormData(stationModel);
-    hasControl.value = (showSelectData as never)[stationModel.hasControl + ''];
-    concentrationStations.value = (showSelectData as never)[
-      stationModel.concentrationStations + ''
-    ];
     if (stationModel.kilometerSystem) {
       kilometerSystem.coordinateSystem =
         stationModel.kilometerSystem.coordinateSystem;
@@ -100,10 +93,6 @@ onMounted(() => {
 });
 
 function onUpdate() {
-  stationModel.hasControl = JSON.parse((showSelect as never)[hasControl.value]);
-  stationModel.concentrationStations = JSON.parse(
-    (showSelect as never)[concentrationStations.value]
-  );
   stationModel.kilometerSystem = {
     coordinateSystem: kilometerSystem.coordinateSystem,
     kilometer: kilometerSystem.kilometer,

src/drawApp/graphics/LinkInteraction.ts

@@ -6,7 +6,7 @@ import { GraphicDataBase } from './GraphicDataBase';
 import { ContextMenu } from 'src/jl-graphic/ui/ContextMenu';
 import { MenuItemOptions } from 'src/jl-graphic/ui/Menu';
 import {
-  GraphicApp,
+  IGraphicApp,
   GraphicInteractionPlugin,
   JlGraphic,
 } from 'src/jl-graphic';
@@ -119,12 +119,12 @@ const EpEditMenu: ContextMenu = ContextMenu.init({
 
 export class DrawLinkPlugin extends GraphicInteractionPlugin<Link> {
   static Name = 'link_draw_right_menu';
-  constructor(app: GraphicApp) {
+  constructor(app: IGraphicApp) {
     super(DrawLinkPlugin.Name, app);
     app.registerMenu(LinkEditMenu);
     app.registerMenu(EpEditMenu);
   }
-  static init(app: GraphicApp) {
+  static init(app: IGraphicApp) {
     return new DrawLinkPlugin(app);
   }
   filter(...grahpics: JlGraphic[]): Link[] | undefined {

src/drawApp/graphics/LogicSectionInteraction.ts

@@ -10,7 +10,7 @@ import { graphicData } from 'src/protos/stationLayoutGraphics';
 import { DisplayObject, FederatedMouseEvent, IPointData } from 'pixi.js';
 import { state } from 'src/protos/device_status';
 import {
-  GraphicApp,
+  IGraphicApp,
   GraphicInteractionPlugin,
   JlGraphic,
 } from 'src/jl-graphic';
@@ -81,14 +81,14 @@ const LogicSectionMenu = ContextMenu.init({
 
 export class LogicSectionOperationPlugin extends GraphicInteractionPlugin<LogicSection> {
   static Name = 'logic_section_menu';
-  constructor(app: GraphicApp) {
+  constructor(app: IGraphicApp) {
     super(LogicSectionOperationPlugin.Name, app);
     app.registerMenu(LogicSectionMenu);
   }
   filter(...grahpics: JlGraphic[]): LogicSection[] | undefined {
     return grahpics.filter((g): g is LogicSection => g instanceof LogicSection);
   }
-  static init(app: GraphicApp) {
+  static init(app: IGraphicApp) {
     return new LogicSectionOperationPlugin(app);
   }
   bind(g: LogicSection): void {

src/drawApp/graphics/PlatformInteraction.ts

@@ -10,7 +10,7 @@ import { state } from 'src/protos/device_status';
 import { MenuItemOptions } from 'src/jl-graphic/ui/Menu';
 import { ContextMenu } from 'src/jl-graphic/ui/ContextMenu';
 import {
-  GraphicApp,
+  IGraphicApp,
   GraphicInteractionPlugin,
   JlGraphic,
 } from 'src/jl-graphic';
@@ -224,11 +224,11 @@ const PlatformOperateMenu: ContextMenu = ContextMenu.init({
 
 export class PlatformOperateInteraction extends GraphicInteractionPlugin<Platform> {
   static Name = 'platform_operate_menu';
-  constructor(app: GraphicApp) {
+  constructor(app: IGraphicApp) {
     super(PlatformOperateInteraction.Name, app);
     app.registerMenu(PlatformOperateMenu);
   }
-  static init(app: GraphicApp) {
+  static init(app: IGraphicApp) {
     return new PlatformOperateInteraction(app);
   }
   filter(...grahpics: JlGraphic[]): Platform[] | undefined {

src/drawApp/graphics/PolygonInteraction.ts

@@ -4,7 +4,7 @@ import { graphicData } from 'src/protos/stationLayoutGraphics';
 import { GraphicDataBase } from './GraphicDataBase';
 import { DisplayObject, FederatedMouseEvent, IPointData } from 'pixi.js';
 import {
-  GraphicApp,
+  IGraphicApp,
   GraphicInteractionPlugin,
   JlGraphic,
 } from 'src/jl-graphic';
@@ -128,12 +128,12 @@ const EpEditMenu: ContextMenu = ContextMenu.init({
 
 export class DrawPolygonPlugin extends GraphicInteractionPlugin<Polygon> {
   static Name = 'polygon_draw_right_menu';
-  constructor(app: GraphicApp) {
+  constructor(app: IGraphicApp) {
     super(DrawPolygonPlugin.Name, app);
     app.registerMenu(PolygonEditMenu);
     app.registerMenu(EpEditMenu);
   }
-  static init(app: GraphicApp) {
+  static init(app: IGraphicApp) {
     return new DrawPolygonPlugin(app);
   }
   filter(...grahpics: JlGraphic[]): Polygon[] | undefined {

src/drawApp/graphics/RunLineInteraction.ts

@@ -8,7 +8,7 @@ import { graphicData } from 'src/protos/stationLayoutGraphics';
 import { GraphicDataBase } from './GraphicDataBase';
 import {
   GraphicInteractionPlugin,
-  GraphicApp,
+  IGraphicApp,
   JlGraphic,
 } from 'src/jl-graphic';
 import { ContextMenu } from 'src/jl-graphic/ui/ContextMenu';
@@ -133,12 +133,12 @@ const EpEditMenu: ContextMenu = ContextMenu.init({
 
 export class DrawRunLinePlugin extends GraphicInteractionPlugin<RunLine> {
   static Name = 'runline_draw_right_menu';
-  constructor(app: GraphicApp) {
+  constructor(app: IGraphicApp) {
     super(DrawRunLinePlugin.Name, app);
     app.registerMenu(RunLineEditMenu);
     app.registerMenu(EpEditMenu);
   }
-  static init(app: GraphicApp) {
+  static init(app: IGraphicApp) {
     return new DrawRunLinePlugin(app);
   }
   filter(...grahpics: JlGraphic[]): RunLine[] | undefined {
@@ -221,11 +221,11 @@ export class DrawRunLinePlugin extends GraphicInteractionPlugin<RunLine> {
 
 export class RunLineOperateInteraction extends GraphicInteractionPlugin<RunLine> {
   static Name = 'runLine_operate_menu';
-  constructor(app: GraphicApp) {
+  constructor(app: IGraphicApp) {
     super(RunLineOperateInteraction.Name, app);
     app.registerMenu(EpEditMenu);
   }
-  static init(app: GraphicApp) {
+  static init(app: IGraphicApp) {
     return new RunLineOperateInteraction(app);
   }
   filter(...grahpics: JlGraphic[]): RunLine[] | undefined {

src/drawApp/graphics/SignalInteraction.ts

@@ -9,7 +9,7 @@ import { graphicData } from 'src/protos/stationLayoutGraphics';
 import { GraphicDataBase, GraphicStateBase } from './GraphicDataBase';
 import {
   GraphicInteractionPlugin,
-  GraphicApp,
+  IGraphicApp,
   JlGraphic,
 } from 'src/jl-graphic';
 import { ContextMenu } from 'src/jl-graphic/ui/ContextMenu';
@@ -283,11 +283,11 @@ const SignalOperateMenu: ContextMenu = ContextMenu.init({
 });
 export class DrawSignalInteraction extends GraphicInteractionPlugin<Signal> {
   static Name = 'signal_draw_right_menu';
-  constructor(app: GraphicApp) {
+  constructor(app: IGraphicApp) {
     super(DrawSignalInteraction.Name, app);
     app.registerMenu(SignalEditMenu);
   }
-  static init(app: GraphicApp) {
+  static init(app: IGraphicApp) {
     return new DrawSignalInteraction(app);
   }
   filter(...grahpics: JlGraphic[]): Signal[] | undefined {
@@ -316,11 +316,11 @@ export class DrawSignalInteraction extends GraphicInteractionPlugin<Signal> {
 
 export class SignalOperateInteraction extends GraphicInteractionPlugin<Signal> {
   static Name = 'signal_operate_menu';
-  constructor(app: GraphicApp) {
+  constructor(app: IGraphicApp) {
     super(SignalOperateInteraction.Name, app);
     app.registerMenu(SignalOperateMenu);
   }
-  static init(app: GraphicApp) {
+  static init(app: IGraphicApp) {
     return new SignalOperateInteraction(app);
   }
   filter(...grahpics: JlGraphic[]): Signal[] | undefined {

src/drawApp/graphics/StationInteraction.ts

@@ -10,7 +10,7 @@ import { state } from 'src/protos/device_status';
 import { MenuItemOptions } from 'src/jl-graphic/ui/Menu';
 import { ContextMenu } from 'src/jl-graphic/ui/ContextMenu';
 import {
-  GraphicApp,
+  IGraphicApp,
   GraphicInteractionPlugin,
   JlGraphic,
 } from 'src/jl-graphic';
@@ -160,11 +160,11 @@ const StationOperateMenu: ContextMenu = ContextMenu.init({
 
 export class StationOperateInteraction extends GraphicInteractionPlugin<Station> {
   static Name = 'station_operate_menu';
-  constructor(app: GraphicApp) {
+  constructor(app: IGraphicApp) {
     super(StationOperateInteraction.Name, app);
     app.registerMenu(StationOperateMenu);
   }
-  static init(app: GraphicApp) {
+  static init(app: IGraphicApp) {
     return new StationOperateInteraction(app);
   }
   filter(...grahpics: JlGraphic[]): Station[] | undefined {

src/drawApp/graphics/TrainInteraction.ts

@@ -7,7 +7,7 @@ import { train } from 'src/protos/train';
 import { MenuItemOptions } from 'src/jl-graphic/ui/Menu';
 import { ContextMenu } from 'src/jl-graphic/ui/ContextMenu';
 import {
-  GraphicApp,
+  IGraphicApp,
   GraphicInteractionPlugin,
   JlGraphic,
   VectorText,
@@ -269,12 +269,12 @@ const TrainOperateMenu: ContextMenu = ContextMenu.init({
 export class TrainOperateInteraction extends GraphicInteractionPlugin<Train> {
   static Name = 'train_operate_menu';
   hoverLaber: TrainHoverLabel;
-  constructor(app: GraphicApp) {
+  constructor(app: IGraphicApp) {
     super(TrainOperateInteraction.Name, app);
     this.hoverLaber = new TrainHoverLabel();
     app.registerMenu(TrainOperateMenu);
   }
-  static init(app: GraphicApp) {
+  static init(app: IGraphicApp) {
     return new TrainOperateInteraction(app);
   }
   filter(...grahpics: JlGraphic[]): Train[] | undefined {

src/drawApp/graphics/TurnoutInteraction.ts

@@ -10,7 +10,7 @@ import { DisplayObject, FederatedMouseEvent, IPointData } from 'pixi.js';
 import { KilometerSystem } from 'src/graphics/signal/Signal';
 import { state } from 'src/protos/device_status';
 import {
-  GraphicApp,
+  IGraphicApp,
   GraphicInteractionPlugin,
   JlGraphic,
 } from 'src/jl-graphic';
@@ -139,14 +139,14 @@ const TurnoutOperateMenu = ContextMenu.init({
 
 export class TurnoutOperationPlugin extends GraphicInteractionPlugin<Turnout> {
   static Name = 'turnout_operate_menu';
-  constructor(app: GraphicApp) {
+  constructor(app: IGraphicApp) {
     super(TurnoutOperationPlugin.Name, app);
     app.registerMenu(TurnoutOperateMenu);
   }
   filter(...grahpics: JlGraphic[]): Turnout[] | undefined {
     return grahpics.filter((g): g is Turnout => g instanceof Turnout);
   }
-  static init(app: GraphicApp) {
+  static init(app: IGraphicApp) {
     return new TurnoutOperationPlugin(app);
   }
   bind(g: Turnout): void {