Merge remote-tracking branch 'origin/master'

This commit is contained in:
猿小天
2023-02-20 23:00:03 +08:00
6 changed files with 358 additions and 594 deletions

View File

@@ -30,242 +30,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
meta: { meta: {
isKeepAlive: true, isKeepAlive: true,
}, },
children: [ children: [],
{
path: '/home',
name: 'home',
component: () => import('/@/views/system/home/index.vue'),
meta: {
title: 'message.router.home',
isLink: '',
isHide: false,
isKeepAlive: true,
isAffix: true,
isIframe: false,
roles: ['admin', 'common'],
icon: 'iconfont icon-shouye',
},
},
{
path: '/system',
name: 'system',
component: () => import('/@/layout/routerView/parent.vue'),
redirect: '/system',
meta: {
title: 'message.router.system',
isLink: '',
isHide: false,
isKeepAlive: true,
isAffix: false,
isIframe: false,
roles: ['admin'],
icon: 'iconfont icon-xitongshezhi',
},
children: [
{
path: '/system/menu',
name: 'systemMenu',
component: () => import('/@/views/system/menu/index.vue'),
meta: {
title: 'message.router.systemMenu',
isLink: '',
isHide: false,
isKeepAlive: true,
isAffix: false,
isIframe: false,
roles: ['admin'],
icon: 'iconfont icon-caidan',
},
},
{
path: '/system/role',
name: 'systemRole',
component: () => import('/@/views/system/role/index.vue'),
meta: {
title: 'message.router.systemRole',
isLink: '',
isHide: false,
isKeepAlive: true,
isAffix: false,
isIframe: false,
roles: ['admin'],
icon: 'ele-ColdDrink',
},
},
{
path: '/system/user',
name: 'systemUser',
component: () => import('/@/views/system/user/index.vue'),
meta: {
title: 'message.router.systemUser',
isLink: '',
isHide: false,
isKeepAlive: true,
isAffix: false,
isIframe: false,
roles: ['admin'],
icon: 'iconfont icon-icon-',
},
},
{
path: '/system/dept',
name: 'systemDept',
component: () => import('/@/views/system/dept/index.vue'),
meta: {
title: 'message.router.systemDept',
isLink: '',
isHide: false,
isKeepAlive: true,
isAffix: false,
isIframe: false,
roles: ['admin'],
icon: 'ele-OfficeBuilding',
},
},
{
path: '/system/apiWhiteList',
name: 'apiWhiteList',
component: () => import('/@/views/system/apiWhiteList/index.vue'),
meta: {
title: 'message.router.systemApiWhiteList',
isLink: '',
isHide: false,
isKeepAlive: true,
isAffix: false,
isIframe: false,
roles: ['admin'],
icon: 'ele-SetUp',
},
},
],
},
{
path: '/config',
name: 'config',
component: () => import('/@/layout/routerView/parent.vue'),
redirect: '/config/menu',
meta: {
title: 'message.router.config',
isLink: '',
isHide: false,
isKeepAlive: true,
isAffix: false,
isIframe: false,
roles: ['admin'],
icon: 'iconfont icon-configure',
},
children: [
{
path: '/system/configSystem',
name: 'configSystem',
component: () => import('/@/views/system/dept/index.vue'),
meta: {
title: 'message.router.configSystem',
isLink: '',
isHide: false,
isKeepAlive: true,
isAffix: false,
isIframe: false,
roles: ['admin'],
icon: 'iconfont icon-system',
},
},
{
path: '/system/dict',
name: 'configDict',
component: () => import('/@/views/system/dic/index.vue'),
meta: {
title: 'message.router.configDict',
isLink: '',
isHide: false,
isKeepAlive: true,
isAffix: false,
isIframe: false,
roles: ['admin'],
icon: 'iconfont icon-dict',
},
},
{
path: '/system/area',
name: 'configArea',
component: () => import('/@/views/system/dic/index.vue'),
meta: {
title: 'message.router.configArea',
isLink: '',
isHide: false,
isKeepAlive: true,
isAffix: false,
isIframe: false,
roles: ['admin'],
icon: 'iconfont icon-Area',
},
},
{
path: '/system/file',
name: 'configFile',
component: () => import('/@/views/system/dic/index.vue'),
meta: {
title: 'message.router.configFile',
isLink: '',
isHide: false,
isKeepAlive: true,
isAffix: false,
isIframe: false,
roles: ['admin'],
icon: 'iconfont icon-file',
},
},
],
},
{
path: '/log',
name: 'log',
component: () => import('/@/layout/routerView/parent.vue'),
redirect: '/log/loginLog',
meta: {
title: 'message.router.log',
isLink: '',
isHide: false,
isKeepAlive: true,
isAffix: false,
isIframe: false,
roles: ['admin'],
icon: 'iconfont icon-rizhi',
},
children: [
{
path: '/log/loginLog',
name: 'loginLog',
component: () => import('/@/views/system/dic/index.vue'),
meta: {
title: 'message.router.loginLog',
isLink: '',
isHide: false,
isKeepAlive: true,
isAffix: false,
isIframe: false,
roles: ['admin'],
icon: 'iconfont icon-guanlidenglurizhi',
},
},
{
path: '/log/operationLog',
name: 'operationLog',
component: () => import('/@/views/system/dic/index.vue'),
meta: {
title: 'message.router.operationLog',
isLink: '',
isHide: false,
isKeepAlive: true,
isAffix: false,
isIframe: false,
roles: ['admin'],
icon: 'iconfont icon-caozuorizhi',
},
},
],
},
],
}, },
]; ];

View File

@@ -1,11 +1,11 @@
import axios from "axios"; import axios from 'axios';
import { get } from "lodash-es"; import { get } from 'lodash-es';
// @ts-ignore // @ts-ignore
import { errorLog, errorCreate } from "./tools.ts"; import { errorLog, errorCreate } from './tools.ts';
// import { env } from "/src/utils/util.env"; // import { env } from "/src/utils/util.env";
// import { useUserStore } from "../store/modules/user"; // import { useUserStore } from "../store/modules/user";
import { Local, Session } from '/@/utils/storage'; import { Local, Session } from '/@/utils/storage';
import qs from "qs"; import qs from 'qs';
/** /**
* @description 创建请求实例 * @description 创建请求实例
*/ */
@@ -31,13 +31,17 @@ function createService() {
// 响应拦截 // 响应拦截
service.interceptors.response.use( service.interceptors.response.use(
(response) => { (response) => {
if (response.config.responseType === "blob") { if (response.config.responseType === 'blob') {
return response; return response;
} }
// dataAxios 是 axios 返回数据中的 data // dataAxios 是 axios 返回数据中的 data
const dataAxios = response.data; const dataAxios = response.data;
// 这个状态码是和后端约定的 // 这个状态码是和后端约定的
const { code } = dataAxios; const { code } = dataAxios;
// swagger判断
if (dataAxios.swagger != undefined) {
return dataAxios;
}
// 根据 code 进行判断 // 根据 code 进行判断
if (code === undefined) { if (code === undefined) {
// 如果没有 code 代表这不是项目后端开发的接口 // 如果没有 code 代表这不是项目后端开发的接口
@@ -50,9 +54,9 @@ function createService() {
Local.clear(); Local.clear();
Session.clear(); Session.clear();
window.location.reload(); window.location.reload();
dataAxios.msg = "登录授权过期,请重新登录"; dataAxios.msg = '登录授权过期,请重新登录';
errorCreate(`${dataAxios.msg}: ${response.config.url}`); errorCreate(`${dataAxios.msg}: ${response.config.url}`);
break break;
case 2000: case 2000:
// @ts-ignore // @ts-ignore
if (response.config.unpack === false) { if (response.config.unpack === false) {
@@ -68,40 +72,40 @@ function createService() {
} }
}, },
(error) => { (error) => {
const status = get(error, "response.status"); const status = get(error, 'response.status');
switch (status) { switch (status) {
case 400: case 400:
error.message = "请求错误"; error.message = '请求错误';
break; break;
case 401: case 401:
error.message = "未授权,请登录"; error.message = '未授权,请登录';
break; break;
case 403: case 403:
error.message = "拒绝访问"; error.message = '拒绝访问';
break; break;
case 404: case 404:
error.message = `请求地址出错: ${error.response.config.url}`; error.message = `请求地址出错: ${error.response.config.url}`;
break; break;
case 408: case 408:
error.message = "请求超时"; error.message = '请求超时';
break; break;
case 500: case 500:
error.message = "服务器内部错误"; error.message = '服务器内部错误';
break; break;
case 501: case 501:
error.message = "服务未实现"; error.message = '服务未实现';
break; break;
case 502: case 502:
error.message = "网关错误"; error.message = '网关错误';
break; break;
case 503: case 503:
error.message = "服务不可用"; error.message = '服务不可用';
break; break;
case 504: case 504:
error.message = "网关超时"; error.message = '网关超时';
break; break;
case 505: case 505:
error.message = "HTTP版本不受支持"; error.message = 'HTTP版本不受支持';
break; break;
default: default:
break; break;
@@ -125,15 +129,15 @@ function createRequestFunction(service: any) {
return function (config: any) { return function (config: any) {
const configDefault = { const configDefault = {
headers: { headers: {
"Content-Type": get(config, "headers.Content-Type", "application/json") 'Content-Type': get(config, 'headers.Content-Type', 'application/json'),
}, },
timeout: 5000, timeout: 5000,
baseURL: import.meta.env.VITE_API_URL as any, baseURL: import.meta.env.VITE_API_URL as any,
data: {} data: {},
}; };
// const token = userStore.getToken; // const token = userStore.getToken;
const token = Session.get('token') const token = Session.get('token');
if (token != null) { if (token != null) {
// @ts-ignore // @ts-ignore
configDefault.headers.Authorization = 'JWT ' + token; configDefault.headers.Authorization = 'JWT ' + token;
@@ -149,4 +153,3 @@ export const request = createRequestFunction(service);
// 用于模拟网络请求的实例和请求方法 // 用于模拟网络请求的实例和请求方法
export const serviceForMock = createService(); export const serviceForMock = createService();
export const requestForMock = createRequestFunction(serviceForMock); export const requestForMock = createRequestFunction(serviceForMock);

View File

@@ -1,222 +0,0 @@
import { CrudExpose, CrudOptions, AddReq, DelReq, EditReq, dict } from '@fast-crud/fast-crud';
import _ from 'lodash-es';
import {h} from 'vue';
import {tabBarProps} from "element-plus";
interface CreateCrudOptionsTypes {
crudOptions: CrudOptions;
}
//此处为crudOptions配置
export const createCrudOptions = function ({crudExpose}: {crudExpose: CrudExpose}): CreateCrudOptionsTypes {
//本地模拟后台crud接口方法 ----开始
const records = [
{
id: 1,
modifier_name: '超级管理员',
creator_name: '超级管理员',
create_datetime: '2022-05-24 13:43:21',
update_datetime: '2022-05-31 02:09:01',
description: 'null1111111',
modifier: '1',
dept_belong_id: '1',
url: '/api/system/dept_lazy_tree/',
method: 0,
enable_datasource: true,
creator: 1,
},
{
id: 2,
modifier_name: '超级管理员',
creator_name: '超级管理员',
create_datetime: '2022-05-24 13:43:21',
update_datetime: '2022-05-31 02:09:01',
description: 'null22222',
modifier: '1',
dept_belong_id: '1',
url: '/api/system/dept_lazy_tree/',
method: 3,
enable_datasource: false,
creator: 1,
},
];
const pageRequest = async (query: any) => {
return {
records,
currentPage: 1,
pageSize: 20,
total: records.length,
};
};
const editRequest = async (req: EditReq) => {
const target = _.find(records, (item) => {
return req.row.id === item.id;
});
_.merge(target, req.form);
return target;
};
const delRequest = async (req: DelReq) => {
_.remove(records, (item) => {
return item.id === req.row.id;
});
};
const addRequest = async (req: AddReq) => {
const maxRecord = _.maxBy(records, (item) => {
return item.id;
});
req.form.id = (maxRecord?.id || 0) + 1;
records.push(req.form);
return req.form;
};
//本地模拟后台crud接口方法 ----结束
return {
crudOptions: {
request: {
pageRequest,
addRequest,
editRequest,
delRequest,
},
rowHandle: {
buttons: {
view: { show: false },
},
},
form: {
labelWidth: '120px',
wrapper: {
is: 'el-dialog',
width: '600px',
},
},
columns: {
_index: {
title: '序号',
form: { show: false },
column: {
//type: 'index',
align: 'center',
width: '70px',
columnSetDisabled: true, //禁止在列设置中选择
formatter: (context) => {
//计算序号,你可以自定义计算规则,此处为翻页累加
let index = context.index ?? 1;
let pagination = crudExpose.crudBinding.value.pagination;
return ((pagination.currentPage ?? 1) - 1) * pagination.pageSize + index + 1;
},
},
},
search: {
title: '关键词',
column: { show: false },
type: 'text',
search: { show: true },
form: {
show: false,
component: {
placeholder: '输入关键词搜索',
},
},
},
id: {
title: 'ID',
type: 'text',
column: { show: false },
search: { show: false },
form: { show: false },
},
method: {
title: '请求方式',
type: 'dict-select',
search: { show: true },
dict: dict({
data: [
{
label: 'GET',
value: 0,
color: null,
},
{
label: 'POST',
value: 1,
color: null,
},
{
label: 'PUT',
value: 2,
color: null,
},
{
label: 'DELETE',
value: 3,
color: null,
},
],
}),
form: {
component: {
maxlength: 20,
},
},
column: {
sortable: true,
},
},
url: {
title: '接口地址',
type: 'text',
search: { show: false },
form: {
col: { span: 24 },
helper: {
render() {
return <el-tag>使,:/api/xx/.*?/</el-tag>
},
},
component: {
maxlength: 20,
},
},
column: {
sortable: true,
},
},
enable_datasource: {
title: '数据权限认证',
search: { show: true },
type: 'dict-radio',
dict: dict({
data: [
{
label: '启用',
value: true,
color: 'success',
},
{
label: '禁用',
value: false,
color: 'danger',
},
],
}),
form: {
component: {
maxlength: 20,
},
},
},
description: {
title: '备注',
type: 'textarea',
search: { show: false },
form: {
col: { span: 24 },
component: {
maxlength: 200,
},
},
},
},
},
};
};

View File

@@ -0,0 +1,41 @@
import { request } from '/@/utils/service';
import { PageQuery, AddReq, DelReq, EditReq, InfoReq } from '@fast-crud/fast-crud';
export const apiPrefix = '/api/system/api_white_list/';
export function GetList(query: PageQuery) {
return request({
url: apiPrefix,
method: 'get',
data: query,
});
}
export function GetObj(id: InfoReq) {
return request({
url: apiPrefix + id,
method: 'get',
});
}
export function AddObj(obj: AddReq) {
return request({
url: apiPrefix,
method: 'post',
data: obj,
});
}
export function UpdateObj(obj: EditReq) {
return request({
url: apiPrefix + obj.id + '/',
method: 'put',
data: obj,
});
}
export function DelObj(id: DelReq) {
return request({
url: apiPrefix + id + '/',
method: 'delete',
data: { id },
});
}

View File

@@ -0,0 +1,184 @@
import * as api from './api';
import { dict, PageQuery, AddReq, DelReq, EditReq, CrudExpose, CrudOptions } from '@fast-crud/fast-crud';
import { request } from '/@/utils/service';
import { dictionary } from '/@/utils/dictionary';
interface CreateCrudOptionsTypes {
crudOptions: CrudOptions;
}
export const createCrudOptions = function ({ crudExpose }: { crudExpose: CrudExpose }): CreateCrudOptionsTypes {
const pageRequest = async (query: PageQuery) => {
return await api.GetList(query);
};
const editRequest = async ({ form, row }: EditReq) => {
form.id = row.id;
return await api.UpdateObj(form);
};
const delRequest = async ({ row }: DelReq) => {
return await api.DelObj(row.id);
};
const addRequest = async ({ form }: AddReq) => {
return await api.AddObj(form);
};
return {
crudOptions: {
request: {
pageRequest,
addRequest,
editRequest,
delRequest,
},
columns: {
_index: {
title: '序号',
form: { show: false },
column: {
//type: 'index',
align: 'center',
width: '70px',
columnSetDisabled: true, //禁止在列设置中选择
formatter: (context) => {
//计算序号,你可以自定义计算规则,此处为翻页累加
let index = context.index ?? 1;
let pagination = crudExpose.crudBinding.value.pagination;
return ((pagination.currentPage ?? 1) - 1) * pagination.pageSize + index + 1;
},
},
},
search: {
title: '关键词',
column: {
show: false,
},
search: {
show: true,
component: {
props: {
clearable: true,
},
placeholder: '请输入关键词',
},
},
form: {
show: false,
component: {
props: {
clearable: true,
},
},
},
},
method: {
title: '请求方式',
sortable: true,
search: {
disabled: false,
},
type: 'dict-select',
dict: dict({
data: [
{
label: 'GET',
value: 0,
},
{
label: 'POST',
value: 1,
},
{
label: 'PUT',
value: 2,
},
{
label: 'DELETE',
value: 3,
},
],
}),
form: {
rules: [
// 表单校验规则
{
required: true,
message: '必填项',
},
],
component: {
span: 12,
},
itemProps: {
class: { yxtInput: true },
},
},
},
url: {
title: '接口地址',
sortable: true,
search: {
disabled: true,
},
type: 'dict-select',
dict: dict({
async getData(dict: any) {
return request('/swagger.json').then((ret: any) => {
const res = Object.keys(ret.paths);
const data = [];
for (const item of res) {
const obj = { label: '', value: '' };
obj.label = item;
obj.value = item;
data.push(obj);
}
return data;
});
},
}),
form: {
rules: [
// 表单校验规则
{
required: true,
message: '必填项',
},
],
component: {
span: 24,
props: {
elProps: {
allowCreate: true,
filterable: true,
clearable: true,
},
},
},
itemProps: {
class: { yxtInput: true },
},
helper: {
render(h) {
return <el-alert title="请正确填写,以免请求时被拦截。匹配单例使用正则,例如:/api/xx/.*?/" type="warning" />;
},
},
},
},
enable_datasource: {
title: '数据权限认证',
search: {
disabled: false,
},
width: 150,
type: 'dict-radio',
dict: dict({
data: dictionary('button_status_bool'),
}),
form: {
value: true,
component: {
span: 12,
},
},
},
},
},
};
};

View File

@@ -1,18 +1,13 @@
<template> <template>
<fs-page> <fs-page>
<fs-crud ref="crudRef" v-bind="crudBinding"> <fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
<template #cell_url="scope">
<el-tag size="small">{{ scope.row.url }}</el-tag>
</template>
</fs-crud>
</fs-page> </fs-page>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref, onMounted } from 'vue'; import { ref, onMounted } from 'vue';
import { useExpose, useCrud } from '@fast-crud/fast-crud'; import { useExpose, useCrud } from '@fast-crud/fast-crud';
import { createCrudOptions } from './curd'; import { createCrudOptions } from './crud';
// crudref // crudref
const crudRef = ref(); const crudRef = ref();
// crud ref // crud ref
@@ -23,8 +18,6 @@ const { crudExpose } = useExpose({ crudRef, crudBinding });
const { crudOptions } = createCrudOptions({ crudExpose }); const { crudOptions } = createCrudOptions({ crudExpose });
// crud // crud
const { resetCrudOptions } = useCrud({ crudExpose, crudOptions }); const { resetCrudOptions } = useCrud({ crudExpose, crudOptions });
// crud
// resetCrudOptions(options)
// //
onMounted(() => { onMounted(() => {