diff --git a/ui/src/components/ai-chat/ExecutionDetailDialog.vue b/ui/src/components/ai-chat/ExecutionDetailDialog.vue index 98ec1e6fa..0ea0faabe 100644 --- a/ui/src/components/ai-chat/ExecutionDetailDialog.vue +++ b/ui/src/components/ai-chat/ExecutionDetailDialog.vue @@ -38,10 +38,10 @@ >{{ item?.message_tokens + item?.answer_tokens }} tokens {{ item?.run_time?.toFixed(2) || 0.0 }} s - + - + diff --git a/ui/src/components/model-select/index.vue b/ui/src/components/model-select/index.vue index 7c68925db..664ca9930 100644 --- a/ui/src/components/model-select/index.vue +++ b/ui/src/components/model-select/index.vue @@ -42,7 +42,7 @@ class="model-icon mr-8" > {{ item.name }} - {{ $t('common.unavailable') }} + {{ $t('common.unavailable') }} diff --git a/ui/src/layout/layout-header/avatar/APIKeyDialog.vue b/ui/src/layout/layout-header/avatar/APIKeyDialog.vue index 62f393fbb..64dd08548 100644 --- a/ui/src/layout/layout-header/avatar/APIKeyDialog.vue +++ b/ui/src/layout/layout-header/avatar/APIKeyDialog.vue @@ -113,7 +113,7 @@ function deleteApiKey(row: any) { { confirmButtonText: t('common.confirm'), cancelButtonText: t('common.cancel'), - confirmButtonClass: 'danger' + confirmButtonClass: 'color-danger' } ) .then(() => { diff --git a/ui/src/layout/layout-header/avatar/AboutDialog.vue b/ui/src/layout/layout-header/avatar/AboutDialog.vue index 3e59fde80..e5530c237 100644 --- a/ui/src/layout/layout-header/avatar/AboutDialog.vue +++ b/ui/src/layout/layout-header/avatar/AboutDialog.vue @@ -18,7 +18,7 @@ {{ $t('layout.about.expiredTime') }} {{ licenseInfo?.expired || '-' }} - ({{ fromNowDate(licenseInfo?.expired) }}) diff --git a/ui/src/locales/lang/en-US/views/application.ts b/ui/src/locales/lang/en-US/views/application.ts index 1e20c6adb..72010cb83 100644 --- a/ui/src/locales/lang/en-US/views/application.ts +++ b/ui/src/locales/lang/en-US/views/application.ts @@ -128,8 +128,8 @@ export default { addModel: 'Add Model', }, dialog: { - addDataset: 'Add Related Knowledge', - addDatasetPlaceholder: 'The selected knowledge must use the same embedding model', + addKnowledge: 'Add Related Knowledge', + addKnowledgePlaceholder: 'The selected knowledge must use the same embedding model', selected: 'Selected', countDataset: 'Knowledge', diff --git a/ui/src/locales/lang/zh-CN/views/application.ts b/ui/src/locales/lang/zh-CN/views/application.ts index 6668f84b1..e2f33277f 100644 --- a/ui/src/locales/lang/zh-CN/views/application.ts +++ b/ui/src/locales/lang/zh-CN/views/application.ts @@ -119,8 +119,8 @@ export default { }, dialog: { - addDataset: '添加关联知识库', - addDatasetPlaceholder: '所选知识库必须使用相同的 Embedding 模型', + addKnowledge: '添加关联知识库', + addKnowledgePlaceholder: '所选知识库必须使用相同的 Embedding 模型', selected: '已选', countDataset: '个知识库', diff --git a/ui/src/locales/lang/zh-Hant/views/application.ts b/ui/src/locales/lang/zh-Hant/views/application.ts index 57676fb02..792241a6a 100644 --- a/ui/src/locales/lang/zh-Hant/views/application.ts +++ b/ui/src/locales/lang/zh-Hant/views/application.ts @@ -119,8 +119,8 @@ export default { }, dialog: { - addDataset: '新增關聯知識庫', - addDatasetPlaceholder: '所選知識庫必須使用相同的 Embedding 模型', + addKnowledge: '新增關聯知識庫', + addKnowledgePlaceholder: '所選知識庫必須使用相同的 Embedding 模型', selected: '已選', countDataset: '個知識庫', diff --git a/ui/src/styles/app.scss b/ui/src/styles/app.scss index 935fceaae..e2260d2bf 100644 --- a/ui/src/styles/app.scss +++ b/ui/src/styles/app.scss @@ -373,18 +373,30 @@ h5 { } // 颜色 + .color-primary { color: var(--el-color-primary); } + +.color-danger { + color: var(--el-color-danger); +} +.color-warning { + color: var(--el-color-warning); +} +.color-success { + color: var(--el-color-success); +} +.color-info { + color: var(--el-color-info); +} .color-text-primary { color: var(--el-text-color-primary); } .color-secondary { color: var(--app-text-color-secondary); } -.color-success { - color: var(--el-color-success); -} + .color-input-placeholder { color: var(--app-input-color-placeholder); } diff --git a/ui/src/styles/element-plus.scss b/ui/src/styles/element-plus.scss index b683294a1..6d056a5b2 100644 --- a/ui/src/styles/element-plus.scss +++ b/ui/src/styles/element-plus.scss @@ -211,3 +211,32 @@ font-size: 20px; } } + +// el-form + +.el-form { + --el-form-inline-content-width: 100%; +} + +.el-form-item { + margin-bottom: 16px; + .el-form-item { + margin-bottom: 16px; + &:last-child { + margin-bottom: 0px; + } + } +} +.el-form-item__label { + font-weight: 400; + width: 100%; +} + +.el-form-item__error { + position: unset; + font-size: 14px; +} + +.el-form--label-top .el-form-item .el-form-item__label { + padding-right: 0; +} diff --git a/ui/src/views/application-overview/component/APIKeyDialog.vue b/ui/src/views/application-overview/component/APIKeyDialog.vue index 950c862a6..958a6dab8 100644 --- a/ui/src/views/application-overview/component/APIKeyDialog.vue +++ b/ui/src/views/application-overview/component/APIKeyDialog.vue @@ -96,7 +96,7 @@ function deleteApiKey(row: any) { { confirmButtonText: t('common.confirm'), cancelButtonText: t('common.cancel'), - confirmButtonClass: 'danger' + confirmButtonClass: 'color-danger' } ) .then(() => { diff --git a/ui/src/views/application/ApplicationSetting.vue b/ui/src/views/application/ApplicationSetting.vue index a8b1681b0..407370dd6 100644 --- a/ui/src/views/application/ApplicationSetting.vue +++ b/ui/src/views/application/ApplicationSetting.vue @@ -33,7 +33,7 @@
{{ $t('views.application.form.appName.label') }} - **
@@ -118,7 +118,7 @@ > - * + * @@ -233,7 +233,7 @@ > - * + * @@ -290,7 +290,7 @@
{{ $t('views.application.form.voiceInput.label') }} - * + *
@@ -330,7 +330,7 @@ {{ $t('views.application.form.voicePlay.label') }}
-
-
- - - - - - - -
-

- {{ applicationForm?.name || $t('views.application.form.appName.label') }} -

-
@@ -768,7 +733,8 @@ onMounted(() => { } .scrollbar-height { - height: calc(var(--app-main-height) - 166px); + padding-top: 16px; + height: calc(var(--app-main-height) - 96px); } } diff --git a/ui/src/views/application/component/AddKnowledgeDialog.vue b/ui/src/views/application/component/AddKnowledgeDialog.vue index fe3e74614..44feb35b7 100644 --- a/ui/src/views/application/component/AddKnowledgeDialog.vue +++ b/ui/src/views/application/component/AddKnowledgeDialog.vue @@ -1,37 +1,38 @@