admin/django-vue3-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	web/src/settings.ts
This commit is contained in:
李强
2023-12-26 15:37:08 +08:00
parent 06476c182e 6146e6edb6
commit 4a26257a61
15 changed files with 3102 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/settings.ts
View File

@@ -13,7 +13,7 @@ import {FsExtendsEditor, FsExtendsUploader} from '@fast-crud/fast-extends';
import '@fast-crud/fast-extends/dist/style.css';
import {successMessage, successNotification} from '/@/utils/message';
import XEUtils from "xe-utils";
import {commonCrudConfig} from "/@/utils/commonCrud";
export default {
async install(app: any, options: any) {
// 先安装ui
@@ -110,7 +110,7 @@ export default {
successHandle(ret) {
// 上传完成后的结果处理， 此处应返回格式为{url:xxx,key:xxx}
return {
url: getBaseURL() + ret.data.url,
url: getBaseURL(ret.data.url),
key: ret.data.id,
...ret.data
};

7
web/src/theme/element.scss
View File

@@ -256,6 +256,13 @@
.el-button.is-text {
padding: 0;
}
th.el-table__cell{
-webkit-user-select: text !important;
-moz-user-select: text !important;
-ms-user-select: text !important;
user-select:text !important;
}
}
/* scrollbar

4
web/src/theme/fa/css/font-awesome.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

BIN
web/src/theme/fa/fonts/FontAwesome.otf Normal file
View File

Binary file not shown.

BIN
web/src/theme/fa/fonts/fontawesome-webfont.eot Normal file
View File

Binary file not shown.

2671
web/src/theme/fa/fonts/fontawesome-webfont.svg Normal file
View File

File diff suppressed because it is too large Load Diff
Side by Side

After

Width:  |  Height:  |  Size: 434 KiB

BIN
web/src/theme/fa/fonts/fontawesome-webfont.ttf Normal file
View File

Binary file not shown.

BIN
web/src/theme/fa/fonts/fontawesome-webfont.woff Normal file
View File

Binary file not shown.

BIN
web/src/theme/fa/fonts/fontawesome-webfont.woff2 Normal file
View File

Binary file not shown.

1
web/src/theme/index.scss
View File

@@ -5,3 +5,4 @@
@import './media/media.scss';
@import './waves.scss';
@import './dark.scss';
@import './fa/css/font-awesome.min.css';

16
web/src/utils/baseUrl.ts
View File

@@ -3,9 +3,9 @@ import { pluginsAll } from '/@/views/plugins/index';
/**
* @description 校验是否为租户模式。租户模式把域名替换成 域名 加端口
*/
export const getBaseURL = function () {
var baseURL = import.meta.env.VITE_API_URL as any;
var param = baseURL.split('/')[3] || '';
export const getBaseURL = function (url:string) {
let baseURL = import.meta.env.VITE_API_URL as any;
let param = baseURL.split('/')[3] || '';
// @ts-ignore
if (pluginsAll && pluginsAll.indexOf('dvadmin3-tenants-web') !== -1 && (!param || baseURL.startsWith('/'))) {
// 1.把127.0.0.1 替换成和前端一样域名
@@ -26,6 +26,16 @@ export const getBaseURL = function () {
baseURL = location.protocol + '//' + location.hostname + (location.port ? ':' : '') + location.port + baseURL;
}
}
if(url){
const regex = /^(http|https):\/\//;
if(regex.test(url)){
return url
}else{
if(url.startsWith('/')){
return baseURL + url;
}
}
}
if (!baseURL.endsWith('/')) {
baseURL += '/';
}

11
web/src/utils/getStyleSheets.ts
View File

@@ -50,6 +50,17 @@ const getAwesomeIconfont = () => {
const styles: any = document.styleSheets;
let sheetsList = [];
let sheetsIconList = [];
// 判断fontFamily是否是本地加载
for (let i = 0; i < styles.length; i++) {
const rules = styles[i].cssRules || styles[i].rules;
if (rules) {
for (let j = 0; j < rules.length; j++) {
if (rules[j].style && rules[j].style.fontFamily === 'FontAwesome') {
sheetsList.push(styles[i])
}
}
}
}
for (let i = 0; i < styles.length; i++) {
if (styles[i].href && styles[i].href.indexOf('netdna.bootstrapcdn.com') > -1) {
sheetsList.push(styles[i]);

2
web/src/utils/setIconfont.ts
View File

@@ -2,7 +2,7 @@
const cssCdnUrlList: Array<string> = [
'//at.alicdn.com/t/font_2298093_y6u00apwst.css',
'//at.alicdn.com/t/c/font_3882322_9ah7y8m9175.css', //dvadmin3项目用icon
'//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css'
//'//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css'
];
// 第三方 js url
const jsCdnUrlList: Array<string> = [];

5
web/src/views/system/login/index.vue
View File

@@ -48,9 +48,9 @@
|
<a :href="getSystemConfig['login.help_url']?getSystemConfig['login.help_url']:'https://django-vue-admin.com'" target="_blank">帮助</a>
|
<a :href="getSystemConfig['login.privacy_url']?getSystemConfig['login.privacy_url']:'#'">隐私</a>
<a :href="getSystemConfig['login.privacy_url']?getBaseURL(getSystemConfig['login.privacy_url']):'#'">隐私</a>
|
<a :href="getSystemConfig['login.clause_url']?getSystemConfig['login.clause_url']:'#'">条款</a>
<a :href="getSystemConfig['login.clause_url']?getBaseURL(getSystemConfig['login.clause_url']):'#'">条款</a>
</p>
</div>
</div>
@@ -65,6 +65,7 @@ import logoMini from '/@/assets/logo-mini.svg';
import loginMain from '/@/assets/login-main.svg';
import loginBg from '/@/assets/login-bg.svg';
import {SystemConfigStore} from '/@/stores/systemConfig'
import {getBaseURL} from "/@/utils/baseUrl";
// 引入组件
const Account = defineAsyncComponent(() => import('/@/views/system/login/component/account.vue'));
const Mobile = defineAsyncComponent(() => import('/@/views/system/login/component/mobile.vue'));

76
web/src/views/system/user/crud.tsx
View File

@@ -1,22 +1,34 @@
import * as api from './api';
import { dict, UserPageQuery, AddReq, DelReq, EditReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet } from '@fast-crud/fast-crud';
import { request } from '/@/utils/service';
import { dictionary } from '/@/utils/dictionary';
import { successMessage } from '/@/utils/message';
import { auth } from '/@/utils/authFunction';
export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
import {
dict,
UserPageQuery,
AddReq,
DelReq,
EditReq,
compute,
CreateCrudOptionsProps,
CreateCrudOptionsRet
} from '@fast-crud/fast-crud';
import {request} from '/@/utils/service';
import {dictionary} from '/@/utils/dictionary';
import {successMessage} from '/@/utils/message';
import {auth} from '/@/utils/authFunction';
import {SystemConfigStore} from "/@/stores/systemConfig";
import {storeToRefs} from "pinia";
import {computed} from "vue";
import { Md5 } from 'ts-md5';
export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps): CreateCrudOptionsRet {
const pageRequest = async (query: UserPageQuery) => {
return await api.GetList(query);
};
const editRequest = async ({ form, row }: EditReq) => {
const editRequest = async ({form, row}: EditReq) => {
form.id = row.id;
return await api.UpdateObj(form);
};
const delRequest = async ({ row }: DelReq) => {
const delRequest = async ({row}: DelReq) => {
return await api.DelObj(row.id);
};
const addRequest = async ({ form }: AddReq) => {
const addRequest = async ({form}: AddReq) => {
return await api.AddObj(form);
};
@@ -24,6 +36,13 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
return await api.exportData(query)
}
const systemConfigStore = SystemConfigStore()
const {systemConfig} = storeToRefs(systemConfigStore)
const getSystemConfig = computed(() => {
console.log(systemConfig.value)
return systemConfig.value
})
return {
crudOptions: {
@@ -38,15 +57,22 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
editRequest,
delRequest,
},
form: {
initialForm: {
password: computed(() => {
return systemConfig.value['base.default_password']
}),
}
},
actionbar: {
buttons: {
add: {
show: auth('user:Create')
},
export:{
text:"导出",//按钮文字
title:"导出",//鼠标停留显示的信息
click(){
export: {
text: "导出",//按钮文字
title: "导出",//鼠标停留显示的信息
click() {
return exportRequest(crudExpose!.getSearchFormData())
}
}
@@ -80,7 +106,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
},
//@ts-ignore
click: (ctx: any) => {
const { row } = ctx;
const {row} = ctx;
},
},
},
@@ -88,7 +114,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
columns: {
_index: {
title: '序号',
form: { show: false },
form: {show: false},
column: {
type: 'index',
align: 'center',
@@ -120,7 +146,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
},
password: {
title: '密码',
type: 'input',
type: 'password',
column: {
show: false,
},
@@ -136,17 +162,17 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
},
],
component: {
span: 12,
showPassword: true,
placeholder: '请输入密码',
},
// value: vm.systemConfig('base.default_password'),
},
/* valueResolve(row, key) {
if (row.password) {
row.password = vm.$md5(row.password)
valueResolve({form}) {
if (form.password) {
form.password = Md5.hashStr(form.password)
}
}
} */
},
name: {
title: '姓名',
@@ -182,7 +208,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
url: '/api/system/dept/all_dept/',
value: 'id',
label: 'name',
getData: async ({ url }: { url: string }) => {
getData: async ({url}: { url: string }) => {
return request({
url: url,
}).then((ret: any) => {
@@ -224,7 +250,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
value: 'id',
label: 'name',
isTree: true,
getData: async ({ url }: { url: string }) => {
getData: async ({url}: { url: string }) => {
return request({
url: url,
params: {
@@ -310,7 +336,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
span: 12,
},
},
component: { props: { color: 'auto' } }, // 自动染色
component: {props: {color: 'auto'}}, // 自动染色
},
user_type: {
title: '用户类型',