Merge pull request #167 from newpanjing/dev

Dev
newpanjing · Oct 17, 2019 · 1aff47b · 1aff47b
2 parents 78f3f61 + 59b3ac1
commit 1aff47b
Show file tree

Hide file tree

Showing 11 changed files with 146 additions and 99 deletions.
diff --git 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/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
@@ -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
@@ -17,23 +17,6 @@
             var item = app.menuData[i]
             if ((item.url || '/') == hash) {
                 app.openTab(item, item.eid, true);
-                //找到和item.eid同名的菜单
-                // var defaultIndex = '1';
-                //
-                // app.menus.forEach(n => {
-                //     if (n.eid == item.eid) {
-                //         console.log(n)
-                //         defaultIndex = n.index;
-                //     } else if (n.models) {
-                //         n.models.forEach(k => {
-                //             if (k.eid == item.eid) {
-                //                 console.log(k)
-                //                 defaultIndex = k.index;
-                //             }
-                //         })
-                //     }
-                // });
-                // console.log(defaultIndex)
                 break;
             }
         }
@@ -50,9 +33,9 @@
     }
 
     var fontConfig = new Vue({
-        el: '#dynamicCss',
+        // el: '#dynamicCss',
         data: {
-            fontSize: 14
+            fontSize: null
         },
         created: function () {
             var val = getCookie('fontSize');
@@ -62,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: {}
     });
 
@@ -200,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)
             },
@@ -229,6 +239,7 @@
         },
         created: function () {
 
+            // this.watch.theme('');
 
             var val = getCookie('fold') == 'true';
             this.small = this.fold = val;
@@ -277,6 +288,7 @@
             this.theme = getCookie('theme');
             this.themeName = getCookie('theme_name');
 
+
             //接收子页面的事件注册
             window.themeEvents = [];
             window.fontEvents = [];
@@ -300,6 +312,11 @@
             if (window.onresize) {
                 window.onresize();
             }
+            this.$nextTick(function () {
+                if (window.renderCallback) {
+                    window.renderCallback(this);
+                }
+            });
         },
         methods: {
             syncTabs: function () {
@@ -414,6 +431,9 @@
             }
             ,
             openTab: function (data, index, selected) {
+                if (data.breadcrumbs) {
+                    this.breadcrumbs = data.breadcrumbs;
+                }
 
                 //如果data没有eid，就直接打开或者添加，根据url
                 if (!data.eid) {
@@ -506,6 +526,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 () {
 
@@ -544,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
@@ -1,5 +1,4 @@
 window.getLanuage = function (key) {
-    console.log(key)
     if (!window.Lanuages) {
         return "";
     }

diff --git a/simpleui/templates/admin/base.html b/simpleui/templates/admin/base.html
@@ -10,7 +10,7 @@
     <head>
         <title>{% block title %}{% endblock %}</title>
 
-         {% if "SIMPLEUI_STATIC_OFFLINE"|get_config %}
+        {% if "SIMPLEUI_STATIC_OFFLINE"|get_config %}
             <link rel="stylesheet" href="{% static '/admin/simpleui-x/elementui/theme-chalk/index.css' %}">
             <link rel="stylesheet" href="{% static '/admin/simpleui-x/fontawesome-free-5.8.1-web/css/all.min.css' %}">
         {% else %}
@@ -23,22 +23,23 @@
         <link rel="stylesheet" href="{% static '/admin/simpleui-x/theme/simpleui.css' %}">
 
 
-    {% if "SIMPLEUI_STATIC_OFFLINE"|get_config %}
-        <script type="text/javascript" src="{% static '/admin/simpleui-x/js/vue.min.js' %}"></script>
-        <script type="text/javascript" src="{% static '/admin/simpleui-x/elementui/index.js' %}"></script>
-    {% else %}
-{#        <script src="https://cdn.jsdelivr.net/npm/vue"></script>#}
-        <script src="https://unpkg.com/[email protected]/dist/vue.min.js"></script>
-        <script src="https://unpkg.com/element-ui/lib/index.js"></script>
-    {% endif %}
+        {% if "SIMPLEUI_STATIC_OFFLINE"|get_config %}
+            <script type="text/javascript" src="{% static '/admin/simpleui-x/js/vue.min.js' %}"></script>
+            <script type="text/javascript" src="{% static '/admin/simpleui-x/elementui/index.js' %}"></script>
+        {% else %}
+            {#        <script src="https://cdn.jsdelivr.net/npm/vue"></script>#}
+            <script src="https://unpkg.com/[email protected]/dist/vue.min.js"></script>
+            <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+        {% endif %}
 
         <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>
 
         {% if ""|get_language_code != 'zh-hans' %}
 
-            <script type="text/javascript" src="{% static '/admin/simpleui-x/elementui/umd/locale/en.js' %}?_=2.1.2"></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>
@@ -47,7 +48,8 @@
         <script type="text/javascript" src="{% static '/admin/simpleui-x/js/cookie.js' %}"></script>
         {% block extrastyle %}{% endblock %}
         {% if LANGUAGE_BIDI %}
-            <link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}?_=20180905"/>{% endif %}
+            <link rel="stylesheet" type="text/css" href="
+                    {% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}?_=20180905"/>{% endif %}
         {% block extrahead %}{% endblock %}
         {% block responsive %}
             <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0">
@@ -66,26 +68,41 @@
           data-admin-utc-offset="{% now "Z" %}">
 
     {% verbatim dynamicCss %}
-    <style type="text/css" id="dynamicCss" v-if="fontSize!=0">
-        *{
-            font-size: {{ fontSize }}px!important;
-        }
-    </style>
     {% endverbatim dynamicCss %}
 
     <div id="theme">
         <link v-if="theme && theme!=''" rel="stylesheet" :href="theme">
 
         {% if "SIMPLEUI_DEFAULT_THEME"|get_config %}
-        <link v-else rel="stylesheet" href="{% static 'admin/simpleui-x/theme/' %}{{ "SIMPLEUI_DEFAULT_THEME"|get_config }}">
+            <link v-else rel="stylesheet"
+                  href="{% static 'admin/simpleui-x/theme/' %}{{ "SIMPLEUI_DEFAULT_THEME"|get_config }}">
         {% endif %}
     </div>
     <script type="text/javascript">
 
-         var fontConfig = new Vue({
-            el: '#dynamicCss',
+        var fontConfig = new Vue({
             data: {
-                fontSize: 14
+                fontSize: null
+            },
+            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();
+                        }
+                    }
+                }
             },
             created: function () {
                 var val = getCookie('fontSize');
@@ -122,7 +139,7 @@
             }
         })
         window.addEventListener('beforeunload', () => {
-            if(window.beforeLoad){
+            if (window.beforeLoad) {
                 window.beforeLoad();
             }
         });

diff --git a/simpleui/templates/admin/change_form.html b/simpleui/templates/admin/change_form.html
@@ -1,5 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% load i18n admin_urls static admin_modify %}
+{% load i18n admin_urls static admin_modify simpletags%}
 
 {% block extrahead %}{{ block.super }}
     <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
@@ -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 %}'
                 }
             }
         })