Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into development-business-css
This commit is contained in:
commit
9c7eebdb8e
@ -1054,21 +1054,17 @@ function copyNode() { // 复制节点
|
|||||||
|
|
||||||
|
|
||||||
function closeAntvx6() {
|
function closeAntvx6() {
|
||||||
let isSaveDesign = false
|
// let isSaveDesign = false
|
||||||
const designData:any = graph.toJSON()
|
// const designData:any = graph.toJSON()
|
||||||
for(let i = 0;i<designData.cells.length;i++){
|
// for(let i = 0;i<designData.cells.length;i++){
|
||||||
if(designData.cells[i].shape == 'rect-text' || designData.cells[i].shape == 'image-node'){
|
// if(designData.cells[i].shape == 'rect-text' || designData.cells[i].shape == 'image-node'){
|
||||||
isSaveDesign = true
|
// isSaveDesign = true
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
if(isSaveDesign == true){
|
// if(isSaveDesign == true){
|
||||||
saveDesign(true)
|
// saveDesign(true)
|
||||||
}
|
// }
|
||||||
|
emit('closeAntvx6')
|
||||||
setTimeout(() => {
|
|
||||||
emit('closeAntvx6')
|
|
||||||
}, 100);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function revokeClick(){
|
function revokeClick(){
|
||||||
@ -1389,14 +1385,14 @@ function saveDesign(is:any) { // 保存设计
|
|||||||
try {
|
try {
|
||||||
// 获取画布内容并转换为JSON
|
// 获取画布内容并转换为JSON
|
||||||
const designData:any = graph.toJSON()
|
const designData:any = graph.toJSON()
|
||||||
if(is == true){
|
// if(is == true){
|
||||||
isDisplay.value = true
|
// isDisplay.value = true
|
||||||
for(let i = 0;i<designData.cells.length;i++){
|
// for(let i = 0;i<designData.cells.length;i++){
|
||||||
if(designData.cells[i].shape == 'rect-text' || designData.cells[i].shape == 'image-node'){
|
// if(designData.cells[i].shape == 'rect-text' || designData.cells[i].shape == 'image-node'){
|
||||||
graph.removeCell(designData.cells[i].id)
|
// graph.removeCell(designData.cells[i].id)
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
|
|
||||||
let cells:any = []
|
let cells:any = []
|
||||||
@ -1820,11 +1816,11 @@ function getName(code:any) {
|
|||||||
<div class="operation-icon-text">显示</div>
|
<div class="operation-icon-text">显示</div>
|
||||||
</div> -->
|
</div> -->
|
||||||
|
|
||||||
<div class="operation-icon-box" @click="isDisplayClick">
|
<!-- <div class="operation-icon-box" @click="isDisplayClick">
|
||||||
<img v-if="isDisplay" src="@/assets/x6/display.png">
|
<img v-if="isDisplay" src="@/assets/x6/display.png">
|
||||||
<img v-else src="@/assets/x6/hide.png">
|
<img v-else src="@/assets/x6/hide.png">
|
||||||
<div class="operation-icon-text">显示</div>
|
<div class="operation-icon-text">显示</div>
|
||||||
</div>
|
</div> -->
|
||||||
|
|
||||||
<div class="operation-icon-box" style="width: 60px;" @click="boundaryClick">
|
<div class="operation-icon-box" style="width: 60px;" @click="boundaryClick">
|
||||||
<img v-if="!isBoundary" src="@/assets/x6/display.png">
|
<img v-if="!isBoundary" src="@/assets/x6/display.png">
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user