Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
开发团队
Flowable Engine
提交
85c13da7
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,发现更多精彩内容 >>
提交
85c13da7
编写于
10月 12, 2017
作者:
T
Tijs Rademakers
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Small fixes to dataobject logic
上级
4ca8e77a
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
20 addition
and
15 deletion
+20
-15
modules/flowable-json-converter/src/test/resources/test.valueddataobjectmodel.json
...verter/src/test/resources/test.valueddataobjectmodel.json
+2
-2
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
+5
-5
modules/flowable-ui-modeler/flowable-ui-modeler-app/src/main/webapp/editor-app/configuration/properties/data-properties-display-template.html
...guration/properties/data-properties-display-template.html
+2
-2
modules/flowable-ui-modeler/flowable-ui-modeler-logic/src/main/java/org/flowable/app/service/editor/BpmnDisplayJsonConverter.java
...flowable/app/service/editor/BpmnDisplayJsonConverter.java
+11
-6
未找到文件。
modules/flowable-json-converter/src/test/resources/test.valueddataobjectmodel.json
浏览文件 @
85c13da7
...
...
@@ -176,7 +176,7 @@
],
"properties"
:
{
"documentation"
:
""
,
"name"
:
""
,
"dataproperties"
:
{
"
dataPropertie
s"
:
[
"dataproperties"
:
{
"
item
s"
:
[
{
"dataproperty_id"
:
"dObj7"
,
"dataproperty_name"
:
"SubStringTest"
,
"dataproperty_type"
:
"string"
,
...
...
@@ -418,7 +418,7 @@
],
"properties"
:
{
"documentation"
:
""
,
"executionlisteners"
:
""
,
"dataproperties"
:
{
"
dataPropertie
s"
:
[
"dataproperties"
:
{
"
item
s"
:
[
{
"dataproperty_id"
:
"dObj1"
,
"dataproperty_name"
:
"StringTest"
,
"dataproperty_type"
:
"string"
,
...
...
modules/flowable-ui-modeler/flowable-ui-modeler-app/src/main/webapp/editor-app/configuration/properties-data-properties-controller.js
浏览文件 @
85c13da7
...
...
@@ -33,11 +33,11 @@ angular.module('flowableModeler').controller('FlowableDataPropertiesPopupCtrl',
// Put json representing data properties on scope
if
(
$scope
.
property
.
value
!==
undefined
&&
$scope
.
property
.
value
!==
null
&&
$scope
.
property
.
value
.
dataPropertie
s
!==
undefined
&&
$scope
.
property
.
value
.
dataPropertie
s
!==
null
)
{
&&
$scope
.
property
.
value
.
item
s
!==
undefined
&&
$scope
.
property
.
value
.
item
s
!==
null
)
{
// Note that we clone the json object rather then setting it directly,
// this to cope with the fact that the user can click the cancel button and no changes should have happen
d
ed
$scope
.
dataProperties
=
angular
.
copy
(
$scope
.
property
.
value
.
dataPropertie
s
);
// this to cope with the fact that the user can click the cancel button and no changes should have happened
$scope
.
dataProperties
=
angular
.
copy
(
$scope
.
property
.
value
.
item
s
);
for
(
var
i
=
0
;
i
<
$scope
.
dataProperties
.
length
;
i
++
)
{
var
dataProperty
=
$scope
.
dataProperties
[
i
];
...
...
@@ -306,7 +306,7 @@ angular.module('flowableModeler').controller('FlowableDataPropertiesPopupCtrl',
if
(
$scope
.
dataProperties
.
length
>
0
)
{
$scope
.
property
.
value
=
{};
$scope
.
property
.
value
.
dataPropertie
s
=
$scope
.
dataProperties
;
$scope
.
property
.
value
.
item
s
=
$scope
.
dataProperties
;
}
else
{
$scope
.
property
.
value
=
null
;
}
...
...
modules/flowable-ui-modeler/flowable-ui-modeler-app/src/main/webapp/editor-app/configuration/properties/data-properties-display-template.html
浏览文件 @
85c13da7
<span
ng-if=
"!property.noValue"
>
{{'PROPERTY.DATAPROPERTIES.VALUES' | translate:property.value.dataProperties}}
</span>
<span
ng-if=
"property.noValue"
translate
>
PROPERTY.DATAPROPERTIES.EMPTY
</span>
\ No newline at end of file
<span
ng-if=
"property.value.items && property.value.items.length > 0"
>
{{'PROPERTY.DATAPROPERTIES.VALUES' | translate:property.value.items}}
</span>
<span
ng-if=
"!property.value.items || property.value.items.length == 0"
translate
>
PROPERTY.DATAPROPERTIES.EMPTY
</span>
\ No newline at end of file
modules/flowable-ui-modeler/flowable-ui-modeler-logic/src/main/java/org/flowable/app/service/editor/BpmnDisplayJsonConverter.java
浏览文件 @
85c13da7
...
...
@@ -12,11 +12,6 @@
*/
package
org.flowable.app.service.editor
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.node.ArrayNode
;
import
com.fasterxml.jackson.databind.node.ObjectNode
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.HashMap
;
...
...
@@ -35,6 +30,7 @@ import org.flowable.bpmn.model.Artifact;
import
org.flowable.bpmn.model.Association
;
import
org.flowable.bpmn.model.BoundaryEvent
;
import
org.flowable.bpmn.model.BpmnModel
;
import
org.flowable.bpmn.model.DataObject
;
import
org.flowable.bpmn.model.ErrorEventDefinition
;
import
org.flowable.bpmn.model.Event
;
import
org.flowable.bpmn.model.EventDefinition
;
...
...
@@ -57,6 +53,11 @@ import org.slf4j.Logger;
import
org.slf4j.LoggerFactory
;
import
org.springframework.stereotype.Component
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.node.ArrayNode
;
import
com.fasterxml.jackson.databind.node.ObjectNode
;
@Component
public
class
BpmnDisplayJsonConverter
{
...
...
@@ -168,7 +169,11 @@ public class BpmnDisplayJsonConverter {
protected
void
processElements
(
Collection
<
FlowElement
>
elementList
,
BpmnModel
model
,
ArrayNode
elementArray
,
ArrayNode
flowArray
,
GraphicInfo
diagramInfo
)
{
for
(
FlowElement
element
:
elementList
)
{
if
(
element
instanceof
SequenceFlow
)
{
// ignore data objects in visual representation
if
(
DataObject
.
class
.
isInstance
(
element
))
{
continue
;
}
else
if
(
element
instanceof
SequenceFlow
)
{
ObjectNode
elementNode
=
objectMapper
.
createObjectNode
();
SequenceFlow
flow
=
(
SequenceFlow
)
element
;
elementNode
.
put
(
"id"
,
flow
.
getId
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录