From 1af94094f96f7160662e204f165f4da06f6cba36 Mon Sep 17 00:00:00 2001
From: H0nGzA1 <2505811377@qq.com>
Date: Mon, 27 Feb 2023 09:08:44 +0800
Subject: [PATCH] =?UTF-8?q?fix(1-5):=20=F0=9F=90=9B=20=20=E4=BC=98?=
=?UTF-8?q?=E5=8C=96=E7=B3=BB=E7=BB=9F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/fixtures/init_dictionary.json | 88 +++++++++----------
web/.env.production | 2 +-
web/index.html | 2 +-
web/src/stores/dictionary.ts | 79 ++++++++---------
web/src/stores/themeConfig.ts | 2 +-
web/src/views/system/login/component/scan.vue | 2 +-
web/src/views/system/login/index.vue | 5 +-
web/src/views/system/menu/crud.tsx | 28 ++++--
8 files changed, 112 insertions(+), 96 deletions(-)
diff --git a/backend/dvadmin/system/fixtures/init_dictionary.json b/backend/dvadmin/system/fixtures/init_dictionary.json
index f4533f9..f750c40 100644
--- a/backend/dvadmin/system/fixtures/init_dictionary.json
+++ b/backend/dvadmin/system/fixtures/init_dictionary.json
@@ -15,7 +15,7 @@
"value": "true",
"parent": 1,
"type": 6,
- "color": null,
+ "color": "success",
"is_value": true,
"status": true,
"sort": 1,
@@ -27,7 +27,7 @@
"value": "false",
"parent": 1,
"type": 6,
- "color": null,
+ "color": "danger",
"is_value": true,
"status": true,
"sort": 2,
@@ -50,7 +50,7 @@
{
"label": "新增",
"value": "Create",
- "parent": 66,
+ "parent": 4,
"type": 0,
"color": "success",
"is_value": true,
@@ -62,7 +62,7 @@
{
"label": "编辑",
"value": "Update",
- "parent": 66,
+ "parent": 4,
"type": 0,
"color": "primary",
"is_value": true,
@@ -74,7 +74,7 @@
{
"label": "删除",
"value": "Delete",
- "parent": 66,
+ "parent": 4,
"type": 0,
"color": "danger",
"is_value": true,
@@ -86,7 +86,7 @@
{
"label": "详情",
"value": "Retrieve",
- "parent": 66,
+ "parent": 4,
"type": 0,
"color": "info",
"is_value": true,
@@ -98,7 +98,7 @@
{
"label": "查询",
"value": "Search",
- "parent": 66,
+ "parent": 4,
"type": 0,
"color": "warning",
"is_value": true,
@@ -110,7 +110,7 @@
{
"label": "保存",
"value": "Save",
- "parent": 66,
+ "parent": 4,
"type": 0,
"color": "success",
"is_value": true,
@@ -122,7 +122,7 @@
{
"label": "导入",
"value": "Import",
- "parent": 66,
+ "parent": 4,
"type": 0,
"color": "primary",
"is_value": true,
@@ -134,7 +134,7 @@
{
"label": "导出",
"value": "Export",
- "parent": 66,
+ "parent": 4,
"type": 0,
"color": "warning",
"is_value": true,
@@ -159,9 +159,9 @@
{
"label": "启用",
"value": "1",
- "parent": 7,
+ "parent": 13,
"type": 1,
- "color": null,
+ "color": "success",
"is_value": true,
"status": true,
"sort": 1,
@@ -171,9 +171,9 @@
{
"label": "禁用",
"value": "0",
- "parent": 7,
+ "parent": 13,
"type": 1,
- "color": null,
+ "color": "danger",
"is_value": true,
"status": true,
"sort": 2,
@@ -196,9 +196,9 @@
{
"label": "是",
"value": "true",
- "parent": 5,
+ "parent": 16,
"type": 6,
- "color": null,
+ "color": "success",
"is_value": true,
"status": true,
"sort": 1,
@@ -208,9 +208,9 @@
{
"label": "否",
"value": "false",
- "parent": 5,
+ "parent": 16,
"type": 6,
- "color": null,
+ "color": "danger",
"is_value": true,
"status": true,
"sort": 2,
@@ -233,9 +233,9 @@
{
"label": "是",
"value": "1",
- "parent": 10,
+ "parent": 19,
"type": 1,
- "color": null,
+ "color": "success",
"is_value": true,
"status": true,
"sort": 1,
@@ -245,9 +245,9 @@
{
"label": "否",
"value": "2",
- "parent": 10,
+ "parent": 19,
"type": 1,
- "color": null,
+ "color": "danger",
"is_value": true,
"status": true,
"sort": 2,
@@ -270,7 +270,7 @@
{
"label": "后台用户",
"value": "0",
- "parent": 15,
+ "parent": 22,
"type": 1,
"color": null,
"is_value": true,
@@ -282,7 +282,7 @@
{
"label": "前台用户",
"value": "1",
- "parent": 15,
+ "parent": 22,
"type": 1,
"color": null,
"is_value": true,
@@ -307,7 +307,7 @@
{
"label": "text",
"value": "0",
- "parent": 49,
+ "parent": 25,
"type": 1,
"color": null,
"is_value": true,
@@ -319,7 +319,7 @@
{
"label": "textarea",
"value": "3",
- "parent": 49,
+ "parent": 25,
"type": 1,
"color": "",
"is_value": true,
@@ -331,7 +331,7 @@
{
"label": "number",
"value": "10",
- "parent": 49,
+ "parent": 25,
"type": 1,
"color": "",
"is_value": true,
@@ -343,7 +343,7 @@
{
"label": "datetime",
"value": "1",
- "parent": 49,
+ "parent": 25,
"type": 1,
"color": null,
"is_value": true,
@@ -355,7 +355,7 @@
{
"label": "date",
"value": "2",
- "parent": 49,
+ "parent": 25,
"type": 1,
"color": null,
"is_value": true,
@@ -367,7 +367,7 @@
{
"label": "time",
"value": "15",
- "parent": 49,
+ "parent": 25,
"type": 1,
"color": "",
"is_value": true,
@@ -379,7 +379,7 @@
{
"label": "select",
"value": "4",
- "parent": 49,
+ "parent": 25,
"type": 1,
"color": null,
"is_value": true,
@@ -391,7 +391,7 @@
{
"label": "checkbox",
"value": "5",
- "parent": 49,
+ "parent": 25,
"type": 1,
"color": null,
"is_value": true,
@@ -403,7 +403,7 @@
{
"label": "radio",
"value": "6",
- "parent": 49,
+ "parent": 25,
"type": 1,
"color": null,
"is_value": true,
@@ -415,7 +415,7 @@
{
"label": "switch",
"value": "9",
- "parent": 49,
+ "parent": 25,
"type": 1,
"color": "",
"is_value": true,
@@ -427,7 +427,7 @@
{
"label": "文件附件",
"value": "8",
- "parent": 49,
+ "parent": 25,
"type": 1,
"color": "",
"is_value": true,
@@ -439,7 +439,7 @@
{
"label": "图片(单张)",
"value": "7",
- "parent": 49,
+ "parent": 25,
"type": 1,
"color": "",
"is_value": true,
@@ -451,7 +451,7 @@
{
"label": "图片(多张)",
"value": "12",
- "parent": 49,
+ "parent": 25,
"type": 1,
"color": "",
"is_value": true,
@@ -463,7 +463,7 @@
{
"label": "数组",
"value": "11",
- "parent": 49,
+ "parent": 25,
"type": 1,
"color": "",
"is_value": true,
@@ -475,7 +475,7 @@
{
"label": "关联表",
"value": "13",
- "parent": 49,
+ "parent": 25,
"type": 1,
"color": "",
"is_value": true,
@@ -487,7 +487,7 @@
{
"label": "关联表(多选)",
"value": "14",
- "parent": 49,
+ "parent": 25,
"type": 1,
"color": "",
"is_value": true,
@@ -512,7 +512,7 @@
{
"label": "未知",
"value": "0",
- "parent": 18,
+ "parent": 42,
"type": 1,
"color": null,
"is_value": true,
@@ -524,7 +524,7 @@
{
"label": "男",
"value": "1",
- "parent": 18,
+ "parent": 42,
"type": 1,
"color": null,
"is_value": true,
@@ -536,7 +536,7 @@
{
"label": "女",
"value": "2",
- "parent": 18,
+ "parent": 42,
"type": 1,
"color": null,
"is_value": true,
@@ -547,4 +547,4 @@
}
]
}
-]
+]
\ No newline at end of file
diff --git a/web/.env.production b/web/.env.production
index 74257c6..70cd18d 100644
--- a/web/.env.production
+++ b/web/.env.production
@@ -2,7 +2,7 @@
ENV = 'production'
# 线上环境接口地址
-VITE_API_URL = 'https://lyt-top.gitee.io/vue-next-admin-preview/'
+VITE_API_URL = ''
# 是否启用按钮权限
VITE_PM_ENABLED = true
diff --git a/web/index.html b/web/index.html
index 3f6f08b..2fcf37b 100644
--- a/web/index.html
+++ b/web/index.html
@@ -13,7 +13,7 @@
content="django-vue3-admin，基于 vue3 + CompositionAPI + typescript + vite + element plus, 是一款全栈，快速，开源的后台管理系统！"
/>
- vue-next-admin
+ django-vue3-admin
diff --git a/web/src/stores/dictionary.ts b/web/src/stores/dictionary.ts
index 30d5013..3f8ec84 100644
--- a/web/src/stores/dictionary.ts
+++ b/web/src/stores/dictionary.ts
@@ -2,54 +2,53 @@ import { defineStore } from 'pinia';
import { DictionaryStates } from './interface';
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 = {
- 1: 'success',
- true: 'success',
- 0: 'danger',
- false: 'danger',
- Search: 'warning', // 查询
- Update: 'primary', // 编辑
- Create: 'success', // 新增
- Retrieve: 'info', // 单例
- Delete: 'danger' // 删除
-}
+ 1: 'success',
+ true: 'success',
+ 0: 'danger',
+ false: 'danger',
+ Search: 'warning', // 查询
+ Update: 'primary', // 编辑
+ Create: 'success', // 新增
+ Retrieve: 'info', // 单例
+ Delete: 'danger', // 删除
+};
export function getButtonSettings(objectSettings: any) {
- return objectSettings.map((item: any) => ({
- label: item.label,
- value: item.value,
- color: item.color || BUTTON_VALUE_TO_COLOR_MAPPING[item.value]
- }))
+ return objectSettings.map((item: any) => ({
+ label: item.label,
+ value: item.value,
+ color: item.color || BUTTON_VALUE_TO_COLOR_MAPPING[item.value],
+ }));
}
-
/**
* 字典管理数据
* @methods getSystemDictionarys 获取系统字典数据
*/
export const DictionaryStore = defineStore('Dictionary', {
- state: (): DictionaryStates => ({
- data: {}
- }),
- actions: {
- async getSystemDictionarys() {
- request({
- url: '/api/init/dictionary/?dictionary_key=all',
- method: 'get',
- }).then((ret: {
- data: []
- }) => {
- // 转换数据格式并保存到pinia
- let dataList = ret.data
- dataList.forEach((item: any) => {
- let childrens = item.children
- this.data[item.value] = childrens
- })
- })
- },
- },
- persist: {
- enabled: true,
- },
+ state: (): DictionaryStates => ({
+ data: {},
+ }),
+ actions: {
+ async getSystemDictionarys() {
+ request({
+ url: '/api/init/dictionary/?dictionary_key=all',
+ method: 'get',
+ }).then((ret: { data: [] }) => {
+ // 转换数据格式并保存到pinia
+ let dataList = ret.data;
+
+ dataList.forEach((item: any) => {
+ let childrens = item.children;
+ console.log(item);
+ this.data[item.value] = childrens;
+ });
+ });
+ },
+ },
+ persist: {
+ enabled: true,
+ },
});
diff --git a/web/src/stores/themeConfig.ts b/web/src/stores/themeConfig.ts
index 11570e0..c9f0f14 100644
--- a/web/src/stores/themeConfig.ts
+++ b/web/src/stores/themeConfig.ts
@@ -141,7 +141,7 @@ export const useThemeConfig = defineStore('themeConfig', {
// 网站副标题（登录页顶部文字）
globalViceTitle: 'dvadmin',
// 网站副标题（登录页顶部文字）
- globalViceTitleMsg: '企业级后台管理系统',
+ globalViceTitleMsg: '企业级快速开发平台',
// 默认初始语言，可选值""，默认 zh-cn
globalI18n: 'zh-cn',
// 默认全局组件大小，可选值""，默认 'large'
diff --git a/web/src/views/system/login/component/scan.vue b/web/src/views/system/login/component/scan.vue
index 27a93f9..de13e6b 100644
--- a/web/src/views/system/login/component/scan.vue
+++ b/web/src/views/system/login/component/scan.vue
@@ -17,7 +17,7 @@ export default defineComponent({
const initQrcode = () => {
(qrcodeRef.value as HTMLElement).innerHTML = '';
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,
height: 260,
colorDark: '#000000',
diff --git a/web/src/views/system/login/index.vue b/web/src/views/system/login/index.vue
index c0ade96..9cf7e05 100644
--- a/web/src/views/system/login/index.vue
+++ b/web/src/views/system/login/index.vue
@@ -25,9 +25,10 @@
-
+
+
diff --git a/web/src/views/system/menu/crud.tsx b/web/src/views/system/menu/crud.tsx
index 0f9937b..8deaa0b 100644
--- a/web/src/views/system/menu/crud.tsx
+++ b/web/src/views/system/menu/crud.tsx
@@ -83,6 +83,7 @@ export const createCrudOptions = function ({ crudExpose, menuButtonRef }: { crud
},
},
rowHandle: {
+ width: 310,
buttons: {
custom: {
text: '按钮配置',
@@ -231,7 +232,9 @@ export const createCrudOptions = function ({ crudExpose, menuButtonRef }: { crud
},
sort: {
title: '排序',
- width: 60,
+ column: {
+ width: 60,
+ },
type: 'number',
form: {
value: 1,
@@ -242,6 +245,9 @@ export const createCrudOptions = function ({ crudExpose, menuButtonRef }: { crud
},
is_catalog: {
title: '是否目录',
+ column: {
+ width: 60,
+ },
type: 'dict-switch',
dict: dict({
data: dictionary('button_whether_bool'),
@@ -368,7 +374,9 @@ export const createCrudOptions = function ({ crudExpose, menuButtonRef }: { crud
},
component_name: {
title: '组件名称',
- width: 170,
+ column: {
+ width: 140,
+ },
form: {
rules: [{ required: true, message: '请输入组件名称' }],
component: {
@@ -391,7 +399,6 @@ export const createCrudOptions = function ({ crudExpose, menuButtonRef }: { crud
menuPermission: {
title: '拥有权限',
type: 'dict-select',
- width: 300,
form: {
show: false,
component: {
@@ -403,13 +410,18 @@ export const createCrudOptions = function ({ crudExpose, menuButtonRef }: { crud
},
},
},
+ column: {
+ width: 260,
+ },
},
cache: {
title: '缓存',
+ column: {
+ width: 60,
+ },
search: {
show: true,
},
- width: 60,
type: 'dict-switch',
dict: dict({
data: dictionary('button_whether_bool'),
@@ -432,10 +444,12 @@ export const createCrudOptions = function ({ crudExpose, menuButtonRef }: { crud
},
visible: {
title: '侧边可见',
+ column: {
+ width: 60,
+ },
search: {
show: true,
},
- width: 75,
type: 'dict-switch',
dict: dict({
data: dictionary('button_whether_bool'),
@@ -462,7 +476,9 @@ export const createCrudOptions = function ({ crudExpose, menuButtonRef }: { crud
search: {
show: true,
},
- width: 70,
+ column: {
+ width: 80,
+ },
type: 'dict-switch',
dict: dict({
data: dictionary('button_status_bool'),