1
0
mirror of https://github.com/PanJiaChen/vue-element-admin.git synced 2025-08-13 23:20:12 +08:00

fix: Run print format without operator's. (#420)

This commit is contained in:
Edwin Betancourt 2020-03-27 16:59:09 -04:00 committed by GitHub
parent ee937abbe0
commit a1b3b25c2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 15 deletions

View File

@ -1406,12 +1406,21 @@ const panel = {
value = undefined value = undefined
} }
// only to fields type Time, Datea and DateTime let operator
// set default operator of field
if (isAdvancedQuery || ['process', 'report'].includes(parameterItem.panelType)) {
operator = parameterItem.operator
}
// only to fields type Time, Date and DateTime, and is range, with values
// manage as Array = [value, valueTo]
if (parameterItem.isRange && parameterItem.componentPath !== 'FieldNumber') { if (parameterItem.isRange && parameterItem.componentPath !== 'FieldNumber') {
operator = 'LESS_EQUAL' // operand to value is second position of array
parametersRange.push({ parametersRange.push({
columnName: `${parameterItem.columnName}_To`, columnName: `${parameterItem.columnName}_To`,
operator,
value: valueTo value: valueTo
}) })
operator = 'GREATER_EQUAL' // rewrite to assign first position of array
} }
return { return {
@ -1419,7 +1428,7 @@ const panel = {
value, value,
isRange: parameterItem.isRange, isRange: parameterItem.isRange,
values, values,
operator: isAdvancedQuery ? parameterItem.operator : undefined operator
} }
}) })

View File

@ -143,12 +143,11 @@ const reportControl = {
instanceUuid, instanceUuid,
option option
}) { }) {
return new Promise(resolve => {
if (isEmptyValue(printFormatUuid)) { if (isEmptyValue(printFormatUuid)) {
printFormatUuid = getters.getDefaultPrintFormat(processUuid).printFormatUuid printFormatUuid = getters.getDefaultPrintFormat(processUuid).printFormatUuid
} }
const parametersList = rootGetters.getParametersToServer({ containerUuid: processUuid }) const parametersList = rootGetters.getParametersToServer({ containerUuid: processUuid })
return new Promise(resolve => {
getReportOutput({ getReportOutput({
parametersList, parametersList,
printFormatUuid, printFormatUuid,
@ -166,7 +165,7 @@ const reportControl = {
isError: false, isError: false,
instanceUuid, instanceUuid,
isReport: true, isReport: true,
option: option option
} }
commit('setNewReportOutput', reportOutput) commit('setNewReportOutput', reportOutput)

View File

@ -198,6 +198,8 @@ export function generateField({
} }
// Overwrite some values // Overwrite some values
if (field.isRange) {
field.operator = 'GREATER_EQUAL'
if (typeRange) { if (typeRange) {
field.uuid = `${field.uuid}_To` field.uuid = `${field.uuid}_To`
field.columnName = `${field.columnName}_To` field.columnName = `${field.columnName}_To`
@ -205,6 +207,8 @@ export function generateField({
field.value = parsedDefaultValueTo field.value = parsedDefaultValueTo
field.defaultValue = field.defaultValueTo field.defaultValue = field.defaultValueTo
field.parsedDefaultValue = field.parsedDefaultValueTo field.parsedDefaultValue = field.parsedDefaultValueTo
field.operator = 'LESS_EQUAL'
}
} }
// hidden field type button // hidden field type button