完善字典,基本功能完成,下一步,菜单

main
expressgy 3 months ago
parent eff6f9626f
commit b05d6e16ad
  1. 6
      src/api/http.js
  2. 3
      src/views/Auth/Dict/DictTable.vue
  3. 37
      src/views/Auth/Dict/index.vue

@ -48,6 +48,7 @@ service.interceptors.request.use(
} else if (config.url === '/authUser/sign/refresh') { } else if (config.url === '/authUser/sign/refresh') {
// ! 刷新Token请求,传入RefreshToken // ! 刷新Token请求,传入RefreshToken
config.headers.Authorization = `Bearer ${systemStore.state.refreshToken}`; config.headers.Authorization = `Bearer ${systemStore.state.refreshToken}`;
config.isRefresh = true;
} else { } else {
if (isExpired) { if (isExpired) {
// ! 等待刷新token后放行 // ! 等待刷新token后放行
@ -73,6 +74,11 @@ service.interceptors.response.use(
// ! 正常响应,返回数据 // ! 正常响应,返回数据
return data.data; return data.data;
} else if (data.statusCode === 403) { } else if (data.statusCode === 403) {
if(response.config.isRefresh === true){
systemStore.goBackSignin();
window.pino.fatal('RefreshToken过期');
return
}
// ! WARN ============================================ // ! WARN ============================================
window.pino.error('Token过期'); window.pino.error('Token过期');

@ -49,7 +49,7 @@ const tableColumnObject = {
dictIcon: { dictIcon: {
title: '字典图标', title: '字典图标',
dataIndex: 'dictIcon', dataIndex: 'dictIcon',
customRender: ({ text, record, index, column }) => (text ? h(IconPool[text], { style: { fontSize: '20px' } }) : null), customRender: ({ text, record, index, column }) => (text && IconPool[text] ? h(IconPool[text], { style: { fontSize: '20px' } }) : h('div', text)),
key: 'dictIcon', key: 'dictIcon',
}, },
dictType: { dictType: {
@ -74,6 +74,7 @@ const tableColumnObject = {
dataIndex: 'createtime', dataIndex: 'createtime',
key: 'createtime', key: 'createtime',
width: '140px', width: '140px',
sorter: true,
}, },
createName: { createName: {
title: '创建人', title: '创建人',

@ -51,7 +51,7 @@ const formData = reactive({
const tableData = reactive({ const tableData = reactive({
dataSource: [], dataSource: [],
methods: { methods: {
handleTableChange: () => {}, handleTableChange,
handleRemoveAck, handleRemoveAck,
handleUpdate, handleUpdate,
}, },
@ -89,6 +89,7 @@ async function handleCreateAck(data) {
clearSearchData(); clearSearchData();
clearFormData(); clearFormData();
getPage(); getPage();
baseDataStore.getDictList();
} }
// ! // !
async function handleRemoveAck(data) { async function handleRemoveAck(data) {
@ -98,6 +99,7 @@ async function handleRemoveAck(data) {
tableData.pageInfo.pageNumber--; tableData.pageInfo.pageNumber--;
} }
getPage(); getPage();
baseDataStore.getDictList();
} }
// ! // !
async function handleUpdate(data) { async function handleUpdate(data) {
@ -122,6 +124,7 @@ async function handleUpdateAck(data) {
Message.success('更新字典成功!'); Message.success('更新字典成功!');
clearFormData(); clearFormData();
getPage(); getPage();
baseDataStore.getDictList();
} }
// ! // !
watch(tableData.pageInfo, () => { watch(tableData.pageInfo, () => {
@ -137,11 +140,20 @@ watch(tableData.pageInfo, () => {
}); });
// ! // !
async function getPage() { async function getPage() {
baseDataStore.getDictList();
const resd = await CoreDict.getDict(tableData.pageInfo); const resd = await CoreDict.getDict(tableData.pageInfo);
tableData.dataSource = resd.rowData; tableData.dataSource = resd.rowData;
tableData.total = Number(resd.total); tableData.total = Number(resd.total);
} }
// !
function handleTableChange(page, filter, sorter){
if (sorter.order == 'ascend') {
tableData.pageInfo.isAsc = true;
} else if (sorter.order == 'descend') {
tableData.pageInfo.isAsc = false;
} else {
tableData.pageInfo.isAsc = undefined;
}
}
// ! // !
const handlePageChange = (page, pageSize) => { const handlePageChange = (page, pageSize) => {
tableData.pageInfo.pageSize = pageSize; tableData.pageInfo.pageSize = pageSize;
@ -150,17 +162,15 @@ const handlePageChange = (page, pageSize) => {
}; };
// ! // !
function clearSearchData() { function clearSearchData() {
tableData.pageInfo = { tableData.pageInfo.pageSize=10;
pageSize: 10, tableData.pageInfo.pageNumber= 1;
pageNumber: 1, tableData.pageInfo.isList= false;
isList: false, tableData.pageInfo.isAsc= false;
isAsc: false, tableData.pageInfo.dictInfo= undefined;
dictInfo: undefined, tableData.pageInfo.dictType=undefined;
dictType: undefined, tableData.pageInfo.root=undefined;
root: undefined, tableData.pageInfo.serviceKey=undefined;
serviceKey: undefined, tableData.pageInfo.status=undefined;
status: undefined,
};
} }
// ! // !
function clearFormData() { function clearFormData() {
@ -180,6 +190,7 @@ function clearFormData() {
formData.formData.orderNum = 0; formData.formData.orderNum = 0;
} }
onMounted(() => { onMounted(() => {
baseDataStore.getDictList();
getPage(); getPage();
if (baseDataStore.state.serviceList.length == 0) { if (baseDataStore.state.serviceList.length == 0) {
baseDataStore.getServiceList(); baseDataStore.getServiceList();

Loading…
Cancel
Save