From cc3981d99c36831cd2966a861ecfa7f1f0fd995f Mon Sep 17 00:00:00 2001
From: "meilin.huang" <954537473@qq.com>
Date: Wed, 17 Jan 2024 12:13:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E5=BA=93=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=AF=BC=E8=87=B4=E6=A0=87=E7=AD=BE=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BF=AE=E5=A4=8D=E3=80=81cron=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mayfly_go_web/src/components/crontab/Crontab.vue      | 11 +++++++++--
 mayfly_go_web/src/components/crontab/CrontabDay.vue   |  2 +-
 mayfly_go_web/src/components/crontab/CrontabHour.vue  |  2 +-
 mayfly_go_web/src/components/crontab/CrontabMin.vue   |  2 +-
 mayfly_go_web/src/components/crontab/CrontabMouth.vue | 11 +----------
 .../src/components/crontab/CrontabSecond.vue          |  2 +-
 mayfly_go_web/src/components/crontab/CrontabWeek.vue  |  2 +-
 mayfly_go_web/src/components/crontab/CrontabYear.vue  | 11 +----------
 server/internal/db/application/db.go                  |  2 +-
 server/internal/tag/application/tag_tree.go           |  3 +++
 10 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/mayfly_go_web/src/components/crontab/Crontab.vue b/mayfly_go_web/src/components/crontab/Crontab.vue
index ca84bc19..5a602f37 100644
--- a/mayfly_go_web/src/components/crontab/Crontab.vue
+++ b/mayfly_go_web/src/components/crontab/Crontab.vue
@@ -78,7 +78,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, toRefs, onMounted, reactive, ref, nextTick } from 'vue';
+import { computed, toRefs, onMounted, reactive, ref, nextTick, watch } from 'vue';
 import CrontabSecond from './CrontabSecond.vue';
 import CrontabMin from './CrontabMin.vue';
 import CrontabHour from './CrontabHour.vue';
@@ -129,9 +129,15 @@ const { tabTitles, crontabValueObj } = toRefs(state);
 
 onMounted(() => {
     resolveExp();
-    changeTab(state.activeName);
 });
 
+watch(
+    () => props.expression,
+    () => {
+        resolveExp();
+    }
+);
+
 function shouldHide(key: string) {
     if (props.hideComponent && props.hideComponent.includes(key)) return false;
     return true;
@@ -156,6 +162,7 @@ function resolveExp() {
                 ...obj,
             };
         }
+        changeTab(state.activeName);
     } else {
         //没有传入的表达式 则还原
         clearCron();
diff --git a/mayfly_go_web/src/components/crontab/CrontabDay.vue b/mayfly_go_web/src/components/crontab/CrontabDay.vue
index d490ae74..072279c3 100644
--- a/mayfly_go_web/src/components/crontab/CrontabDay.vue
+++ b/mayfly_go_web/src/components/crontab/CrontabDay.vue
@@ -37,7 +37,7 @@
             <div class="flex-align-center w100">
                 <el-radio v-model="radioValue" :label="7" class="mr5"> 指定 </el-radio>
                 <el-select @click="radioValue = 7" class="w100" clearable v-model="checkboxList" placeholder="可多选" multiple>
-                    <el-option v-for="item in 31" :key="item" :value="item">{{ item }}</el-option>
+                    <el-option v-for="item in 31" :key="item" :value="`${item}`">{{ item }}</el-option>
                 </el-select>
             </div>
         </el-form-item>
diff --git a/mayfly_go_web/src/components/crontab/CrontabHour.vue b/mayfly_go_web/src/components/crontab/CrontabHour.vue
index 46bac8d0..61f0bbed 100644
--- a/mayfly_go_web/src/components/crontab/CrontabHour.vue
+++ b/mayfly_go_web/src/components/crontab/CrontabHour.vue
@@ -22,7 +22,7 @@
             <div class="flex-align-center w100">
                 <el-radio v-model="radioValue" :label="4" class="mr5"> 指定 </el-radio>
                 <el-select @click="radioValue = 4" class="w100" clearable v-model="checkboxList" placeholder="可多选" multiple>
-                    <el-option v-for="item in 60" :key="item" :value="item - 1">{{ item - 1 }}</el-option>
+                    <el-option v-for="item in 60" :key="item" :value="`${item - 1}`">{{ item - 1 }}</el-option>
                 </el-select>
             </div>
         </el-form-item>
diff --git a/mayfly_go_web/src/components/crontab/CrontabMin.vue b/mayfly_go_web/src/components/crontab/CrontabMin.vue
index 24f491b4..0b6bb17b 100644
--- a/mayfly_go_web/src/components/crontab/CrontabMin.vue
+++ b/mayfly_go_web/src/components/crontab/CrontabMin.vue
@@ -22,7 +22,7 @@
             <div class="flex-align-center w100">
                 <el-radio v-model="radioValue" :label="4" class="mr5"> 指定 </el-radio>
                 <el-select @click="radioValue = 4" class="w100" clearable v-model="checkboxList" placeholder="可多选" multiple>
-                    <el-option v-for="item in 60" :key="item" :value="item - 1">{{ item - 1 }}</el-option>
+                    <el-option v-for="item in 60" :key="item" :value="`${item - 1}`">{{ item - 1 }}</el-option>
                 </el-select>
             </div>
         </el-form-item>
diff --git a/mayfly_go_web/src/components/crontab/CrontabMouth.vue b/mayfly_go_web/src/components/crontab/CrontabMouth.vue
index 500170e1..89636e34 100644
--- a/mayfly_go_web/src/components/crontab/CrontabMouth.vue
+++ b/mayfly_go_web/src/components/crontab/CrontabMouth.vue
@@ -18,20 +18,11 @@
             </el-radio>
         </el-form-item>
 
-        <!-- <el-form-item>
-            <el-radio v-model="radioValue" :label="4">
-                指定
-                <el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width: 100%">
-                    <el-option v-for="item in 12" :key="item" :value="item">{{ item }}</el-option>
-                </el-select>
-            </el-radio>
-        </el-form-item> -->
-
         <el-form-item>
             <div class="flex-align-center w100">
                 <el-radio v-model="radioValue" :label="4" class="mr5"> 指定 </el-radio>
                 <el-select @click="radioValue = 4" class="w100" clearable v-model="checkboxList" placeholder="可多选" multiple>
-                    <el-option v-for="item in 12" :key="item" :value="item">{{ item }}</el-option>
+                    <el-option v-for="item in 12" :key="item" :value="`${item}`">{{ item }}</el-option>
                 </el-select>
             </div>
         </el-form-item>
diff --git a/mayfly_go_web/src/components/crontab/CrontabSecond.vue b/mayfly_go_web/src/components/crontab/CrontabSecond.vue
index 4015f2d0..ee466688 100644
--- a/mayfly_go_web/src/components/crontab/CrontabSecond.vue
+++ b/mayfly_go_web/src/components/crontab/CrontabSecond.vue
@@ -22,7 +22,7 @@
             <div class="flex-align-center w100">
                 <el-radio v-model="radioValue" :label="4" class="mr5"> 指定 </el-radio>
                 <el-select @click="radioValue = 4" class="w100" clearable v-model="checkboxList" placeholder="可多选" multiple>
-                    <el-option v-for="item in 60" :key="item" :value="item - 1">{{ item - 1 }}</el-option>
+                    <el-option v-for="item in 60" :key="item" :value="`${item - 1}`">{{ item - 1 }}</el-option>
                 </el-select>
             </div>
         </el-form-item>
diff --git a/mayfly_go_web/src/components/crontab/CrontabWeek.vue b/mayfly_go_web/src/components/crontab/CrontabWeek.vue
index 67b1ff26..899ad5d2 100644
--- a/mayfly_go_web/src/components/crontab/CrontabWeek.vue
+++ b/mayfly_go_web/src/components/crontab/CrontabWeek.vue
@@ -35,7 +35,7 @@
             <div class="flex-align-center w100">
                 <el-radio v-model="radioValue" :label="6" class="mr5"> 指定 </el-radio>
                 <el-select @click="radioValue = 6" class="w100" clearable v-model="checkboxList" placeholder="可多选" multiple>
-                    <el-option v-for="(item, index) of weekList" :label="item" :key="index" :value="index + 1">{{ item }}</el-option>
+                    <el-option v-for="(item, index) of weekList" :label="item" :key="index" :value="`${index + 1}`">{{ item }}</el-option>
                 </el-select>
             </div>
         </el-form-item>
diff --git a/mayfly_go_web/src/components/crontab/CrontabYear.vue b/mayfly_go_web/src/components/crontab/CrontabYear.vue
index 526f9c6c..a52af87d 100644
--- a/mayfly_go_web/src/components/crontab/CrontabYear.vue
+++ b/mayfly_go_web/src/components/crontab/CrontabYear.vue
@@ -23,20 +23,11 @@
             </el-radio>
         </el-form-item>
 
-        <!-- <el-form-item>
-            <el-radio :label="5" v-model="radioValue">
-                指定
-                <el-select clearable v-model="checkboxList" placeholder="可多选" multiple>
-                    <el-option v-for="item in 9" :key="item" :value="item - 1 + fullYear" :label="item - 1 + fullYear" />
-                </el-select>
-            </el-radio>
-        </el-form-item> -->
-
         <el-form-item>
             <div class="flex-align-center w100">
                 <el-radio v-model="radioValue" :label="5" class="mr5"> 指定 </el-radio>
                 <el-select @click="radioValue = 5" class="w100" clearable v-model="checkboxList" placeholder="可多选" multiple>
-                    <el-option v-for="item in 9" :key="item" :value="item - 1 + fullYear" :label="item - 1 + fullYear" />
+                    <el-option v-for="item in 9" :key="item" :value="`${item - 1 + fullYear}`" :label="item - 1 + fullYear" />
                 </el-select>
             </div>
         </el-form-item>
diff --git a/server/internal/db/application/db.go b/server/internal/db/application/db.go
index d6e5c116..4dae88ab 100644
--- a/server/internal/db/application/db.go
+++ b/server/internal/db/application/db.go
@@ -113,7 +113,7 @@ func (d *dbAppImpl) SaveDb(ctx context.Context, dbEntity *entity.Db, tagIds ...u
 	return d.Tx(ctx, func(ctx context.Context) error {
 		return d.UpdateById(ctx, dbEntity)
 	}, func(ctx context.Context) error {
-		return d.tagApp.RelateResource(ctx, oldDb.Code, consts.TagResourceTypeDb, tagIds)
+		return d.tagApp.RelateResource(ctx, old.Code, consts.TagResourceTypeDb, tagIds)
 	})
 }
 
diff --git a/server/internal/tag/application/tag_tree.go b/server/internal/tag/application/tag_tree.go
index 9fc3cf28..cf7121b8 100644
--- a/server/internal/tag/application/tag_tree.go
+++ b/server/internal/tag/application/tag_tree.go
@@ -150,6 +150,9 @@ func (p *tagTreeAppImpl) GetAccountResourceCodes(accountId uint64, resourceType
 }
 
 func (p *tagTreeAppImpl) RelateResource(ctx context.Context, resourceCode string, resourceType int8, tagIds []uint64) error {
+	if resourceCode == "" {
+		return errorx.NewBiz("资源编号不能为空")
+	}
 	// 如果tagIds为空数组，则为解绑该标签资源关联关系
 	if len(tagIds) == 0 {
 		return p.tagResourceApp.DeleteByCond(ctx, &entity.TagResource{