diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/View/Edit.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/View/Edit.tpl index 9da24b3..99cdec1 100644 --- a/CoreCms.Net.CodeGenerator/CrudTemplete/View/Edit.tpl +++ b/CoreCms.Net.CodeGenerator/CrudTemplete/View/Edit.tpl @@ -7,8 +7,8 @@
- +
{% elsif field.DataType == 'nvarchar' %}
diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/View/Index.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/View/Index.tpl index 1cb01af..4044f0c 100644 --- a/CoreCms.Net.CodeGenerator/CrudTemplete/View/Index.tpl +++ b/CoreCms.Net.CodeGenerator/CrudTemplete/View/Index.tpl @@ -104,7 +104,7 @@ var field = data.field; searchwhere = field; //执行重载 - table.reload('LAY-app-{{ModelClassName}}-tableBox',{ where: field }); + table.reloadData('LAY-app-{{ModelClassName}}-tableBox',{ where: field }); }); //数据绑定 table.render({ @@ -142,7 +142,7 @@ }); //监听排序事件 table.on('sort(LAY-app-{{ModelClassName}}-tableBox)', function(obj){ - table.reload('LAY-app-{{ModelClassName}}-tableBox', { + table.reloadData('LAY-app-{{ModelClassName}}-tableBox', { initSort: obj, //记录初始排序,如果不设的话,将无法标记表头的排序状态。 where: { //请求参数(注意:这里面的参数可任意定义,并非下面固定的格式) orderField: obj.field, //排序字段 @@ -207,7 +207,7 @@ coreHelper.Post("Api/{{ModelClassName}}/DoCreate", field, function (e) { console.log(e) if (e.code === 0) { - layui.table.reload('LAY-app-{{ModelClassName}}-tableBox'); //重载表格 + layui.table.reloadData('LAY-app-{{ModelClassName}}-tableBox'); //重载表格 layer.close(index); //再执行关闭 layer.msg(e.msg); } else { @@ -252,7 +252,7 @@ coreHelper.Post("Api/{{ModelClassName}}/DoEdit", field, function (e) { console.log(e) if (e.code === 0) { - layui.table.reload('LAY-app-{{ModelClassName}}-tableBox'); //重载表格 + layui.table.reloadData('LAY-app-{{ModelClassName}}-tableBox'); //重载表格 layer.close(index); //再执行关闭 layer.msg(e.msg); } else { @@ -300,7 +300,7 @@ function doDelete(obj){ coreHelper.Post("Api/{{ModelClassName}}/DoDelete", { id: obj.data.id }, function (e) { if (debug) { console.log(e); } //开启调试返回数据 - table.reload('LAY-app-{{ModelClassName}}-tableBox'); + table.reloadData('LAY-app-{{ModelClassName}}-tableBox'); layer.msg(e.msg); }); } @@ -319,7 +319,7 @@ }); coreHelper.Post("Api/{{ModelClassName}}/DoBatchDelete", { id: delidsStr }, function (e) { if (debug) { console.log(e); } //开启调试返回数据 - table.reload('LAY-app-{{ModelClassName}}-tableBox'); + table.reloadData('LAY-app-{{ModelClassName}}-tableBox'); layer.msg(e.msg); }); }); @@ -376,7 +376,7 @@ layui.form.on('switch(switch_{{field.DbColumnName}})', function (obj) { coreHelper.Post("Api/{{ModelClassName}}/DoSet{{field.DbColumnName}}", { id: this.value, data: obj.elem.checked }, function (e) { if (debug) { console.log(e); } //开启调试返回数据 - //table.reload('LAY-app-{{ModelClassName}}-tableBox'); + //table.reloadData('LAY-app-{{ModelClassName}}-tableBox'); layer.msg(e.msg); }); }); diff --git a/CoreCms.Net.Services/Com/ToolsServices.cs b/CoreCms.Net.Services/Com/ToolsServices.cs index 2fe74c3..e6791d5 100644 --- a/CoreCms.Net.Services/Com/ToolsServices.cs +++ b/CoreCms.Net.Services/Com/ToolsServices.cs @@ -60,7 +60,7 @@ namespace CoreCms.Net.Services } WordsMatch wordsSearch = new WordsMatch(); - wordsSearch.SetKeywords(cache.Split("|")); + wordsSearch.SetKeywords(cache.Split('|', StringSplitOptions.RemoveEmptyEntries)); var t = wordsSearch.Replace(oldString, symbol); return t; @@ -90,7 +90,7 @@ namespace CoreCms.Net.Services } WordsMatch wordsSearch = new WordsMatch(); - wordsSearch.SetKeywords(cache.Split("|")); + wordsSearch.SetKeywords(cache.Split('|', StringSplitOptions.RemoveEmptyEntries)); var bl = wordsSearch.ContainsAny(oldString); diff --git a/CoreCms.Net.Web.Admin/illegalWord/说明.txt b/CoreCms.Net.Web.Admin/illegalWord/说明.txt index 8c0516e..8060e3d 100644 --- a/CoreCms.Net.Web.Admin/illegalWord/说明.txt +++ b/CoreCms.Net.Web.Admin/illegalWord/说明.txt @@ -1 +1 @@ -此文件夹为过滤敏感词存放词库所用。词库内容请保持“|”分隔,并且最后一位不包含“|” \ No newline at end of file +此文件夹为过滤敏感词存放词库所用。词库内容请保持“|”分隔 \ No newline at end of file diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/index.html index fffe59b..30c99a7 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/index.html @@ -183,7 +183,7 @@
最近登录
- 查看更多>> + 查看更多>>
@@ -197,7 +197,7 @@
全局日志
- 查看更多>> + 查看更多>>
diff --git a/CoreCms.Net.Web.WebApi/illegalWord/说明.txt b/CoreCms.Net.Web.WebApi/illegalWord/说明.txt index 8c0516e..8060e3d 100644 --- a/CoreCms.Net.Web.WebApi/illegalWord/说明.txt +++ b/CoreCms.Net.Web.WebApi/illegalWord/说明.txt @@ -1 +1 @@ -此文件夹为过滤敏感词存放词库所用。词库内容请保持“|”分隔,并且最后一位不包含“|” \ No newline at end of file +此文件夹为过滤敏感词存放词库所用。词库内容请保持“|”分隔 \ No newline at end of file