fix: 用户管理页面只读权限查看修改列表项显示数据异常#4368 仪表板数字列表组件没有无法下拉 添加用户时,部分手机号码无法输入,未通过手机号码校验 #4391

This commit is contained in:
dataeaseShu 2023-01-17 15:13:55 +08:00
parent 40f832df70
commit 5df00dce99
5 changed files with 15 additions and 6 deletions

View File

@ -261,7 +261,6 @@ export default {
.condition-content-container { .condition-content-container {
position: relative; position: relative;
display: table;
width: 100%; width: 100%;
height: 100%; height: 100%;
white-space: nowrap; white-space: nowrap;
@ -269,8 +268,6 @@ export default {
.first-element { .first-element {
position: relative; position: relative;
display: table-cell;
vertical-align: middle;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
height: 100%; height: 100%;
@ -298,6 +295,7 @@ export default {
background: #fff; background: #fff;
border: 1px solid #d7dae2; border: 1px solid #d7dae2;
top: 5px; top: 5px;
height: 100%;
} }
.condition-main-line { .condition-main-line {

View File

@ -799,6 +799,7 @@ export default {
}) })
}, },
changeDatasource() { changeDatasource() {
this.keywords = ''
for (let i = 0; i < this.options.length; i++) { for (let i = 0; i < this.options.length; i++) {
if (this.options[i].id === this.dataSource) { if (this.options[i].id === this.dataSource) {
this.selectedDatasource = this.options[i] this.selectedDatasource = this.options[i]

View File

@ -253,7 +253,7 @@ export default {
} }
li.select { li.select {
background: var(--deWhiteHover, #ecf5ff) !important; background: var(--deWhiteHover, #e0eaff) !important;
color: var(--TextActive, #3370ff) !important; color: var(--TextActive, #3370ff) !important;
} }

View File

@ -223,7 +223,6 @@
</template> </template>
<script> <script>
import { PHONE_REGEX } from '@/utils/validate'
import { getDeptTree, treeByDeptId } from '@/api/system/dept' import { getDeptTree, treeByDeptId } from '@/api/system/dept'
import { addUser, editUser, allRoles, queryAssist } from '@/api/system/user' import { addUser, editUser, allRoles, queryAssist } from '@/api/system/user'
import { pluginLoaded, defaultPwd, wecomStatus, dingtalkStatus, larkStatus } from '@/api/user' import { pluginLoaded, defaultPwd, wecomStatus, dingtalkStatus, larkStatus } from '@/api/user'
@ -280,7 +279,7 @@ export default {
], ],
phone: [ phone: [
{ {
pattern: PHONE_REGEX, validator: this.phoneRegex,
message: this.$t('user.phone_format'), message: this.$t('user.phone_format'),
trigger: 'blur' trigger: 'blur'
} }
@ -413,6 +412,16 @@ export default {
callback() 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) { validateUsername(rule, value, callback) {
const pattern = '^[a-zA-Z][a-zA-Z0-9\._-]*$' const pattern = '^[a-zA-Z][a-zA-Z0-9\._-]*$'
const regep = new RegExp(pattern) const regep = new RegExp(pattern)

View File

@ -304,6 +304,7 @@
type="text" type="text"
@click="unlock(scope.row)" @click="unlock(scope.row)"
>{{ $t("commons.unlock") }}</el-button> >{{ $t("commons.unlock") }}</el-button>
<span v-else>&nbsp;</span>
</template> </template>
</el-table-column> </el-table-column>
</grid-table> </grid-table>