Merge remote-tracking branch 'origin/master'

# Conflicts:
#	requirements.txt

applications/view/system/dept.py

@@ -108,7 +108,8 @@ def dis_enable():
 @authorize("system:dept:edit", log=True)
 def update():
     json = request.get_json(force=True)
-    id = json.get("deptId"),
+    #id = json.get("deptId"),
+    id = str_escape(json.get("deptId"))
     data = {
         "dept_name": validate.str_escape(json.get("deptName")),
         "sort": validate.str_escape(json.get("sort")),

docs/install.md

@@ -44,7 +44,7 @@ source ./test_env/bin/activate
 
 ```shell
 # 使用 pip 安装必要模块（对于 master 分支）
-pip install -r requirement\requirement.txt
+pip install -r requirements.txt
 
 # 使用 pip 安装必要模块（对于 mini 分支）
 pip install -r requirement.txt
@@ -76,10 +76,10 @@ flask admin init
 #### 运行项目
 
 ```shell
-# linux
+# windows
 run.bat
 
-# windows
+# linux
 ./run.sh
 ```
 

templates/system/dept/main.html

@@ -199,7 +199,8 @@
                 title: '修改',
                 shade: 0.1,
                 area: ['450px', '500px'],
-                content: MODULE_PATH + 'edit?deptId=' + obj.data['deptId']
+                //content: MODULE_PATH + 'edit?deptId=' + obj.data['deptId']
+                content: MODULE_PATH + 'edit?deptId=' + obj.data['id']
             })
         }
 

templates/system/power/add.html

@@ -63,7 +63,7 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">排序</label>
                     <div class="layui-input-block">
-                        <input type="text" name="sort" lay-verify="title" autocomplete="off" placeholder="排序"
+                        <input type="text" name="sort" lay-verify="required|title" autocomplete="off" placeholder="排序"
                                class="layui-input">
                     </div>
                 </div>

templates/system/power/edit.html

@@ -75,7 +75,7 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">排序</label>
                     <div class="layui-input-block">
-                        <input type="text" value="{{ power.sort }}" name="sort" lay-verify="title" autocomplete="off"
+                        <input type="text" value="{{ power.sort }}" name="sort" lay-verify="required|title" autocomplete="off"
                                placeholder="排序" class="layui-input">
                     </div>
                 </div>

templates/system/user/edit.html

@@ -80,10 +80,10 @@
             elem: '#selectParent',
             url: '/system/dept/tree',
             method: 'get',
-      selectInputName: { nodeId: 'deptId', context: 'deptName' },
+            selectInputName: {nodeId: 'deptId', context: 'deptName'},
             skin: 'layui',
             dataFormat: 'list',
-      response: { treeId: 'deptId', parentId: 'parentId', title: 'deptName' },
+            response: {treeId: 'id', parentId: 'parent_id', title: 'dept_name'},
             selectInitVal: "{{ user.dept_id }}"
         })
         form.on('submit(user-update)', function (data) {
@@ -101,12 +101,12 @@
                 type: 'put',
                 success: function (result) {
                     if (result.success) {
-            layer.msg(result.msg, { icon: 1, time: 1000 }, function () {
+                        layer.msg(result.msg, {icon: 1, time: 1000}, function () {
                             parent.layer.close(parent.layer.getFrameIndex(window.name))//关闭当前页
                             parent.layui.table.reload('user-table')
                         })
                     } else {
-            layer.msg(result.msg, { icon: 2, time: 1000 })
+                        layer.msg(result.msg, {icon: 2, time: 1000})
                     }
                 }
             })

templates/system/user/profile.html

@@ -65,7 +65,7 @@
         formData.append('fileToken', timeStamp)
         $.ajax({
           method: 'post',
-          url: '/admin/file/upload', //用于文件上传的服务器端请求地址
+          url: '/system/file/upload', //用于文件上传的服务器端请求地址
           data: formData,
           processData: false,
           contentType: false,