0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug#10564、10618、10619、10605、10606、10604、10608

This commit is contained in:
JiangQiming 2023-03-20 16:46:59 +08:00
parent 5d27993d0f
commit 3181027490
4 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/validate.ts
View File

@ -4,7 +4,7 @@
* @returns {boolean}
*/
export const phoneRegEx = (value: string) => {
const phone = new RegExp('^(((\\+86)|(\\+86-))|((86)|(86\\-))|((0086)|(0086\\-)))?1[3|5|7|8]\\d{9}$')
const phone = new RegExp('^(((\\+86)|(\\+86-))|((86)|(86\\-))|((0086)|(0086\\-)))?1[3|5|7|8|9]\\d{9}$')
const mobile = /(0[0-9]{2,3})([2-9][0-9]{6,7})+([0-9]{8,11})?$/
return phone.test(value) || mobile.test(value)
}

32
src/views/notice/Config/Detail/index.vue
View File

@ -269,7 +269,7 @@
v-model:value="
formData.configuration.secret
"
placeholder="Secret"
placeholder="请输入Secret"
/>
</j-form-item>
</template>
@ -493,33 +493,33 @@ const handleSslChange = () => {
const resetPublicFiles = () => {
switch (formData.value.provider) {
case 'dingTalkMessage':
formData.value.configuration.appKey = '';
formData.value.configuration.appSecret = '';
formData.value.configuration.appKey = undefined;
formData.value.configuration.appSecret = undefined;
break;
case 'dingTalkRobotWebHook':
formData.value.configuration.url = '';
formData.value.configuration.url = undefined;
break;
case 'corpMessage':
formData.value.configuration.corpId = '';
formData.value.configuration.corpSecret = '';
formData.value.configuration.corpId = undefined;
formData.value.configuration.corpSecret = undefined;
break;
case 'embedded':
formData.value.configuration.host = '';
formData.value.configuration.host = undefined;
formData.value.configuration.port = 25;
formData.value.configuration.ssl = false;
formData.value.configuration.sender = '';
formData.value.configuration.username = '';
formData.value.configuration.password = '';
formData.value.configuration.sender = undefined;
formData.value.configuration.username = undefined;
formData.value.configuration.password = undefined;
break;
case 'aliyun':
formData.value.configuration.regionId = '';
formData.value.configuration.accessKeyId = '';
formData.value.configuration.secret = '';
formData.value.configuration.regionId = undefined;
formData.value.configuration.accessKeyId = undefined;
formData.value.configuration.secret = undefined;
break;
case 'aliyunSms':
formData.value.configuration.regionId = '';
formData.value.configuration.accessKeyId = '';
formData.value.configuration.secret = '';
formData.value.configuration.regionId = undefined;
formData.value.configuration.accessKeyId = undefined;
formData.value.configuration.secret = undefined;
break;
case 'http':
formData.value.configuration.url = undefined;

10
src/views/notice/Config/SyncUser/index.vue
View File

@ -49,7 +49,7 @@
pageSize: pageSize,
pageSizeOptions: ['5', '10', '20', '50', '100'],
showSizeChanger: true,
hideOnSinglePage: true,
hideOnSinglePage: false,
showTotal: (total: number, range: number) => `第 ${range[0]} - ${range[1]} 条/总共 ${total} 条`,
}"
@change="handleTableChange"
@ -196,11 +196,19 @@ const getDepartment = async () => {
deptId.value = _result[0]?.id;
};
watch(
() => deptName.value,
(val: any) => {
if (!val) getDepartment();
},
);
/**
* 部门点击
*/
const onTreeSelect = (keys: any) => {
deptId.value = keys[0];
pageSize.value = 5;
};
// 右侧表格

2
src/views/notice/Template/Detail/components/ToTag.vue
View File

@ -2,7 +2,7 @@
<j-select
:options="options"
@change="change"
placeholder="请选择标签推送，多个标签用,号分隔"
placeholder="请选择标签推送"
style="width: 100%"
:allowClear="true"
v-model:value="_value"