diff --git a/src/app/working-area/model/axLegend.ts b/src/app/working-area/model/axLegend.ts index 55359cf..55f4d8f 100644 --- a/src/app/working-area/model/axLegend.ts +++ b/src/app/working-area/model/axLegend.ts @@ -44,7 +44,7 @@ export class AxLegend extends AxShape { this.removeChildren(); let index = 1; let offset = 25; - let number = 2; + let number = this.assetData.PropertyInfos[0].PropertyValue; let width = 300; let height = 50; for (let i = 0; i < number; i++){ diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index f010069..28bcfcd 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -141,7 +141,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV // Beta版: 该版本相对于α版已有了很大的改进,消除了严重的错误,但还是存在着一些缺陷,需要经过多次测试来进一步消除,此版本主要的修改对像是软件的UI。 // RC版: 该版本已经相当成熟了,基本上不存在导致错误的BUG,与即将发行的正式版相差无几。 // Release版: 该版本意味“最终版本”,在前面版本的一系列测试版之后,终归会有一个正式版本,是最终交付用户使用的一个版本。该版本有时也称为标准版。一般情况下,Release不会以单词形式出现在软件封面上,取而代之的是符号®。 - public VERSION = '1.0.3.20210109_beta'; + public VERSION = '1.0.4.20210109_beta'; /** * 数据初始化 */ @@ -353,7 +353,8 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV /** * 创建图标事件(数据处理) */ - this.on('createIcon', (axShape:AxShape)=> { + this.on('createIcon', (axShape: AxShape) => { + console.log("新增图标:"+axShape.assetData.Name); if (axShape.assetData.GameMode === GameMode.BasicInformation) { // 基本信息 // 添加楼层数据 this.canvasData.originaleveryStoreyData.data[axShape.assetData.Id] = axShape.assetData; @@ -383,6 +384,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV var itemLegend = new Legend(axShape.assetData.Name, axShape.assetData.ImageUrl, 1); temp.addItem(itemLegend); } + this.emit('canvasDataChanged'); this.canvasData.isChange = true; }); /** @@ -420,6 +422,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV // } this.backgroundImage.removeChild(axShape); + this.emit('canvasDataChanged'); this.canvasData.isChange = true; }); } @@ -462,6 +465,8 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV icon.refresh(); } else if (icon instanceof AxArrowConnector) { icon.redraw(); + } else if (icon instanceof AxLegend) { + icon.refresh(); } } /** @@ -945,7 +950,21 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV const tempAssetData = { Id: "图例",//ObjectID.default.generate() Color: "#066EED80", - PropertyInfos:[] + PropertyInfos: [ + { + Tag : '', + Order : 0, + Enabled : true, + Visible : true, + Required : false, + RuleName : "", + RuleValue : "", + PhysicalUnit : "", + PropertyName : "列", + PropertyType : 2, + PropertyValue : 2, + }, + ] }; let shapeMap: Map = new Map();