openatc-components 0.0.103 → 0.0.104

package/src/kisscomps/components/DrawChannelization/drawsvg/iconSvg/pedroadIconSvg.vue

@@ -65,42 +65,49 @@ export default {
     }
   },
   watch: {
-    item: {
-      handler: function (newval, oldval) {
-        if ((JSON.stringify(oldval) !== '{}')) {
-          // 更改原数据的位置大小数据
-          let data = {
-            ...this.PedData,
-            ...newval,
-            viewbox: this.Viewbox
-          }
-          let fields = Object.keys(newval).concat('viewbox')
-          this.$emit('changePedItem', data, fields)
-        }
-      }
-    },
+    // item: {
+    //   handler: function (newval, oldval) {
+    //     if ((JSON.stringify(oldval) !== '{}')) {
+    //       // 更改原数据的位置大小数据
+    //       let data = {
+    //         ...this.PedData,
+    //         ...newval,
+    //         viewbox: this.Viewbox
+    //       }
+    //       let fields = Object.keys(newval).concat('viewbox')
+    //       this.$emit('changePedItem', data, fields)
+    //     }
+    //   }
+    // },
     PedData: {
       handler: function (val) {
-        if (!val.pedtype) return
-        if (val.pedtype === 4 && this.lastType === '') {
+        if (this.UsageMode === 'draw') {
+          this.item.x = val.x
+          this.item.y = val.y
+          this.item.angle = val.angle
+        }
+        if (this.UsageMode === 'show') {
+          if (!val.pedtype) return
+          if (val.pedtype === 4 && this.lastType === '') {
           // 绿闪：绿-》灰-》绿 循环效果
-          this.GreenFlashColor = '#7bd66b'
-          this.GreenIntervalId = setInterval(() => {
-            this.GreenFlashColor =
+            this.GreenFlashColor = '#7bd66b'
+            this.GreenIntervalId = setInterval(() => {
+              this.GreenFlashColor =
               !this.GreenFlashColor || this.GreenFlashColor === '#828282'
                 ? '#7bd66b'
                 : '#828282'
-          }, 500)
-          this.lastType = val.pedtype
-        }
-        if (
-          this.GreenIntervalId &&
+            }, 500)
+            this.lastType = val.pedtype
+          }
+          if (
+            this.GreenIntervalId &&
           val.pedtype !== 4 &&
           val.pedtype !== this.lastType
-        ) {
-          clearInterval(this.GreenIntervalId)
-          this.GreenFlashColor = undefined
-          this.lastType = ''
+          ) {
+            clearInterval(this.GreenIntervalId)
+            this.GreenFlashColor = undefined
+            this.lastType = ''
+          }
         }
       },
       deep: true
@@ -130,6 +137,7 @@ export default {
   methods: {
     boxDragStop (origin, final) {
       this.item = JSON.parse(JSON.stringify(final))
+      this.handleChangeData()
     },
     boxResizeStop (origin, final) {
       this.IconW = final.w + 'px'
@@ -139,9 +147,15 @@ export default {
       this.Viewbox[2] = final.w.toFixed(1)
       this.Viewbox[3] = final.h.toFixed(1)
       this.item = JSON.parse(JSON.stringify(final))
+      this.handleChangeData()
     },
     boxRotateStop (origin, final) {
       this.item = JSON.parse(JSON.stringify(final))
+      // 第四象限的角度是负值（开源组件接口返回），转化为正值便于理解
+      if (this.item.angle < 0) {
+        this.item.angle = this.item.angle + 360
+      }
+      this.handleChangeData()
     },
     resetSvg () {
       this.reset = false
@@ -155,8 +169,18 @@ export default {
         this.rectArr.push(i)
       }
     },
-    handleSelectIcon (iconparams) {
+    handleSelectIcon () {
       this.$emit('handleSelectIcon', this.PedData)
+    },
+    handleChangeData () {
+      let data = {
+        ...this.PedData,
+        ...this.item,
+        viewbox: this.Viewbox
+      }
+      let fields = Object.keys(this.item).concat('viewbox')
+      this.$emit('changePedItem', data, fields)
+      this.handleSelectIcon()
     }
   },
   created () {

package/src/kisscomps/components/DrawChannelization/drawsvg/importDialog.vue

@@ -48,7 +48,7 @@ export default {
     // 底图加载
     readAsText () {
       this.svgmethods = new Svgmethods()
-      this.svgmethods.clickOpen(this.loadSvgString)
+      this.svgmethods.clickOpen(this.loadSvgString, this.getMapWidthHeighgt)
       this.dialogVisible = false
     },
     loadSvgString (type, content) {
@@ -62,6 +62,9 @@ export default {
       } else {
         this.$emit('loadSvgString', type, content)
       }
+    },
+    getMapWidthHeighgt (type, size) {
+      this.$emit('loadMapSize', type, size)
     }
   },
   mounted () {}