diff --git a/src/components/Form/AutoDataForm/utils.js b/src/components/Form/AutoDataForm/utils.js
index efc371eba..58dac16f3 100644
--- a/src/components/Form/AutoDataForm/utils.js
+++ b/src/components/Form/AutoDataForm/utils.js
@@ -5,7 +5,7 @@ import Switcher from '@/components/Form/FormFields/Switcher.vue'
import rules from '@/components/Form/DataForm/rules'
import BasicTree from '@/components/Form/FormFields/BasicTree.vue'
import JsonEditor from '@/components/Form/FormFields/JsonEditor.vue'
-import { assignIfNot } from '@/utils/common'
+import { assignIfNot, capitalizeFirst } from '@/utils/common'
import TagInput from '@/components/Form/FormFields/TagInput.vue'
import Select2 from '@/components/Form/FormFields/Select2.vue'
import TransferSelect from '@/components/Form/FormFields/TransferSelect.vue'
@@ -173,7 +173,7 @@ export class FormFieldGenerator {
field = Object.assign(field, fieldMeta)
field.el = el
field.rules = rules
- field.label = field.label.toUpperCase()
+ field.label = capitalizeFirst(field.label)
_.set(field, 'attrs.error', '')
Vue.$log.debug('Generate field: ', name, field)
return field
diff --git a/src/components/Table/AutoDataTable/index.vue b/src/components/Table/AutoDataTable/index.vue
index 9d75b3444..757ead744 100644
--- a/src/components/Table/AutoDataTable/index.vue
+++ b/src/components/Table/AutoDataTable/index.vue
@@ -26,7 +26,7 @@ import {
ObjectRelatedFormatter
} from '@/components/Table/TableFormatters'
import i18n from '@/i18n/i18n'
-import { newURL, replaceAllUUID } from '@/utils/common'
+import { capitalizeFirst, newURL, replaceAllUUID } from '@/utils/common'
import ColumnSettingPopover from './components/ColumnSettingPopover.vue'
import LabelsFormatter from '@/components/Table/TableFormatters/LabelsFormatter.vue'
@@ -274,7 +274,7 @@ export default {
col = this.addHelpTipsIfNeed(col)
col = this.addFilterIfNeed(col)
col = this.addOrderingIfNeed(col)
- col.label = col.label.toUpperCase()
+ col.label = capitalizeFirst(col.label)
return col
},
generateTotalColumns() {
diff --git a/src/i18n/i18n.js b/src/i18n/i18n.js
index d34035688..fdb5ede75 100644
--- a/src/i18n/i18n.js
+++ b/src/i18n/i18n.js
@@ -27,7 +27,7 @@ Vue.prototype.$tr = (key) => {
return i18n.t('' + key)
}
-axios.get(`/api/v1/settings/i18n/lina/?lang=${lang}`)
+axios.get(`/api/v1/settings/i18n/lina/?lang=${lang}&flat=0`)
.then((res) => {
if (res.status !== 200) {
return
diff --git a/src/layout/components/TabPage/index.vue b/src/layout/components/TabPage/index.vue
index 32c1c1726..e30286bdc 100644
--- a/src/layout/components/TabPage/index.vue
+++ b/src/layout/components/TabPage/index.vue
@@ -21,7 +21,7 @@
>
- {{ item.title }}
+ {{ capitalizeFirst(item.title) }}
@@ -42,6 +42,7 @@