From e5dde9d853a35015855e594a58ef051d8412231e Mon Sep 17 00:00:00 2001 From: datagear Date: Thu, 26 Mar 2020 21:01:12 +0800 Subject: [PATCH] =?UTF-8?q?[web]"selectonly"=E6=93=8D=E4=BD=9C=E6=A0=87?= =?UTF-8?q?=E8=AF=86=E6=94=B9=E4=B8=BA"selectOperation"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../support/ConversionSqlParamValueMapper.java | 2 +- .../support/DefaultLOBRowMapper.java | 4 ++-- .../web/controller/AbstractController.java | 2 +- .../web/controller/ChartController.java | 2 +- .../web/controller/DashboardController.java | 2 +- .../datagear/web/controller/DataController.java | 2 +- .../web/controller/DataSetController.java | 2 +- .../web/controller/DriverEntityController.java | 2 +- .../datagear/web/controller/RoleController.java | 2 +- .../web/controller/SchemaController.java | 2 +- .../datagear/web/controller/UserController.java | 2 +- .../freemarker/analysis/chart/chart_grid.ftl | 12 ++++++------ .../analysis/chartPlugin/chartPlugin_grid.ftl | 8 ++++---- .../analysis/dashboard/dashboard_grid.ftl | 12 ++++++------ .../analysis/dataSet/dataSet_grid.ftl | 12 ++++++------ .../webapp/view/freemarker/data/data_grid.ftl | 17 ++++++++++------- .../driverEntity/driverEntity_grid.ftl | 10 +++++----- .../webapp/view/freemarker/role/role_grid.ftl | 10 +++++----- .../view/freemarker/schema/schema_grid.ftl | 10 +++++----- .../webapp/view/freemarker/user/user_grid.ftl | 12 ++++++------ 20 files changed, 65 insertions(+), 62 deletions(-) diff --git a/datagear-persistence/src/main/java/org/datagear/persistence/support/ConversionSqlParamValueMapper.java b/datagear-persistence/src/main/java/org/datagear/persistence/support/ConversionSqlParamValueMapper.java index 2307bc3d..75aa580b 100644 --- a/datagear-persistence/src/main/java/org/datagear/persistence/support/ConversionSqlParamValueMapper.java +++ b/datagear-persistence/src/main/java/org/datagear/persistence/support/ConversionSqlParamValueMapper.java @@ -44,7 +44,7 @@ import org.springframework.expression.spel.standard.SpelExpressionParser; /** * 支持类型转换的{@linkplain SqlParamValueMapper}。 *

- * 对于LOB、二进制类型，此类支持文件路径（{@code "file:..."}）、Hex编码（{@code "hex:..."}）、Base64（{@code "base64:..."}）编码格式的字符串原值，
+ * 对于LOB、二进制类型，此类支持文件路径（{@code "file:..."}）、Hex编码（{@code "hex:..."}）、Base64编码（{@code "base64:..."}）格式的字符串原值，
* 如果设置了{@linkplain #setFilePathValueDirectory(File)}，则文件路径限制为其子路径。 *

*

diff --git a/datagear-persistence/src/main/java/org/datagear/persistence/support/DefaultLOBRowMapper.java b/datagear-persistence/src/main/java/org/datagear/persistence/support/DefaultLOBRowMapper.java index 05adb7ce..1777f65a 100644 --- a/datagear-persistence/src/main/java/org/datagear/persistence/support/DefaultLOBRowMapper.java +++ b/datagear-persistence/src/main/java/org/datagear/persistence/support/DefaultLOBRowMapper.java @@ -32,8 +32,8 @@ import org.datagear.util.StringUtil; * 默认地，对于二进制类型，返回{@code byte[]}；对于大字符类型，返回{@linkplain String}；其他，返回默认值。 *

*

- * 可以通过{@linkplain #setReadActualLobRows(int)}、{@linkplain #setBinaryEncoder(String)}、 - * {@linkplain #setBigBinaryDirectory(File)}来控制映射格式。 + * 可以通过{@linkplain #setReadActualBlobRows(int)}、{@linkplain #setReadActualClobRows(int)}、{@linkplain #setBinaryEncoder(String)}、 + * {@linkplain #setBlobDirectory(File)}来控制映射格式。 *

* * @author datagear@163.com diff --git a/datagear-web/src/main/java/org/datagear/web/controller/AbstractController.java b/datagear-web/src/main/java/org/datagear/web/controller/AbstractController.java index 9ff13be8..29729d14 100644 --- a/datagear-web/src/main/java/org/datagear/web/controller/AbstractController.java +++ b/datagear-web/src/main/java/org/datagear/web/controller/AbstractController.java @@ -49,7 +49,7 @@ public abstract class AbstractController public static final String KEY_READONLY = "readonly"; - public static final String KEY_SELECTONLY = "selectonly"; + public static final String KEY_SELECT_OPERATION = "selectOperation"; public static final String DATA_FILTER_PARAM = DataFilterPagingQuery.PROPERTY_DATA_FILTER; diff --git a/datagear-web/src/main/java/org/datagear/web/controller/ChartController.java b/datagear-web/src/main/java/org/datagear/web/controller/ChartController.java index bd4e1497..f032c992 100644 --- a/datagear-web/src/main/java/org/datagear/web/controller/ChartController.java +++ b/datagear-web/src/main/java/org/datagear/web/controller/ChartController.java @@ -259,7 +259,7 @@ public class ChartController extends AbstractChartPluginAwareController implemen public String select(HttpServletRequest request, HttpServletResponse response, org.springframework.ui.Model model) { model.addAttribute(KEY_TITLE_MESSAGE_KEY, "chart.selectChart"); - model.addAttribute(KEY_SELECTONLY, true); + model.addAttribute(KEY_SELECT_OPERATION, true); setIsMultipleSelectAttribute(request, model); return "/analysis/chart/chart_grid"; diff --git a/datagear-web/src/main/java/org/datagear/web/controller/DashboardController.java b/datagear-web/src/main/java/org/datagear/web/controller/DashboardController.java index c7983b64..9c6681de 100644 --- a/datagear-web/src/main/java/org/datagear/web/controller/DashboardController.java +++ b/datagear-web/src/main/java/org/datagear/web/controller/DashboardController.java @@ -567,7 +567,7 @@ public class DashboardController extends AbstractDataAnalysisController implemen public String select(HttpServletRequest request, HttpServletResponse response, org.springframework.ui.Model model) { model.addAttribute(KEY_TITLE_MESSAGE_KEY, "dashboard.selectDashboard"); - model.addAttribute(KEY_SELECTONLY, true); + model.addAttribute(KEY_SELECT_OPERATION, true); return "/analysis/dashboard/dashboard_grid"; } diff --git a/datagear-web/src/main/java/org/datagear/web/controller/DataController.java b/datagear-web/src/main/java/org/datagear/web/controller/DataController.java index 313dfbf8..0d4ce3cf 100644 --- a/datagear-web/src/main/java/org/datagear/web/controller/DataController.java +++ b/datagear-web/src/main/java/org/datagear/web/controller/DataController.java @@ -570,7 +570,7 @@ public class DataController extends AbstractSchemaConnTableController springModel.addAttribute(KEY_TITLE_DISPLAY_NAME, table.getName()); springModel.addAttribute(KEY_SQL_IDENTIFIER_QUOTE, dialect.getIdentifierQuote()); - springModel.addAttribute(KEY_SELECTONLY, true); + springModel.addAttribute(KEY_SELECT_OPERATION, true); setGridPageAttributes(request, response, springModel, schema, table); } }.execute(); diff --git a/datagear-web/src/main/java/org/datagear/web/controller/DataSetController.java b/datagear-web/src/main/java/org/datagear/web/controller/DataSetController.java index 3dbe2b46..757b79d6 100644 --- a/datagear-web/src/main/java/org/datagear/web/controller/DataSetController.java +++ b/datagear-web/src/main/java/org/datagear/web/controller/DataSetController.java @@ -257,7 +257,7 @@ public class DataSetController extends AbstractSchemaConnController public String select(HttpServletRequest request, HttpServletResponse response, org.springframework.ui.Model model) { model.addAttribute(KEY_TITLE_MESSAGE_KEY, "dataSet.selectDataSet"); - model.addAttribute(KEY_SELECTONLY, true); + model.addAttribute(KEY_SELECT_OPERATION, true); setIsMultipleSelectAttribute(request, model); return "/analysis/dataSet/dataSet_grid"; diff --git a/datagear-web/src/main/java/org/datagear/web/controller/DriverEntityController.java b/datagear-web/src/main/java/org/datagear/web/controller/DriverEntityController.java index 97fee468..b89ae0f1 100644 --- a/datagear-web/src/main/java/org/datagear/web/controller/DriverEntityController.java +++ b/datagear-web/src/main/java/org/datagear/web/controller/DriverEntityController.java @@ -300,7 +300,7 @@ public class DriverEntityController extends AbstractController public String select(HttpServletRequest request, org.springframework.ui.Model model) { model.addAttribute(KEY_TITLE_MESSAGE_KEY, "driverEntity.selectDriverEntity"); - model.addAttribute(KEY_SELECTONLY, true); + model.addAttribute(KEY_SELECT_OPERATION, true); return "/driverEntity/driverEntity_grid"; } diff --git a/datagear-web/src/main/java/org/datagear/web/controller/RoleController.java b/datagear-web/src/main/java/org/datagear/web/controller/RoleController.java index 6160f033..18e7b0e2 100644 --- a/datagear-web/src/main/java/org/datagear/web/controller/RoleController.java +++ b/datagear-web/src/main/java/org/datagear/web/controller/RoleController.java @@ -156,7 +156,7 @@ public class RoleController extends AbstractController public String select(HttpServletRequest request, HttpServletResponse response, org.springframework.ui.Model model) { model.addAttribute(KEY_TITLE_MESSAGE_KEY, "role.selectRole"); - model.addAttribute(KEY_SELECTONLY, true); + model.addAttribute(KEY_SELECT_OPERATION, true); return "/role/role_grid"; } diff --git a/datagear-web/src/main/java/org/datagear/web/controller/SchemaController.java b/datagear-web/src/main/java/org/datagear/web/controller/SchemaController.java index 48595696..5670204e 100644 --- a/datagear-web/src/main/java/org/datagear/web/controller/SchemaController.java +++ b/datagear-web/src/main/java/org/datagear/web/controller/SchemaController.java @@ -188,7 +188,7 @@ public class SchemaController extends AbstractSchemaConnTableController public String select(HttpServletRequest request, HttpServletResponse response, org.springframework.ui.Model model) { model.addAttribute(KEY_TITLE_MESSAGE_KEY, "schema.selectSchema"); - model.addAttribute(KEY_SELECTONLY, true); + model.addAttribute(KEY_SELECT_OPERATION, true); return "/schema/schema_grid"; } diff --git a/datagear-web/src/main/java/org/datagear/web/controller/UserController.java b/datagear-web/src/main/java/org/datagear/web/controller/UserController.java index 8bedc01b..829460c0 100644 --- a/datagear-web/src/main/java/org/datagear/web/controller/UserController.java +++ b/datagear-web/src/main/java/org/datagear/web/controller/UserController.java @@ -183,7 +183,7 @@ public class UserController extends AbstractController public String select(HttpServletRequest request, HttpServletResponse response, org.springframework.ui.Model model) { model.addAttribute(KEY_TITLE_MESSAGE_KEY, "user.selectUser"); - model.addAttribute(KEY_SELECTONLY, true); + model.addAttribute(KEY_SELECT_OPERATION, true); setIsMultipleSelectAttribute(request, model); return "/user/user_grid"; diff --git a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/chart/chart_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/chart/chart_grid.ftl index 09a95ca3..4448713b 100644 --- a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/chart/chart_grid.ftl +++ b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/chart/chart_grid.ftl @@ -2,9 +2,9 @@ <#include "../../include/html_doctype.ftl"> <#-- titleMessageKey 标题标签I18N关键字，不允许null -selectonly 是否选择操作，允许为null +selectOperation 是否选择操作，允许为null --> -<#assign selectonly=(selectonly!false)> +<#assign selectOperation=(selectOperation!false)> <#assign isMultipleSelect=(isMultipleSelect!false)> <#assign HtmlChartWidgetEntity=statics['org.datagear.management.domain.HtmlChartWidgetEntity']> @@ -23,7 +23,7 @@ selectonly 是否选择操作，允许为null <#include "../../include/page_obj_searchform_data_filter.ftl">
- <#if selectonly> + <#if selectOperation> <#else> @@ -67,7 +67,7 @@ selectonly 是否选择操作，允许为null return "${contextPath}/analysis/chart/" + action; }; - <#if !selectonly> + <#if !selectOperation> po.element("input[name=addButton]").click(function() { po.open(po.url("add"), @@ -141,7 +141,7 @@ selectonly 是否选择操作，允许为null }); }); - <#if !selectonly> + <#if !selectOperation> po.element("input[name=deleteButton]").click( function() { @@ -163,7 +163,7 @@ selectonly 是否选择操作，允许为null }); - <#if selectonly> + <#if selectOperation> po.element("input[name=confirmButton]").click(function() { <#if isMultipleSelect> diff --git a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/chartPlugin/chartPlugin_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/chartPlugin/chartPlugin_grid.ftl index e6965477..04fbfba1 100644 --- a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/chartPlugin/chartPlugin_grid.ftl +++ b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/chartPlugin/chartPlugin_grid.ftl @@ -2,9 +2,9 @@ <#include "../../include/html_doctype.ftl"> <#-- titleMessageKey 标题标签I18N关键字，不允许null -selectonly 是否选择操作，允许为null +selectOperation 是否选择操作，允许为null --> -<#assign selectonly=(selectonly!false)> +<#assign selectOperation=(selectOperation!false)> <#include "../../include/html_head.ftl"> @@ -20,7 +20,7 @@ selectonly 是否选择操作，允许为null <#include "../../include/page_obj_searchform.html.ftl">
- <#if selectonly> + <#if selectOperation> <#else> @@ -56,7 +56,7 @@ selectonly 是否选择操作，允许为null return "${contextPath}/analysis/chartPlugin/" + action; }; - <#if !selectonly> + <#if !selectOperation> po.element("input[name=uploadButton]").click(function() { po.open(po.url("upload"), diff --git a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dashboard/dashboard_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dashboard/dashboard_grid.ftl index f69af175..9da1cba2 100644 --- a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dashboard/dashboard_grid.ftl +++ b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dashboard/dashboard_grid.ftl @@ -2,9 +2,9 @@ <#include "../../include/html_doctype.ftl"> <#-- titleMessageKey 标题标签I18N关键字，不允许null -selectonly 是否选择操作，允许为null +selectOperation 是否选择操作，允许为null --> -<#assign selectonly=(selectonly!false)> +<#assign selectOperation=(selectOperation!false)> <#assign HtmlTplDashboardWidgetEntity=statics['org.datagear.management.domain.HtmlTplDashboardWidgetEntity']> @@ -22,7 +22,7 @@ selectonly 是否选择操作，允许为null <#include "../../include/page_obj_searchform_data_filter.ftl">
- <#if selectonly> + <#if selectOperation> <#else> @@ -67,7 +67,7 @@ selectonly 是否选择操作，允许为null return "${contextPath}/analysis/dashboard/" + action; }; - <#if !selectonly> + <#if !selectOperation> po.element("input[name=addButton]").click(function() { po.open(po.url("add"), @@ -156,7 +156,7 @@ selectonly 是否选择操作，允许为null }); }); - <#if !selectonly> + <#if !selectOperation> po.element("input[name=deleteButton]").click( function() { @@ -178,7 +178,7 @@ selectonly 是否选择操作，允许为null }); - <#if selectonly> + <#if selectOperation> po.element("input[name=confirmButton]").click(function() { po.executeOnSelect(function(row) diff --git a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_grid.ftl index 305aed69..d5d3bf0b 100644 --- a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_grid.ftl +++ b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_grid.ftl @@ -2,9 +2,9 @@ <#include "../../include/html_doctype.ftl"> <#-- titleMessageKey 标题标签I18N关键字，不允许null -selectonly 是否选择操作，允许为null +selectOperation 是否选择操作，允许为null --> -<#assign selectonly=(selectonly!false)> +<#assign selectOperation=(selectOperation!false)> <#assign isMultipleSelect=(isMultipleSelect!false)> <#assign SqlDataSetEntity=statics['org.datagear.management.domain.SqlDataSetEntity']> @@ -23,7 +23,7 @@ selectonly 是否选择操作，允许为null <#include "../../include/page_obj_searchform_data_filter.ftl">
- <#if selectonly> + <#if selectOperation> <#else> @@ -66,7 +66,7 @@ selectonly 是否选择操作，允许为null return "${contextPath}/analysis/dataSet/" + action; }; - <#if !selectonly> + <#if !selectOperation> po.element("input[name=addButton]").click(function() { po.open(po.url("add"), @@ -132,7 +132,7 @@ selectonly 是否选择操作，允许为null }); }); - <#if !selectonly> + <#if !selectOperation> po.element("input[name=deleteButton]").click( function() { @@ -154,7 +154,7 @@ selectonly 是否选择操作，允许为null }); - <#if selectonly> + <#if selectOperation> po.element("input[name=confirmButton]").click(function() { <#if isMultipleSelect> diff --git a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/data/data_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/data/data_grid.ftl index 10fd66b3..25ea6fd0 100644 --- a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/data/data_grid.ftl +++ b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/data/data_grid.ftl @@ -5,24 +5,21 @@ Schema schema 数据库，不允许为null Table table 模型，不允许为null String titleDisplayName 页面展示名称，默认为"" String titleDisplayDesc 页面展示描述，默认为"" -boolean selectonly 是否选择操作，允许为null +boolean selectOperation 是否选择操作，允许为null boolean isMultipleSelect 是否多选，默认为false boolean readonly 是否只读操作，默认为false --> <#assign titleDisplayName=(titleDisplayName!'')> <#assign titleDisplayDesc=(titleDisplayDesc!'')> -<#assign selectonly=(selectonly!false)> +<#assign selectOperation=(selectOperation!false)> <#assign isMultipleSelect=(isMultipleSelect!false)> <#assign readonly=(readonly!false)> -<#if selectonly> -<#assign readonly=true> - <#include "../include/html_head.ftl"> <#include "../include/html_title_app_name.ftl"> - <#if selectonly> + <#if selectOperation> <@spring.message code='select' /> <#else> <@spring.message code='query' /> @@ -49,16 +46,20 @@ boolean readonly 是否只读操作，默认为false <#include "include/data_page_obj_searchform_html.ftl"> </div> <div class="operation"> - <#if selectonly> + <#if selectOperation> <input name="confirmButton" type="button" class="recommended" value="<@spring.message code='confirm' />" /> </#if> <#if readonly> <input name="viewButton" type="button" value="<@spring.message code='view' />" /> <#else> <input name="addButton" type="button" value="<@spring.message code='add' />" /> + <#if !selectOperation> <input name="editButton" type="button" value="<@spring.message code='edit' />" /> + </#if> <input name="viewButton" type="button" value="<@spring.message code='view' />" /> + <#if !selectOperation> <input name="deleteButton" type="button" value="<@spring.message code='delete' />" /> + </#if> </#if> </div> </div> @@ -155,6 +156,7 @@ boolean readonly 是否只读操作，默认为false }); </#if> + <#if selectOperation> po.element("input[name=confirmButton]").click(function() { if(po.isMultipleSelect) @@ -184,6 +186,7 @@ boolean readonly 是否只读操作，默认为false }); } }); + </#if> po.element("input[name=viewButton]").click(function() { diff --git a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/driverEntity/driverEntity_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/driverEntity/driverEntity_grid.ftl index 950fad14..ffdd5dc0 100644 --- a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/driverEntity/driverEntity_grid.ftl +++ b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/driverEntity/driverEntity_grid.ftl @@ -2,9 +2,9 @@ <#include "../include/html_doctype.ftl"> <#-- titleMessageKey 标题标签I18N关键字，不允许null -selectonly 是否选择操作，允许为null +selectOperation 是否选择操作，允许为null --> -<#assign selectonly=(selectonly!false)> +<#assign selectOperation=(selectOperation!false)> <html> <head> <#include "../include/html_head.ftl"> @@ -20,7 +20,7 @@ selectonly 是否选择操作，允许为null <#include "../include/page_obj_searchform.html.ftl"> </div> <div class="operation"> - <#if selectonly> + <#if selectOperation> <input name="confirmButton" type="button" class="recommended" value="<@spring.message code='confirm' />" /> <input name="viewButton" type="button" value="<@spring.message code='view' />" /> <#else> @@ -59,7 +59,7 @@ selectonly 是否选择操作，允许为null return "${contextPath}/driverEntity/" + action; }; - <#if !selectonly> + <#if !selectOperation> po.element("input[name=addButton]").click(function() { po.open(po.url("add"), @@ -132,7 +132,7 @@ selectonly 是否选择操作，允许为null }); }); - <#if !selectonly> + <#if !selectOperation> po.element("input[name=deleteButton]").click( function() { diff --git a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/role/role_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/role/role_grid.ftl index 64ee2697..952e93a0 100644 --- a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/role/role_grid.ftl +++ b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/role/role_grid.ftl @@ -2,9 +2,9 @@ <#include "../include/html_doctype.ftl"> <#-- titleMessageKey 标题标签I18N关键字，不允许null -selectonly 是否选择操作，允许为null +selectOperation 是否选择操作，允许为null --> -<#assign selectonly=(selectonly!false)> +<#assign selectOperation=(selectOperation!false)> <html> <head> <#include "../include/html_head.ftl"> @@ -20,7 +20,7 @@ selectonly 是否选择操作，允许为null <#include "../include/page_obj_searchform.html.ftl"> </div> <div class="operation"> - <#if selectonly> + <#if selectOperation> <input name="confirmButton" type="button" class="recommended" value="<@spring.message code='confirm' />" /> <input name="viewButton" type="button" value="<@spring.message code='view' />" /> <#else> @@ -58,7 +58,7 @@ selectonly 是否选择操作，允许为null return "${contextPath}/role/" + action; }; - <#if !selectonly> + <#if !selectOperation> po.element("input[name=addButton]").click(function() { po.open(po.url("add"), @@ -122,7 +122,7 @@ selectonly 是否选择操作，允许为null }); }); - <#if !selectonly> + <#if !selectOperation> po.element("input[name=deleteButton]").click( function() { diff --git a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/schema/schema_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/schema/schema_grid.ftl index a99cd4ad..ee6a2878 100644 --- a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/schema/schema_grid.ftl +++ b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/schema/schema_grid.ftl @@ -2,9 +2,9 @@ <#include "../include/html_doctype.ftl"> <#-- titleMessageKey 标题标签I18N关键字，不允许null -selectonly 是否选择操作，允许为null +selectOperation 是否选择操作，允许为null --> -<#assign selectonly=(selectonly!false)> +<#assign selectOperation=(selectOperation!false)> <html> <head> <#include "../include/html_head.ftl"> @@ -20,7 +20,7 @@ selectonly 是否选择操作，允许为null <#include "../include/page_obj_searchform.html.ftl"> </div> <div class="operation"> - <#if selectonly> + <#if selectOperation> <input name="confirmButton" type="button" class="recommended" value="<@spring.message code='confirm' />" /> <input name="viewButton" type="button" value="<@spring.message code='view' />" /> <#else> @@ -57,7 +57,7 @@ selectonly 是否选择操作，允许为null return "${contextPath}/schema/" + action; }; - <#if !selectonly> + <#if !selectOperation> po.element("input[name=addButton]").click(function() { po.open(po.url("add"), @@ -126,7 +126,7 @@ selectonly 是否选择操作，允许为null }); }); - <#if selectonly> + <#if selectOperation> po.element("input[name=confirmButton]").click(function() { po.executeOnSelect(function(row) diff --git a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/user/user_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/user/user_grid.ftl index b5eac060..bcba3269 100644 --- a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/user/user_grid.ftl +++ b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/user/user_grid.ftl @@ -2,9 +2,9 @@ <#include "../include/html_doctype.ftl"> <#-- titleMessageKey 标题标签I18N关键字，不允许null -selectonly 是否选择操作，允许为null +selectOperation 是否选择操作，允许为null --> -<#assign selectonly=(selectonly!false)> +<#assign selectOperation=(selectOperation!false)> <#assign isMultipleSelect=(isMultipleSelect!false)> <html> <head> @@ -21,7 +21,7 @@ selectonly 是否选择操作，允许为null <#include "../include/page_obj_searchform.html.ftl"> </div> <div class="operation"> - <#if selectonly> + <#if selectOperation> <input name="confirmButton" type="button" class="recommended" value="<@spring.message code='confirm' />" /> <input name="viewButton" type="button" value="<@spring.message code='view' />" /> <#else> @@ -58,7 +58,7 @@ selectonly 是否选择操作，允许为null return "${contextPath}/user/" + action; }; - <#if !selectonly> + <#if !selectOperation> po.element("input[name=addButton]").click(function() { po.open(po.url("add"), @@ -107,7 +107,7 @@ selectonly 是否选择操作，允许为null }); }); - <#if !selectonly> + <#if !selectOperation> po.element("input[name=deleteButton]").click( function() { @@ -129,7 +129,7 @@ selectonly 是否选择操作，允许为null }); </#if> - <#if selectonly> + <#if selectOperation> po.element("input[name=confirmButton]").click(function() { <#if isMultipleSelect>