From 117d62fde6ec5a0f1f25495cc1ee6d11b45108a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=A8=9C?= <lnlnln629@163.com>
Date: Wed, 12 Feb 2025 17:33:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF&=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E5=90=8E=E8=BF=94=E5=9B=9E=E7=99=BB=E5=BD=95fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/package/zh-cn.ts |   9 ++-
 src/views/login/index.vue | 137 ++++++++++++++++++++++++++------------
 2 files changed, 103 insertions(+), 43 deletions(-)

diff --git a/src/lang/package/zh-cn.ts b/src/lang/package/zh-cn.ts
index 2d0eaaf..fcfce46 100644
--- a/src/lang/package/zh-cn.ts
+++ b/src/lang/package/zh-cn.ts
@@ -15,6 +15,7 @@ export default {
         nameMsg: "昵称不能为空",
         required: "请输入昵称",
         notMinThan: "昵称长度不能大于10个字符",
+        popoverMsg:'长度为1-10个字符'
       },
       username: {
         usernameMsg: "用户名不能为空",
@@ -22,6 +23,7 @@ export default {
         notMinThan: "用户名长度不能少于5个字符",
         notMaxThan: "用户名长度不能大于20个字符",
         regxMsg: "用户名只能为小写字母、数字",
+        popoverMsg:'长度为5-20个字符,只能包含小写字母、数字'
       },
       password: {
         passwordMsg: "密码不能为空",
@@ -29,20 +31,23 @@ export default {
         notMinThan: "密码长度不能少于6个字符",
         notMaxThan: "密码长度不能大于20个字符",
         regxMsg: "密码必须包含大写字母、小写字母、数字",
+        popoverMsg:'长度为6-20个字符,必须包含大写字母、小写字母、数字'
       },
       passwd: {
         passwordMsg: "密码不能为空",
         required: "请输入密码",
-        notMinThan: "密码长度不能少于5个字符",
+        notMinThan: "密码长度不能少于6个字符",
         notMaxThan: "密码长度不能大于20个字符",
         regxMsg: "密码必须包含大写字母、小写字母、数字",
+        popoverMsg:'长度为6-20个字符,必须包含大写字母、小写字母、数字'
       },
       email: {
         emailMsg: "邮箱不能为空",
         required: "请输入邮箱",
-        notMinThan: "邮箱长度不能少于6个字符",
+        notMinThan: "邮箱长度不能少于5个字符",
         notMaxThan: "邮箱长度不能大于20个字符",
         regxMsg: "邮箱格式不正确",
+        popoverMsg:'长度为5-20个字符,格式必须为XXX@XXX.XXX'
       },
       loginTip: "用户名或密码错误",
       loginToken: "您的会话已过期，请重新登录",
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 4889435..2169fa7 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -91,6 +91,30 @@
             <!-- 昵称 -->
             <el-form-item prop="name" class="username-from">
               <div class="input-wrapper">
+                <el-popover
+                  placement="top-end"
+                  :width="500"
+                  trigger="hover"
+                  :content="t('login.message.name.popoverMsg')"
+                  popper-class="custom-popover"
+                >
+                  <template #reference>
+                    <el-input
+                      ref="name"
+                      v-model="signinData.name"
+                      :placeholder="$t('login.message.name.required')"
+                      name="name"
+                      size="large"
+                      class="h-[48px]"
+                    />
+                  </template>
+                </el-popover>
+              </div>
+            </el-form-item>
+            <!-- <el-form-item prop="name" class="username-from">
+              <el-tooltip placement="top" effect="dark">
+                <template #content> multiple lines<br />second line </template>
+
                 <el-input
                   ref="name"
                   v-model="signinData.name"
@@ -99,59 +123,89 @@
                   size="large"
                   class="h-[48px]"
                 />
-              </div>
-            </el-form-item>
+              </el-tooltip>
+            </el-form-item> -->
             <!-- 用户名 -->
             <el-form-item prop="account" class="username-from">
               <div class="input-wrapper">
-                <el-input
-                  ref="account"
-                  v-model="signinData.account"
-                  :placeholder="$t('login.message.username.required')"
-                  name="account"
-                  size="large"
-                  class="h-[48px]"
-                />
+                <el-popover
+                  placement="top-end"
+                  :width="500"
+                  trigger="hover"
+                  :content="t('login.message.username.popoverMsg')"
+                  popper-class="custom-popover"
+                >
+                  <template #reference>
+                    <el-input
+                      ref="account"
+                      v-model="signinData.account"
+                      :placeholder="$t('login.message.username.required')"
+                      name="account"
+                      size="large"
+                      class="h-[48px]"
+                    />
+                  </template>
+                </el-popover>
               </div>
             </el-form-item>
             <!-- 邮箱 -->
             <el-form-item prop="email" class="username-from">
               <div class="input-wrapper">
-                <el-input
-                  ref="email"
-                  v-model="signinData.email"
-                  :placeholder="$t('login.message.email.required')"
-                  name="email"
-                  size="large"
-                  class="h-[48px]"
-                />
+                <el-popover
+                  placement="top-end"
+                  :width="500"
+                  trigger="hover"
+                  :content="t('login.message.email.popoverMsg')"
+                  popper-class="custom-popover"
+                >
+                  <template #reference>
+                    <el-input
+                      ref="email"
+                      v-model="signinData.email"
+                      :placeholder="$t('login.message.email.required')"
+                      name="email"
+                      size="large"
+                      class="h-[48px]"
+                    />
+                  </template>
+                </el-popover>
               </div>
             </el-form-item>
 
             <!-- 密码 -->
             <el-form-item prop="passwd" class="password-from">
               <div class="input-wrapper">
-                <el-input
-                  v-model="signinData.passwd"
-                  :placeholder="$t('login.message.passwd.required')"
-                  name="passwd"
-                  :type="passwordType"
-                  @keyup.enter="handleLoginSubmit"
-                  size="large"
-                  class="h-[48px]"
-                  autocomplete="off"
-                  ref="inputRef"
+                <el-popover
+                  placement="top-end"
+                  :width="500"
+                  trigger="hover"
+                  :content="t('login.message.passwd.popoverMsg')"
+                  popper-class="custom-popover"
                 >
-                  <template #suffix>
-                    <el-icon
-                      class="el-input__icon el-input__password"
-                      @click="handleShowPassword"
+                  <template #reference>
+                    <el-input
+                      v-model="signinData.passwd"
+                      :placeholder="$t('login.message.passwd.required')"
+                      name="passwd"
+                      :type="passwordType"
+                      @keyup.enter="handleLoginSubmit"
+                      size="large"
+                      class="h-[48px]"
+                      autocomplete="off"
+                      ref="inputRef"
                     >
-                      <IconInvisible v-if="passwordType === 'password'" />
-                      <IconVisible v-else />
-                    </el-icon>
+                      <template #suffix>
+                        <el-icon
+                          class="el-input__icon el-input__password"
+                          @click="handleShowPassword"
+                        >
+                          <IconInvisible v-if="passwordType === 'password'" />
+                          <IconVisible v-else />
+                        </el-icon>
+                      </template>
+                    </el-input>
                   </template>
-                </el-input>
+                </el-popover>
               </div>
             </el-form-item>
             <!-- 注册按钮 -->
@@ -383,9 +437,9 @@ const handleLoginSubmit = () => {
   });
 };
 
-/** 
- * 跳转到注册 
- */ 
+/**
+ * 跳转到注册
+ */
 const handleSigIn = () => {
   isSigIn.value = true;
   loginFormRef.value?.resetFields();
@@ -395,7 +449,7 @@ const handleSigIn = () => {
  * 返回登录
  */
 const handleBackLogin = () => {
-  if(signinLoding.value){
+  if (signinLoding.value) {
     return;
   }
   signinFormRef.value?.resetFields();
@@ -419,7 +473,8 @@ const handleSigInSubmit = () => {
             customClass: "o-message--success",
             duration: 3000,
           });
-          handleBackLogin();
+          signinFormRef.value?.resetFields();
+          isSigIn.value = false;
         })
         .finally(() => {
           signinLoding.value = false;
-- 
Gitee


From 25a202036b18c72d630e074d2f6b475efc261fbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=A8=9C?= <lnlnln629@163.com>
Date: Fri, 14 Feb 2025 14:59:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?witchainD=E5=B5=8C=E5=85=A5Copilot=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=80=82=E9=85=8D=E3=80=81=E8=B7=AF=E7=94=B1=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E9=80=82=E9=85=8D=EF=BC=9BwitchainD=E6=96=87=E6=A1=88?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=EF=BC=9B=E9=9A=90=E8=97=8FwitchainD=E7=9A=84?=
 =?UTF-8?q?hearder=E8=8F=9C=E5=8D=95=E6=A0=8F=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                               |  2 +-
 src/components/HeaderBar/index.vue         |  6 +++---
 src/components/UserHeaderBar/headerCom.vue |  7 ++++---
 src/lang/package/zh-cn.ts                  |  4 ++--
 src/styles/login.scss                      | 15 ++++++++++++--
 src/styles/reset.scss                      | 24 ++++++++++++++++++++--
 src/views/login/index.vue                  | 14 -------------
 vite.config.ts                             |  3 ++-
 8 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 48992e7..b12707c 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "witChainD",
+  "name": "知识库",
   "version": "1.0.0",
   "private": true,
   "type": "module",
diff --git a/src/components/HeaderBar/index.vue b/src/components/HeaderBar/index.vue
index d372bf7..9306976 100644
--- a/src/components/HeaderBar/index.vue
+++ b/src/components/HeaderBar/index.vue
@@ -1,6 +1,7 @@
 <template>
   <el-affix target=".main-container" :offset="0">
-    <el-header class="platform-header">
+    <!-- 因嵌入copilot页面暂时注释 -->
+    <!-- <el-header class="platform-header">
       <span class="platform-title">
         <img src="/src/assets/svg/euler_copilot_logo.svg" />
         <h4>witChainD</h4>
@@ -11,7 +12,7 @@
           <IconHelpCircle />
         </el-icon>
       </div>
-    </el-header>
+    </el-header> -->
   </el-affix>
 </template>
 
@@ -24,7 +25,6 @@ import { IconHelpCircle } from "@computing/opendesign-icons";
 import { TOKEN_KEY } from "@/enums/CacheEnum";
 const settingsStore = useSettingsStore();
 const { t } = useI18n();
- 
 </script>
 
 <style lang="scss">
diff --git a/src/components/UserHeaderBar/headerCom.vue b/src/components/UserHeaderBar/headerCom.vue
index ec3c54c..ad9e856 100644
--- a/src/components/UserHeaderBar/headerCom.vue
+++ b/src/components/UserHeaderBar/headerCom.vue
@@ -2,11 +2,12 @@
   <el-header class="platform-header">
     <div class="header-container">
       <span class="platform-title">
-        <img src="/src/assets/svg/euler_copilot_logo.svg" />
-        <span class="project-name">witChainD</span>
+    <!-- 因嵌入copilot页面暂时注释 -->
+        <!-- <img src="/src/assets/svg/euler_copilot_logo.svg" /> -->
+        <!-- <span class="project-name">witChainD</span> -->
       </span>
       <div class="top-bar">
-        <lang-select class="ml-2 cursor-pointer" />
+        <!-- <lang-select class="ml-2 cursor-pointer" /> -->
         <el-dropdown
           popper-class="dropdown-container userDro"
           class="userDroContainer"
diff --git a/src/lang/package/zh-cn.ts b/src/lang/package/zh-cn.ts
index fcfce46..e19329b 100644
--- a/src/lang/package/zh-cn.ts
+++ b/src/lang/package/zh-cn.ts
@@ -61,9 +61,9 @@ export default {
   assetLibrary: {
     assetLibrary: "资产库",
     assetId: "资产ID",
-    welcomeUsePro: "欢迎使用WitChainD!",
+    welcomeUsePro: "欢迎使用知识库!",
     profile:
-      "witChainD专注于文档的高效管理和智能解析，支持包括XML、MD、XLSX、DOCX、DOC以及TXT在内的多种文件格式。本平台搭载的先进文档处理技术，结合openEuler Copilot System RAG的强大检索功能，旨在为您提供卓越的智能问答服务体验。",
+      "知识库专注于文档的高效管理和智能解析，支持包括XML、MD、XLSX、DOCX、DOC以及TXT在内的多种文件格式。本平台搭载的先进文档处理技术，结合openEuler Copilot System RAG的强大检索功能，旨在为您提供卓越的智能问答服务体验。",
     message: {
       name: "请输入资产库名称",
       libraryNameLen: "资产库名称长度1-15个字符",
diff --git a/src/styles/login.scss b/src/styles/login.scss
index 3fd5db4..4e00c07 100644
--- a/src/styles/login.scss
+++ b/src/styles/login.scss
@@ -91,8 +91,8 @@
       cursor: pointer;
       color: var(--o-color-info);
       &:hover {
-        color: var(--text-color-info-secondary);
-        transition: 500ms;
+        color: #5d7dffc0;
+        transition: 200ms;
       }
     }
     .not-click{
@@ -124,3 +124,14 @@
     border-radius: 5px;
   }
 }
+/* 调整箭头位置的关键 CSS */
+.el-popover.custom-popover .el-popper__arrow {
+  /* 通过调整 left 属性来水平移动箭头 */
+  left: 90% !important;
+  /* 可以根据需要调整偏移量 */
+  transform: translateX(90%) !important;
+}
+.el-popover.custom-popover .el-popper__arrow::before {
+  /* 调整箭头伪元素的样式 */
+  border-top-color: #fff;
+}
\ No newline at end of file
diff --git a/src/styles/reset.scss b/src/styles/reset.scss
index e2c0850..97d6a8b 100644
--- a/src/styles/reset.scss
+++ b/src/styles/reset.scss
@@ -205,10 +205,30 @@ h6 {
   font-size: 12px;
 }
 
-.el-button--primary {
-  background: rgb(0 119 255) !important;
+$newbg: linear-gradient(to top left, rgba(165, 221, 249, 0.637), rgba(118, 182, 251, 0.698) 50.232%, rgba(106, 147, 243, 0.632) 83.699%); 
+// $newbg:linear-gradient(270deg, rgba(109, 117, 250, 0.2), rgba(90, 179, 255, 0.2));
+$newHoverBg: linear-gradient(to top left, rgb(182, 216, 253), rgb(149, 203, 250) 33.232%, rgb(139, 152, 249) 85.699%);
+/**
+ * 重置按钮背景及边框颜色样式
+ */
+ .el-button{
+  &:hover {
+    color: #5d7dffc0 !important;
+    border-color: #5d7dffc0 !important;
+  }
+}
+.el-button--primary,
+.bgThumb {
+  background:  $newbg !important;  
+  border-color: #c7d2fbc0 !important;
+  &:hover {
+    color: white !important;
+    background: $newHoverBg !important;
+    border-color: #c7d2fbc0 !important;
+  }
 }
 
+
 *,
 *::before,
 *::after {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 2169fa7..0492e21 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -111,20 +111,6 @@
                 </el-popover>
               </div>
             </el-form-item>
-            <!-- <el-form-item prop="name" class="username-from">
-              <el-tooltip placement="top" effect="dark">
-                <template #content> multiple lines<br />second line </template>
-
-                <el-input
-                  ref="name"
-                  v-model="signinData.name"
-                  :placeholder="$t('login.message.name.required')"
-                  name="name"
-                  size="large"
-                  class="h-[48px]"
-                />
-              </el-tooltip>
-            </el-form-item> -->
             <!-- 用户名 -->
             <el-form-item prop="account" class="username-from">
               <div class="input-wrapper">
diff --git a/vite.config.ts b/vite.config.ts
index 6d38b15..55bf8e9 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -49,8 +49,9 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
     },
     server: {
       // 允许IP访问
-      host: "127.0.0.1",
+      host: "localhost",
       port: 3002,
+      origin: 'http://localhost:3002',
       // 运行是否自动打开浏览器
       headers: {
         "Access-control-allow-origin": "*",
-- 
Gitee