Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
a69d1d2d
authored
Feb 14, 2025
by
lizhixian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 魔法字符调整成枚举类
parent
26e28965
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue
+4
-3
src/views/bpm/model/form/FormDesign.vue
+6
-5
No files found.
src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue
View file @
a69d1d2d
...
@@ -123,7 +123,7 @@
...
@@ -123,7 +123,7 @@
</div>
</div>
<el-divider
content-position=
"left"
>
字段权限
</el-divider>
<el-divider
content-position=
"left"
>
字段权限
</el-divider>
<div
class=
"field-setting-pane"
v-if=
"formType ===
10
"
>
<div
class=
"field-setting-pane"
v-if=
"formType ===
BpmModelFormType.NORMAL
"
>
<div
class=
"field-permit-title"
>
<div
class=
"field-permit-title"
>
<div
class=
"setting-title-label first-title"
>
字段名称
</div>
<div
class=
"setting-title-label first-title"
>
字段名称
</div>
<div
class=
"other-titles"
>
<div
class=
"other-titles"
>
...
@@ -191,6 +191,7 @@ import {
...
@@ -191,6 +191,7 @@ import {
}
from
'@/components/SimpleProcessDesignerV2/src/consts'
}
from
'@/components/SimpleProcessDesignerV2/src/consts'
import
*
as
UserApi
from
'@/api/system/user'
import
*
as
UserApi
from
'@/api/system/user'
import
{
useFormFieldsPermission
}
from
'@/components/SimpleProcessDesignerV2/src/node'
import
{
useFormFieldsPermission
}
from
'@/components/SimpleProcessDesignerV2/src/node'
import
{
BpmModelFormType
}
from
'@/utils/constants'
defineOptions
({
name
:
'ElementCustomConfig4UserTask'
})
defineOptions
({
name
:
'ElementCustomConfig4UserTask'
})
const
props
=
defineProps
({
const
props
=
defineProps
({
...
@@ -497,9 +498,9 @@ onMounted(async () => {
...
@@ -497,9 +498,9 @@ onMounted(async () => {
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.button-setting-pane
{
.button-setting-pane
{
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
font-size
:
14px
;
margin-top
:
8px
;
margin-top
:
8px
;
font-size
:
14px
;
flex-direction
:
column
;
.button-setting-desc
{
.button-setting-desc
{
padding-right
:
8px
;
padding-right
:
8px
;
...
...
src/views/bpm/model/form/FormDesign.vue
View file @
a69d1d2d
...
@@ -11,12 +11,12 @@
...
@@ -11,12 +11,12 @@
</el-radio>
</el-radio>
</el-radio-group>
</el-radio-group>
</el-form-item>
</el-form-item>
<el-form-item
v-if=
"modelData.formType ===
10
"
label=
"流程表单"
prop=
"formId"
>
<el-form-item
v-if=
"modelData.formType ===
BpmModelFormType.NORMAL
"
label=
"流程表单"
prop=
"formId"
>
<el-select
v-model=
"modelData.formId"
clearable
style=
"width: 100%"
>
<el-select
v-model=
"modelData.formId"
clearable
style=
"width: 100%"
>
<el-option
v-for=
"form in formList"
:key=
"form.id"
:label=
"form.name"
:value=
"form.id"
/>
<el-option
v-for=
"form in formList"
:key=
"form.id"
:label=
"form.name"
:value=
"form.id"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
v-if=
"modelData.formType ===
20
"
label=
"表单提交路由"
prop=
"formCustomCreatePath"
>
<el-form-item
v-if=
"modelData.formType ===
BpmModelFormType.CUSTOM
"
label=
"表单提交路由"
prop=
"formCustomCreatePath"
>
<el-input
<el-input
v-model=
"modelData.formCustomCreatePath"
v-model=
"modelData.formCustomCreatePath"
placeholder=
"请输入表单提交路由"
placeholder=
"请输入表单提交路由"
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
<Icon
icon=
"ep:question"
class=
"ml-5px"
/>
<Icon
icon=
"ep:question"
class=
"ml-5px"
/>
</el-tooltip>
</el-tooltip>
</el-form-item>
</el-form-item>
<el-form-item
v-if=
"modelData.formType ===
20
"
label=
"表单查看地址"
prop=
"formCustomViewPath"
>
<el-form-item
v-if=
"modelData.formType ===
BpmModelFormType.CUSTOM
"
label=
"表单查看地址"
prop=
"formCustomViewPath"
>
<el-input
<el-input
v-model=
"modelData.formCustomViewPath"
v-model=
"modelData.formCustomViewPath"
placeholder=
"请输入表单查看的组件地址"
placeholder=
"请输入表单查看的组件地址"
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
</el-form-item>
</el-form-item>
<!-- 表单预览 -->
<!-- 表单预览 -->
<div
<div
v-if=
"modelData.formType ===
10
&& modelData.formId && formPreview.rule.length > 0"
v-if=
"modelData.formType ===
BpmModelFormType.NORMAL
&& modelData.formId && formPreview.rule.length > 0"
class=
"mt-20px"
class=
"mt-20px"
>
>
<div
class=
"flex items-center mb-15px"
>
<div
class=
"flex items-center mb-15px"
>
...
@@ -68,6 +68,7 @@
...
@@ -68,6 +68,7 @@
import
{
DICT_TYPE
,
getIntDictOptions
}
from
'@/utils/dict'
import
{
DICT_TYPE
,
getIntDictOptions
}
from
'@/utils/dict'
import
*
as
FormApi
from
'@/api/bpm/form'
import
*
as
FormApi
from
'@/api/bpm/form'
import
{
setConfAndFields2
}
from
'@/utils/formCreate'
import
{
setConfAndFields2
}
from
'@/utils/formCreate'
import
{
BpmModelFormType
}
from
'@/utils/constants'
const
props
=
defineProps
({
const
props
=
defineProps
({
formList
:
{
formList
:
{
...
@@ -96,7 +97,7 @@ const formPreview = ref({
...
@@ -96,7 +97,7 @@ const formPreview = ref({
watch
(
watch
(
()
=>
modelData
.
value
.
formId
,
()
=>
modelData
.
value
.
formId
,
async
(
newFormId
)
=>
{
async
(
newFormId
)
=>
{
if
(
newFormId
&&
modelData
.
value
.
formType
===
10
)
{
if
(
newFormId
&&
modelData
.
value
.
formType
===
BpmModelFormType
.
NORMAL
)
{
const
data
=
await
FormApi
.
getForm
(
newFormId
)
const
data
=
await
FormApi
.
getForm
(
newFormId
)
setConfAndFields2
(
formPreview
.
value
,
data
.
conf
,
data
.
fields
)
setConfAndFields2
(
formPreview
.
value
,
data
.
conf
,
data
.
fields
)
// 设置只读
// 设置只读
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment