Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

基本信息tooltip取消掉lineheight



See merge request !78

@@ -55,6 +55,22 @@ export const monitorTreeShape = {
         value: 'resource_capacity_analysis',
         value: 'resource_capacity_analysis',
       },
       },
       {
       {
+        type: 'el-input-text',
+        label: '字树节点',
+        name: 'propsChildren',
+        required: false,
+        placeholder: '',
+        value: 'children',
+      },
+      {
+        type: 'el-input-text',
+        label: '节点标签',
+        name: 'propsLabel',
+        required: false,
+        placeholder: '',
+        value: 'label',
+      },
+      {
         type: 'el-switch',
         type: 'el-switch',
         label: '加边框',
         label: '加边框',
         name: 'isBorder',
         name: 'isBorder',

@@ -24,7 +24,7 @@
                         <el-col :style="[lineHeightStyle]"  v-if="(titleName?index>=0:index>0)" class="basic-border basic-item-title basic-flex" :span="10">
                         <el-col :style="[lineHeightStyle]"  v-if="(titleName?index>=0:index>0)" class="basic-border basic-item-title basic-flex" :span="10">
                           {{ item.name }}
                           {{ item.name }}
                         </el-col>
                         </el-col>
-                        <el-col :style="[lineHeightStyle]" v-if="(titleName?index>=0:index>0) " class="basic-border basic-flex  basic-item-content" :span="14"><span>{{ item.value }}</span>
+                        <el-col  v-if="(titleName?index>=0:index>0) " class="basic-border basic-flex  basic-item-content" :span="14"><span>{{ item.value }}</span>
                         </el-col>
                         </el-col>
                       </el-row>
                       </el-row>
                     </div>
                     </div>

@@ -27,10 +27,10 @@ export default {
     return {
     return {
       iframeSrc:'',
       iframeSrc:'',
       activeName:'bos',
       activeName:'bos',
-      defaultProps : {
+/*      defaultProps : {
         children: 'child',
         children: 'child',
         label: 'typeName',//resTypeName
         label: 'typeName',//resTypeName
-      },
+      },*/
       treeData: [], // 所有的树结点
       treeData: [], // 所有的树结点
       checkedKeys: [], // 当前选中的keys
       checkedKeys: [], // 当前选中的keys
 
 
@@ -41,6 +41,13 @@ export default {
     };
     };
   },
   },
   computed: {
   computed: {
+    //设置紫薯节点及节点标签
+    defaultProps(){
+      return{
+        children:this.optionsSetup.propsChildren?this.optionsSetup.propsChildren:'children',
+        label:this.optionsSetup.propsLabel?this.optionsSetup.propsLabel:'label'
+      }
+    },
     styleObj() {
     styleObj() {
       return {
       return {
         position: this.ispreview ? "absolute" : "static",
         position: this.ispreview ? "absolute" : "static",
@@ -58,6 +65,7 @@ export default {
         'box-shadow':this.optionsSetup.isShadow?'0px 3px 12px '+this.optionsSetup.borderColor:'none',
         'box-shadow':this.optionsSetup.isShadow?'0px 3px 12px '+this.optionsSetup.borderColor:'none',
         'max-height':this.optionsStyle.height + "px",
         'max-height':this.optionsStyle.height + "px",
         'overflow':'auto',
         'overflow':'auto',
+        'width':this.optionsSetup.isFrame?'20%':'100%'
       }
       }
     },
     },
     //文字样式设置
     //文字样式设置
@@ -220,8 +228,8 @@ export default {
       data.then(res => {
       data.then(res => {
         if(res[0] && res[0].data){
         if(res[0] && res[0].data){
           this.treeData=res[0].data;
           this.treeData=res[0].data;
-          this.setSrc(this.treeData[0])
-
+          this.handleNodeClick(this.treeData[0])
+          // this.setSrc(this.treeData[0])
         }
         }
       });
       });
     },
     },