From e18aeba7dd2ca2abd9be5bae4ba3ecba1878e767 Mon Sep 17 00:00:00 2001
From: JianWeie <jianweie@live.com>
Date: Wed, 1 Sep 2021 09:49:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CrudTemplete/View/Create.tpl              | 13 ++---
 .../CrudTemplete/View/Edit.tpl                | 13 ++---
 .../CrudTemplete/View/Index.tpl               | 49 +++++++++++--------
 3 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/View/Create.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/View/Create.tpl
index f4d2b15..8116477 100644
--- a/CoreCms.Net.CodeGenerator/CrudTemplete/View/Create.tpl
+++ b/CoreCms.Net.CodeGenerator/CrudTemplete/View/Create.tpl
@@ -3,17 +3,12 @@
 	{% for field in ModelFields %}{% if  field.DbColumnName contains 'Image' or field.DbColumnName contains 'image' or field.DbColumnName contains 'thumbnail'  or field.DbColumnName contains 'Thumbnail' %}
 	<div class="layui-form-item">
         <label for="{{field.DbColumnName}}" class="layui-form-label  layui-form-required">{{field.ColumnDescription}}</label>
-        <div class="layui-input-block">
+        <div class="layui-input-inline">
             <input name="{{field.DbColumnName}}" id="{{field.DbColumnName}}Input" lay-verType="tips" lay-verify="required" class="layui-input" placeholder="请上传{{field.ColumnDescription}}" lay-reqText="请上传{{field.ColumnDescription}}"  />
         </div>
-		<div class="layui-input-block">
-            <div class="layui-upload">
-                <button type="button" class="layui-btn" id="upBtn{{field.DbColumnName}}" lay-active="doCropperImg">上传图片</button>
-                <div class="layui-upload-list">
-                    <img class="layui-upload-img" id="viewImgBox{{field.DbColumnName}}"  src="{% raw %}{{{% endraw %} layui.setter.noImagePicUrl {% raw %}}}{% endraw %}">
-                    <p id="viewTextBox{{field.DbColumnName}}"></p>
-                </div>
-            </div>
+		<div class="layui-input-inline">
+            <img class="coreshop-upload-img" id="viewImgBox{{field.DbColumnName}}"  src="{% raw %}{{{% endraw %} layui.setter.noImagePicUrl {% raw %}}}{% endraw %}">
+            <button type="button" class="layui-btn" id="upBtn{{field.DbColumnName}}" lay-active="doCropperImg">上传图片</button>
         </div>
     </div>{% elsif field.DataType == 'nvarchar' %}
 	<div class="layui-form-item">
diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/View/Edit.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/View/Edit.tpl
index f4ff65d..9da24b3 100644
--- a/CoreCms.Net.CodeGenerator/CrudTemplete/View/Edit.tpl
+++ b/CoreCms.Net.CodeGenerator/CrudTemplete/View/Edit.tpl
@@ -3,17 +3,12 @@
 	    {% for field in ModelFields %}{% if field.IsIdentity == true and field.IsPrimarykey == true %}<input type="hidden" name="{{field.DbColumnName}}"  value="{% raw %}{{{% endraw %}d.params.data.{{field.DbColumnName}} || '' {% raw %}}}{% endraw %}" />{% endif %}{% if  field.DbColumnName contains 'Image' or field.DbColumnName contains 'image'  or field.DbColumnName contains 'thumbnail'  or field.DbColumnName contains 'Thumbnail' %}
 	    <div class="layui-form-item">
             <label for="{{field.DbColumnName}}" class="layui-form-label  layui-form-required">{{field.ColumnDescription}}</label>
-            <div class="layui-input-block">
+            <div class="layui-input-inline">
                 <input name="{{field.DbColumnName}}" id="{{field.DbColumnName}}Input" lay-verType="tips" lay-verify="required" class="layui-input"  value="{% raw %}{{{% endraw %}d.params.data.{{field.DbColumnName}} || '' {% raw %}}}{% endraw %}" placeholder="请上传{{field.ColumnDescription}}" lay-reqText="请上传{{field.ColumnDescription}}"  />
             </div>
-		    <div class="layui-input-block">
-                <div class="layui-upload">
-                    <button type="button" class="layui-btn" id="upBtn{{field.DbColumnName}}" lay-active="doCropperImg">上传图片</button>
-                    <div class="layui-upload-list">
-                        <img class="layui-upload-img" id="viewImgBox{{field.DbColumnName}}" src="{% raw %}{{{% endraw %}d.params.data.{{field.DbColumnName}} || layui.setter.noImagePicUrl {% raw %}}}{% endraw %}">
-                        <p id="viewTextBox{{field.DbColumnName}}"></p>
-                    </div>
-                </div>
+		    <div class="layui-input-inline">
+                <button type="button" class="layui-btn" id="upBtn{{field.DbColumnName}}" lay-active="doCropperImg">上传图片</button>
+                <img class="coreshop-upload-img" id="viewImgBox{{field.DbColumnName}}" src="{% raw %}{{{% endraw %}d.params.data.{{field.DbColumnName}} || layui.setter.noImagePicUrl {% raw %}}}{% endraw %}">
             </div>
         </div>{% elsif field.DataType == 'nvarchar' %}
 	    <div class="layui-form-item">
diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/View/Index.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/View/Index.tpl
index cb01c12..1cb01af 100644
--- a/CoreCms.Net.CodeGenerator/CrudTemplete/View/Index.tpl
+++ b/CoreCms.Net.CodeGenerator/CrudTemplete/View/Index.tpl
@@ -11,7 +11,14 @@
     /* 重写样式 */
 </style>
 <script type="text/html" template lay-type="Post" lay-url="{{ layui.setter.apiUrl }}Api/{{ModelClassName}}/GetIndex" lay-done="layui.data.done(d);">
-    <div class="layui-form coreshop-search-form">
+    
+</script>
+<div class="table-body">
+    <table  id="LAY-app-{{ModelClassName}}-tableBox" lay-filter="LAY-app-{{ModelClassName}}-tableBox"></table>
+</div>
+
+<script type="text/html" id="LAY-app-{{ModelClassName}}-toolbar">
+    <div class="layui-form coreshop-toolbar-search-form">
         <div class="layui-form-item">
 		    {% for field in ModelFields %}{% if field.DataType == 'bit' %}
 		    <div class="layui-inline">
@@ -42,11 +49,8 @@
         </div>
     </div>
 </script>
-<div class="table-body">
-    <table  id="LAY-app-{{ModelClassName}}-tableBox" lay-filter="LAY-app-{{ModelClassName}}-tableBox"></table>
-</div>
 
-<script type="text/html" id="LAY-app-{{ModelClassName}}-toolbar">
+<script type="text/html" id="LAY-app-{{ModelClassName}}-pagebar">
     <div class="layui-btn-container">
         <button class="layui-btn layui-btn-sm" lay-event="addData"><i class="layui-icon layui-icon-add-1"></i>添加数据</button>
         <button class="layui-btn layui-btn-sm" lay-event="batchDelete"><i class="layui-icon layui-icon-delete"></i>批量删除</button>
@@ -54,6 +58,7 @@
         <button class="layui-btn layui-btn-sm" lay-event="queryExportExcel"><i class="layui-icon layui-icon-download-circle"></i>查询导出</button>
     </div>
 </script>
+
 <script type="text/html" id="LAY-app-{{ModelClassName}}-tableBox-bar">
     <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看</a>
     <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
@@ -70,8 +75,6 @@
             <a class="layui-btn layui-btn-normal cursor" lay-event="del">确定</a>
         </div>
     </div>
-
-
 </script>
 
 <script>
@@ -93,14 +96,7 @@
                     , coreHelper = layui.coreHelper
                     , util = layui.util
                     , view = layui.view;
-			    {% for field in ModelFields %}{% if field.DataType == 'datetime' %}
-                laydate.render({
-                    elem: '#searchTime-{{ModelClassName}}-{{field.DbColumnName}}',
-                    type: 'datetime',
-                    range: '到',
-                });{% endif %}{% endfor %}
-                //重载form
-                form.render();
+			    
                 var searchwhere;
                 //监听搜索
                 form.on('submit(LAY-app-{{ModelClassName}}-search)',
@@ -116,8 +112,10 @@
                     url: layui.setter.apiUrl + 'Api/{{ModelClassName}}/GetPageList',
                     method: 'POST',
 				    toolbar: '#LAY-app-{{ModelClassName}}-toolbar',
+				    pagebar: '#LAY-app-{{ModelClassName}}-pagebar',
+                    className: 'pagebarbox',
                     defaultToolbar: ['filter', 'print', 'exports'],
-                    height: 'full-189',//面包屑142px,搜索框4行172,3行137,2行102,1行67
+                    height: 'full-127',//面包屑142px,搜索框4行172,3行137,2行102,1行67
                     page: true,
                     limit: 30,
                     limits: [10, 15, 20, 25, 30, 50, 100, 200],
@@ -158,7 +156,7 @@
                     doDetails(obj);
                 });
                 //头工具栏事件
-                table.on('toolbar(LAY-app-{{ModelClassName}}-tableBox)', function (obj) {
+                table.on('pagebar(LAY-app-{{ModelClassName}}-tableBox)', function (obj) {
                     var checkStatus = table.checkStatus(obj.config.id);
                     switch (obj.event) {
                     case 'addData':
@@ -193,7 +191,7 @@
                                 admin.popup({
                                     shadeClose: false,
                                     title: '创建数据',
-                                    area: ['1000px', '500px'],
+                                    area: ['1200px', '90%'],
                                     id: 'LAY-popup-{{ModelClassName}}-create',
                                     success: function (layero, index) {
                                         view(this.id).render('base/{{ModelClassName}}/create', { data: e.data }).done(function () {
@@ -238,7 +236,7 @@
                             admin.popup({
                                 shadeClose: false,
                                 title: '编辑数据',
-                                area: ['1000px', '500px'],
+                                area: ['1200px', '90%'],
                                 id: 'LAY-popup-{{ModelClassName}}-edit',
                                 success: function (layero, index) {
                                     view(this.id).render('base/{{ModelClassName}}/edit', { data: e.data }).done(function () {
@@ -283,7 +281,7 @@
                             admin.popup({
                                 shadeClose: false,
                                 title: '查看详情',
-                                area: ['1000px', '500px'],
+                                area: ['1200px', '90%'],
                                 id: 'LAY-popup-{{ModelClassName}}-details',
                                 success: function (layero, index) {
                                     view(this.id).render('base/{{ModelClassName}}/details', { data: e.data }).done(function () {
@@ -365,6 +363,14 @@
                                 });
                         });
 			    }
+
+                {% for field in ModelFields %}{% if field.DataType == 'datetime' %}
+                laydate.render({
+                    elem: '#searchTime-{{ModelClassName}}-{{field.DbColumnName}}',
+                    type: 'datetime',
+                    range: '到',
+                });{% endif %}{% endfor %}
+
                 //监听 表格复选框操作
                 {% for field in ModelFields %}{% if field.DataType == 'bit' %}
                 layui.form.on('switch(switch_{{field.DbColumnName}})', function (obj) {
@@ -375,6 +381,9 @@
                     });
                 });
                 {% endif %}{% endfor %}
+
+                //重载form
+                form.render();
             });
     };
 </script>