From 3f012453ed555a1b3614f33fc087fe3ec877aab4 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Thu, 12 Sep 2019 23:44:31 +0800 Subject: [PATCH] =?UTF-8?q?jqgrid=E6=96=B0=E5=A2=9EemptyDataHint=E5=8F=82?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E8=A1=A8=E6=A0=BC=E5=86=85=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E6=97=B6=E5=80=99=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=20=E2=80=9C=E6=97=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E2=80=9D=EF=BC=9Bjqgrid=E6=96=B0=E5=A2=9Eedi?= =?UTF-8?q?tGridAddRowBtnToHeader=E5=B1=9E=E6=80=A7=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E5=B0=86=E5=AD=90=E8=A1=A8=E6=96=B0=E5=A2=9E=E8=A1=8C=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=B7=BB=E5=8A=A0=E5=88=B0=E8=A1=A8=E5=A4=B4=E4=B8=8A?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/config/beetl-core.properties | 27 +++++++------------ .../views/modules/test/testDataForm.html | 9 ++++--- .../views/modules/test/testDataList.html | 7 ++--- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/modules/core/src/main/resources/config/beetl-core.properties b/modules/core/src/main/resources/config/beetl-core.properties index 9bdcd996..f2a2b137 100644 --- a/modules/core/src/main/resources/config/beetl-core.properties +++ b/modules/core/src/main/resources/config/beetl-core.properties @@ -90,10 +90,19 @@ FN.hasAttribute=org.beetl.ext.fn.HasAttributeFunction FN.env=org.beetl.ext.fn.EnvFunction FN.parentTag=org.beetl.ext.fn.ParentTagFunction +##JeeSite自定义函数 +FN.isBlank = com.jeesite.common.beetl.ext.fn.IsBlank +FN.isNotBlank = com.jeesite.common.beetl.ext.fn.IsNotBlank +FN.toJson = com.jeesite.common.beetl.ext.fn.ToJson +FN.fromJson = com.jeesite.common.beetl.ext.fn.FromJson +FN.hasPermi = com.jeesite.common.beetl.ext.fn.HasPermi +FN.cookie = com.jeesite.common.beetl.ext.fn.Cookie +FN.lang = com.jeesite.common.beetl.ext.fn.Lang +FN.text = com.jeesite.common.beetl.ext.fn.Text + ##内置的功能包 FNP.strutil = org.beetl.ext.fn.StringUtil FNP.reg = org.beetl.ext.fn.RegxFunctionUtil - FNP.array = org.beetl.ext.fn.ArrayUtil ##内置的格式化函数 @@ -136,19 +145,3 @@ TAG.html.set= org.beetl.ext.tag.html.SetHtmlTag TAG.html.if= org.beetl.ext.tag.html.IfHtmlTag TAG.html.foreach= org.beetl.ext.tag.html.ForeachHtmlTag #TAG.includeUrl=org.beetl.ext.tag.IncludeUrlTag - -##JeeSite自定义函数 -FN.isBlank = com.jeesite.common.beetl.ext.fn.IsBlank -FN.isNotBlank = com.jeesite.common.beetl.ext.fn.IsNotBlank -FN.toJson = com.jeesite.common.beetl.ext.fn.ToJson -FN.fromJson = com.jeesite.common.beetl.ext.fn.FromJson -FN.hasPermi = com.jeesite.common.beetl.ext.fn.HasPermi -FN.cookie = com.jeesite.common.beetl.ext.fn.Cookie -FN.lang = com.jeesite.common.beetl.ext.fn.Lang -FN.text = com.jeesite.common.beetl.ext.fn.Text - -##JeeSite内置的功能包 -#FNP.StringUtils = com.jeesite.common.lang.StringUtils -#FNP.NumberUtils = com.jeesite.common.lang.NumberUtils -#FNP.DateUtils = com.jeesite.common.lang.DateUtils -#FNP.TimeUtils = com.jeesite.common.lang.TimeUtils diff --git a/web/src/main/resources/views/modules/test/testDataForm.html b/web/src/main/resources/views/modules/test/testDataForm.html index 30331671..20d35511 100644 --- a/web/src/main/resources/views/modules/test/testDataForm.html +++ b/web/src/main/resources/views/modules/test/testDataForm.html @@ -312,7 +312,8 @@ $("#testDataChildDataGrid").dataGrid({ // 编辑表格参数 editGrid: true, // 是否是编辑表格 editGridInitRowNum: 1, // 编辑表格的初始化新增行数 - editGridAddRowBtn: $('#testDataChildDataGridAddRowBtn'), // 子表增行按钮 + editGridAddRowBtn: $('#testDataChildDataGridAddRowBtn'), // 子表增行按钮 + editGridAddRowBtnToHeader: true, // 子表增行按钮是否显示到表头上 v4.1.7 editGridAddRowInitData: {id: '', status: Global.STATUS_NORMAL}, // 新增行的时候初始化的数据 // 编辑表格的提交数据参数 @@ -321,9 +322,9 @@ $("#testDataChildDataGrid").dataGrid({ // 加载成功后执行事件 ajaxSuccess: function(data){ - $('#jqgh_testDataChildDataGrid_rn').append('' - + ''); +// $('#jqgh_testDataChildDataGrid_rn').append('' +// + ''); } }); diff --git a/web/src/main/resources/views/modules/test/testDataList.html b/web/src/main/resources/views/modules/test/testDataList.html index 8d46d1f7..bc727eb5 100644 --- a/web/src/main/resources/views/modules/test/testDataList.html +++ b/web/src/main/resources/views/modules/test/testDataList.html @@ -209,13 +209,14 @@ $('#dataGrid').dataGrid({ }); }, - multiSort: true, // 是否支持多列排序，给列指定 firstsortorder 可设定初次排序方式 + multiSort: true, // 是否支持多列排序，给列指定 firstsortorder 可设定初次排序方式 + emptyDataHint: true, // 表格内没有数据的时候提示 “无数据显示” v4.1.7 // 加载成功后执行事件 ajaxSuccess: function(data){ // if (data.count == 0){ -// $("#dataGrid").parent().append("
没有符合数据
"); -// } +// $("#dataGrid").parent().append("
没有符合数据
"); +// } } }); $("#btnTrunsTest").click(function(){