From 4fd30472a10e3594675f026d2dd602f0ff361540 Mon Sep 17 00:00:00 2001
From: newpanjing <newpanjing@163.com>
Date: Mon, 22 Jul 2019 15:27:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=20#118=20#122=20=E9=A1=B5=E9=9D=A2=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 simpleui/static/admin/simpleui-x/js/index.js | 5 +++++
 simpleui/templates/admin/index.html          | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/simpleui/static/admin/simpleui-x/js/index.js b/simpleui/static/admin/simpleui-x/js/index.js
index 72a7ae39..aeeedece 100644
--- a/simpleui/static/admin/simpleui-x/js/index.js
+++ b/simpleui/static/admin/simpleui-x/js/index.js
@@ -260,6 +260,11 @@
             if (location.hash != '') {
                 openByHash();
             }
+
+            //elementui布局问题，导致页面不能正常撑开，调用resize使其重新计算
+            if(window.onresize){
+                window.onresize();
+            }
         },
         methods: {
             syncTabs: function () {
diff --git a/simpleui/templates/admin/index.html b/simpleui/templates/admin/index.html
index 1539c0fb..d620d1f6 100755
--- a/simpleui/templates/admin/index.html
+++ b/simpleui/templates/admin/index.html
@@ -310,7 +310,7 @@
 <script type="text/javascript" src="{% static '/admin/simpleui-x/js/cookie.js' %}"></script>
 <script type="text/javascript" src="{% static '/admin/simpleui-x/theme/theme.js' %}"></script>
 <script type="text/javascript" src="{% static '/admin/simpleui-x/waves/waves.min.js' %}?_=2.0.5"></script>
-<script type="text/javascript" src="{% static '/admin/simpleui-x/js/index.js' %}?_=2.3"></script>
+<script type="text/javascript" src="{% static '/admin/simpleui-x/js/index.js' %}?_=2.6"></script>
 
 {% load_analysis %}
 {% block script %}