mirror of
https://github.com/PanJiaChen/vue-element-admin.git
synced 2025-08-10 20:39:48 +08:00
fix: Run print format without operator's. (#420)
This commit is contained in:
parent
ee937abbe0
commit
a1b3b25c2b
@ -1406,12 +1406,21 @@ const panel = {
|
||||
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') {
|
||||
operator = 'LESS_EQUAL' // operand to value is second position of array
|
||||
parametersRange.push({
|
||||
columnName: `${parameterItem.columnName}_To`,
|
||||
operator,
|
||||
value: valueTo
|
||||
})
|
||||
operator = 'GREATER_EQUAL' // rewrite to assign first position of array
|
||||
}
|
||||
|
||||
return {
|
||||
@ -1419,7 +1428,7 @@ const panel = {
|
||||
value,
|
||||
isRange: parameterItem.isRange,
|
||||
values,
|
||||
operator: isAdvancedQuery ? parameterItem.operator : undefined
|
||||
operator
|
||||
}
|
||||
})
|
||||
|
||||
|
@ -143,12 +143,11 @@ const reportControl = {
|
||||
instanceUuid,
|
||||
option
|
||||
}) {
|
||||
if (isEmptyValue(printFormatUuid)) {
|
||||
printFormatUuid = getters.getDefaultPrintFormat(processUuid).printFormatUuid
|
||||
}
|
||||
|
||||
const parametersList = rootGetters.getParametersToServer({ containerUuid: processUuid })
|
||||
return new Promise(resolve => {
|
||||
if (isEmptyValue(printFormatUuid)) {
|
||||
printFormatUuid = getters.getDefaultPrintFormat(processUuid).printFormatUuid
|
||||
}
|
||||
const parametersList = rootGetters.getParametersToServer({ containerUuid: processUuid })
|
||||
getReportOutput({
|
||||
parametersList,
|
||||
printFormatUuid,
|
||||
@ -166,7 +165,7 @@ const reportControl = {
|
||||
isError: false,
|
||||
instanceUuid,
|
||||
isReport: true,
|
||||
option: option
|
||||
option
|
||||
}
|
||||
commit('setNewReportOutput', reportOutput)
|
||||
|
||||
|
@ -198,13 +198,17 @@ export function generateField({
|
||||
}
|
||||
|
||||
// Overwrite some values
|
||||
if (typeRange) {
|
||||
field.uuid = `${field.uuid}_To`
|
||||
field.columnName = `${field.columnName}_To`
|
||||
field.name = `${field.name} To`
|
||||
field.value = parsedDefaultValueTo
|
||||
field.defaultValue = field.defaultValueTo
|
||||
field.parsedDefaultValue = field.parsedDefaultValueTo
|
||||
if (field.isRange) {
|
||||
field.operator = 'GREATER_EQUAL'
|
||||
if (typeRange) {
|
||||
field.uuid = `${field.uuid}_To`
|
||||
field.columnName = `${field.columnName}_To`
|
||||
field.name = `${field.name} To`
|
||||
field.value = parsedDefaultValueTo
|
||||
field.defaultValue = field.defaultValueTo
|
||||
field.parsedDefaultValue = field.parsedDefaultValueTo
|
||||
field.operator = 'LESS_EQUAL'
|
||||
}
|
||||
}
|
||||
|
||||
// hidden field type button
|
||||
|
Loading…
x
Reference in New Issue
Block a user