From 5df00dce997b3f8960460bf9a4eabc15bdeeeb92 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Tue, 17 Jan 2023 15:13:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8F=AA=E8=AF=BB=E6=9D=83=E9=99=90=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8=E9=A1=B9=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=95=B0=E6=8D=AE=E5=BC=82=E5=B8=B8#4368=20=20?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=95=B0=E5=AD=97=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=B2=A1=E6=9C=89=E6=97=A0=E6=B3=95=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=20=20=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=83=A8=E5=88=86=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=A0=81?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=BE=93=E5=85=A5=EF=BC=8C=E6=9C=AA=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=A0=81=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=20#4391?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/dataease/DeOutWidget.vue    |  4 +---
 frontend/src/views/dataset/add/AddSQL.vue           |  1 +
 .../views/panel/template/component/TemplateList.vue |  2 +-
 frontend/src/views/system/user/UserEditer.vue       | 13 +++++++++++--
 frontend/src/views/system/user/index.vue            |  1 +
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/dataease/DeOutWidget.vue b/frontend/src/components/dataease/DeOutWidget.vue
index 049cb7878f..487b35df75 100644
--- a/frontend/src/components/dataease/DeOutWidget.vue
+++ b/frontend/src/components/dataease/DeOutWidget.vue
@@ -261,7 +261,6 @@ export default {
 
 .condition-content-container {
   position: relative;
-  display: table;
   width: 100%;
   height: 100%;
   white-space: nowrap;
@@ -269,8 +268,6 @@ export default {
 
 .first-element {
   position: relative;
-  display: table-cell;
-  vertical-align: middle;
   margin: 0px;
   padding: 0px;
   height: 100%;
@@ -298,6 +295,7 @@ export default {
   background: #fff;
   border: 1px solid #d7dae2;
   top: 5px;
+  height: 100%;
 }
 
 .condition-main-line {
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index d3f0f66eba..ad99840b4f 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -799,6 +799,7 @@ export default {
       })
     },
     changeDatasource() {
+      this.keywords = ''
       for (let i = 0; i < this.options.length; i++) {
         if (this.options[i].id === this.dataSource) {
           this.selectedDatasource = this.options[i]
diff --git a/frontend/src/views/panel/template/component/TemplateList.vue b/frontend/src/views/panel/template/component/TemplateList.vue
index 88f7af9ae8..01786f8645 100644
--- a/frontend/src/views/panel/template/component/TemplateList.vue
+++ b/frontend/src/views/panel/template/component/TemplateList.vue
@@ -253,7 +253,7 @@ export default {
   }
 
   li.select {
-    background: var(--deWhiteHover, #ecf5ff) !important;
+    background: var(--deWhiteHover, #e0eaff) !important;
     color: var(--TextActive, #3370ff) !important;
   }
 
diff --git a/frontend/src/views/system/user/UserEditer.vue b/frontend/src/views/system/user/UserEditer.vue
index e3cf2b0a13..fcaf287844 100644
--- a/frontend/src/views/system/user/UserEditer.vue
+++ b/frontend/src/views/system/user/UserEditer.vue
@@ -223,7 +223,6 @@
 </template>
 
 <script>
-import { PHONE_REGEX } from '@/utils/validate'
 import { getDeptTree, treeByDeptId } from '@/api/system/dept'
 import { addUser, editUser, allRoles, queryAssist } from '@/api/system/user'
 import { pluginLoaded, defaultPwd, wecomStatus, dingtalkStatus, larkStatus } from '@/api/user'
@@ -280,7 +279,7 @@ export default {
         ],
         phone: [
           {
-            pattern: PHONE_REGEX,
+            validator: this.phoneRegex,
             message: this.$t('user.phone_format'),
             trigger: 'blur'
           }
@@ -413,6 +412,16 @@ export default {
         callback()
       }
     },
+    phoneRegex(rule, value, callback) {
+      const regep = new RegExp(/^1[3-9]\d{9}$/)
+
+      if (!regep.test(value)) {
+        const msg = this.$t('user.phone_format')
+        callback(new Error(msg))
+      } else {
+        callback()
+      }
+    },
     validateUsername(rule, value, callback) {
       const pattern = '^[a-zA-Z][a-zA-Z0-9\._-]*$'
       const regep = new RegExp(pattern)
diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index 4f9bdb603f..be0894105c 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -304,6 +304,7 @@
               type="text"
               @click="unlock(scope.row)"
             >{{ $t("commons.unlock") }}</el-button>
+            <span v-else>&nbsp;</span>
           </template>
         </el-table-column>
       </grid-table>