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

fix: bug#17715、17705、17699、17696 

* fix: bug#17696、17694、17693、17691、17676

* fix: bug#17715、17705、17699、17696
This commit is contained in:
qiaochuLei 2023-08-31 15:51:07 +08:00 committed by GitHub
parent 06a323e6f0
commit c9a6e97795
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 48 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/Layout/components/Notice.vue
View File

@ -88,13 +88,12 @@ const subscribeNotice = () => {
const read = (type: string, data: any) => { const read = (type: string, data: any) => {
changeStatus_api('_read', [data.payload.id]).then((resp: any) => { changeStatus_api('_read', [data.payload.id]).then((resp: any) => {
if (resp.status !== 200) return; if (resp.status !== 200) return;
notification.close(data.payload.id); notification.close(data.payload.id);
getList(); getList();
if (type !== '_read') { if (type !== '_read') {
menuStory.routerPush('account/center', { menuStory.routerPush('account/center', {
tabKey: 'StationMessage', tabKey: 'StationMessage',
row: data.payload.detail, row: data.payload,
}); });
} }
}); });

17
src/components/Layout/components/NoticeInfo.vue
View File

@ -86,6 +86,7 @@ const activeKey = ref<DataType>(props.tabs?.[0]?.key || 'alarm');
const menuStory = useMenuStore(); const menuStory = useMenuStore();
const route = useRoute(); const route = useRoute();
const type = ref();
const userInfo = useUserInfo(); const userInfo = useUserInfo();
const getData = (type: string[]) => { const getData = (type: string[]) => {
@ -107,6 +108,12 @@ const getData = (type: string[]) => {
termType: 'in', termType: 'in',
column: 'topicProvider', column: 'topicProvider',
}, },
{
type: 'and',
value: 'unread',
termType: 'eq',
column: 'state',
},
], ],
}, },
], ],
@ -114,16 +121,14 @@ const getData = (type: string[]) => {
getList_api(params) getList_api(params)
.then((resp: any) => { .then((resp: any) => {
total.value = resp.result.total; total.value = resp.result.total;
list.value = resp.result?.data?.filter((item:any)=>{ list.value = resp.result?.data || [];
return item?.state?.value === "unread"
}) || [];
}) })
.finally(() => (loading.value = false)); .finally(() => (loading.value = false));
}; };
const onChange = (_key: string) => { const onChange = (_key: string) => {
const type = props.tabs.find((item: any) => item.key === _key)?.type || []; type.value = props.tabs.find((item: any) => item.key === _key)?.type || [];
getData(type); getData(type.value);
}; };
onMounted(async () => { onMounted(async () => {
@ -136,7 +141,7 @@ const onRefresh = (id: string,index:number) => {
...refreshObj.value, ...refreshObj.value,
[id]: !flag, [id]: !flag,
}; };
list.value.splice(index,1); getData(type.value)
}; };
const onMore = (key: string) => { const onMore = (key: string) => {

10
src/utils/validate.ts
View File

@ -24,4 +24,12 @@ export const testIP = (value: string) => {
const ip = const ip =
/^([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])$/; /^([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])$/;
return ip.test(value); return ip.test(value);
}; };
/**
* 判断是否为Ipv4和Ipv6的地址
*/
export const testIpv4_6 = (value:string) => {
const regIpv4 = new RegExp(/^([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])$/);
const regIPv6 = new RegExp(/^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/);
return regIpv4.test(value) || regIPv6.test(value)
}

8
src/views/init-home/InitData/index.vue
View File

@ -107,6 +107,7 @@
v-model:value="modalForm.publicPort" v-model:value="modalForm.publicPort"
placeholder="请输入公网端口" placeholder="请输入公网端口"
style="width: 100%" style="width: 100%"
:precision="0"
/> />
</j-form-item> </j-form-item>
</j-col> </j-col>
@ -131,6 +132,7 @@ import {
} from '@/api/initHome'; } from '@/api/initHome';
import { modalState } from '../data/interface'; import { modalState } from '../data/interface';
import type { Rule } from 'ant-design-vue/es/form'; import type { Rule } from 'ant-design-vue/es/form';
import { testIpv4_6 } from '@/utils/validate';
const formRef = ref(); const formRef = ref();
/** /**
* 初始化数据状态 * 初始化数据状态
@ -143,6 +145,7 @@ const visible = ref<boolean>(false);
const modalForm = reactive<modalState>({ const modalForm = reactive<modalState>({
host: '0.0.0.0', host: '0.0.0.0',
}); });
/** /**
* 校验官网地址 * 校验官网地址
*/ */
@ -150,10 +153,7 @@ const validateUrl = async (_rule: Rule, value: string) => {
if (!value) { if (!value) {
return Promise.reject('请输入公网地址'); return Promise.reject('请输入公网地址');
} else { } else {
var reg = new RegExp( if (!testIpv4_6(value)) {
/^(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}$/,
);
if (!reg.test(value)) {
return Promise.reject('请输入正确的公网地址'); return Promise.reject('请输入正确的公网地址');
} }
return Promise.resolve(); return Promise.resolve();

24
src/views/link/AccessConfig/components/Media/GB28181.vue
View File

@ -147,9 +147,8 @@
message: '请输入IP地址', message: '请输入IP地址',
}, },
{ {
pattern: validator:validateUrl,
/^([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])$/, trigger: 'change',
message: '请输入正确的IP地址',
}, },
]" ]"
@ -341,10 +340,8 @@
'请输入公网 Host', '请输入公网 Host',
}, },
{ {
pattern: validator:validateUrl,
/^([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])$/, trigger: 'change',
message:
'请输入正确的IP地址',
}, },
]" ]"
> >
@ -514,7 +511,8 @@ import { getResourcesCurrent, getClusters } from '@/api/link/accessConfig';
import { update, save } from '@/api/link/accessConfig'; import { update, save } from '@/api/link/accessConfig';
import { onlyMessage } from '@/utils/comm'; import { onlyMessage } from '@/utils/comm';
import { isNumber } from 'lodash-es'; import { isNumber } from 'lodash-es';
import type { Rule } from 'ant-design-vue/es/form';
import { testIpv4_6 } from '@/utils/validate';
interface Form2 { interface Form2 {
clusterNodeId: string | undefined; clusterNodeId: string | undefined;
port: string | undefined; port: string | undefined;
@ -598,6 +596,16 @@ const rules = {
] ]
} }
const validateUrl=async (_rule: Rule, value: string) => {
if (!value) {
return Promise.reject('请输入IP地址');
} else {
if (!testIpv4_6(value)) {
return Promise.reject('请输入正确的IP地址');
}
return Promise.resolve();
}
}
const removeCluster = (item: Form2) => { const removeCluster = (item: Form2) => {
let index = dynamicValidateForm.cluster.indexOf(item); let index = dynamicValidateForm.cluster.indexOf(item);
if (index !== -1) { if (index !== -1) {

2
src/views/link/Type/data.ts
View File

@ -108,7 +108,7 @@ export const Validator = {
regIpv4: new RegExp( regIpv4: new RegExp(
/^((([01]?[0-9]{1,2})|(2[0-4][0-9])|(25[0-5]))\.){3}(([01]?[0-9]{1,2})|(2[0-4][0-9])|(25[0-5]))$/, /^((([01]?[0-9]{1,2})|(2[0-4][0-9])|(25[0-5]))\.){3}(([01]?[0-9]{1,2})|(2[0-4][0-9])|(25[0-5]))$/,
), ),
regIPv6: new RegExp(/^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$/), regIPv6: new RegExp(/^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/),
regDomain: new RegExp( regDomain: new RegExp(
// /^https?:\/\/(([a-zA-Z0-9_-])+(\.)?)*(:\d+)?(\/((\.)?(\?)?=?&?[a-zA-Z0-9_-](\?)?)*)*$/i, // /^https?:\/\/(([a-zA-Z0-9_-])+(\.)?)*(:\d+)?(\/((\.)?(\?)?=?&?[a-zA-Z0-9_-](\?)?)*)*$/i,
/^[a-zA-Z0-9]+([\-\.]{1}[a-zA-Z0-9]+)*\.[a-zA-Z]{2,}$/ /^[a-zA-Z0-9]+([\-\.]{1}[a-zA-Z0-9]+)*\.[a-zA-Z]{2,}$/

6
src/views/media/Cascade/Save/index.vue
View File

@ -674,6 +674,8 @@ onMounted(() => {
const regDomain = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(?:\.|$)){4}$/ const regDomain = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(?:\.|$)){4}$/
// /[j-zA-Z0-9][-j-zA-Z0-9]{0,62}(\.[j-zA-Z0-9][-j-zA-Z0-9]{0,62})+\.?/; // /[j-zA-Z0-9][-j-zA-Z0-9]{0,62}(\.[j-zA-Z0-9][-j-zA-Z0-9]{0,62})+\.?/;
const ipv6 = new RegExp(/^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/)
/** /**
* 上级SIP地址 字段验证 * 上级SIP地址 字段验证
* @param _ * @param _
@ -701,8 +703,8 @@ const checkHost = (host: string, port: string | number | undefined) => {
return Promise.resolve(); return Promise.resolve();
} else if (!host) { } else if (!host) {
return Promise.reject(new Error('请输入IP 地址')); return Promise.reject(new Error('请输入IP 地址'));
} else if (host && !regDomain.test(host)) { } else if (host && !regDomain.test(host) && !ipv6.test(host)) {
return Promise.reject(new Error('请输入0.0.0.0~255.255.255.255的IP地址')); return Promise.reject(new Error('请输入正确的IP地址'));
} else if (!port) { } else if (!port) {
return Promise.reject(new Error('请输入端口')); return Promise.reject(new Error('请输入端口'));
} else if ((port && Number(port) < 1) || Number(port) > 65535) { } else if ((port && Number(port) < 1) || Number(port) > 65535) {

9
src/views/media/Stream/Detail/index.vue
View File

@ -288,7 +288,7 @@ import { queryProviders, queryDetail, save, update } from '@/api/media/stream';
import type { FormInstance } from 'ant-design-vue'; import type { FormInstance } from 'ant-design-vue';
import { FormDataType } from '../type'; import { FormDataType } from '../type';
import { testIpv4_6 } from '@/utils/validate';
const router = useRouter(); const router = useRouter();
const route = useRoute(); const route = useRoute();
const view = route.query.view as string; const view = route.query.view as string;
@ -301,10 +301,6 @@ const options = ref([]);
const checked = ref(false); const checked = ref(false);
const Validator = { const Validator = {
regIpv4: new RegExp(
/^((([01]?[0-9]{1,2})|(2[0-4][0-9])|(25[0-5]))\.){3}(([01]?[0-9]{1,2})|(2[0-4][0-9])|(25[0-5]))$/,
),
regIPv6: new RegExp(/^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$/),
regDomain: new RegExp( regDomain: new RegExp(
/^https?:\/\/(([a-zA-Z0-9_-])+(\.)?)*(:\d+)?(\/((\.)?(\?)?=?&?[a-zA-Z0-9_-](\?)?)*)*$/i, /^https?:\/\/(([a-zA-Z0-9_-])+(\.)?)*(:\d+)?(\/((\.)?(\?)?=?&?[a-zA-Z0-9_-](\?)?)*)*$/i,
), ),
@ -314,8 +310,7 @@ const Validator = {
const validateAddress = (_rule: any, value: string): Promise<any> => const validateAddress = (_rule: any, value: string): Promise<any> =>
new Promise(async (resolve, reject) => { new Promise(async (resolve, reject) => {
if ( if (
Validator.regIpv4.test(value) || testIpv4_6(value) ||
Validator.regIPv6.test(value) ||
Validator.regDomain.test(value) Validator.regDomain.test(value)
) { ) {
return resolve(''); return resolve('');