Merge pull request #173 from newpanjing/dev

Dev
newpanjing · Oct 28, 2019 · 5c86aad · 5c86aad
2 parents 1aff47b + e1724cb
commit 5c86aad
Show file tree

Hide file tree

Showing 14 changed files with 314 additions and 219 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .idea/
 django_simpleui.egg-info
-dist
+dist
+/simpleui.egg-info/
diff --git a/QUICK.md b/QUICK.md
@@ -40,6 +40,7 @@ simpleui 快速上手指南
   + [自定义按钮](#自定义按钮)
   + [离线模式](#离线模式)
   + [关闭Loading遮罩层](#关闭Loading遮罩层)
+  + [admindoc](#admindoc)
 # 常见问题
   + [settings.py](#settingspy-找不到)
   + [python版本问题](#python版本问题)
@@ -716,6 +717,9 @@ SIMPLEUI_LOADING = False
 ```
 True或None 默认显示加载遮罩层，指定为False 不显示遮罩层。默认显示
 
+## admindoc
+admindoc需要simpleui 3.3+ 版本
+
 ## 常见问题
   ### settings.py 找不到
 

diff --git a/doc/en/QUICK_en.md b/doc/en/QUICK_en.md
@@ -38,6 +38,7 @@ Before starting，please take a minte to understand **settings.py**, because it'
   + [Custom Action](#Custom%2dAction)
   + [Offline](#Offline)
   + [Close Loading](#Close%2dLoading)
+  + [admindoc](#admindoc)
 # Common Problems
   + [settings.py](#Not%2dfound%2dsettings.py)
   + [python version problem](#python%2dversion%2dproblem)
@@ -655,6 +656,9 @@ settings.py:
 SIMPLEUI_LOADING = False
 ```
 
+## admindoc
+Admindoc must be the simpleui3.3+ version
+
 ## Common Problems
   ### Not found settings.py
 

diff --git a/simpleui/__init__.py b/simpleui/__init__.py
@@ -1,2 +1,2 @@
 def get_version():
-    return '3.2'
+    return '3.3'
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
@@ -112,9 +112,9 @@ html, body {
 .simpleui-table tr {
   height: 35px;
 
-  &:hover{
-    th,td{
-      background-color: inherit!important;
+  &:hover {
+    th, td {
+      background-color: inherit !important;
     }
   }
 }
@@ -431,4 +431,10 @@ html, body {
     border-radius: 0;
     background: rgba(0, 0, 0, 0.1);
   }
+}
+
+.lite-menus {
+  .el-submenu__title:hover, .is-opened .el-submenu__title {
+    color: white !important;
+  }
 }
diff --git a/simpleui/static/admin/simpleui-x/js/index.js b/simpleui/static/admin/simpleui-x/js/index.js
@@ -16,7 +16,8 @@
         for (var i = 0; i < app.menuData.length; i++) {
             var item = app.menuData[i]
             if ((item.url || '/') == hash) {
-                app.openTab(item, item.eid, true);
+
+                app.openTab(item, item.eid, true, false);
                 break;
             }
         }
@@ -107,6 +108,8 @@
     new Vue({
         el: '#main',
         data: {
+            drawer: false,
+            mobile: false,
             upgrade: {
                 isUpdate: false,
                 body: '',
@@ -258,7 +261,8 @@
                         self.fold = width < 800;
                     })
                 }
-                self.isResize = true
+                self.isResize = true;
+                self.mobile = width < 800;
 
                 //判断全屏状态
                 try {
@@ -430,11 +434,12 @@
                 }
             }
             ,
-            openTab: function (data, index, selected) {
+            openTab: function (data, index, selected, loading) {
                 if (data.breadcrumbs) {
                     this.breadcrumbs = data.breadcrumbs;
                 }
 
+
                 //如果data没有eid，就直接打开或者添加，根据url
                 if (!data.eid) {
                     data.eid = new Date().getTime() + "" + Math.random();
@@ -471,8 +476,13 @@
                 } else {
                     //其他的网址loading会一直转
                     if (data.url && data.url.indexOf('http') != 0) {
-                        data.loading = true;
-                        this.loading = true;
+                        if (loading) {
+                            data.loading = true;
+                            this.loading = true;
+                        }else{
+                            data.loading = false;
+                            this.loading = false;
+                        }
                     }
                     // data.id = new Date().getTime() + "" + Math.random();
                     data.id = data.eid;
@@ -486,6 +496,12 @@
             ,
             foldClick: function () {
 
+                //移动端浮动菜单
+                var width = document.documentElement.clientWidth || document.body.clientWidth;
+                if (width < 800) {
+                    this.drawer = !this.drawer;
+                    return;
+                }
                 this.menuTextShow = !this.menuTextShow;
                 this.$nextTick(() => {
                     this.fold = !this.fold;
@@ -569,7 +585,7 @@
                 this.timeline = !this.timeline;
             },
             report: function (url) {
-                if(!url){
+                if (!url) {
                     url = 'https://github.com/newpanjing/simpleui/issues';
                 }
                 window.open(url);

diff --git a/simpleui/static/admin/simpleui-x/js/login.js b/simpleui/static/admin/simpleui-x/js/login.js
@@ -2,7 +2,7 @@ if (parent.callback) {
     //如果是在子框架内就把首页刷新
     parent.callback();
 }
-new Vue({
+var loginApp = new Vue({
     el: '.login-main',
     data: {
         username: '',
@@ -17,4 +17,4 @@ new Vue({
             });
         }
     }
-})
+});