update 优化 整体代码结构

This commit is contained in:
疯狂的狮子Li 2023-08-11 17:58:58 +08:00
parent 73df6a1b30
commit f3195be732
16 changed files with 62 additions and 68 deletions

View File

@ -30,7 +30,7 @@ module.exports = {
extendDefaults: true, extendDefaults: true,
types: { types: {
'{}': false, '{}': false,
'Function': false Function: false
} }
} }
] ]

View File

@ -43,7 +43,6 @@ export interface ClientVO {
* 0 1 * 0 1
*/ */
status: string; status: string;
} }
export interface ClientForm extends BaseEntity { export interface ClientForm extends BaseEntity {
@ -91,7 +90,6 @@ export interface ClientForm extends BaseEntity {
* 0 1 * 0 1
*/ */
status?: string; status?: string;
} }
export interface ClientQuery extends PageQuery { export interface ClientQuery extends PageQuery {
@ -134,5 +132,4 @@ export interface ClientQuery extends PageQuery {
* 0 1 * 0 1
*/ */
status?: string; status?: string;
} }

View File

@ -175,8 +175,8 @@ export const updateAuthRole = (data: { userId: string; roleIds: string }) => {
*/ */
export const listUserByDeptId = (deptId: string | number): AxiosPromise<UserVO[]> => { export const listUserByDeptId = (deptId: string | number): AxiosPromise<UserVO[]> => {
return request({ return request({
url: "/system/user/list/dept/" + deptId, url: '/system/user/list/dept/' + deptId,
method: "get" method: 'get'
}); });
}; };

View File

@ -37,7 +37,7 @@ export const updateGenTable = (data: DbTableForm) => {
}; };
// 导入表 // 导入表
export const importTable = (data: { tables: string, dataName: string }) => { export const importTable = (data: { tables: string; dataName: string }) => {
return request({ return request({
url: '/tool/gen/importTable', url: '/tool/gen/importTable',
method: 'post', method: 'post',

View File

@ -78,8 +78,6 @@
overflow-x: hidden; overflow-x: hidden;
} }
// refine element ui upload // refine element ui upload
.upload-container { .upload-container {
.el-upload { .el-upload {

View File

@ -26,7 +26,8 @@ html {
box-sizing: border-box; box-sizing: border-box;
} }
html.dark .svg-icon, html.dark svg { html.dark .svg-icon,
html.dark svg {
fill: var(--el-text-color-regular); fill: var(--el-text-color-regular);
} }

View File

@ -4,11 +4,11 @@
const props = defineProps({ const props = defineProps({
formJson: { formJson: {
type: [String, Object], type: [String, Object],
default: {} default: ""
}, },
formData: { formData: {
type: [String, Object], type: [String, Object],
default: {} default: ""
}, },
isView: { isView: {
type: Boolean, type: Boolean,

View File

@ -3,7 +3,7 @@ import FileSaver from 'file-saver';
import errorCode from '@/utils/errorCode'; import errorCode from '@/utils/errorCode';
import { blobValidate } from '@/utils/ruoyi'; import { blobValidate } from '@/utils/ruoyi';
import { LoadingInstance } from 'element-plus/es/components/loading/src/loading'; import { LoadingInstance } from 'element-plus/es/components/loading/src/loading';
import { globalHeaders } from "@/utils/request"; import { globalHeaders } from '@/utils/request';
const baseURL = import.meta.env.VITE_APP_BASE_API; const baseURL = import.meta.env.VITE_APP_BASE_API;
let downloadLoadingInstance: LoadingInstance; let downloadLoadingInstance: LoadingInstance;
@ -16,7 +16,7 @@ export default {
method: 'get', method: 'get',
url: url, url: url,
responseType: 'blob', responseType: 'blob',
headers: globalHeaders(), headers: globalHeaders()
}); });
const isBlob = blobValidate(res.data); const isBlob = blobValidate(res.data);
if (isBlob) { if (isBlob) {
@ -40,7 +40,7 @@ export default {
method: 'get', method: 'get',
url: url, url: url,
responseType: 'blob', responseType: 'blob',
headers: globalHeaders(), headers: globalHeaders()
}); });
const isBlob = blobValidate(res.data); const isBlob = blobValidate(res.data);
if (isBlob) { if (isBlob) {

View File

@ -181,5 +181,4 @@ const router = createRouter({
} }
}); });
export default router; export default router;

View File

@ -16,10 +16,10 @@ let downloadLoadingInstance: LoadingInstance;
export const isRelogin = { show: false }; export const isRelogin = { show: false };
export const globalHeaders = () => { export const globalHeaders = () => {
return { return {
Authorization: "Bearer " + getToken(), Authorization: 'Bearer ' + getToken(),
clientid: import.meta.env.VITE_APP_CLIENT_ID clientid: import.meta.env.VITE_APP_CLIENT_ID
} };
} };
axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'; axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8';
axios.defaults.headers['clientid'] = import.meta.env.VITE_APP_CLIENT_ID; axios.defaults.headers['clientid'] = import.meta.env.VITE_APP_CLIENT_ID;

View File

@ -68,7 +68,7 @@ export const validAlphabets = (str: string) => {
*/ */
export const validEmail = (email: string) => { export const validEmail = (email: string) => {
const reg = const reg =
/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; /^(([^<>()\]\\.,;:\s@"]+(\.[^<>()\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
return reg.test(email); return reg.test(email);
}; };

View File

@ -299,7 +299,6 @@
<script setup name="User" lang="ts"> <script setup name="User" lang="ts">
import api from "@/api/system/user" import api from "@/api/system/user"
import { UserForm, UserQuery, UserVO } from '@/api/system/user/types'; import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
import { getToken } from "@/utils/auth";
import { treeselect } from "@/api/system/dept"; import { treeselect } from "@/api/system/dept";
import { DeptVO } from "@/api/system/dept/types"; import { DeptVO } from "@/api/system/dept/types";
import { RoleVO } from "@/api/system/role/types"; import { RoleVO } from "@/api/system/role/types";

View File

@ -9,6 +9,6 @@ export default () => {
'panel-title': 'panel-title':
'pb-[5px] font-sans leading-[1.1] font-medium text-base text-[#6379bb] border-b border-b-solid border-[var(--el-border-color-light)] mb-5 mt-0' 'pb-[5px] font-sans leading-[1.1] font-medium text-base text-[#6379bb] border-b border-b-solid border-[var(--el-border-color-light)] mb-5 mt-0'
}, },
hmrTopLevelAwait: false, // unocss默认是true低版本浏览器是不支持的启动后会报错 hmrTopLevelAwait: false // unocss默认是true低版本浏览器是不支持的启动后会报错
}); });
}; };