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 
# Conflicts:
#	src/views/iscs_new/iscsDraw/index.vue
This commit is contained in:
ival 2021-04-12 18:44:16 +08:00
commit ae686de0ab
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/iscs_new/iscsDraw/index.vue
View File

@ -141,6 +141,7 @@ export default {
if (elem) { if (elem) {
elem.model = this.selected; elem.model = this.selected;
this.enabledTab = this.selected.type; this.enabledTab = this.selected.type;
this.cardTab = 'first';
} }
} else { } else {
this.selected = null; this.selected = null;
@ -193,7 +194,7 @@ export default {
}, },
getComposeElemList() { getComposeElemList() {
const source = this.$iscs.getSource(); const source = this.$iscs.getSource();
if (source.elementList) { if (source.elementList && source.elementLis.length > 0) {
this.composeElemList = source.elementList; this.composeElemList = source.elementList;
this.statusTab = this.composeElemList[0].code; this.statusTab = this.composeElemList[0].code;
} }
@ -202,10 +203,7 @@ export default {
this.$refs['tableform' + this.statusTab][0].$refs['form'].validate((valid) => { this.$refs['tableform' + this.statusTab][0].$refs['form'].validate((valid) => {
if (valid) { if (valid) {
const model = utils.deepClone(this.$refs['tableform' + this.statusTab][0].formModel); const model = utils.deepClone(this.$refs['tableform' + this.statusTab][0].formModel);
model.stateList.forEach(state=>{ model.stateList.map(state=>{ delete state.defaultStyleSelect; delete state.defaultShapeSelect; });
delete state.defaultStyleSelect;
delete state.defaultShapeSelect;
});
this.$refs.iscsCanvas.doAction([{model, action: {shapeType: shapeType.Element, order: orders.Update}}]); this.$refs.iscsCanvas.doAction([{model, action: {shapeType: shapeType.Element, order: orders.Update}}]);
this.onSave(); this.onSave();
} }