From 0ca75c81d4303a4f5594bf634c2544693f46080f Mon Sep 17 00:00:00 2001
From: zhengxinonly <pyxxponly@gmail.com>
Date: Fri, 23 Jul 2021 02:00:10 +0800
Subject: [PATCH] =?UTF-8?q?refactor(api):=E8=B0=83=E6=95=B4=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/templates/department/main.html | 66 ++++++++-------------
 applications/templates/rights/main.html     | 14 ++---
 applications/templates/roles/main.html      | 10 +---
 3 files changed, 32 insertions(+), 58 deletions(-)

diff --git a/applications/templates/department/main.html b/applications/templates/department/main.html
index 53c1ad8..5ada059 100644
--- a/applications/templates/department/main.html
+++ b/applications/templates/department/main.html
@@ -244,12 +244,13 @@
     </div>
 </form>
 <script>
-  layui.use(['table', 'form', 'jquery', 'treetable', 'popup'], function () {
+  layui.use(['table', 'form', 'jquery', 'treetable', 'popup', 'dtree'], function () {
     let table = layui.table
     let form = layui.form
     let $ = layui.jquery
     let treetable = layui.treetable
     let popup = layui.popup
+    let dtree = layui.dtree
 
     {#定义模块访问路径#}
     let MODULE_PATH = '/dept/'
@@ -435,16 +436,30 @@
         })
       })
     }
-  })
-</script>
-{#添加数据#}
-<script>
-  layui.use(['form', 'jquery', 'dtree'], function () {
-    let form = layui.form
-    let $ = layui.jquery
-    let dtree = layui.dtree
 
-    /*渲染下拉选择组件*/
+    // 修改数据 当点击更新之后，获取数据
+    form.on('submit(dept-update)', function (data) {
+      $.ajax({
+        url: '/dept/edit/' + data.field.deptId,
+        data: JSON.stringify(data.field),
+        dataType: 'json',
+        contentType: 'application/json',
+        type: 'put',
+        success: function (result) {
+          if (result.success) {
+            layer.msg(result.msg, { icon: 1, time: 1000 }, function () {
+              layer.close(layer.index)
+              location.reload()
+            })
+          } else {
+            layer.msg(result.msg, { icon: 2, time: 1000 })
+          }
+        }
+      })
+      return false
+    })
+
+    /*添加数据 渲染下拉选择组件*/
     dtree.renderSelect({
       elem: '#selectParent',
       url: '/dept/tree',
@@ -456,7 +471,7 @@
       selectInitVal: '1'
     })
 
-    /*表单组件，提交按钮之后触发的事件*/
+    /*添加数据 表单组件，提交按钮之后触发的事件*/
     form.on('submit(dept-save)', function (data) {
       $.ajax({
         url: '/dept/add',
@@ -479,33 +494,4 @@
     })
   })
 </script>
-{#修改数据#}
-<script>
-  layui.use(['form', 'jquery'], function () {
-    let form = layui.form
-    let $ = layui.jquery
-
-    // 当点击更新之后，获取数据
-    form.on('submit(dept-update)', function (data) {
-      $.ajax({
-        url: '/dept/edit/' + data.field.deptId,
-        data: JSON.stringify(data.field),
-        dataType: 'json',
-        contentType: 'application/json',
-        type: 'put',
-        success: function (result) {
-          if (result.success) {
-            layer.msg(result.msg, { icon: 1, time: 1000 }, function () {
-              layer.close(layer.index)
-              location.reload()
-            })
-          } else {
-            layer.msg(result.msg, { icon: 2, time: 1000 })
-          }
-        }
-      })
-      return false
-    })
-  })
-</script>
 </html>
\ No newline at end of file
diff --git a/applications/templates/rights/main.html b/applications/templates/rights/main.html
index e06bd88..51a13c9 100644
--- a/applications/templates/rights/main.html
+++ b/applications/templates/rights/main.html
@@ -166,12 +166,14 @@
 
 {% include 'common/footer.html' %}
 <script>
-  layui.use(['table', 'form', 'jquery', 'treetable', 'popup'], function () {
+  layui.use(['table', 'form', 'jquery', 'treetable', 'popup', 'dtree', 'iconPicker'], function () {
     let table = layui.table
     let form = layui.form
     let $ = layui.jquery
     let treetable = layui.treetable
     let popup = layui.popup
+    let iconPicker = layui.iconPicker
+    let dtree = layui.dtree
 
     let MODULE_PATH = '/rights/'
 
@@ -361,16 +363,8 @@
         })
       })
     }
-  })
-</script>
-{#添加权限数据页面#}
-<script>
-  layui.use(['form', 'jquery', 'iconPicker', 'dtree'], function () {
-    let form = layui.form
-    let $ = layui.jquery
-    let iconPicker = layui.iconPicker
-    let dtree = layui.dtree
 
+    {#添加权限数据页面#}
     dtree.renderSelect({
       elem: '#select_parent_dept',
       url: '{{ url_for('rights.select_parent') }}',
diff --git a/applications/templates/roles/main.html b/applications/templates/roles/main.html
index c2295ad..4b44087 100644
--- a/applications/templates/roles/main.html
+++ b/applications/templates/roles/main.html
@@ -309,14 +309,8 @@
     window.refresh = function () {
       table.reload('role-table')
     }
-  })
-</script>
-{#添加数据逻辑#}
-<script>
-  layui.use(['form', 'jquery'], function () {
-    let form = layui.form
-    let $ = layui.jquery
 
+    {#添加数据逻辑#}
     form.on('submit(role-save)', function (data) {
       $.ajax({
         url: '/admin/role/add',
@@ -327,7 +321,7 @@
         success: function (result) {
           if (result.success) {
             layer.msg(result.msg, { icon: 1, time: 1000 }, function () {
-              // # TODO 关闭不了页面
+              // TODO 关闭不了页面  flask-restful 拦截的错误信息没有提示
               layer.close(layer.index)  // 关闭当前页
               layui.table.reload('role-table')
             })