Commit c1a02534 authored by 赵伟庚's avatar 赵伟庚

[fix](组织管理新增用户): 帐号校验规则变更

parent 9b4c55ba
...@@ -34,7 +34,7 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行 ...@@ -34,7 +34,7 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
image: registry.cn-qingdao.aliyuncs.com/wod/devops-node:16.16.0-slim image: registry.cn-qingdao.aliyuncs.com/wod/devops-node:16.16.0-slim
# 将宿主机中文件夹挂载到容器中,宿主机文件夹中的文件会被容器访问并修改,起到使用缓存的作用,避免每次运行都要重现下载依赖,提高运行速度 # 将宿主机中文件夹挂载到容器中,宿主机文件夹中的文件会被容器访问并修改,起到使用缓存的作用,避免每次运行都要重现下载依赖,提高运行速度
commands: commands:
- yarn # - yarn
- export NODE_ENV=production - export NODE_ENV=production
- yarn build - yarn build
...@@ -62,7 +62,7 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行 ...@@ -62,7 +62,7 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5 # 基础镜像,根据项目需求进行使用,如果第三方登录改成ui-base base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5 # 基础镜像,根据项目需求进行使用,如果第三方登录改成ui-base
dockerfile: .beagle/dockerfile dockerfile: .beagle/dockerfile
repo: wod/apaas-system-ui # 生成镜像的 分组/名称 repo: wod/apaas-system-ui # 生成镜像的 分组/名称
version: "5.1.1" # 版本号 version: "5.1.2" # 版本号
channel: alpha # 后缀 example: alpha test fix-alpha fix等 channel: alpha # 后缀 example: alpha test fix-alpha fix等
args: "TARGETOS=linux,TARGETARCH=amd64" # 不同架构的构建参数 args: "TARGETOS=linux,TARGETARCH=amd64" # 不同架构的构建参数
registry: registry.cn-qingdao.aliyuncs.com # 私有仓库地址 registry: registry.cn-qingdao.aliyuncs.com # 私有仓库地址
...@@ -93,7 +93,7 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行 ...@@ -93,7 +93,7 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-arm64 base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-arm64
dockerfile: .beagle/dockerfile dockerfile: .beagle/dockerfile
repo: wod/apaas-system-ui repo: wod/apaas-system-ui
version: "5.1.1" version: "5.1.2"
channel: alpha-arm64 channel: alpha-arm64
args: "TARGETOS=linux,TARGETARCH=arm64" args: "TARGETOS=linux,TARGETARCH=arm64"
registry: registry.cn-qingdao.aliyuncs.com registry: registry.cn-qingdao.aliyuncs.com
......
...@@ -92,6 +92,10 @@ const validatePass = (rule, value, callback) => { ...@@ -92,6 +92,10 @@ const validatePass = (rule, value, callback) => {
}; };
const validateSystemAccount = (rule, value, callback) => { const validateSystemAccount = (rule, value, callback) => {
let reg = /^[a-zA-Z0-9]+$/;
if (!reg.test(value)) {
callback(new Error("只能输入字母和数字"));
} else {
let params = null; let params = null;
if (props.id) { if (props.id) {
params = { id: parseInt(props.id), system_account: value }; params = { id: parseInt(props.id), system_account: value };
...@@ -106,6 +110,7 @@ const validateSystemAccount = (rule, value, callback) => { ...@@ -106,6 +110,7 @@ const validateSystemAccount = (rule, value, callback) => {
callback(new Error(res.data.data)); callback(new Error(res.data.data));
} }
}); });
}
}; };
const checkPhone = (rule, value, callback) => { const checkPhone = (rule, value, callback) => {
...@@ -141,6 +146,8 @@ const orgAccountFormRules = reactive({ ...@@ -141,6 +146,8 @@ const orgAccountFormRules = reactive({
select_role: [{ required: true, message: "请选择角色", trigger: "blur" }], select_role: [{ required: true, message: "请选择角色", trigger: "blur" }],
system_account: [ system_account: [
{ required: true, message: "请输入账号", trigger: "blur" }, { required: true, message: "请输入账号", trigger: "blur" },
{ min: 4, message: "帐号长度不得低于4个字符", trigger: "blur" },
{ max: 20, message: "帐号最大长度为20个字符", trigger: "blur" },
{ validator: validateSystemAccount, trigger: "blur" }, { validator: validateSystemAccount, trigger: "blur" },
], ],
contact_phone: [ contact_phone: [
......
...@@ -95,6 +95,10 @@ const checkPhone = (rule, value, callback) => { ...@@ -95,6 +95,10 @@ const checkPhone = (rule, value, callback) => {
}; };
const validateSystemAccount = (rule, value, callback) => { const validateSystemAccount = (rule, value, callback) => {
let reg = /^[a-zA-Z0-9]+$/;
if (!reg.test(value)) {
callback(new Error("只能输入字母和数字"));
} else {
let params = null; let params = null;
if (props.id) { if (props.id) {
params = { id: parseInt(props.id), system_account: value }; params = { id: parseInt(props.id), system_account: value };
...@@ -109,6 +113,7 @@ const validateSystemAccount = (rule, value, callback) => { ...@@ -109,6 +113,7 @@ const validateSystemAccount = (rule, value, callback) => {
callback(new Error(res.data.data)); callback(new Error(res.data.data));
} }
}); });
}
}; };
const checkPhoneRepet = (rule, value, callback) => { const checkPhoneRepet = (rule, value, callback) => {
...@@ -131,6 +136,8 @@ const checkPhoneRepet = (rule, value, callback) => { ...@@ -131,6 +136,8 @@ const checkPhoneRepet = (rule, value, callback) => {
const platformAccountFormRules = reactive({ const platformAccountFormRules = reactive({
system_account: [ system_account: [
{ required: true, message: "请输入账号", trigger: "blur" }, { required: true, message: "请输入账号", trigger: "blur" },
{ min: 4, message: "帐号长度不得低于4个字符", trigger: "blur" },
{ max: 20, message: "帐号最大长度为20个字符", trigger: "blur" },
{ validator: validateSystemAccount, trigger: "blur" }, { validator: validateSystemAccount, trigger: "blur" },
], ],
contact_phone: [ contact_phone: [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment