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

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

Browse Source
This commit is contained in:
猿小天
2023-06-06 20:53:08 +08:00
parent e962ca6559 4bdc256311
commit e7065ab89e
11 changed files with 17036 additions and 3371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/.env.development
View File

@@ -2,7 +2,7 @@
ENV = 'development' ENV = 'development'
# 本地环境接口地址 # 本地环境接口地址
VITE_API_URL = 'http://127.0.0.1:8000/' VITE_API_URL = 'https://demo.dvadmin.com/api/'
# 是否启用按钮权限 # 是否启用按钮权限
VITE_PM_ENABLED = true VITE_PM_ENABLED = true

13749
web/package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

2
web/src/views/system/areas/crud.tsx
View File

@@ -205,7 +205,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
name: 'fs-dict-switch', name: 'fs-dict-switch',
activeText: '', activeText: '',
inactiveText: '', inactiveText: '',
style: '--el-switch-on-color: #409eff; --el-switch-off-color: #dcdfe6', style: '--el-switch-on-color: var(--el-color-primary); --el-switch-off-color: #dcdfe6',
onChange: compute((context) => { onChange: compute((context) => {
return () => { return () => {
api.UpdateObj(context.row).then((res: APIResponseData) => { api.UpdateObj(context.row).then((res: APIResponseData) => {

7
web/src/views/system/dept/index.vue
View File

@@ -20,9 +20,9 @@
@node-click="handleNodeClick" @node-click="handleNodeClick"
> >
<template #default="{ node, data }"> <template #default="{ node, data }">
<span v-if="data.status" class="text-center font-black text-xl"><SvgIcon <span v-if="data.status" class="text-center font-black font-normal"><SvgIcon
:name="node.data.icon"/>&nbsp;{{ node.label }}</span> :name="node.data.icon"/>&nbsp;{{ node.label }}</span>
<span v-else class="text-center font-black text-xl text-red-700"><SvgIcon <span v-else class="text-center font-black font-normal text-red-700"><SvgIcon
:name="node.data.icon"/>&nbsp;{{ node.label }}</span> :name="node.data.icon"/>&nbsp;{{ node.label }}</span>
</template> </template>
</el-tree> </el-tree>
@@ -302,4 +302,7 @@ onMounted(() => {
.el-card { .el-card {
height: 100%; height: 100%;
} }
.font-normal {
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
}
</style> </style>

2
web/src/views/system/dictionary/crud.tsx
View File

@@ -179,7 +179,7 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
name: 'fs-dict-switch', name: 'fs-dict-switch',
activeText: '', activeText: '',
inactiveText: '', inactiveText: '',
style: '--el-switch-on-color: #409eff; --el-switch-off-color: #dcdfe6', style: '--el-switch-on-color: var(--el-color-primary); --el-switch-off-color: #dcdfe6',
onChange: compute((context) => { onChange: compute((context) => {
return () => { return () => {
api.UpdateObj(context.row).then((res: APIResponseData) => { api.UpdateObj(context.row).then((res: APIResponseData) => {

7
web/src/views/system/menu/index.vue
View File

@@ -19,10 +19,10 @@
@node-drop="nodeDrop" lazy icon="ArrowRightBold" :indent="12" draggable @node-drop="nodeDrop" lazy icon="ArrowRightBold" :indent="12" draggable
@node-click="handleNodeClick"> @node-click="handleNodeClick">
<template #default="{ node, data }"> <template #default="{ node, data }">
<span v-if="data.status" class="text-center font-black text-xl"> <span v-if="data.status" class="text-center font-black font-normal">
<SvgIcon :name="node.data.icon"/>&nbsp;{{ node.label }} <SvgIcon :name="node.data.icon"/>&nbsp;{{ node.label }}
</span> </span>
<span v-else class="text-center font-black text-xl text-red-700"> <span v-else class="text-center font-black text-red-700 font-normal">
<SvgIcon :name="node.data.icon"/>&nbsp;{{ node.label }} <SvgIcon :name="node.data.icon"/>&nbsp;{{ node.label }}
</span> </span>
</template> </template>
@@ -394,4 +394,7 @@ onActivated(() => {
.el-card { .el-card {
height: 100%; height: 100%;
} }
.font-normal {
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
}
</style> </style>

2
web/src/views/system/role/crud.tsx
View File

@@ -177,7 +177,7 @@ export const createCrudOptions = function ({ crudExpose, rolePermission }: { cru
name: 'fs-dict-switch', name: 'fs-dict-switch',
activeText: '', activeText: '',
inactiveText: '', inactiveText: '',
style: '--el-switch-on-color: #409eff; --el-switch-off-color: #dcdfe6', style: '--el-switch-on-color: var(--el-color-primary); --el-switch-off-color: #dcdfe6',
onChange: compute((context) => { onChange: compute((context) => {
return () => { return () => {
api.UpdateObj(context.row).then((res: APIResponseData) => { api.UpdateObj(context.row).then((res: APIResponseData) => {

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

@@ -346,7 +346,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
name: 'fs-dict-switch', name: 'fs-dict-switch',
activeText: '', activeText: '',
inactiveText: '', inactiveText: '',
style: '--el-switch-on-color: #409eff; --el-switch-off-color: #dcdfe6', style: '--el-switch-on-color: var(--el-color-primary); --el-switch-off-color: #dcdfe6',
onChange: compute((context) => { onChange: compute((context) => {
return () => { return () => {
api.UpdateObj(context.row).then((res: APIResponseData) => { api.UpdateObj(context.row).then((res: APIResponseData) => {

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

@@ -23,7 +23,7 @@
@node-click="onTreeNodeClick" @node-click="onTreeNodeClick"
> >
<template #default="{ node, data }"> <template #default="{ node, data }">
<span class="text-center font-black text-xl">{{ node.label }}</span> <span class="text-center font-black font-normal">{{ node.label }}</span>
</template> </template>
</el-tree> </el-tree>
</el-card> </el-card>
@@ -142,4 +142,7 @@ onMounted(() => {
.el-card { .el-card {
height: 100%; height: 100%;
} }
.font-normal {
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
}
</style> </style>

2
web/src/views/system/whiteList/crud.tsx
View File

@@ -217,7 +217,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
name: 'fs-dict-switch', name: 'fs-dict-switch',
activeText: '', activeText: '',
inactiveText: '', inactiveText: '',
style: '--el-switch-on-color: #409eff; --el-switch-off-color: #dcdfe6', style: '--el-switch-on-color: var(--el-color-primary); --el-switch-off-color: #dcdfe6',
onChange: compute((context) => { onChange: compute((context) => {
return () => { return () => {
api.UpdateObj(context.row).then((res: APIResponseData) => { api.UpdateObj(context.row).then((res: APIResponseData) => {

6627
web/yarn.lock
View File

File diff suppressed because it is too large Load Diff