fix: 新增资源选择标签问题修复、项目文档转移

This commit is contained in:
meilin.huang
2023-06-29 20:20:58 +08:00
parent d9807b1bf0
commit d423572e01
10 changed files with 33 additions and 36 deletions

View File

@@ -1,6 +1,6 @@
<template>
<div>
<el-tree-select @check="changeTag" style="width: 100%" v-model="selectTags" :data="tags" placeholder="请选择关联标签"
<el-tree-select v-bind="$attrs" @check="changeTag" style="width: 100%" :data="tags" placeholder="请选择关联标签"
:render-after-expand="true" :default-expanded-keys="[selectTags]" show-checkbox check-strictly node-key="id"
:props="{
value: 'id',
@@ -26,17 +26,8 @@
import { toRefs, reactive, onMounted } from 'vue';
import { tagApi } from '../tag/api';
const props = defineProps({
tagId: {
type: Number,
},
tagPath: {
type: String,
},
})
//定义事件
const emit = defineEmits(['changeTag', 'update:tagId', 'update:tagPath'])
const emit = defineEmits(['changeTag', 'update:tagPath'])
const state = reactive({
tags: [],
@@ -50,19 +41,14 @@ const {
} = toRefs(state)
onMounted(async () => {
if (props.tagId) {
state.selectTags = props.tagId;
}
state.tags = await tagApi.getTagTrees.request(null);
});
const changeTag = (tag: any, checkInfo: any) => {
if (checkInfo.checkedNodes.length > 0) {
emit('update:tagId', tag.id);
emit('update:tagPath', tag.codePath);
emit('changeTag', tag);
} else {
emit('update:tagId', null);
emit('update:tagPath', null);
}
};

View File

@@ -6,7 +6,7 @@
<el-tabs v-model="tabActiveName">
<el-tab-pane label="基础信息" name="basic">
<el-form-item prop="tagId" label="标签:" required>
<tag-select v-model:tag-id="form.tagId" v-model:tag-path="form.tagPath" style="width: 100%" />
<tag-select v-model="form.tagId" v-model:tag-path="form.tagPath" style="width: 100%" />
</el-form-item>
<el-form-item prop="name" label="别名:" required>

View File

@@ -5,12 +5,8 @@
<el-form :model="form" ref="machineForm" :rules="rules" label-width="85px">
<el-tabs v-model="tabActiveName">
<el-tab-pane label="基础信息" name="basic">
<el-form-item prop="tagId" label="标签:" required :rules="{
required: true,
message: '请选择标签',
trigger: ['change', 'blur'],
}">
<tag-select v-model:tag-id="form.tagId" v-model:tag-path="form.tagPath" style="width: 100%" />
<el-form-item prop="tagId" label="标签:">
<tag-select v-model="form.tagId" v-model:tag-path="form.tagPath" 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>
@@ -100,6 +96,11 @@ const props = defineProps({
const emit = defineEmits(['update:visible', 'cancel', 'val-change'])
const rules = {
tagId: [{
required: true,
message: '请选择标签',
trigger: ['blur', 'change'],
}],
name: [
{
required: true,
@@ -250,7 +251,6 @@ const btnOk = async () => {
const getReqForm = () => {
const reqForm: any = { ...state.form };
debugger
// 如果为密码认证则置空授权凭证id
if (state.authType == 1) {
reqForm.authCertId = -1;

View File

@@ -6,7 +6,7 @@
<el-tabs v-model="tabActiveName">
<el-tab-pane label="基础信息" name="basic">
<el-form-item prop="tagId" label="标签:" required>
<tag-select v-model:tag-id="form.tagId" v-model:tag-path="form.tagPath" style="width: 100%" />
<tag-select v-model="form.tagId" v-model:tag-path="form.tagPath" style="width: 100%" />
</el-form-item>
<el-form-item prop="name" label="名称" required>

View File

@@ -6,7 +6,7 @@
<el-tabs v-model="tabActiveName">
<el-tab-pane label="基础信息" name="basic">
<el-form-item prop="tagId" label="标签:" required>
<tag-select v-model:tag-id="form.tagId" v-model:tag-path="form.tagPath" style="width: 100%" />
<tag-select v-model="form.tagId" v-model:tag-path="form.tagPath" style="width: 100%" />
</el-form-item>
<el-form-item prop="name" label="名称:" required>
<el-input v-model.trim="form.name" placeholder="请输入redis名称" auto-complete="off"></el-input>
@@ -89,6 +89,18 @@ const props = defineProps({
const emit = defineEmits(['update:visible', 'val-change', 'cancel'])
const rules = {
tagId: [{
required: true,
message: '请选择标签',
trigger: ['blur', 'change'],
}],
name: [
{
required: true,
message: '请输入名称',
trigger: ['change', 'blur'],
},
],
host: [
{
required: true,