From 70b443db6e56bbf05c65f9191ce32d418533dcb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com>
Date: Tue, 19 Jan 2021 17:15:46 +0800
Subject: [PATCH] 1.0.10.20210118b
---
.../working-area/model/axArrowConnector.ts | 4 +-
.../working-area/working-area.component.ts | 44 +++++++++----------
2 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/src/app/working-area/model/axArrowConnector.ts b/src/app/working-area/model/axArrowConnector.ts
index 6bd8b3f..d9ba040 100644
--- a/src/app/working-area/model/axArrowConnector.ts
+++ b/src/app/working-area/model/axArrowConnector.ts
@@ -36,7 +36,7 @@ export class AxArrowConnector extends AxShape {
this.markerStart = markerStart;
this.markerEnd = markerEnd;
-
+ this.position = this.assetData.Point;
this.name = assetData.Id;
this.text = new PIXI.Text(this.assetData.Name
+ '\r\n'
@@ -154,7 +154,7 @@ export class AxArrowConnector extends AxShape {
+ this.assetData.PropertyInfos?.find(item => item.PropertyName === '名称/编号')?.PropertyValue;
const strokeWidth = 1;
- const edgeWidth = this.assetData.Thickness === 0 ? 1 : this.assetData.Thickness; // 宽度
+ const edgeWidth = this.assetData.Thickness === 0 ? 5 : this.assetData.Thickness; // 宽度
const startWidth = edgeWidth * 2 + strokeWidth;
const endWidth = edgeWidth * 2 + strokeWidth;
diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts
index 98755ea..04d2c17 100644
--- a/src/app/working-area/working-area.component.ts
+++ b/src/app/working-area/working-area.component.ts
@@ -148,7 +148,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
* RC版: 该版本已经相当成熟了，基本上不存在导致错误的BUG，与即将发行的正式版相差无几。
* Release版: 该版本意味“最终版本”，在前面版本的一系列测试版之后，终归会有一个正式版本，是最终交付用户使用的一个版本。该版本有时也称为标准版。一般情况下，Release不会以单词形式出现在软件封面上，取而代之的是符号®。
*/
- public VERSION = '1.0.9.20210118_beta';
+ public VERSION = '1.0.10.20210118_beta';
/**
* 数据初始化
*/
@@ -394,8 +394,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
this.canvasData.selectPanelPoint.Data = new FloorNodeData();
}
this.canvasData.selectPanelPoint.Data.Stock[axShape.assetData.Id] = axShape.assetData;
- }
- else if (axShape.assetData.GameMode === GameMode.Examinee) { // 考生考试
+ } else if (axShape.assetData.GameMode === GameMode.Examinee) { // 考生考试
if (axShape.assetData.Tag === 1) {
this.canvasData.examOriginaleveryStoreyData.data[axShape.assetData.Id] = axShape.assetData;
} else {
@@ -439,8 +438,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
delete this.canvasData.selectPanelPoint.Data.DefinedIncrement[axShape.assetData.Id];
delete this.canvasData.selectPanelPoint.Data.Increment[axShape.assetData.Id];
delete this.canvasData.selectPanelPoint.Data.Stock[axShape.assetData.Id];
- }
- else if (axShape.assetData.GameMode === GameMode.Examinee) { // 考生考试
+ } else if (axShape.assetData.GameMode === GameMode.Examinee) { // 考生考试
if (axShape.assetData.Tag === 1) {
// 删除楼层数据
delete this.canvasData.examOriginaleveryStoreyData.data[axShape.assetData.Id];
@@ -1339,16 +1337,16 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
await this.refreshBackgroundImage();
// 清空所有图形
this.selection.deselectAll();
- let itemList = [];
- this.backgroundImage.children.forEach(item => {
- if (item instanceof AxShape && item instanceof AxPreviewImageShape===false) {
- itemList.push(item.name);
+ const itemList = [];
+ this.backgroundImage.children.forEach(item => {
+ if (item instanceof AxShape && item instanceof AxPreviewImageShape === false) {
+ itemList.push(item.name);
}
});
- itemList.forEach(item => {
+ itemList.forEach(item => {
this.backgroundImage.getChildByName(item).destroy();
- })
+ });
// 创建楼层图形
this.createFloorShape(this.canvasData.examOriginaleveryStoreyData.data);
// 创建楼层图形
@@ -1366,16 +1364,16 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
await this.refreshBackgroundImage();
// 清空所有图形
this.selection.deselectAll();
- let itemList = [];
- this.backgroundImage.children.forEach(item => {
- if (item instanceof AxShape && item instanceof AxPreviewImageShape===false) {
- itemList.push(item.name);
+ const itemList = [];
+ this.backgroundImage.children.forEach(item => {
+ if (item instanceof AxShape && item instanceof AxPreviewImageShape === false) {
+ itemList.push(item.name);
}
});
- itemList.forEach(item => {
+ itemList.forEach(item => {
this.backgroundImage.getChildByName(item).destroy();
- })
+ });
// 创建楼层图形
this.createFloorShape(this.canvasData.examOriginaleveryStoreyData.data);
// 创建楼层图形
@@ -1392,16 +1390,16 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
await this.refreshBackgroundImage();
// 清空所有图形
this.selection.deselectAll();
- let itemList = [];
- this.backgroundImage.children.forEach(item => {
- if (item instanceof AxShape && item instanceof AxPreviewImageShape===false) {
- itemList.push(item.name);
+ const itemList = [];
+ this.backgroundImage.children.forEach(item => {
+ if (item instanceof AxShape && item instanceof AxPreviewImageShape === false) {
+ itemList.push(item.name);
}
});
- itemList.forEach(item => {
+ itemList.forEach(item => {
this.backgroundImage.getChildByName(item).destroy();
- })
+ });
// 创建楼层图形
this.createFloorShape(this.canvasData.originaleveryStoreyData.data);
// 创建处置预案图形