From b705ad6ee875c7d81a29f70a97053704fbbe98f2 Mon Sep 17 00:00:00 2001 From: whyour Date: Fri, 21 Apr 2023 21:15:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=96=B0=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=81=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E3=80=81?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E3=80=81=E8=AE=A2=E9=98=85=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/data/cron.ts | 2 +- back/data/dependence.ts | 5 ++++- back/data/env.ts | 5 ++++- back/data/subscription.ts | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/back/data/cron.ts b/back/data/cron.ts index 82502f09..81198d89 100644 --- a/back/data/cron.ts +++ b/back/data/cron.ts @@ -26,7 +26,7 @@ export class Crontab { this.saved = options.saved; this.id = options.id; this.status = - options.status && CrontabStatus[options.status] + typeof options.status === 'number' && CrontabStatus[options.status] ? options.status : CrontabStatus.idle; this.timestamp = new Date().toString(); diff --git a/back/data/dependence.ts b/back/data/dependence.ts index ab06ce83..51ea4556 100644 --- a/back/data/dependence.ts +++ b/back/data/dependence.ts @@ -12,7 +12,10 @@ export class Dependence { constructor(options: Dependence) { this.id = options.id; - this.status = options.status || DependenceStatus.installing; + this.status = + typeof options.status === 'number' && DependenceStatus[options.status] + ? options.status + : DependenceStatus.installing; this.type = options.type || DependenceTypes.nodejs; this.timestamp = new Date().toString(); this.name = options.name; diff --git a/back/data/env.ts b/back/data/env.ts index 3a1d3470..eae6b48e 100644 --- a/back/data/env.ts +++ b/back/data/env.ts @@ -13,7 +13,10 @@ export class Env { constructor(options: Env) { this.value = options.value; this.id = options.id; - this.status = options.status || EnvStatus.normal; + this.status = + typeof options.status === 'number' && EnvStatus[options.status] + ? options.status + : EnvStatus.normal; this.timestamp = new Date().toString(); this.position = options.position; this.name = options.name; diff --git a/back/data/subscription.ts b/back/data/subscription.ts index 7bb1ef7e..e75b3876 100644 --- a/back/data/subscription.ts +++ b/back/data/subscription.ts @@ -37,8 +37,8 @@ export class Subscription { this.name = options.name || options.alias; this.type = options.type; this.schedule = options.schedule; - this.status = - options.status && SubscriptionStatus[options.status] + this.status = this.status = + typeof options.status === 'number' && SubscriptionStatus[options.status] ? options.status : SubscriptionStatus.idle; this.url = options.url;