fix: bug#10935
This commit is contained in:
parent
80a362e815
commit
7474254a45
|
@ -185,7 +185,8 @@ export default [
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
accessSupport: { text: "支持", value: "support" },
|
accessSupport: { text: "支持", value: "support" },
|
||||||
supportDataAccess: true
|
supportDataAccess: true,
|
||||||
|
assetType: 'notifyConfig'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
code: 'notice/Template',
|
code: 'notice/Template',
|
||||||
|
|
|
@ -242,10 +242,30 @@ const handleOptionsColumnsValue = (termsColumns: any[], _options: any) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
const columnSelect = (e: any) => {
|
const columnSelect = (e: any) => {
|
||||||
paramsValue.termType = 'eq'
|
const dataType = e.type
|
||||||
paramsValue.value = {
|
const hasTypeChange = dataType !== tabsOptions.value[0].component
|
||||||
source: tabsOptions.value[0].key,
|
let termTypeChange = false
|
||||||
value: undefined
|
|
||||||
|
// 如果参数类型未发生变化,则不修改操作符以及值
|
||||||
|
const termTypes = e.termTypes
|
||||||
|
if (!termTypes.some((item: {id: string}) => paramsValue.termType === item.id)) { // 修改操作符
|
||||||
|
termTypeChange = true
|
||||||
|
paramsValue.termType = termTypes?.length ? termTypes[0].id : 'eq'
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hasTypeChange) {
|
||||||
|
paramsValue.termType = termTypes?.length ? termTypes[0].id : 'eq'
|
||||||
|
paramsValue.value = {
|
||||||
|
source: tabsOptions.value[0].key,
|
||||||
|
value: undefined
|
||||||
|
}
|
||||||
|
} else if (termTypeChange) {
|
||||||
|
const oldValue = isArray(paramsValue.value!.value) ? paramsValue.value!.value[0] : paramsValue.value!.value
|
||||||
|
const value = arrayParamsKey.includes(e.key) ? [ oldValue, undefined ] : oldValue
|
||||||
|
paramsValue.value = {
|
||||||
|
source: paramsValue.value?.source || tabsOptions.value[0].key,
|
||||||
|
value: value
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const columns = e.metadata === true ? [e.column] : []
|
const columns = e.metadata === true ? [e.column] : []
|
||||||
|
@ -266,7 +286,7 @@ const termsTypeSelect = (e: { key: string, name: string }) => {
|
||||||
const oldValue = isArray(paramsValue.value!.value) ? paramsValue.value!.value[0] : paramsValue.value!.value
|
const oldValue = isArray(paramsValue.value!.value) ? paramsValue.value!.value[0] : paramsValue.value!.value
|
||||||
const value = arrayParamsKey.includes(e.key) ? [ oldValue, undefined ] : oldValue
|
const value = arrayParamsKey.includes(e.key) ? [ oldValue, undefined ] : oldValue
|
||||||
paramsValue.value = {
|
paramsValue.value = {
|
||||||
source: tabsOptions.value[0].key,
|
source: paramsValue.value?.source || tabsOptions.value[0].key,
|
||||||
value: value
|
value: value
|
||||||
}
|
}
|
||||||
emit('update:value', { ...paramsValue })
|
emit('update:value', { ...paramsValue })
|
||||||
|
|
|
@ -216,12 +216,14 @@ watch(() => [columnOptions.value, paramsValue.column], () => {
|
||||||
|
|
||||||
const showDouble = computed(() => {
|
const showDouble = computed(() => {
|
||||||
const isRange = paramsValue.termType ? arrayParamsKey.includes(paramsValue.termType) : false
|
const isRange = paramsValue.termType ? arrayParamsKey.includes(paramsValue.termType) : false
|
||||||
|
const isSourceMetric = paramsValue.value?.source === 'metric'
|
||||||
if (metricsCacheOption.value.length) {
|
if (metricsCacheOption.value.length) {
|
||||||
metricOption.value = metricsCacheOption.value.filter(item => isRange ? item.range : !item.range)
|
metricOption.value = metricsCacheOption.value.filter(item => isRange ? item.range : !item.range)
|
||||||
} else {
|
} else {
|
||||||
metricOption.value = []
|
metricOption.value = []
|
||||||
}
|
}
|
||||||
return isRange && !isMetric.value
|
|
||||||
|
return isRange && !isMetric.value && !isSourceMetric
|
||||||
})
|
})
|
||||||
|
|
||||||
const mouseover = () => {
|
const mouseover = () => {
|
||||||
|
@ -237,11 +239,29 @@ const mouseout = () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
const columnSelect = (option: any) => {
|
const columnSelect = (option: any) => {
|
||||||
|
const dataType = option.dataType
|
||||||
|
const hasTypeChange = dataType !== tabsOptions.value[0].component
|
||||||
|
let termTypeChange = false
|
||||||
|
// 如果参数类型未发生变化,则不修改操作符以及值
|
||||||
const termTypes = option.termTypes
|
const termTypes = option.termTypes
|
||||||
paramsValue.termType = termTypes?.length ? termTypes[0].id : 'eq'
|
if (!termTypes.some((item: {id: string}) => paramsValue.termType === item.id)) { // 修改操作符
|
||||||
paramsValue.value = {
|
termTypeChange = true
|
||||||
source: tabsOptions.value[0].key,
|
paramsValue.termType = termTypes?.length ? termTypes[0].id : 'eq'
|
||||||
value: undefined
|
}
|
||||||
|
|
||||||
|
if (hasTypeChange) { // 类型发生变化
|
||||||
|
paramsValue.termType = termTypes?.length ? termTypes[0].id : 'eq'
|
||||||
|
paramsValue.value = {
|
||||||
|
source: tabsOptions.value[0].key,
|
||||||
|
value: undefined
|
||||||
|
}
|
||||||
|
} else if (termTypeChange) {
|
||||||
|
const oldValue = isArray(paramsValue.value!.value) ? paramsValue.value!.value[0] : paramsValue.value!.value
|
||||||
|
const value = arrayParamsKey.includes(paramsValue.termType as string) ? [ oldValue, undefined ] : oldValue
|
||||||
|
paramsValue.value = {
|
||||||
|
source: paramsValue.value?.source || tabsOptions.value[0].key,
|
||||||
|
value: value
|
||||||
|
}
|
||||||
}
|
}
|
||||||
handOptionByColumn(option)
|
handOptionByColumn(option)
|
||||||
emit('update:value', { ...paramsValue })
|
emit('update:value', { ...paramsValue })
|
||||||
|
@ -254,7 +274,7 @@ const termsTypeSelect = (e: { key: string, name: string }) => {
|
||||||
const oldValue = isArray(paramsValue.value!.value) ? paramsValue.value!.value[0] : paramsValue.value!.value
|
const oldValue = isArray(paramsValue.value!.value) ? paramsValue.value!.value[0] : paramsValue.value!.value
|
||||||
const value = arrayParamsKey.includes(e.key) ? [ oldValue, undefined ] : oldValue
|
const value = arrayParamsKey.includes(e.key) ? [ oldValue, undefined ] : oldValue
|
||||||
paramsValue.value = {
|
paramsValue.value = {
|
||||||
source: tabsOptions.value[0].key,
|
source: paramsValue.value?.source || tabsOptions.value[0].key,
|
||||||
value: value
|
value: value
|
||||||
}
|
}
|
||||||
emit('update:value', { ...paramsValue })
|
emit('update:value', { ...paramsValue })
|
||||||
|
@ -263,7 +283,7 @@ const termsTypeSelect = (e: { key: string, name: string }) => {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const valueSelect = (_: any, label: string, labelObj: Record<number, any>) => {
|
const valueSelect = (v: any, label: string, labelObj: Record<number, any>) => {
|
||||||
emit('update:value', { ...paramsValue })
|
emit('update:value', { ...paramsValue })
|
||||||
formItemContext.onFieldChange()
|
formItemContext.onFieldChange()
|
||||||
formModel.value.options!.when[props.branchName].terms[props.whenName].terms[props.name][2] = labelObj
|
formModel.value.options!.when[props.branchName].terms[props.whenName].terms[props.name][2] = labelObj
|
||||||
|
|
Loading…
Reference in New Issue