样式调整前备份

longkex · Dec 6, 2019 · 4a5438d · 4a5438d
1 parent 9da0288
commit 4a5438d
Show file tree

Hide file tree

Showing 7 changed files with 249 additions and 247 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/rbac/forms/__pycache__/menu.cpython-37.pyc b/rbac/forms/__pycache__/menu.cpython-37.pyc
diff --git a/rbac/forms/menu.py b/rbac/forms/menu.py
@@ -43,22 +43,22 @@ class Meta:
 class MultiAddPermissionForm(forms.Form):
     """批量添加"""
     title = forms.CharField(
-        widget=forms.TextInput(attrs={'class': 'form-control'})
+        widget=forms.TextInput(attrs={'class': 'layui-input'})
     )
     url = forms.CharField(
-        widget=forms.TextInput(attrs={'class': 'form-control'})
+        widget=forms.TextInput(attrs={'class': 'layui-input'})
     )
     name = forms.CharField(
-        widget=forms.TextInput(attrs={'class': 'form-control'})
+        widget=forms.TextInput(attrs={'class': 'layui-input'})
     )
     menu_id = forms.ChoiceField(
         choices=[(None, '-----')],
-        widget=forms.Select(attrs={'class': 'form-control'}),
+        widget=forms.Select(attrs={'class': 'layui-input'}),
         required=False,
     )
     pid_id = forms.ChoiceField(
         choices=[(None, '-----')],
-        widget=forms.Select(attrs={'class': 'form-control'}),
+        widget=forms.Select(attrs={'class': 'layui-input'}),
         required=False,
     )
 
@@ -75,22 +75,22 @@ class MultiEditPermissionForm(forms.Form):
         widget=forms.HiddenInput()  # 自动隐藏
     )
     title = forms.CharField(
-        widget=forms.TextInput(attrs={'class': 'form-control'})
+        widget=forms.TextInput(attrs={'class': 'layui-input'})
     )
     url = forms.CharField(
-        widget=forms.TextInput(attrs={'class': 'form-control'})
+        widget=forms.TextInput(attrs={'class': 'layui-input'})
     )
     name = forms.CharField(
-        widget=forms.TextInput(attrs={'class': 'form-control'})
+        widget=forms.TextInput(attrs={'class': 'layui-input'})
     )
     menu_id = forms.ChoiceField(
         choices=[(None, '-----')],
-        widget=forms.Select(attrs={'class': 'form-control'}),
+        widget=forms.Select(attrs={'class': 'layui-input layui-unselect'}),
         required=False,
     )
     pid_id = forms.ChoiceField(
         choices=[(None, '-----')],
-        widget=forms.Select(attrs={'class': 'form-control'}),
+        widget=forms.Select(attrs={'class': 'layui-input layui-unselect'}),
         required=False,
     )
 

diff --git a/rbac/templates/layout.html b/rbac/templates/layout.html
@@ -6,7 +6,7 @@
     <meta charset="UTF-8">
     <title>权限管理页面</title>
     <link rel="shortcut icon" href="{% static 'imgs/default.png' %} ">
-{#        <link rel="stylesheet" href="{% static 'plugins/bootstrap/css/bootstrap.css' %} "/>#}
+    {#        <link rel="stylesheet" href="{% static 'plugins/bootstrap/css/bootstrap.css' %} "/>#}
     <link rel="stylesheet" href="{% static 'plugins/font-awesome/css/font-awesome.css' %} "/>
     <link rel="stylesheet" href="{% static 'css/commons.css' %} "/>
     <link rel="stylesheet" href="{% static 'css/nav.css' %} "/>
@@ -20,30 +20,45 @@
             margin: 0;
             height: 100%;
         }
+
         html {
             height: 100%;
         }
+
+        .pg-body {
+            overflow: hidden;
+        }
+
+        .left-menu {
+            float: left;
+            min-height: 100%;
+        }
         .layui-header a {
-            text-decoration:none;
+            text-decoration: none;
         }
+
         .layui-header {
             background-color: #393d49;
         }
-        .pg-body, .left-menu, .left-tree{
-            height: 100%;
+
+        .pg-body, .left-menu, .left-tree {
+            {#height: 100%;#}
         }
+
         .pg-body > .right-body {
             background-color: #f2f2f2;
-            position: absolute;
-            left: 200px;
-            right: 0;
-            top: 60px;
-            height: 100%;
+            float: left;
+            width: calc(100% - 202px);
+            {#position: absolute;#}
+            {#left: 200px;#}
+            {#right: 0;#}
+            {#top: 60px;#}
             border: 1px solid #ddd;
             font-size: 14px;
-            min-width: 755px;
+            {#min-width: 755px;#}
         }
-        .layui-card-one{
+
+        .layui-card-one {
             height: 50px;
             line-height: 50px;
             border-bottom: 1px solid #ddd;
@@ -99,7 +114,9 @@
     <!--左侧-->
     <!--实现可插拔功能，其他项目需要打印菜单时，用rbac中的inclusion_tag方法即可-->
     <div class="left-menu">
-        {% multi_menu request %}
+        <div class="menu-body">
+            {% multi_menu request %}
+         </div>
     </div>
     <!--右侧-->
     <div class="right-body">
@@ -108,20 +125,19 @@
         </div>
         {% block content %} {% endblock %}
     </div>
-
 </div>
-
 <script src="{% static 'js/jquery-3.3.1.min.js' %} "></script>
-<script src="{% static 'plugins/bootstrap/js/bootstrap.js' %} "></script>
+{#<script src="{% static 'plugins/bootstrap/js/bootstrap.js' %} "></script>#}
 <script src="{% static 'rbac/js/rbac.js' %} "></script>
 <!--某些单独的页面需要用自己的js-->
 <script>
-    //注意：导航 依赖 element 模块，否则无法进行功能性操作
     layui.use('element', function () {
         var element = layui.element;
     });
+    layui.use('form', function () {
+        var form = layui.form;
+    });
 </script>
-
 {% block js %} {% endblock %}
 
 </body>

diff --git a/rbac/templates/rbac/change.html b/rbac/templates/rbac/change.html
@@ -30,6 +30,8 @@
     </style>
 {% endblock %}
 {% block content %}
+
+
     <div class="layui-row" style="padding: 20px">
         <div class="layui-col-md12">
             <div class="layui-card">
@@ -46,6 +48,7 @@
                                 </div>
                             </div>
                         {% endfor %}
+
                         <div class="layui-form-item" style="padding-top: 30px">
                             <div class="layui-input-block">
                                 <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>

diff --git a/rbac/templates/rbac/menu_list.html b/rbac/templates/rbac/menu_list.html
@@ -29,7 +29,7 @@
                 </div>
                 <div class="layui-col-md6">
                     <div class="layui-card">
-                        <div class="layui-card-header">快捷批量管理
+                        <div class="layui-card-header"><a href="{% memory_url request 'rbac:multi_permissions' %}">批量操作</a>
                         </div>
                         <div class="layui-card-body">
                             点击该页批量操作按钮进行管理<br>