From e7b88112d6d7864a2b6f2dfa38272ddb672cae2c Mon Sep 17 00:00:00 2001
From: felixu <xufei_0320@163.com>
Date: Tue, 5 Dec 2017 18:36:17 +0800
Subject: [PATCH] edit

---
 .../main/resources/templates/model/list.ftl   | 38 +++++++++----------
 .../resources/static/js/slife/datatable.js    | 27 +++++++++++++
 2 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/slife-activiti/src/main/resources/templates/model/list.ftl b/slife-activiti/src/main/resources/templates/model/list.ftl
index 5ca0081..b165bed 100644
--- a/slife-activiti/src/main/resources/templates/model/list.ftl
+++ b/slife-activiti/src/main/resources/templates/model/list.ftl
@@ -19,26 +19,26 @@
 
                 <div id="exampleToolbar" role="group">
 
-                    <label style="margin-left: 10px;">
-                        登录名：
-                        <input type="text" class="form-filter input-sm _search" name="search_eq_login_name">
-                    </label>
-                    <label style="margin-left: 10px;">
-                        动作：
-                        <input type="text" class="form-filter input-sm _search" name="search_eq_msg">
-                    </label>
-                    <label style="margin-left: 10px;">
-                        参数：
-                        <input type="text" class="form-filter input-sm _search" name="search_like_params">
-                    </label>
+                    <#--<label style="margin-left: 10px;">-->
+                        <#--登录名：-->
+                        <#--<input type="text" class="form-filter input-sm _search" name="search_eq_login_name">-->
+                    <#--</label>-->
+                    <#--<label style="margin-left: 10px;">-->
+                        <#--动作：-->
+                        <#--<input type="text" class="form-filter input-sm _search" name="search_eq_msg">-->
+                    <#--</label>-->
+                    <#--<label style="margin-left: 10px;">-->
+                        <#--参数：-->
+                        <#--<input type="text" class="form-filter input-sm _search" name="search_like_params">-->
+                    <#--</label>-->
 
                     <label style="margin-left: 10px;">
-                        <button class="btn btn-success" onclick="re_load()">
-                            <i class="fa fa-search" aria-hidden="true"></i>查询
-                        </button>
-                        <button type="button" class="btn  btn-primary" onclick="reset()">
-                            <i class="fa fa-circle-thin" aria-hidden="true"></i>重置
-                        </button>
+                        <#--<button class="btn btn-success" onclick="re_load()">-->
+                            <#--<i class="fa fa-search" aria-hidden="true"></i>查询-->
+                        <#--</button>-->
+                        <#--<button type="button" class="btn  btn-primary" onclick="reset()">-->
+                            <#--<i class="fa fa-circle-thin" aria-hidden="true"></i>重置-->
+                        <#--</button>-->
                         <button type="button" class="btn  btn-danger" onclick="batch_remove()">
                             <i class="fa fa-trash" aria-hidden="true"></i>删除
                         </button>
@@ -101,7 +101,7 @@
                 field: 'id',
                 align: 'center',
                 formatter: function (value, row, index) {
-                    return dt_delete_button(row);
+                    return dt_delete_button(row)+dt_edit_model_button(row);
                 }
             }];
         return c;
diff --git a/slife-web/src/main/resources/static/js/slife/datatable.js b/slife-web/src/main/resources/static/js/slife/datatable.js
index 6ccf5b3..cb8692e 100644
--- a/slife-web/src/main/resources/static/js/slife/datatable.js
+++ b/slife-web/src/main/resources/static/js/slife/datatable.js
@@ -209,6 +209,16 @@ function dt_edit_button(row) {
     return editO;
 }
 
+/**
+ * 编辑 按钮
+ * @returns {string}
+ */
+function dt_edit_model_button(row) {
+    var uri = url.substring(0, url.length - 1);
+    var editO = '<a class="btn btn-primary btn-sm" href="'+ uri +'er.html?modelId=' + row.id + '" title="编辑"><i class="fa fa-edit"></i></a> ';
+    return editO;
+}
+
 /**
  * 详情按钮
  * @returns {*}
@@ -243,6 +253,23 @@ function dt_detail(id) {
     dt_action("详情", "detail/" + id);
 }
 
+/**
+ * 打开模态框
+ * @param title
+ * @param action
+ */
+function dt_action(title, action) {
+    // iframe层
+    layer.open({
+        type: 2,
+        title: title,
+        maxmin: true,
+        shadeClose: false, // 点击遮罩关闭层
+        area: ['800px', '520px'],
+        content: url + action // iframe的url
+    });
+}
+
 /**
  * 打开模态框
  * @param title