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

fix(1-5): 🐛 优化系统问题

Browse Source
This commit is contained in:
H0nGzA1
2023-02-27 09:08:44 +08:00
parent 050956a797
commit 1af94094f9
8 changed files with 112 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
backend/dvadmin/system/fixtures/init_dictionary.json
View File

@@ -15,7 +15,7 @@
"value": "true", "value": "true",
"parent": 1, "parent": 1,
"type": 6, "type": 6,
"color": null, "color": "success",
"is_value": true, "is_value": true,
"status": true, "status": true,
"sort": 1, "sort": 1,
@@ -27,7 +27,7 @@
"value": "false", "value": "false",
"parent": 1, "parent": 1,
"type": 6, "type": 6,
"color": null, "color": "danger",
"is_value": true, "is_value": true,
"status": true, "status": true,
"sort": 2, "sort": 2,
@@ -50,7 +50,7 @@
{ {
"label": "新增", "label": "新增",
"value": "Create", "value": "Create",
"parent": 66, "parent": 4,
"type": 0, "type": 0,
"color": "success", "color": "success",
"is_value": true, "is_value": true,
@@ -62,7 +62,7 @@
{ {
"label": "编辑", "label": "编辑",
"value": "Update", "value": "Update",
"parent": 66, "parent": 4,
"type": 0, "type": 0,
"color": "primary", "color": "primary",
"is_value": true, "is_value": true,
@@ -74,7 +74,7 @@
{ {
"label": "删除", "label": "删除",
"value": "Delete", "value": "Delete",
"parent": 66, "parent": 4,
"type": 0, "type": 0,
"color": "danger", "color": "danger",
"is_value": true, "is_value": true,
@@ -86,7 +86,7 @@
{ {
"label": "详情", "label": "详情",
"value": "Retrieve", "value": "Retrieve",
"parent": 66, "parent": 4,
"type": 0, "type": 0,
"color": "info", "color": "info",
"is_value": true, "is_value": true,
@@ -98,7 +98,7 @@
{ {
"label": "查询", "label": "查询",
"value": "Search", "value": "Search",
"parent": 66, "parent": 4,
"type": 0, "type": 0,
"color": "warning", "color": "warning",
"is_value": true, "is_value": true,
@@ -110,7 +110,7 @@
{ {
"label": "保存", "label": "保存",
"value": "Save", "value": "Save",
"parent": 66, "parent": 4,
"type": 0, "type": 0,
"color": "success", "color": "success",
"is_value": true, "is_value": true,
@@ -122,7 +122,7 @@
{ {
"label": "导入", "label": "导入",
"value": "Import", "value": "Import",
"parent": 66, "parent": 4,
"type": 0, "type": 0,
"color": "primary", "color": "primary",
"is_value": true, "is_value": true,
@@ -134,7 +134,7 @@
{ {
"label": "导出", "label": "导出",
"value": "Export", "value": "Export",
"parent": 66, "parent": 4,
"type": 0, "type": 0,
"color": "warning", "color": "warning",
"is_value": true, "is_value": true,
@@ -159,9 +159,9 @@
{ {
"label": "启用", "label": "启用",
"value": "1", "value": "1",
"parent": 7, "parent": 13,
"type": 1, "type": 1,
"color": null, "color": "success",
"is_value": true, "is_value": true,
"status": true, "status": true,
"sort": 1, "sort": 1,
@@ -171,9 +171,9 @@
{ {
"label": "禁用", "label": "禁用",
"value": "0", "value": "0",
"parent": 7, "parent": 13,
"type": 1, "type": 1,
"color": null, "color": "danger",
"is_value": true, "is_value": true,
"status": true, "status": true,
"sort": 2, "sort": 2,
@@ -196,9 +196,9 @@
{ {
"label": "是", "label": "是",
"value": "true", "value": "true",
"parent": 5, "parent": 16,
"type": 6, "type": 6,
"color": null, "color": "success",
"is_value": true, "is_value": true,
"status": true, "status": true,
"sort": 1, "sort": 1,
@@ -208,9 +208,9 @@
{ {
"label": "否", "label": "否",
"value": "false", "value": "false",
"parent": 5, "parent": 16,
"type": 6, "type": 6,
"color": null, "color": "danger",
"is_value": true, "is_value": true,
"status": true, "status": true,
"sort": 2, "sort": 2,
@@ -233,9 +233,9 @@
{ {
"label": "是", "label": "是",
"value": "1", "value": "1",
"parent": 10, "parent": 19,
"type": 1, "type": 1,
"color": null, "color": "success",
"is_value": true, "is_value": true,
"status": true, "status": true,
"sort": 1, "sort": 1,
@@ -245,9 +245,9 @@
{ {
"label": "否", "label": "否",
"value": "2", "value": "2",
"parent": 10, "parent": 19,
"type": 1, "type": 1,
"color": null, "color": "danger",
"is_value": true, "is_value": true,
"status": true, "status": true,
"sort": 2, "sort": 2,
@@ -270,7 +270,7 @@
{ {
"label": "后台用户", "label": "后台用户",
"value": "0", "value": "0",
"parent": 15, "parent": 22,
"type": 1, "type": 1,
"color": null, "color": null,
"is_value": true, "is_value": true,
@@ -282,7 +282,7 @@
{ {
"label": "前台用户", "label": "前台用户",
"value": "1", "value": "1",
"parent": 15, "parent": 22,
"type": 1, "type": 1,
"color": null, "color": null,
"is_value": true, "is_value": true,
@@ -307,7 +307,7 @@
{ {
"label": "text", "label": "text",
"value": "0", "value": "0",
"parent": 49, "parent": 25,
"type": 1, "type": 1,
"color": null, "color": null,
"is_value": true, "is_value": true,
@@ -319,7 +319,7 @@
{ {
"label": "textarea", "label": "textarea",
"value": "3", "value": "3",
"parent": 49, "parent": 25,
"type": 1, "type": 1,
"color": "", "color": "",
"is_value": true, "is_value": true,
@@ -331,7 +331,7 @@
{ {
"label": "number", "label": "number",
"value": "10", "value": "10",
"parent": 49, "parent": 25,
"type": 1, "type": 1,
"color": "", "color": "",
"is_value": true, "is_value": true,
@@ -343,7 +343,7 @@
{ {
"label": "datetime", "label": "datetime",
"value": "1", "value": "1",
"parent": 49, "parent": 25,
"type": 1, "type": 1,
"color": null, "color": null,
"is_value": true, "is_value": true,
@@ -355,7 +355,7 @@
{ {
"label": "date", "label": "date",
"value": "2", "value": "2",
"parent": 49, "parent": 25,
"type": 1, "type": 1,
"color": null, "color": null,
"is_value": true, "is_value": true,
@@ -367,7 +367,7 @@
{ {
"label": "time", "label": "time",
"value": "15", "value": "15",
"parent": 49, "parent": 25,
"type": 1, "type": 1,
"color": "", "color": "",
"is_value": true, "is_value": true,
@@ -379,7 +379,7 @@
{ {
"label": "select", "label": "select",
"value": "4", "value": "4",
"parent": 49, "parent": 25,
"type": 1, "type": 1,
"color": null, "color": null,
"is_value": true, "is_value": true,
@@ -391,7 +391,7 @@
{ {
"label": "checkbox", "label": "checkbox",
"value": "5", "value": "5",
"parent": 49, "parent": 25,
"type": 1, "type": 1,
"color": null, "color": null,
"is_value": true, "is_value": true,
@@ -403,7 +403,7 @@
{ {
"label": "radio", "label": "radio",
"value": "6", "value": "6",
"parent": 49, "parent": 25,
"type": 1, "type": 1,
"color": null, "color": null,
"is_value": true, "is_value": true,
@@ -415,7 +415,7 @@
{ {
"label": "switch", "label": "switch",
"value": "9", "value": "9",
"parent": 49, "parent": 25,
"type": 1, "type": 1,
"color": "", "color": "",
"is_value": true, "is_value": true,
@@ -427,7 +427,7 @@
{ {
"label": "文件附件", "label": "文件附件",
"value": "8", "value": "8",
"parent": 49, "parent": 25,
"type": 1, "type": 1,
"color": "", "color": "",
"is_value": true, "is_value": true,
@@ -439,7 +439,7 @@
{ {
"label": "图片(单张)", "label": "图片(单张)",
"value": "7", "value": "7",
"parent": 49, "parent": 25,
"type": 1, "type": 1,
"color": "", "color": "",
"is_value": true, "is_value": true,
@@ -451,7 +451,7 @@
{ {
"label": "图片(多张)", "label": "图片(多张)",
"value": "12", "value": "12",
"parent": 49, "parent": 25,
"type": 1, "type": 1,
"color": "", "color": "",
"is_value": true, "is_value": true,
@@ -463,7 +463,7 @@
{ {
"label": "数组", "label": "数组",
"value": "11", "value": "11",
"parent": 49, "parent": 25,
"type": 1, "type": 1,
"color": "", "color": "",
"is_value": true, "is_value": true,
@@ -475,7 +475,7 @@
{ {
"label": "关联表", "label": "关联表",
"value": "13", "value": "13",
"parent": 49, "parent": 25,
"type": 1, "type": 1,
"color": "", "color": "",
"is_value": true, "is_value": true,
@@ -487,7 +487,7 @@
{ {
"label": "关联表(多选)", "label": "关联表(多选)",
"value": "14", "value": "14",
"parent": 49, "parent": 25,
"type": 1, "type": 1,
"color": "", "color": "",
"is_value": true, "is_value": true,
@@ -512,7 +512,7 @@
{ {
"label": "未知", "label": "未知",
"value": "0", "value": "0",
"parent": 18, "parent": 42,
"type": 1, "type": 1,
"color": null, "color": null,
"is_value": true, "is_value": true,
@@ -524,7 +524,7 @@
{ {
"label": "男", "label": "男",
"value": "1", "value": "1",
"parent": 18, "parent": 42,
"type": 1, "type": 1,
"color": null, "color": null,
"is_value": true, "is_value": true,
@@ -536,7 +536,7 @@
{ {
"label": "女", "label": "女",
"value": "2", "value": "2",
"parent": 18, "parent": 42,
"type": 1, "type": 1,
"color": null, "color": null,
"is_value": true, "is_value": true,

2
web/.env.production
View File

@@ -2,7 +2,7 @@
ENV = 'production' ENV = 'production'
# 线上环境接口地址 # 线上环境接口地址
VITE_API_URL = 'https://lyt-top.gitee.io/vue-next-admin-preview/' VITE_API_URL = ''
# 是否启用按钮权限 # 是否启用按钮权限
VITE_PM_ENABLED = true VITE_PM_ENABLED = true

2
web/index.html
View File

@@ -13,7 +13,7 @@
content="django-vue3-admin，基于 vue3 + CompositionAPI + typescript + vite + element plus, 是一款全栈，快速，开源的后台管理系统！" content="django-vue3-admin，基于 vue3 + CompositionAPI + typescript + vite + element plus, 是一款全栈，快速，开源的后台管理系统！"
/> />
<link rel="icon" href="/favicon.ico" /> <link rel="icon" href="/favicon.ico" />
<title>vue-next-admin</title> <title>django-vue3-admin</title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>

79
web/src/stores/dictionary.ts
View File

@@ -2,54 +2,53 @@ import { defineStore } from 'pinia';
import { DictionaryStates } from './interface'; import { DictionaryStates } from './interface';
import { request } from '../utils/service'; import { request } from '../utils/service';
export const urlPrefix = '/api/init/dictionary/' export const urlPrefix = '/api/init/dictionary/';
export const BUTTON_VALUE_TO_COLOR_MAPPING: any = { export const BUTTON_VALUE_TO_COLOR_MAPPING: any = {
1: 'success', 1: 'success',
true: 'success', true: 'success',
0: 'danger', 0: 'danger',
false: 'danger', false: 'danger',
Search: 'warning', // 查询 Search: 'warning', // 查询
Update: 'primary', // 编辑 Update: 'primary', // 编辑
Create: 'success', // 新增 Create: 'success', // 新增
Retrieve: 'info', // 单例 Retrieve: 'info', // 单例
Delete: 'danger' // 删除 Delete: 'danger', // 删除
} };
export function getButtonSettings(objectSettings: any) { export function getButtonSettings(objectSettings: any) {
return objectSettings.map((item: any) => ({ return objectSettings.map((item: any) => ({
label: item.label, label: item.label,
value: item.value, value: item.value,
color: item.color || BUTTON_VALUE_TO_COLOR_MAPPING[item.value] color: item.color || BUTTON_VALUE_TO_COLOR_MAPPING[item.value],
})) }));
} }
/** /**
* 字典管理数据 * 字典管理数据
* @methods getSystemDictionarys 获取系统字典数据 * @methods getSystemDictionarys 获取系统字典数据
*/ */
export const DictionaryStore = defineStore('Dictionary', { export const DictionaryStore = defineStore('Dictionary', {
state: (): DictionaryStates => ({ state: (): DictionaryStates => ({
data: {} data: {},
}), }),
actions: { actions: {
async getSystemDictionarys() { async getSystemDictionarys() {
request({ request({
url: '/api/init/dictionary/?dictionary_key=all', url: '/api/init/dictionary/?dictionary_key=all',
method: 'get', method: 'get',
}).then((ret: { }).then((ret: { data: [] }) => {
data: [] // 转换数据格式并保存到pinia
}) => { let dataList = ret.data;
// 转换数据格式并保存到pinia
let dataList = ret.data dataList.forEach((item: any) => {
dataList.forEach((item: any) => { let childrens = item.children;
let childrens = item.children console.log(item);
this.data[item.value] = childrens this.data[item.value] = childrens;
}) });
}) });
}, },
}, },
persist: { persist: {
enabled: true, enabled: true,
}, },
}); });

2
web/src/stores/themeConfig.ts
View File

@@ -141,7 +141,7 @@ export const useThemeConfig = defineStore('themeConfig', {
// 网站副标题（登录页顶部文字） // 网站副标题（登录页顶部文字）
globalViceTitle: 'dvadmin', globalViceTitle: 'dvadmin',
// 网站副标题（登录页顶部文字） // 网站副标题（登录页顶部文字）
globalViceTitleMsg: '企业级后台管理系统', globalViceTitleMsg: '企业级快速开发平台',
// 默认初始语言，可选值"<zh-cn|en|zh-tw>"，默认 zh-cn // 默认初始语言，可选值"<zh-cn|en|zh-tw>"，默认 zh-cn
globalI18n: 'zh-cn', globalI18n: 'zh-cn',
// 默认全局组件大小，可选值"<large|'default'|small>"，默认 'large' // 默认全局组件大小，可选值"<large|'default'|small>"，默认 'large'

2
web/src/views/system/login/component/scan.vue
View File

@@ -17,7 +17,7 @@ export default defineComponent({
const initQrcode = () => { const initQrcode = () => {
(qrcodeRef.value as HTMLElement).innerHTML = ''; (qrcodeRef.value as HTMLElement).innerHTML = '';
new QRCode(qrcodeRef.value, { new QRCode(qrcodeRef.value, {
text: `https://qm.qq.com/cgi-bin/qm/qr?k=RdUY97Vx0T0vZ_1OOu-X1yFNkWgDwbjC&jump_from=webapi`, text: `https://jq.qq.com/?_wv=1027&k=8keWoTap`,
width: 260, width: 260,
height: 260, height: 260,
colorDark: '#000000', colorDark: '#000000',

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

@@ -25,9 +25,10 @@
<el-tab-pane :label="$t('message.label.one1')" name="account"> <el-tab-pane :label="$t('message.label.one1')" name="account">
<Account /> <Account />
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="$t('message.label.two2')" name="mobile"> <!-- TODO 手机号码登录未接入，展示隐藏 -->
<!-- <el-tab-pane :label="$t('message.label.two2')" name="mobile">
<Mobile /> <Mobile />
</el-tab-pane> </el-tab-pane> -->
</el-tabs> </el-tabs>
</div> </div>
<Scan v-if="state.isScan" /> <Scan v-if="state.isScan" />

28
web/src/views/system/menu/crud.tsx
View File

@@ -83,6 +83,7 @@ export const createCrudOptions = function ({ crudExpose, menuButtonRef }: { crud
}, },
}, },
rowHandle: { rowHandle: {
width: 310,
buttons: { buttons: {
custom: { custom: {
text: '按钮配置', text: '按钮配置',
@@ -231,7 +232,9 @@ export const createCrudOptions = function ({ crudExpose, menuButtonRef }: { crud
}, },
sort: { sort: {
title: '排序', title: '排序',
width: 60, column: {
width: 60,
},
type: 'number', type: 'number',
form: { form: {
value: 1, value: 1,
@@ -242,6 +245,9 @@ export const createCrudOptions = function ({ crudExpose, menuButtonRef }: { crud
}, },
is_catalog: { is_catalog: {
title: '是否目录', title: '是否目录',
column: {
width: 60,
},
type: 'dict-switch', type: 'dict-switch',
dict: dict({ dict: dict({
data: dictionary('button_whether_bool'), data: dictionary('button_whether_bool'),
@@ -368,7 +374,9 @@ export const createCrudOptions = function ({ crudExpose, menuButtonRef }: { crud
}, },
component_name: { component_name: {
title: '组件名称', title: '组件名称',
width: 170, column: {
width: 140,
},
form: { form: {
rules: [{ required: true, message: '请输入组件名称' }], rules: [{ required: true, message: '请输入组件名称' }],
component: { component: {
@@ -391,7 +399,6 @@ export const createCrudOptions = function ({ crudExpose, menuButtonRef }: { crud
menuPermission: { menuPermission: {
title: '拥有权限', title: '拥有权限',
type: 'dict-select', type: 'dict-select',
width: 300,
form: { form: {
show: false, show: false,
component: { component: {
@@ -403,13 +410,18 @@ export const createCrudOptions = function ({ crudExpose, menuButtonRef }: { crud
}, },
}, },
}, },
column: {
width: 260,
},
}, },
cache: { cache: {
title: '缓存', title: '缓存',
column: {
width: 60,
},
search: { search: {
show: true, show: true,
}, },
width: 60,
type: 'dict-switch', type: 'dict-switch',
dict: dict({ dict: dict({
data: dictionary('button_whether_bool'), data: dictionary('button_whether_bool'),
@@ -432,10 +444,12 @@ export const createCrudOptions = function ({ crudExpose, menuButtonRef }: { crud
}, },
visible: { visible: {
title: '侧边可见', title: '侧边可见',
column: {
width: 60,
},
search: { search: {
show: true, show: true,
}, },
width: 75,
type: 'dict-switch', type: 'dict-switch',
dict: dict({ dict: dict({
data: dictionary('button_whether_bool'), data: dictionary('button_whether_bool'),
@@ -462,7 +476,9 @@ export const createCrudOptions = function ({ crudExpose, menuButtonRef }: { crud
search: { search: {
show: true, show: true,
}, },
width: 70, column: {
width: 80,
},
type: 'dict-switch', type: 'dict-switch',
dict: dict({ dict: dict({
data: dictionary('button_status_bool'), data: dictionary('button_status_bool'),