diff --git a/db.sqlite3 b/db.sqlite3 index f75dca4540fc8f29878420db9cd496f00a5a84fa..b90fdab599273a41fe0af9cbcde0e7143dfa7adb 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/demo/admin.py b/demo/admin.py index df6d11afccd2ed8f29f82403f85ce70960ead2f4..4e77bc79a6ef26c99fe114bed9ef7aaf1ec6a934 100644 --- a/demo/admin.py +++ b/demo/admin.py @@ -1,9 +1,12 @@ import datetime from django.contrib import admin +from django.db import transaction from django.urls import reverse from .models import * +from import_export import resources +from import_export.admin import ImportExportModelAdmin, ImportExportActionModelAdmin # Register your models here. @@ -21,6 +24,7 @@ class DepartmentAdmin(admin.ModelAdmin): actions_on_top = True + class ImageInline(admin.TabularInline): model = Image @@ -68,14 +72,19 @@ class AgeListFilter(admin.SimpleListFilter): return queryset.filter(birthday__gte=day) +class ProxyResource(resources.ModelResource): + class Meta: + model = Employe + @admin.register(Employe) -class EmployeAdmin(admin.ModelAdmin): +class EmployeAdmin(ImportExportActionModelAdmin): + resource_class = ProxyResource list_display = ('id', 'name', 'gender', 'phone', 'birthday', 'department', 'enable', 'create_time') # search_fields = ('name', 'enable', 'idCard', 'department') search_fields = ('name', 'department__name') list_per_page = 20 raw_id_fields = ('department', 'title') - list_filter = ('department', AgeListFilter) + list_filter = ('department', AgeListFilter, 'create_time') # list_filter = (AgeListFilter, 'department', 'create_time', 'birthday', 'time', 'enable', 'gender') list_display_links = ('name',) @@ -83,8 +92,18 @@ class EmployeAdmin(admin.ModelAdmin): list_editable = ('department', 'phone', 'birthday', 'enable', 'gender') date_hierarchy = 'create_time' + + fieldsets = [(None, {'fields': ['name', 'gender','phone']}), + (u'其他信息', { + 'classes': ('123',), + 'fields': ['birthday', 'department', 'enable']})] + + + @transaction.atomic + def test(self, request, queryset): + pass # 增加自定义按钮 - actions = ['make_copy', 'custom_button'] + actions = [test, 'make_copy', 'custom_button'] def custom_button(self, request, queryset): pass diff --git a/simpleui_demo/settings.py b/simpleui_demo/settings.py index b0d5073ce527c212ef0f22c10c6e668d50fe731c..18285e2650e1845c34566de1016160138d2054dd 100644 --- a/simpleui_demo/settings.py +++ b/simpleui_demo/settings.py @@ -185,6 +185,10 @@ SIMPLEUI_CONFIG = { 'name': '内网穿透', 'url': 'https://www.wezoz.com', 'icon': 'fab fa-github' + }, { + 'name': '内网穿透', + 'url': 'https://www.wezoz.com', + 'icon': 'fab fa-github' }, { 'name': '登录页嵌套测试', 'url': '/login' @@ -204,4 +208,4 @@ SIMPLEUI_ICON = { # 指定simpleui 是否以脱机模式加载静态资源,为True的时候将默认从本地读取所有资源,即使没有联网一样可以。适合内网项目 # 不填该项或者为False的时候,默认从第三方的cdn获取 -# SIMPLEUI_STATIC_OFFLINE = True +SIMPLEUI_STATIC_OFFLINE = False