refactor: ♻️ 代码规范调整和已知问题修复

This commit is contained in:
Ray.Hao
2025-04-15 23:31:17 +08:00
parent f048376eb3
commit 4cc36629a8
13 changed files with 474 additions and 469 deletions

View File

@@ -1,18 +1,9 @@
<template> <template>
<template v-if="Array.isArray(modelValue)"> <template v-if="tagType">
<el-tag <el-tag :type="tagType" :size="tagSize">{{ label }}</el-tag>
v-for="(tag, index) in tagList"
:key="index"
:type="tag.tagType"
:size="tagSize"
class="me-1"
>
{{ tag.label }}
</el-tag>
</template> </template>
<template v-else> <template v-else>
<el-tag v-if="tagType" :type="tagType" :size="tagSize">{{ label }}</el-tag> <span>{{ label }}</span>
<span v-else>{{ label }}</span>
</template> </template>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@@ -20,20 +11,16 @@ import { useDictStore } from "@/store";
const props = defineProps({ const props = defineProps({
code: String, // 字典编码 code: String, // 字典编码
modelValue: [String, Number, Array], // 字典项的值 modelValue: [String, Number], // 字典项的值
size: { size: {
type: String, type: String,
default: "default", // 标签大小 default: "default", // 标签大小
}, },
}); });
const label = ref(""); const label = ref("");
type TagType = "success" | "info" | "warning" | "danger" | "primary"; const tagType = ref<"success" | "warning" | "info" | "primary" | "danger" | undefined>(); // 标签类型
const tagType = ref<TagType | undefined>(undefined);
const tagSize = ref<"default" | "large" | "small">(props.size as "default" | "large" | "small"); // 标签大小 const tagSize = ref<"default" | "large" | "small">(props.size as "default" | "large" | "small"); // 标签大小
// 多个标签时使用
const tagList = ref<Array<{ label: string; tagType?: TagType }>>([]);
const dictStore = useDictStore(); const dictStore = useDictStore();
/** /**
* 根据字典项的值获取对应的 label 和 tagType * 根据字典项的值获取对应的 label 和 tagType
@@ -49,27 +36,24 @@ const getLabelAndTagByValue = async (dictCode: string, value: any) => {
// 查找对应的字典项 // 查找对应的字典项
const dictItem = dictItems.find((item) => item.value == value); const dictItem = dictItems.find((item) => item.value == value);
return { return {
label: dictItem?.label || String(value), label: dictItem?.label || "",
tagType: dictItem?.tagType as TagType, tagType: dictItem?.tagType,
}; };
}; };
/**
* 更新 label 和 tagType
*/
const updateLabelAndTag = async () => { const updateLabelAndTag = async () => {
if (!props.code || props.modelValue === undefined || props.modelValue === null) return; console.log("updateLabelAndTag", props.code, props.modelValue);
if (!props.code || props.modelValue === undefined) return;
await dictStore.loadDictItems(props.code); const { label: newLabel, tagType: newTagType } = await getLabelAndTagByValue(
props.code,
if (Array.isArray(props.modelValue)) { props.modelValue
const results = await Promise.all( );
props.modelValue.map((val) => getLabelAndTagByValue(props.code!, val)) label.value = newLabel;
); tagType.value = newTagType as typeof tagType.value;
tagList.value = results;
} else {
const result = await getLabelAndTagByValue(props.code, props.modelValue);
label.value = result.label;
tagType.value = result.tagType as typeof tagType.value;
}
}; };
watch([() => props.code, () => props.modelValue], updateLabelAndTag); watch([() => props.code, () => props.modelValue], updateLabelAndTag);
onMounted(updateLabelAndTag); onMounted(updateLabelAndTag);

View File

@@ -1,11 +1,9 @@
<template> <template>
<!-- Select / Select-Multiple -->
<el-select <el-select
v-if="['select', 'select-multiple'].includes(type)" v-if="type === 'select'"
v-model="selectedValue" v-model="selectedValue"
:placeholder="placeholder" :placeholder="placeholder"
:disabled="disabled" :disabled="disabled"
:multiple="type === 'select-multiple'"
clearable clearable
:style="style" :style="style"
@change="handleChange" @change="handleChange"
@@ -18,7 +16,6 @@
/> />
</el-select> </el-select>
<!-- Radio -->
<el-radio-group <el-radio-group
v-else-if="type === 'radio'" v-else-if="type === 'radio'"
v-model="selectedValue" v-model="selectedValue"
@@ -36,7 +33,6 @@
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
<!-- Checkbox -->
<el-checkbox-group <el-checkbox-group
v-else-if="type === 'checkbox'" v-else-if="type === 'checkbox'"
v-model="selectedValue" v-model="selectedValue"
@@ -56,7 +52,6 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, watch, onMounted } from "vue";
import { useDictStore } from "@/store"; import { useDictStore } from "@/store";
const dictStore = useDictStore(); const dictStore = useDictStore();
@@ -73,8 +68,7 @@ const props = defineProps({
type: { type: {
type: String, type: String,
default: "select", default: "select",
validator: (value: string) => validator: (value: string) => ["select", "radio", "checkbox"].includes(value),
["select", "select-multiple", "radio", "checkbox"].includes(value),
}, },
placeholder: { placeholder: {
type: String, type: String,
@@ -86,7 +80,11 @@ const props = defineProps({
}, },
style: { style: {
type: Object, type: Object,
default: () => ({ width: "300px" }), default: () => {
return {
width: "300px",
};
},
}, },
}); });
@@ -94,29 +92,35 @@ const emit = defineEmits(["update:modelValue"]);
const options = ref<Array<{ label: string; value: string | number }>>([]); const options = ref<Array<{ label: string; value: string | number }>>([]);
// 动态初始化 selectedValue
const selectedValue = ref<any>( const selectedValue = ref<any>(
["select-multiple", "checkbox"].includes(props.type) typeof props.modelValue === "string" || typeof props.modelValue === "number"
? Array.isArray(props.modelValue) ? props.modelValue
: Array.isArray(props.modelValue)
? props.modelValue ? props.modelValue
: [] : undefined
: (props.modelValue ?? undefined)
); );
// 同步 selectedValue 与 props.modelValue // 监听 modelValue 和 options 的变化
watch( watch(
() => props.modelValue, [() => props.modelValue, () => options.value],
(newValue) => { ([newValue, newOptions]) => {
if (["select-multiple", "checkbox"].includes(props.type)) { if (newOptions.length > 0 && newValue !== undefined) {
selectedValue.value = Array.isArray(newValue) ? newValue : []; if (props.type === "checkbox") {
selectedValue.value = Array.isArray(newValue) ? newValue : [];
} else {
const matchedOption = newOptions.find(
(option) => String(option.value) === String(newValue)
);
selectedValue.value = matchedOption?.value;
}
} else { } else {
selectedValue.value = newValue ?? undefined; selectedValue.value = undefined;
} }
}, },
{ immediate: true } { immediate: true }
); );
// selectedValue 改变时回传给父组件 // 监听 selectedValue 的变化并触发 update:modelValue
function handleChange(val: any) { function handleChange(val: any) {
emit("update:modelValue", val); emit("update:modelValue", val);
} }

View File

@@ -4,42 +4,76 @@
padding: 15px; padding: 15px;
} }
.search-bar {
padding: 18px 18px 0;
margin-bottom: 15px;
background-color: var(--el-bg-color-overlay);
border: 1px solid var(--el-border-color-light);
border-radius: 4px;
box-shadow: var(--el-box-shadow-light);
//搜索表单按钮组全局样式
.search-form-btn-box {
flex: 1;
padding-right: 13px;
.search-form-btn-box-item {
display: flex;
align-items: center;
justify-content: end;
width: 100%;
}
}
:deep(.el-form-item) {
width: 100% !important;
}
.el-form--inline .el-form-item {
display: flex !important;
margin-right: 0px !important;
}
}
.table-container > .el-card__header {
padding: calc(var(--el-card-padding) - 8px) var(--el-card-padding);
}
// 进度条颜色 // 进度条颜色
#nprogress .bar { #nprogress .bar {
background-color: var(--el-color-primary); background-color: var(--el-color-primary);
} }
// 全局搜索区域样式
.search-container {
padding: 18px 16px 0;
margin-bottom: 16px;
background-color: var(--el-bg-color-overlay);
border: 1px solid var(--el-border-color-light);
border-radius: 4px;
.search-buttons {
margin-right: 0;
}
.el-form-item {
margin-bottom: 18px;
}
}
// 表格区域样式 (BEM规范)
.data-table {
margin-bottom: 16px;
// 表格工具栏区域
&__toolbar {
display: flex;
justify-content: space-between;
margin-bottom: 16px;
&--actions,
&--tools {
display: flex;
gap: 8px;
}
}
// 表格内容区域
&__content {
margin: 8px 0;
}
// 分页区域
.el-pagination {
justify-content: flex-end;
margin-top: 16px;
}
}
// 抽屉和对话框底部按钮区域
.dialog-footer {
display: flex;
gap: 8px;
justify-content: flex-end;
padding-top: 16px;
}
// 搜索表单固定宽度项
.fixed-width-item {
&-sm {
width: 100px !important;
}
&-md {
width: 150px !important;
}
&-lg {
width: 200px !important;
}
}

View File

@@ -1,48 +1,42 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="search-bar"> <!-- 搜索区域 -->
<div class="search-container">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto"> <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
<el-row :gutter="22"> <el-form-item prop="keywords" label="关键字">
<el-col :span="24" :md="12" :lg="6"> <el-input
<el-form-item prop="keywords" label="关键字"> v-model="queryParams.keywords"
<el-input placeholder="表名"
v-model="queryParams.keywords" clearable
placeholder="表名" @keyup.enter="handleQuery"
clearable />
@keyup.enter="handleQuery" </el-form-item>
/>
</el-form-item>
</el-col>
<div class="search-form-btn-box"> <el-form-item class="search-buttons">
<div class="search-form-btn-box-item"> <el-button type="primary" @click="handleQuery">
<el-form-item> <template #icon>
<el-button type="primary" @click="handleQuery"> <Search />
<template #icon> </template>
<Search /> 搜索
</template> </el-button>
搜索 <el-button @click="handleResetQuery">
</el-button> <template #icon>
<el-button @click="handleResetQuery"> <Refresh />
<template #icon> </template>
<Refresh /> 重置
</template> </el-button>
重置 </el-form-item>
</el-button>
</el-form-item>
</div>
</div>
</el-row>
</el-form> </el-form>
</div> </div>
<el-card shadow="never" class="table-container"> <el-card shadow="hover" class="table-card">
<el-table <el-table
ref="dataTableRef" ref="dataTableRef"
v-loading="loading" v-loading="loading"
:data="pageData" :data="pageData"
highlight-current-row highlight-current-row
border border
class="data-table__content"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="表名" prop="tableName" min-width="100" /> <el-table-column label="表名" prop="tableName" min-width="100" />

View File

@@ -1,50 +1,45 @@
<!-- 系统配置 --> <!-- 系统配置 -->
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="search-bar"> <!-- 搜索区域 -->
<div class="search-container">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto"> <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
<el-row :gutter="22"> <el-form-item label="关键字" prop="keywords">
<el-col :span="24" :md="12" :lg="6"> <el-input
<el-form-item label="关键字" prop="keywords"> v-model="queryParams.keywords"
<el-input placeholder="请输入配置键\配置名称"
v-model="queryParams.keywords" clearable
placeholder="请输入配置键\配置名称" @keyup.enter="handleQuery"
clearable />
@keyup.enter="handleQuery" </el-form-item>
/>
</el-form-item>
</el-col>
<div class="search-form-btn-box"> <el-form-item class="search-buttons">
<div class="search-form-btn-box-item"> <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
<el-form-item> <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
<el-button type="primary" icon="search" @click="handleQuery">搜索</el-button> </el-form-item>
<el-button icon="refresh" @click="handleResetQuery">重置</el-button>
</el-form-item>
</div>
</div>
</el-row>
</el-form> </el-form>
</div> </div>
<el-card shadow="never"> <el-card shadow="hover" class="data-table">
<div class="mb-10px"> <div class="data-table__toolbar">
<el-button <div class="data-table__toolbar--actions">
v-hasPerm="['sys:config:add']" <el-button
type="success" v-hasPerm="['sys:config:add']"
icon="plus" type="success"
@click="handleOpenDialog()" icon="plus"
> @click="handleOpenDialog()"
新增 >
</el-button> 新增
<el-button </el-button>
v-hasPerm="['sys:config:refresh']" <el-button
color="#626aef" v-hasPerm="['sys:config:refresh']"
icon="RefreshLeft" color="#626aef"
@click="handleRefreshCache" icon="RefreshLeft"
> @click="handleRefreshCache"
刷新缓存 >
</el-button> 刷新缓存
</el-button>
</div>
</div> </div>
<el-table <el-table
@@ -52,6 +47,8 @@
v-loading="loading" v-loading="loading"
:data="pageData" :data="pageData"
highlight-current-row highlight-current-row
class="data-table__content"
border
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="index" label="序号" width="60" /> <el-table-column type="index" label="序号" width="60" />

View File

@@ -1,59 +1,53 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="search-bar"> <!-- 搜索区域 -->
<div class="search-container">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto"> <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
<el-row :gutter="22"> <el-form-item label="关键字" prop="keywords">
<el-col :span="24" :md="12" :lg="6"> <el-input
<el-form-item label="关键字" prop="keywords"> v-model="queryParams.keywords"
<el-input placeholder="部门名称"
v-model="queryParams.keywords" @keyup.enter="handleQuery"
placeholder="部门名称" />
@keyup.enter="handleQuery" </el-form-item>
/>
</el-form-item>
</el-col>
<el-col :span="24" :md="12" :lg="6">
<el-form-item label="部门状态" prop="status">
<el-select v-model="queryParams.status" placeholder="全部" clearable>
<el-option :value="1" label="正常" />
<el-option :value="0" label="禁用" />
</el-select>
</el-form-item>
</el-col>
<div class="search-form-btn-box"> <el-form-item label="部门状态" prop="status">
<div class="search-form-btn-box-item"> <el-select v-model="queryParams.status" placeholder="全部" clearable style="width: 100px">
<el-form-item> <el-option :value="1" label="正常" />
<el-button class="filter-item" type="primary" icon="search" @click="handleQuery"> <el-option :value="0" label="禁用" />
搜索 </el-select>
</el-button> </el-form-item>
<el-button icon="refresh" @click="handleResetQuery">重置</el-button>
</el-form-item> <el-form-item class="search-buttons">
</div> <el-button class="filter-item" type="primary" icon="search" @click="handleQuery">
</div> 搜索
</el-row> </el-button>
<el-button icon="refresh" @click="handleResetQuery">重置</el-button>
</el-form-item>
</el-form> </el-form>
</div> </div>
<el-card shadow="never"> <el-card shadow="hover" class="data-table">
<div class="mb-10px"> <div class="data-table__toolbar">
<el-button <div class="data-table__toolbar--actions">
v-hasPerm="['sys:dept:add']" <el-button
type="success" v-hasPerm="['sys:dept:add']"
icon="plus" type="success"
@click="handleOpenDialog()" icon="plus"
> @click="handleOpenDialog()"
新增 >
</el-button> 新增
<el-button </el-button>
v-hasPerm="['sys:dept:delete']" <el-button
type="danger" v-hasPerm="['sys:dept:delete']"
:disabled="selectIds.length === 0" type="danger"
icon="delete" :disabled="selectIds.length === 0"
@click="handleDelete()" icon="delete"
> @click="handleDelete()"
删除 >
</el-button> 删除
</el-button>
</div>
</div> </div>
<el-table <el-table
@@ -62,6 +56,7 @@
row-key="id" row-key="id"
default-expand-all default-expand-all
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
class="data-table__content"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />

View File

@@ -1,38 +1,38 @@
<!-- 字典 --> <!-- 字典 -->
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="search-bar"> <!-- 搜索区域 -->
<div class="search-container">
<el-form ref="queryFormRef" :model="queryParams" :inline="true"> <el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-row :gutter="20"> <el-form-item label="关键字" prop="keywords">
<el-col :span="24" :md="12" :lg="6"> <el-input
<el-form-item label="关键字" prop="keywords"> v-model="queryParams.keywords"
<el-input placeholder="字典名称/编码"
v-model="queryParams.keywords" clearable
placeholder="字典名称/编码" @keyup.enter="handleQuery"
clearable />
@keyup.enter="handleQuery" </el-form-item>
/>
</el-form-item>
</el-col>
<div class="search-form-btn-box"> <el-form-item class="search-buttons">
<div class="search-form-btn-box-item"> <el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button>
<el-form-item> <el-button icon="refresh" @click="handleResetQuery()">重置</el-button>
<el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button> </el-form-item>
<el-button icon="refresh" @click="handleResetQuery()">重置</el-button>
</el-form-item>
</div>
</div>
</el-row>
</el-form> </el-form>
</div> </div>
<el-card shadow="never"> <el-card shadow="hover" class="data-table">
<div class="mb-[10px]"> <div class="data-table__toolbar">
<el-button type="success" icon="plus" @click="handleAddClick()">新增</el-button> <div class="data-table__toolbar--actions">
<el-button type="danger" :disabled="ids.length === 0" icon="delete" @click="handleDelete()"> <el-button type="success" icon="plus" @click="handleAddClick()">新增</el-button>
删除 <el-button
</el-button> type="danger"
:disabled="ids.length === 0"
icon="delete"
@click="handleDelete()"
>
删除
</el-button>
</div>
</div> </div>
<el-table <el-table
@@ -40,6 +40,7 @@
highlight-current-row highlight-current-row
:data="tableData" :data="tableData"
border border
class="data-table__content"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />

View File

@@ -1,47 +1,45 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="search-bar"> <!-- 搜索区域 -->
<div class="search-container">
<el-form ref="queryFormRef" :model="queryParams" :inline="true"> <el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-row :gutter="22"> <el-form-item prop="keywords" label="关键字">
<el-col :span="24" :md="12" :lg="6"> <el-input
<el-form-item prop="keywords" label="关键字"> v-model="queryParams.keywords"
<el-input placeholder="日志内容"
v-model="queryParams.keywords" clearable
placeholder="日志内容" @keyup.enter="handleQuery"
clearable />
@keyup.enter="handleQuery" </el-form-item>
/>
</el-form-item>
</el-col>
<el-col :span="24" :md="12" :lg="6">
<el-form-item prop="createTime" label="操作时间">
<el-date-picker
v-model="queryParams.createTime"
:editable="false"
class="!w-[240px]"
type="daterange"
range-separator="~"
start-placeholder="开始时间"
end-placeholder="截止时间"
value-format="YYYY-MM-DD"
/>
</el-form-item>
</el-col>
<div class="search-form-btn-box"> <el-form-item prop="createTime" label="操作时间">
<div class="search-form-btn-box-item"> <el-date-picker
<el-form-item> v-model="queryParams.createTime"
<el-button type="primary" icon="search" @click="handleQuery">搜索</el-button> :editable="false"
<el-button icon="refresh" @click="handleResetQuery">重置</el-button> class="fixed-width-item-lg"
</el-form-item> type="daterange"
</div> range-separator="~"
</div> start-placeholder="开始时间"
</el-row> end-placeholder="截止时间"
value-format="YYYY-MM-DD"
/>
</el-form-item>
<el-form-item class="search-buttons">
<el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
<el-button icon="refresh" @click="handleResetQuery">重置</el-button>
</el-form-item>
</el-form> </el-form>
</div> </div>
<el-card shadow="never"> <el-card shadow="hover" class="data-table">
<el-table v-loading="loading" :data="pageData" highlight-current-row border> <el-table
v-loading="loading"
:data="pageData"
highlight-current-row
border
class="data-table__content"
>
<el-table-column label="操作时间" prop="createTime" width="180" /> <el-table-column label="操作时间" prop="createTime" width="180" />
<el-table-column label="操作人" prop="operator" width="120" /> <el-table-column label="操作人" prop="operator" width="120" />
<el-table-column label="日志模块" prop="module" width="100" /> <el-table-column label="日志模块" prop="module" width="100" />

View File

@@ -1,51 +1,48 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="search-bar"> <!-- 搜索区域 -->
<div class="search-container">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto"> <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
<el-row :gutter="22"> <el-form-item label="关键字" prop="keywords">
<el-col :span="24" :md="12" :lg="6"> <el-input
<el-form-item label="关键字" prop="keywords"> v-model="queryParams.keywords"
<el-input placeholder="菜单名称"
v-model="queryParams.keywords" clearable
placeholder="菜单名称" @keyup.enter="handleQuery"
clearable />
@keyup.enter="handleQuery" </el-form-item>
/>
</el-form-item> <el-form-item class="search-buttons">
</el-col> <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
<div class="search-form-btn-box"> <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
<div class="search-form-btn-box-item"> </el-form-item>
<el-form-item>
<el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
<el-button icon="refresh" @click="handleResetQuery">重置</el-button>
</el-form-item>
</div>
</div>
</el-row>
</el-form> </el-form>
</div> </div>
<el-card shadow="never"> <el-card shadow="hover" class="data-table">
<div class="mb-10px"> <div class="data-table__toolbar">
<el-button <div class="data-table__toolbar--actions">
v-hasPerm="['sys:menu:add']" <el-button
type="success" v-hasPerm="['sys:menu:add']"
icon="plus" type="success"
@click="handleOpenDialog('0')" icon="plus"
> @click="handleOpenDialog('0')"
新增 >
</el-button> 新增
</el-button>
</div>
</div> </div>
<el-table <el-table
ref="dataTableRef"
v-loading="loading" v-loading="loading"
:data="menuTableData"
highlight-current-row
row-key="id" row-key="id"
:data="menuTableData"
:tree-props="{ :tree-props="{
children: 'children', children: 'children',
hasChildren: 'hasChildren', hasChildren: 'hasChildren',
}" }"
class="data-table__content"
@row-click="handleRowClick" @row-click="handleRowClick"
> >
<el-table-column label="菜单名称" min-width="200"> <el-table-column label="菜单名称" min-width="200">
@@ -282,11 +279,11 @@
始终显示 始终显示
<el-tooltip placement="bottom" effect="light"> <el-tooltip placement="bottom" effect="light">
<template #content> <template #content>
选择即使目录或菜单下只有一个子节点也会显示父节点 选择"是"即使目录或菜单下只有一个子节点也会显示父节点
<br /> <br />
选择如果目录或菜单下只有一个子节点则只显示该子节点隐藏父节点 选择"否"如果目录或菜单下只有一个子节点则只显示该子节点隐藏父节点
<br /> <br />
如果是叶子节点请选择 如果是叶子节点请选择"否"
</template> </template>
<el-icon class="ml-1 cursor-pointer"> <el-icon class="ml-1 cursor-pointer">
<QuestionFilled /> <QuestionFilled />

View File

@@ -1,43 +1,42 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="search-bar"> <!-- 搜索区域 -->
<div class="search-container">
<el-form ref="queryFormRef" :model="queryParams" :inline="true"> <el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-row :gutter="22"> <el-form-item label="通知标题" prop="title">
<el-col :span="24" :md="12" :lg="6"> <el-input
<el-form-item label="通知标题" prop="title"> v-model="queryParams.title"
<el-input placeholder="关键字"
v-model="queryParams.title" clearable
placeholder="关键字" @keyup.enter="handleQuery()"
clearable />
@keyup.enter="handleQuery()" </el-form-item>
/>
</el-form-item>
</el-col>
<div class="search-form-btn-box"> <el-form-item class="search-buttons">
<div class="search-form-btn-box-item"> <el-button type="primary" @click="handleQuery()">
<el-form-item> <template #icon>
<el-button type="primary" @click="handleQuery()"> <Search />
<template #icon> </template>
<Search /> 搜索
</template> </el-button>
搜索 <el-button @click="handleResetQuery()">
</el-button> <template #icon>
<el-button @click="handleResetQuery()"> <Refresh />
<template #icon> </template>
<Refresh /> 重置
</template> </el-button>
重置 </el-form-item>
</el-button>
</el-form-item>
</div>
</div>
</el-row>
</el-form> </el-form>
</div> </div>
<el-card shadow="never"> <el-card shadow="hover" class="data-table">
<el-table ref="dataTableRef" v-loading="loading" :data="pageData" highlight-current-row> <el-table
ref="dataTableRef"
v-loading="loading"
:data="pageData"
highlight-current-row
class="data-table__content"
>
<el-table-column type="index" label="序号" width="60" /> <el-table-column type="index" label="序号" width="60" />
<el-table-column label="通知标题" prop="title" min-width="200" /> <el-table-column label="通知标题" prop="title" min-width="200" />
<el-table-column align="center" label="通知类型" width="150"> <el-table-column align="center" label="通知类型" width="150">

View File

@@ -1,6 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="search-bar"> <!-- 搜索区域 -->
<div class="search-container">
<el-form <el-form
ref="queryFormRef" ref="queryFormRef"
:model="queryParams" :model="queryParams"
@@ -8,65 +9,64 @@
label-suffix=":" label-suffix=":"
label-width="auto" label-width="auto"
> >
<el-row :gutter="22"> <el-form-item label="标题" prop="title">
<el-col :span="24" :md="12" :lg="6"> <el-input
<el-form-item label="标题" prop="title"> v-model="queryParams.title"
<el-input placeholder="标题"
v-model="queryParams.title" clearable
placeholder="标题" @keyup.enter="handleQuery()"
clearable />
@keyup.enter="handleQuery()" </el-form-item>
/>
</el-form-item>
</el-col>
<el-col :span="24" :md="12" :lg="6">
<el-form-item label="发布状态" prop="publishStatus">
<el-select v-model="queryParams.publishStatus" clearable placeholder="全部">
<el-option :value="0" label="未发布" />
<el-option :value="1" label="已发布" />
<el-option :value="-1" label="已撤回" />
</el-select>
</el-form-item>
</el-col>
<div class="search-form-btn-box"> <el-form-item label="发布状态" prop="publishStatus">
<div class="search-form-btn-box-item"> <el-select
<el-form-item> v-model="queryParams.publishStatus"
<el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button> clearable
<el-button icon="refresh" @click="handleResetQuery()">重置</el-button> placeholder="全部"
</el-form-item> style="width: 100px"
</div> >
</div> <el-option :value="0" label="未发布" />
</el-row> <el-option :value="1" label="已发布" />
<el-option :value="-1" label="已撤回" />
</el-select>
</el-form-item>
<el-form-item class="search-buttons">
<el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button>
<el-button icon="refresh" @click="handleResetQuery()">重置</el-button>
</el-form-item>
</el-form> </el-form>
</div> </div>
<el-card shadow="never" class="table-wrapper"> <el-card shadow="hover" class="data-table">
<template #header> <div class="data-table__toolbar">
<el-button <div class="data-table__toolbar--actions">
v-hasPerm="['sys:notice:add']" <el-button
type="success" v-hasPerm="['sys:notice:add']"
icon="plus" type="success"
@click="handleOpenDialog()" icon="plus"
> @click="handleOpenDialog()"
新增通知 >
</el-button> 新增通知
<el-button </el-button>
v-hasPerm="['sys:notice:delete']" <el-button
type="danger" v-hasPerm="['sys:notice:delete']"
:disabled="selectIds.length === 0" type="danger"
icon="delete" :disabled="selectIds.length === 0"
@click="handleDelete()" icon="delete"
> @click="handleDelete()"
删除 >
</el-button> 删除
</template> </el-button>
</div>
</div>
<el-table <el-table
ref="dataTableRef" ref="dataTableRef"
v-loading="loading" v-loading="loading"
:data="pageData" :data="pageData"
highlight-current-row highlight-current-row
class="data-table__content"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />

View File

@@ -1,37 +1,37 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="search-bar"> <!-- 搜索区域 -->
<div class="search-container">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto"> <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
<el-row :gutter="22"> <el-form-item prop="keywords" label="关键字">
<el-col :span="24" :md="12" :lg="6"> <el-input
<el-form-item prop="keywords" label="关键字"> v-model="queryParams.keywords"
<el-input placeholder="角色名称"
v-model="queryParams.keywords" clearable
placeholder="角色名称" @keyup.enter="handleQuery"
clearable />
@keyup.enter="handleQuery" </el-form-item>
/>
</el-form-item>
</el-col>
<div class="search-form-btn-box"> <el-form-item class="search-buttons">
<div class="search-form-btn-box-item"> <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
<el-form-item> <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
<el-button type="primary" icon="search" @click="handleQuery">搜索</el-button> </el-form-item>
<el-button icon="refresh" @click="handleResetQuery">重置</el-button>
</el-form-item>
</div>
</div>
</el-row>
</el-form> </el-form>
</div> </div>
<el-card shadow="never"> <el-card shadow="hover" class="data-table">
<div class="mb-10px"> <div class="data-table__toolbar">
<el-button type="success" icon="plus" @click="handleOpenDialog()">新增</el-button> <div class="data-table__toolbar--actions">
<el-button type="danger" :disabled="ids.length === 0" icon="delete" @click="handleDelete()"> <el-button type="success" icon="plus" @click="handleOpenDialog()">新增</el-button>
删除 <el-button
</el-button> type="danger"
:disabled="ids.length === 0"
icon="delete"
@click="handleDelete()"
>
删除
</el-button>
</div>
</div> </div>
<el-table <el-table
@@ -40,6 +40,7 @@
:data="roleList" :data="roleList"
highlight-current-row highlight-current-row
border border
class="data-table__content"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />

View File

@@ -9,58 +9,52 @@
<!-- 用户列表 --> <!-- 用户列表 -->
<el-col :lg="20" :xs="24"> <el-col :lg="20" :xs="24">
<div class="search-bar"> <!-- 搜索区域 -->
<div class="search-container">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto"> <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
<el-row :gutter="22"> <el-form-item label="关键字" prop="keywords">
<el-col :span="24" :md="12" :lg="6"> <el-input
<el-form-item label="关键字" prop="keywords"> v-model="queryParams.keywords"
<el-input placeholder="用户名/昵称/手机号"
v-model="queryParams.keywords" clearable
placeholder="用户名/昵称/手机号" @keyup.enter="handleQuery"
clearable />
@keyup.enter="handleQuery" </el-form-item>
/>
</el-form-item>
</el-col>
<el-col :span="24" :md="12" :lg="6"> <el-form-item label="状态" prop="status">
<el-form-item label="状态" prop="status"> <el-select
<el-select v-model="queryParams.status" placeholder="全部" clearable> v-model="queryParams.status"
<el-option label="正常" :value="1" /> placeholder="全部"
<el-option label="禁用" :value="0" /> clearable
</el-select> style="width: 100px"
</el-form-item> >
</el-col> <el-option label="正常" :value="1" />
<el-option label="禁用" :value="0" />
</el-select>
</el-form-item>
<el-col :span="24" :md="12" :lg="6"> <el-form-item label="创建时间">
<el-form-item label="创建时间"> <el-date-picker
<el-date-picker v-model="queryParams.createTime"
v-model="queryParams.createTime" :editable="false"
:editable="false" type="daterange"
type="daterange" range-separator="~"
range-separator="~" start-placeholder="开始时间"
start-placeholder="开始时间" end-placeholder="截止时间"
end-placeholder="截止时间" value-format="YYYY-MM-DD"
value-format="YYYY-MM-DD" />
/> </el-form-item>
</el-form-item>
</el-col>
<div class="search-form-btn-box"> <el-form-item class="search-buttons">
<div class="search-form-btn-box-item"> <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
<el-form-item> <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
<el-button type="primary" icon="search" @click="handleQuery">搜索</el-button> </el-form-item>
<el-button icon="refresh" @click="handleResetQuery">重置</el-button>
</el-form-item>
</div>
</div>
</el-row>
</el-form> </el-form>
</div> </div>
<el-card shadow="never"> <el-card shadow="hover" class="data-table">
<div class="flex-x-between mb-10px"> <div class="data-table__toolbar">
<div> <div class="data-table__toolbar--actions">
<el-button <el-button
v-hasPerm="['sys:user:add']" v-hasPerm="['sys:user:add']"
type="success" type="success"
@@ -79,7 +73,7 @@
删除 删除
</el-button> </el-button>
</div> </div>
<div> <div class="data-table__toolbar--tools">
<el-button <el-button
v-hasPerm="'sys:user:import'" v-hasPerm="'sys:user:import'"
icon="upload" icon="upload"
@@ -94,13 +88,20 @@
</div> </div>
</div> </div>
<el-table v-loading="loading" :data="pageData" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="pageData"
border
stripe
highlight-current-row
class="data-table__content"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column label="用户名" prop="username" /> <el-table-column label="用户名" prop="username" />
<el-table-column label="昵称" width="150" align="center" prop="nickname" /> <el-table-column label="昵称" width="150" align="center" prop="nickname" />
<el-table-column label="性别" width="100" align="center"> <el-table-column label="性别" width="100" align="center">
<template #default="scope"> <template #default="scope">
<!-- 性别字典翻译 -->
<DictLabel v-model="scope.row.gender" code="gender" /> <DictLabel v-model="scope.row.gender" code="gender" />
</template> </template>
</el-table-column> </el-table-column>