-
-
- updateFormFieldKey(key, newKey)"
- placeholder="请选择表单字段"
- :disabled="key !== ''"
+
+
+
+
+
+
+
修改表单设置 {{ index + 1 }}
+
+
+
+
+
+
+
+ handleConditionUpdate(index, val)"
+ />
+
+
-
-
-
-
- 的值设置为
-
-
+
+
-
-
-
-
-
-
-
-
+
添加条件
+
+
修改表单字段设置
+
+
+
+
+ updateFormFieldKey(formSetting, key, newKey)"
+ placeholder="请选择表单字段"
+ :disabled="key !== ''"
+ >
+
+
+
+
+
的值设置为
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加修改字段
+
+
-
- 添加修改字段
+
+
+
+ 添加设置
@@ -191,10 +243,26 @@
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue
index 47ef540cc9e1229db7d2986ff42eff60fb6db84e..ae1af6c287957627fcdc5b0febe729ad618593be 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue
@@ -9,7 +9,14 @@
]"
>
-
+
+
+
+
- {{ NODE_DEFAULT_TEXT.get(NodeType.USER_TASK_NODE) }}
+ {{ NODE_DEFAULT_TEXT.get(currentNode.type) }}
diff --git a/src/components/SimpleProcessDesignerV2/theme/simple-process-designer.scss b/src/components/SimpleProcessDesignerV2/theme/simple-process-designer.scss
index f3d8b4437335aa206dce04c919d343001252a4ad..62199105c22c684af71bb15db657c4e46d78ea6d 100644
--- a/src/components/SimpleProcessDesignerV2/theme/simple-process-designer.scss
+++ b/src/components/SimpleProcessDesignerV2/theme/simple-process-designer.scss
@@ -177,6 +177,10 @@
color: #ca3a31
}
+ .transactor {
+ color: #330099;
+ }
+
.handler-item-text {
margin-top: 4px;
width: 80px;
@@ -290,10 +294,14 @@
&.trigger-node {
color: #3373d2;
}
-
+
&.router-node {
color: #ca3a31
}
+
+ &.transactor-task {
+ color: #330099;
+ }
}
.node-title {
@@ -777,7 +785,7 @@
content: "\e7eb";
}
-.icon-handle:before {
+.icon-transactor:before {
content: "\e61c";
}
diff --git a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue
index aab130d087aa243b2e89c8c89fef76b50b21bb9b..8b3b8af2d4676b5e0696c5c14a07cd7812c16d74 100644
--- a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue
@@ -191,6 +191,7 @@ import {
} from '@/components/SimpleProcessDesignerV2/src/consts'
import * as UserApi from '@/api/system/user'
import { useFormFieldsPermission } from '@/components/SimpleProcessDesignerV2/src/node'
+import { BpmModelFormType } from '@/utils/constants'
defineOptions({ name: 'ElementCustomConfig4UserTask' })
const props = defineProps({
@@ -248,7 +249,6 @@ const resetCustomConfigList = () => {
bpmnElement.value.id,
bpmnInstances().modeler
)
-
// 获取元素扩展属性 或者 创建扩展属性
elExtensionElements.value =
bpmnElement.value.businessObject?.extensionElements ??
@@ -311,14 +311,13 @@ const resetCustomConfigList = () => {
}
// 字段权限
- if (formType.value === 10) {
+ if (formType.value === BpmModelFormType.NORMAL) {
const fieldsPermissionList = elExtensionElements.value.values?.filter(
(ex) => ex.$type === `${prefix}:FieldsPermission`
)
fieldsPermissionEl.value = []
getNodeConfigFormFields()
- // 由于默认添加了发起人元素,这里需要删掉
- fieldsPermissionConfig.value = fieldsPermissionConfig.value.slice(1)
+ fieldsPermissionConfig.value = fieldsPermissionConfig.value
fieldsPermissionConfig.value.forEach((element) => {
element.permission =
fieldsPermissionList?.find((obj) => obj.field === element.field)?.permission ?? '1'
@@ -497,9 +496,9 @@ onMounted(async () => {