feat: 支持关联多标签、计划任务立即执行、标签相关操作优化

mayfly_go_web/src/views/ops/machine/MachineEdit.vue

@@ -4,8 +4,19 @@
             <el-form :model="form" ref="machineForm" :rules="rules" label-width="auto">
                 <el-tabs v-model="tabActiveName">
                     <el-tab-pane label="基础信息" name="basic">
-                        <el-form-item prop="tagId" label="标签">
-                            <tag-select v-model="form.tagId" v-model:tag-path="form.tagPath" style="width: 100%" />
+                        <el-form-item ref="tagSelectRef" prop="tagId" label="标签">
+                            <tag-tree-select
+                                multiple
+                                @change-tag="
+                                    (tagIds) => {
+                                        form.tagId = tagIds;
+                                        tagSelectRef.validate();
+                                    }
+                                "
+                                :resource-code="form.code"
+                                :resource-type="TagResourceTypeEnum.Machine.value"
+                                style="width: 100%"
+                            />
                         </el-form-item>
                         <el-form-item prop="name" label="名称" required>
                             <el-input v-model.trim="form.name" placeholder="请输入机器别名" auto-complete="off"></el-input>
@@ -71,9 +82,10 @@
 import { toRefs, reactive, watch, ref } from 'vue';
 import { machineApi } from './api';
 import { ElMessage } from 'element-plus';
-import TagSelect from '../component/TagSelect.vue';
+import TagTreeSelect from '../component/TagTreeSelect.vue';
 import SshTunnelSelect from '../component/SshTunnelSelect.vue';
 import AuthCertSelect from './authcert/AuthCertSelect.vue';
+import { TagResourceTypeEnum } from '@/common/commonEnum';
 
 const props = defineProps({
     visible: {
@@ -95,7 +107,7 @@ const rules = {
         {
             required: true,
             message: '请选择标签',
-            trigger: ['blur', 'change'],
+            trigger: ['change'],
         },
     ],
     name: [
@@ -126,17 +138,11 @@ const rules = {
             trigger: ['change', 'blur'],
         },
     ],
-    password: [
-        {
-            required: true,
-            message: '请输入授权密码',
-            trigger: ['change', 'blur'],
-        },
-    ],
 };
 
 const machineForm: any = ref(null);
 const authCertSelectRef: any = ref(null);
+const tagSelectRef: any = ref(null);
 
 const state = reactive({
     dialogVisible: false,
@@ -146,14 +152,14 @@ const state = reactive({
     authType: 1,
     form: {
         id: null,
+        code: '',
         ip: null,
         port: 22,
         name: null,
         authCertId: null as any,
         username: '',
         password: '',
-        tagId: null as any,
-        tagPath: null as any,
+        tagId: [],
         remark: '',
         sshTunnelMachineId: null as any,
         enableRecorder: -1,
@@ -173,6 +179,7 @@ watch(props, async (newValue: any) => {
     state.tabActiveName = 'basic';
     if (newValue.machine) {
         state.form = { ...newValue.machine };
+
         // 如果凭证类型为公共的，则表示使用授权凭证认证
         const authCertId = (state.form as any).authCertId;
         if (authCertId > 0) {
@@ -181,7 +188,7 @@ watch(props, async (newValue: any) => {
             state.authType = 1;
         }
     } else {
-        state.form = { port: 22 } as any;
+        state.form = { port: 22, tagId: [] } as any;
         state.authType = 1;
     }
 });