Browse Source

[修正] 右击清除默认行为, BUG修正

develop
陈鹏飞 4 years ago
parent
commit
60284b584c
  1. 2
      src/app/ui/collection-tools/addPlaneFigure.html
  2. 2
      src/app/ui/collection-tools/collection-tools.component.html
  3. 2
      src/app/ui/collection-tools/collection-tools.component.scss
  4. 12
      src/app/ui/collection-tools/collection-tools.component.ts
  5. 2
      src/app/ui/collection-tools/editPlaneFigure.html
  6. 19
      src/app/ui/collection-tools/panel.scss

2
src/app/ui/collection-tools/addPlaneFigure.html

@ -23,7 +23,7 @@
</div>
<div class="keyMargin">
<textarea name="details" required ngModel placeholder="详情"></textarea>
<textarea name="details" ngModel placeholder="详情"></textarea>
</div>
<div class="submitBottom">

2
src/app/ui/collection-tools/collection-tools.component.html

@ -60,7 +60,7 @@
<!--功能区 -->
<div class="functionalDomain">
<div class='functionalDomainContent'>
<div class='functionalDomainContent' id="functionalDomainContent">
<!-- H5Canvas -->
<app-working-area #canvas></app-working-area>

2
src/app/ui/collection-tools/collection-tools.component.scss

@ -91,7 +91,7 @@
flex-direction: column;
margin-left: 0px;
transition: margin-left 0.5s;
min-width: 150px;
min-width: 160px;
border: 1px solid #E6EAEE;
width: 230px;
left: 0;

12
src/app/ui/collection-tools/collection-tools.component.ts

@ -391,7 +391,15 @@ export class CollectionToolsComponent implements OnInit {
this.getAllLibrary()
this.getSitePlan()
this.getAllBuildings()
let that = this
window.setTimeout(()=>{
document.getElementById("functionalDomainContent").oncontextmenu = function (event) {
that.selectImageIndex = -1
event.preventDefault();
};
})
}
@ -921,7 +929,7 @@ export class CollectionToolsComponent implements OnInit {
isRefresh? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false
isRefresh? this.isShowProperty = true : null
isRefresh? this.isShowAttribute = true : null
this.selectingSitePlan.imageUrl? this.backGroundScale() : null
isRefresh && this.selectingSitePlan.imageUrl? this.backGroundScale() : null
let beforeOneId = this.selectingSitePlan.id || '' //当前 选中 平面图 楼层/区域 id
let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据

2
src/app/ui/collection-tools/editPlaneFigure.html

@ -24,7 +24,7 @@
</div>
<div class="keyMargin">
<textarea name="details" required [(ngModel)]="details" placeholder="详情"></textarea>
<textarea name="details" [(ngModel)]="details" placeholder="详情"></textarea>
</div>
<div class="submitBottom">

19
src/app/ui/collection-tools/panel.scss

@ -17,20 +17,20 @@
font-size: 15px;
font-weight: 400;
color: #000;
background: linear-gradient(to right,#c5c3c3,#868080);
// background: linear-gradient(to top,#cdced1,#FFF);
background: linear-gradient(to top,#cdced1,#FFF);
}
//平面图头部字体图标样式
.hover {
width: 18px;
height: 18px;
margin-left: 40%;
border: 1px solid #fff;
margin-left: 90px;
border: 1px solid #999;
border-radius: 3px;
.mat-icon {font-size: 18px; color: #fff;}
.mat-icon {font-size: 18px; color: #999;}
}
.hover:hover {
background-color: #4DA5FA;
.mat-icon {color: #fff;}
}
//平面图
@ -50,7 +50,7 @@
.a-upload {
display: block;
float: right;
margin: 8px 5px 0 0;
margin: 8px 18px 0 0;
width: 20px;
height: 20px;
line-height: 20px;
@ -114,8 +114,8 @@
top: -32px;
right: -50.5px;
border-radius: 0 100px 100px 0;
background-color: #cdced1;
// #F0F4F7
background-color: #F0F4F7;
// #F0F4F7 cdced1
display: none;
.functionButton {
height: 25%;
@ -124,6 +124,9 @@
.bigFunctionIcon {
font-size: 24px;
}
.functionIcon {
color: #999;
}
.functionIcon:hover {
color: #4DA5FA;
}

Loading…
Cancel
Save