From 99805275bdc94177f179a78a7f808ee8b7d130f3 Mon Sep 17 00:00:00 2001 From: newpanjing Date: Sun, 6 Oct 2019 18:47:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=E5=90=8E=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=A1=B5=E9=9D=A2=E5=BC=82=E5=B8=B8=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simpleui/__init__.py | 2 +- simpleui/static/admin/simpleui-x/js/index.js | 4 ++++ simpleui/templates/admin/index.html | 11 +++++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/simpleui/__init__.py b/simpleui/__init__.py index 193d2dbc..f64a8b01 100644 --- a/simpleui/__init__.py +++ b/simpleui/__init__.py @@ -1,2 +1,2 @@ def get_version(): - return '3.1' + return '3.2' diff --git a/simpleui/static/admin/simpleui-x/js/index.js b/simpleui/static/admin/simpleui-x/js/index.js index b8b30390..36318445 100644 --- a/simpleui/static/admin/simpleui-x/js/index.js +++ b/simpleui/static/admin/simpleui-x/js/index.js @@ -506,6 +506,10 @@ cancelButtonText: language.no, type: 'warning' }).then(function () { + //清除cookie主题设置和sessionStore数据 + delete sessionStorage['tabs']; + setCookie('theme', ''); + setCookie('theme_name', ''); window.location.href = window.urls.logout; }).catch(function () { diff --git a/simpleui/templates/admin/index.html b/simpleui/templates/admin/index.html index c756d3bc..33c2b730 100755 --- a/simpleui/templates/admin/index.html +++ b/simpleui/templates/admin/index.html @@ -126,7 +126,7 @@
- + {% block breadcrumb %} {% verbatim myclode %} {% endverbatim myclode %} + {% endblock %}
@@ -199,8 +200,10 @@ {% endif %} - + {% block tab-item %} + + + {% endblock %}
@@ -336,7 +339,7 @@ {% block index_js %} - + {% endblock %} {% block autoupdate %} @@ -104,18 +104,7 @@ el:'.page-header', methods:{ goBack:function () { - //找到上级 - var array = location.pathname.split('/') - if (array.length == 5||array.length==6) { - window.location.href = '/' + array[1] + '/' + array[2]; - } else { - var referrer = document.referrer; - if (referrer && document.URL != referrer) { - window.location.href = referrer; - } else { - window.history.go(-1); - } - } + window.location.href='{% get_model_url %}' } } }) diff --git a/simpleui/templates/admin/submit_line.html b/simpleui/templates/admin/submit_line.html index 528044a0..1f7651a4 100644 --- a/simpleui/templates/admin/submit_line.html +++ b/simpleui/templates/admin/submit_line.html @@ -1,4 +1,4 @@ -{% load i18n admin_urls %} +{% load i18n admin_urls simpletags%}
@@ -40,17 +40,7 @@ $("form").submit(); }, prev: function () { - var array = location.pathname.split('/') - if (array.length == 5 || array.length == 6) { - window.location.href = '/' + array[1] + '/' + array[2]; - } else { - var referrer = document.referrer; - if (referrer && document.URL != referrer) { - window.location.href = referrer; - } else { - window.history.go(-1); - } - } + window.location.href='{% get_model_url %}' } } }) diff --git a/simpleui/templatetags/simpletags.py b/simpleui/templatetags/simpletags.py index 1242ef36..32d512c5 100644 --- a/simpleui/templatetags/simpletags.py +++ b/simpleui/templatetags/simpletags.py @@ -13,6 +13,7 @@ from django.conf import settings from django.core.serializers.json import DjangoJSONEncoder from django.db import models +from django.urls import reverse from django.utils.encoding import force_text from django.utils.functional import Promise from django.utils.html import format_html @@ -445,3 +446,12 @@ def get_tz_suffix(): @register.simple_tag def simple_version(): return simpleui.get_version() + + +@register.simple_tag(takes_context=True) +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) From 68f9c30fd21a816f808fd40a6b1b1ffecbfa20e1 Mon Sep 17 00:00:00 2001 From: newpanjing Date: Mon, 14 Oct 2019 17:18:26 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simpleui/static/admin/simpleui-x/js/index.js | 38 ++++++++++++- simpleui/templates/admin/base.html | 59 +++++++++++++------- simpleui/templates/admin/index.html | 48 ++++++++-------- 3 files changed, 97 insertions(+), 48 deletions(-) diff --git a/simpleui/static/admin/simpleui-x/js/index.js b/simpleui/static/admin/simpleui-x/js/index.js index 1af6851f..e945c806 100644 --- a/simpleui/static/admin/simpleui-x/js/index.js +++ b/simpleui/static/admin/simpleui-x/js/index.js @@ -33,9 +33,9 @@ } var fontConfig = new Vue({ - el: '#dynamicCss', + // el: '#dynamicCss', data: { - fontSize: 14 + fontSize: null }, created: function () { var val = getCookie('fontSize'); @@ -45,6 +45,26 @@ this.fontSize = 0; } }, + watch: { + fontSize: function (newValue) { + if (newValue != 0) { + var fontStyle = document.getElementById('fontStyle'); + if (!fontStyle) { + fontStyle = document.createElement('style'); + fontStyle.id = 'fontStyle'; + fontStyle.type = 'text/css'; + document.head.append(fontStyle); + } + fontStyle.innerHTML = '*{font-size:' + newValue + 'px!important;}' + + } else { + var fontStyle = document.getElementById('fontStyle'); + if (fontStyle) { + fontStyle.remove(); + } + } + } + }, methods: {} }); @@ -183,6 +203,13 @@ menuData: [] }, watch: { + theme: function (newValue, oldValue) { + this.$nextTick(function () { + if (window.renderCallback) { + window.renderCallback(this); + } + }); + }, fold: function (newValue, oldValue) { // console.log(newValue) }, @@ -212,6 +239,7 @@ }, created: function () { + // this.watch.theme(''); var val = getCookie('fold') == 'true'; this.small = this.fold = val; @@ -260,6 +288,7 @@ this.theme = getCookie('theme'); this.themeName = getCookie('theme_name'); + //接收子页面的事件注册 window.themeEvents = []; window.fontEvents = []; @@ -283,6 +312,11 @@ if (window.onresize) { window.onresize(); } + this.$nextTick(function () { + if (window.renderCallback) { + window.renderCallback(this); + } + }); }, methods: { syncTabs: function () { diff --git a/simpleui/templates/admin/base.html b/simpleui/templates/admin/base.html index 9396a156..68ade94f 100644 --- a/simpleui/templates/admin/base.html +++ b/simpleui/templates/admin/base.html @@ -10,7 +10,7 @@ {% block title %}{% endblock %} - {% if "SIMPLEUI_STATIC_OFFLINE"|get_config %} + {% if "SIMPLEUI_STATIC_OFFLINE"|get_config %} {% else %} @@ -23,14 +23,14 @@ - {% if "SIMPLEUI_STATIC_OFFLINE"|get_config %} - - - {% else %} -{# #} - - - {% endif %} + {% if "SIMPLEUI_STATIC_OFFLINE"|get_config %} + + + {% else %} + {# #} + + + {% endif %} @@ -38,7 +38,8 @@ {% if ""|get_language_code != 'zh-hans' %} - + @@ -47,7 +48,8 @@ {% block extrastyle %}{% endblock %} {% if LANGUAGE_BIDI %} - {% endif %} + {% endif %} {% block extrahead %}{% endblock %} {% block responsive %} @@ -66,26 +68,41 @@ data-admin-utc-offset="{% now "Z" %}"> {% verbatim dynamicCss %} - {% endverbatim dynamicCss %}
{% if "SIMPLEUI_DEFAULT_THEME"|get_config %} - + {% endif %}
{% block index_js %} - + {% endblock %} {% block autoupdate %} - + {% if not "SIMPLEUI_STATIC_OFFLINE"|get_config %} + + {% endif %} {% endblock %} {% endblock %} {% load_analysis %} From 59b3ac12a6f3d24c27434821384a45f71df17af2 Mon Sep 17 00:00:00 2001 From: newpanjing Date: Thu, 17 Oct 2019 12:45:27 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simpleui/static/admin/simpleui-x/css/index.css | 5 ++++- simpleui/static/admin/simpleui-x/css/index.css.map | 2 +- simpleui/static/admin/simpleui-x/css/index.less | 8 +++++++- simpleui/static/admin/simpleui-x/js/index.js | 7 +++++-- simpleui/static/admin/simpleui-x/js/language.js | 1 - simpleui/templates/admin/index.html | 2 +- simpleui/templatetags/simpletags.py | 5 +++++ 7 files changed, 23 insertions(+), 7 deletions(-) diff --git a/simpleui/static/admin/simpleui-x/css/index.css b/simpleui/static/admin/simpleui-x/css/index.css index ae53c1a2..3a5d74b3 100644 --- a/simpleui/static/admin/simpleui-x/css/index.css +++ b/simpleui/static/admin/simpleui-x/css/index.css @@ -99,9 +99,12 @@ body { .simpleui-table tr { height: 35px; } +.simpleui-table tr:hover th, +.simpleui-table tr:hover td { + background-color: inherit!important; +} .simpleui-table tr th { text-align: right; - width: 60px; border-bottom: #eaeef5 1px solid; } .simpleui-table tr td { diff --git a/simpleui/static/admin/simpleui-x/css/index.css.map b/simpleui/static/admin/simpleui-x/css/index.css.map index ad7eed49..4fd78112 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 f71e4edf..1114af85 100644 --- a/simpleui/static/admin/simpleui-x/css/index.less +++ b/simpleui/static/admin/simpleui-x/css/index.less @@ -111,11 +111,17 @@ html, body { .simpleui-table tr { height: 35px; + + &:hover{ + th,td{ + background-color: inherit!important; + } + } } .simpleui-table tr th { text-align: right; - width: 60px; + //width: 60px; border-bottom: #eaeef5 1px solid; } diff --git a/simpleui/static/admin/simpleui-x/js/index.js b/simpleui/static/admin/simpleui-x/js/index.js index e945c806..eedd558c 100644 --- a/simpleui/static/admin/simpleui-x/js/index.js +++ b/simpleui/static/admin/simpleui-x/js/index.js @@ -568,8 +568,11 @@ displayTimeline: function () { this.timeline = !this.timeline; }, - report: function () { - window.open('https://github.com/newpanjing/simpleui/issues') + report: function (url) { + if(!url){ + url = 'https://github.com/newpanjing/simpleui/issues'; + } + window.open(url); } } }) diff --git a/simpleui/static/admin/simpleui-x/js/language.js b/simpleui/static/admin/simpleui-x/js/language.js index e76ad269..6e9229bf 100644 --- a/simpleui/static/admin/simpleui-x/js/language.js +++ b/simpleui/static/admin/simpleui-x/js/language.js @@ -1,5 +1,4 @@ window.getLanuage = function (key) { - console.log(key) if (!window.Lanuages) { return ""; } diff --git a/simpleui/templates/admin/index.html b/simpleui/templates/admin/index.html index 5df0db57..62f9e150 100755 --- a/simpleui/templates/admin/index.html +++ b/simpleui/templates/admin/index.html @@ -28,7 +28,7 @@ {% endif %} - + {% endblock %} {% block head %} diff --git a/simpleui/templatetags/simpletags.py b/simpleui/templatetags/simpletags.py index 32d512c5..36cfdcbb 100644 --- a/simpleui/templatetags/simpletags.py +++ b/simpleui/templatetags/simpletags.py @@ -148,6 +148,11 @@ def get_config(key): return __get_config(key) +@register.simple_tag +def get_version(): + return simpleui.get_version() + + @register.simple_tag def get_app_info(): dict = {