|
|
@@ -47,7 +47,7 @@ const query = function getQueryForm(data) {
|
|
|
}
|
|
|
_hidden_div.html('');
|
|
|
_hidden_div.append(form);
|
|
|
- form.submit();
|
|
|
+ // form.submit();
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -115,11 +115,11 @@ const query = function getQueryForm(data) {
|
|
|
if ([null, '', undefined].includes(condition.type) && ![null, undefined].includes(condition.name)) {
|
|
|
condition.type = 'input';
|
|
|
}
|
|
|
- if (['dataTime_dataTime', 'input_input'].includes(condition.type)) {
|
|
|
+ if (['dateTime_dateTime', 'input_input'].includes(condition.type)) {
|
|
|
td = $("<td style='width: 330px'</td>")
|
|
|
- } else if (['select_multiple_select', 'time', 'dataTime_select'].includes(condition.type)) {
|
|
|
+ } else if (['select_multiple_select', 'time', 'dateTime_select'].includes(condition.type)) {
|
|
|
td = $("<td style='width: 280px'</td>");
|
|
|
- } else if (['time', 'dataTime_select'].includes(condition.type)) {
|
|
|
+ } else if (['time', 'dateTime_select'].includes(condition.type)) {
|
|
|
td = $("<td style='width: 320px'</td>");
|
|
|
}
|
|
|
td.append(createModule(condition));
|
|
|
@@ -142,15 +142,15 @@ const query = function getQueryForm(data) {
|
|
|
_baseData.condition.forEach(function (conditions, xindex, xarrays) {
|
|
|
let _width = 0;
|
|
|
conditions.forEach(function (condition, index, array) {
|
|
|
- if (['input', 'select', 'dataTime', 'input_select'].includes(condition.type)) {
|
|
|
+ if (['input', 'select', 'dateTime', 'input_select'].includes(condition.type)) {
|
|
|
_width += 260;
|
|
|
- } else if (['dataTime_dataTime', 'input_input'].includes(condition.type)) {
|
|
|
+ } else if (['dateTime_dateTime', 'input_input'].includes(condition.type)) {
|
|
|
_width += 330;
|
|
|
} else if (['select_multiple_select','search_select'].includes(condition.type)) {
|
|
|
_width += 280;
|
|
|
} else if (['checkbox'].includes(condition.type)) {
|
|
|
_width += 260;
|
|
|
- } else if (['time', 'dataTime_select'].includes(condition.type)) {
|
|
|
+ } else if (['time', 'dateTime_select'].includes(condition.type)) {
|
|
|
_width += 320;
|
|
|
} else if ([undefined, null, ''].includes(condition)) {
|
|
|
_width += 260;
|
|
|
@@ -311,11 +311,11 @@ const query = function getQueryForm(data) {
|
|
|
|| (type === "select" && getSelect(condition))
|
|
|
|| (type === "search_select" && getSearchSelect(condition))
|
|
|
|| (type === "input_select" && getInputSelect(condition))
|
|
|
- || (type === "dataTime" && getDataTime(condition))
|
|
|
+ || (type === "dateTime" && getdateTime(condition))
|
|
|
|| (type === "time" && getTime(condition))
|
|
|
|| (type === "input_input" && getInputInput(condition))
|
|
|
- || (type === "dataTime_dataTime" && getDataTimeDataTime(condition))
|
|
|
- || (type === "dataTime_select" && getDataTimeSelect(condition))
|
|
|
+ || (type === "dateTime_dateTime" && getdateTimedateTime(condition))
|
|
|
+ || (type === "dateTime_select" && getdateTimeSelect(condition))
|
|
|
|| (type === "select_multiple_select" && getSelectMultipleSelect(condition))
|
|
|
|| (type === "checkbox" && getCheckBox(condition));
|
|
|
}
|
|
|
@@ -396,25 +396,25 @@ const query = function getQueryForm(data) {
|
|
|
}
|
|
|
|
|
|
// datTime
|
|
|
- function getDataTime(condition) {
|
|
|
- let dataTime = $("<input type='date' class='form-control form-control-sm' name='" + condition.name + "' style='max-width: 150px' data-toggle='tooltip' data-placement='top' title='" + condition.tip + "' style='width: 200px'>");
|
|
|
- dataTime.attr('title', controlJsType(condition.tip, 'undefined') ? '' : condition.tip);
|
|
|
- dataTime.bind('input propertychange', function () {
|
|
|
- let dom = {name: condition.name, type: 'dataTime', value: this.value, mold: 'dataTime'};
|
|
|
+ function getdateTime(condition) {
|
|
|
+ let dateTime = $("<input type='date' class='form-control form-control-sm' name='" + condition.name + "' style='max-width: 150px' data-toggle='tooltip' data-placement='top' title='" + condition.tip + "' style='width: 200px'>");
|
|
|
+ dateTime.attr('title', controlJsType(condition.tip, 'undefined') ? '' : condition.tip);
|
|
|
+ dateTime.bind('input propertychange', function () {
|
|
|
+ let dom = {name: condition.name, type: 'dateTime', value: this.value, mold: 'dateTime'};
|
|
|
modifyData(dom);
|
|
|
})
|
|
|
- return dataTime;
|
|
|
+ return dateTime;
|
|
|
}
|
|
|
|
|
|
// time
|
|
|
function getTime(condition) {
|
|
|
let div = $("<div class='form-inline'></div>");
|
|
|
- let dataTime = $("<input type='date' class='form-control form-control-sm' name='" + condition.name + "' style='width:150px' data-toggle='tooltip' data-placement='top' >");
|
|
|
- dataTime.attr('title', controlJsType(condition.tip[0], 'undefined') ? '' : condition.tip[0]);
|
|
|
+ let dateTime = $("<input type='date' class='form-control form-control-sm' name='" + condition.name + "' style='width:150px' data-toggle='tooltip' data-placement='top' >");
|
|
|
+ dateTime.attr('title', controlJsType(condition.tip[0], 'undefined') ? '' : condition.tip[0]);
|
|
|
let min = $("<input id='" + condition.name + "_min' class='form-control form-control-sm ml-2' style='max-width: 100px;' placeholder='00:00' data-toggle='tooltip' data-placement='top' >");
|
|
|
min.attr('title', controlJsType(condition.tip[1], 'undefined') ? '' : condition.tip[1]);
|
|
|
|
|
|
- dataTime.bind('input propertychange', function () {
|
|
|
+ dateTime.bind('input propertychange', function () {
|
|
|
let value = this.value !== '' ? this.value + ' ' + ([null, undefined, ''].includes(min.value) ? '00:00' : min.value) : '';
|
|
|
let dom = {name: condition.name, type: 'time', value: value, mold: 'time'};
|
|
|
modifyData(dom);
|
|
|
@@ -423,16 +423,16 @@ const query = function getQueryForm(data) {
|
|
|
verifyTime(this);
|
|
|
})
|
|
|
min.bind('input propertychange', function () {
|
|
|
- if (['null', 'undefined', ''].includes(dataTime.val())) {
|
|
|
+ if (['null', 'undefined', ''].includes(dateTime.val())) {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- let value = ['null', 'undefined', ''].includes(dataTime.val()) ? '' : dataTime.val() + ' ' + min.val();
|
|
|
- //let value = dataTime.value !== '' ? dataTime.value + ' ' + (min.value === '' ? '00:00' : min. value) : '';
|
|
|
+ let value = ['null', 'undefined', ''].includes(dateTime.val()) ? '' : dateTime.val() + ' ' + min.val();
|
|
|
+ //let value = dateTime.value !== '' ? dateTime.value + ' ' + (min.value === '' ? '00:00' : min. value) : '';
|
|
|
let dom = {name: condition.name, type: 'time', value: value, mold: 'time'};
|
|
|
modifyData(dom);
|
|
|
})
|
|
|
- return div.append(dataTime).append(min);
|
|
|
+ return div.append(dateTime).append(min);
|
|
|
}
|
|
|
|
|
|
// input_input
|
|
|
@@ -454,45 +454,45 @@ const query = function getQueryForm(data) {
|
|
|
return div.append(input1).append(input2);
|
|
|
}
|
|
|
|
|
|
- // dataTime_dataTime
|
|
|
- function getDataTimeDataTime(condition) {
|
|
|
+ // dateTime_dateTime
|
|
|
+ function getdateTimedateTime(condition) {
|
|
|
let div = $("<div class='form-inline'></div>");
|
|
|
- let dataTime1 = $("<input type='date' class='form-control form-control-sm' name='" + condition.name[0] + "' style='width: 150px' data-toggle='tooltip' data-placement='top' >");
|
|
|
- dataTime1.attr('title', controlJsType(condition.tip[0], 'undefined') ? '' : condition.tip[0]);
|
|
|
+ let dateTime1 = $("<input type='date' class='form-control form-control-sm' name='" + condition.name[0] + "' style='width: 150px' data-toggle='tooltip' data-placement='top' >");
|
|
|
+ dateTime1.attr('title', controlJsType(condition.tip[0], 'undefined') ? '' : condition.tip[0]);
|
|
|
|
|
|
- let dataTime2 = $("<input type='date' class='form-control form-control-sm ml-2' name='" + condition.name[1] + "' style='width: 150px;' data-toggle='tooltip' data-placement='top' >");
|
|
|
- dataTime2.attr('title', controlJsType(condition.tip[1], 'undefined') ? '' : condition.tip[1]);
|
|
|
+ let dateTime2 = $("<input type='date' class='form-control form-control-sm ml-2' name='" + condition.name[1] + "' style='width: 150px;' data-toggle='tooltip' data-placement='top' >");
|
|
|
+ dateTime2.attr('title', controlJsType(condition.tip[1], 'undefined') ? '' : condition.tip[1]);
|
|
|
|
|
|
- dataTime1.bind('input propertychange', function () {
|
|
|
- let dom = {name: this.name, type: 'dataTime_dataTime', value: this.value, mold: 'dataTime'};
|
|
|
+ dateTime1.bind('input propertychange', function () {
|
|
|
+ let dom = {name: this.name, type: 'dateTime_dateTime', value: this.value, mold: 'dateTime'};
|
|
|
modifyData(dom);
|
|
|
})
|
|
|
- dataTime2.bind('input propertychange', function () {
|
|
|
- let dom = {name: this.name, type: 'dataTime_dataTime', value: this.value, mold: 'dataTime'};
|
|
|
+ dateTime2.bind('input propertychange', function () {
|
|
|
+ let dom = {name: this.name, type: 'dateTime_dateTime', value: this.value, mold: 'dateTime'};
|
|
|
modifyData(dom);
|
|
|
})
|
|
|
- return div.append(dataTime1).append(dataTime2);
|
|
|
+ return div.append(dateTime1).append(dateTime2);
|
|
|
}
|
|
|
|
|
|
- // dataTime_select
|
|
|
- function getDataTimeSelect(condition) {
|
|
|
+ // dateTime_select
|
|
|
+ function getdateTimeSelect(condition) {
|
|
|
let div = $("<div class='form-inline'></div>");
|
|
|
- let dataTime = $("<input type='date' class='form-control form-control-sm' name='" + condition.name[0] + "' style='max-width: 150px;' data-toggle='tooltip' data-placement='top' >");
|
|
|
- dataTime.attr('title', controlJsType(condition.tip[0], 'undefined') ? '' : condition.tip[0]);
|
|
|
+ let dateTime = $("<input type='date' class='form-control form-control-sm' name='" + condition.name[0] + "' style='max-width: 150px;' data-toggle='tooltip' data-placement='top' >");
|
|
|
+ dateTime.attr('title', controlJsType(condition.tip[0], 'undefined') ? '' : condition.tip[0]);
|
|
|
|
|
|
let select = $("<select name='" + condition.name[1] + "' class='form-control form-control-sm ml-2' data-toggle='tooltip' data-placement='top' style='max-width: 100px'></select>");
|
|
|
select.attr('title', controlJsType(condition.tip[1], 'undefined') ? '' : condition.tip[1]);
|
|
|
|
|
|
fillSelectOption(select, condition.data)
|
|
|
- dataTime.bind('input propertychange', function () {
|
|
|
- let dom = {name: this.name, type: 'dataTime_select', value: this.value, mold: 'dataTime'};
|
|
|
+ dateTime.bind('input propertychange', function () {
|
|
|
+ let dom = {name: this.name, type: 'dateTime_select', value: this.value, mold: 'dateTime'};
|
|
|
modifyData(dom);
|
|
|
})
|
|
|
select.change(function () {
|
|
|
- let dom = {name: this.name, type: 'dataTime_select', value: this.value, mold: 'select'};
|
|
|
+ let dom = {name: this.name, type: 'dateTime_select', value: this.value, mold: 'select'};
|
|
|
modifyData(dom);
|
|
|
})
|
|
|
- return div.append(dataTime).append(select);
|
|
|
+ return div.append(dateTime).append(select);
|
|
|
}
|
|
|
|
|
|
// select_multiple_select
|
|
|
@@ -678,8 +678,15 @@ const query = function getQueryForm(data) {
|
|
|
_data[dom.name].value = dom.value;
|
|
|
_data[dom.name].select = dom.value;
|
|
|
redenerSearchFormOnData(dom.name, dom.value, dom.mold);
|
|
|
+ let killings=_data[dom.name].killings;
|
|
|
+ if(killings){
|
|
|
+ killings.forEach(function(targetName){
|
|
|
+ redenerSearchFormOnData(_data[targetName].name, '', _data[targetName].mold);
|
|
|
+ })
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
+
|
|
|
// save search on cookie
|
|
|
function saveSearchOnCookie() {
|
|
|
let saveData = {};
|
|
|
@@ -772,6 +779,7 @@ const query = function getQueryForm(data) {
|
|
|
|
|
|
// renderer input
|
|
|
function rendererSearchFormOnInput(key, value, mold) {
|
|
|
+ console.log('inner:',key, value, mold)
|
|
|
if ([undefined, null, ''].includes(value)) {
|
|
|
$(_form).find("input[name='" + key + "']").val('');
|
|
|
$(_form).find("input[name='" + key + "']").removeClass('bg-warning');
|
|
|
@@ -918,7 +926,8 @@ const query = function getQueryForm(data) {
|
|
|
}
|
|
|
|
|
|
function redenerSearchFormOnData(key, value, mold) {
|
|
|
- if (mold === 'input') {
|
|
|
+ console.log('outer:',key, value, mold)
|
|
|
+ if (mold === 'input' ||mold === 'dateTime') {
|
|
|
rendererSearchFormOnInput(key, value, mold);
|
|
|
} else if (mold === 'select') {
|
|
|
rendererSearchFormOnSelect(key, value, mold);
|
|
|
@@ -935,7 +944,7 @@ const query = function getQueryForm(data) {
|
|
|
function switchData() {
|
|
|
_this.condition.forEach(function (conditions) {
|
|
|
conditions.forEach(function (condition) {
|
|
|
- if (['input', 'select', 'dataTime', 'search_select', 'time', 'select_multiple_select','checkbox'].includes(condition.type)) {
|
|
|
+ if (['input', 'select', 'dateTime', 'search_select', 'time', 'select_multiple_select','checkbox'].includes(condition.type)) {
|
|
|
if (!condition.select) {
|
|
|
condition.select = '';
|
|
|
}
|
|
|
@@ -944,8 +953,9 @@ const query = function getQueryForm(data) {
|
|
|
type: condition.type,
|
|
|
value: condition.value,
|
|
|
select: condition.select,
|
|
|
- mold: ['input', 'dataTime'].includes(condition.type) ? 'input' : condition.type,
|
|
|
- data:condition.data
|
|
|
+ mold: ['input', 'dateTime'].includes(condition.type) ? 'input' : condition.type,
|
|
|
+ data:condition.data,
|
|
|
+ killings:condition.killings,
|
|
|
}
|
|
|
if (condition.type === 'search_select') {
|
|
|
data.mold = 'select';
|
|
|
@@ -954,7 +964,7 @@ const query = function getQueryForm(data) {
|
|
|
data.value = [];
|
|
|
}
|
|
|
_data[condition.name] = data;
|
|
|
- } else if (['dataTime_dataTime', 'input_input', 'input_select', 'dataTime_select'].includes(condition.type)) {
|
|
|
+ } else if (['dateTime_dateTime', 'input_input', 'input_select', 'dateTime_select'].includes(condition.type)) {
|
|
|
let types = condition.type.split("_");
|
|
|
if (!condition.select) {
|
|
|
condition.select = ['', ''];
|
|
|
@@ -968,7 +978,8 @@ const query = function getQueryForm(data) {
|
|
|
type: types[index],
|
|
|
value: condition.value[index],
|
|
|
select: condition.select[index],
|
|
|
- mold: ['input', 'dataTime'].includes(types[index]) ? 'input' : types[index]
|
|
|
+ mold: ['input', 'dateTime'].includes(types[index]) ? 'input' : types[index],
|
|
|
+ killings:condition.killings,
|
|
|
}
|
|
|
_data[_name] = data;
|
|
|
})
|
|
|
@@ -1015,7 +1026,7 @@ const query = function getQueryForm(data) {
|
|
|
let value = _data[key].value, type = _data[key].type, mold = _data[key].mold;
|
|
|
_data[key].select = value;
|
|
|
|
|
|
- if (['input', 'dataTime'].includes(mold)) {
|
|
|
+ if (['input', 'dateTime'].includes(mold)) {
|
|
|
rendererSearchFormOnInput(key, value, mold);
|
|
|
} else if (['select'].includes(mold)) {
|
|
|
rendererSearchFormOnSelect(key, value, mold);
|