From b0a8ab2980cee83d26738c96f7d739e4f5e6e087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=92=AC=E8=BD=AE=E7=8C=AB?= <10928033@qq.com>
Date: Thu, 1 Jul 2021 15:59:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=86=85=E5=AD=98=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E5=88=86=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/LeftToolBar.vue | 14 +++++++-------
 src/global/global.js           | 10 ----------
 src/views/CircuitEdit.vue      | 29 ++++++++---------------------
 3 files changed, 15 insertions(+), 38 deletions(-)
 delete mode 100644 src/global/global.js

diff --git a/src/components/LeftToolBar.vue b/src/components/LeftToolBar.vue
index a7e2fec..6807cfc 100644
--- a/src/components/LeftToolBar.vue
+++ b/src/components/LeftToolBar.vue
@@ -1,8 +1,7 @@
 <template>
   <div class="components-layout-left">
 
-    <a-input-search placeholder="搜索组件"
-                    />
+    <a-input-search placeholder="搜索组件" />
     <a-collapse v-model:activeKey="activeKey"
                 accordion>
       <a-collapse-panel key="1"
@@ -31,7 +30,6 @@
   </div>
 </template>
 <script>
-import global from '@/global/global.js';//全局变量
 export default {
   props: ['svgInfoData'],
   data () {
@@ -42,10 +40,12 @@ export default {
   },
   methods: {
     Mousedown (type, title, color) {
-      global.CurrentlySelectedToolBarType = type;
-      global.CurrentlySelectedToolBarTypeName = title;
-      global.CurrentlySelectedToolBarTitle = title;
-      global.CurrentlySelectedToolBarColor = color;
+      window.CurrentlySelectedToolBar = {
+        Type: type,//选中的工具栏svg类型
+        TypeName:title,//选中的工具栏svg类型名称
+        Title:title,//选中的工具栏svg标题
+        Color:color//选中的工具栏svg颜色
+      };
     },
   }
 };
diff --git a/src/global/global.js b/src/global/global.js
deleted file mode 100644
index 34b4699..0000000
--- a/src/global/global.js
+++ /dev/null
@@ -1,10 +0,0 @@
-//当前选中的左侧工具栏参数类型
-let CurrentlySelectedToolBarType='';
-//当前选中的左侧工具栏参数类型名称
-let CurrentlySelectedToolBarTypeName='';
-//当前选中的左侧工具栏参数标题
-let CurrentlySelectedToolBarTitle='';
-//当前选中的左侧工具栏参数颜色
-let CurrentlySelectedToolBarColor='';
-export default {
-    CurrentlySelectedToolBarType,CurrentlySelectedToolBarTypeName,CurrentlySelectedToolBarTitle,CurrentlySelectedToolBarColor}
\ No newline at end of file
diff --git a/src/views/CircuitEdit.vue b/src/views/CircuitEdit.vue
index 6eb1760..379843c 100644
--- a/src/views/CircuitEdit.vue
+++ b/src/views/CircuitEdit.vue
@@ -87,7 +87,6 @@
 import LeftToolBar from '@/components/LeftToolBar.vue';
 import RightToolBar from '@/components/RightToolBar.vue';
 // import SvgComponents from '@/components/SvgComponents.vue';
-import global from '@/global/global.js';//全局变量
 import SvgComponents from '@/components/SvgComponents.vue';
 export default {
   components: { LeftToolBar, RightToolBar, SvgComponents },
@@ -104,12 +103,6 @@ export default {
       //辅助线元素
       guideX: '',
       guideY: '',
-      CurrentlySelectedToolBar: {
-        Type: '',//选中的工具栏svg类型
-        TypeName: '',//选中的工具栏svg类型名称
-        Title: '',//选中的工具栏svg标题
-        Color: '',//选中的工具栏svg颜色
-      },
       selectSvg: {
         ID: '',//要移动的svg
         Index: 0,
@@ -192,8 +185,8 @@ export default {
 
     },
     MousedownSvg (id, index, pointX, pointY, e) {
-      this.CurrentlySelectedToolBar.Type = global.CurrentlySelectedToolBarType = '';
-      this.CurrentlySelectedToolBar.Title = global.CurrentlySelectedToolBarTitle = '';
+      window.CurrentlySelectedToolBar.Type = '';
+      window.CurrentlySelectedToolBar.Title = '';
       //从数组里面根据index找到当前元素
       this.selectSvg.ID = id;
       this.selectSvg.Index = index;
@@ -209,7 +202,7 @@ export default {
     MouseupCanvas () {
       this.guideX.style.display = 'none';
       this.guideY.style.display = 'none';
-      if (this.CurrentlySelectedToolBar.Title != '' || this.CurrentlySelectedToolBar.Type != '') {
+      if (window.CurrentlySelectedToolBar.Title != '' || window.CurrentlySelectedToolBar.Type != '') {
         return;
       }
       // this.selectSvg.ID = '';
@@ -239,7 +232,6 @@ export default {
       alert(JSON.stringify(this.svgLists));
     },
     testE () {
-      this.svgLists = global.AnalogData;
     },
     testH () {
       localStorage.setItem('svginfo', JSON.stringify(this.svgLists));
@@ -291,24 +283,19 @@ export default {
     _this.guideY = document.querySelector('#guide-y');//辅助线y轴
     canvasdiv.addEventListener("dragover", function (e) {
       e.preventDefault();
-      _this.CurrentlySelectedToolBar.Type = global.CurrentlySelectedToolBarType;
-      _this.CurrentlySelectedToolBar.Title = global.CurrentlySelectedToolBarTitle;
-      _this.CurrentlySelectedToolBar.TypeName = global.CurrentlySelectedToolBarTypeName;
-      _this.CurrentlySelectedToolBar.Color = global.CurrentlySelectedToolBarColor;
-      _this.CurrentlySelectedToolBar.Height = global.CurrentlySelectedToolBarHeight;
     }, false);
     canvasdiv.addEventListener("drop", function (e) {
       e.preventDefault();
-      if (_this.CurrentlySelectedToolBar.Type == '') {
+      if (window.CurrentlySelectedToolBar.Type == '') {
         return;
       }
       //根据类型和鼠标位置创建组件
       let svgItem = {
         id: _this.$UCore.GenUUid(),
-        title: _this.CurrentlySelectedToolBar.Title,
-        type: _this.CurrentlySelectedToolBar.Type,
-        typeName: _this.CurrentlySelectedToolBar.TypeName,
-        svgColor: _this.CurrentlySelectedToolBar.Color,
+        title: window.CurrentlySelectedToolBar.Title,
+        type: window.CurrentlySelectedToolBar.Type,
+        typeName: window.CurrentlySelectedToolBar.TypeName,
+        svgColor: window.CurrentlySelectedToolBar.Color,
         svgPositionX: e.offsetX,
         svgPositionY: e.offsetY,
         size: 1,