diff --git a/.gitignore b/.gitignore index 69ccc46e..7e6be9bf 100644 --- a/.gitignore +++ b/.gitignore @@ -180,3 +180,4 @@ apps/static models/ data .dev +poetry.lock diff --git a/apps/common/field/common.py b/apps/common/field/common.py index a9746989..3d6c95f1 100644 --- a/apps/common/field/common.py +++ b/apps/common/field/common.py @@ -27,7 +27,7 @@ class FunctionField(serializers.Field): def to_internal_value(self, data): if not callable(data): - self.fail('不是一個函數', value=data) + self.fail('不是一个函數', value=data) return data def to_representation(self, value): diff --git a/installer/config.yaml b/installer/config.yaml index 9e19ef0b..c9f45db8 100644 --- a/installer/config.yaml +++ b/installer/config.yaml @@ -6,8 +6,8 @@ EMAIL_HOST: ${EMAIL_HOST} EMAIL_PORT: ${EMAIL_PORT} EMAIL_HOST_USER: ${EMAIL_HOST_USER} EMAIL_HOST_PASSWORD: ${EMAIL_HOST_PASSWORD} -# -# # 数据库链接信息 + +# 数据库链接信息 DB_NAME: maxkb DB_HOST: 127.0.0.1 DB_PORT: 5432 diff --git a/main.py b/main.py index 0f5e744f..dbe48e7e 100644 --- a/main.py +++ b/main.py @@ -18,7 +18,7 @@ django.setup() def collect_static(): """ 收集静态文件到指定目录 - 本项目主要是将前端vue/dist的前段项目放到静态目录下面 + 本项目主要是将前端vue/dist的前端项目放到静态目录下面 :return: """ logging.info("Collect static files") diff --git a/ui/src/layout/components/top-bar/avatar/ResetPasssword.vue b/ui/src/layout/components/top-bar/avatar/ResetPassword.vue similarity index 100% rename from ui/src/layout/components/top-bar/avatar/ResetPasssword.vue rename to ui/src/layout/components/top-bar/avatar/ResetPassword.vue diff --git a/ui/src/layout/components/top-bar/avatar/index.vue b/ui/src/layout/components/top-bar/avatar/index.vue index dd3a316c..19bdcdbb 100644 --- a/ui/src/layout/components/top-bar/avatar/index.vue +++ b/ui/src/layout/components/top-bar/avatar/index.vue @@ -35,7 +35,7 @@ import { ref } from 'vue' import useStore from '@/stores' import { useRouter } from 'vue-router' -import ResetPassword from './ResetPasssword.vue' +import ResetPassword from './ResetPassword.vue' import AboutDialog from './AboutDialog.vue' const { user } = useStore() const router = useRouter() diff --git a/ui/src/styles/app.scss b/ui/src/styles/app.scss index ee23445d..bf03e7fd 100644 --- a/ui/src/styles/app.scss +++ b/ui/src/styles/app.scss @@ -332,8 +332,8 @@ h4 { /* tag */ .default-tag { - background: var(--tag-deflaut-bg); - color: var(--tag-deflaut-color); + background: var(--tag-default-bg); + color: var(--tag-default-color); border: none; } .success-tag { diff --git a/ui/src/styles/variables.scss b/ui/src/styles/variables.scss index 8b296e8c..ef092ca6 100644 --- a/ui/src/styles/variables.scss +++ b/ui/src/styles/variables.scss @@ -24,8 +24,8 @@ --sidebar-bg-color: #ffffff; --sidebar-width: 240px; /** tag */ - --tag-deflaut-bg: rgba(51, 112, 255, 0.2); - --tag-deflaut-color: #2b5fd9; + --tag-default-bg: rgba(51, 112, 255, 0.2); + --tag-default-color: #2b5fd9; --tag-success-bg: rgba(52, 199, 36, 0.2); --tag-success-color: #2ca91f; --tag-warning-bg: rgba(255, 136, 0, 0.2); diff --git a/ui/src/utils/message.ts b/ui/src/utils/message.ts index 357a83aa..f762d5a8 100644 --- a/ui/src/utils/message.ts +++ b/ui/src/utils/message.ts @@ -40,26 +40,26 @@ export const MsgError = (message: string) => { /** * 删除知识库 - * @param 参数 message: {title, decription,type} + * @param 参数 message: {title, description,type} */ -export const MsgConfirm = (title: string, decription: string, options?: any) => { +export const MsgConfirm = (title: string, description: string, options?: any) => { const defaultOptions: Object = { showCancelButton: true, confirmButtonText: '确定', cancelButtonText: '取消', ...options } - return ElMessageBox.confirm(decription, title, defaultOptions) + return ElMessageBox.confirm(description, title, defaultOptions) } -// export const MsgConfirm = ({ title, decription }: any, options?: any) => { +// export const MsgConfirm = ({ title, description }: any, options?: any) => { // const message: any = h('div', { class: 'app-confirm' }, [ // h('h4', { class: 'app-confirm-title flex align-center' }, [ // h(ElIcon, { class: 'icon' }, [h(WarningFilled)]), // h('span', { class: 'ml-16' }, title) // ]), -// h('div', { class: 'app-confirm-decription mt-8' }, decription) +// h('div', { class: 'app-confirm-description mt-8' }, description) // ]) // const defaultOptions: Object = { diff --git a/ui/src/views/dataset/CreateDataset.vue b/ui/src/views/dataset/CreateDataset.vue index 7a55bd96..8a83efea 100644 --- a/ui/src/views/dataset/CreateDataset.vue +++ b/ui/src/views/dataset/CreateDataset.vue @@ -3,23 +3,6 @@ -