rsbi преди 3 години
родител
ревизия
f74332480c
променени са 3 файла, в които са добавени 6 реда и са изтрити 2 реда
  1. 4 1
      src/view/model/DsourceAdd.vue
  2. 1 0
      src/view/portal/ChartDailog.vue
  3. 1 1
      src/view/portal/LayoutBottom.vue

+ 4 - 1
src/view/model/DsourceAdd.vue

@@ -90,7 +90,7 @@ export default {
         linkType: [{ required: true, message: "必填", trigger: "blur" }],
         linkUrl: [{ required: true, message: "必填", trigger: "blur" }],
         linkName: [{ required: true, message: "必填", trigger: "blur" }],
-        linkPwd: [{ required: true, message: "必填", trigger: "blur" }],
+       // linkPwd: [{ required: true, message: "必填", trigger: "blur" }],
       },
       jndiRules: {
         jndiName: [{ required: true, message: "必填", trigger: "blur" }],
@@ -106,6 +106,7 @@ export default {
           { label: "PostgreSQL", value: "postgresql" },
           { label: "Hive", value: "hive" },
           { label: "Kylin", value: "kylin" },
+          { label: "ClickHouse", value: "clickhouse" },
         ],
       },
     };
@@ -174,6 +175,8 @@ export default {
         s = "jdbc:hive2://ip:10000/default";
       } else if (val == "kylin") {
         s = "jdbc:kylin://ip:7070/kylin_project_name";
+      }else if(val === 'clickhouse'){
+        s = "jdbc:clickhouse://ip:port/default";
       }
       this.dsource.linkUrl = s;
     },

+ 1 - 0
src/view/portal/ChartDailog.vue

@@ -160,6 +160,7 @@
 					});
 				});
 				this.charts[0].show = true;
+				this.charts[0].children[0].select = true;
 			},
 			//更改图形类型
 			changeType(comp){

+ 1 - 1
src/view/portal/LayoutBottom.vue

@@ -7,7 +7,7 @@
             <button class="btn btn-outline btn-danger btn-xs" @click="closeDatapanel()"><i class="fa fa-times"></i></button>
             </div>
           </div>
-          <div class="ibox-content" style="padding:0px; overflow:auto; height:150px;">
+          <div class="ibox-content" style="padding:0px; overflow:auto; height:150px; width:100%;">
             <dbox v-if="showBox" :comp="comp" ref="boxForm"></dbox>
             <dchart v-if="showChart" :comp="comp" ref="chartForm"></dchart>
             <dgrid v-if="showGrid" :comp="comp" ref="gridForm"></dgrid>