joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into iscs

Browse Source
This commit is contained in:
joylink_cuiweidong 2021-04-13 09:11:50 +08:00
commit acefe20fc0
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/iscs_new/map.js
View File

@ -187,10 +187,9 @@ class JMap {
case orders.Update: case orders.Update:
oldShape = this.$shapeFactory.removeShape(curShape); oldShape = this.$shapeFactory.removeShape(curShape);
newShape = this.$shapeFactory.createShape(updateModel, action.shapeType); 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.$shapeFactory.addShape(newShape)
this.$painter.removeFromLayer(oldShape.type, oldShape.instanceHightLight);
this.$painter.remove(oldShape);
this.$painter.add(newShape); this.$painter.add(newShape);
break; break;
case orders.Unbinding: case orders.Unbinding:

6
src/views/iscs_new/components/tableForm.vue
View File

@ -93,6 +93,8 @@
<script> <script>
import elementConst from '@/iscs_new/core/form/elementConst'; import elementConst from '@/iscs_new/core/form/elementConst';
import EachFormItem from './eachFormItem'; import EachFormItem from './eachFormItem';
import * as utils from '@/iscs_new/utils/utils';
export default { export default {
name:'TableForm', name:'TableForm',
components:{ components:{
@ -152,7 +154,7 @@ export default {
} }
const data = this.formModel.stateList[index]; const data = this.formModel.stateList[index];
if (!data.style[data.defaultStyleSelect] && data.defaultStyleSelect) { 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); this.$set(this.formModel.stateList[index].style, data.defaultStyleSelect, other);
} }
}, },
@ -163,7 +165,7 @@ export default {
} }
const data = this.formModel.stateList[index]; const data = this.formModel.stateList[index];
if (!data.shape[data.defaultShapeSelect] && data.defaultShapeSelect) { 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); this.$set(this.formModel.stateList[index].shape, data.defaultShapeSelect, other);
} }
}, },