apps/x_admin
1
0
Fork 0
mirror of https://gitee.com/xiangheng/x_admin.git synced 2025-12-24 08:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

小优化

Browse Source
This commit is contained in:
xiangheng
2024-02-21 14:39:29 +08:00
parent ef9199c2cb
commit 1dc7f7542a
15 changed files with 69 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
admin/src/views/article/lists/index.vue
View File

@@ -2,16 +2,11 @@
<div class="article-lists">
<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-[280px]"
v-model="queryParams.title"
clearable
@keyup.enter="resetPage"
/>
<el-form-item label="文章标题" class="w-[280px]">
<el-input v-model="queryParams.title" clearable @keyup.enter="resetPage" />
</el-form-item>
<el-form-item label="栏目名称">
<el-select class="w-[280px]" v-model="queryParams.cid">
<el-form-item label="栏目名称" class="w-[280px]">
<el-select v-model="queryParams.cid">
<el-option label="全部" value />
<el-option
v-for="item in optionsData.articleCate"
@@ -21,8 +16,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="文章状态">
<el-select class="w-[280px]" v-model="queryParams.isShow">
<el-form-item label="文章状态" class="w-[280px]">
<el-select v-model="queryParams.isShow">
<el-option label="全部" value />
<el-option label="显示" :value="1" />
<el-option label="隐藏" :value="0" />

8
admin/src/views/article_collect/index.vue
View File

@@ -2,11 +2,11 @@
<div class="index-lists">
<el-card class="!border-none" shadow="never">
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
<el-form-item label="用户ID" prop="userId">
<el-input class="w-[280px]" v-model="queryParams.userId" />
<el-form-item label="用户ID" prop="userId" class="w-[280px]">
<el-input v-model="queryParams.userId" />
</el-form-item>
<el-form-item label="文章ID" prop="articleId">
<el-input class="w-[280px]" v-model="queryParams.articleId" />
<el-form-item label="文章ID" prop="articleId" class="w-[280px]">
<el-input v-model="queryParams.articleId" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>

3
admin/src/views/consumer/lists/index.vue
View File

@@ -4,7 +4,6 @@
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
<el-form-item label="用户信息">
<el-input
class="w-[280px]"
v-model="queryParams.keyword"
placeholder="用户编号/昵称/手机号码"
clearable
@@ -18,7 +17,7 @@
/>
</el-form-item>
<el-form-item label="注册来源">
<el-select class="w-[280px]" v-model="queryParams.channel">
<el-select v-model="queryParams.channel">
<el-option
v-for="(item, key) in ClientMap"
:key="key"

14
admin/src/views/dev_tools/code/index.vue
View File

@@ -3,20 +3,10 @@
<el-card class="!border-none" shadow="never">
<el-form class="mb-[-16px]" :model="formData" inline>
<el-form-item label="表名称">
<el-input
class="w-[280px]"
v-model="formData.tableName"
clearable
@keyup.enter="resetPage"
/>
<el-input v-model="formData.tableName" clearable @keyup.enter="resetPage" />
</el-form-item>
<el-form-item label="表描述">
<el-input
class="w-[280px]"
v-model="formData.tableComment"
clearable
@keyup.enter="resetPage"
/>
<el-input v-model="formData.tableComment" clearable @keyup.enter="resetPage" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>

14
admin/src/views/dev_tools/components/data-table.vue
View File

@@ -13,20 +13,10 @@
</template>
<el-form class="ls-form" :model="formData" inline>
<el-form-item label="表名称">
<el-input
class="w-[280px]"
v-model="formData.tableName"
clearable
@keyup.enter="resetPage"
/>
<el-input v-model="formData.tableName" clearable @keyup.enter="resetPage" />
</el-form-item>
<el-form-item label="表描述">
<el-input
class="w-[280px]"
v-model="formData.tableComment"
clearable
@keyup.enter="resetPage"
/>
<el-input v-model="formData.tableComment" clearable @keyup.enter="resetPage" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>

12
admin/src/views/flow/flow_template/index.vue
View File

@@ -2,14 +2,14 @@
<div class="index-lists">
<el-card class="!border-none" shadow="never">
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
<el-form-item label="流程名称" prop="flowName">
<el-input class="w-[280px]" v-model="queryParams.flowName" />
<el-form-item class="w-[280px]" label="流程名称" prop="flowName">
<el-input v-model="queryParams.flowName" />
</el-form-item>
<el-form-item label="流程分类" prop="flowGroup">
<el-input class="w-[280px]" v-model="queryParams.flowGroup" />
<el-form-item class="w-[280px]" label="流程分类" prop="flowGroup">
<el-input v-model="queryParams.flowGroup" />
</el-form-item>
<el-form-item label="流程描述" prop="flowRemark">
<el-input class="w-[280px]" v-model="queryParams.flowRemark" />
<el-form-item class="w-[280px]" label="流程描述" prop="flowRemark">
<el-input v-model="queryParams.flowRemark" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>

17
admin/src/views/setting/dict/data/index.vue
View File

@@ -3,8 +3,8 @@
<el-card class="!border-none" shadow="never">
<el-page-header class="mb-4" content="数据管理" @back="$router.back()" />
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="字典名称">
<el-select class="w-[280px]" v-model="queryParams.dictType" @change="getLists">
<el-form-item class="w-[280px]" label="字典名称">
<el-select v-model="queryParams.dictType" @change="getLists">
<el-option
v-for="item in optionsData.dictType"
:label="item.dictName"
@@ -13,16 +13,11 @@
/>
</el-select>
</el-form-item>
<el-form-item label="数据名称">
<el-input
class="w-[280px]"
v-model="queryParams.name"
clearable
@keyup.enter="resetPage"
/>
<el-form-item class="w-[280px]" label="数据名称">
<el-input v-model="queryParams.name" clearable @keyup.enter="resetPage" />
</el-form-item>
<el-form-item label="数据状态">
<el-select class="w-[280px]" v-model="queryParams.status">
<el-form-item class="w-[280px]" label="数据状态">
<el-select v-model="queryParams.status">
<el-option label="全部" value />
<el-option label="正常" :value="1" />
<el-option label="停用" :value="0" />

22
admin/src/views/setting/dict/type/index.vue
View File

@@ -2,24 +2,14 @@
<div class="dict-type">
<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-[280px]"
v-model="queryParams.dictName"
clearable
@keyup.enter="resetPage"
/>
<el-form-item class="w-[280px]" label="字典名称">
<el-input v-model="queryParams.dictName" clearable @keyup.enter="resetPage" />
</el-form-item>
<el-form-item label="字典类型">
<el-input
class="w-[280px]"
v-model="queryParams.dictType"
clearable
@keyup.enter="resetPage"
/>
<el-form-item class="w-[280px]" label="字典类型">
<el-input v-model="queryParams.dictType" clearable @keyup.enter="resetPage" />
</el-form-item>
<el-form-item label="状态">
<el-select class="w-[280px]" v-model="queryParams.dictStatus">
<el-form-item class="w-[280px]" label="状态">
<el-select v-model="queryParams.dictStatus">
<el-option label="全部" value />
<el-option label="正常" :value="1" />
<el-option label="停用" :value="0" />

13
admin/src/views/setting/organization/department/index.vue
View File

@@ -2,16 +2,11 @@
<div class="dept-lists">
<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-[280px]"
v-model="queryParams.name"
clearable
@keyup.enter="getLists"
/>
<el-form-item label="部门名称" prop="name" class="w-[280px]">
<el-input v-model="queryParams.name" clearable @keyup.enter="getLists" />
</el-form-item>
<el-form-item label="部门状态" prop="isStop">
<el-select class="w-[280px]" v-model="queryParams.isStop">
<el-form-item label="部门状态" prop="isStop" class="w-[280px]">
<el-select v-model="queryParams.isStop">
<el-option label="全部" value />
<el-option label="正常" value="0" />
<el-option label="停用" value="1" />

22
admin/src/views/setting/organization/post/index.vue
View File

@@ -2,24 +2,14 @@
<div class="post-lists">
<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-[280px]"
v-model="queryParams.code"
clearable
@keyup.enter="resetPage"
/>
<el-form-item class="w-[280px]" label="岗位编码">
<el-input v-model="queryParams.code" clearable @keyup.enter="resetPage" />
</el-form-item>
<el-form-item label="岗位名称">
<el-input
class="w-[280px]"
v-model="queryParams.name"
clearable
@keyup.enter="resetPage"
/>
<el-form-item class="w-[280px]" label="岗位名称">
<el-input v-model="queryParams.name" clearable @keyup.enter="resetPage" />
</el-form-item>
<el-form-item label="岗位状态">
<el-select class="w-[280px]" v-model="queryParams.isStop">
<el-form-item class="w-[280px]" label="岗位状态">
<el-select v-model="queryParams.isStop">
<el-option label="全部" value />
<el-option label="正常" :value="0" />
<el-option label="停用" :value="1" />

6
admin/src/views/setting/permission/admin/index.vue
View File

@@ -2,13 +2,13 @@
<div class="admin">
<el-card class="!border-none" shadow="never">
<el-form class="mb-[-16px]" :model="formData" inline>
<el-form-item label="管理员账号">
<el-form-item label="管理员账号" class="w-[280px]">
<el-input v-model="formData.username" clearable @keyup.enter="resetPage" />
</el-form-item>
<el-form-item label="管理员名称">
<el-form-item label="管理员名称" class="w-[280px]">
<el-input v-model="formData.nickname" clearable @keyup.enter="resetPage" />
</el-form-item>
<el-form-item label="管理员角色">
<el-form-item label="管理员角色" class="w-[280px]">
<el-select v-model="formData.role">
<el-option label="全部" value="" />
<el-option

5
admin/src/views/setting/user/setup.vue
View File

@@ -25,11 +25,14 @@
</div>
</template>
<script lang="ts" setup name="userSetup">
<script lang="ts" setup>
import { getUserSetup, setUserSetup } from '@/api/setting/user'
import feedback from '@/utils/feedback'
// import type { FormInstance } from 'element-plus'
defineOptions({
name: 'userSetup'
})
// 表单数据
const formData = reactive({
defaultAvatar: '' // 用户默认头像

14
admin/src/views/user/setting.vue
View File

@@ -24,7 +24,18 @@
<el-input v-model="formData.nickname" placeholder="请输入名称" />
</div>
</el-form-item>
<input
type="password"
style="
position: absolute;
height: 0;
width: 0;
line-height: 0;
border: 0;
opacity: 0;
overflow: hidden;
"
/>
<el-form-item label="当前密码：" prop="currPassword">
<div class="w-80">
<el-input
@@ -32,6 +43,7 @@
placeholder="修改密码时必填, 不修改密码时留空"
type="password"
show-password
autoComplete="new-password"
/>
</div>
</el-form-item>

8
server/admin/generator/tpl_utils/templates/vue/index-tree.vue.tpl
View File

@@ -12,10 +12,10 @@
/>
</el-form-item>
{{{- else if or (eq .HtmlType "select") (eq .HtmlType "radio") }}}
<el-form-item label="{{{ .ColumnComment }}}" prop="{{{ (toCamelCase .GoField) }}}">
<el-form-item label="{{{ .ColumnComment }}}" prop="{{{ (toCamelCase .GoField) }}}" class="w-[280px]">
<el-select
v-model="queryParams.{{{ (toCamelCase .GoField) }}}"
class="w-[280px]"
clearable
>
{{{- if eq .DictType "" }}}
@@ -32,8 +32,8 @@
</el-select>
</el-form-item>
{{{- else if eq .HtmlType "input" }}}
<el-form-item label="{{{ .ColumnComment }}}" prop="{{{ (toCamelCase .GoField) }}}">
<el-input class="w-[280px]" v-model="queryParams.{{{ (toCamelCase .GoField) }}}" />
<el-form-item label="{{{ .ColumnComment }}}" prop="{{{ (toCamelCase .GoField) }}}" class="w-[280px]">
<el-input v-model="queryParams.{{{ (toCamelCase .GoField) }}}" />
</el-form-item>
{{{- end }}}
{{{- end }}}

4
server/admin/generator/tpl_utils/tpl.go
View File

@@ -176,7 +176,7 @@ func (tu templateUtil) GetTemplatePaths(genTpl string) []string {
//go:embed templates/gocode
//go:embed templates/vue
var fs embed.FS
var templatesFs embed.FS
/**
* Render 渲染模板
@@ -188,7 +188,7 @@ var fs embed.FS
*/
func (tu templateUtil) Render(tplPath string, tplVars TplVars) (res string, e error) {
tpl, err := tu.tpl.ParseFS(fs, "templates/"+tplPath)
tpl, err := tu.tpl.ParseFS(templatesFs, "templates/"+tplPath)
if e = response.CheckErr(err, "TemplateUtil.Render ParseFiles err"); e != nil {
return "", e
}