|
|
|
@ -16,7 +16,7 @@ import { GameMode } from 'src/app/working-area/model/gameMode'; |
|
|
|
import { ActivatedRoute, Router } from '@angular/router'; |
|
|
|
import { ActivatedRoute, Router } from '@angular/router'; |
|
|
|
import { MaskLayerService } from 'src/app/mask-layer.service'; |
|
|
|
import { MaskLayerService } from 'src/app/mask-layer.service'; |
|
|
|
import * as ObjectID from 'bson-objectid'; |
|
|
|
import * as ObjectID from 'bson-objectid'; |
|
|
|
|
|
|
|
import { AxMessageSystem } from 'src/app/working-area/model/axMessageSystem'; |
|
|
|
@Component({ |
|
|
|
@Component({ |
|
|
|
selector: 'app-collection-tools', |
|
|
|
selector: 'app-collection-tools', |
|
|
|
templateUrl: './collection-tools.component.html', |
|
|
|
templateUrl: './collection-tools.component.html', |
|
|
|
@ -82,9 +82,11 @@ export class CollectionToolsComponent implements OnInit { |
|
|
|
setTimeout(() => { |
|
|
|
setTimeout(() => { |
|
|
|
obj.PropertyInfos.forEach(item => { |
|
|
|
obj.PropertyInfos.forEach(item => { |
|
|
|
if(item.PropertyType == 4){ |
|
|
|
if(item.PropertyType == 4){ |
|
|
|
this.gallery = new Viewer(document.getElementById('viewerjs'),{ |
|
|
|
if(document.getElementById('viewerjs')){ |
|
|
|
url: 'data-original' |
|
|
|
this.gallery = new Viewer(document.getElementById('viewerjs'),{ |
|
|
|
}); |
|
|
|
url: 'data-original' |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
}) |
|
|
|
}, 0); |
|
|
|
}, 0); |
|
|
|
@ -619,28 +621,74 @@ export class CollectionToolsComponent implements OnInit { |
|
|
|
this.canvasData.isChange = true |
|
|
|
this.canvasData.isChange = true |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
isMultipleAsset:boolean = false//框选多个素材属性显隐
|
|
|
|
|
|
|
|
multipleAsset:any = { |
|
|
|
|
|
|
|
Width:null, |
|
|
|
|
|
|
|
Height:null, |
|
|
|
|
|
|
|
Angle:null, |
|
|
|
|
|
|
|
Thickness:null, |
|
|
|
|
|
|
|
Color:null, |
|
|
|
|
|
|
|
PropertyInfos:[] |
|
|
|
|
|
|
|
}//多个素材共同属性
|
|
|
|
|
|
|
|
multipleAssetData:any//当前多选的素材
|
|
|
|
|
|
|
|
firstMultipleAssetData:any//当前多选的第一个素材
|
|
|
|
|
|
|
|
ngOnInit(): void { |
|
|
|
|
|
|
|
|
|
|
|
isSixShow = true
|
|
|
|
let _this = this |
|
|
|
isSixbtn = true //控制想定作业编辑按钮
|
|
|
|
AxMessageSystem.addListener('selectionChanged', ()=>{ |
|
|
|
isxxx = true //控制查看编辑模式的编辑模式按钮
|
|
|
|
if(this.canvas.selection.size() == 1){//如果是单选
|
|
|
|
|
|
|
|
this.isMultipleAsset = false |
|
|
|
|
|
|
|
// console.log('单选',this.canvas.selection.first().assetData)
|
|
|
|
|
|
|
|
this.setAssetsProperty(this.canvas.selection.first().assetData) |
|
|
|
|
|
|
|
}else if(this.canvas.selection.size()){ |
|
|
|
|
|
|
|
// console.log('多选')
|
|
|
|
|
|
|
|
this.isShowProperty = true |
|
|
|
|
|
|
|
this.multipleAssetData = this.canvas.selection.all() |
|
|
|
|
|
|
|
this.firstMultipleAssetData = this.canvas.selection.first() |
|
|
|
|
|
|
|
this.multipleAsset = { |
|
|
|
|
|
|
|
Width:null, |
|
|
|
|
|
|
|
Height:null, |
|
|
|
|
|
|
|
Angle:null, |
|
|
|
|
|
|
|
Thickness:null, |
|
|
|
|
|
|
|
Color:null, |
|
|
|
|
|
|
|
PropertyInfos:[] |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
this.isMultipleAsset = true |
|
|
|
|
|
|
|
let firstAssetData = this.canvas.selection.first().assetData;//拿出第一个素材作为例子与其他素材进行对比
|
|
|
|
|
|
|
|
let InteractiveMode = firstAssetData.InteractiveMode //素材连接方式
|
|
|
|
|
|
|
|
let isInteractiveMode = this.canvas.selection.all().every(item => item.assetData.InteractiveMode === InteractiveMode) |
|
|
|
|
|
|
|
if(isInteractiveMode){ |
|
|
|
|
|
|
|
this.multipleAsset.InteractiveMode = InteractiveMode |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
let isFillMode = this.canvas.selection.all().every(item => item.assetData.FillMode === 0) //素材填充方式都为0
|
|
|
|
|
|
|
|
if(isFillMode){ |
|
|
|
|
|
|
|
this.multipleAsset.FillMode = 0 |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
this.canvas.selection.first().assetData.PropertyInfos.forEach(i => { |
|
|
|
|
|
|
|
let index = 0 |
|
|
|
|
|
|
|
this.canvas.selection.all().forEach(item => { |
|
|
|
|
|
|
|
item.assetData.PropertyInfos.forEach(element => { |
|
|
|
|
|
|
|
if(element.PropertyName == i.PropertyName && element.PropertyType == i.PropertyType && element.PropertyType != 3 && element.PropertyType != 4){ |
|
|
|
|
|
|
|
index++ |
|
|
|
|
|
|
|
if(index == this.canvas.selection.size()){ |
|
|
|
|
|
|
|
let newElement = JSON.parse(JSON.stringify(element)) |
|
|
|
|
|
|
|
newElement.PropertyValue = '' |
|
|
|
|
|
|
|
this.multipleAsset.PropertyInfos.push(newElement) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
}else if(this.canvas.selection.size() == 0){ |
|
|
|
|
|
|
|
this.isShowProperty = false |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}, this) |
|
|
|
|
|
|
|
|
|
|
|
ngOnInit(): void { |
|
|
|
|
|
|
|
this.canvasData.gameMode = GameMode.Assignment |
|
|
|
this.canvasData.gameMode = GameMode.Assignment |
|
|
|
if(this.router.url.indexOf("keyUnit/viewunitinfoplan") == -1 && this.router.url.indexOf("keyUnit/viewunitinfo") != -1 || this.router.url.indexOf("keyUnit/editplaninfo")!= -1){ |
|
|
|
if (sessionStorage.getItem('editable') == "0") { //查看模式
|
|
|
|
this.isSixbtn = false |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(!this.isSixbtn && sessionStorage.getItem("six") == "edit"){ |
|
|
|
|
|
|
|
this.isSixShow = true |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(!this.isSixbtn && sessionStorage.getItem("six") == "look"){ |
|
|
|
|
|
|
|
this.isEditPattern = false |
|
|
|
this.isEditPattern = false |
|
|
|
this.isxxx = false |
|
|
|
} else { |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (sessionStorage.getItem('editable') == "0") { |
|
|
|
|
|
|
|
this.isEditPattern = false |
|
|
|
|
|
|
|
this.isxxx = false |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
this.getAllLibrary('plan') //获取素材库
|
|
|
|
this.getAllLibrary('plan') //获取素材库
|
|
|
|
@ -655,28 +703,115 @@ export class CollectionToolsComponent implements OnInit { |
|
|
|
event.preventDefault(); |
|
|
|
event.preventDefault(); |
|
|
|
}; |
|
|
|
}; |
|
|
|
}) |
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
this.canvasData.getMessage().subscribe((message: any)=>{ |
|
|
|
this.canvasData.getMessage().subscribe((message: any)=>{ |
|
|
|
if(message == "send a message"){ |
|
|
|
if(message == "send a message"){ |
|
|
|
this.refurbishTreeData() |
|
|
|
this.refurbishTreeData() |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//多选宽度共同改变
|
|
|
|
|
|
|
|
multipleAssetWidthInput(){ |
|
|
|
|
|
|
|
this.multipleAssetData.forEach(item=>{ |
|
|
|
|
|
|
|
item.assetData.Width = this.multipleAsset.Width |
|
|
|
|
|
|
|
this.canvas.refreshIcon(item.assetData.Id) |
|
|
|
|
|
|
|
this.canvasData.isChange = true |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//多选高度共同改变
|
|
|
|
|
|
|
|
multipleAssetHeightInput(){ |
|
|
|
|
|
|
|
this.multipleAssetData.forEach(item=>{ |
|
|
|
|
|
|
|
item.assetData.Height = this.multipleAsset.Height |
|
|
|
|
|
|
|
this.canvas.refreshIcon(item.assetData.Id) |
|
|
|
|
|
|
|
this.canvasData.isChange = true |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//多选角度共同改变
|
|
|
|
|
|
|
|
multipleAssetAngleInput(){ |
|
|
|
|
|
|
|
this.multipleAssetData.forEach(item=>{ |
|
|
|
|
|
|
|
item.assetData.Angle = this.multipleAsset.Angle |
|
|
|
|
|
|
|
this.canvas.refreshIcon(item.assetData.Id) |
|
|
|
|
|
|
|
this.canvasData.isChange = true |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//多选厚度共同改变
|
|
|
|
|
|
|
|
multipleAssetThicknessInput(){ |
|
|
|
|
|
|
|
this.multipleAssetData.forEach(item=>{ |
|
|
|
|
|
|
|
item.assetData.Thickness = this.multipleAsset.Thickness |
|
|
|
|
|
|
|
this.canvas.refreshIcon(item.assetData.Id) |
|
|
|
|
|
|
|
this.canvasData.isChange = true |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//多选颜色共同改变
|
|
|
|
|
|
|
|
multipleSelectedcolor:any |
|
|
|
|
|
|
|
multipleAssetSelectcolor(item,key){ |
|
|
|
|
|
|
|
//在当前透明度基础上改变颜色
|
|
|
|
|
|
|
|
this.multipleSelectedcolor = item |
|
|
|
|
|
|
|
this.multipleAssetData.forEach(item=>{ |
|
|
|
|
|
|
|
item.assetData.Color = this.multipleSelectedcolor |
|
|
|
|
|
|
|
this.canvasData.isChange = true |
|
|
|
|
|
|
|
this.canvas.refreshIcon(item.assetData.Id) |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//多选颜色滑竿改变
|
|
|
|
|
|
|
|
multipleColorDivSliderChange(){ |
|
|
|
|
|
|
|
let colorOpacity = Math.round(255 * this.colorDivSliderValue * 0.01)
|
|
|
|
|
|
|
|
//根据滑竿值改变16进制颜色后两位
|
|
|
|
|
|
|
|
function replacepos(text,start,stop,replacetext){ |
|
|
|
|
|
|
|
let mystr = text.substring(0,stop-1)+replacetext+text.substring(stop+1); |
|
|
|
|
|
|
|
return mystr; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
this.multipleAssetData.forEach(item=>{ |
|
|
|
|
|
|
|
this.multipleSelectedcolor = replacepos(this.multipleSelectedcolor,7,8,colorOpacity.toString(16)) |
|
|
|
|
|
|
|
item.assetData.Color = this.multipleSelectedcolor |
|
|
|
|
|
|
|
this.canvasData.isChange = true |
|
|
|
|
|
|
|
this.canvas.refreshIcon(item.assetData.Id) |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//多选状态动态属性素材input框值改变
|
|
|
|
|
|
|
|
multipleAssetInputChange(i,e){ |
|
|
|
|
|
|
|
e.stopPropagation() |
|
|
|
|
|
|
|
this.multipleAssetData.forEach(item=>{ |
|
|
|
|
|
|
|
item.assetData.PropertyInfos.forEach(element => { |
|
|
|
|
|
|
|
if(element.PropertyName == i.PropertyName){ |
|
|
|
|
|
|
|
element.PropertyValue = i.PropertyValue |
|
|
|
|
|
|
|
this.canvas.refreshIcon(item.assetData.Id) |
|
|
|
|
|
|
|
this.canvasData.isChange = true |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//多选状态动态属性素材radio框值改变
|
|
|
|
|
|
|
|
multipleAssetRadioChange(i,value){ |
|
|
|
|
|
|
|
// e.stopPropagation()
|
|
|
|
|
|
|
|
this.multipleAssetData.forEach(item=>{ |
|
|
|
|
|
|
|
item.assetData.PropertyInfos.forEach(element => { |
|
|
|
|
|
|
|
if(element.PropertyName == i.PropertyName){ |
|
|
|
|
|
|
|
element.PropertyValue = value |
|
|
|
|
|
|
|
this.canvas.refreshIcon(item.assetData.Id) |
|
|
|
|
|
|
|
this.canvasData.isChange = true |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//多选状态动态属性素材下拉框值改变
|
|
|
|
|
|
|
|
multipleSupplyArea(i,e){ |
|
|
|
|
|
|
|
e.stopPropagation() |
|
|
|
|
|
|
|
this.multipleAssetData.forEach(item=>{ |
|
|
|
|
|
|
|
item.assetData.PropertyInfos.forEach(element => { |
|
|
|
|
|
|
|
if(element.PropertyName == i.PropertyName){ |
|
|
|
|
|
|
|
element.PropertyValue = i.PropertyValue |
|
|
|
|
|
|
|
this.canvas.refreshIcon(item.assetData.Id) |
|
|
|
|
|
|
|
this.canvasData.isChange = true |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
ngAfterViewInit(): void { |
|
|
|
ngAfterViewInit(): void { |
|
|
|
|
|
|
|
|
|
|
|
this.getSitePlan() |
|
|
|
this.getSitePlan() |
|
|
|
// 监听canvas组件选中素材事件
|
|
|
|
|
|
|
|
this.canvas.on("select",obj=>{ |
|
|
|
|
|
|
|
//选中素材属性注入函数
|
|
|
|
|
|
|
|
this.setAssetsProperty(obj.assetData) |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
// 监听canvas组件取消选中素材事件
|
|
|
|
|
|
|
|
this.canvas.on("deselect",obj=>{ |
|
|
|
|
|
|
|
this.isShowProperty = false |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
//监听数据变化后
|
|
|
|
//监听数据变化后
|
|
|
|
this.canvas.on('canvasDataChanged',()=>{ |
|
|
|
this.canvas.on('canvasDataChanged',()=>{ |
|
|
|
// 收到数据表示共享数据发生变化
|
|
|
|
// 收到数据表示共享数据发生变化
|
|
|
|
@ -687,7 +822,14 @@ export class CollectionToolsComponent implements OnInit { |
|
|
|
copyAssetData:any //存储用于复制的素材
|
|
|
|
copyAssetData:any //存储用于复制的素材
|
|
|
|
//复制素材
|
|
|
|
//复制素材
|
|
|
|
copyAsset(){ |
|
|
|
copyAsset(){ |
|
|
|
this.canvas.copy() |
|
|
|
if(this.canvas.selection.allowEdit()){//如果当前选中素材可以编辑
|
|
|
|
|
|
|
|
this.canvas.copy() |
|
|
|
|
|
|
|
}else{ |
|
|
|
|
|
|
|
let config = new MatSnackBarConfig(); |
|
|
|
|
|
|
|
config.verticalPosition = 'top'; |
|
|
|
|
|
|
|
config.duration = 3000 |
|
|
|
|
|
|
|
this.snackBar.open('当前选中素材不可复制','确定',config); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
//粘贴素材
|
|
|
|
//粘贴素材
|
|
|
|
pasteAsset(){ |
|
|
|
pasteAsset(){ |
|
|
|
@ -2280,7 +2422,7 @@ export class CollectionToolsComponent implements OnInit { |
|
|
|
if(selectPanelPoint.Data){ |
|
|
|
if(selectPanelPoint.Data){ |
|
|
|
for(let key in selectPanelPoint.Data.Stock){ //筛选数据 没有匹配全部放入到 其他 数组
|
|
|
|
for(let key in selectPanelPoint.Data.Stock){ //筛选数据 没有匹配全部放入到 其他 数组
|
|
|
|
let noMatch = this.allFireElements.find( every=> every.id===selectPanelPoint.Data.Stock[key].FireElementId ) |
|
|
|
let noMatch = this.allFireElements.find( every=> every.id===selectPanelPoint.Data.Stock[key].FireElementId ) |
|
|
|
if (!noMatch) { |
|
|
|
if (!noMatch && selectPanelPoint.Data.Stock[key].Id != "图例") { |
|
|
|
this.allFireElements[this.allFireElements.length-1].children.push(selectPanelPoint.Data.Stock[key]) |
|
|
|
this.allFireElements[this.allFireElements.length-1].children.push(selectPanelPoint.Data.Stock[key]) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
chenjingyu
4 years ago