From 1c0757248dc834e10ef0b336f5a1d4bda92202c3 Mon Sep 17 00:00:00 2001
From: wangbing <wangbing@wbsite.xyz>
Date: Mon, 10 Feb 2020 02:51:29 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E6=8F=92=E6=A7=BDB?=
 =?UTF-8?q?UG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 083523aa99c25ed4d32a4269617dc8ec1cc39d44
---
 .../SpringBoot/resources/templates/control/nav.ftl        | 6 +++++-
 .../SpringBoot/resources/templates/screen/module/mgr.ftl  | 6 +++---
 .../resources/templates/screen/module/system/dept.ftl     | 6 +++---
 .../resources/templates/screen/module/system/dict.ftl     | 8 ++++----
 .../resources/templates/screen/module/system/dictItem.ftl | 6 +++---
 .../resources/templates/screen/module/system/file.ftl     | 6 +++---
 .../resources/templates/screen/module/system/logErr.ftl   | 6 +++---
 .../resources/templates/screen/module/system/res.ftl      | 6 +++---
 .../resources/templates/screen/module/system/role.ftl     | 8 ++++----
 .../resources/templates/screen/module/system/tokens.ftl   | 4 ++--
 .../resources/templates/screen/module/system/user.ftl     | 6 +++---
 11 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl b/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl
index 403633d6..0b6421c4 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl
@@ -737,6 +737,10 @@
                 type: Boolean,
                 default: true
             },
+            arg: {
+                type: Object | String | Number,
+                default: {}
+            }
         },
         methods: {
             input: function (value) {
@@ -744,7 +748,7 @@
             },
             onCommand: function (index) {
                 if (this.items[index].click) {
-                    this.items[index].click();
+                    this.items[index].click(this.arg);
                 }
             }
         },
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl
index bca5b0d9..2e4fe868 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl
@@ -144,9 +144,9 @@
                     width="120"
                     label="操作">
                 <template slot-scope="scope">
-                    <wb-dropdown>
-                        <wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit(scope.row)"></wb-dropdown-item>
-                        <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete(scope.row)"></wb-dropdown-item>
+                    <wb-dropdown :arg="scope.row">
+                        <wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit"></wb-dropdown-item>
+                        <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete"></wb-dropdown-item>
                     </wb-dropdown>
                 </template>
             </el-table-column>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl
index 0adec5b5..b4a8f9ff 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl
@@ -126,9 +126,9 @@
                             width="120"
                             label="操作">
                         <template slot-scope="scope">
-                            <wb-dropdown>
-                                <wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit(scope.row)"></wb-dropdown-item>
-                                <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete(scope.row)"></wb-dropdown-item>
+                            <wb-dropdown :arg="scope.row">
+                                <wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit"></wb-dropdown-item>
+                                <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete"></wb-dropdown-item>
                             </wb-dropdown>
                         </template>
                     </el-table-column>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl
index 5aa0d6bc..e6fb0110 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl
@@ -102,10 +102,10 @@
                     width="120"
                     label="操作">
                 <template slot-scope="scope">
-                    <wb-dropdown>
-                        <wb-dropdown-item value="查看" icon="el-icon-tickets" @click="onView(scope.row)"></wb-dropdown-item>
-                        <wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit(scope.row)"></wb-dropdown-item>
-                        <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete(scope.row)"></wb-dropdown-item>
+                    <wb-dropdown :arg="scope.row">
+                        <wb-dropdown-item value="查看" icon="el-icon-tickets" @click="onView"></wb-dropdown-item>
+                        <wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit"></wb-dropdown-item>
+                        <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete"></wb-dropdown-item>
                     </wb-dropdown>
                 </template>
             </el-table-column>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl
index f56285f3..f41e1a9e 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl
@@ -105,9 +105,9 @@
                     width="120"
                     label="操作">
                 <template slot-scope="scope">
-                    <wb-dropdown>
-                        <wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit(scope.row)"></wb-dropdown-item>
-                        <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete(scope.row)"></wb-dropdown-item>
+                    <wb-dropdown :arg="scope.row">
+                        <wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit"></wb-dropdown-item>
+                        <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete"></wb-dropdown-item>
                     </wb-dropdown>
                 </template>
             </el-table-column>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl
index ee36770a..86c0aef6 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl
@@ -94,9 +94,9 @@
                     width="120"
                     label="操作">
                 <template slot-scope="scope">
-                    <wb-dropdown>
-                        <wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit(scope.row)"></wb-dropdown-item>
-                        <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete(scope.row)"></wb-dropdown-item>
+                    <wb-dropdown :arg="scope.row">
+                        <wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit"></wb-dropdown-item>
+                        <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete"></wb-dropdown-item>
                     </wb-dropdown>
                 </template>
             </el-table-column>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/logErr.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/logErr.ftl
index 5d45dc4a..eee44f8c 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/logErr.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/logErr.ftl
@@ -115,9 +115,9 @@
                     width="120"
                     label="操作">
                 <template slot-scope="scope">
-                    <wb-dropdown>
-                        <wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit(scope.row)"></wb-dropdown-item>
-                        <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete(scope.row)"></wb-dropdown-item>
+                    <wb-dropdown :arg="scope.row">
+                        <wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit"></wb-dropdown-item>
+                        <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete"></wb-dropdown-item>
                     </wb-dropdown>
                 </template>
             </el-table-column>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl
index 8cbd8198..904b296a 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl
@@ -119,9 +119,9 @@
                             width="120"
                             label="操作">
                         <template slot-scope="scope">
-                            <wb-dropdown>
-                                <wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit(scope.row)"></wb-dropdown-item>
-                                <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete(scope.row)"></wb-dropdown-item>
+                            <wb-dropdown :arg="scope.row">
+                                <wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit"></wb-dropdown-item>
+                                <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete"></wb-dropdown-item>
                             </wb-dropdown>
                         </template>
                     </el-table-column>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl
index 583dc11f..0ead97da 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl
@@ -90,10 +90,10 @@
                     width="120"
                     label="操作">
                 <template slot-scope="scope">
-                    <wb-dropdown>
-                        <wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit(scope.row)"></wb-dropdown-item>
-                        <wb-dropdown-item value="授权" icon="el-icon-edit" @click="onResEdit(scope.row)"></wb-dropdown-item>
-                        <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete(scope.row)"></wb-dropdown-item>
+                    <wb-dropdown :arg="scope.row">
+                        <wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit"></wb-dropdown-item>
+                        <wb-dropdown-item value="授权" icon="el-icon-edit" @click="onResEdit"></wb-dropdown-item>
+                        <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete"></wb-dropdown-item>
                     </wb-dropdown>
                 </template>
             </el-table-column>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/tokens.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/tokens.ftl
index 7534af6c..2c2acb39 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/tokens.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/tokens.ftl
@@ -147,8 +147,8 @@
                     width="120"
                     label="操作">
                 <template slot-scope="scope">
-                    <wb-dropdown>
-                        <wb-dropdown-item value="注销" icon="el-icon-edit" @click="onLogout(scope.row)"></wb-dropdown-item>
+                    <wb-dropdown :arg="scope.row">
+                        <wb-dropdown-item value="注销" icon="el-icon-edit" @click="onLogout"></wb-dropdown-item>
                     </wb-dropdown>
                 </template>
             </el-table-column>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl
index 5a5fe2e4..a428904e 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl
@@ -116,9 +116,9 @@
                     width="120"
                     label="操作">
                 <template slot-scope="scope">
-                    <wb-dropdown>
-                        <wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit(scope.row)"></wb-dropdown-item>
-                        <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete(scope.row)"></wb-dropdown-item>
+                    <wb-dropdown :arg="scope.row">
+                        <wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit"></wb-dropdown-item>
+                        <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete"></wb-dropdown-item>
                     </wb-dropdown>
                 </template>
             </el-table-column>