Merge pull request #4396 from dataease/pr@dev_memory_component

Pr@dev memory component

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 {

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]

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;
   }
 

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)

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>