Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e2df9bc
新增SearchResponse数据类型,用户search返回内容模型
4linuxfun Nov 10, 2022
e505f43
完善search语句逻辑判断
4linuxfun Nov 10, 2022
35c1dcf
初步完成后端“系统管理”->:“数据字典”后端逻辑 fix #81
4linuxfun Nov 10, 2022
6c4f8f1
分页模型增加type类型
4linuxfun Nov 10, 2022
23db269
前端完成“系统管理”->“数据字典”部分功能 fix #81
4linuxfun Nov 10, 2022
d8a4719
alembic更新
4linuxfun Nov 10, 2022
a9b80ab
统一更新分页内容配置项
4linuxfun Nov 10, 2022
d2d0468
系统管理->数据字典:重置按钮生效
4linuxfun Nov 10, 2022
b5781d8
给分页查询添加file_type,后端进行sql语句的拼接实现 fix #84
4linuxfun Nov 10, 2022
4e0285b
数据字典:分页查询相关内容安全修改 fix #84
4linuxfun Nov 10, 2022
da9b87e
删除不必要的注释
4linuxfun Nov 11, 2022
a94f2fd
菜单管理:前后端改造
4linuxfun Nov 11, 2022
9a68b88
用户管理:前后端改造
4linuxfun Nov 11, 2022
0f2a19e
角色管理前端改造
4linuxfun Nov 11, 2022
634e658
菜单管理改造
4linuxfun Nov 11, 2022
1c5ec25
数据字典:添加监听
4linuxfun Nov 11, 2022
df986a7
重构字典元素字段名
4linuxfun Nov 11, 2022
9947c29
添加“获取数据字典”请求方法
4linuxfun Nov 11, 2022
d8588bc
系统管理->用户管理:状态数据通过数据字典获取
4linuxfun Nov 11, 2022
6b60e6c
bool值统一直接eq对比判断,0为假,1为真
4linuxfun Nov 11, 2022
a8e3674
数据字典请求实现
4linuxfun Nov 11, 2022
44fe979
前端调整数据字典相关内容
4linuxfun Nov 11, 2022
c43a700
系统管理->用户管理:用户编辑页面swtich状态修改
4linuxfun Nov 11, 2022
4d5cee6
前端添加Auto-dict组件,用于数据字典的自动生成元素
4linuxfun Nov 11, 2022
ba84764
role调整匹配
4linuxfun Nov 11, 2022
9f4bc27
数据字典相关元素使用Auto-Dict自动生成
4linuxfun Nov 11, 2022
62e9529
update README.md
4linuxfun Nov 11, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
系统管理->数据字典:重置按钮生效
  • Loading branch information
4linuxfun committed Nov 10, 2022
commit d2d0468ba82ad503d7f62febd489bfb4851eb0c0
36 changes: 23 additions & 13 deletions www/src/views/system/dictonary/DictItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
<!-- 字典列表页面,用于显示、查询、新增、编辑字典元素-->
<el-row>
<el-row>
<el-form v-model="search" :inline="true">
<el-form-item label="名称">
<el-form :model="search" :inline="true" ref="searchRef">
<el-form-item label="名称" prop="name">
<el-input style="width: 100px" v-model="search.name"/>
</el-form-item>
<el-form-item label="状态">
<el-input style="width: 100px" v-model="search.enable"/>
<el-form-item label="状态" prop="enable">
<el-select v-model="search.enable" style="width: 100px">
<el-option label="正常" :value="true"/>
<el-option label="禁用" :value="false"/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSearch">
Expand All @@ -16,7 +19,10 @@
</el-icon>
搜索
</el-button>
<el-button>重置</el-button>
<el-button type="primary" @click="handleReset">
<el-icon>
<RefreshRight/>
</el-icon>重置</el-button>
</el-form-item>
</el-form>
</el-row>
Expand All @@ -35,13 +41,15 @@
<template #default="scope">
<el-button text type="primary"
class="item_button"
@click="handleEdit(scope.row)" :icon="Edit">编辑</el-button>
@click="handleEdit(scope.row)" :icon="Edit">编辑
</el-button>
<el-divider direction="vertical"/>
<el-popconfirm title="确定要删除此元素吗?" @confirm="handleDel(scope.row.id)">
<template #reference>
<el-button text type="danger"
class="item_button"
:icon="Delete">删除</el-button>
:icon="Delete">删除
</el-button>
</template>
</el-popconfirm>

Expand Down Expand Up @@ -71,16 +79,13 @@
const props = defineProps(['id'])
const addItemDialog = ref(false)
const selectItem = ref(null)
const searchRef = ref(null)

let searchForm = {
dict_id: props.id,
name: null,
data: null,
type: {
dict_id: 'eq',
name: 'like',
code: 'like',
}
enable: null
}


Expand Down Expand Up @@ -108,9 +113,14 @@
addItemDialog.value = true
}

function handleReset() {
searchRef.value.resetFields()
}

function handleEdit(dictItem) {
selectItem.value = dictItem
addItemDialog.value = true
console.log(search.value)
}

function handleDel(itemId) {
Expand All @@ -136,7 +146,7 @@
</script>

<style scoped>
.item_button{
.item_button {
padding: 0;
}
</style>
17 changes: 14 additions & 3 deletions www/src/views/system/dictonary/index.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<el-row>
<el-form inline :model="search">
<el-form inline :model="search" ref="searchRef">
<el-form-item label="字典名称" prop="name">
<el-input v-model="search.name"/>
</el-form-item>
Expand All @@ -9,7 +9,12 @@
</el-form-item>
<el-form-item>
<el-button type="primary" :icon="Search" @click="handleSearch">查询</el-button>
<el-button>重置</el-button>
<el-button type="primary" @click="handleReset">
<el-icon>
<RefreshRight/>
</el-icon>
重置
</el-button>
</el-form-item>
</el-form>
</el-row>
Expand Down Expand Up @@ -79,6 +84,7 @@
const itemDrawer = ref(false)
const dialogTitle = ref(null)
const selectDict = ref(null)
const searchRef = ref(null)

const searchForm = {
name: null,
Expand Down Expand Up @@ -110,6 +116,11 @@
addDialog.value = true
}

function handleReset() {
searchRef.value.resetFields()
handleSearch()
}

function handleEdit(dict) {
dialogTitle.value = '编辑数据字典'
selectDict.value = dict
Expand All @@ -129,7 +140,7 @@
</script>

<style scoped>
.custom_pagination{
.custom_pagination {
margin-top: 10px;
padding-left: 0;
}
Expand Down