|
@@ -531,6 +531,17 @@ export default {
|
|
obj.cubeColumnId = e.__vModel__
|
|
obj.cubeColumnId = e.__vModel__
|
|
obj.function = e.__config__.viewDataType === 'STRING' ? (e.function = 'like') : e.__config__.viewDataType === 'NUMBER' ? (e.function = 'between') : 'between'
|
|
obj.function = e.__config__.viewDataType === 'STRING' ? (e.function = 'like') : e.__config__.viewDataType === 'NUMBER' ? (e.function = 'between') : 'between'
|
|
obj.values = values
|
|
obj.values = values
|
|
|
|
+ let relationData = this.searchList.find(
|
|
|
|
+ (field) =>
|
|
|
|
+ field.relationData && field.relationData.itemRelationList && field.relationData.itemRelationList.length && field.relationData.itemRelationList.find((i) => i.drawId == e.__vModel__)
|
|
|
|
+ )
|
|
|
|
+ let associationColumnFlag = false
|
|
|
|
+ if (relationData) {
|
|
|
|
+ if (relationData.relationData.itemRelationList.find((i) => i.drawId === e.__vModel__).plaintext === 1) {
|
|
|
|
+ associationColumnFlag = true
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if (associationColumnFlag) obj.associationColumn = false
|
|
arr.push(obj)
|
|
arr.push(obj)
|
|
}
|
|
}
|
|
}
|
|
}
|