From dc855fa6efeb273e19ac7a05d5d9f5ad051a31c5 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Mon, 12 Apr 2021 18:43:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/iscs_new/map.js                         | 5 ++---
 src/views/iscs_new/components/tableForm.vue | 6 ++++--
 src/views/iscs_new/iscsDraw/index.vue       | 6 ++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/iscs_new/map.js b/src/iscs_new/map.js
index cc4aa3a2a..11174a8d7 100644
--- a/src/iscs_new/map.js
+++ b/src/iscs_new/map.js
@@ -187,10 +187,9 @@ class JMap {
 					case orders.Update:
 						oldShape = this.$shapeFactory.removeShape(curShape);
 						newShape = this.$shapeFactory.createShape(updateModel, action.shapeType);
-						this.$painter.removeFromLayer(oldShape.type, oldShape.instanceHightLight);
-						this.$painter.removeFromLayer(oldShape.type, newShape.instanceHightLight);
-						this.$painter.remove(oldShape);
 						this.$shapeFactory.addShape(newShape)
+						this.$painter.removeFromLayer(oldShape.type, oldShape.instanceHightLight);
+						this.$painter.remove(oldShape);
 						this.$painter.add(newShape);
 						break;
 					case orders.Unbinding:
diff --git a/src/views/iscs_new/components/tableForm.vue b/src/views/iscs_new/components/tableForm.vue
index 234042b8c..ce9765272 100644
--- a/src/views/iscs_new/components/tableForm.vue
+++ b/src/views/iscs_new/components/tableForm.vue
@@ -93,6 +93,8 @@
 <script>
 import elementConst from '@/iscs_new/core/form/elementConst';
 import EachFormItem from './eachFormItem';
+import * as utils from '@/iscs_new/utils/utils';
+
 export default {
     name:'TableForm',
     components:{
@@ -152,7 +154,7 @@ export default {
             }
             const data = this.formModel.stateList[index];
             if (!data.style[data.defaultStyleSelect] && data.defaultStyleSelect) {
-                const other = this.formModel.style[data.defaultStyleSelect];
+                const other = utils.deepClone(this.formModel.style[data.defaultStyleSelect]);
                 this.$set(this.formModel.stateList[index].style, data.defaultStyleSelect, other);
             }
         },
@@ -163,7 +165,7 @@ export default {
             }
             const data = this.formModel.stateList[index];
             if (!data.shape[data.defaultShapeSelect] && data.defaultShapeSelect) {
-                const other = this.formModel.shape[data.defaultShapeSelect];
+                const other = utils.deepClone(this.formModel.shape[data.defaultShapeSelect]);
                 this.$set(this.formModel.stateList[index].shape, data.defaultShapeSelect, other);
             }
         },
diff --git a/src/views/iscs_new/iscsDraw/index.vue b/src/views/iscs_new/iscsDraw/index.vue
index a4d583631..d2a4c1a6c 100644
--- a/src/views/iscs_new/iscsDraw/index.vue
+++ b/src/views/iscs_new/iscsDraw/index.vue
@@ -202,8 +202,10 @@ export default {
             this.$refs['tableform' + this.statusTab][0].$refs['form'].validate((valid) => {
                 if (valid) {
                     const model = utils.deepClone(this.$refs['tableform' + this.statusTab][0].formModel);
-                    model.stateList.map(state=>{ delete state.defaultStyleSelect; delete state.defaultShapeSelect; });
-                    debugger;
+                    model.stateList.forEach(state=>{
+						delete state.defaultStyleSelect;
+						delete state.defaultShapeSelect;
+					});
                     this.$refs.iscsCanvas.doAction([{model, action: {shapeType: shapeType.Element, order: orders.Update}}]);
                     this.onSave();
                 }