Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #378

Merged
merged 5 commits into from
May 24, 2021
Merged

Dev #378

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ docker pull newpanjing/simpleui_demo

docker run -p 8080:8080 newpanjing/simpleui_demo
```

启动成功后访问:http://127.0.0.1:8080

# simpleui 是什么?
Expand Down
2 changes: 1 addition & 1 deletion simpleui/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@


def get_version():
return '2021.5.11'
return '2021.6.1'
2 changes: 1 addition & 1 deletion simpleui/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
from django.utils.html import conditional_escape, html_safe
from django.utils.safestring import mark_safe
from django.utils.translation import gettext as _
from widgets import *
from simpleui.widgets import *

class SimpleForm(BaseForm, metaclass=DeclarativeFieldsMetaclass):
def get_vue_app_js(self,app_id):
Expand Down
13 changes: 8 additions & 5 deletions simpleui/static/admin/simpleui-x/css/base.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion simpleui/static/admin/simpleui-x/css/base.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 9 additions & 5 deletions simpleui/static/admin/simpleui-x/css/base.less
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
}

.submit-row {
background: inherit!important;
border: none!important;
background: inherit !important;
border: none !important;
}

#content {
Expand All @@ -25,9 +25,9 @@
}

#changelist #toolbar form input {
padding-left: 30px!important;
padding-top:0px!important;
padding-bottom:0px!important;
padding-left: 30px !important;
padding-top: 0px !important;
padding-bottom: 0px !important;
}

.el-link-btn {
Expand Down Expand Up @@ -232,3 +232,7 @@ body,
right: 0px;
}
}

.inline-group .tabular td.original p{
margin-top: -42px!important;
}
2 changes: 1 addition & 1 deletion simpleui/templates/admin/change_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</li>
{% if has_absolute_url %}
<li>
<el-button @click="window.open('{{ absolute_url }}')" class="viewsitelink" icon="fas fa-globe-asia">{% trans "View on site" %}</el-button>
<el-button size="small" @click="window.open('{{ absolute_url }}')" class="viewsitelink" icon="fas fa-globe-asia">{% trans "View on site" %}</el-button>
</li>
{% endif %}
{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion simpleui/templatetags/simpletags.py
Original file line number Diff line number Diff line change
Expand Up @@ -531,4 +531,4 @@ def django_version_is_gte_32x():
version = []
for s in arrays:
version.append(int(s))
return tuple(version) >= (3, 2, 0)
return tuple(version) >= (3, 2)