diff --git a/.gitignore b/.gitignore index 3876009d..3445645e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .idea/ django_simpleui.egg-info -dist \ No newline at end of file +dist +/simpleui.egg-info/ diff --git a/QUICK.md b/QUICK.md index 091696db..d1059219 100644 --- a/QUICK.md +++ b/QUICK.md @@ -40,6 +40,7 @@ simpleui 快速上手指南 + [自定义按钮](#自定义按钮) + [离线模式](#离线模式) + [关闭Loading遮罩层](#关闭Loading遮罩层) + + [admindoc](#admindoc) # 常见问题 + [settings.py](#settingspy-找不到) + [python版本问题](#python版本问题) @@ -716,6 +717,9 @@ SIMPLEUI_LOADING = False ``` True或None 默认显示加载遮罩层，指定为False 不显示遮罩层。默认显示 +## admindoc +admindoc需要simpleui 3.3+ 版本 + ## 常见问题 ### settings.py 找不到 diff --git a/doc/en/QUICK_en.md b/doc/en/QUICK_en.md index 885c6b34..8f29c3f7 100644 --- a/doc/en/QUICK_en.md +++ b/doc/en/QUICK_en.md @@ -38,6 +38,7 @@ Before starting，please take a minte to understand **settings.py**, because it' + [Custom Action](#Custom%2dAction) + [Offline](#Offline) + [Close Loading](#Close%2dLoading) + + [admindoc](#admindoc) # Common Problems + [settings.py](#Not%2dfound%2dsettings.py) + [python version problem](#python%2dversion%2dproblem) @@ -655,6 +656,9 @@ settings.py: SIMPLEUI_LOADING = False ``` +## admindoc +Admindoc must be the simpleui3.3+ version + ## Common Problems ### Not found settings.py diff --git a/simpleui/__init__.py b/simpleui/__init__.py index f64a8b01..f4434d1a 100644 --- a/simpleui/__init__.py +++ b/simpleui/__init__.py @@ -1,2 +1,2 @@ def get_version(): - return '3.2' + return '3.3' diff --git a/simpleui/static/admin/simpleui-x/css/index.css b/simpleui/static/admin/simpleui-x/css/index.css index 3a5d74b3..bfe5276d 100644 --- a/simpleui/static/admin/simpleui-x/css/index.css +++ b/simpleui/static/admin/simpleui-x/css/index.css @@ -101,7 +101,7 @@ body { } .simpleui-table tr:hover th, .simpleui-table tr:hover td { - background-color: inherit!important; + background-color: inherit !important; } .simpleui-table tr th { text-align: right; @@ -363,4 +363,8 @@ body { border-radius: 0; background: rgba(0, 0, 0, 0.1); } +.lite-menus .el-submenu__title:hover, +.lite-menus .is-opened .el-submenu__title { + color: white !important; +} /*# sourceMappingURL=index.css.map */ \ No newline at end of file diff --git a/simpleui/static/admin/simpleui-x/css/index.css.map b/simpleui/static/admin/simpleui-x/css/index.css.map index 4fd78112..2eff1be5 100644 --- a/simpleui/static/admin/simpleui-x/css/index.css.map +++ b/simpleui/static/admin/simpleui-x/css/index.css.map @@ -1 +1 @@ -{"version":3,"sources":["index.less"],"names":[],"mappings":"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","file":"index.css"} \ No newline at end of file +{"version":3,"sources":["index.less"],"names":[],"mappings":"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","file":"index.css"} \ No newline at end of file diff --git a/simpleui/static/admin/simpleui-x/css/index.less b/simpleui/static/admin/simpleui-x/css/index.less index 1114af85..a1e2d37c 100644 --- a/simpleui/static/admin/simpleui-x/css/index.less +++ b/simpleui/static/admin/simpleui-x/css/index.less @@ -112,9 +112,9 @@ html, body { .simpleui-table tr { height: 35px; - &:hover{ - th,td{ - background-color: inherit!important; + &:hover { + th, td { + background-color: inherit !important; } } } @@ -431,4 +431,10 @@ html, body { border-radius: 0; background: rgba(0, 0, 0, 0.1); } +} + +.lite-menus { + .el-submenu__title:hover, .is-opened .el-submenu__title { + color: white !important; + } } \ No newline at end of file diff --git a/simpleui/static/admin/simpleui-x/js/index.js b/simpleui/static/admin/simpleui-x/js/index.js index eedd558c..0b52b506 100644 --- a/simpleui/static/admin/simpleui-x/js/index.js +++ b/simpleui/static/admin/simpleui-x/js/index.js @@ -16,7 +16,8 @@ for (var i = 0; i < app.menuData.length; i++) { var item = app.menuData[i] if ((item.url || '/') == hash) { - app.openTab(item, item.eid, true); + + app.openTab(item, item.eid, true, false); break; } } @@ -107,6 +108,8 @@ new Vue({ el: '#main', data: { + drawer: false, + mobile: false, upgrade: { isUpdate: false, body: '', @@ -258,7 +261,8 @@ self.fold = width < 800; }) } - self.isResize = true + self.isResize = true; + self.mobile = width < 800; //判断全屏状态 try { @@ -430,11 +434,12 @@ } } , - openTab: function (data, index, selected) { + openTab: function (data, index, selected, loading) { if (data.breadcrumbs) { this.breadcrumbs = data.breadcrumbs; } + //如果data没有eid，就直接打开或者添加，根据url if (!data.eid) { data.eid = new Date().getTime() + "" + Math.random(); @@ -471,8 +476,13 @@ } else { //其他的网址loading会一直转 if (data.url && data.url.indexOf('http') != 0) { - data.loading = true; - this.loading = true; + if (loading) { + data.loading = true; + this.loading = true; + }else{ + data.loading = false; + this.loading = false; + } } // data.id = new Date().getTime() + "" + Math.random(); data.id = data.eid; @@ -486,6 +496,12 @@ , foldClick: function () { + //移动端浮动菜单 + var width = document.documentElement.clientWidth || document.body.clientWidth; + if (width < 800) { + this.drawer = !this.drawer; + return; + } this.menuTextShow = !this.menuTextShow; this.$nextTick(() => { this.fold = !this.fold; @@ -569,7 +585,7 @@ this.timeline = !this.timeline; }, report: function (url) { - if(!url){ + if (!url) { url = 'https://github.com/newpanjing/simpleui/issues'; } window.open(url); diff --git a/simpleui/static/admin/simpleui-x/js/login.js b/simpleui/static/admin/simpleui-x/js/login.js index 01c36d44..cf3dfbdc 100644 --- a/simpleui/static/admin/simpleui-x/js/login.js +++ b/simpleui/static/admin/simpleui-x/js/login.js @@ -2,7 +2,7 @@ if (parent.callback) { //如果是在子框架内就把首页刷新 parent.callback(); } -new Vue({ +var loginApp = new Vue({ el: '.login-main', data: { username: '', @@ -17,4 +17,4 @@ new Vue({ }); } } -}) \ No newline at end of file +}); \ No newline at end of file diff --git a/simpleui/templates/admin/base.html b/simpleui/templates/admin/base.html index 68ade94f..a55d87d2 100644 --- a/simpleui/templates/admin/base.html +++ b/simpleui/templates/admin/base.html @@ -1,204 +1,206 @@ {% load i18n static simpletags %} -{% if request.GET.e == 'simpleui_json' %} - {% comment %}由于无法改写django代码，只能利用错误代码来判断，从而输出json{% endcomment %} - {% context_to_json %} -{% else %} - - - {% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %} - - - {% block title %}{% endblock %} - - {% if "SIMPLEUI_STATIC_OFFLINE"|get_config %} - - - {% else %} - - - {% endif %} - - - - - - - {% if "SIMPLEUI_STATIC_OFFLINE"|get_config %} - - - {% else %} - {# #} - - - {% endif %} - - - - - - {% if ""|get_language_code != 'zh-hans' %} - - - - - {% endif %} - - {% block extrastyle %}{% endblock %} - {% if LANGUAGE_BIDI %} - + + {% block title %}{% endblock %} + + {% if "SIMPLEUI_STATIC_OFFLINE"|get_config %} + + + {% else %} + + + {% endif %} + + + + + + + {% if "SIMPLEUI_STATIC_OFFLINE"|get_config %} + + + {% else %} + {# #} + + + {% endif %} + + + + + + {% if ""|get_language_code != 'zh-hans' %} + + + + + {% endif %} + + {% block extrastyle %}{% endblock %} + {% if LANGUAGE_BIDI %} + {% endif %} - {% block extrahead %}{% endblock %} - {% block responsive %} - - - {% if LANGUAGE_BIDI %} - - {% endif %} - {% endblock %} - {% block blockbots %} - {% endblock %} - - - {% load i18n %} - - - - {% verbatim dynamicCss %} - {% endverbatim dynamicCss %} - -
- - - {% if "SIMPLEUI_DEFAULT_THEME"|get_config %} - + {% block extrahead %}{% endblock %} + {% block responsive %} + + + {% if LANGUAGE_BIDI %} + {% endif %} -
- + +{% load i18n %} + + + +{% verbatim dynamicCss %} +{% endverbatim dynamicCss %} + +
+ + + {% if "SIMPLEUI_DEFAULT_THEME"|get_config %} + + {% endif %} +
+ + +
+ + {% block messages %} + {% autoescape off %} + {% load_message %} + {% endautoescape %} + - } - }) - window.addEventListener('beforeunload', () => { - if (window.beforeLoad) { - window.beforeLoad(); - } - }); - - - -
- - {% block messages %} - {% autoescape off %} - {% load_message %} - {% endautoescape %} - - - {% endblock messages %} - -
- {% for app in app_list %} - {{ app }} - {% endfor %} -
- -
- {% block pretitle %}{% endblock %} - {% block content_title %} - {% if title %} -
{{ title }}
- {% endif %} - {% endblock %} - {% block content %} - {% block object-tools %}{% endblock %} - {{ content }} - {% endblock %} - {% block sidebar %}{% endblock %} -
-
- - - {% block footer %} - {% endblock %} +
+ {% for app in app_list %} + {{ app }} + {% endfor %} +
+ +
+ {% has_admindoc_page as has_page %} + {% if has_page %} + {% url 'django-admindocs-docroot' as rooturl %} + {% if request.path != rooturl %} + {% trans 'Back to View documentation' %} + {% endif %} + {% endif %} + + {% block pretitle %}{% endblock %} + {% block content_title %} + {% if title %} +
{{ title }}
+ {% endif %} + {% endblock %} + {% block content %} + {% block object-tools %}{% endblock %} + {{ content }} + {% endblock %} + {% block sidebar %}{% endblock %} +
- - - -{% endif %} \ No newline at end of file + + + {% block footer %} + {% endblock %} +
+ + + \ No newline at end of file diff --git a/simpleui/templates/admin/index.html b/simpleui/templates/admin/index.html index 62f9e150..2b122cae 100755 --- a/simpleui/templates/admin/index.html +++ b/simpleui/templates/admin/index.html @@ -68,10 +68,42 @@ href="{% static 'admin/simpleui-x/theme/' %}{{ "SIMPLEUI_DEFAULT_THEME"|get_config }}"> {% endif %} {% endblock %} + + +
+ + + + + + + + + + + + + + + + + +
+ + - + {% block logo %}
@@ -115,6 +147,7 @@ + {% block header %} @@ -123,7 +156,7 @@ {% block breadcrumb %} - + {% verbatim myclode %} {{ menus[0].name }} @@ -159,18 +192,26 @@ {{ user }} - {% verbatim mycode %} - + + {% verbatim mycode %} {{ language.change_password }} - + {% endverbatim mycode %} + {% has_enable_admindoc as has_admindoc %} + {% if has_admindoc %} + {% trans 'Documentation' %} + {% endif %} + + {% verbatim mycode %} {{ language.logout }} - - {% endverbatim mycode %} + {% endverbatim mycode %} +
@@ -335,7 +376,7 @@ {% block index_js %} - + {% endblock %} {% block autoupdate %} {% if not "SIMPLEUI_STATIC_OFFLINE"|get_config %} diff --git a/simpleui/templates/admin/login.html b/simpleui/templates/admin/login.html index c4737dc5..deb1b611 100755 --- a/simpleui/templates/admin/login.html +++ b/simpleui/templates/admin/login.html @@ -116,7 +116,7 @@ {% endif %} - + {% block particles %} {% if 'SIMPLEUI_LOGIN_PARTICLES'|get_config != False %} diff --git a/simpleui/templates/admin/submit_line.html b/simpleui/templates/admin/submit_line.html index 1f7651a4..48e2d0cb 100644 --- a/simpleui/templates/admin/submit_line.html +++ b/simpleui/templates/admin/submit_line.html @@ -28,8 +28,10 @@
\ No newline at end of file diff --git a/simpleui/templatetags/simpletags.py b/simpleui/templatetags/simpletags.py index 36cfdcbb..8eaacec7 100644 --- a/simpleui/templatetags/simpletags.py +++ b/simpleui/templatetags/simpletags.py @@ -458,5 +458,18 @@ def get_model_url(context): # reverse() opts = context.get('opts') key = 'admin:{}_{}_changelist'.format(opts.app_label, opts.model_name) - print(context) return reverse(key) + + +@register.simple_tag +def has_enable_admindoc(): + apps = settings.INSTALLED_APPS + return 'django.contrib.admindocs' in apps + + +@register.simple_tag(takes_context=True) +def has_admindoc_page(context): + if hasattr(context, 'template_name'): + return context.template_name.find('admin_doc') == 0 + else: + return False