update: 发布dev2.7.6Beta版本 (#1908)

* feat: 优化菜单管理的路径选择框

* fixed: 修复错误的文件命名

* feat: 增加参数管理功能,调整菜单选择组件。

* feat: 恢复config.yaml

* feat: 更新AI功能

* feat: 增加API自动填充功能

* feat: 增加AI自动填充表格导出模板

* feat: 增加AI自动填充表格导出模板和AI自动模板填充

* feat: 新增方法支持选择是否鉴权

---------

Co-authored-by: Azir <2075125282@qq.com>
This commit is contained in:
PiexlMax(奇淼
2024-10-15 21:58:17 +08:00
committed by GitHub
co-authored by Azir
parent c34e3b4282
commit 0ce5a63c1d
52 changed files with 1620 additions and 706 deletions
+41 -3
View File
@@ -204,12 +204,12 @@
<div class="flex justify-between items-center">
<span class="text-lg">同步路由</span>
<div>
<el-button @click="closeSyncDialog">
<el-button :loading="apiCompletionLoading" @click="closeSyncDialog">
取 消
</el-button>
<el-button
type="primary"
:loading="syncing"
:loading="syncing||apiCompletionLoading"
@click="enterSyncDialog"
>
确 定
@@ -218,8 +218,17 @@
</div>
</template>
<h4>新增路由 <span class="text-xs text-gray-500 ml-2 font-normal">存在于当前路由中,但是不存在于api表</span></h4>
<h4>新增路由 <span class="text-xs text-gray-500 mx-2 font-normal">存在于当前路由中,但是不存在于api表</span>
<el-button type="primary" size="small" @click="apiCompletion">
<el-icon size="18">
<ai-gva />
</el-icon>
自动填充
</el-button>
</h4>
<el-table
v-loading="syncing||apiCompletionLoading"
element-loading-text="小淼正在思考..."
:data="syncApiData.newApis"
>
<el-table-column
@@ -481,6 +490,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
import ExportExcel from '@/components/exportExcel/exportExcel.vue'
import ExportTemplate from '@/components/exportExcel/exportTemplate.vue'
import ImportExcel from '@/components/exportExcel/importExcel.vue'
import {butler} from "@/api/autoCode";
defineOptions({
name: 'Api',
@@ -843,6 +853,34 @@ const deleteApiFunc = async(row) => {
}
})
}
const apiCompletionLoading = ref(false)
const apiCompletion = async () =>{
apiCompletionLoading.value = true
const routerPaths = syncApiData.value.newApis.filter(item => !item.apiGroup || !item.description).map(item => item.path)
const res = await butler({data:routerPaths,command:'apiCompletion'})
apiCompletionLoading.value = false
if (res.code === 0) {
try{
const data = JSON.parse(res.data)
syncApiData.value.newApis.forEach(item => {
const target = data.find(d => d.path === item.path)
if(target){
if(!item.apiGroup){
item.apiGroup = target.apiGroup
}
if (!item.description) {
item.description = target.description
}
}
})
} catch (e) {
ElMessage({
type: 'error',
message: 'AI自动填充失败,请重新生成'
})
}
}
}
</script>
@@ -0,0 +1,119 @@
<template>
<div class="flex justify-between items-center gap-2 w-full">
<el-cascader
v-if="pathIsSelect"
placeholder="请选择文件路径"
:options="pathOptions"
v-model="activeComponent"
filterable
class="w-full"
clearable
@change="emitChange"
/>
<el-input v-else v-model="tempPath" placeholder="页面:view/xxx/xx.vue 插件:plugin/xx/xx.vue" @change="emitChange" />
<el-button @click="togglePathIsSelect">{{ pathIsSelect ? '手动输入' : '快捷选择' }} </el-button>
</div>
</template>
<script setup>
import { onMounted, ref } from "vue";
import pathInfo from "@/pathInfo.json";
const props = defineProps({
component: {
type: String,
default: ""
}
})
const emits = defineEmits(['change'])
const pathOptions = ref([])
const tempPath = ref('')
const activeComponent = ref('')
const pathIsSelect = ref(true)
const togglePathIsSelect = () => {
if(pathIsSelect.value){
tempPath.value = activeComponent.value?.join('/')
}else{
activeComponent.value = tempPath.value.split('/')
console.log(activeComponent.value)
}
pathIsSelect.value = !pathIsSelect.value
emitChange()
}
function convertToCascaderOptions(data) {
const result = [];
for (const path in data) {
const label = data[path];
const parts = path.split('/').filter(Boolean);
// 如果第一个部分是 'src',则从第二个部分开始处理
const startIndex = parts[0] === 'src' ? 1 : 0;
let currentLevel = result;
for (let i = startIndex; i < parts.length; i++) {
const part = parts[i];
let node = currentLevel.find(item => item.value === part);
if (!node) {
node = {
value: part,
label: part,
children: []
};
currentLevel.push(node);
}
if (i === parts.length - 1) {
// 如果是路径的最后一部分,设置标签并移除 children
node.label = label;
delete node.children;
}
currentLevel = node.children || [];
}
}
return result;
}
onMounted(() => {
pathOptions.value = convertToCascaderOptions(pathInfo)
initCascader(props.component)
})
const initCascader = (value) => {
// 新增的时候
if(value === ''){
pathIsSelect.value = true
return
}
// 编辑的时候,根据路径判断是选择框还是输入框
if (pathInfo[`/src/${value}` || pathInfo[value]]) {
activeComponent.value = value.split('/').filter(Boolean);
tempPath.value = ''
pathIsSelect.value = true
return
}
tempPath.value = value
activeComponent.value = []
pathIsSelect.value = false
}
const emitChange = () => {
emits('change', pathIsSelect.value ? activeComponent.value?.join('/') : tempPath.value)
}
</script>
<style scoped lang="scss">
</style>
+11 -34
View File
@@ -165,24 +165,9 @@
label="文件路径"
prop="component"
>
<el-select
v-model="form.component"
filterable
allow-create
autocomplete="off"
style="width: 100%"
placeholder="页面:view/xxx/xx.vue 插件:plugin/xx/xx.vue"
default-first-option
@change="fmtComponent"
>
<el-option
v-for="(item,path) in pathOptions"
:key="path"
:label="path"
:value="path"
/>
</el-select>
<span style="font-size: 12px; margin-right: 12px">如果菜单包含子菜单,请创建router-view二级路由页面或者</span><el-button
<components-cascader :component="form.component" @change="fmtComponent" />
<span style="font-size: 12px; margin-right: 12px">如果菜单包含子菜单,请创建router-view二级路由页面或者</span>
<el-button
style="margin-top: 4px"
@click="form.component = 'view/routerHolder.vue'"
>
@@ -556,27 +541,19 @@ import {
import icon from '@/view/superAdmin/menu/icon.vue'
import WarningBar from '@/components/warningBar/warningBar.vue'
import { canRemoveAuthorityBtnApi } from '@/api/authorityBtn'
import { reactive, ref, onMounted } from 'vue'
import {reactive, ref} from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { QuestionFilled } from '@element-plus/icons-vue'
import pathInfo from '@/pathInfo.json'
import { toDoc } from '@/utils/doc'
import { toLowerCase } from '@/utils/stringFun'
import {toLowerCase} from "@/utils/stringFun";
import ComponentsCascader from "@/view/superAdmin/menu/components/components-cascader.vue";
import pathInfo from "@/pathInfo.json";
defineOptions({
name: 'Menus',
})
const pathOptions = reactive({})
onMounted(()=>{
for (let pathInfoKey in pathInfo) {
// 取消掉最前面的 /src/
pathOptions[pathInfoKey.replace(/^\/src\//, '')] = pathInfo[pathInfoKey]
}
})
const rules = reactive({
path: [{ required: true, message: '请输入菜单name', trigger: 'blur' }],
component: [{ required: true, message: '请输入文件路径', trigger: 'blur' }],
@@ -608,9 +585,9 @@ const addParameter = (form) => {
})
}
const fmtComponent = () => {
form.value.component = form.value.component.replace(/\\/g, '/')
form.value.name = toLowerCase(pathOptions[form.value.component])
const fmtComponent = (component) => {
form.value.component = component.replace(/\\/g, '/')
form.value.name = toLowerCase(pathInfo["/src/"+component])
form.value.path = form.value.name
}
@@ -0,0 +1,453 @@
<template>
<div>
<div class="gva-search-box">
<el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
<el-form-item label="创建日期" prop="createdAt">
<template #label>
<span>
创建日期
<el-tooltip content="搜索范围是开始日期(包含)至结束日期(不包含)">
<el-icon><QuestionFilled /></el-icon>
</el-tooltip>
</span>
</template>
<el-date-picker v-model="searchInfo.startCreatedAt" type="datetime" placeholder="开始日期" :disabled-date="time=> searchInfo.endCreatedAt ? time.getTime() > searchInfo.endCreatedAt.getTime() : false"></el-date-picker>
—
<el-date-picker v-model="searchInfo.endCreatedAt" type="datetime" placeholder="结束日期" :disabled-date="time=> searchInfo.startCreatedAt ? time.getTime() < searchInfo.startCreatedAt.getTime() : false"></el-date-picker>
</el-form-item>
<el-form-item label="参数名称" prop="name">
<el-input v-model="searchInfo.name" placeholder="搜索条件" />
</el-form-item>
<el-form-item label="参数键" prop="key">
<el-input v-model="searchInfo.key" placeholder="搜索条件" />
</el-form-item>
<template v-if="showAllQuery">
<!-- 将需要控制显示状态的查询条件添加到此范围内 -->
</template>
<el-form-item>
<el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
<el-button icon="refresh" @click="onReset">重置</el-button>
<el-button link type="primary" icon="arrow-down" @click="showAllQuery=true" v-if="!showAllQuery">展开</el-button>
<el-button link type="primary" icon="arrow-up" @click="showAllQuery=false" v-else>收起</el-button>
</el-form-item>
</el-form>
</div>
<div class="gva-table-box">
<div class="gva-btn-list">
<el-button type="primary" icon="plus" @click="openDialog">新增</el-button>
<el-button icon="delete" style="margin-left: 10px;" :disabled="!multipleSelection.length" @click="onDelete">删除</el-button>
</div>
<el-table
ref="multipleTable"
style="width: 100%"
tooltip-effect="dark"
:data="tableData"
row-key="ID"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" />
<el-table-column align="left" label="日期" prop="createdAt" width="180">
<template #default="scope">{{ formatDate(scope.row.CreatedAt) }}</template>
</el-table-column>
<el-table-column align="left" label="参数名称" prop="name" width="120" />
<el-table-column align="left" label="参数键" prop="key" width="120" />
<el-table-column align="left" label="参数值" prop="value" width="120" />
<el-table-column align="left" label="参数说明" prop="desc" width="120" />
<el-table-column align="left" label="操作" fixed="right" min-width="240">
<template #default="scope">
<el-button type="primary" link class="table-button" @click="getDetails(scope.row)"><el-icon style="margin-right: 5px"><InfoFilled /></el-icon>查看详情</el-button>
<el-button type="primary" link icon="edit" class="table-button" @click="updateSysParamsFunc(scope.row)">变更</el-button>
<el-button type="primary" link icon="delete" @click="deleteRow(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="gva-pagination">
<el-pagination
layout="total, sizes, prev, pager, next, jumper"
:current-page="page"
:page-size="pageSize"
:page-sizes="[10, 30, 50, 100]"
:total="total"
@current-change="handleCurrentChange"
@size-change="handleSizeChange"
/>
</div>
</div>
<el-drawer destroy-on-close size="800" v-model="dialogFormVisible" :show-close="false" :before-close="closeDialog">
<template #header>
<div class="flex justify-between items-center">
<span class="text-lg">{{type==='create'?'添加':'修改'}}</span>
<div>
<el-button type="primary" @click="enterDialog">确 定</el-button>
<el-button @click="closeDialog">取 消</el-button>
</div>
</div>
</template>
<el-form :model="formData" label-position="top" ref="elFormRef" :rules="rule" label-width="80px">
<el-form-item label="参数名称:" prop="name" >
<el-input v-model="formData.name" :clearable="true" placeholder="请输入参数名称" />
</el-form-item>
<el-form-item label="参数键:" prop="key" >
<el-input v-model="formData.key" :clearable="true" placeholder="请输入参数键" />
</el-form-item>
<el-form-item label="参数值:" prop="value" >
<el-input type="textarea" :rows="5" v-model="formData.value" :clearable="true" placeholder="请输入参数值" />
</el-form-item>
<el-form-item label="参数说明:" prop="desc" >
<el-input v-model="formData.desc" :clearable="true" placeholder="请输入参数说明" />
</el-form-item>
</el-form>
<div class="usage-instructions bg-gray-100 border border-gray-300 rounded-lg p-4 mt-5">
<h3 class="mb-3 text-lg text-gray-800">使用说明</h3>
<p class="mb-2 text-sm text-gray-600">
前端可以通过引入 <code class="bg-blue-100 px-1 py-0.5 rounded">import { getParams } from '@/utils/dictionary'</code> 然后通过 <code class="bg-blue-100 px-1 py-0.5 rounded">await getParams(key)</code> 来获取对应的参数。
</p>
<p class="mb-2 text-sm text-gray-600">
后端可以调用 <code class="bg-blue-100 px-1 py-0.5 rounded">new(system.SysParamsService).GetSysParam(key)</code> 来获取对应的 value 值。
</p>
<p class="text-sm text-gray-600">
后端需要提前 <code class="bg-blue-100 px-1 py-0.5 rounded">import "github.com/flipped-aurora/gin-vue-admin/server/service/system"</code>
</p>
</div>
</el-drawer>
<el-drawer destroy-on-close size="800" v-model="detailShow" :show-close="true" :before-close="closeDetailShow">
<el-descriptions :column="1" border>
<el-descriptions-item label="参数名称">
{{ detailFrom.name }}
</el-descriptions-item>
<el-descriptions-item label="参数键">
{{ detailFrom.key }}
</el-descriptions-item>
<el-descriptions-item label="参数值">
{{ detailFrom.value }}
</el-descriptions-item>
<el-descriptions-item label="参数说明">
{{ detailFrom.desc }}
</el-descriptions-item>
</el-descriptions>
</el-drawer>
</div>
</template>
<script setup>
import {
createSysParams,
deleteSysParams,
deleteSysParamsByIds,
updateSysParams,
findSysParams,
getSysParamsList
} from '@/api/sysParams'
// 全量引入格式化工具 请按需保留
import { getDictFunc, formatDate, formatBoolean, filterDict ,filterDataSource, returnArrImg, onDownloadFile } from '@/utils/format'
import { ElMessage, ElMessageBox } from 'element-plus'
import { ref, reactive } from 'vue'
defineOptions({
name: 'SysParams'
})
// 控制更多查询条件显示/隐藏状态
const showAllQuery = ref(false)
// 自动化生成的字典(可能为空)以及字段
const formData = ref({
name: '',
key: '',
value: '',
desc: '',
})
// 验证规则
const rule = reactive({
name : [{
required: true,
message: '',
trigger: ['input','blur'],
},
{
whitespace: true,
message: '不能只输入空格',
trigger: ['input', 'blur'],
}
],
key : [{
required: true,
message: '',
trigger: ['input','blur'],
},
{
whitespace: true,
message: '不能只输入空格',
trigger: ['input', 'blur'],
}
],
value : [{
required: true,
message: '',
trigger: ['input','blur'],
},
{
whitespace: true,
message: '不能只输入空格',
trigger: ['input', 'blur'],
}
],
})
const searchRule = reactive({
createdAt: [
{ validator: (rule, value, callback) => {
if (searchInfo.value.startCreatedAt && !searchInfo.value.endCreatedAt) {
callback(new Error('请填写结束日期'))
} else if (!searchInfo.value.startCreatedAt && searchInfo.value.endCreatedAt) {
callback(new Error('请填写开始日期'))
} else if (searchInfo.value.startCreatedAt && searchInfo.value.endCreatedAt && (searchInfo.value.startCreatedAt.getTime() === searchInfo.value.endCreatedAt.getTime() || searchInfo.value.startCreatedAt.getTime() > searchInfo.value.endCreatedAt.getTime())) {
callback(new Error('开始日期应当早于结束日期'))
} else {
callback()
}
}, trigger: 'change' }
],
})
const elFormRef = ref()
const elSearchFormRef = ref()
// =========== 表格控制部分 ===========
const page = ref(1)
const total = ref(0)
const pageSize = ref(10)
const tableData = ref([])
const searchInfo = ref({})
// 重置
const onReset = () => {
searchInfo.value = {}
getTableData()
}
// 搜索
const onSubmit = () => {
elSearchFormRef.value?.validate(async(valid) => {
if (!valid) return
page.value = 1
pageSize.value = 10
getTableData()
})
}
// 分页
const handleSizeChange = (val) => {
pageSize.value = val
getTableData()
}
// 修改页面容量
const handleCurrentChange = (val) => {
page.value = val
getTableData()
}
// 查询
const getTableData = async() => {
const table = await getSysParamsList({ page: page.value, pageSize: pageSize.value, ...searchInfo.value })
if (table.code === 0) {
tableData.value = table.data.list
total.value = table.data.total
page.value = table.data.page
pageSize.value = table.data.pageSize
}
}
getTableData()
// ============== 表格控制部分结束 ===============
// 获取需要的字典 可能为空 按需保留
const setOptions = async () =>{
}
// 获取需要的字典 可能为空 按需保留
setOptions()
// 多选数据
const multipleSelection = ref([])
// 多选
const handleSelectionChange = (val) => {
multipleSelection.value = val
}
// 删除行
const deleteRow = (row) => {
ElMessageBox.confirm('确定要删除吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteSysParamsFunc(row)
})
}
// 多选删除
const onDelete = async() => {
ElMessageBox.confirm('确定要删除吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async() => {
const IDs = []
if (multipleSelection.value.length === 0) {
ElMessage({
type: 'warning',
message: '请选择要删除的数据'
})
return
}
multipleSelection.value &&
multipleSelection.value.map(item => {
IDs.push(item.ID)
})
const res = await deleteSysParamsByIds({ IDs })
if (res.code === 0) {
ElMessage({
type: 'success',
message: '删除成功'
})
if (tableData.value.length === IDs.length && page.value > 1) {
page.value--
}
getTableData()
}
})
}
// 行为控制标记(弹窗内部需要增还是改)
const type = ref('')
// 更新行
const updateSysParamsFunc = async(row) => {
const res = await findSysParams({ ID: row.ID })
type.value = 'update'
if (res.code === 0) {
formData.value = res.data
dialogFormVisible.value = true
}
}
// 删除行
const deleteSysParamsFunc = async (row) => {
const res = await deleteSysParams({ ID: row.ID })
if (res.code === 0) {
ElMessage({
type: 'success',
message: '删除成功'
})
if (tableData.value.length === 1 && page.value > 1) {
page.value--
}
getTableData()
}
}
// 弹窗控制标记
const dialogFormVisible = ref(false)
// 打开弹窗
const openDialog = () => {
type.value = 'create'
dialogFormVisible.value = true
}
// 关闭弹窗
const closeDialog = () => {
dialogFormVisible.value = false
formData.value = {
name: '',
key: '',
value: '',
desc: '',
}
}
// 弹窗确定
const enterDialog = async () => {
elFormRef.value?.validate( async (valid) => {
if (!valid) return
let res
switch (type.value) {
case 'create':
res = await createSysParams(formData.value)
break
case 'update':
res = await updateSysParams(formData.value)
break
default:
res = await createSysParams(formData.value)
break
}
if (res.code === 0) {
ElMessage({
type: 'success',
message: '创建/更改成功'
})
closeDialog()
getTableData()
}
})
}
const detailFrom = ref({})
// 查看详情控制标记
const detailShow = ref(false)
// 打开详情弹窗
const openDetailShow = () => {
detailShow.value = true
}
// 打开详情
const getDetails = async (row) => {
// 打开弹窗
const res = await findSysParams({ ID: row.ID })
if (res.code === 0) {
detailFrom.value = res.data
openDetailShow()
}
}
// 关闭详情弹窗
const closeDetailShow = () => {
detailShow.value = false
detailFrom.value = {}
}
</script>
<style>
</style>