|
|
|
@ -150,10 +150,9 @@
|
|
|
|
|
return defaultValue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function localizeEnumMember(property, row) {
|
|
|
|
|
function localizeEnumMember(property, enumMemberValue) {
|
|
|
|
|
var enumType = property.config.type;
|
|
|
|
|
var enumInfo = abp.objectExtensions.enums[enumType];
|
|
|
|
|
var enumMemberValue = row.extraProperties[property.name];
|
|
|
|
|
var enumMemberName = getEnumMemberName(enumInfo, enumMemberValue);
|
|
|
|
|
|
|
|
|
|
if (!enumMemberName) {
|
|
|
|
@ -199,6 +198,10 @@
|
|
|
|
|
return tableProperties;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function getValueFromRow(property, row) {
|
|
|
|
|
return row.extraProperties[property.name];;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function convertPropertyToColumnConfig(property) {
|
|
|
|
|
var columnConfig = {
|
|
|
|
|
title: localizeDisplayName(property.name, property.config.displayName),
|
|
|
|
@ -208,10 +211,18 @@
|
|
|
|
|
|
|
|
|
|
if (property.config.typeSimple === 'enum') {
|
|
|
|
|
columnConfig.render = function (data, type, row) {
|
|
|
|
|
return localizeEnumMember(
|
|
|
|
|
property,
|
|
|
|
|
row
|
|
|
|
|
);
|
|
|
|
|
var value = getValueFromRow(property, row);
|
|
|
|
|
return localizeEnumMember(property, value);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (property.config.typeSimple === 'boolean') {
|
|
|
|
|
columnConfig.render = function (data, type, row) {
|
|
|
|
|
var value = getValueFromRow(property, row);
|
|
|
|
|
if (value) {
|
|
|
|
|
return '<i class="fa fa-check"></i>';
|
|
|
|
|
} else {
|
|
|
|
|
return '<i class="fa fa-times"></i>';
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|