Merge pull request #74 from newpanjing/dev

Dev
newpanjing · Jun 3, 2019 · 20a1502 · 20a1502
2 parents 52a8d68 + 272a58d
commit 20a1502
Show file tree

Hide file tree

Showing 13 changed files with 104 additions and 74 deletions.
diff --git a/simpleui/__init__.py b/simpleui/__init__.py
@@ -1,2 +1,2 @@
 def get_version():
-    return '2.1.2b3'
+    return '2.1.2'
diff --git a/simpleui/static/admin/simpleui-x/automatic/segment.js b/simpleui/static/admin/simpleui-x/automatic/segment.js
@@ -39,6 +39,9 @@ function Segment() {
 var segment = new Segment();
 
 function getIcon(name, icon) {
+    if(!name){
+        return;
+    }
     var value = 'far fa-file';
     if (icon) {
         //有默认图标的

diff --git a/simpleui/static/admin/simpleui-x/css/base.css b/simpleui/static/admin/simpleui-x/css/base.css
diff --git a/simpleui/static/admin/simpleui-x/css/index.css b/simpleui/static/admin/simpleui-x/css/index.css
diff --git a/simpleui/static/admin/simpleui-x/css/index.css.map b/simpleui/static/admin/simpleui-x/css/index.css.map
diff --git a/simpleui/static/admin/simpleui-x/css/index.less b/simpleui/static/admin/simpleui-x/css/index.less
@@ -213,6 +213,9 @@ html, body {
   .el-breadcrumb__item,.el-breadcrumb__item span{
     margin-left: 0px;
   }
+  .el-breadcrumb__separator{
+    margin-left: 5px!important;
+  }
 }
 
 .quick-card {

diff --git a/simpleui/static/admin/simpleui-x/js/index.js b/simpleui/static/admin/simpleui-x/js/index.js
@@ -348,12 +348,20 @@
                 var width = document.documentElement.clientWidth || document.body.clientWidth;
                 if (width > 800) {
                     this.pwdDialog = {
-                        url: window.urls.changePassword,
+                        url: window.urls.changePassword+'?dialog=1',
                         name: language.change_password,
                         show: true
                     };
                 } else {
-                    this.openTab({url: window.urls.changePassword, icon: 'far fa-edit', name: language.change_password})
+                    this.openTab({
+                        url: window.urls.changePassword,
+                        icon: 'far fa-edit',
+                        name: language.change_password,
+                        breadcrumbs:[{
+                            name: language.change_password,
+                            icon: 'far fa-edit'
+                        }]
+                    })
                     app.breadcrumbs = [language.change_password];
                 }
             }

diff --git a/simpleui/static/admin/simpleui-x/theme/aircraft.css b/simpleui/static/admin/simpleui-x/theme/aircraft.css
diff --git a/simpleui/static/admin/simpleui-x/theme/aircraft.css.map b/simpleui/static/admin/simpleui-x/theme/aircraft.css.map
diff --git a/simpleui/templates/admin/base.html b/simpleui/templates/admin/base.html
@@ -20,13 +20,13 @@
 {#    <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>#}
 
         <script type="text/javascript" src="{% static '/admin/simpleui-x/js/vue.min.js' %}"></script>
-        <script type="text/javascript" src="{% static '/admin/simpleui-x/js/language.js' %}"></script>
-        <script type="text/javascript" src="{% static '/admin/simpleui-x/locale/en-us.js' %}"></script>
+        <script type="text/javascript" src="{% static '/admin/simpleui-x/js/language.js' %}?_=2.1.2"></script>
+        <script type="text/javascript" src="{% static '/admin/simpleui-x/locale/en-us.js' %}?_=2.1.2"></script>
         <script type="text/javascript" src="{% static '/admin/simpleui-x/locale/' %}{% get_language %}.js"></script>
         <script type="text/javascript" src="{% static '/admin/simpleui-x/elementui/index.js' %}"></script>
         {% if ""|get_language_code != 'zh-hans' %}
 
-            <script type="text/javascript" src="{% static '/admin/simpleui-x/elementui/umd/locale/en.js' %}"></script>
+            <script type="text/javascript" src="{% static '/admin/simpleui-x/elementui/umd/locale/en.js' %}?_=2.1.2"></script>
             <script type="text/javascript">
                 ELEMENT.locale(ELEMENT.lang.en)
             </script>