diff --git a/Yi.Ai.Vue3/.env.development b/Yi.Ai.Vue3/.env.development index 60773b7c..ce807789 100644 --- a/Yi.Ai.Vue3/.env.development +++ b/Yi.Ai.Vue3/.env.development @@ -11,8 +11,8 @@ VITE_WEB_ENV = 'development' VITE_WEB_BASE_API = '/dev-api' # 本地接口 - VITE_API_URL = http://localhost:19001/api/app -#VITE_API_URL=http://ccnetcore.com:19001/api/app +# VITE_API_URL = http://localhost:19001/api/app +VITE_API_URL=http://ccnetcore.com:19001/api/app # SSO单点登录url # SSO_SEVER_URL='http://localhost:18001' diff --git a/Yi.Ai.Vue3/src/styles/btn-style.scss b/Yi.Ai.Vue3/src/styles/btn-style.scss index 71c6fd1f..70c98cd6 100644 --- a/Yi.Ai.Vue3/src/styles/btn-style.scss +++ b/Yi.Ai.Vue3/src/styles/btn-style.scss @@ -1,35 +1,33 @@ // 公共的图表按钮样式 .btn-icon-btn { + display: inline-block; align-items: center; justify-content: center; - display: inline-block; - border: 1px solid transparent; - border-radius: 30%; padding: 4px; cursor: pointer; + border: 1px solid transparent; + border-radius: 30%; transition: all 0.3s ease; // 鼠标移入 &:hover { - background-color: rgb(0, 0, 0, .05); - + background-color: rgb(0 0 0 / 5%); .svg-icon { - color: rgb(0, 0, 0, .6); + color: rgb(0 0 0 / 60%); } } // 鼠标按下 &:active { - background-color: rgb(0, 0, 0, .08); - + background-color: rgb(0 0 0 / 8%); .svg-icon { - color: rgb(0, 0, 0, .7); + color: rgb(0 0 0 / 70%); } } // 图标 .svg-icon { + color: rgb(0 0 0 / 50%); user-select: none; - color: rgb(0, 0, 0, .5); } } diff --git a/Yi.Ai.Vue3/src/styles/btn-style.scss.bak b/Yi.Ai.Vue3/src/styles/btn-style.scss.bak new file mode 100644 index 00000000..71c6fd1f --- /dev/null +++ b/Yi.Ai.Vue3/src/styles/btn-style.scss.bak @@ -0,0 +1,35 @@ +// 公共的图表按钮样式 +.btn-icon-btn { + align-items: center; + justify-content: center; + display: inline-block; + border: 1px solid transparent; + border-radius: 30%; + padding: 4px; + cursor: pointer; + transition: all 0.3s ease; + + // 鼠标移入 + &:hover { + background-color: rgb(0, 0, 0, .05); + + .svg-icon { + color: rgb(0, 0, 0, .6); + } + } + + // 鼠标按下 + &:active { + background-color: rgb(0, 0, 0, .08); + + .svg-icon { + color: rgb(0, 0, 0, .7); + } + } + + // 图标 + .svg-icon { + user-select: none; + color: rgb(0, 0, 0, .5); + } +} diff --git a/Yi.Ai.Vue3/src/styles/element-plus.scss b/Yi.Ai.Vue3/src/styles/element-plus.scss index 2ddb9eb0..98ec11a6 100644 --- a/Yi.Ai.Vue3/src/styles/element-plus.scss +++ b/Yi.Ai.Vue3/src/styles/element-plus.scss @@ -1,15 +1,15 @@ .el-form{ .el-form-item{ &:nth-last-child(1){ - margin-bottom: 0px; + margin-bottom: 0; } } } // el 弹框不知道为啥宽度会变大 .el-popup-parent--hidden { - overflow: hidden; width: 100% !important; + overflow: hidden; } @@ -22,29 +22,28 @@ // rounded-tooltip 提示框样式 .rounded-tooltip { - border-radius: 10px !important; display: flex; align-items: center; height: fit-content; + border-radius: 10px !important; } - .rounded-tooltip-enter-from { - transform: scale(0.9); /* 进入前:缩小隐藏 */ opacity: 0; + transform: scale(0.9); /* 进入前:缩小隐藏 */ } .rounded-tooltip-enter-active, .rounded-tooltip-leave-active { transition: transform 0.3s, opacity 0.3s; /* 缓入动画 */ } .rounded-tooltip-enter-to { - transform: scale(1); /* 进入后:正常大小 */ opacity: 1; + transform: scale(1); /* 进入后:正常大小 */ } .rounded-tooltip-leave-from { - transform: scale(1); /* 离开前:正常大小 */ opacity: 1; + transform: scale(1); /* 离开前:正常大小 */ } .rounded-tooltip-leave-to { - transform: scale(0.9); /* 离开后:缩小隐藏 */ opacity: 0; + transform: scale(0.9); /* 离开后:缩小隐藏 */ } diff --git a/Yi.Ai.Vue3/src/styles/element-plus.scss.bak b/Yi.Ai.Vue3/src/styles/element-plus.scss.bak new file mode 100644 index 00000000..2ddb9eb0 --- /dev/null +++ b/Yi.Ai.Vue3/src/styles/element-plus.scss.bak @@ -0,0 +1,50 @@ +.el-form{ + .el-form-item{ + &:nth-last-child(1){ + margin-bottom: 0px; + } + } +} + +// el 弹框不知道为啥宽度会变大 +.el-popup-parent--hidden { + overflow: hidden; + width: 100% !important; +} + + +// messagebox 样式 +.is-message-box { + .el-message-box { + border-radius: 16px; + } +} + +// rounded-tooltip 提示框样式 +.rounded-tooltip { + border-radius: 10px !important; + display: flex; + align-items: center; + height: fit-content; +} + +.rounded-tooltip-enter-from { + transform: scale(0.9); /* 进入前:缩小隐藏 */ + opacity: 0; +} +.rounded-tooltip-enter-active, +.rounded-tooltip-leave-active { + transition: transform 0.3s, opacity 0.3s; /* 缓入动画 */ +} +.rounded-tooltip-enter-to { + transform: scale(1); /* 进入后:正常大小 */ + opacity: 1; +} +.rounded-tooltip-leave-from { + transform: scale(1); /* 离开前:正常大小 */ + opacity: 1; +} +.rounded-tooltip-leave-to { + transform: scale(0.9); /* 离开后:缩小隐藏 */ + opacity: 0; +} diff --git a/Yi.Ai.Vue3/src/styles/elx.scss b/Yi.Ai.Vue3/src/styles/elx.scss index 420e09d9..eb9e423e 100644 --- a/Yi.Ai.Vue3/src/styles/elx.scss +++ b/Yi.Ai.Vue3/src/styles/elx.scss @@ -4,26 +4,22 @@ .image-preview-container { flex: none !important; } - .elx-files-card-content { gap: 8px; .elx-files-card-description { line-height: 1.35; } } - .prev-next-btn { position: absolute; top: calc(50% + 3px); - transform: translateY(-50%); z-index: 10; cursor: pointer; + transform: translateY(-50%); } - .elx-attachments-file-card-wrap { padding-top: 6px; } - .elx-attachments-card { user-select: none; } diff --git a/Yi.Ai.Vue3/src/styles/elx.scss.bak b/Yi.Ai.Vue3/src/styles/elx.scss.bak new file mode 100644 index 00000000..420e09d9 --- /dev/null +++ b/Yi.Ai.Vue3/src/styles/elx.scss.bak @@ -0,0 +1,36 @@ +// 覆盖一些 elx 组件样式 + +// attachments 图片组件的 1.2.0 版本样式 bug +.image-preview-container { + flex: none !important; +} + +.elx-files-card-content { + gap: 8px; + .elx-files-card-description { + line-height: 1.35; + } +} + +.prev-next-btn { + position: absolute; + top: calc(50% + 3px); + transform: translateY(-50%); + z-index: 10; + cursor: pointer; +} + +.elx-attachments-file-card-wrap { + padding-top: 6px; +} + +.elx-attachments-card { + user-select: none; +} + +// 隐藏 elx-sender-header 组件的底部边框 +.el-sender-header { + border-bottom-color: transparent !important; +} + + diff --git a/Yi.Ai.Vue3/src/styles/index.scss b/Yi.Ai.Vue3/src/styles/index.scss index d833ce61..184e6ab7 100644 --- a/Yi.Ai.Vue3/src/styles/index.scss +++ b/Yi.Ai.Vue3/src/styles/index.scss @@ -1,9 +1,8 @@ -@use './media.scss'; -@use './btn-style.scss'; +@use './media'; +@use './btn-style'; @use 'reset-css'; -@use './element-plus.scss'; -@use './elx.scss'; - +@use './element-plus'; +@use './elx'; body{ overflow: hidden; } diff --git a/Yi.Ai.Vue3/src/styles/index.scss.bak b/Yi.Ai.Vue3/src/styles/index.scss.bak new file mode 100644 index 00000000..d833ce61 --- /dev/null +++ b/Yi.Ai.Vue3/src/styles/index.scss.bak @@ -0,0 +1,9 @@ +@use './media.scss'; +@use './btn-style.scss'; +@use 'reset-css'; +@use './element-plus.scss'; +@use './elx.scss'; + +body{ + overflow: hidden; +} diff --git a/Yi.Ai.Vue3/src/styles/var.scss b/Yi.Ai.Vue3/src/styles/var.scss index d482be3e..3f70b7d3 100644 --- a/Yi.Ai.Vue3/src/styles/var.scss +++ b/Yi.Ai.Vue3/src/styles/var.scss @@ -13,7 +13,7 @@ --login-dialog-section-padding: 0px; --login-dialog-border-radius: 24px; --login-dialog-mode-toggle-color: #409eff; - --login-dialog-logo-background: #fff; + --login-dialog-logo-background: #ffffff; --login-dialog-logo-text-color: #191919; diff --git a/Yi.Ai.Vue3/src/styles/var.scss.bak b/Yi.Ai.Vue3/src/styles/var.scss.bak new file mode 100644 index 00000000..d482be3e --- /dev/null +++ b/Yi.Ai.Vue3/src/styles/var.scss.bak @@ -0,0 +1,24 @@ +:root { + /* 头部高度 */ + --header-container-default-heigth: 56px; + + /* 左侧侧边栏背景色 */ + --sidebar-background-color: #f3f4f6; + + + /* 登录弹框变量 */ + --login-dialog-width: 738px; + --login-dialog-height: 416px; + --login-dialog-padding: 0px; + --login-dialog-section-padding: 0px; + --login-dialog-border-radius: 24px; + --login-dialog-mode-toggle-color: #409eff; + --login-dialog-logo-background: #fff; + --login-dialog-logo-text-color: #191919; + + + + /* 覆盖 element-plus 样式 */ + --el-border-radius-base: 12px !important; + --el-messagebox-border-radius: 16px !important; +}