Merge branch 'master-v32-xwx' into 'master'

资源管理-【1759】-资源管理SSHPUBKEY协议私钥参数录入保存格式问题



See merge request !1019

@@ -237,7 +237,18 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                         if (flag) {
                         if (flag) {
                             $(".protocol-base-area").css("display", "none");
                             $(".protocol-base-area").css("display", "none");
                         }
                         }
-                        form.on('submit(protocol-add-form)', function (data) {
+
+                    },
+                    yes: function (index, layero) {//确定按钮回调方法
+                        var flag = true;
+                        //看协议参数名称和参数code、参数排序有没有输入
+                        $.each($("#editProtocolParam_add_table").find("input[name='paramName'],input[name='paramCode'],input[name='sort']"), function (i, e) {
+                            if (!$(e).val()) {
+                                flag = false;
+                                return;
+                            }
+                        })
+                        if (flag) {
                             var paramList = [];
                             var paramList = [];
                             $.each($("#editProtocolParam_add_table").find("tbody tr"), function (i, e) {
                             $.each($("#editProtocolParam_add_table").find("tbody tr"), function (i, e) {
                                 paramList.push({
                                 paramList.push({
@@ -263,8 +274,9 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                                 contentType: "application/json;charset=utf-8",
                                 contentType: "application/json;charset=utf-8",
                                 async: false,
                                 async: false,
                                 success: function (res) {
                                 success: function (res) {
+
                                     // layer.closeAll();
                                     // layer.closeAll();
-                                    layer.close(indexm);  //joke modify 20210303
+                                    layer.close(index);  //joke modify 20210303
                                     layer.closeAll('loading');
                                     layer.closeAll('loading');
                                     reloadTable();
                                     reloadTable();
                                 },
                                 },
@@ -272,20 +284,6 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                                     layer.closeAll('loading');
                                     layer.closeAll('loading');
                                 }
                                 }
                             })
                             })
-                        });
-
-                    },
-                    yes: function (index, layero) {//确定按钮回调方法
-                        var flag = true;
-                        //看协议参数名称和参数code、参数排序有没有输入
-                        $.each($("#editProtocolParam_add_table").find("input[name='paramName'],input[name='paramCode'],input[name='sort']"), function (i, e) {
-                            if (!$(e).val()) {
-                                flag = false;
-                                return;
-                            }
-                        })
-                        if (flag) {
-                            $('#protocolAddForm').find("button.protocol-add-submit").trigger("click")
                         } else {
                         } else {
                             layer.msg("请将参数协议填写完整", {offset: '15px', icon: 7, time: 1500});
                             layer.msg("请将参数协议填写完整", {offset: '15px', icon: 7, time: 1500});
                             return false;
                             return false;
@@ -313,4 +311,4 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
         }
         }
     });
     });
 
 
-});
+});

@@ -448,10 +448,15 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
                             defaultValue=price;
                             defaultValue=price;
                         }
                         }
                         row = createSelect(e.protocolCode,param,index);
                         row = createSelect(e.protocolCode,param,index);
+                        let td = '';
+                        if (param.paramCode === 'privkey'){
+                            td='<td style="width: 60%"><textarea'+chooseStyle+' data-paramName="' + param.paramName + '" data-paramCode="' + param.paramCode + '" data-protocol="' + e.protocolCode + '" data-allCode="' + e.protocolCode+param.paramCode + '"  type="' + type + '" class="layui-textarea"  name="paramValue">'+defaultValue+'</textarea></td>'
+                        }else {
+                            td='<td style="width: 60%"><input'+chooseStyle+' data-paramName="' + param.paramName + '" data-paramCode="' + param.paramCode + '" data-protocol="' + e.protocolCode + '" data-allCode="' + e.protocolCode+param.paramCode + '"  type="' + type + '" class="layui-input" value="' + defaultValue + '" name="paramValue"></td>'
+                        }
                         if (row == '') {
                         if (row == '') {
                             row = '<tr'+revealStyle+'>' +
                             row = '<tr'+revealStyle+'>' +
-                                '<td style="width: 40%"><span>' + param.paramName + fillStyle+'</span></td>' +
-                                '<td style="width: 60%"><input'+chooseStyle+' data-paramName="' + param.paramName + '" data-paramCode="' + param.paramCode + '" data-protocol="' + e.protocolCode + '" data-allCode="' + e.protocolCode+param.paramCode + '"  type="' + type + '" class="layui-input" value="' + defaultValue + '" name="paramValue"></td>' +
+                                '<td style="width: 40%"><span>' + param.paramName + fillStyle+'</span></td>' + td +
                                 '</tr>'
                                 '</tr>'
                         }
                         }
                         $dom.find("table tbody").append(row);
                         $dom.find("table tbody").append(row);
@@ -495,10 +500,15 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
                             param.paramValue=price;
                             param.paramValue=price;
                         }
                         }
                         row=createSelect(k,param,index);
                         row=createSelect(k,param,index);
+                        let td = '';
+                        if (param.paramCode === 'privkey'){
+                            td='<td style="width: 60%"><textarea'+chooseStyle+' data-paramName="' + param.paramName + '" data-paramCode="' + param.paramCode + '" data-protocol="' +k + '" data-allCode="' + k+param.paramCode + '"  type="' + type + '" class="layui-textarea"  name="paramValue" >'+param.paramValue+'</textarea></td>'
+                        }else {
+                            td='<td style="width: 60%"><input '+chooseStyle+' data-paramName="'+param.paramName+'" data-paramCode="'+param.paramCode+'" data-protocol="'+k+'" value="'+param.paramValue+'" data-allCode="' + k+param.paramCode + '" type="'+type+'" class="layui-input" name="paramValue"></td>'
+                        }
                         if (row == '') {
                         if (row == '') {
                             var row = '<tr '+revealStyle+'>' +
                             var row = '<tr '+revealStyle+'>' +
-                                '<td style="width: 40%"><span>'+param.paramName+fillStyle+'</span>'+typeHtml+'</td>' +
-                                '<td style="width: 60%"><input '+chooseStyle+' data-paramName="'+param.paramName+'" data-paramCode="'+param.paramCode+'" data-protocol="'+k+'" value="'+param.paramValue+'" data-allCode="' + k+param.paramCode + '" type="'+type+'" class="layui-input" name="paramValue"></td>' +
+                                '<td style="width: 40%"><span>'+param.paramName+fillStyle+'</span>'+typeHtml+'</td>' + td +
                                 '</tr>'
                                 '</tr>'
                         }
                         }
                         $dom.find("table tbody").append(row);
                         $dom.find("table tbody").append(row);

@@ -1950,6 +1950,27 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
                                 }
                                 }
                             }
                             }
                             res.push(obj)
                             res.push(obj)
+                        }else if ($(td).find('.xm-select-demo').length > 0 || $(td).find('textarea').length > 0){
+                            var $dom = $(td).find('.xm-select-demo').length>=1?$(td).find('.xm-select-demo'):$(td).find('textarea');
+                            var obj ={
+                                protocol: $dom.data("protocol"),
+                                paramCode:$dom.data("paramcode"),
+                                paramName:$dom.data("paramname"),
+                                paramValue:$dom.val()
+                            }
+                            //为xmSelect时
+                            if($(td).find('.xm-select-demo').length>=1){
+                                obj.paramValue=$(td).find('.label-content').attr('title')?$(td).find('.label-content').attr('title'):'';
+                            }
+                            //是否集群 保存是否0，是1
+                            if(obj.protocol=="REDIS_CLI" && obj.paramCode=="redis_isCluster"){
+                                if(obj.paramValue=="否"){
+                                    obj.paramValue="0";
+                                }else{
+                                    obj.paramValue="1";
+                                }
+                            }
+                            res.push(obj)
                         }
                         }
                     })
                     })
                 })
                 })

@@ -23,7 +23,7 @@
                    <textarea name="protocolDesc" class="layui-textarea"></textarea>
                    <textarea name="protocolDesc" class="layui-textarea"></textarea>
                </div>
                </div>
            </div>
            </div>
-           <button type="submit" lay-submit class="protocol-add-submit" style="display: none">提交</button>
+           <button type="submit" lay-submit id="protocol-add-submit" style="display: none">提交</button>
        </form>
        </form>
    </div>
    </div>
     <div class="layui-card-body layui-form-pane editProtocolParam-list" style="padding-top: 0px;">
     <div class="layui-card-body layui-form-pane editProtocolParam-list" style="padding-top: 0px;">
@@ -112,4 +112,4 @@
     layui.use('protocolAdd', function (fn) {
     layui.use('protocolAdd', function (fn) {
         fn({{ d }});
         fn({{ d }});
     });
     });
-</script>
+</script>