|
|
@@ -2199,7 +2199,7 @@ function fastEdit(e, url, title, col, index, type)
|
|
|
var valid = '';
|
|
|
var action = '';
|
|
|
|
|
|
- if ($(t).find('form').length) {
|
|
|
+ if ($(t).find('form').length && !$(t).find('#form1').length) {
|
|
|
if ($(t).find('form').length > 1) {
|
|
|
var form = $(t).find('form').eq(1);
|
|
|
form.addClass('layui-card-body');
|
|
|
@@ -2826,6 +2826,7 @@ var dever_update =
|
|
|
{
|
|
|
var self = this;
|
|
|
var key = e.attr('toggle_key');
|
|
|
+ var parent = e.parent().parent().parent();
|
|
|
var child = '.dever_'+key+'_child';
|
|
|
|
|
|
if(typeof(self.index[key]) == "undefined")
|
|
|
@@ -2839,12 +2840,12 @@ var dever_update =
|
|
|
|
|
|
if(self.index[key] <= 0)
|
|
|
{
|
|
|
- self.index[key] = $(child).length;
|
|
|
+ self.index[key] = parent.find(child).length;
|
|
|
}
|
|
|
|
|
|
- if(self.index[key] > 30)
|
|
|
+ if(self.index[key] > 100)
|
|
|
{
|
|
|
- layer.showAlert('最多只能增加30条');
|
|
|
+ layer.showAlert('最多只能增加100条');
|
|
|
|
|
|
return;
|
|
|
}
|
|
|
@@ -2855,7 +2856,7 @@ var dever_update =
|
|
|
|
|
|
var name = '第' + (self.index[key]) + '条';
|
|
|
|
|
|
- p.before('<li><a href="javascript:;" id="tab-'+id+'" toggle_key="'+key+'" toggle_id="'+self.index[key]+'" toggle_child="'+child+'" toggle="#'+id+'" onclick="showToggle($(this))">'+name+'</a></li>');
|
|
|
+ p.before('<li style="margin:0px;padding:0 15px;"><a href="javascript:;" id="tab-'+id+'" toggle_key="'+key+'" toggle_id="'+self.index[key]+'" toggle_child="'+child+'" toggle="#'+id+'" onclick="showToggle($(this))">'+name+'</a></li>');
|
|
|
|
|
|
|
|
|
var e = e.parent().parent();
|
|
|
@@ -2868,7 +2869,13 @@ var dever_update =
|
|
|
|
|
|
content = content.replaceAll('_c_', '_c_' + (self.index[key]-1) + '_i_');
|
|
|
|
|
|
- content = '<div id="'+id+'" style="display:none;margin:10px" class="'+n.attr('class')+' dever_form_add_child">' + content + '</div>';
|
|
|
+ var cname = n.attr('class');
|
|
|
+ if (cname.indexOf('layui-tab') > -1) {
|
|
|
+ content = '<div id="'+id+'" style="display:none;" class="'+n.attr('class')+'">' + content + '</div>';
|
|
|
+ } else {
|
|
|
+ //content = '<div id="'+id+'" style="display:none;margin:10px" class="'+n.attr('class')+' dever_form_add_child">' + content + '</div>';
|
|
|
+ content = '<div id="'+id+'" style="display:none;margin:10px" class="'+n.attr('class')+'">' + content + '</div>';
|
|
|
+ }
|
|
|
|
|
|
p.append(content);
|
|
|
|
rabin