Merge remote-tracking branch 'origin/dev-dictionary' into dev-dictionary
This commit is contained in:
XieYongHong
commit
1a0cb1d9c8
|
|
@ -14,7 +14,6 @@
|
|||
>
|
||||
新增字典
|
||||
</PermissionButton>
|
||||
<!-- <j-button type="primary" @click="showSave" style="width: 60%;">新增字典</j-button> -->
|
||||
<PermissionButton
|
||||
type="text"
|
||||
hasPermission="system/Dictionary:down"
|
||||
|
|
@ -22,7 +21,6 @@
|
|||
>
|
||||
下载
|
||||
</PermissionButton>
|
||||
<!-- <j-button type="text" @click="downVisible=true">下载</j-button> -->
|
||||
<j-upload
|
||||
:before-upload="beforeUpload"
|
||||
accept=".json"
|
||||
|
|
@ -44,10 +42,10 @@
|
|||
<div class="itemText"><Ellipsis style="width: calc(100%-100px)">{{ item.name }}</Ellipsis></div>
|
||||
<div @click="(e) => e.stopPropagation()">
|
||||
<j-popconfirm v-if="hasPermission('system/Dictionary:action')" :title="item.data.status === 1 ? '确定禁用？' : '确定启用？'" @confirm="()=>updateDic(item.data)">
|
||||
<j-switch v-model:checked="item.status" :disabled="!hasPermission('system/Dictionary:action')" :checkedValue="1" :unCheckedValue="0"></j-switch>
|
||||
<j-switch :checked="item.status" :disabled="!hasPermission('system/Dictionary:action')" :checkedValue="1" :unCheckedValue="0"></j-switch>
|
||||
</j-popconfirm>
|
||||
<j-tooltip v-else placement="top" title="暂无权限,请联系管理员">
|
||||
<j-switch v-model:checked="item.status" :disabled="!hasPermission('system/Dictionary:action')" :checkedValue="1" :unCheckedValue="0"></j-switch>
|
||||
<j-switch :checked="item.status" :disabled="!hasPermission('system/Dictionary:action')" :checkedValue="1" :unCheckedValue="0"></j-switch>
|
||||
</j-tooltip>
|
||||
<PermissionButton
|
||||
type="text"
|
||||
|
|
@ -59,9 +57,6 @@
|
|||
>
|
||||
删除
|
||||
</PermissionButton>
|
||||
<!-- <j-popconfirm title="确认删除？" @confirm="()=>deleteDic(item.id)">
|
||||
<j-button type="text">删除</j-button>
|
||||
</j-popconfirm> -->
|
||||
<PermissionButton
|
||||
type="text"
|
||||
hasPermission="system/Dictionary:update"
|
||||
|
|
@ -69,7 +64,6 @@
|
|||
>
|
||||
编辑
|
||||
</PermissionButton>
|
||||
<!-- <j-button type="text" @click="()=>showEdit(item.data)">编辑</j-button> -->
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -88,7 +82,6 @@ import Save from './save/index.vue'
|
|||
import { onlyMessage} from '@/utils/comm';
|
||||
import Export from './Export/index.vue'
|
||||
import { usePermissionStore } from '@/store/permission';
|
||||
import { first } from 'lodash-es';
|
||||
const emit = defineEmits(['selectData'])
|
||||
const hasPermission = usePermissionStore().hasPermission;
|
||||
const saveShow = ref(false)
|
||||
|
|
|
|||
|
|
@ -1,73 +1,57 @@
|
|||
<template>
|
||||
<div>
|
||||
<div class="des_head">
|
||||
<div>字典ID：<span>{{ data.id }}</span></div>
|
||||
<div>说明：<span>{{ data.describe }}</span></div>
|
||||
<div>创建日期：<span>{{ data.name }}</span></div>
|
||||
</div>
|
||||
<div class="contain">
|
||||
<pro-search
|
||||
:columns="columns"
|
||||
@search="handleSearch"
|
||||
/>
|
||||
<JProTable :columns="columns"
|
||||
model="TABLE"
|
||||
:request="queryItem"
|
||||
:params="params"
|
||||
ref="tableRef"
|
||||
>
|
||||
<template #headerTitle>
|
||||
<PermissionButton
|
||||
type="primary"
|
||||
@click="add"
|
||||
hasPermission="system/Dictionary:add"
|
||||
>
|
||||
<div>
|
||||
<div class="des_head">
|
||||
<div>字典ID：<span>{{ data.id }}</span></div>
|
||||
<div>说明：<span>{{ data.describe }}</span></div>
|
||||
<div>创建日期：<span> {{
|
||||
dayjs(
|
||||
data?.createTime,
|
||||
).format(
|
||||
'YYYY-MM-DD HH:mm:ss',
|
||||
)
|
||||
}}</span></div>
|
||||
</div>
|
||||
<div class="contain">
|
||||
<pro-search :columns="columns" @search="handleSearch" />
|
||||
<JProTable :columns="columns" model="TABLE" :request="queryItem" :params="params" ref="tableRef">
|
||||
<template #headerTitle>
|
||||
<PermissionButton type="primary" @click="add" hasPermission="system/Dictionary:add">
|
||||
新增
|
||||
</PermissionButton>
|
||||
</template>
|
||||
<template #action="slotProps">
|
||||
</template>
|
||||
<template #action="slotProps">
|
||||
<j-space>
|
||||
<template
|
||||
v-for="i in getActions(slotProps, 'table')"
|
||||
:key="i.key"
|
||||
>
|
||||
<PermissionButton
|
||||
:disabled="i.disabled"
|
||||
:popConfirm="i.popConfirm"
|
||||
:tooltip="{
|
||||
...i.tooltip,
|
||||
}"
|
||||
@click="i.onClick"
|
||||
type="link"
|
||||
style="padding: 0 5px"
|
||||
:danger="i.key === 'delete'"
|
||||
:hasPermission="
|
||||
'system/Dictionary:' + i.key
|
||||
"
|
||||
>
|
||||
<template #icon
|
||||
><AIcon :type="i.icon"
|
||||
/></template>
|
||||
<template v-for="i in getActions(slotProps, 'table')" :key="i.key">
|
||||
<PermissionButton :disabled="i.disabled" :popConfirm="i.popConfirm" :tooltip="{
|
||||
...i.tooltip,
|
||||
}" @click="i.onClick" type="link" style="padding: 0 5px" :danger="i.key === 'delete'"
|
||||
:hasPermission="'system/Dictionary:' + i.key
|
||||
">
|
||||
<template #icon>
|
||||
<AIcon :type="i.icon" />
|
||||
</template>
|
||||
</PermissionButton>
|
||||
</template>
|
||||
</j-space>
|
||||
</template>
|
||||
</JProTable>
|
||||
</JProTable>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<Save v-if="saveVisible" :dicId='data.id' :type="modalType" :data="current" :sort=sort @closeModal="closeModal" @refresh="refresh"/>
|
||||
<Save v-if="saveVisible" :dicId='data.id' :type="modalType" :data="current" :sort=sort @closeModal="closeModal"
|
||||
@refresh="refresh" />
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { queryDicItem ,deleteDicItem } from '@/api/system/dictionary'
|
||||
import { queryDicItem, deleteDicItem } from '@/api/system/dictionary'
|
||||
import Save from './Save/index.vue'
|
||||
import type { ActionsType } from './typings';
|
||||
import { onlyMessage } from '@/utils/comm';
|
||||
import { cloneDeep } from 'lodash-es';
|
||||
import dayjs from 'dayjs';
|
||||
const props = defineProps({
|
||||
data:{
|
||||
type:Object,
|
||||
default:{}
|
||||
data: {
|
||||
type: Object,
|
||||
default: {}
|
||||
},
|
||||
})
|
||||
const params = ref()
|
||||
|
|
@ -78,20 +62,20 @@ const modalType = ref('add')
|
|||
const current = ref()
|
||||
const columns = [
|
||||
{
|
||||
title:'序号',
|
||||
dataIndex:'ordinal',
|
||||
key:'ordinal',
|
||||
search:{
|
||||
type:'number'
|
||||
title: '序号',
|
||||
dataIndex: 'ordinal',
|
||||
key: 'ordinal',
|
||||
search: {
|
||||
type: 'number'
|
||||
}
|
||||
},
|
||||
{
|
||||
title: 'name',
|
||||
dataIndex: 'name',
|
||||
key: 'name',
|
||||
key: 'name',
|
||||
ellipsis: true,
|
||||
search:{
|
||||
type:'string'
|
||||
search: {
|
||||
type: 'string'
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -99,8 +83,8 @@ const columns = [
|
|||
dataIndex: 'value',
|
||||
key: 'value',
|
||||
ellipsis: true,
|
||||
search:{
|
||||
type:'string'
|
||||
search: {
|
||||
type: 'string'
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -108,13 +92,13 @@ const columns = [
|
|||
dataIndex: 'text',
|
||||
key: 'text',
|
||||
ellipsis: true,
|
||||
search:{
|
||||
type:'string'
|
||||
search: {
|
||||
type: 'string'
|
||||
}
|
||||
},{
|
||||
title:'操作',
|
||||
dataIndex:'action',
|
||||
key:'action',
|
||||
}, {
|
||||
title: '操作',
|
||||
dataIndex: 'action',
|
||||
key: 'action',
|
||||
scopedSlots: true,
|
||||
}
|
||||
];
|
||||
|
|
@ -142,18 +126,18 @@ const getActions = (
|
|||
key: 'delete',
|
||||
text: '删除',
|
||||
tooltip: {
|
||||
title:'删除',
|
||||
title: '删除',
|
||||
},
|
||||
popConfirm: {
|
||||
title: '确认删除?',
|
||||
onConfirm: async () => {
|
||||
const res = await deleteDicItem(data.id)
|
||||
if(res.status ===200){
|
||||
onlyMessage('操作成功!')
|
||||
tableRef.value.reload()
|
||||
}else{
|
||||
onlyMessage('操作失败!','error')
|
||||
}
|
||||
const res = await deleteDicItem(data.id)
|
||||
if (res.status === 200) {
|
||||
onlyMessage('操作成功!')
|
||||
tableRef.value.reload()
|
||||
} else {
|
||||
onlyMessage('操作失败!', 'error')
|
||||
}
|
||||
},
|
||||
},
|
||||
icon: 'DeleteOutlined',
|
||||
|
|
@ -163,73 +147,74 @@ const getActions = (
|
|||
return actions.filter((i: ActionsType) => i.key !== 'view');
|
||||
return actions;
|
||||
};
|
||||
const add = () =>{
|
||||
const add = () => {
|
||||
modalType.value = 'add'
|
||||
current.value = {}
|
||||
saveVisible.value = true
|
||||
}
|
||||
|
||||
const closeModal = () =>{
|
||||
const closeModal = () => {
|
||||
saveVisible.value = false
|
||||
}
|
||||
const handleSearch = (i:any)=>{
|
||||
const handleSearch = (i: any) => {
|
||||
params.value = i
|
||||
}
|
||||
const refresh = () =>{
|
||||
const refresh = () => {
|
||||
saveVisible.value = false
|
||||
tableRef.value.reload()
|
||||
}
|
||||
const queryItem =async(_params:any)=>{
|
||||
const queryItem = async (_params: any) => {
|
||||
if (props.data?.id) {
|
||||
const params = {
|
||||
..._params,
|
||||
sorts: [{ name: 'createTime', order: 'desc' }],
|
||||
terms: [
|
||||
..._params.terms,
|
||||
{
|
||||
column: 'dictId',
|
||||
termType: 'eq',
|
||||
value: props.data?.id
|
||||
},
|
||||
],
|
||||
};
|
||||
const resp: any = await queryDicItem(params);
|
||||
if(resp.status===200){
|
||||
const arr = cloneDeep(resp.result.data)
|
||||
arr?.sort((a:any,b:any)=>{
|
||||
return b.ordinal - a.ordinal
|
||||
})
|
||||
sort.value =arr.length ? arr[0].ordinal + 1 : 1
|
||||
return {
|
||||
const params = {
|
||||
..._params,
|
||||
sorts: [{ name: 'createTime', order: 'desc' }],
|
||||
terms: [
|
||||
..._params.terms,
|
||||
{
|
||||
column: 'dictId',
|
||||
termType: 'eq',
|
||||
value: props.data?.id
|
||||
},
|
||||
],
|
||||
};
|
||||
const resp: any = await queryDicItem(params);
|
||||
if (resp.status === 200) {
|
||||
const arr = cloneDeep(resp.result.data)
|
||||
arr?.sort((a: any, b: any) => {
|
||||
return b.ordinal - a.ordinal
|
||||
})
|
||||
sort.value = arr.length ? arr[0].ordinal + 1 : 1
|
||||
return {
|
||||
code: resp.status,
|
||||
result: resp.result,
|
||||
status: resp.status,
|
||||
};
|
||||
}
|
||||
} else {
|
||||
sort.value= 1
|
||||
return {
|
||||
code: 200,
|
||||
result: {
|
||||
data: [],
|
||||
pageIndex: 0,
|
||||
pageSize: 0,
|
||||
total: 0,
|
||||
},
|
||||
status: 200,
|
||||
};
|
||||
}
|
||||
} else {
|
||||
sort.value = 1
|
||||
return {
|
||||
code: 200,
|
||||
result: {
|
||||
data: [],
|
||||
pageIndex: 0,
|
||||
pageSize: 0,
|
||||
total: 0,
|
||||
},
|
||||
status: 200,
|
||||
};
|
||||
}
|
||||
watch(()=>props?.data?.id,()=>{
|
||||
}
|
||||
watch(() => props?.data?.id, () => {
|
||||
tableRef.value.reload()
|
||||
})
|
||||
</script>
|
||||
<style lang="less" scoped>
|
||||
.des_head{
|
||||
.des_head {
|
||||
padding: 10px 20px;
|
||||
background-color: rgb(242, 242, 242);
|
||||
span{
|
||||
color:rgb(127, 127, 127)
|
||||
|
||||
span {
|
||||
color: rgb(127, 127, 127)
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -5,17 +5,16 @@
|
|||
<AIcon type="SearchOutlined" @click="search" />
|
||||
</template>
|
||||
</j-input>
|
||||
<div class="controls">
|
||||
<PermissionButton
|
||||
type="primary"
|
||||
hasPermission="system/Dictionary:add"
|
||||
@click="addGroup"
|
||||
style="width: 100%"
|
||||
<div class="controls" v-if="admin">
|
||||
<j-button
|
||||
type="primary"
|
||||
@click="addGroup"
|
||||
style="width: 100%"
|
||||
>
|
||||
新增分组
|
||||
</PermissionButton>
|
||||
</j-button>
|
||||
</div>
|
||||
<div>
|
||||
<div class="listBox">
|
||||
<j-tree :tree-data="listData" v-if="listData.length" :fieldNames="{title:'name',key:'id'}" blockNode :selectedKeys="selectedKeys">
|
||||
<template #title="item">
|
||||
<div class="treeItem" @click="()=>selectGroup(item.data.id)" v-if="!item.data?.edit">
|
||||
|
|
@ -31,6 +30,7 @@
|
|||
title: `确定要删除？`,
|
||||
onConfirm: () => deleteGroup(item.id),
|
||||
}"
|
||||
:disabled="item.id === 'default_group'"
|
||||
>
|
||||
删除
|
||||
</PermissionButton>
|
||||
|
|
@ -38,6 +38,7 @@
|
|||
type="text"
|
||||
hasPermission="system/Role:update"
|
||||
@click="editGroup(item.data)"
|
||||
:disabled="item.id === 'default_group'"
|
||||
>
|
||||
编辑
|
||||
</PermissionButton>
|
||||
|
|
@ -45,7 +46,6 @@
|
|||
</div>
|
||||
<div v-else>
|
||||
<j-input v-model:value="addName" @blur="()=>saveGroup(item.data)" ref="inputRef" :maxlength="64"></j-input>
|
||||
<div style="color: red;" v-if="validateTip">分组名称不能为空</div>
|
||||
</div>
|
||||
</template>
|
||||
</j-tree>
|
||||
|
|
@ -56,15 +56,22 @@
|
|||
|
||||
<script lang="ts" setup>
|
||||
import { onlyMessage } from '@/utils/comm';
|
||||
import { queryRoleGroup , saveRoleGroup , deleteRoleGroup } from '@/api/system/role'
|
||||
import { randomString } from '@/utils/utils'
|
||||
import { queryRoleGroup , saveRoleGroup , deleteRoleGroup } from '@/api/system/role';
|
||||
import { randomString } from '@/utils/utils';
|
||||
import { useUserInfo } from '@/store/userInfo';
|
||||
import { storeToRefs } from 'pinia';
|
||||
const emit = defineEmits(['selectData'])
|
||||
const userInfoStore = useUserInfo()
|
||||
const { userInfos } = storeToRefs(userInfoStore)
|
||||
const admin = computed(() => {
|
||||
return userInfos.value?.username === 'admin';
|
||||
})
|
||||
const listData:any = ref([])
|
||||
const selectedKeys = ref<string[]>([])
|
||||
const searchValue = ref()
|
||||
const inputRef = ref()
|
||||
const validateTip = ref()
|
||||
const addName = ref()
|
||||
const addStatus = ref(false) // 新增分组状态
|
||||
const queryGroup = async(select?:Boolean,searchName?:string) =>{
|
||||
const params = searchName ? {sorts: [{ name: 'createTime', order: 'desc' }],terms:[{terms:[{value:'%'+ searchName +'%',termType:'like',column:'name'}]}]} : {sorts: [{ name: 'createTime', order: 'desc' }]}
|
||||
const req:any = await queryRoleGroup(params)
|
||||
|
|
@ -77,7 +84,7 @@ const queryGroup = async(select?:Boolean,searchName?:string) =>{
|
|||
}
|
||||
const addGroup = () =>{
|
||||
addName.value = ''
|
||||
listData.value.push({
|
||||
listData.value.unshift({
|
||||
name:'',
|
||||
edit:true,
|
||||
id: randomString()
|
||||
|
|
@ -88,9 +95,8 @@ const addGroup = () =>{
|
|||
}
|
||||
const saveGroup = async(data:any) =>{
|
||||
if(addName.value === ''){
|
||||
validateTip.value = true
|
||||
listData.value.shift()
|
||||
}else{
|
||||
validateTip.value = false
|
||||
const saveData = {
|
||||
name:addName.value,
|
||||
id:data.id
|
||||
|
|
@ -103,6 +109,7 @@ const saveGroup = async(data:any) =>{
|
|||
onlyMessage('操作失败!')
|
||||
}
|
||||
}
|
||||
addStatus.value = false
|
||||
}
|
||||
const search = () =>{
|
||||
queryGroup(true,searchValue.value)
|
||||
|
|
@ -152,4 +159,7 @@ onMounted(()=>{
|
|||
max-width:40%
|
||||
}
|
||||
}
|
||||
.listBox{
|
||||
margin: 10px 0;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -94,10 +94,11 @@
|
|||
: '删除',
|
||||
}"
|
||||
:popConfirm="{
|
||||
title: `确认删除`,
|
||||
title:slotProps?.type?.id === 'application' ? '此操作将同步删除对应的第三方配置，确认删除?':'确认删除',
|
||||
onConfirm: () =>
|
||||
table.clickDel(slotProps.id),
|
||||
}"
|
||||
|
||||
:disabled="slotProps.status"
|
||||
>
|
||||
<AIcon type="DeleteOutlined" />
|
||||
|
|
@ -215,7 +216,7 @@ const columns = [
|
|||
dataIndex: 'action',
|
||||
key: 'action',
|
||||
fixed: 'right',
|
||||
width: 150,
|
||||
width: 200,
|
||||
scopedSlots: true,
|
||||
},
|
||||
];
|
||||
|
|
|
|||
Loading…
Reference in New Issue