Skip to content

F
Flowable Engine

开发团队 / Flowable Engine

通知 9
Star 0
Fork 0
F
Flowable Engine

体验新版 GitCode，发现更多精彩内容 >>

提交 6e5c50d4 编写于 作者: T Tijs Rademakers
浏览文件
操作

Small changes to PR #593

上级 093d8207
隐藏空白更改
内联 并排
Showing with 114 addition and 114 deletion
modules/flowable-json-converter/src/main/java/org/flowable/editor/constants/StencilConstants.java
浏览文件 @ 6e5c50d4
......@@ -190,11 +190,10 @@ public interface StencilConstants {
final String PROPERTY_FORM_ENUM_VALUES_ID = "id";
final String PROPERTY_DATA_PROPERTIES = "dataproperties";
final String PROPERTY_DATA_PROPERTIES_NODE = "dataProperties";
final String PROPERTY_DATA_ID = "id";
final String PROPERTY_DATA_NAME = "name";
final String PROPERTY_DATA_TYPE = "type";
final String PROPERTY_DATA_VALUE = "value";
final String PROPERTY_DATA_ID = "dataproperty_id";
final String PROPERTY_DATA_NAME = "dataproperty_name";
final String PROPERTY_DATA_TYPE = "dataproperty_type";
final String PROPERTY_DATA_VALUE = "dataproperty_value";
final String PROPERTY_SCRIPT_FORMAT = "scriptformat";
final String PROPERTY_SCRIPT_TEXT = "scripttext";
......
modules/flowable-json-converter/src/main/java/org/flowable/editor/language/json/converter/BpmnJsonConverterUtil.java
浏览文件 @ 6e5c50d4
......@@ -515,7 +515,7 @@ public class BpmnJsonConverterUtil implements EditorJsonConstants, StencilConsta
}
}
JsonNode itemsArrayNode = objectNode.get(PROPERTY_DATA_PROPERTIES_NODE);
JsonNode itemsArrayNode = objectNode.get(EDITOR_PROPERTIES_GENERAL_ITEMS);
if (itemsArrayNode != null) {
for (JsonNode dataNode : itemsArrayNode) {
......@@ -603,7 +603,7 @@ public class BpmnJsonConverterUtil implements EditorJsonConstants, StencilConsta
itemsNode.add(propertyItemNode);
}
dataPropertiesNode.set(PROPERTY_DATA_PROPERTIES_NODE, itemsNode);
dataPropertiesNode.set(EDITOR_PROPERTIES_GENERAL_ITEMS, itemsNode);
propertiesNode.set(PROPERTY_DATA_PROPERTIES, dataPropertiesNode);
}
......
modules/flowable-json-converter/src/test/resources/test.valueddataobjectmodel.json
浏览文件 @ 6e5c50d4
......@@ -177,65 +177,65 @@
"properties" : { "documentation" : "",
"name" : "",
"dataproperties" : { "dataProperties" : [
{ "id" : "dObj7",
"name" : "SubStringTest",
"type" : "string",
"value" : "Testing456"
{ "dataproperty_id" : "dObj7",
"dataproperty_name" : "SubStringTest",
"dataproperty_type" : "string",
"dataproperty_value" : "Testing456"
},
{ "id" : "dObj8",
"name" : "SubBooleanTest",
"type" : "boolean",
"value" : "false"
{ "dataproperty_id" : "dObj8",
"dataproperty_name" : "SubBooleanTest",
"dataproperty_type" : "boolean",
"dataproperty_value" : "false"
},
{ "id" : "dObj9",
"name" : "SubDateTest",
"type" : "datetime",
"value" : "2013-11-11"
{ "dataproperty_id" : "dObj9",
"dataproperty_name" : "SubDateTest",
"dataproperty_type" : "datetime",
"dataproperty_value" : "2013-11-11"
},
{ "id" : "dObj10",
"name" : "SubDoubleTest",
"type" : "double",
"value" : "678912345"
{ "dataproperty_id" : "dObj10",
"dataproperty_name" : "SubDoubleTest",
"dataproperty_type" : "double",
"dataproperty_value" : "678912345"
},
{ "id" : "dObj11",
"name" : "SubIntegerTest",
"type" : "int",
"value" : "45"
{ "dataproperty_id" : "dObj11",
"dataproperty_name" : "SubIntegerTest",
"dataproperty_type" : "int",
"dataproperty_value" : "45"
},
{ "id" : "dObj12",
"name" : "SubLongTest",
"type" : "long",
"value" : "456123"
{ "dataproperty_id" : "dObj12",
"dataproperty_name" : "SubLongTest",
"dataproperty_type" : "long",
"dataproperty_value" : "456123"
},
{ "id" : "dObj19",
"name" : "SubStringTest2",
"type" : "string",
"value" : ""
{ "dataproperty_id" : "dObj19",
"dataproperty_name" : "SubStringTest2",
"dataproperty_type" : "string",
"dataproperty_value" : ""
},
{ "id" : "dObj20",
"name" : "SubBooleanTest2",
"type" : "boolean",
"value" : ""
{ "dataproperty_id" : "dObj20",
"dataproperty_name" : "SubBooleanTest2",
"dataproperty_type" : "boolean",
"dataproperty_value" : ""
},
{ "id" : "dObj21",
"name" : "SubDateTest2",
"type" : "datetime",
"value" : ""
{ "dataproperty_id" : "dObj21",
"dataproperty_name" : "SubDateTest2",
"dataproperty_type" : "datetime",
"dataproperty_value" : ""
},
{ "id" : "dObj22",
"name" : "SubDoubleTest2",
"type" : "double",
"value" : ""
{ "dataproperty_id" : "dObj22",
"dataproperty_name" : "SubDoubleTest2",
"dataproperty_type" : "double",
"dataproperty_value" : ""
},
{ "id" : "dObj23",
"name" : "SubIntegerTest2",
"type" : "int",
"value" : ""
{ "dataproperty_id" : "dObj23",
"dataproperty_name" : "SubIntegerTest2",
"dataproperty_type" : "int",
"dataproperty_value" : ""
},
{ "id" : "dObj24",
"name" : "SubLongTest2",
"type" : "long",
"value" : ""
{ "dataproperty_id" : "dObj24",
"dataproperty_name" : "SubLongTest2",
"dataproperty_type" : "long",
"dataproperty_value" : ""
}
],
"totalCount" : 12
......@@ -419,65 +419,65 @@
"properties" : { "documentation" : "",
"executionlisteners" : "",
"dataproperties" : { "dataProperties" : [
{ "id" : "dObj1",
"name" : "StringTest",
"type" : "string",
"value" : "Testing123"
{ "dataproperty_id" : "dObj1",
"dataproperty_name" : "StringTest",
"dataproperty_type" : "string",
"dataproperty_value" : "Testing123"
},
{ "id" : "dObj2",
"name" : "BooleanTest",
"type" : "boolean",
"value" : "true"
{ "dataproperty_id" : "dObj2",
"dataproperty_name" : "BooleanTest",
"dataproperty_type" : "boolean",
"dataproperty_value" : "true"
},
{ "id" : "dObj3",
"name" : "DateTest",
"type" : "datetime",
"value" : "2013-09-16T11:23:00"
{ "dataproperty_id" : "dObj3",
"dataproperty_name" : "DateTest",
"dataproperty_type" : "datetime",
"dataproperty_value" : "2013-09-16T11:23:00"
},
{ "id" : "dObj4",
"name" : "DoubleTest",
"type" : "double",
"value" : "123456789"
{ "dataproperty_id" : "dObj4",
"dataproperty_name" : "DoubleTest",
"dataproperty_type" : "double",
"dataproperty_value" : "123456789"
},
{ "id" : "dObj5",
"name" : "IntegerTest",
"type" : "int",
"value" : "123"
{ "dataproperty_id" : "dObj5",
"dataproperty_name" : "IntegerTest",
"dataproperty_type" : "int",
"dataproperty_value" : "123"
},
{ "id" : "dObj6",
"name" : "LongTest",
"type" : "long",
"value" : "-123456"
{ "dataproperty_id" : "dObj6",
"dataproperty_name" : "LongTest",
"dataproperty_type" : "long",
"dataproperty_value" : "-123456"
},
{ "id" : "dObj13",
"name" : "StringTest2",
"type" : "string",
"value" : ""
{ "dataproperty_id" : "dObj13",
"dataproperty_name" : "StringTest2",
"dataproperty_type" : "string",
"dataproperty_value" : ""
},
{ "id" : "dObj14",
"name" : "BooleanTest2",
"type" : "boolean",
"value" : ""
{ "dataproperty_id" : "dObj14",
"dataproperty_name" : "BooleanTest2",
"dataproperty_type" : "boolean",
"dataproperty_value" : ""
},
{ "id" : "dObj15",
"name" : "DateTest2",
"type" : "datetime",
"value" : ""
{ "dataproperty_id" : "dObj15",
"dataproperty_name" : "DateTest2",
"dataproperty_type" : "datetime",
"dataproperty_value" : ""
},
{ "id" : "dObj16",
"name" : "DoubleTest2",
"type" : "double",
"value" : ""
{ "dataproperty_id" : "dObj16",
"dataproperty_name" : "DoubleTest2",
"dataproperty_type" : "double",
"dataproperty_value" : ""
},
{ "id" : "dObj17",
"name" : "IntegerTest2",
"type" : "int",
"value" : ""
{ "dataproperty_id" : "dObj17",
"dataproperty_name" : "IntegerTest2",
"dataproperty_type" : "int",
"dataproperty_value" : ""
},
{ "id" : "dObj18",
"name" : "LongTest2",
"type" : "long",
"value" : ""
{ "dataproperty_id" : "dObj18",
"dataproperty_name" : "LongTest2",
"dataproperty_type" : "long",
"dataproperty_value" : ""
}
],
"totalCount" : 12
......
modules/flowable-ui-modeler/flowable-ui-modeler-app/src/main/webapp/editor-app/configuration/properties-data-properties-controller.js
浏览文件 @ 6e5c50d4
......@@ -85,10 +85,10 @@ angular.module('flowableModeler').controller('FlowableDataPropertiesPopupCtrl',
enableHorizontalScrollbar: 0,
enableColumnMenus: false,
enableSorting: false,
columnDefs: [{field: 'id', displayName: $scope.labels.idLabel},
{field: 'name', displayName: $scope.labels.nameLabel},
{field: 'type', displayName: $scope.labels.typeLabel},
{field: 'value', displayName: $scope.labels.valueLabel}]
columnDefs: [{field: 'dataproperty_id', displayName: $scope.labels.idLabel},
{field: 'dataproperty_name', displayName: $scope.labels.nameLabel},
{field: 'dataproperty_type', displayName: $scope.labels.typeLabel},
{field: 'dataproperty_value', displayName: $scope.labels.valueLabel}]
};
$scope.enumGridOptions = {
......@@ -157,9 +157,9 @@ angular.module('flowableModeler').controller('FlowableDataPropertiesPopupCtrl',
var propertyIndex = 1;
$scope.addNewProperty = function () {
var newProperty = {
id: 'new_data_object_' + propertyIndex++,
name: '',
type: 'string',
dataproperty_id: 'new_data_object_' + propertyIndex++,
dataproperty_name: '',
dataproperty_type: 'string',
readable: true,
writable: true
};
......
modules/flowable-ui-modeler/flowable-ui-modeler-app/src/main/webapp/editor-app/configuration/properties/data-properties-popup.html
浏览文件 @ 6e5c50d4
......@@ -28,15 +28,15 @@
<div class="form-group">
<label for="idField">{{'PROPERTY.DATAPROPERTIES.ID' | translate}}</label>
<input id="idField" class="form-control" type="text" ng-model="selectedProperty.id" placeholder="{{'PROPERTY.DATAPROPERTIES.ID.PLACEHOLDER' | translate }}" />
<input id="idField" class="form-control" type="text" ng-model="selectedProperty.dataproperty_id" placeholder="{{'PROPERTY.DATAPROPERTIES.ID.PLACEHOLDER' | translate }}" />
</div>
<div class="form-group">
<label for="nameField">{{'PROPERTY.DATAPROPERTIES.NAME' | translate}}</label>
<input id="nameField" class="form-control" type="text" ng-model="selectedProperty.name" placeholder="{{'PROPERTY.DATAPROPERTIES.NAME.PLACEHOLDER' | translate }}" />
<input id="nameField" class="form-control" type="text" ng-model="selectedProperty.dataproperty_name" placeholder="{{'PROPERTY.DATAPROPERTIES.NAME.PLACEHOLDER' | translate }}" />
</div>
<div class="form-group">
<label for="typeField">{{'PROPERTY.DATAPROPERTIES.TYPE' | translate}}</label>
<select id="typeField" class="form-control" ng-model="selectedProperty.type" ng-change="propertyTypeChanged()">
<select id="typeField" class="form-control" ng-model="selectedProperty.dataproperty_type" ng-change="propertyTypeChanged()">
<option selected>string</option>
<option>boolean</option>
<option>datetime</option>
......@@ -47,7 +47,7 @@
</div>
<div class="form-group">
<label for="valueField">{{'PROPERTY.DATAPROPERTIES.VALUE' | translate}}</label>
<input id="valueField" class="form-control" type="text" ng-model="selectedProperty.value" placeholder="{{'PROPERTY.DATAPROPERTIES.VALUE.PLACEHOLDER' | translate }}" />
<input id="valueField" class="form-control" type="text" ng-model="selectedProperty.dataproperty_value" placeholder="{{'PROPERTY.DATAPROPERTIES.VALUE.PLACEHOLDER' | translate }}" />
</div>
</div>
<div ng-show="!selectedProperty" class="muted no-property-selected" translate>PROPERTY.DATAPROPERTIES.EMPTY</div>
......
modules/flowable-ui-modeler/flowable-ui-modeler-logic/src/main/java/org/flowable/app/service/editor/ModelImageService.java
浏览文件 @ 6e5c50d4
......@@ -221,6 +221,7 @@ public class ModelImageService {
if (flowList != null) {
graphicInfoList.addAll(flowList);
}
// no graphic info for Data Objects
} else if (!DataObject.class.isInstance(flowElement)) {
graphicInfoList.add(bpmnModel.getGraphicInfo(flowElement.getId()));
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或