From 09cd7b1f8dd4e72d1589e2426fcab46f39491265 Mon Sep 17 00:00:00 2001
From: wangbing <Wb295490665>
Date: Wed, 25 Nov 2020 14:33:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/screen/module/mgr.ftl | 18 +++----
 .../templates/screen/module/wsys/dept.ftl     | 10 ++--
 .../templates/screen/module/wsys/dict.ftl     |  4 +-
 .../templates/screen/module/wsys/dictItem.ftl |  6 +--
 .../templates/screen/module/wsys/file.ftl     |  6 +--
 .../templates/screen/module/wsys/logerr.ftl   |  2 +-
 .../templates/screen/module/wsys/logtask.ftl  |  4 +-
 .../templates/screen/module/wsys/profiles.ftl |  4 +-
 .../templates/screen/module/wsys/res.ftl      | 32 ++++++-------
 .../templates/screen/module/wsys/role.ftl     | 47 +++++++++++--------
 .../templates/screen/module/wsys/schedule.ftl |  4 +-
 .../templates/screen/module/wsys/taskSql.ftl  |  4 +-
 .../templates/screen/module/wsys/tokens.ftl   |  8 ++--
 .../templates/screen/module/wsys/user.ftl     |  8 ++--
 .../templates/screen/module/wsys/visitor.ftl  |  6 +--
 15 files changed, 86 insertions(+), 77 deletions(-)

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 49b61c6b..27620bda 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
@@ -13,31 +13,31 @@
             </el-form-item>
         <#elseif item.getFieldTypeJava() =="Byte" && item.isQuery>
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
-                <el-input v-model="vm.${item.getFName()}" type="number" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" min="-128" max="127" step="1"></el-input>
+                <el-input v-model="vm.${item.getFName()}" @keyup.enter.native="onSearch" type="number" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" min="-128" max="127" step="1"></el-input>
             </el-form-item>
         <#elseif item.getFieldTypeJava() =="Character" && item.isQuery>
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
-                <el-input v-model="vm.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" minlength="0" maxlength="1"></el-input>
+                <el-input v-model="vm.${item.getFName()}" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" minlength="0" maxlength="1"></el-input>
             </el-form-item>
         <#elseif item.getFieldTypeJava() =="Short" && item.isQuery>
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
-                <el-input v-model="vm.${item.getFName()}" type="number" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" min="-32768" max="32767" step="1"></el-input>
+                <el-input v-model="vm.${item.getFName()}" @keyup.enter.native="onSearch" type="number" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" min="-32768" max="32767" step="1"></el-input>
             </el-form-item>
         <#elseif item.getFieldTypeJava() =="Integer" && item.isQuery>
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
-                <el-input v-model="vm.${item.getFName()}" type="number" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" min="-2147483648" max="2147483647" step="1"></el-input>
+                <el-input v-model="vm.${item.getFName()}" @keyup.enter.native="onSearch" type="number" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" min="-2147483648" max="2147483647" step="1"></el-input>
             </el-form-item>
         <#elseif item.getFieldTypeJava() =="Long" && item.isQuery>
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
-                <el-input v-model="vm.${item.getFName()}" type="number" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" step="1"></el-input>
+                <el-input v-model="vm.${item.getFName()}" @keyup.enter.native="onSearch" type="number" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" step="1"></el-input>
             </el-form-item>
         <#elseif item.getFieldTypeJava() =="Float" && item.isQuery>
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
-                <el-input v-model="vm.${item.getFName()}" type="number" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" step="0.01"></el-input>
+                <el-input v-model="vm.${item.getFName()}" @keyup.enter.native="onSearch" type="number" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" step="0.01"></el-input>
             </el-form-item>
         <#elseif item.getFieldTypeJava() =="Double" && item.isQuery>
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
-                <el-input v-model="vm.${item.getFName()}" type="number" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" step="0.01"></el-input>
+                <el-input v-model="vm.${item.getFName()}" @keyup.enter.native="onSearch" type="number" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" step="0.01"></el-input>
             </el-form-item>
         <#elseif item.getFieldTypeJava() =="Date" && item.isQuery>
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
@@ -68,12 +68,12 @@
             </el-form-item>
         <#elseif item.getFieldTypeJava() =="String" && item.isQuery>
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
-                <el-input v-model="vm.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}"></el-input>
+                <el-input v-model="vm.${item.getFName()}" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}"></el-input>
             </el-form-item>
         </#if>
         <#if item.getFieldTypeJava() =="String" && item.isLike>
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
-                <el-input v-model="vm.${item.getFName()}Like" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}模糊查询"></el-input>
+                <el-input v-model="vm.${item.getFName()}Like" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}模糊查询"></el-input>
             </el-form-item>
         </#if>
     </#if>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dept.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dept.ftl
index 7ea1684d..9904a49a 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dept.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dept.ftl
@@ -3,19 +3,19 @@
     <el-card class="box-card">
         <el-form class="search" :inline="true" :model="vm" ref="vm" label-position="right" label-width="90px">
             <el-form-item label="部门代码" prop="deptCode">
-                <el-input v-model="vm.deptCode" clearable size="mini" placeholder="请输入部门代码"></el-input>
+                <el-input v-model="vm.deptCode" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入部门代码"></el-input>
             </el-form-item>
             <el-form-item label="部门名称" prop="deptName">
-                <el-input v-model="vm.deptName" clearable size="mini" placeholder="请输入部门名称"></el-input>
+                <el-input v-model="vm.deptName" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入部门名称"></el-input>
             </el-form-item>
             <el-form-item label="部门别名" prop="deptAlias">
-                <el-input v-model="vm.deptAlias" clearable size="mini" placeholder="请输入部门别名"></el-input>
+                <el-input v-model="vm.deptAlias" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入部门别名"></el-input>
             </el-form-item>
             <el-form-item label="上级代码" prop="supCode">
-                <el-input v-model="vm.supCode" clearable size="mini" placeholder="请输入上级代码"></el-input>
+                <el-input v-model="vm.supCode" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入上级代码"></el-input>
             </el-form-item>
             <el-form-item label="上级名称" prop="supName">
-                <el-input v-model="vm.supName" clearable size="mini" placeholder="请输入上级名称"></el-input>
+                <el-input v-model="vm.supName" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入上级名称"></el-input>
             </el-form-item>
             <el-form-item label="是否有效" prop="valid">
                 <el-radio-group v-model="vm.valid" clearable size="mini">
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dict.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dict.ftl
index 41f53dec..f42c60bf 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dict.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dict.ftl
@@ -3,10 +3,10 @@
     <el-card class="box-card">
         <el-form class="search" :inline="true" :model="vm" ref="vm" label-position="right" label-width="90px">
             <el-form-item label="字典名称" prop="dictName">
-                <el-input v-model="vm.dictName" clearable size="mini" placeholder="请输入字典名称"></el-input>
+                <el-input v-model="vm.dictName" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入字典名称"></el-input>
             </el-form-item>
             <el-form-item label="字典描述" prop="dictComment">
-                <el-input v-model="vm.dictComment" clearable size="mini" placeholder="请输入字典描述"></el-input>
+                <el-input v-model="vm.dictComment" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入字典描述"></el-input>
             </el-form-item>
             <el-form-item label="是否有效" prop="valid">
                 <el-radio-group v-model="vm.valid">
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dictItem.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dictItem.ftl
index 7424fe3c..a1cd7dcb 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dictItem.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dictItem.ftl
@@ -3,13 +3,13 @@
     <el-card class="box-card">
         <el-form class="search" :inline="true" :model="vm" ref="vm" label-position="right" label-width="90px">
             <el-form-item label="字典名称" prop="dictName">
-                <el-input v-model="vm.dictName" clearable size="mini" placeholder="请输入字典名称" readonly></el-input>
+                <el-input v-model="vm.dictName" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入字典名称" readonly></el-input>
             </el-form-item>
             <el-form-item label="字典键" prop="key">
-                <el-input v-model="vm.key" clearable size="mini" placeholder="请输入字典键"></el-input>
+                <el-input v-model="vm.key" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入字典键"></el-input>
             </el-form-item>
             <el-form-item label="字典值" prop="value">
-                <el-input v-model="vm.value" clearable size="mini" placeholder="请输入字典值"></el-input>
+                <el-input v-model="vm.value" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入字典值"></el-input>
             </el-form-item>
             <el-form-item label="是否有效" prop="valid">
                 <el-radio-group v-model="vm.valid" clearable>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/file.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/file.ftl
index fa8a092c..6078277e 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/file.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/file.ftl
@@ -3,7 +3,7 @@
     <el-card class="box-card">
         <el-form class="search" :inline="true" :model="vm" ref="vm" label-position="right" label-width="90px">
             <el-form-item label="文件名称" prop="name">
-                <el-input v-model="vm.name" clearable size="mini" placeholder="请输入文件名称"></el-input>
+                <el-input v-model="vm.name" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入文件名称"></el-input>
             </el-form-item>
             <el-form-item label="文件类型" prop="fileType">
                 <el-select v-model="vm.fileType" clearable size="mini" filterable placeholder="请输入文件类型">
@@ -12,10 +12,10 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="扩展属性1" prop="attribute1">
-                <el-input v-model="vm.attribute1" clearable size="mini" placeholder="请输入扩展属性1"></el-input>
+                <el-input v-model="vm.attribute1" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入扩展属性1"></el-input>
             </el-form-item>
             <el-form-item label="扩展属性2" prop="attribute2">
-                <el-input v-model="vm.attribute2" clearable size="mini" placeholder="请输入扩展属性2"></el-input>
+                <el-input v-model="vm.attribute2" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入扩展属性2"></el-input>
             </el-form-item>
             <el-form-item label="开始日期" prop="startDate">
                 <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logerr.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logerr.ftl
index 3d1b7125..c5967e8c 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logerr.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logerr.ftl
@@ -9,7 +9,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="任务标题" prop="logTitle">
-                <el-input v-model="vm.logTitle" clearable size="mini" placeholder="请输入任务标题"></el-input>
+                <el-input v-model="vm.logTitle" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入任务标题"></el-input>
             </el-form-item>
             <el-form-item label="日志状态" prop="logState">
                 <el-select v-model="vm.logState" clearable size="mini" filterable placeholder="请输入日志状态">
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logtask.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logtask.ftl
index 71d7539e..0c94bb1d 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logtask.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logtask.ftl
@@ -2,7 +2,7 @@
     <el-card class="box-card">
         <el-form class="search" :inline="true" :model="vm" ref="vm" label-position="right" label-width="90px">
             <el-form-item label="任务名称" prop="taskName">
-                <el-input v-model="vm.taskName" clearable size="mini" placeholder="请输入任务名称"></el-input>
+                <el-input v-model="vm.taskName" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入任务名称"></el-input>
             </el-form-item>
             <el-form-item label="开始时间" prop="startTime">
                 <el-date-picker
@@ -25,7 +25,7 @@
                 </el-date-picker>
             </el-form-item>
             <el-form-item label="执行耗时" prop="execTime">
-                <el-input v-model="vm.execTime" type="number" clearable size="mini" placeholder="请输入执行耗时" min="-2147483648" max="2147483647" step="1"></el-input>
+                <el-input v-model="vm.execTime" @keyup.enter.native="onSearch" type="number" clearable size="mini" placeholder="请输入执行耗时" min="-2147483648" max="2147483647" step="1"></el-input>
             </el-form-item>
             <el-form-item label="执行状态" prop="execState">
                 <el-select v-model="vm.execState" clearable size="mini" filterable placeholder="请输入执行状态">
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl
index 9d884a1a..509bc0d9 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl
@@ -8,10 +8,10 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="配置项名" prop="key">
-                <el-input v-model="vm.key" clearable size="mini" placeholder="请输入配置项名"></el-input>
+                <el-input v-model="vm.key" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入配置项名"></el-input>
             </el-form-item>
             <el-form-item label="配置描述" prop="noteLike">
-                <el-input v-model="vm.noteLike" clearable size="mini" placeholder="请输入配置描述模糊查询"></el-input>
+                <el-input v-model="vm.noteLike" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入配置描述模糊查询"></el-input>
             </el-form-item>
             <el-form-item label="开始日期" prop="startDate">
                 <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/res.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/res.ftl
index 8662b5e9..3d768000 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/res.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/res.ftl
@@ -2,10 +2,10 @@
     <el-card class="box-card">
         <el-form class="search" :inline="true" :model="vm" ref="vm" label-position="right" label-width="90px">
             <el-form-item label="资源代码" prop="resCode">
-                <el-input v-model="vm.resCode" clearable size="mini" placeholder="请输入资源代码"></el-input>
+                <el-input v-model="vm.resCode" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入资源代码"></el-input>
             </el-form-item>
             <el-form-item label="资源名称" prop="resName">
-                <el-input v-model="vm.resName" clearable size="mini" placeholder="请输入资源名称"></el-input>
+                <el-input v-model="vm.resName" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入资源名称"></el-input>
             </el-form-item>
             <el-form-item label="资源类型" prop="resType">
                 <el-select v-model="vm.resType" clearable size="mini" filterable placeholder="请输入资源类型">
@@ -14,7 +14,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="资源内容" prop="resValue">
-                <el-input v-model="vm.resValue" clearable size="mini" placeholder="请输入资源内容"></el-input>
+                <el-input v-model="vm.resValue" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入资源内容"></el-input>
             </el-form-item>
             <el-form-item label="是否免费" prop="free">
                 <el-radio-group v-model="vm.free" clearable size="mini">
@@ -235,7 +235,7 @@
             :close-on-press-escape="true"
             :modal-append-to-body="true"
             :append-to-body="true"
-            @opened="onTreeOpened"
+            @opened="onTreeLoad"
             size="600px">
 
         <el-page-header slot="title" @back="treeShow = false" content="结构展示"></el-page-header>
@@ -257,12 +257,12 @@
                             <el-tooltip effect="dark" content="过滤树" placement="bottom">
                                 <el-button size="mini" type="primary" icon="el-icon-search" @click="$refs.tree.filter(treeFilter)">查询</el-button>
                             </el-tooltip>
-                            <el-tooltip effect="dark" content="批量删除" placement="bottom">
-                                <el-button size="mini" type="primary" icon="el-icon-delete" @click="onTreeDelete">删除</el-button>
-                            </el-tooltip>
                             <el-tooltip effect="dark" content="刷新" placement="bottom">
                                 <el-button size="mini" type="primary" icon="el-icon-refresh" @click="onTreeLoad">刷新</el-button>
                             </el-tooltip>
+                            <el-tooltip effect="dark" content="批量删除" placement="bottom">
+                                <el-button size="mini" type="primary" icon="el-icon-delete" @click="onTreeDelete">删除</el-button>
+                            </el-tooltip>
                         </el-button-group>
                     </el-col>
                 </el-row>
@@ -271,23 +271,23 @@
             <el-main style="height:100%;padding: 0 20px 20px 20px;">
                 <el-tree
                         :data="treeData"
-                        node-key="resCode"
+                        node-key="id"
                         ref="tree"
                         accordion
                         show-checkbox
                         check-strictly="true"
-                        default-expand-all="true"
                         :filter-node-method="onTreeFilter"
-                        :expand-on-click-node="false">
+                        :default-expanded-keys="treeExpand">
                     <div class="tree" slot-scope="{ node, data }">
                 <span>
                     {{ data.resName }}
-                    <span style="color: #409EFF" @click="onTreeEdit(data)">[{{data.resCode}}]</span>
+                    <span style="color: #409EFF">[{{data.resCode}}]</span>
                     <span style="color: #ff0000" v-if="data.free">[免费]</span>
                 </span>
                 <span>
-                    <el-link type="success" @click="onTreeCreate(data)">新增</el-link>
-                    <el-link type="danger" @click="onDelete(data)">删除</el-link>
+                    <el-link type="success" @click.stop="onTreeCreate(data)">新增</el-link>
+                    <el-link type="primary" @click.stop="onTreeEdit(data)">编辑</el-link>
+                    <el-link type="danger" @click.stop="onDelete(data)">删除</el-link>
                 </span>
                     </div>
                 </el-tree>
@@ -363,6 +363,7 @@
             },
             treeShow: false,
             treeFilter: '',
+            treeExpand: [],
             treeData: []
         },
         methods: {
@@ -470,11 +471,10 @@
                         nav.e(response.errors[0].message);
                     } else {
                         this.treeData = response.result;
+                        // 默认展开第一个节点
+                        this.treeExpand = [response.result[0].id];
                     }
                 }.bind(this))
-            },
-            onTreeOpened: function () {
-                this.onTreeLoad();
             }
         },
         mounted: function () {
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl
index 198f82fe..5a7d7ebd 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl
@@ -2,13 +2,13 @@
     <el-card class="box-card">
         <el-form class="search" :inline="true" :model="vm" ref="vm" label-position="right" label-width="90px">
             <el-form-item label="角色代码" prop="code">
-                <el-input v-model="vm.code" clearable size="mini" placeholder="请输入角色代码"></el-input>
+                <el-input v-model="vm.code" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入角色代码"></el-input>
             </el-form-item>
             <el-form-item label="角色名称" prop="name">
-                <el-input v-model="vm.name" clearable size="mini" placeholder="请输入角色名称"></el-input>
+                <el-input v-model="vm.name" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入角色名称"></el-input>
             </el-form-item>
             <el-form-item label="角色描述" prop="comment">
-                <el-input v-model="vm.comment" clearable size="mini" placeholder="请输入角色描述"></el-input>
+                <el-input v-model="vm.comment" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入角色描述"></el-input>
             </el-form-item>
             <el-form-item label="开始日期" prop="startDate">
                 <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
@@ -166,25 +166,28 @@
 		</span>
     </el-dialog>
 
-    <el-dialog class="form-dialog" :title="formRes.title" :visible.sync="formRes.dialog">
+    <el-dialog width="540px" :title="formRes.title" :visible.sync="formRes.dialog">
         <el-row style="padding: 0 10px 10px 10px;">
             <el-col :span="12">
                 <el-input
                         clearable
                         size="mini"
-                        v-model="formRes.treeFilter"
+                        v-model="treeFilter"
                         prefix-icon="el-icon-search"
                         placeholder="输入过滤关键字"
-                        @keyup.enter.native="$refs.tree.filter(formRes.treeFilter)"/>
+                        @keyup.enter.native="$refs.tree.filter(treeFilter)"/>
             </el-col>
             <el-col :span="11" offset="1">
                 <el-button-group>
                     <el-tooltip effect="dark" content="关键字过滤资源" placement="bottom">
-                        <el-button size="mini" type="primary" icon="el-icon-search" @click="$refs.tree.filter(formRes.treeFilter)">查询</el-button>
+                        <el-button size="mini" type="primary" icon="el-icon-search" @click="$refs.tree.filter(treeFilter)">查询</el-button>
+                    </el-tooltip>
+                    <el-tooltip effect="dark" content="刷新" placement="bottom">
+                        <el-button size="mini" type="primary" icon="el-icon-refresh" @click="onTreeLoad">刷新</el-button>
                     </el-tooltip>
                     <el-tooltip effect="dark" content="勾选父节点时是否关联勾选所有子节点" placement="bottom">
-                        <el-button v-if="!formRes.strictly" @click="formRes.strictly = !formRes.strictly" size="mini" type="primary" icon="el-icon-share">关联</el-button>
-                        <el-button v-if="formRes.strictly" @click="formRes.strictly = !formRes.strictly" size="mini" icon="el-icon-share">关联</el-button>
+                        <el-button v-if="!treeStrictly" @click="treeStrictly = !treeStrictly" size="mini" type="primary" icon="el-icon-share">关联</el-button>
+                        <el-button v-if="treeStrictly" @click="treeStrictly = !treeStrictly" size="mini" icon="el-icon-share">关联</el-button>
                     </el-tooltip>
                 </el-button-group>
             </el-col>
@@ -192,16 +195,22 @@
 
         <el-tree
                 ref="tree"
+                accordion
                 node-key="id"
                 show-checkbox
                 :data="treeData"
                 @check="onCheck"
                 :check-strictly="true"
-                :expand-on-click-node="false"
-                :filter-node-method="onTreeFilter">
+                :expand-on-click-node="true"
+                :filter-node-method="onTreeFilter"
+                :default-expanded-keys="treeExpand">
             <div class="tree" slot-scope="{ node, data }">
                 <el-tooltip class="item" effect="dark" :content="data.resValue" placement="right">
-                    <span>{{ data.resName }}<span style="color: #409EFF">[{{data.resCode}}]</span></span>
+                    <span>
+                        {{ data.resName }}
+                        <span style="color: #409EFF">[{{data.resCode}}]</span>
+                        <span style="color: #ff0000" v-if="data.free">[免费]</span>
+                    </span>
                 </el-tooltip>
             </div>
         </el-tree>
@@ -257,9 +266,10 @@
                 dialog: false,
                 roleId: null,
                 roleCode: null,
-                treeFilter: '',
-                strictly:true//是否严格遵循复制不关联
             },
+            treeFilter: '',
+            treeExpand: [],
+            treeStrictly:true,//是否严格遵循复制不关联
             treeData: []
         },
         methods: {
@@ -364,22 +374,21 @@
                         || data.resCode.indexOf(value) !== -1
                         || data.resValue.indexOf(value) !== -1;
             },
-            onLoadTree: function () {
+            onTreeLoad: function () {
                 new Ajax("wsys", "res", "tree").post({}, function (response) {
                     if (response.errors.length > 0) {
                         nav.e(response.errors[0].message);
                     } else {
                         this.treeData = response.result;
-                        this.treeData.forTree(function (item) {
-                            item.disabled = item.free;
-                        });
+                        // 默认展开第一个节点
+                        this.treeExpand = [response.result[0].id];
                     }
                 }.bind(this))
             },
         },
         mounted: function () {
             this.onFind();
-            this.onLoadTree();
+            this.onTreeLoad();
         }
     })
 </script>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/schedule.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/schedule.ftl
index 09907af2..90c721a7 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/schedule.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/schedule.ftl
@@ -2,10 +2,10 @@
     <el-card class="box-card">
         <el-form class="search" :inline="true" :model="vm" ref="vm" label-position="right" label-width="90px">
             <el-form-item label="任务ID" prop="taskId">
-                <el-input v-model="vm.taskId" clearable size="mini" placeholder="请输入任务ID"></el-input>
+                <el-input v-model="vm.taskId" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入任务ID"></el-input>
             </el-form-item>
             <el-form-item label="任务名称" prop="taskName">
-                <el-input v-model="vm.taskName" clearable size="mini" placeholder="请输入任务名称"></el-input>
+                <el-input v-model="vm.taskName" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入任务名称"></el-input>
             </el-form-item>
             <el-form-item label="运行状态" prop="run">
                 <el-radio-group v-model="vm.run" clearable size="mini">
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/taskSql.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/taskSql.ftl
index 53c6edfa..bb20ba48 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/taskSql.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/taskSql.ftl
@@ -2,10 +2,10 @@
     <el-card class="box-card">
         <el-form class="search" :inline="true" :model="vm" ref="vm" label-position="right" label-width="90px">
             <el-form-item label="任务名称" prop="taskName">
-                <el-input v-model="vm.taskName" clearable size="mini" placeholder="请输入任务名称"></el-input>
+                <el-input v-model="vm.taskName" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入任务名称"></el-input>
             </el-form-item>
             <el-form-item label="详细注释" prop="taskNote">
-                <el-input v-model="vm.taskNote" clearable size="mini" placeholder="请输入详细注释"></el-input>
+                <el-input v-model="vm.taskNote" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入详细注释"></el-input>
             </el-form-item>
             <el-form-item label="任务类型" prop="taskType">
                 <el-select v-model="vm.taskType" clearable size="mini" filterable placeholder="请输入任务类型">
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/tokens.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/tokens.ftl
index cea1033d..e211fda3 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/tokens.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/tokens.ftl
@@ -3,13 +3,13 @@
     <el-card class="box-card">
         <el-form class="search" :inline="true" :model="vm" ref="vm" label-position="right" label-width="90px">
             <el-form-item label="用户主键" prop="userId">
-                <el-input v-model="vm.userId" clearable size="mini" placeholder="请输入用户主键"></el-input>
+                <el-input v-model="vm.userId" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入用户主键"></el-input>
             </el-form-item>
             <el-form-item label="用户名称" prop="userName">
-                <el-input v-model="vm.userName" clearable size="mini" placeholder="请输入用户名称"></el-input>
+                <el-input v-model="vm.userName" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入用户名称"></el-input>
             </el-form-item>
             <el-form-item label="用户别名" prop="userAliasLike">
-                <el-input v-model="vm.userAliasLike" clearable size="mini" placeholder="请输入用户别名模糊查询"></el-input>
+                <el-input v-model="vm.userAliasLike" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入用户别名模糊查询"></el-input>
             </el-form-item>
             <el-form-item label="登录时间" prop="loginTime">
                 <el-date-picker
@@ -28,7 +28,7 @@
                 </el-radio-group>
             </el-form-item>
             <el-form-item label="部门名称" prop="deptName">
-                <el-input v-model="vm.deptName" clearable size="mini" placeholder="请输入部门名称"></el-input>
+                <el-input v-model="vm.deptName" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入部门名称"></el-input>
             </el-form-item>
             <el-form-item label="终端类型" prop="terminal">
                 <el-select v-model="vm.terminal" clearable size="mini" filterable placeholder="请输入日志类型">
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl
index c35b0be2..cdae46d1 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl
@@ -3,13 +3,13 @@
     <el-card class="box-card">
         <el-form class="search" :inline="true" :model="vm" ref="vm" label-position="right" label-width="90px">
             <el-form-item label="用户账户" prop="userName">
-                <el-input v-model="vm.userName" clearable size="mini" placeholder="请输入用户账户"></el-input>
+                <el-input v-model="vm.userName" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入用户账户"></el-input>
             </el-form-item>
             <el-form-item label="用户代码" prop="userCode">
-                <el-input v-model="vm.userCode" clearable size="mini" placeholder="请输入用户代码"></el-input>
+                <el-input v-model="vm.userCode" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入用户代码"></el-input>
             </el-form-item>
             <el-form-item label="用户别名" prop="userAlias">
-                <el-input v-model="vm.userAlias" clearable size="mini" placeholder="请输入用户别名"></el-input>
+                <el-input v-model="vm.userAlias" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入用户别名"></el-input>
             </el-form-item>
             <el-form-item label="用户状态" prop="userStatus">
                 <el-select v-model="vm.userStatus" clearable size="mini" filterable placeholder="请输入用户状态">
@@ -19,7 +19,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="所属部门" prop="deptCode">
-                <el-input-dept v-model="vm.deptCode" clearable size="mini" placeholder="请选择所属部门"></el-input-dept>
+                <el-input-dept v-model="vm.deptCode" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请选择所属部门"></el-input-dept>
             </el-form-item>
             <el-form-item label="开始日期" prop="startDate">
                 <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/visitor.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/visitor.ftl
index d1b455f8..cabb61c7 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/visitor.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/visitor.ftl
@@ -2,13 +2,13 @@
     <el-card class="box-card">
         <el-form class="search" :inline="true" :model="vm" ref="vm" label-position="right" label-width="90px">
             <el-form-item label="应用名称" prop="appName">
-                <el-input v-model="vm.appName" clearable size="mini" placeholder="请输入应用名称"></el-input>
+                <el-input v-model="vm.appName" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入应用名称"></el-input>
             </el-form-item>
             <el-form-item label="应用码" prop="appKey">
-                <el-input v-model="vm.appKey" clearable size="mini" placeholder="请输入应用码"></el-input>
+                <el-input v-model="vm.appKey" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入应用码"></el-input>
             </el-form-item>
             <el-form-item label="安全码" prop="appSecret">
-                <el-input v-model="vm.appSecret" clearable size="mini" placeholder="请输入安全码"></el-input>
+                <el-input v-model="vm.appSecret" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入安全码"></el-input>
             </el-form-item>
             <el-form-item label="是否有效" prop="valid">
                 <el-radio-group v-model="vm.valid" clearable size="mini">