Merge remote-tracking branch 'origin/v2.x' into v2.x
猿小天
commit
d20ae4d133
33
README.md
33
README.md
|
|
@ -45,12 +45,12 @@
|
|||
|
||||
- 插件市场：[戳我](https://bbs.django-vue-admin.com/plugMarket.html)👩👦👦
|
||||
|
||||
- django-vue-admin交流01群：812482043 [点击链接加入群聊](https://qm.qq.com/cgi-bin/qm/qr?k=aJVwjDvH-Es4MPJQuoO32N0SucK22TE5&jump_from=webapi)
|
||||
- django-vue-admin交流01群(已满)：812482043 [点击链接加入群聊](https://qm.qq.com/cgi-bin/qm/qr?k=aJVwjDvH-Es4MPJQuoO32N0SucK22TE5&jump_from=webapi)
|
||||
- django-vue-admin交流02群：687252418 [点击链接加入群聊](https://qm.qq.com/cgi-bin/qm/qr?k=4jJN4IjWGfxJ8YJXbb_gTsuWjR34WLdc&jump_from=webapi)
|
||||
|
||||
- 二维码
|
||||
|
||||
<img src='https://gitee.com/liqianglog/django-vue-admin/raw/master/dvadmin-ui/src/assets/images/qq.jpg' width='200'>
|
||||
<img src='https://images.gitee.com/uploads/images/2022/0530/233203_5fb11883_5074988.jpeg' width='200'>
|
||||
|
||||
## 源码地址
|
||||
|
||||
|
|
@ -82,7 +82,7 @@ github地址：[https://github.com/liqianglog/django-vue-admin](https://github.c
|
|||
|
||||
## 准备工作
|
||||
~~~
|
||||
Python >= 3.6.0 (推荐3.8+版本)
|
||||
Python >= 3.8.0 (推荐3.8+版本)
|
||||
nodejs >= 14.0 (推荐最新)
|
||||
Mysql >= 5.7.0 (可选，默认数据库sqlite3，推荐8.0版本)
|
||||
Redis(可选，最新版)
|
||||
|
|
@ -148,14 +148,15 @@ npm run dev
|
|||
# 先安装docker-compose (自行百度安装),执行此命令等待安装，如有使用celery插件请打开docker-compose.yml中celery 部分注释
|
||||
docker-compose up -d
|
||||
# 初始化后端数据(第一次执行即可)
|
||||
docker exec -ti DVAdmin-django bash
|
||||
docker exec -ti dvadmin-django bash
|
||||
python manage.py makemigrations
|
||||
python manage.py migrate
|
||||
python manage.py init -y
|
||||
python manage.py init_area
|
||||
python manage.py init
|
||||
exit
|
||||
|
||||
前端地址：http://127.0.0.1:8080
|
||||
后端地址：http://127.0.0.1:8000
|
||||
后端地址：http://127.0.0.1:8080/api
|
||||
# 在服务器上请把127.0.0.1 换成自己公网ip
|
||||
账号：superadmin 密码：admin123456
|
||||
|
||||
|
|
@ -171,21 +172,25 @@ docker-compose up -d --build
|
|||
|
||||
## 演示图✅
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -12,5 +12,6 @@ import os
|
|||
from django.core.asgi import get_asgi_application
|
||||
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'application.settings')
|
||||
os.environ["DJANGO_ALLOW_ASYNC_UNSAFE"] = "true"
|
||||
|
||||
application = get_asgi_application()
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
from django.conf import settings
|
||||
from django.db import ProgrammingError
|
||||
from django.db import connection
|
||||
|
||||
|
||||
def is_tenants_mode():
|
||||
"""
|
||||
判断是否为租户模式
|
||||
|
|
@ -35,7 +35,7 @@ def _get_all_system_config():
|
|||
system_config_obj = SystemConfig.objects.filter(status=True, parent_id__isnull=False).values(
|
||||
'parent__key', 'key', 'value', 'form_item_type').order_by('sort')
|
||||
for system_config in system_config_obj:
|
||||
value = system_config.get('value') or ''
|
||||
value = system_config.get('value', '')
|
||||
if value and system_config.get('form_item_type') == 7:
|
||||
value = value[0].get('url')
|
||||
data[f"{system_config.get('parent__key')}.{system_config.get('key')}"] = value
|
||||
|
|
|
|||
|
|
@ -12,5 +12,6 @@ import os
|
|||
from django.core.wsgi import get_wsgi_application
|
||||
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'application.settings')
|
||||
os.environ["DJANGO_ALLOW_ASYNC_UNSAFE"] = "true"
|
||||
|
||||
application = get_wsgi_application()
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ DATABASE_USER = "root"
|
|||
DATABASE_PASSWORD = "123456"
|
||||
|
||||
# 表前缀
|
||||
TABLE_PREFIX = "sys_"
|
||||
TABLE_PREFIX = "dvadmin_"
|
||||
# ================================================= #
|
||||
# ******** redis配置，无redis 可不进行配置 ******** #
|
||||
# ================================================= #
|
||||
|
|
|
|||
|
|
@ -255,13 +255,13 @@
|
|||
{
|
||||
"name": "重设密码",
|
||||
"value": "ResetPassword",
|
||||
"api": "/api/system/user/reset_password/{id}/",
|
||||
"api": "/api/system/user/{id}/reset_password/",
|
||||
"method": 2
|
||||
},
|
||||
{
|
||||
"name": "重置密码",
|
||||
"value": "DefaultPassword",
|
||||
"api": "/api/system/user/reset_to_default_password/{id}/",
|
||||
"api": "/api/system/user/{id}/reset_to_default_password/",
|
||||
"method": 2
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -187,6 +187,11 @@ class Dictionary(CoreModel):
|
|||
def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
|
||||
super().save(force_insert, force_update, using, update_fields)
|
||||
dispatch.refresh_dictionary() # 有更新则刷新字典配置
|
||||
|
||||
def delete(self, using=None, keep_parents=False):
|
||||
res = super().delete(using, keep_parents)
|
||||
dispatch.refresh_dictionary()
|
||||
return res
|
||||
|
||||
|
||||
class OperationLog(CoreModel):
|
||||
|
|
@ -320,6 +325,11 @@ class SystemConfig(CoreModel):
|
|||
def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
|
||||
super().save(force_insert, force_update, using, update_fields)
|
||||
dispatch.refresh_system_config() # 有更新则刷新系统配置
|
||||
|
||||
def delete(self, using=None, keep_parents=False):
|
||||
res = super().delete(using, keep_parents)
|
||||
dispatch.refresh_system_config()
|
||||
return res
|
||||
|
||||
|
||||
class LoginLog(CoreModel):
|
||||
|
|
|
|||
|
|
@ -28,12 +28,6 @@ system_url.register(r'api_white_list', ApiWhiteListViewSet)
|
|||
system_url.register(r'system_config', SystemConfigViewSet)
|
||||
|
||||
urlpatterns = [
|
||||
path('role/roleId_get_menu/<int:pk>/', RoleViewSet.as_view({'get': 'roleId_get_menu'})),
|
||||
path('menu/web_router/', MenuViewSet.as_view({'get': 'web_router'})),
|
||||
path('user/user_info/', UserViewSet.as_view({'get': 'user_info', 'put': 'update_user_info'})),
|
||||
path('user/change_password/<int:pk>/', UserViewSet.as_view({'put': 'change_password'})),
|
||||
path('user/reset_to_default_password/<int:pk>/', UserViewSet.as_view({'put': 'reset_to_default_password'})),
|
||||
path('user/reset_password/<int:pk>/', UserViewSet.as_view({'put': 'reset_password'})),
|
||||
path('user/export/', UserViewSet.as_view({'post': 'export_data', })),
|
||||
path('user/import/', UserViewSet.as_view({'get': 'import_data', 'post': 'import_data'})),
|
||||
path('system_config/save_content/', SystemConfigViewSet.as_view({'put': 'save_content'})),
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ class MenuViewSet(CustomModelViewSet):
|
|||
filter_fields = ['parent', 'name', 'status', 'is_link', 'visible', 'cache', 'is_catalog']
|
||||
extra_filter_backends = []
|
||||
|
||||
@action(methods=['GET'], detail=True, permission_classes=[])
|
||||
@action(methods=['GET'], detail=False, permission_classes=[])
|
||||
def web_router(self, request):
|
||||
"""用于前端获取当前角色的路由"""
|
||||
user = request.user
|
||||
|
|
|
|||
|
|
@ -101,6 +101,7 @@ class UserUpdateSerializer(CustomModelSerializer):
|
|||
validators=[
|
||||
CustomUniqueValidator(queryset=Users.objects.all(), message="手机号必须唯一")
|
||||
],
|
||||
allow_blank=True
|
||||
)
|
||||
|
||||
def save(self, **kwargs):
|
||||
|
|
@ -228,7 +229,7 @@ class UserViewSet(CustomModelViewSet):
|
|||
"role": "角色ID",
|
||||
}
|
||||
|
||||
@action(methods=["GET"], detail=True, permission_classes=[IsAuthenticated])
|
||||
@action(methods=["GET"], detail=False, permission_classes=[IsAuthenticated])
|
||||
def user_info(self, request):
|
||||
"""获取当前用户信息"""
|
||||
user = request.user
|
||||
|
|
@ -241,7 +242,7 @@ class UserViewSet(CustomModelViewSet):
|
|||
}
|
||||
return DetailResponse(data=result, msg="获取成功")
|
||||
|
||||
@action(methods=["PUT"], detail=True, permission_classes=[IsAuthenticated])
|
||||
@action(methods=["PUT"], detail=False, permission_classes=[IsAuthenticated])
|
||||
def update_user_info(self, request):
|
||||
"""修改当前用户信息"""
|
||||
user = request.user
|
||||
|
|
|
|||
|
|
@ -165,8 +165,9 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
|
|||
def find_filter_lookups(self, orm_lookups, search_term_key):
|
||||
for lookup in orm_lookups:
|
||||
# if lookup.find(search_term_key) >= 0:
|
||||
new_lookup = lookup.split("__")[0]
|
||||
# 修复条件搜索错误 bug
|
||||
if lookup == search_term_key:
|
||||
if new_lookup == search_term_key:
|
||||
return lookup
|
||||
return None
|
||||
|
||||
|
|
|
|||
|
|
@ -65,9 +65,7 @@ class ImportSerializerMixin:
|
|||
for ele in data:
|
||||
# 获取 unique 字段
|
||||
filter_dic = {i: ele.get(i) for i in list(set(self.import_field_dict.keys()) & set(unique_list))}
|
||||
print(11, ele)
|
||||
instance = filter_dic and queryset.filter(**filter_dic).first()
|
||||
print(22, instance)
|
||||
if instance and not updateSupport:
|
||||
continue
|
||||
if not filter_dic:
|
||||
|
|
|
|||
|
|
@ -65,37 +65,27 @@ class CustomPermission(BasePermission):
|
|||
def has_permission(self, request, view):
|
||||
if isinstance(request.user, AnonymousUser):
|
||||
return False
|
||||
# 对ViewSet下的def方法进行权限判断
|
||||
# 当权限为空时,则可以访问
|
||||
is_head = getattr(view, 'head', None)
|
||||
if is_head:
|
||||
head_kwargs = getattr(view.head, 'kwargs', None)
|
||||
if head_kwargs:
|
||||
_permission_classes = getattr(head_kwargs, 'permission_classes', None)
|
||||
if _permission_classes is None:
|
||||
return True
|
||||
# 判断是否是超级管理员
|
||||
if request.user.is_superuser:
|
||||
return True
|
||||
else:
|
||||
api = request.path # 当前请求接口
|
||||
method = request.method # 当前请求方法
|
||||
methodList = ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS']
|
||||
methodList = ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS', 'PATCH']
|
||||
method = methodList.index(method)
|
||||
# ***接口白名单***
|
||||
api_white_list = ApiWhiteList.objects.values(permission__api=F('url'), permission__method=F('method'))
|
||||
api_white_list = [
|
||||
str(item.get('permission__api').replace('{id}', '.*?')) + ":" + str(item.get('permission__method')) for
|
||||
item in api_white_list if item.get('permission__api')]
|
||||
str(item.get('permission__api').replace('{id}', '([a-zA-Z0-9-]+)')) + ":" + str(
|
||||
item.get('permission__method')) + '$' for item in api_white_list if item.get('permission__api')]
|
||||
# ********#
|
||||
if not hasattr(request.user, "role"):
|
||||
return False
|
||||
userApiList = request.user.role.values('permission__api', 'permission__method') # 获取当前用户的角色拥有的所有接口
|
||||
ApiList = [
|
||||
str(item.get('permission__api').replace('{id}', '.*?')) + ":" + str(item.get('permission__method')) for
|
||||
item in
|
||||
userApiList if item.get('permission__api')]
|
||||
new_api_ist = api_white_list + ApiList
|
||||
str(item.get('permission__api').replace('{id}', '([a-zA-Z0-9-]+)')) + ":" + str(
|
||||
item.get('permission__method')) + '$' for item in userApiList if item.get('permission__api')]
|
||||
new_api_ist = api_white_list + ApiList
|
||||
new_api = api + ":" + str(method)
|
||||
for item in new_api_ist:
|
||||
matchObj = re.match(item, new_api, re.M | re.I)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ chardet==4.0.0
|
|||
coreapi==2.3.3
|
||||
coreschema==0.0.4
|
||||
Django==3.2.3
|
||||
django-comment-migrate==0.1.1
|
||||
django-comment-migrate==0.1.5
|
||||
django-cors-headers==3.10.1
|
||||
django-filter==21.1
|
||||
django-ranged-response==0.2.0
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@ FROM registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/python38-base-backend:late
|
|||
WORKDIR /backend
|
||||
COPY ./backend/ .
|
||||
RUN awk 'BEGIN { cmd="cp -i ./conf/env.example.py ./conf/env.py "; print "n" |cmd; }'
|
||||
RUN python3 -m pip install -i https://mirrors.aliyun.com/pypi/simple/ -r requirements.txt
|
||||
RUN python3 -m pip install -i https://pypi.tuna.tsinghua.edu.cn/simple/ -r requirements.txt
|
||||
CMD ["celery", "-A", "application", "worker", "-B", "--loglevel=info"]
|
||||
|
||||
|
|
|
|||
|
|
@ -2,5 +2,5 @@ FROM registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/python38-base-backend:late
|
|||
WORKDIR /backend
|
||||
COPY ./backend/ .
|
||||
RUN awk 'BEGIN { cmd="cp -i ./conf/env.example.py ./conf/env.py "; print "n" |cmd; }'
|
||||
RUN python3 -m pip install -i https://mirrors.aliyun.com/pypi/simple/ -r requirements.txt
|
||||
RUN python3 -m pip install -i https://pypi.tuna.tsinghua.edu.cn/simple/ -r requirements.txt
|
||||
CMD ["daphne","-b","0.0.0.0","-p","8000","application.asgi:application"]
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ server {
|
|||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto https;
|
||||
set_real_ip_from 177.7.0.0/16;
|
||||
set_real_ip_from 0.0.0.0/0;
|
||||
real_ip_header X-Forwarded-For;
|
||||
root /usr/share/nginx/html;
|
||||
index index.html index.php index.htm;
|
||||
|
|
@ -18,9 +18,9 @@ server {
|
|||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
set_real_ip_from 177.7.0.0/16;
|
||||
set_real_ip_from 0.0.0.0/0;
|
||||
real_ip_header X-Forwarded-For;
|
||||
rewrite ^/api/(.*)$ /$1 break; #重写
|
||||
proxy_pass http://177.7.0.12:8000/; # 设置代理服务器的协议和地址
|
||||
proxy_pass http://177.8.0.12:8000/; # 设置代理服务器的协议和地址
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ export function getErrorMessage (msg) {
|
|||
function createService () {
|
||||
// 创建一个 axios 实例
|
||||
const service = axios.create({
|
||||
baseURL: process.env.VUE_APP_API_URL,
|
||||
baseURL: util.baseURL(),
|
||||
timeout: 20000,
|
||||
paramsSerializer: (params) => qs.stringify(params, { indices: false })
|
||||
})
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ export default {
|
|||
// 设置上传的请求头部
|
||||
headers: { Authorization: 'JWT ' + util.cookies.get('token') },
|
||||
// 上传的地址
|
||||
url: process.env.VUE_APP_API + '/api/system/file/'
|
||||
url: util.baseURL() + 'api/system/file/'
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -78,7 +78,7 @@ export default {
|
|||
/** 下载模板操作 */
|
||||
importTemplate () {
|
||||
downloadFile({
|
||||
url: process.env.VUE_APP_API + this.importApi,
|
||||
url: util.baseURL() + this.importApi,
|
||||
params: {},
|
||||
method: 'get'
|
||||
})
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@ export default {
|
|||
...defaultElProps.columns
|
||||
]
|
||||
} else {
|
||||
defaultElProps.radioConfig = this.elProps.radioConfig
|
||||
defaultElProps.radioConfig = this.elProps
|
||||
? this.elProps.radioConfig
|
||||
: {}
|
||||
defaultElProps.columns = [
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
import util from '@/libs/util.js'
|
||||
export default {
|
||||
'image-uploader': {
|
||||
form: { component: { name: 'd2p-file-uploader', props: { elProps: { listType: 'picture-card', accept: '.png,.jpeg,.jpg,.ico,.bmp,.gif' } } } },
|
||||
|
|
@ -26,6 +27,14 @@ export default {
|
|||
const value = row[col.key]
|
||||
if (value != null && value) {
|
||||
row[col.key] = value.split(',')
|
||||
// 进行组装地址，纠正地址
|
||||
row[col.key].map((val, index) => {
|
||||
if (val.startsWith('/')) {
|
||||
row[col.key][index] = util.baseURL() + val.slice(1)
|
||||
} else {
|
||||
row[col.key][index] = !val.startsWith('http') ? util.baseURL() + val : val
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -56,6 +65,14 @@ export default {
|
|||
const value = row[col.key]
|
||||
if (value != null && value) {
|
||||
row[col.key] = value.split(',')
|
||||
// 进行组装地址，纠正地址
|
||||
row[col.key].map((val, index) => {
|
||||
if (val.startsWith('/')) {
|
||||
row[col.key][index] = util.baseURL() + val.slice(1)
|
||||
} else {
|
||||
row[col.key][index] = !val.startsWith('http') ? util.baseURL() + val : val
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -82,6 +99,14 @@ export default {
|
|||
const value = row[col.key]
|
||||
if (value != null && value) {
|
||||
row[col.key] = value.split(',')
|
||||
// 进行组装地址，纠正地址
|
||||
row[col.key].map((val, index) => {
|
||||
if (val.startsWith('/')) {
|
||||
row[col.key][index] = util.baseURL() + val.slice(1)
|
||||
} else {
|
||||
row[col.key][index] = !val.startsWith('http') ? util.baseURL() + val : val
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -112,6 +137,14 @@ export default {
|
|||
const value = row[col.key]
|
||||
if (value != null && value) {
|
||||
row[col.key] = value.split(',')
|
||||
// 进行组装地址，纠正地址
|
||||
row[col.key].map((val, index) => {
|
||||
if (val.startsWith('/')) {
|
||||
row[col.key][index] = util.baseURL() + val.slice(1)
|
||||
} else {
|
||||
row[col.key][index] = !val.startsWith('http') ? util.baseURL() + val : val
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,8 +18,7 @@ import XEUtils from 'xe-utils'
|
|||
import store from '@/store/index'
|
||||
import { urlPrefix as deptPrefix } from '@/views/system/dept/api'
|
||||
import types from '@/config/d2p-extends/types'
|
||||
import { checkPlugins } from '@/views/plugins'
|
||||
const uploadUrl = util.baseURL() + 'api/system/file/'
|
||||
import { checkPlugins, plugins } from '@/views/plugins'
|
||||
|
||||
/**
|
||||
// vxe0
|
||||
|
|
@ -32,7 +31,8 @@ const uploadUrl = util.baseURL() + 'api/system/file/'
|
|||
// 按如下重命名引入可与官方版共存，index.vue中标签用<d2-crud-x />使用加强版
|
||||
// 不传name，则d2CrudX的标签仍为<d2-crud>,不可与官方版共存
|
||||
Vue.use(d2CrudX, { name: 'd2-crud-x' })
|
||||
|
||||
// 注册dvadmin插件
|
||||
Vue.use(plugins)
|
||||
// // 官方版【此处为演示与官方版共存而引入，全新项目中可以用d2-crud-x完全替代官方版】
|
||||
// Vue.use(d2Crud)
|
||||
/**
|
||||
|
|
@ -167,7 +167,7 @@ Vue.use(D2pUploader, {
|
|||
domain: 'http://d2p.file.veryreader.com'
|
||||
},
|
||||
form: {
|
||||
action: uploadUrl,
|
||||
action: util.baseURL() + 'api/system/file/',
|
||||
name: 'file',
|
||||
data: {}, // 上传附加参数
|
||||
headers () {
|
||||
|
|
@ -180,7 +180,7 @@ Vue.use(D2pUploader, {
|
|||
if (ret.data === null || ret.data === '') {
|
||||
throw new Error('上传失败')
|
||||
}
|
||||
return { url: util.baseURL() + ret.data.url, key: option.data.key }
|
||||
return { url: util.baseURL() + ret.data.url, key: option.data.key, id: ret.data.id }
|
||||
},
|
||||
withCredentials: false // 是否带cookie
|
||||
}
|
||||
|
|
@ -368,6 +368,20 @@ Vue.prototype.commonEndColumns = function (param = {}) {
|
|||
title: '创建时间',
|
||||
key: 'create_datetime',
|
||||
width: 160,
|
||||
search: {
|
||||
disabled: !showData.create_datetime.showForm,
|
||||
width: 240,
|
||||
component: { // 查询框组件配置，默认根据form配置生成
|
||||
name: 'el-date-picker',
|
||||
props: {
|
||||
type: 'daterange',
|
||||
'range-separator': '至',
|
||||
'start-placeholder': '开始',
|
||||
'end-placeholder': '结束',
|
||||
valueFormat: 'yyyy-MM-dd'
|
||||
}
|
||||
}
|
||||
},
|
||||
show: showData.create_datetime.showTable,
|
||||
type: 'datetime',
|
||||
sortable: true,
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ export default {
|
|||
_self.$refs.userInfoForm.validate((valid) => {
|
||||
if (valid) {
|
||||
request({
|
||||
url: '/api/system/user/user_info/',
|
||||
url: '/api/system/user/update_user_info/',
|
||||
method: 'put',
|
||||
data: _self.userInfo
|
||||
}).then((res) => {
|
||||
|
|
@ -266,7 +266,7 @@ export default {
|
|||
params.newPassword = _self.$md5(params.newPassword)
|
||||
params.newPassword2 = _self.$md5(params.newPassword2)
|
||||
request({
|
||||
url: '/api/system/user/change_password/' + userId + '/',
|
||||
url: '/api/system/user/' + userId + '/change_password/',
|
||||
method: 'put',
|
||||
data: params
|
||||
}).then((res) => {
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ export const handleRouter = function (menuData) {
|
|||
meta: {
|
||||
title: item.name,
|
||||
auth: true,
|
||||
cache: item.cache === 1
|
||||
cache: item.cache
|
||||
}
|
||||
}
|
||||
result.push(obj)
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ import pluginError from '@/plugin/error'
|
|||
import pluginLog from '@/plugin/log'
|
||||
import pluginOpen from '@/plugin/open'
|
||||
import tableSelector from '@/components/table-selector/index'
|
||||
import { plugins } from '@/views/plugins/index.js'
|
||||
export default {
|
||||
async install (Vue, options) {
|
||||
// 设置为 false 以阻止 vue 在启动时生成生产提示
|
||||
|
|
@ -40,6 +39,5 @@ export default {
|
|||
Vue.use(pluginLog)
|
||||
Vue.use(pluginOpen)
|
||||
Vue.use(tableSelector)
|
||||
Vue.use(plugins)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,12 +35,13 @@ export default {
|
|||
*/
|
||||
async load ({ state, dispatch, commit }) {
|
||||
// store 赋值
|
||||
state.data = await dispatch('d2admin/db/get', {
|
||||
const data = await dispatch('d2admin/db/get', {
|
||||
dbName: 'sys',
|
||||
path: 'settings.init',
|
||||
defaultValue: {},
|
||||
user: true
|
||||
}, { root: true })
|
||||
commit('set', data)
|
||||
}
|
||||
},
|
||||
mutations: {
|
||||
|
|
@ -52,6 +53,16 @@ export default {
|
|||
*/
|
||||
async get (state, key, value) {
|
||||
return state[key]
|
||||
},
|
||||
/**
|
||||
* @description 赋值系统配置
|
||||
* @param {Object} state state
|
||||
* @param {Object} value active
|
||||
*/
|
||||
async set (state, value) {
|
||||
state.data = value
|
||||
state.keepRecord = value['login.keep_record']
|
||||
return state.data
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ export const crudOptions = (vm) => {
|
|||
},
|
||||
options: {
|
||||
tableType: 'vxe-table',
|
||||
stripe: false,
|
||||
rowKey: true, // 必须设置，true or false
|
||||
rowId: 'id',
|
||||
height: '100%', // 表格高度100%, 使用toolbar必须设置
|
||||
|
|
|
|||
|
|
@ -1,15 +1,12 @@
|
|||
<!--
|
||||
* @创建文件时间: 2021-06-01 22:41:21
|
||||
* @Auther: 猿小天
|
||||
* @最后修改人: 猿小天
|
||||
* @最后修改时间: 2021-08-09 20:27:09
|
||||
* 联系Qq:1638245306
|
||||
* @文件介绍: 字典管理
|
||||
-->
|
||||
<template>
|
||||
<d2-container :class="{ 'page-compact': crud.pageOptions.compact }">
|
||||
<!-- <template slot="header">测试页面1</template>-->
|
||||
<d2-crud-x ref="d2Crud" v-bind="_crudProps" v-on="_crudListeners" @dictionaryConfigure="dictionaryConfigure">
|
||||
<d2-crud-x
|
||||
ref="d2Crud"
|
||||
v-bind="_crudProps"
|
||||
v-on="_crudListeners"
|
||||
@dictionaryConfigure="dictionaryConfigure"
|
||||
>
|
||||
<div slot="header">
|
||||
<crud-search
|
||||
ref="search"
|
||||
|
|
@ -30,14 +27,18 @@
|
|||
/>
|
||||
</div>
|
||||
</d2-crud-x>
|
||||
<el-drawer
|
||||
:visible.sync="drawer"
|
||||
:size="700">
|
||||
<div slot="title">
|
||||
<span>字典列表</span>
|
||||
<el-tag size="small" style="margin-left: 10px">{{dictionaryRow.label}}</el-tag>
|
||||
</div>
|
||||
<sub-dictionary style="margin-top: 80px;margin-left: 10px" :dictionaryRow="dictionaryRow"></sub-dictionary>
|
||||
<el-drawer :visible.sync="drawer" :size="700">
|
||||
<div slot="title">
|
||||
<span>字典列表</span>
|
||||
<el-tag size="small" style="margin-left: 10px">{{
|
||||
dictionaryRow.label
|
||||
}}</el-tag>
|
||||
</div>
|
||||
<sub-dictionary
|
||||
style="margin-top: 80px; margin-left: 10px"
|
||||
:dictionaryRow="dictionaryRow"
|
||||
>
|
||||
</sub-dictionary>
|
||||
</el-drawer>
|
||||
</d2-container>
|
||||
</template>
|
||||
|
|
@ -80,6 +81,10 @@ export default {
|
|||
dictionaryConfigure (scope) {
|
||||
this.drawer = true
|
||||
this.dictionaryRow = scope.row
|
||||
},
|
||||
doAfterRowChange (row) {
|
||||
this.doRefresh({ from: 'afterRowChange' })
|
||||
this.$store.dispatch('d2admin/dictionary/load')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,8 +44,7 @@ export default {
|
|||
}
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
}
|
||||
return {}
|
||||
},
|
||||
methods: {
|
||||
getCrudOptions () {
|
||||
|
|
@ -70,6 +69,10 @@ export default {
|
|||
},
|
||||
delRequest (row) {
|
||||
return api.DelObj(row.id)
|
||||
},
|
||||
doAfterRowChange (row) {
|
||||
this.doRefresh({ from: 'afterRowChange' })
|
||||
this.$store.dispatch('d2admin/dictionary/load')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import { mapActions } from 'vuex'
|
||||
import { mapActions, mapState } from 'vuex'
|
||||
import localeMixin from '@/locales/mixin.js'
|
||||
import * as api from '@/views/system/login/api'
|
||||
|
||||
|
|
@ -15,15 +15,6 @@ export default {
|
|||
},
|
||||
data () {
|
||||
return {
|
||||
siteName: this.systemConfig('login.site_name'), // 网站名称
|
||||
siteLogo: this.systemConfig('login.site_logo') || require('./image/dvadmin.png'), // 网站logo地址
|
||||
loginBackground: this.systemConfig('login.login_background') || require('./image/bg.jpg'), // 登录页背景图
|
||||
copyright: this.systemConfig('login.copyright'), // 版权
|
||||
keepRecord: this.systemConfig('login.keep_record'), // 备案
|
||||
helpUrl: this.systemConfig('login.help_url'), // 帮助
|
||||
privacyUrl: this.systemConfig('login.privacy_url'), // 隐私
|
||||
clauseUrl: this.systemConfig('login.clause_url'), // 条款
|
||||
captchaState: this.systemConfig('base.captcha_state') || true, // 验证码
|
||||
processTitle: process.env.VUE_APP_TITLE || 'D2Admin',
|
||||
backgroundImage: 'url(' + this.loginBackground + ')',
|
||||
// 表单
|
||||
|
|
@ -67,6 +58,19 @@ export default {
|
|||
]
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
...mapState('d2admin', {
|
||||
siteLogo: state => state.settings.data['login.site_logo'] || require('./image/dvadmin.png'), // 网站logo地址
|
||||
keepRecord: state => state.settings.data['login.keep_record'],
|
||||
siteName: state => state.settings.data['login.site_name'], // 网站名称
|
||||
copyright: state => state.settings.data['login.copyright'],
|
||||
loginBackground: state => state.settings.data['login.login_background'] || require('./image/bg.jpg'), // 登录页背景图
|
||||
helpUrl: state => state.settings.data['login.help_url'], // 帮助
|
||||
privacyUrl: state => state.settings.data['login.privacy_url'], // 隐私
|
||||
clauseUrl: state => state.settings.data['login.clause_url'], // 条款
|
||||
captchaState: state => state.settings.data['base.captcha_state'] !== undefined ? state.settings.data['base.captcha_state'] : true // 验证码
|
||||
})
|
||||
},
|
||||
mounted () {
|
||||
},
|
||||
beforeDestroy () {
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@ export const crudOptions = (vm) => {
|
|||
}
|
||||
}
|
||||
},
|
||||
width: 180,
|
||||
minWidth: 180,
|
||||
type: 'input',
|
||||
form: {
|
||||
rules: [ // 表单校验规则
|
||||
|
|
@ -225,7 +225,16 @@ export const crudOptions = (vm) => {
|
|||
form: {
|
||||
value: false,
|
||||
component: {
|
||||
placeholder: '请选择是否外链接'
|
||||
placeholder: '请选择是否目录'
|
||||
},
|
||||
valueChange (key, value, form, { getColumn, mode, component, immediate, getComponent }) {
|
||||
if (!value) {
|
||||
form.web_path = undefined
|
||||
form.component = undefined
|
||||
form.component_name = undefined
|
||||
form.cache = false
|
||||
form.is_link = false
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -247,7 +256,9 @@ export const crudOptions = (vm) => {
|
|||
placeholder: '请选择是否外链接'
|
||||
},
|
||||
valueChange (key, value, form, { getColumn, mode, component, immediate, getComponent }) {
|
||||
form.web_path = null
|
||||
form.web_path = undefined
|
||||
form.component = undefined
|
||||
form.component_name = undefined
|
||||
if (value) {
|
||||
getColumn('web_path').title = '外链接地址'
|
||||
getColumn('web_path').component.placeholder = '请输入外链接地址'
|
||||
|
|
@ -378,7 +389,7 @@ export const crudOptions = (vm) => {
|
|||
search: {
|
||||
disabled: false
|
||||
},
|
||||
width: 50,
|
||||
width: 60,
|
||||
type: 'radio',
|
||||
dict: {
|
||||
data: vm.dictionary('button_whether_bool')
|
||||
|
|
@ -416,6 +427,9 @@ export const crudOptions = (vm) => {
|
|||
component: {
|
||||
placeholder: '请选择侧边可见'
|
||||
},
|
||||
rules: [ // 表单校验规则
|
||||
{ required: true, message: '侧边可见必填项' }
|
||||
],
|
||||
helper: {
|
||||
render (h) {
|
||||
return (< el-alert title="是否显示在侧边菜单中" type="warning" />
|
||||
|
|
@ -440,7 +454,10 @@ export const crudOptions = (vm) => {
|
|||
value: true,
|
||||
component: {
|
||||
placeholder: '请选择状态'
|
||||
}
|
||||
},
|
||||
rules: [ // 表单校验规则
|
||||
{ required: true, message: '状态必填项' }
|
||||
]
|
||||
}
|
||||
}
|
||||
].concat(vm.commonEndColumns({
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ export function DelObj (id) {
|
|||
// 通过角色id,获取菜单数据
|
||||
export function GetMenuData (obj) {
|
||||
return request({
|
||||
url: '/api/system/role/roleId_get_menu/' + obj.id + '/',
|
||||
url: '/api/system/role/' + obj.id + '/roleId_get_menu/',
|
||||
method: 'get',
|
||||
params: {}
|
||||
}).then(res => {
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ export function DelObj (id) {
|
|||
*/
|
||||
export function ResetPwd (obj) {
|
||||
return request({
|
||||
url: urlPrefix + 'reset_password/' + obj.id + '/',
|
||||
url: urlPrefix + obj.id + '/reset_password/',
|
||||
method: 'put',
|
||||
data: obj
|
||||
})
|
||||
|
|
|
|||
Loading…
Reference in New Issue