diff --git a/src/pages/src/components/custom-fields/view.vue b/src/pages/src/components/custom-fields/view.vue index ac542e491..422497169 100644 --- a/src/pages/src/components/custom-fields/view.vue +++ b/src/pages/src/components/custom-fields/view.vue @@ -5,7 +5,7 @@ v-for="(item, index) in extras" :key="index"> {{ item.displayName }}: - {{ ConvertVal(item.value) }} + {{ ConvertVal(item) }} @@ -20,12 +20,14 @@ defineProps({ }, }); -const ConvertVal = (val: any) => { +const ConvertVal = (item: any) => { const demo = ref(''); - if (val instanceof Array) { - demo.value = val?.map(item => item.value).join(';') || '--'; + if (item.type === 'multi_enum') { + demo.value = item.value?.map(k => k.value).join(';') || '--'; + } else if (item.type === 'number') { + demo.value = item.value; } else { - demo.value = val || '--'; + demo.value = item.value || '--'; } return demo.value; }; diff --git a/src/pages/src/hooks/useCustomFields.ts b/src/pages/src/hooks/useCustomFields.ts index 932365b67..e5fbfd8b4 100644 --- a/src/pages/src/hooks/useCustomFields.ts +++ b/src/pages/src/hooks/useCustomFields.ts @@ -11,6 +11,7 @@ export const useCustomFields = (data, customFields) => { key: item.name, value: k.value, displayName: item.display_name, + type: item.data_type, }); } }); @@ -20,6 +21,7 @@ export const useCustomFields = (data, customFields) => { key: item.name, value: item.options.filter((k: string) => item.default.includes(k.id)).filter(k => k.value), displayName: item.display_name, + type: item.data_type, }); } else { extras.push({ @@ -27,6 +29,7 @@ export const useCustomFields = (data, customFields) => { key: item.name, value: item.default, displayName: item.display_name, + type: item.data_type, }); } } else { @@ -38,6 +41,7 @@ export const useCustomFields = (data, customFields) => { key: item.name, value: k.value, displayName: item.display_name, + type: item.data_type, }); } }); @@ -47,6 +51,7 @@ export const useCustomFields = (data, customFields) => { key: item.name, value: item.options.filter((k: string) => data[item.name].includes(k.id)).filter(k => k.value), displayName: item.display_name, + type: item.data_type, }); } else { extras.push({ @@ -54,6 +59,7 @@ export const useCustomFields = (data, customFields) => { key: item.name, value: data[item.name], displayName: item.display_name, + type: item.data_type, }); } } diff --git a/src/pages/src/views/data-source/new-data/Local.vue b/src/pages/src/views/data-source/new-data/Local.vue index e014916d5..a40794e75 100644 --- a/src/pages/src/views/data-source/new-data/Local.vue +++ b/src/pages/src/views/data-source/new-data/Local.vue @@ -99,7 +99,7 @@ -
+
diff --git a/src/pages/src/views/data-source/new-data/index.less b/src/pages/src/views/data-source/new-data/index.less index 62afba6cd..c866f8888 100644 --- a/src/pages/src/views/data-source/new-data/index.less +++ b/src/pages/src/views/data-source/new-data/index.less @@ -13,6 +13,11 @@ font-weight: 700; } + .div-flex { + display: flex; + align-items: center; + } + ::v-deep .bk-form-item { padding-bottom: 24px; margin-bottom: 0; @@ -23,6 +28,10 @@ margin-bottom: 24px; } + .bk-form-content { + line-height: 22px; + } + .bk-radio-button { width: 80px; diff --git a/src/pages/src/views/personal-center/index.vue b/src/pages/src/views/personal-center/index.vue index 3dc62b987..16426203d 100644 --- a/src/pages/src/views/personal-center/index.vue +++ b/src/pages/src/views/personal-center/index.vue @@ -229,7 +229,7 @@
  • {{ item.displayName }}: - {{ ConvertVal(item.value) }} + {{ ConvertVal(item) }}
  • @@ -313,12 +313,14 @@ const getCurrentUser = async (id) => { infoLoading.value = false; }; -const ConvertVal = (val: any) => { +const ConvertVal = (item: any) => { const demo = ref(''); - if (val instanceof Array) { - demo.value = val?.map(item => item.value).join(';') || '--'; + if (item.type === 'multi_enum') { + demo.value = item.value?.map(k => k.value).join(';') || '--'; + } else if (item.type === 'number') { + demo.value = item.value; } else { - demo.value = val || '--'; + demo.value = item.value || '--'; } return demo.value; }; diff --git a/src/pages/src/views/setting/AccountSetting.vue b/src/pages/src/views/setting/AccountSetting.vue index fb82a8aad..5afca1dc2 100644 --- a/src/pages/src/views/setting/AccountSetting.vue +++ b/src/pages/src/views/setting/AccountSetting.vue @@ -5,7 +5,7 @@
    - +