From 5f7b149519ebc36b324a89678a976d4f31037265 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Fri, 14 Jun 2024 22:29:28 +0800 Subject: [PATCH] =?UTF-8?q?fix(sj=5F1.0.1):=20=E4=BF=AE=E5=A4=8D=20cron=20?= =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F=E7=BB=84=E4=BB=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cron-input/src/components/internal/cron-base.vue | 9 ++++++--- .../cron-input/src/components/internal/cron-model.vue | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/cron-input/src/components/internal/cron-base.vue b/packages/cron-input/src/components/internal/cron-base.vue index 7b2901b..9081ec3 100644 --- a/packages/cron-input/src/components/internal/cron-base.vue +++ b/packages/cron-input/src/components/internal/cron-base.vue @@ -15,7 +15,7 @@ interface Props { min: number; max: number; }; - locale: I18n.LocaleType; + locale?: I18n.LocaleType; } const props = withDefaults(defineProps(), { @@ -106,7 +106,9 @@ const value = computed(() => { return props.field.value === DATE ? type.value : `${lastDayOfWeek.value}${type.value}`; case TYPE.SPECIFY: { const specifyValue = specify.value; - return specifyValue.length ? specifyValue.sort((a, b) => a - b).join(type.value) : `${specifyValue[0] || 0}`; + return specifyValue.length + ? specifyValue.sort((a, b) => a - b).join(type.value) + : `${specifyValue[0] || specifies.value[0].value}`; } default: return ''; @@ -144,7 +146,8 @@ watch( specify.value = data !== 'undefined' && data !== 'NaN' ? data.split(TYPE.SPECIFY).map(i => Number.parseInt(i, 10)) : []; } - } + }, + { immediate: true } ); watch( diff --git a/packages/cron-input/src/components/internal/cron-model.vue b/packages/cron-input/src/components/internal/cron-model.vue index 00231ec..9cbc1bf 100644 --- a/packages/cron-input/src/components/internal/cron-model.vue +++ b/packages/cron-input/src/components/internal/cron-model.vue @@ -81,7 +81,7 @@ const previews = computed(() => { try { previewList = parserCron(expression.value); } catch (error) { - previewList = ['此表达式暂时无法解析!']; + previewList = [Locales[props.lang].previewError]; } return previewList;