Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
This commit is contained in:
TinyAnts
commit
264b5ad609
|
|
@ -10,6 +10,7 @@
|
|||
:default-active="activeMenu"
|
||||
:collapse="isCollapsed"
|
||||
mode="vertical"
|
||||
:unique-opened="true"
|
||||
@select="$emit('select')"
|
||||
>
|
||||
<menu-item
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
>
|
||||
<el-form ref="formRef" :model="formData" label-width="84px" :rules="formRules">
|
||||
<el-form-item label="栏目名称" prop="name">
|
||||
<el-input v-model="formData.name" placeholder="请输入栏目名称" />
|
||||
<el-input v-model="formData.name" placeholder="请输入栏目名称" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="排序" prop="sort">
|
||||
<div>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,11 @@
|
|||
<div>
|
||||
<el-form-item label="文章标题" prop="title">
|
||||
<div class="w-80">
|
||||
<el-input v-model="formData.title" placeholder="请输入文章标题" />
|
||||
<el-input
|
||||
v-model="formData.title"
|
||||
placeholder="请输入文章标题"
|
||||
clearable
|
||||
/>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="文章栏目" prop="cid">
|
||||
|
|
@ -23,6 +27,7 @@
|
|||
class="w-80"
|
||||
v-model="formData.cid"
|
||||
placeholder="请选择文章栏目"
|
||||
clearable
|
||||
>
|
||||
<el-option
|
||||
v-for="item in optionsData.articleCate"
|
||||
|
|
@ -34,12 +39,21 @@
|
|||
</el-form-item>
|
||||
<el-form-item label="文章简介" prop="intro">
|
||||
<div class="w-80">
|
||||
<el-input v-model="formData.intro" placeholder="请输入文章简介" />
|
||||
<el-input
|
||||
v-model="formData.intro"
|
||||
placeholder="请输入文章简介"
|
||||
clearable
|
||||
/>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="摘要" prop="summary">
|
||||
<div class="w-80">
|
||||
<el-input type="textarea" :rows="6" v-model="formData.summary" />
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="6"
|
||||
v-model="formData.summary"
|
||||
clearable
|
||||
/>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="文章封面" prop="image">
|
||||
|
|
|
|||
|
|
@ -3,7 +3,12 @@
|
|||
<el-card class="!border-none" shadow="never">
|
||||
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
|
||||
<el-form-item label="文章标题">
|
||||
<el-input class="w-56" v-model="queryParams.title" />
|
||||
<el-input
|
||||
class="w-56"
|
||||
v-model="queryParams.title"
|
||||
clearable
|
||||
@keyup.enter="resetPage"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="栏目名称">
|
||||
<el-select class="w-56" v-model="queryParams.cid">
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@
|
|||
class="w-56"
|
||||
v-model="queryParams.keyword"
|
||||
placeholder="用户编号/昵称/手机号码"
|
||||
clearable
|
||||
@keyup.enter="resetPage"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="注册时间">
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="部门名称" prop="name">
|
||||
<el-input v-model="formData.name" placeholder="请输入部门名称" />
|
||||
<el-input v-model="formData.name" placeholder="请输入部门名称" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="负责人" prop="duty">
|
||||
<el-input v-model="formData.duty" placeholder="请输入负责人姓名" />
|
||||
<el-input v-model="formData.duty" placeholder="请输入负责人姓名" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="联系电话" prop="mobile">
|
||||
<el-input v-model="formData.mobile" placeholder="请输入联系电话" />
|
||||
<el-input v-model="formData.mobile" placeholder="请输入联系电话" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="排序" prop="sort">
|
||||
<div>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,12 @@
|
|||
<el-card class="!border-none" shadow="never">
|
||||
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
|
||||
<el-form-item label="部门名称" prop="name">
|
||||
<el-input class="w-56" v-model="queryParams.name" />
|
||||
<el-input
|
||||
class="w-56"
|
||||
v-model="queryParams.name"
|
||||
clearable
|
||||
@keyup.enter="getLists"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="部门状态" prop="isStop">
|
||||
<el-select class="w-56" v-model="queryParams.isStop">
|
||||
|
|
|
|||
|
|
@ -10,10 +10,10 @@
|
|||
>
|
||||
<el-form ref="formRef" :model="formData" label-width="84px" :rules="formRules">
|
||||
<el-form-item label="岗位名称" prop="name">
|
||||
<el-input v-model="formData.name" placeholder="请输入岗位名称" />
|
||||
<el-input v-model="formData.name" placeholder="请输入岗位名称" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="岗位编码" prop="code">
|
||||
<el-input v-model="formData.code" placeholder="请输入岗位编码" />
|
||||
<el-input v-model="formData.code" placeholder="请输入岗位编码" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="排序" prop="sort">
|
||||
<div>
|
||||
|
|
@ -54,7 +54,7 @@ const formData = reactive({
|
|||
code: '',
|
||||
sort: 0,
|
||||
remarks: '',
|
||||
isStop: 1
|
||||
isStop: 0
|
||||
})
|
||||
|
||||
const formRules = {
|
||||
|
|
|
|||
|
|
@ -3,10 +3,20 @@
|
|||
<el-card class="!border-none" shadow="never">
|
||||
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
|
||||
<el-form-item label="岗位编码">
|
||||
<el-input class="w-56" v-model="queryParams.code" />
|
||||
<el-input
|
||||
class="w-56"
|
||||
v-model="queryParams.code"
|
||||
clearable
|
||||
@keyup.enter="resetPage"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="岗位名称">
|
||||
<el-input class="w-56" v-model="queryParams.name" />
|
||||
<el-input
|
||||
class="w-56"
|
||||
v-model="queryParams.name"
|
||||
clearable
|
||||
@keyup.enter="resetPage"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="岗位状态">
|
||||
<el-select class="w-56" v-model="queryParams.isStop">
|
||||
|
|
@ -34,7 +44,12 @@
|
|||
<el-table-column label="岗位编码" prop="code" min-width="100" />
|
||||
<el-table-column label="岗位名称" prop="name" min-width="100" />
|
||||
<el-table-column label="排序" prop="sort" min-width="100" />
|
||||
<el-table-column label="备注" prop="remarks" min-width="100" />
|
||||
<el-table-column
|
||||
label="备注"
|
||||
prop="remarks"
|
||||
min-width="100"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column label="添加时间" prop="createTime" min-width="180" />
|
||||
<el-table-column label="部门状态" prop="isStop" min-width="100">
|
||||
<template #default="{ row }">
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
v-model="formData.username"
|
||||
:disabled="isRoot"
|
||||
placeholder="请输入账号"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="头像">
|
||||
|
|
@ -25,7 +26,7 @@
|
|||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="名称" prop="nickname">
|
||||
<el-input v-model="formData.nickname" placeholder="请输入名称" />
|
||||
<el-input v-model="formData.nickname" placeholder="请输入名称" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="归属部门" prop="deptId">
|
||||
<el-tree-select
|
||||
|
|
@ -47,7 +48,12 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="岗位" prop="deptId">
|
||||
<el-select class="flex-1" v-model="formData.postId" placeholder="请选择岗位">
|
||||
<el-select
|
||||
class="flex-1"
|
||||
clearable
|
||||
v-model="formData.postId"
|
||||
placeholder="请选择岗位"
|
||||
>
|
||||
<el-option
|
||||
v-for="(item, index) in optionsData.post"
|
||||
:key="index"
|
||||
|
|
@ -62,6 +68,7 @@
|
|||
v-model="formData.role"
|
||||
:disabled="isRoot"
|
||||
class="flex-1"
|
||||
clearable
|
||||
placeholder="请选择角色"
|
||||
>
|
||||
<el-option v-if="isRoot" label="系统管理员" value="0" />
|
||||
|
|
@ -78,6 +85,7 @@
|
|||
<el-input
|
||||
v-model.trim="formData.password"
|
||||
show-password
|
||||
clearable
|
||||
placeholder="请输入密码"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
@ -86,6 +94,7 @@
|
|||
<el-input
|
||||
v-model.trim="formData.passwordConfirm"
|
||||
show-password
|
||||
clearable
|
||||
placeholder="请输入确认密码"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
|
|||
|
|
@ -3,10 +3,20 @@
|
|||
<el-card class="!border-none" shadow="never">
|
||||
<el-form class="mb-[-16px]" :model="formData" inline>
|
||||
<el-form-item label="管理员账号">
|
||||
<el-input v-model="formData.username" class="w-56" />
|
||||
<el-input
|
||||
v-model="formData.username"
|
||||
class="w-56"
|
||||
clearable
|
||||
@keyup.enter="resetPage"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="管理员名称">
|
||||
<el-input v-model="formData.nickname" class="w-56" />
|
||||
<el-input
|
||||
v-model="formData.nickname"
|
||||
class="w-56"
|
||||
clearable
|
||||
@keyup.enter="resetPage"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="管理员角色">
|
||||
<el-select class="w-56" v-model="formData.role">
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="菜单名称" prop="menuName">
|
||||
<el-input v-model="formData.menuName" placeholder="请输入菜单名称" />
|
||||
<el-input v-model="formData.menuName" placeholder="请输入菜单名称" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
v-if="formData.menuType != MenuEnum.BUTTON"
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
prop="paths"
|
||||
>
|
||||
<div class="flex-1">
|
||||
<el-input v-model="formData.paths" placeholder="请输入路由路径" />
|
||||
<el-input v-model="formData.paths" placeholder="请输入路由路径" clearable />
|
||||
<div class="form-tips">
|
||||
访问的路由地址，如：`admin`，如外网地址需内链访问则以`http(s)://`开头
|
||||
</div>
|
||||
|
|
@ -75,7 +75,11 @@
|
|||
</el-form-item>
|
||||
<el-form-item label="选中菜单" prop="p" v-if="formData.menuType == MenuEnum.MENU">
|
||||
<div class="flex-1">
|
||||
<el-input v-model="formData.selected" placeholder="请输入路由路径" />
|
||||
<el-input
|
||||
v-model="formData.selected"
|
||||
placeholder="请输入路由路径"
|
||||
clearable
|
||||
/>
|
||||
<div class="form-tips">
|
||||
访问详情页面，编辑页面时，菜单高亮显示，如`/consumer/lists`
|
||||
</div>
|
||||
|
|
@ -87,7 +91,7 @@
|
|||
prop="perms"
|
||||
>
|
||||
<div class="flex-1">
|
||||
<el-input v-model="formData.perms" placeholder="请输入权限字符" />
|
||||
<el-input v-model="formData.perms" placeholder="请输入权限字符" clearable />
|
||||
<div class="form-tips">
|
||||
将作为server端API验权使用，如`system:admin:list`，请谨慎修改
|
||||
</div>
|
||||
|
|
@ -100,7 +104,11 @@
|
|||
>
|
||||
<div>
|
||||
<div class="flex-1">
|
||||
<el-input v-model="formData.params" placeholder="请输入路由参数" />
|
||||
<el-input
|
||||
v-model="formData.params"
|
||||
placeholder="请输入路由参数"
|
||||
clearable
|
||||
/>
|
||||
</div>
|
||||
<div class="form-tips">
|
||||
访问路由的默认传递参数，如：`{"id": 1, "name":
|
||||
|
|
|
|||
|
|
@ -16,7 +16,12 @@
|
|||
label-width="60px"
|
||||
>
|
||||
<el-form-item label="名称" prop="name">
|
||||
<el-input class="ls-input" v-model="formData.name" placeholder="请输入名称" />
|
||||
<el-input
|
||||
class="ls-input"
|
||||
v-model="formData.name"
|
||||
placeholder="请输入名称"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input
|
||||
|
|
|
|||
|
|
@ -20,13 +20,14 @@
|
|||
:model-value="formData.typeValue"
|
||||
placeholder="请输入字典类型"
|
||||
disabled
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="数据名称" prop="name">
|
||||
<el-input v-model="formData.name" placeholder="请输入数据名称" />
|
||||
<el-input v-model="formData.name" placeholder="请输入数据名称" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="数据值" prop="value">
|
||||
<el-input v-model="formData.value" placeholder="请输入数据值" />
|
||||
<el-input v-model="formData.value" placeholder="请输入数据值" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="排序" prop="sort">
|
||||
<div>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,12 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="数据名称">
|
||||
<el-input class="w-56" v-model="queryParams.name" />
|
||||
<el-input
|
||||
class="w-56"
|
||||
v-model="queryParams.name"
|
||||
clearable
|
||||
@keyup.enter="resetPage"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="数据状态">
|
||||
<el-select class="w-56" v-model="queryParams.status">
|
||||
|
|
|
|||
|
|
@ -16,10 +16,10 @@
|
|||
label-width="84px"
|
||||
>
|
||||
<el-form-item label="字典名称" prop="dictName">
|
||||
<el-input v-model="formData.dictName" placeholder="请输入字典名称" />
|
||||
<el-input v-model="formData.dictName" placeholder="请输入字典名称" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="字典类型" prop="dictType">
|
||||
<el-input v-model="formData.dictType" placeholder="请输入字典类型" />
|
||||
<el-input v-model="formData.dictType" placeholder="请输入字典类型" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="字典状态" required prop="dictStatus">
|
||||
<el-radio-group v-model="formData.dictStatus">
|
||||
|
|
|
|||
|
|
@ -3,10 +3,20 @@
|
|||
<el-card class="!border-none" shadow="never">
|
||||
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" inline>
|
||||
<el-form-item label="字典名称">
|
||||
<el-input class="w-56" v-model="queryParams.dictName" />
|
||||
<el-input
|
||||
class="w-56"
|
||||
v-model="queryParams.dictName"
|
||||
clearable
|
||||
@keyup.enter="resetPage"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="字典类型">
|
||||
<el-input class="w-56" v-model="queryParams.dictType" />
|
||||
<el-input
|
||||
class="w-56"
|
||||
v-model="queryParams.dictType"
|
||||
clearable
|
||||
@keyup.enter="resetPage"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态">
|
||||
<el-select class="w-56" v-model="queryParams.dictStatus">
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="关键词" prop="describe" min-width="160">
|
||||
<template #default="{ row }">
|
||||
<el-input v-model="row.name" />
|
||||
<el-input v-model="row.name" clearable />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="排序" prop="describe" min-width="160">
|
||||
|
|
|
|||
|
|
@ -21,14 +21,23 @@
|
|||
<el-input
|
||||
v-model="formData.bucket"
|
||||
placeholder="请输入存储空间名称(Bucket)"
|
||||
clearable
|
||||
/>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="ACCESS_KEY" prop="accessKey">
|
||||
<el-input v-model="formData.accessKey" placeholder="请输入ACCESS_KEY(AK)" />
|
||||
<el-input
|
||||
v-model="formData.accessKey"
|
||||
placeholder="请输入ACCESS_KEY(AK)"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="SECRET_KEY" prop="secretKey">
|
||||
<el-input v-model="formData.secretKey" placeholder="请输入SECRET_KEY(SK)" />
|
||||
<el-input
|
||||
v-model="formData.secretKey"
|
||||
placeholder="请输入SECRET_KEY(SK)"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="空间域名" prop="domain">
|
||||
<div class="flex-1">
|
||||
|
|
@ -36,6 +45,7 @@
|
|||
<el-input
|
||||
v-model="formData.domain"
|
||||
placeholder="请输入空间域名(Domain)"
|
||||
clearable
|
||||
/>
|
||||
</div>
|
||||
<div class="form-tips">
|
||||
|
|
@ -48,7 +58,7 @@
|
|||
label="REGION"
|
||||
prop="region"
|
||||
>
|
||||
<el-input v-model="formData.region" placeholder="请输入region" />
|
||||
<el-input v-model="formData.region" placeholder="请输入region" clearable />
|
||||
</el-form-item>
|
||||
</div>
|
||||
<el-form-item label="状态" prop="status">
|
||||
|
|
|
|||
|
|
@ -61,10 +61,11 @@
|
|||
|
||||
<script lang="ts" setup>
|
||||
import { getWebsite, setWebsite } from '@/api/setting/website'
|
||||
import useAppStore from '@/stores/modules/app'
|
||||
import feedback from '@/utils/feedback'
|
||||
import type { FormInstance } from 'element-plus'
|
||||
const formRef = ref<FormInstance>()
|
||||
|
||||
const { getConfig } = useAppStore()
|
||||
// 表单数据
|
||||
const formData = reactive({
|
||||
name: '', // 网站名称
|
||||
|
|
@ -135,6 +136,7 @@ const handleSubmit = async () => {
|
|||
await formRef.value?.validate()
|
||||
await setWebsite(formData)
|
||||
feedback.msgSuccess('操作成功')
|
||||
getConfig()
|
||||
getData()
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,15 +7,15 @@
|
|||
</template>
|
||||
<div>
|
||||
<div class="flex leading-9">
|
||||
<div class="w-20">当前版本</div>
|
||||
<div class="w-20 flex-none">当前版本</div>
|
||||
<span> {{ workbenchData.version.version }}</span>
|
||||
</div>
|
||||
<div class="flex leading-9">
|
||||
<div class="w-20">基于框架</div>
|
||||
<div class="w-20 flex-none">基于框架</div>
|
||||
<span> {{ workbenchData.version.based }}</span>
|
||||
</div>
|
||||
<div class="flex leading-9">
|
||||
<div class="w-20">获取渠道</div>
|
||||
<div class="w-20 felx-none">获取渠道</div>
|
||||
<div>
|
||||
<a :href="workbenchData.version.channel.website" target="_blank">
|
||||
<el-button type="success" size="small">官网</el-button>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
class="flex-1"
|
||||
type="password"
|
||||
v-model="formData.password"
|
||||
placeholder="请输入字母+数字组合的密码"
|
||||
placeholder="6-20位数字+字母或符号组合"
|
||||
:border="false"
|
||||
/>
|
||||
</u-form-item>
|
||||
|
|
|
|||
Loading…
Reference in New Issue