From 2efd688232d016e23f0ae0b6dc3ea3b0e4edb735 Mon Sep 17 00:00:00 2001 From: datagear Date: Mon, 10 Aug 2020 16:47:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=B1=9E=E6=80=A7=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../management/domain/DataSetEntity.java | 47 ---- .../domain/JsonValueDataSetEntity.java | 31 --- .../management/domain/SqlDataSetEntity.java | 34 +-- .../domain/SummaryDataSetEntity.java | 15 - .../datagear/web/locales/datagear.properties | 18 +- .../datagear/web/webapp/static/css/common.css | 4 +- .../freemarker/analysis/chart/chart_grid.ftl | 3 +- .../analysis/dashboard/dashboard_grid.ftl | 3 +- .../dataSet/dataSet_form_JSON_VALUE.ftl | 22 +- .../analysis/dataSet/dataSet_form_SQL.ftl | 30 +- .../analysis/dataSet/dataSet_grid.ftl | 3 +- .../dataSet/include/dataSet_form_html_wow.ftl | 18 +- .../dataSet/include/dataSet_form_js.ftl | 262 ++++++++++++++---- 13 files changed, 270 insertions(+), 220 deletions(-) diff --git a/datagear-management/src/main/java/org/datagear/management/domain/DataSetEntity.java b/datagear-management/src/main/java/org/datagear/management/domain/DataSetEntity.java index 795ccfe1..858dc06a 100644 --- a/datagear-management/src/main/java/org/datagear/management/domain/DataSetEntity.java +++ b/datagear-management/src/main/java/org/datagear/management/domain/DataSetEntity.java @@ -22,8 +22,6 @@ public interface DataSetEntity extends DataSet, CreateUserEntity, DataPe /** 授权资源类型 */ String AUTHORIZATION_RESOURCE_TYPE = "DataSet"; - String PROPERTY_LABELS_SPLITTER = ","; - /** 数据集类型：SQL */ String DATA_SET_TYPE_SQL = "SQL"; @@ -78,49 +76,4 @@ public interface DataSetEntity extends DataSet, CreateUserEntity, DataPe * @param createTime */ void setCreateTime(Date createTime); - - /** - * 获取属性集的标签文本表示形式。 - * - * @return - */ - String getPropertyLabelsText(); - - /** - * 设置属性集的标签文本表示形式。 - * - * @param text - */ - void setPropertyLabelsText(String text); - - /** - * 获取属性集的标签文本表示形式。 - * - * @param properties - * @return - */ - public static String getPropertyLabelsText(List properties) - { - return DataSetProperty.concatLabels(properties, PROPERTY_LABELS_SPLITTER); - } - - /** - * 设置属性集的标签文本表示形式。 - * - * @param properties - * @param text - */ - public static void setPropertyLabelsText(List properties, String text) - { - String[] labels = DataSetProperty.splitLabels(text, PROPERTY_LABELS_SPLITTER); - - if (labels == null || labels.length == 0) - return; - - for (int i = 0; i < Math.min(labels.length, properties.size()); i++) - { - if (i < labels.length) - properties.get(i).setLabel(labels[i]); - } - } } diff --git a/datagear-management/src/main/java/org/datagear/management/domain/JsonValueDataSetEntity.java b/datagear-management/src/main/java/org/datagear/management/domain/JsonValueDataSetEntity.java index 9841df06..f08b355d 100644 --- a/datagear-management/src/main/java/org/datagear/management/domain/JsonValueDataSetEntity.java +++ b/datagear-management/src/main/java/org/datagear/management/domain/JsonValueDataSetEntity.java @@ -32,8 +32,6 @@ public class JsonValueDataSetEntity extends JsonValueDataSet implements DataSetE /** 权限 */ private int dataPermission = PERMISSION_NOT_LOADED; - private transient String _propertyLabelsText; - public JsonValueDataSetEntity() { super(); @@ -96,33 +94,4 @@ public class JsonValueDataSetEntity extends JsonValueDataSet implements DataSetE { this.dataPermission = dataPermission; } - - @Override - public void setProperties(List properties) - { - super.setProperties(properties); - - if(this._propertyLabelsText != null) - DataSetEntity.setPropertyLabelsText(properties, this._propertyLabelsText); - } - - @Override - public void setPropertyLabelsText(String text) - { - List properties = getProperties(); - - if(properties == null || properties.isEmpty()) - this._propertyLabelsText = text; - else - { - this._propertyLabelsText = null; - DataSetEntity.setPropertyLabelsText(properties, text); - } - } - - @Override - public String getPropertyLabelsText() - { - return DataSetEntity.getPropertyLabelsText(getProperties()); - } } diff --git a/datagear-management/src/main/java/org/datagear/management/domain/SqlDataSetEntity.java b/datagear-management/src/main/java/org/datagear/management/domain/SqlDataSetEntity.java index 3afe8548..6520dcf8 100644 --- a/datagear-management/src/main/java/org/datagear/management/domain/SqlDataSetEntity.java +++ b/datagear-management/src/main/java/org/datagear/management/domain/SqlDataSetEntity.java @@ -33,8 +33,6 @@ public class SqlDataSetEntity extends SqlDataSet implements DataSetEntity /** 权限 */ private int dataPermission = PERMISSION_NOT_LOADED; - private transient String _propertyLabelsText; - public SqlDataSetEntity() { super(); @@ -42,8 +40,7 @@ public class SqlDataSetEntity extends SqlDataSet implements DataSetEntity } public SqlDataSetEntity(String id, String name, List properties, - SchemaConnectionFactory connectionFactory, - String sql, User createUser) + SchemaConnectionFactory connectionFactory, String sql, User createUser) { super(id, name, properties, connectionFactory, sql); this.createTime = new Date(); @@ -123,33 +120,4 @@ public class SqlDataSetEntity extends SqlDataSet implements DataSetEntity { this.dataPermission = dataPermission; } - - @Override - public void setProperties(List properties) - { - super.setProperties(properties); - - if(this._propertyLabelsText != null) - DataSetEntity.setPropertyLabelsText(properties, this._propertyLabelsText); - } - - @Override - public void setPropertyLabelsText(String text) - { - List properties = getProperties(); - - if(properties == null || properties.isEmpty()) - this._propertyLabelsText = text; - else - { - this._propertyLabelsText = null; - DataSetEntity.setPropertyLabelsText(properties, text); - } - } - - @Override - public String getPropertyLabelsText() - { - return DataSetEntity.getPropertyLabelsText(getProperties()); - } } diff --git a/datagear-management/src/main/java/org/datagear/management/domain/SummaryDataSetEntity.java b/datagear-management/src/main/java/org/datagear/management/domain/SummaryDataSetEntity.java index b0cd417d..ad8c982f 100644 --- a/datagear-management/src/main/java/org/datagear/management/domain/SummaryDataSetEntity.java +++ b/datagear-management/src/main/java/org/datagear/management/domain/SummaryDataSetEntity.java @@ -15,8 +15,6 @@ import org.datagear.analysis.DataSetException; import org.datagear.analysis.DataSetResult; import org.datagear.analysis.support.AbstractDataSet; -import com.fasterxml.jackson.annotation.JsonIgnore; - /** * 概要数据集实体。 * @@ -98,19 +96,6 @@ public class SummaryDataSetEntity extends AbstractDataSet implements DataSetEnti this.dataPermission = dataPermission; } - @Override - public void setPropertyLabelsText(String text) - { - throw new UnsupportedOperationException(); - } - - @JsonIgnore - @Override - public String getPropertyLabelsText() - { - throw new UnsupportedOperationException(); - } - @Override public DataSetResult getResult(Map paramValues) throws DataSetException { diff --git a/datagear-web/src/main/resources/org/datagear/web/locales/datagear.properties b/datagear-web/src/main/resources/org/datagear/web/locales/datagear.properties index 020e4402..7e0586d3 100644 --- a/datagear-web/src/main/resources/org/datagear/web/locales/datagear.properties +++ b/datagear-web/src/main/resources/org/datagear/web/locales/datagear.properties @@ -601,11 +601,12 @@ dataSet.dataSetType.JSON_VALUE=JSON dataSet.dataSource=\u6570\u636E\u6E90 dataSet.sql=SQL\u8BED\u53E5 dataSet.json=JSON -dataSet.propertyLabelsText.SQL=SQL\u7ED3\u679C\u5217\u6807\u7B7E -dataSet.propertyLabelsText.JSON_VALUE=JSON\u5C5E\u6027\u6807\u7B7E dataSet.createUser=\u521B\u5EFA\u7528\u6237 dataSet.createTime=\u521B\u5EFA\u65F6\u95F4 dataSet.param=\u53C2\u6570 +dataSet.param.desc=\u5B9A\u4E49\u6570\u636E\u96C6\u7684\u8F93\u5165\u53C2\u6570 +dataSet.property=\u5C5E\u6027 +dataSet.property.desc=\u5B9A\u4E49\u6570\u636E\u96C6\u7684\u6570\u636E\u7ED3\u6784 dataSet.setParamValue=\u8BBE\u7F6E\u53C2\u6570\u503C dataSet.loadMoreData=\u52A0\u8F7D\u66F4\u591A\u6570\u636E dataSet.refreshSqlResult=\u5237\u65B0\u67E5\u8BE2\u7ED3\u679C @@ -613,8 +614,8 @@ dataSet.noMoreData=\u6CA1\u6709\u66F4\u591A\u6570\u636E\u4E86 dataSet.previewButtonTip=\u9884\u89C8\u7ED3\u679C\u6570\u636E\uFF08\u7F16\u8F91\u533A\uFF1ACtrl+Enter\uFF09 dataSet.DataCategory.DIMENSION=\u7EF4\u5EA6 dataSet.DataCategory.SCALAR=\u91CF\u5EA6 -dataSet.propertyLabelsTextSplitByComma=\u591A\u4E2A\u6807\u7B7E\u4EE5\u82F1\u6587\u9017\u53F7(,)\u5206\u9694 dataSet.validation.previewRequired=\u8BF7\u5148\u6267\u884C\u9884\u89C8\u786E\u4FDD\u6570\u636E\u6B63\u786E +dataSet.validation.propertiesRequired=\u8BF7\u5B9A\u4E49\u6570\u636E\u96C6\u5C5E\u6027 dataSet.auth.resouceTypeLabel=\u6570\u636E\u96C6 dataSet.DataSetParam.name=\u540D\u79F0 dataSet.DataSetParam.type=\u7C7B\u578B @@ -634,6 +635,17 @@ dataSet.DataSetParam.InputType.RADIO=\u5355\u9009\u6846 dataSet.DataSetParam.InputType.CHECKBOX=\u590D\u9009\u6846 dataSet.DataSetParam.InputType.TEXTAREA=\u6587\u672C\u57DF dataSet.noDataSetParamDefined=\u6CA1\u6709\u5B9A\u4E49\u53C2\u6570 +dataSet.DataSetProperty.name=\u540D\u79F0 +dataSet.DataSetProperty.type=\u7C7B\u578B +dataSet.DataSetProperty.label=\u5C55\u793A\u540D\u79F0 +dataSet.DataSetProperty.DataType.STRING=\u5B57\u7B26\u4E32 +dataSet.DataSetProperty.DataType.BOOLEAN=\u5E03\u5C14\u503C +dataSet.DataSetProperty.DataType.INTEGER=\u6574\u6570 +dataSet.DataSetProperty.DataType.DECIMAL=\u5C0F\u6570 +dataSet.DataSetProperty.DataType.DATE=\u65E5\u671F +dataSet.DataSetProperty.DataType.TIME=\u65F6\u95F4 +dataSet.DataSetProperty.DataType.TIMESTAMP=\u65F6\u95F4\u6233 +dataSet.noDataSetPropertyDefined=\u6CA1\u6709\u5B9A\u4E49\u5C5E\u6027 #Chart chart.manageChart=\u7BA1\u7406\u56FE\u8868 diff --git a/datagear-web/src/main/resources/org/datagear/web/webapp/static/css/common.css b/datagear-web/src/main/resources/org/datagear/web/webapp/static/css/common.css index 90c10e5b..c900edf1 100644 --- a/datagear-web/src/main/resources/org/datagear/web/webapp/static/css/common.css +++ b/datagear-web/src/main/resources/org/datagear/web/webapp/static/css/common.css @@ -2186,7 +2186,7 @@ table.dataTable tbody tr .column-check .row-data-state .ui-icon{ .page-form-dataSet .workspace-operation-wrapper .input-in-table{ width: 90%!important; } -.page-form-dataSet .form-item-value-workspace .error{ +.page-form-dataSet .form-item-workspace .error{ display: block; } .page-form-dataSet .preview-param-value-panel{ @@ -2194,6 +2194,8 @@ table.dataTable tbody tr .column-check .row-data-state .ui-icon{ display: none; padding: 0.5em 0.5em; max-height: 80%; + min-width: 30%; + max-width: 60%; overflow: auto; } .page-form-dataSet .preview-param-value-panel .ui-widget-header{ 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 7d5de1eb..34af2fc2 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 @@ -98,7 +98,7 @@ boolean readonly 是否只读操作，默认为false { var data = {"id" : row.id}; - po.open(po.url("edit"), { data : data }); + po.open(po.url("edit"), { width: "85%", data : data }); }); }); @@ -127,6 +127,7 @@ boolean readonly 是否只读操作，默认为false po.open(po.url("view"), { + width: "85%", data : data }); }); 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 dffad0fa..113504ed 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 @@ -95,7 +95,7 @@ selectOperation 是否选择操作，允许为null { var data = {"id" : row.id}; - po.open(po.url("edit"), { data : data }); + po.open(po.url("edit"), { width: "85%", data : data }); }); }); @@ -124,6 +124,7 @@ selectOperation 是否选择操作，允许为null po.open(po.url("view"), { + width: "85%", data : data }); }); diff --git a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_form_JSON_VALUE.ftl b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_form_JSON_VALUE.ftl index 33e633b6..3e7c17a1 100644 --- a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_form_JSON_VALUE.ftl +++ b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_form_JSON_VALUE.ftl @@ -21,11 +21,11 @@ readonly 是否只读操作，允许为null
<#include "include/dataSet_form_html_name.ftl"> -
+
-
+
@@ -33,14 +33,6 @@ readonly 是否只读操作，允许为null <#include "include/dataSet_form_html_wow.ftl" >
-
-
- -
-
- -
-
<#if !readonly> @@ -82,16 +74,14 @@ readonly 是否只读操作，允许为null po.initWorkspaceEditor(po.jsonEditor, po.element("textarea[name='value']").val()); - po.isWorkspaceModified = function() - { - return po.isValueModified(); - }; po.initWorkspaceTabs(); + + po.initDataSetPropertiesTable(po.dataSetProperties); po.getAddParamName = function() { - var selectionRange = po.sqlEditor.getSelectionRange(); - return (po.sqlEditor.session.getTextRange(selectionRange) || ""); + var selectionRange = po.jsonEditor.getSelectionRange(); + return (po.jsonEditor.session.getTextRange(selectionRange) || ""); }; po.initDataSetParamsTable(po.dataSetParams); diff --git a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_form_SQL.ftl b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_form_SQL.ftl index 008fb1bc..c9251975 100644 --- a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_form_SQL.ftl +++ b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_form_SQL.ftl @@ -33,11 +33,11 @@ readonly 是否只读操作，允许为null
-
+
-
+
@@ -45,14 +45,6 @@ readonly 是否只读操作，允许为null <#include "include/dataSet_form_html_wow.ftl" >
-
-
- -
-
- -
-
<#if !readonly> @@ -119,12 +111,10 @@ readonly 是否只读操作，允许为null po.initWorkspaceEditor(po.sqlEditor, po.element("textarea[name='sql']").val()); - po.isWorkspaceModified = function() - { - return po.isSqlModified(); - }; po.initWorkspaceTabs(); + po.initDataSetPropertiesTable(po.dataSetProperties); + po.getAddParamName = function() { var selectionRange = po.sqlEditor.getSelectionRange(); @@ -164,7 +154,6 @@ readonly 是否只读操作，允许为null po.previewOptions.success = function(previewResponse) { po.element("textarea[name='sql']").val(this.data.sql); - po.dataSetProperties = (previewResponse.dataSetProperties || []); po.sqlEditor.focus(); }; @@ -231,18 +220,23 @@ readonly 是否只读操作，允许为null { "name" : "required", "schemaConnectionFactory.schema.title" : "required", - "sql" : {"dataSetSqlRequired": true, "dataSetSqlPreviewRequired": true} + "sql" : {"dataSetSqlRequired": true, "dataSetSqlPreviewRequired": true, "dataSetPropertiesRequired": true} }, messages : { "name" : "<@spring.message code='validation.required' />", "schemaConnectionFactory.schema.title" : "<@spring.message code='validation.required' />", - "sql" : {"dataSetSqlRequired": "<@spring.message code='validation.required' />", "dataSetSqlPreviewRequired": "<@spring.message code='dataSet.validation.previewRequired' />"} + "sql" : + { + "dataSetSqlRequired": "<@spring.message code='validation.required' />", + "dataSetSqlPreviewRequired": "<@spring.message code='dataSet.validation.previewRequired' />", + "dataSetPropertiesRequired": "<@spring.message code='dataSet.validation.propertiesRequired' />" + } }, submitHandler : function(form) { var formData = $.formToJson(form); - formData["properties"] = po.dataSetProperties; + formData["properties"] = po.getFormDataSetProperties(); formData["params"] = po.getFormDataSetParams(); $.postJson("${contextPath}/analysis/dataSet/${formAction}", formData, 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 69ed0855..48e6b572 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 @@ -124,7 +124,7 @@ boolean readonly 是否只读操作，默认为false { var data = {"id" : row.id}; - po.open(po.url("edit"), { data : data }); + po.open(po.url("edit"), { width: "85%", data : data }); }); }); @@ -153,6 +153,7 @@ boolean readonly 是否只读操作，默认为false po.open(po.url("view"), { + width: "85%", data : data }); }); diff --git a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/include/dataSet_form_html_wow.ftl b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/include/dataSet_form_html_wow.ftl index 97651093..74983b22 100644 --- a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/include/dataSet_form_html_wow.ftl +++ b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/include/dataSet_form_html_wow.ftl @@ -1,10 +1,11 @@ <#-- -数据集表单页：预览、参数操作区 +数据集表单页：预览、参数、属性操作区 -->
@@ -12,7 +13,7 @@
-
+
@@ -23,6 +24,15 @@
-
+
+
+
+
+ <#if !readonly> + + + +
+
\ No newline at end of file diff --git a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/include/dataSet_form_js.ftl b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/include/dataSet_form_js.ftl index d34b9353..95193814 100644 --- a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/include/dataSet_form_js.ftl +++ b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/include/dataSet_form_js.ftl @@ -5,13 +5,12 @@ page_js_obj.ftl 变量： -//工作空间内容是否已有变更，不允许为null -po.isWorkspaceModified = function(){ return true | false; } //预览URL，不允许为null po.previewOptions.url = "..."; --> -<#assign DataType=statics['org.datagear.analysis.DataSetParam$DataType']> -<#assign InputType=statics['org.datagear.analysis.DataSetParam$InputType']> +<#assign PropertyDataType=statics['org.datagear.analysis.DataSetProperty$DataType']> +<#assign ParamDataType=statics['org.datagear.analysis.DataSetParam$DataType']> +<#assign ParamInputType=statics['org.datagear.analysis.DataSetParam$InputType']> \ No newline at end of file