Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
开发团队
Flowable Engine
提交
6e5c50d4
F
Flowable Engine
项目概览
开发团队
/
Flowable Engine
通知
9
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Flowable Engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6e5c50d4
编写于
10月 12, 2017
作者:
T
Tijs Rademakers
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Small changes to PR #593
上级
093d8207
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
114 addition
and
114 deletion
+114
-114
modules/flowable-json-converter/src/main/java/org/flowable/editor/constants/StencilConstants.java
.../java/org/flowable/editor/constants/StencilConstants.java
+4
-5
modules/flowable-json-converter/src/main/java/org/flowable/editor/language/json/converter/BpmnJsonConverterUtil.java
...editor/language/json/converter/BpmnJsonConverterUtil.java
+2
-2
modules/flowable-json-converter/src/test/resources/test.valueddataobjectmodel.json
...verter/src/test/resources/test.valueddataobjectmodel.json
+96
-96
modules/flowable-ui-modeler/flowable-ui-modeler-app/src/main/webapp/editor-app/configuration/properties-data-properties-controller.js
...pp/configuration/properties-data-properties-controller.js
+7
-7
modules/flowable-ui-modeler/flowable-ui-modeler-app/src/main/webapp/editor-app/configuration/properties/data-properties-popup.html
...r-app/configuration/properties/data-properties-popup.html
+4
-4
modules/flowable-ui-modeler/flowable-ui-modeler-logic/src/main/java/org/flowable/app/service/editor/ModelImageService.java
...va/org/flowable/app/service/editor/ModelImageService.java
+1
-0
未找到文件。
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录