Skip to content

Commit 39801dd

Browse files
newpanjingnewpanjing
authored
Merge pull request #273 from newpanjing/dev
Dev
2 parents e974523 + e3a9ad0 commit 39801dd

File tree

10 files changed

+50
-57
lines changed

10 files changed

+50
-57
lines changed

‎simpleui/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33

44
def get_version():
5-
return '4.0.2'
5+
return '4.0.3'

‎simpleui/static/admin/simpleui-x/js/index.js‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,15 +374,27 @@
374374
window.open(url);
375375
},
376376
contextmenu: function (item, e) {
377+
//右键菜单，如果x+菜单宽度超过屏幕宽度，就默认为屏幕宽度-10-菜单宽度
377378

378379
//home没有popup menu
379380
if (item.id == '0') {
380381
return;
381382
}
382383
this.popup.tab = item;
383-
this.popup.left = e.clientX;
384-
this.popup.top = e.clientY;
385384
this.popup.show = true;
385+
this.$nextTick(function () {
386+
let el = this.$refs.popupmenu;
387+
el.style.width='150px';
388+
let x = e.clientX;
389+
390+
let w= document.body.offsetWidth
391+
if(x+150>w){
392+
x = w - 160;
393+
}
394+
395+
this.popup.left = x;
396+
this.popup.top = e.clientY;
397+
});
386398
},
387399
mainClick: function (e) {
388400
this.popup.show = false;
@@ -572,7 +584,7 @@
572584
},
573585
report: function (url) {
574586
if (!url) {
575-
if ($("html").lang) {
587+
if (document.querySelector('html').lang) {
576588
url = 'https://simpleui.88cto.com';
577589
} else {
578590
url = 'https://github.com/newpanjing/simpleui/issues';

‎simpleui/templates/admin/base.html‎

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,19 @@
1-
{% load i18n static simpletags %}
21
<!DOCTYPE html>
2+
{% load i18n static simpletags %}
33
{% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}
44
<html lang="{{ LANGUAGE_CODE|default:" en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
55
<head>
66
<title>{% block title %}{% endblock %}</title>
77

8-
{% if "SIMPLEUI_STATIC_OFFLINE"|get_config %}
9-
<link rel="stylesheet" href="{% static '/admin/simpleui-x/elementui/theme-chalk/index.css' %}">
10-
<link rel="stylesheet" href="{% static '/admin/simpleui-x/fontawesome-free-5.8.1-web/css/all.min.css' %}">
11-
{% else %}
12-
<link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
13-
<link rel="stylesheet" href="https://cdn.bootcss.com/font-awesome/5.8.1/css/all.min.css">
14-
{% endif %}
8+
{% include 'admin/includes/css-part.html' %}
159

16-
<link rel="stylesheet" type="text/css" href="{% static " admin
17-
/css/base.css" %}">
18-
<link rel="stylesheet" href="{% static '/admin/simpleui-x/css/base.css' %}?_=2.7">
19-
<link rel="stylesheet" href="{% static '/admin/simpleui-x/theme/simpleui.css' %}">
20-
21-
22-
{% if "SIMPLEUI_STATIC_OFFLINE"|get_config %}
23-
<script type="text/javascript" src="{% static '/admin/simpleui-x/js/vue.min.js' %}"></script>
24-
<script type="text/javascript" src="{% static '/admin/simpleui-x/elementui/index.js' %}"></script>
25-
{% else %}
26-
{#
27-
<script src="https://cdn.jsdelivr.net/npm/vue"></script>
28-
#}
29-
<script src="https://unpkg.com/vue@2.6.0/dist/vue.min.js"></script>
30-
<script src="https://unpkg.com/element-ui/lib/index.js"></script>
31-
{% endif %}
10+
<link rel="stylesheet" type="text/css" href="{% static '/admin/css/base.css' %}?_=2.7">
11+
<link rel="stylesheet" type="text/css" href="{% static '/admin/simpleui-x/css/base.css' %}?_=2.7">
12+
<link rel="stylesheet" type="text/css" href="{% static '/admin/simpleui-x/theme/simpleui.css' %}">
13+
14+
15+
16+
{% include 'admin/includes/js-part.html' %}
3217

3318
<script type="text/javascript" src="{% static '/admin/simpleui-x/js/language.js' %}?_=2.1.2"></script>
3419
<script type="text/javascript" src="{% static '/admin/simpleui-x/locale/en-us.js' %}?_=2.1.2"></script>
@@ -46,17 +31,13 @@
4631
<script type="text/javascript" src="{% static '/admin/simpleui-x/js/cookie.js' %}"></script>
4732
{% block extrastyle %}{% endblock %}
4833
{% if LANGUAGE_BIDI %}
49-
<link rel="stylesheet" type="text/css" href="
50-
{% block stylesheet_rtl %}{% static " admin
51-
/css/rtl.css" %}{% endblock %}?_=20180905"/>{% endif %}
34+
<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}?_=20180905"/>{% endif %}
5235
{% block extrahead %}{% endblock %}
5336
{% block responsive %}
5437
<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0">
55-
<link rel="stylesheet" type="text/css" href="{% static " admin
56-
/css/responsive.css" %}?_=20180905"/>
38+
<link rel="stylesheet" type="text/css" href="{% static "admin/css/responsive.css" %}?_=20180905"/>
5739
{% if LANGUAGE_BIDI %}
58-
<link rel="stylesheet" type="text/css" href="{% static " admin
59-
/css/responsive_rtl.css" %}?_=20180905"/>
40+
<link rel="stylesheet" type="text/css" href="{% static "admin/css/responsive_rtl.css" %}?_=20180905"/>
6041
{% endif %}
6142
{% endblock %}
6243
{% block blockbots %}
@@ -77,8 +58,7 @@
7758

7859
{% if "SIMPLEUI_DEFAULT_THEME"|get_config %}
7960
<link v-else rel="stylesheet"
80-
href="{% static 'admin/simpleui-x/theme/' %}{{ " SIMPLEUI_DEFAULT_THEME
81-
"|get_config }}">
61+
href="{% static 'admin/simpleui-x/theme/' %}{{ "SIMPLEUI_DEFAULT_THEME"|get_config }}">
8262
{% endif %}
8363
</div>
8464
<script type="text/javascript">

‎simpleui/templates/admin/change_form.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
el: '.page-header',
109109
methods: {
110110
goBack: function () {
111-
window.location.href = '{% get_model_url %}'
111+
window.location.href = '{% get_previous_url %}'
112112
}
113113
}
114114
})

‎simpleui/templates/admin/includes/css-part.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{% load static simpletags %}
22
{% if "SIMPLEUI_STATIC_OFFLINE"|get_config %}
3-
<link rel="stylesheet" href="{% static '/admin/simpleui-x/elementui/theme-chalk/index.css' %}">
4-
<link rel="stylesheet" href="{% static '/admin/simpleui-x/fontawesome-free-5.8.1-web/css/all.min.css' %}">
3+
<link rel="stylesheet" type="text/css" href="{% static '/admin/simpleui-x/elementui/theme-chalk/index.css' %}">
4+
<link rel="stylesheet" type="text/css" href="{% static '/admin/simpleui-x/fontawesome-free-5.8.1-web/css/all.min.css' %}">
55
{% else %}
6-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/element-ui@2.13.1/lib/theme-chalk/index.css">
7-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.13.0/css/all.min.css">
6+
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/element-ui@2.13.1/lib/theme-chalk/index.css">
7+
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.13.0/css/all.min.css">
88
{% endif %}

‎simpleui/templates/admin/includes/fieldset.html‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,8 @@
182182
}
183183
};
184184

185-
console.log("============================")
186-
187-
188185

189186
var image_document = document.getElementsByTagName("a");
190-
console.log(image_document)
191187
for (var i = 0; i < image_document.length; i++) {
192188
let text_list = image_document[i].href.split('.')
193189
console.log("text_list",text_list)

‎simpleui/templates/admin/includes/js-part.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<script type="text/javascript" src="{% static '/admin/simpleui-x/js/vue.min.js' %}"></script>
44
<script type="text/javascript" src="{% static '/admin/simpleui-x/elementui/index.js' %}"></script>
55
{% else %}
6-
<script src="https://cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js"></script>
7-
<script src="https://cdn.jsdelivr.net/npm/element-ui@2.13.1/lib/index.js"></script>
6+
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js"></script>
7+
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/element-ui@2.13.1/lib/index.js"></script>
88
{% endif %}

‎simpleui/templates/admin/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
</el-container>
264264
</el-container>
265265

266-
<ul v-if="popup.show" class="el-dropdown-menu el-popper"
266+
<ul v-if="popup.show" class="el-dropdown-menu el-popper" ref="popupmenu"
267267
:style="{position: 'absolute',top: popup.top+'px',left: popup.left+'px'}" x-placement="top-end">
268268
<li v-for="(item,index) in popup.menus" tabindex="-1" class="el-dropdown-menu__item"
269269
@click="item.handler(popup.tab,item)"><i :class="item.icon"></i><span

‎simpleui/templates/admin/submit_line.html‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{% load i18n admin_urls simpletags%}
22
<div class="submit-row">
33
{% if '_popup' not in request.GET %}
4-
<el-button type="button" icon="el-icon-arrow-left" @click="prev()"
4+
<el-button type="button" icon="el-icon-arrow-left" onclick="prev()"
55
style="float: left;margin-right: 10px;margin-bottom: 10px;">
66
<span v-text="getLanuage('Go back')"></span>
77
</el-button>
88
{% endif %}
99
{% if show_delete_link %}
1010
{% url opts|admin_urlname:'delete' original.pk|admin_urlquote as delete_url %}
11-
<el-button icon="el-icon-delete" type="danger" @click="del('{% add_preserved_filters delete_url %}')"
11+
<el-button icon="el-icon-delete" type="danger" onclick="del('{% add_preserved_filters delete_url %}')"
1212
style="float: left">{% trans "Delete" %}</el-button>
1313
{% endif %}
1414
{% if show_save_as_new %}
@@ -31,20 +31,21 @@
3131
</div>
3232
<script type="text/javascript">
3333
var submitrows=document.getElementsByClassName('submit-row');
34+
function del(url){
35+
window.location.href = url;
36+
}
37+
function prev() {
38+
window.location.href='{% get_model_url %}'
39+
}
40+
3441
for(var i=0;i<submitrows.length;i++){
3542
new Vue({
3643
el: submitrows[i],
3744
data: {},
3845
methods: {
39-
del: function (url) {
40-
window.location.href = url;
41-
},
4246
formSubmit: function (name, v, e) {
4347
$("#actionName").attr('name', name).val(v);
4448
$("form").submit();
45-
},
46-
prev: function () {
47-
window.location.href='{% get_model_url %}'
4849
}
4950
}
5051
})

‎simpleui/templatetags/simpletags.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,3 +478,7 @@ def get_boolean_choices():
478478
('True', _('Yes')),
479479
('False', _('No'))
480480
)
481+
482+
@register.simple_tag(takes_context=True)
483+
def get_previous_url(context):
484+
return context.request.META.get('HTTP_REFERER')

0 commit comments

Comments
 (0)