diff --git a/src/components/AutoDataForm/utils.js b/src/components/AutoDataForm/utils.js index ae8a6834b..fa9f5efe8 100644 --- a/src/components/AutoDataForm/utils.js +++ b/src/components/AutoDataForm/utils.js @@ -11,7 +11,7 @@ export class FormFieldGenerator { } generateFieldByType(type, field, fieldMeta, fieldRemoteMeta) { switch (type) { - case 'display_choice': + case 'labeled_choice': case 'choice': if (!fieldRemoteMeta.read_only) { field.options = fieldRemoteMeta.choices.map(v => { diff --git a/src/components/AutoDataTable/index.vue b/src/components/AutoDataTable/index.vue index 166abe316..b1e03869a 100644 --- a/src/components/AutoDataTable/index.vue +++ b/src/components/AutoDataTable/index.vue @@ -27,7 +27,7 @@ import { DisplayFormatter, ActionsFormatter, ChoicesFormatter, - NestedObjectFormatter + ObjectRelatedFormatter } from '@/components/TableFormatters' import i18n from '@/i18n/i18n' import ColumnSettingPopover from './components/ColumnSettingPopover' @@ -145,15 +145,19 @@ export default { col.formatter = DateFormatter col.width = '160px' break - case 'nested object': - col.formatter = NestedObjectFormatter + case 'object_related_field': + col.formatter = ObjectRelatedFormatter + break + case 'm2m_related_field': + col.formatter = ObjectRelatedFormatter break case 'field': if (meta.child && meta.child.type === 'nested object') { - col.formatter = NestedObjectFormatter + col.formatter = ObjectRelatedFormatter } break } + this.$log.debug('Field: ', type, col.prop, col) return col }, addHelpTipsIfNeed(col) { diff --git a/src/components/TableFormatters/NestedObjectFormatter.vue b/src/components/TableFormatters/ObjectRelatedFormatter.vue similarity index 100% rename from src/components/TableFormatters/NestedObjectFormatter.vue rename to src/components/TableFormatters/ObjectRelatedFormatter.vue diff --git a/src/components/TableFormatters/index.js b/src/components/TableFormatters/index.js index 5ac5ea4b1..6294270ac 100644 --- a/src/components/TableFormatters/index.js +++ b/src/components/TableFormatters/index.js @@ -12,7 +12,7 @@ import DialogDetailFormatter from './DialogDetailFormatter' import EditableInputFormatter from './EditableInputFormatter' import StatusFormatter from './StatusFormatter' import TagsFormatter from './TagsFormatter' -import NestedObjectFormatter from './NestedObjectFormatter' +import ObjectRelatedFormatter from './ObjectRelatedFormatter' import ChoicesDisplayFormatter from './ChoicesDisplayFormatter' export default { @@ -30,7 +30,7 @@ export default { EditableInputFormatter, StatusFormatter, TagsFormatter, - NestedObjectFormatter, + ObjectRelatedFormatter, ChoicesDisplayFormatter } @@ -49,6 +49,6 @@ export { EditableInputFormatter, StatusFormatter, TagsFormatter, - NestedObjectFormatter, + ObjectRelatedFormatter, ChoicesDisplayFormatter } diff --git a/src/views/assets/Asset/AssetList/AllList.vue b/src/views/assets/Asset/AssetList/AllList.vue index 22ba884e2..75eb8dff7 100644 --- a/src/views/assets/Asset/AssetList/AllList.vue +++ b/src/views/assets/Asset/AssetList/AllList.vue @@ -12,35 +12,38 @@ :tree="treeRef" @showAll="showAll" /> + - +