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

src/iscs_new/core/form/form2TextStyle.js

@@ -91,7 +91,7 @@ export default [
         description: '文字描边样式。'
     },
     {
-        prop: 'textLineWidth',
+        prop: 'textStrokeWidth',
         label: '文字描边宽度',
         type: types.Number,
         min: 0,

src/views/iscs_new/iscsDraw/index.vue

@@ -109,6 +109,7 @@ export default {
 				const elem = this.elementList.find(el => el.code == this.selected.type);
 				if (elem) {
 					elem.model = this.selected;
+          this.enabledTab=this.selected.type;
 				}
 			} else {
 				this.selected = null;