Merge pull request #123 from newpanjing/dev

Dev
newpanjing · Jul 22, 2019 · bd1e05f · bd1e05f
2 parents 67e0313 + 4fd3047
commit bd1e05f
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+.idea/
+django_simpleui.egg-info
+dist
diff --git a/simpleui/__init__.py b/simpleui/__init__.py
@@ -1,2 +1,2 @@
 def get_version():
-    return '2.5'
+    return '2.6'
diff --git a/simpleui/static/admin/simpleui-x/js/index.js b/simpleui/static/admin/simpleui-x/js/index.js
@@ -184,6 +184,12 @@
                     }
                 });
             }
+            /*,
+            tabs: function (newValue, oldValue) {
+
+                //改变tab时把状态储存到sessionStorage
+                console.log(newValue)
+            }*/
         },
         created: function () {
 
@@ -245,12 +251,27 @@
                     fontEvents.push(handler);
                 }
             }
+            var temp_tabs = sessionStorage['tabs'];
 
-            if(location.hash!=''){
+            if (temp_tabs && temp_tabs != '') {
+                this.tabs = JSON.parse(temp_tabs);
+                console.log(this.tabs)
+            }
+            if (location.hash != '') {
                 openByHash();
             }
+
+            //elementui布局问题，导致页面不能正常撑开，调用resize使其重新计算
+            if(window.onresize){
+                window.onresize();
+            }
         },
         methods: {
+            syncTabs: function () {
+                if (window.sessionStorage) {
+                    sessionStorage['tabs'] = JSON.stringify(this.tabs);
+                }
+            },
             reset: function () {
                 this.fontSlider = 14;
                 fontConfig.fontSize = 0;
@@ -350,6 +371,7 @@
                     if (targetName != 0) {
                         this.tabs = this.tabs.filter(tab => tab.id !== targetName);
                     }
+                    this.syncTabs();
                 }
             }
             ,
@@ -380,7 +402,7 @@
                     this.tabModel = data.id;
                 }
                 changeUrl(data)
-
+                this.syncTabs();
             }
             ,
             foldClick: function () {

diff --git a/simpleui/templates/admin/index.html b/simpleui/templates/admin/index.html
@@ -168,7 +168,7 @@
                          @tab-click="tabClick">
 
                     <el-tab-pane v-for="(item,index) in tabs" :closable="index!=0" :label="item.name" :name="item.id"
-                                 :key="item.id">
+                                 :key="item.id" lazy="true">
 
                         {% home_page %}
 
@@ -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 %}

diff --git a/simpleui/templatetags/simpletags.py b/simpleui/templatetags/simpletags.py
@@ -357,7 +357,7 @@ def custom_button(context):
         values = {}
         fun = actions.get(name)[0]
         for key, v in fun.__dict__.items():
-            if key != '__len__':
+            if key != '__len__' and key != '__wrapped__':
                 values[key] = v
         data[name] = values
     return json.dumps(data, cls=LazyEncoder)
@@ -381,8 +381,6 @@ def get_model_fields(model, base=None):
             list.append(('{}__{}'.format(base, f.name), label))
         else:
             list.append((f.name, label))
-        if isinstance(f, ForeignKey):
-            list.extend(get_model_fields(f.related_model, f.name))
 
     return list
 
@@ -391,8 +389,13 @@ def get_model_fields(model, base=None):
 def search_placeholder(context):
     cl = context.get('cl')
 
+    # 取消递归，只获取2级
     fields = get_model_fields(cl.model)
 
+    for f in cl.model._meta.fields:
+        if isinstance(f, ForeignKey):
+            fields.extend(get_model_fields(f.related_model, f.name))
+
     verboses = []
 
     for s in cl.search_fields: