|
@@ -3452,6 +3452,9 @@ export default {
|
|
|
// 关联数据格式化
|
|
|
formatAssociationData(row, column, item) {
|
|
|
let cellValue = row[column.property];
|
|
|
+ if (cellValue.endsWith(';')) {
|
|
|
+ cellValue = cellValue.slice(0, -1);
|
|
|
+ }
|
|
|
const field = column.field;
|
|
|
if (column.params.compoentConfig.isUrl) {
|
|
|
const newUrl = g.replaceAll(cellValue, "@", "&");
|
|
@@ -3461,7 +3464,11 @@ export default {
|
|
|
if (column.params.compoentConfig.relationData && column.params.compoentConfig.relationData.showTitle.length) {
|
|
|
if (column.params.compoentConfig.relationData.isCheck) {
|
|
|
try {
|
|
|
- const data = this.associationData[field][row[field]];
|
|
|
+ let filField = row[field]
|
|
|
+ if (filField.endsWith(';')) {
|
|
|
+ filField = filField.slice(0, -1);
|
|
|
+ }
|
|
|
+ const data = this.associationData[field][filField];
|
|
|
const primaryId = column.params.compoentConfig.relationData.itemRelationList.find((i) => i.drawId === column.params.propId);
|
|
|
const relationField = this.associationColumnDict[field][primaryId.columnId];
|
|
|
cellValue = data ? data[relationField] : cellValue;
|