Browse Source

feat: 对接

bill 2 years ago
parent
commit
790d95c5cd

+ 1 - 0
src/views/draw-file/board/editCAD/History/HistoryUtil.js

@@ -193,6 +193,7 @@ export default class HistoryUtil {
         tableService.setTableInfo(tableInfo)
     }
 
+    // eslint-disable-next-line no-dupe-class-members
     assignTagFromTag(tag1, tag2) {
         const tagInfo = {}
         tagInfo.vectorId = tag1.vectorId

+ 1 - 0
src/views/draw-file/board/editCAD/Service/FloorplanService.js

@@ -467,6 +467,7 @@ export class FloorplanService {
         compass.setAngle(value)
     }
 
+    // eslint-disable-next-line no-dupe-class-members
     getCompass(floor) {
         if (floor == null || typeof floor == 'undefined') {
             floor = this.currentFloor

+ 0 - 2
src/views/draw-file/board/index.d.ts

@@ -60,8 +60,6 @@ export type Board = {
   forward(): void
 
   setImage(url: string): void
-  getCurrentStore(): BoardData
-  drawStore(store: BoardData): void
   getStore(): BoardData
   export(): Promise<Blob>
   destroy(): void

+ 6 - 7
src/views/draw-file/board/index.js

@@ -43,6 +43,7 @@ export const create = (store, canvas) => {
         ]
         shape.data.content = data
         shape.setContent = (newData) => {
+          console.log(newData)
           shape.data.content = newData
           update(newData)
         }
@@ -83,16 +84,13 @@ export const create = (store, canvas) => {
   const board = {
     bus: refs.bus,
     el: canvas,
-    getCurrentStore:() => ({ ...store, ...toStore(refs) }),
-    drawStore(newStore) {
-      refs.ctx.clearRect(0,0, canvas.width, canvas.height)
-      refs.shapes = []
-      refs.baseMap = null
-      generateRefs(newStore)
-    },
     getStore() {
+      console.log(layer.uiControl.exportJSON())
       return store
     },
+    viewInit() {
+      layer.uiControl.menu_flex()
+    },
     unSelectShape() {
       layer.uiControl.clearUI()
     },
@@ -116,6 +114,7 @@ export const create = (store, canvas) => {
       refs.bus.emit('storeChange')
     },
     export() {
+      layer.uiControl.menu_screenShot()
       return new Promise(resolve => canvas.toBlob(resolve))
     },
     destroy() {

+ 1 - 1
src/views/draw-file/board/shape.js

@@ -33,7 +33,7 @@ export const fingerPrint = 'FingerPrint'
 export const corpse = 'DeadBody'
 export const theBlood = 'BloodStain'
 export const title = 'Title'
-export const bgImage = 'BgImage'
+export const bgImage = 'Image'
 export const compass = 'Compass'
 
 export const labels = [