From c6bbd72c6fb62a7db7ffa4870657da26c4bd0c14 Mon Sep 17 00:00:00 2001
From: zwyqz <329636271@qq.com>
Date: Sun, 19 Aug 2018 22:46:25 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=A9=BA=E5=B1=9E=E6=80=A7=E4=B8=8D=E6=8F=90=E4=BA=A4=20?=
 =?UTF-8?q?=E8=87=AA=E6=B5=8B=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/mycat-setting-mycat-data-host.html  | 62 ++++++++++++-------
 .../admin/mycat-setting-mycat-schema.html     | 39 +++++++++---
 .../main/resources/static/assets/js/utils.js  |  9 +++
 3 files changed, 77 insertions(+), 33 deletions(-)

diff --git a/mycateye-web/src/main/resources/static/admin/mycat-setting-mycat-data-host.html b/mycateye-web/src/main/resources/static/admin/mycat-setting-mycat-data-host.html
index 732e218..5d84180 100644
--- a/mycateye-web/src/main/resources/static/admin/mycat-setting-mycat-data-host.html
+++ b/mycateye-web/src/main/resources/static/admin/mycat-setting-mycat-data-host.html
@@ -161,7 +161,7 @@
                     <span class="sublist-title">Mycat管理</span>
                 </div>
                 <ul class="navContent">
-                    <li>
+                    <li  class="active">
                         <div class="showtitle">
                             <img src="img/leftimg.png" />Mycat集群管理
                         </div>
@@ -196,7 +196,7 @@
                             <span class="sub-title">系统属性</span>
                         </a>
                     </li>
-                    <li class="active">
+                    <li>
                         <div class="showtitle">
                             <img src="img/leftimg.png" />参数配置
                         </div>
@@ -379,10 +379,21 @@
 <!-- dataHost模板 -->
 <script id="tmpl" type="text/template">
     <div class="form-horizontal">
+        <div class="form-group mt10">
+            <label class="col-sm-2 control-label">name：</label>
+            <div class="col-sm-10">
+                <input class="form-control" type="text" value="${name}" name="name" />
+            </div>
+        </div>
         <div class="form-group mt10">
             <label class="col-sm-2 control-label">balance：</label>
             <div class="col-sm-10">
-                <input class="form-control" type="text" value="${balance}" name="balance" />
+                <select  name="balance"  value="${balance}">
+                    <option value="0"  ${balance=="0"?"selected":""}> 不开启读写分离</option>
+                    <option value="1"  ${balance=="1"?"selected":""}> 非写节点的随机</option>
+                    <option value="2"  ${balance=="2"?"selected":""}> 所有writeHost和readHost随机</option>
+                    <option value="3"  ${balance=="3"?"selected":""}> 只选择readHost</option>
+                </select>
             </div>
         </div>
         <div class="form-group mt10">
@@ -392,34 +403,30 @@
             </div>
         </div>
         <div class="form-group mt10">
-            <label class="col-sm-2 control-label">name：</label>
+            <label class="col-sm-2 control-label">maxCon：</label>
             <div class="col-sm-10">
-                <input class="form-control" type="text" value="${name}" name="name" />
+                <input class="form-control" type="text" value="${maxCon}" name="maxCon" />
             </div>
         </div>
+
         <div class="form-group mt10">
             <label class="col-sm-2 control-label">writeType：</label>
             <div class="col-sm-10">
-                <select value="${writeType}">
-                    <option value="0"> 0</option>
-                    <option value="1"> 1</option>
-                    <option value="2"> 2</option>
+                <select name="writeType" value="${writeType}">
+                    <option value="0" ${writeType=="0"?"selected":""}> 单写</option>
+                    <option value="1" ${writeType=="1"?"selected":""}> 多写</option>
                 </select>
             </div>
         </div>
         <div class="form-group mt10">
             <label class="col-sm-2 control-label">switchType：</label>
             <div class="col-sm-10">
-                <label class="custom-control custom-radio">
-                    <input name="switchType" value="0" type="radio" class="custom-control-input loadZk" ${"0"==switchType?"checked":""}>
-                    <span class="custom-control-indicator"></span>
-                    <span class="custom-control-description">不开启</span>
-                </label>
-                <label class="custom-control custom-radio">
-                    <input name="switchType" value="1" type="radio" class="custom-control-input loadZk" ${"1"==switchType?"checked":""}>
-                    <span class="custom-control-indicator"></span>
-                    <span class="custom-control-description">开启</span>
-                </label>
+                <select name="switchType" value="${switchType}">
+                    <option value="-1"${switchType==-1?"selected":""}>不自动切换</option>
+                    <option value="1" ${switchType==1?"selected":""}> 自动切换</option>
+                    <option value="2" ${switchType==2?"selected":""}> 基于主从自动切换</option>
+                    <option value="3" ${switchType==3?"selected":""}> 基于galary cluster自动切换</option>
+                </select>
             </div>
         </div>
         <div class="form-group mt10">
@@ -431,13 +438,16 @@
         <div class="form-group mt10">
             <label class="col-sm-2 control-label">dbType：</label>
             <div class="col-sm-10">
-                <input class="form-control" type="text" value="${slaveThreshold}" name="dbType" />
+                <input class="form-control" type="text" value="${dbType}" name="dbType" />
             </div>
         </div>
         <div class="form-group mt10">
             <label class="col-sm-2 control-label">dbDriver：</label>
             <div class="col-sm-10">
-                <input class="form-control" type="text" value="${dbDriver}" name="dbDriver" />
+                <select name="dbDriver" value="${dbDriver}">
+                    <option value="native" ${dbDriver=="native"?"selected":""}>native</option>
+                    <option value="JDBC" ${dbDriver=="JDBC"?"selected":""}> JDBC</option>
+                </select>
             </div>
         </div>
         <div class="form-group mt10">
@@ -527,7 +537,7 @@
 
     function fetchData(forceFromZk) {
         if(table){
-            for(var attr in schemaMap) {
+            for(var attr in dataMap) {
                 delete dataMap[attr];
             }
             $('#container').hide();
@@ -656,12 +666,11 @@
      //dataHost的新增编辑提交.
     $("#container").on("click",".submitDataHost",function () {
         var obj  = {};
-        $("#container").find("input").each(function () {
+        $("#container").find("input,select").each(function () {
             var name = $(this).attr("name");
             var val = $(this).val();
             obj[name] = val;
         });
-        obj.switchType = $("#switchType").find("input[name=switch]:checked").val();
         //做校验 todo
         var type = $(this) .data("type");
         var oldDataHostName = $(this) .data("name");
@@ -694,6 +703,9 @@
         var dataHostName = $(this).data("name");
         var dataHost = getDataHost(dataHostName);
         $('#mycatWriteHostTable').attr("dataHostName", dataHostName);
+        if(!dataHost["writeHost"]){
+            dataHost["writeHost"]=[];
+        }
         $('#mycatWriteHostTable').DataTable({
             'oLanguage': dtb.oLanguage,
             "data": dataHost["writeHost"],
@@ -964,11 +976,13 @@
     //添加一个dataHost
     var addDataHost = function (oldDataHostName, json) {
         if(oldDataHostName == "") {
+            delEmptyAttr(json);
             dataMap[json["name"]] = json;
         } else {
             var obj = dataMap[oldDataHostName];
             delete dataMap[oldDataHostName];
             dataMap[json["name"]] = $.extend(obj, json);
+            delEmptyAttr(dataMap[json["name"]]);
         }
         return dataMap[json["name"]];
     };
diff --git a/mycateye-web/src/main/resources/static/admin/mycat-setting-mycat-schema.html b/mycateye-web/src/main/resources/static/admin/mycat-setting-mycat-schema.html
index e5f4a9c..adac341 100644
--- a/mycateye-web/src/main/resources/static/admin/mycat-setting-mycat-schema.html
+++ b/mycateye-web/src/main/resources/static/admin/mycat-setting-mycat-schema.html
@@ -400,12 +400,12 @@
             <div class="col-sm-9">
                 <!--<input class="form-control" type="text" value="${checkSQLschema}" name="checkSQLschema" />-->
                 <label class="custom-control custom-radio">
-                <input name="checkSQLschema" value="true" type="radio" class="custom-control-input " ${true==checkSQLschema?"checked":""}>
+                <input name="checkSQLschema" value="true" type="radio" class="custom-control-input " ${true==checkSQLschema?"checked":""} ${(undefined==checkSQLschema)?"checked":""}>
                 <span class="custom-control-indicator"></span>
                 <span class="custom-control-description">是</span>
                 </label>
                 <label class="custom-control custom-radio">
-                    <input name="checkSQLschema" value="false" type="radio" class="custom-control-input " ${(false==checkSQLschema)?"checked":""}  ${(undefined==checkSQLschema)?"checked":""}>
+                    <input name="checkSQLschema" value="false" type="radio" class="custom-control-input " ${(false==checkSQLschema)?"checked":""}  >
                     <span class="custom-control-indicator"></span>
                     <span class="custom-control-description">否</span>
                 </label>
@@ -446,12 +446,12 @@
             <label class="col-sm-3 control-label">全局表：</label>
             <div class="col-sm-9">
                 <label class="custom-control custom-radio">
-                    <input name="switchType" value="global" type="radio" class="custom-control-input loadZk" ${"global"==type?"checked":""}>
+                    <input name="type" value="global" type="radio" class="custom-control-input loadZk" ${"global"==type?"checked":""}>
                     <span class="custom-control-indicator"></span>
                     <span class="custom-control-description">是</span>
                 </label>
                 <label class="custom-control custom-radio">
-                    <input name="switchType" value="" type="radio" class="custom-control-input loadZk" ${"global"!=type?"checked":""}>
+                    <input name="type" value="" type="radio" class="custom-control-input loadZk" ${"global"!=type?"checked":""}>
                     <span class="custom-control-indicator"></span>
                     <span class="custom-control-description">否</span>
                 </label>
@@ -494,7 +494,7 @@
                 </label>
             </div>
         </div>
-        <div class="form-group mt10 "  >
+        <div class="form-group mt10 ruleDiv "  >
             <label class="col-sm-3 control-label">subTables：</label>
             <div class="col-sm-9">
                 <input class="form-control" type="text" value="${subTables}" name="subTables" />
@@ -505,12 +505,12 @@
             <label class="col-sm-3 control-label">添加limit：</label>
             <div class="col-sm-9">
                 <label class="custom-control custom-radio">
-                    <input name="needAddLimit" value="true" type="radio" class="custom-control-input " ${true==needAddLimit?"checked":""}>
+                    <input name="needAddLimit" value="true" type="radio" class="custom-control-input " ${true==needAddLimit?"checked":""} ${(undefined==needAddLimit)?"checked":""}>
                     <span class="custom-control-indicator"></span>
                     <span class="custom-control-description">是</span>
                 </label>
                 <label class="custom-control custom-radio">
-                    <input name="needAddLimit" value="false" type="radio" class="custom-control-input " ${(false==needAddLimit)?"checked":""}  ${(undefined==needAddLimit)?"checked":""}>
+                    <input name="needAddLimit" value="false" type="radio" class="custom-control-input " ${(false==needAddLimit)?"checked":""}  >
                     <span class="custom-control-indicator"></span>
                     <span class="custom-control-description">否</span>
                 </label>
@@ -787,8 +787,11 @@
         for(var i = 0 ; i < schemaJson.table.length; i++) {
             if(schemaJson.table[i].name == oldTableName) {
                  schemaJson.table[i] = $.extend(schemaJson.table[i],  tableJson);
+                delEmptyAttr(schemaJson.table[i]);
+                 return;
             }
         }
+        delEmptyAttr(tableJson);
         schemaJson.table.push(tableJson);
     }
     var delTable = function (schemaName, tableName) {
@@ -864,10 +867,23 @@
         var json = $.extend({schemaName: schemaName}, {} )
         $("#editTableModalContainer").html(juicer(html, json));
         $("#myTableModal").modal("show");
-    });
-
 
 
+    });
+    var checkIfGlobal = function (isClear) {
+        var type = $("#editTableModalContainer").find("input[name=type]:checked").val();
+        if(type == ""){
+            $(".ruleDiv").show();
+        } else{
+            $(".ruleDiv").hide();
+        }
+        if(isClear){
+            $(".ruleDiv").find("input[name=rule],input[name=subTables]").val("");
+        }
+    }
+    $("#editTableModalContainer").on("click","input[name=type]",function () {
+        checkIfGlobal(true);
+    });
 
     $("#container").on("click",".editTable",function () {
         var html = $("#tableTmpl").html();
@@ -876,7 +892,10 @@
         var tableJson = getTable(schemaName, tableName);
         var json = $.extend({schemaName: schemaName}, tableJson )
         $("#editTableModalContainer").html(juicer(html, json));
+//        debugger
+        checkIfGlobal(false);
         $("#myTableModal").modal("show");
+
         //tableTmpl
     });
     //
@@ -1136,9 +1155,11 @@
         for(var i = 0 ; i < childList.length; i ++) {
             if(oldChildName == childList[i].name) {
                 childList[i] = $.extend(childList[i],  childJson);
+                delEmptyAttr(childList[i]);
                 return childList[i];
             }
         }
+        delEmptyAttr(childJson);
         childList.push(childJson);
         return childJson;
     };
diff --git a/mycateye-web/src/main/resources/static/assets/js/utils.js b/mycateye-web/src/main/resources/static/assets/js/utils.js
index b593035..126b8a4 100644
--- a/mycateye-web/src/main/resources/static/assets/js/utils.js
+++ b/mycateye-web/src/main/resources/static/assets/js/utils.js
@@ -218,6 +218,13 @@
             this.splice(index, 1);
         }
     };
+    window.delEmptyAttr = function (obj) {
+        for(var attr in obj){
+            if(!obj[attr]){
+                delete obj[attr];
+            }
+        }
+    }
     window.dataSource = function (dataSource , idName) {
         if(dataSource == undefined) {
             dataSource = [];
@@ -233,6 +240,7 @@
             },
             add: function (oldName , json) {
                 if(oldName == ""){
+                    delEmptyAttr(json);
                     dataSource.push(json);
                     return json;
                 }else {
@@ -240,6 +248,7 @@
                         var row = dataSource[index];
                         if(row[idName] == oldName) {
                             dataSource[index] = $.extend(row,  json);
+                            delEmptyAttr(dataSource[index]);
                             return dataSource[index];
                         }
                     }
-- 
Gitee