diff --git a/packages/cron-input/src/components/internal/cron-model.vue b/packages/cron-input/src/components/internal/cron-model.vue index 9cbc1bf..0e1dbcc 100644 --- a/packages/cron-input/src/components/internal/cron-model.vue +++ b/packages/cron-input/src/components/internal/cron-model.vue @@ -49,7 +49,7 @@ const fields = computed(() => { // }); const previewLabel = computed(() => { - return Locales[props.lang].preview.join(previewTime.value.toString()); + return Locales[props.lang].preview.join(previewTime.value?.toString()); }); const expression = computed(() => { diff --git a/packages/cron-input/src/components/internal/input-number.vue b/packages/cron-input/src/components/internal/input-number.vue index a0e3de8..2d9d5f9 100644 --- a/packages/cron-input/src/components/internal/input-number.vue +++ b/packages/cron-input/src/components/internal/input-number.vue @@ -31,7 +31,7 @@ const value = computed({ }); const formatter = (val: number) => { - return props.fieldValue === WEEK ? formatterWeek(val.toString(), props.locale!) : null; + return props.fieldValue === WEEK ? formatterWeek(val?.toString(), props.locale!) : null; }; const parser = (val: string) => { diff --git a/packages/cron-input/src/shared/utils.ts b/packages/cron-input/src/shared/utils.ts index 9a5a64b..120bca5 100644 --- a/packages/cron-input/src/shared/utils.ts +++ b/packages/cron-input/src/shared/utils.ts @@ -19,7 +19,7 @@ export function generateSpecifies( let index = 0; for (let specify = min; specify <= max; specify += 1) { - specifies.push({ value: specify, label: labels ? labels[index] : specify.toString() }); + specifies.push({ value: specify, label: labels ? labels[index] : specify?.toString() }); index += 1; } diff --git a/packages/utils/src/crypto.ts b/packages/utils/src/crypto.ts index dc173c8..be6d9be 100644 --- a/packages/utils/src/crypto.ts +++ b/packages/utils/src/crypto.ts @@ -11,7 +11,7 @@ export class Crypto { encrypt(data: T): string { const dataString = JSON.stringify(data); const encrypted = CryptoJS.AES.encrypt(dataString, this.secret); - return encrypted.toString(); + return encrypted?.toString(); } decrypt(encrypted: string) { diff --git a/packages/work-flow/src/components/log-drawer.vue b/packages/work-flow/src/components/log-drawer.vue index 56b8ed4..386526a 100644 --- a/packages/work-flow/src/components/log-drawer.vue +++ b/packages/work-flow/src/components/log-drawer.vue @@ -113,14 +113,14 @@ onBeforeUnmount(() => { }); function timestampToDate(timestamp: string): string { - const date = new Date(Number.parseInt(timestamp.toString(), 10)); + const date = new Date(Number.parseInt(timestamp?.toString(), 10)); const year = date.getFullYear(); const month = - (date.getMonth() + 1).toString().length === 1 ? `0${date.getMonth() + 1}` : (date.getMonth() + 1).toString(); - const day = date.getDate().toString().length === 1 ? `0${date.getDate()}` : date.getDate().toString(); - const hours = date.getHours().toString().length === 1 ? `0${date.getHours()}` : date.getHours().toString(); - const minutes = date.getMinutes().toString().length === 1 ? `0${date.getMinutes()}` : date.getMinutes().toString(); - const seconds = date.getSeconds().toString().length === 1 ? `0${date.getSeconds()}` : date.getSeconds().toString(); + (date.getMonth() + 1)?.toString().length === 1 ? `0${date.getMonth() + 1}` : (date.getMonth() + 1)?.toString(); + const day = date.getDate()?.toString().length === 1 ? `0${date.getDate()}` : date.getDate()?.toString(); + const hours = date.getHours()?.toString().length === 1 ? `0${date.getHours()}` : date.getHours()?.toString(); + const minutes = date.getMinutes()?.toString().length === 1 ? `0${date.getMinutes()}` : date.getMinutes()?.toString(); + const seconds = date.getSeconds()?.toString().length === 1 ? `0${date.getSeconds()}` : date.getSeconds()?.toString(); return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}.${date.getMilliseconds()}`; } diff --git a/packages/work-flow/src/node/branch-node.vue b/packages/work-flow/src/node/branch-node.vue index d809951..49a895e 100644 --- a/packages/work-flow/src/node/branch-node.vue +++ b/packages/work-flow/src/node/branch-node.vue @@ -148,7 +148,7 @@ const showDetail = (item: Flow.ConditionNodeType, index: number) => { if (job.id) { detailIds.value?.push(job.id); } else if (job.jobId) { - detailId.value = job.jobId.toString(); + detailId.value = job.jobId?.toString(); } }); if (detailIds.value.length === 0) { diff --git a/packages/work-flow/src/node/callback-node.vue b/packages/work-flow/src/node/callback-node.vue index 88b5533..77550ea 100644 --- a/packages/work-flow/src/node/callback-node.vue +++ b/packages/work-flow/src/node/callback-node.vue @@ -92,7 +92,7 @@ const showDetail = (item: Flow.ConditionNodeType, index: number) => { if (job.id) { detailIds.value?.push(job.id); } else if (job.jobId) { - detailId.value = job.jobId.toString(); + detailId.value = job.jobId?.toString(); } }); if (detailIds.value.length === 0) { diff --git a/packages/work-flow/src/node/task-node.vue b/packages/work-flow/src/node/task-node.vue index e94199b..c9d909a 100644 --- a/packages/work-flow/src/node/task-node.vue +++ b/packages/work-flow/src/node/task-node.vue @@ -141,11 +141,11 @@ const showDetail = (node: Flow.ConditionNodeType, detailIndex: number) => { if (item.id) { detailIds.value?.push(item.id); } else if (item.jobId) { - detailId.value = item.jobId.toString(); + detailId.value = item.jobId?.toString(); } }); if (node.jobTask?.jobId) { - detailId.value = node.jobTask?.jobId.toString(); + detailId.value = node.jobTask?.jobId?.toString(); } cardDrawer.value = true; } else if (store.type === 1) { diff --git a/packages/work-flow/src/utils/request.ts b/packages/work-flow/src/utils/request.ts index e8e191f..43f1452 100644 --- a/packages/work-flow/src/utils/request.ts +++ b/packages/work-flow/src/utils/request.ts @@ -27,7 +27,7 @@ export const request = createFlatRequest( isBackendSuccess(response) { // when the backend response code is "0000"(default), it means the request is success // to change this logic by yourself, you can modify the `VITE_SERVICE_SUCCESS_CODE` in `.env` file - return response.data.status.toString() === import.meta.env.VITE_SERVICE_SUCCESS_CODE; + return response.data.status?.toString() === import.meta.env.VITE_SERVICE_SUCCESS_CODE; }, transformBackendResponse(response) { return response.data.total ? response.data : response.data.data; @@ -41,7 +41,7 @@ export const request = createFlatRequest( // get backend error message and code if (error.code === BACKEND_ERROR_CODE) { msg = error.response?.data?.message || msg; - backendErrorCode = error.response?.data?.status.toString() || ''; + backendErrorCode = error.response?.data?.status?.toString() || ''; } // the error message is displayed in the modal diff --git a/src/components/common/log-drawer.vue b/src/components/common/log-drawer.vue index 211386f..f8a350b 100644 --- a/src/components/common/log-drawer.vue +++ b/src/components/common/log-drawer.vue @@ -68,14 +68,14 @@ const onUpdateShow = (value: boolean) => { }; function timestampToDate(timestamp: string): string { - const date = new Date(Number.parseInt(timestamp.toString(), 10)); + const date = new Date(Number.parseInt(timestamp?.toString(), 10)); const year = date.getFullYear(); const month = - (date.getMonth() + 1).toString().length === 1 ? `0${date.getMonth() + 1}` : (date.getMonth() + 1).toString(); - const day = date.getDate().toString().length === 1 ? `0${date.getDate()}` : date.getDate().toString(); - const hours = date.getHours().toString().length === 1 ? `0${date.getHours()}` : date.getHours().toString(); - const minutes = date.getMinutes().toString().length === 1 ? `0${date.getMinutes()}` : date.getMinutes().toString(); - const seconds = date.getSeconds().toString().length === 1 ? `0${date.getSeconds()}` : date.getSeconds().toString(); + (date.getMonth() + 1)?.toString().length === 1 ? `0${date.getMonth() + 1}` : (date.getMonth() + 1)?.toString(); + const day = date.getDate()?.toString().length === 1 ? `0${date.getDate()}` : date.getDate()?.toString(); + const hours = date.getHours()?.toString().length === 1 ? `0${date.getHours()}` : date.getHours()?.toString(); + const minutes = date.getMinutes()?.toString().length === 1 ? `0${date.getMinutes()}` : date.getMinutes()?.toString(); + const seconds = date.getSeconds()?.toString().length === 1 ? `0${date.getSeconds()}` : date.getSeconds()?.toString(); return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}.${date.getMilliseconds()}`; } diff --git a/src/service/request/index.ts b/src/service/request/index.ts index 35a45dd..fa2b51c 100644 --- a/src/service/request/index.ts +++ b/src/service/request/index.ts @@ -52,14 +52,14 @@ export const request = createFlatRequest { const isStaticSuper = computed(() => { const { VITE_AUTH_ROUTE_MODE, VITE_STATIC_SUPER_ROLE } = import.meta.env; return ( - VITE_AUTH_ROUTE_MODE === 'static' && userInfo.roles.map(role => role.toString()).includes(VITE_STATIC_SUPER_ROLE) + VITE_AUTH_ROUTE_MODE === 'static' && userInfo.roles.map(role => role?.toString()).includes(VITE_STATIC_SUPER_ROLE) ); });