Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
ferry_web
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jianan
ferry_web
Commits
9e3c3ea0
Commit
9e3c3ea0
authored
Oct 22, 2020
by
Mr. Lan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 流程不同逻辑流程绑定不同模板存在必填属性会报错。
parent
918fd4a5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
19 deletions
+26
-19
src/components/VueFormMaking/components/GenerateForm.vue
+18
-16
src/views/process/list/create.vue
+3
-1
src/views/process/list/handle.vue
+5
-2
No files found.
src/components/VueFormMaking/components/GenerateForm.vue
View file @
9e3c3ea0
...
...
@@ -197,22 +197,24 @@ export default {
}
}
if
(
this
.
rules
[
genList
[
i
].
model
])
{
this
.
rules
[
genList
[
i
].
model
]
=
[...
this
.
rules
[
genList
[
i
].
model
],
...
genList
[
i
].
rules
.
map
(
item
=>
{
if
(
item
.
pattern
)
{
return
{
...
item
,
pattern
:
eval
(
item
.
pattern
)
}
}
else
{
return
{
...
item
}
}
})]
}
else
{
this
.
rules
[
genList
[
i
].
model
]
=
[...
genList
[
i
].
rules
.
map
(
item
=>
{
if
(
item
.
pattern
)
{
return
{
...
item
,
pattern
:
eval
(
item
.
pattern
)
}
}
else
{
return
{
...
item
}
}
})]
if
(
!
this
.
preview
)
{
if
(
this
.
rules
[
genList
[
i
].
model
])
{
this
.
rules
[
genList
[
i
].
model
]
=
[...
this
.
rules
[
genList
[
i
].
model
],
...
genList
[
i
].
rules
.
map
(
item
=>
{
if
(
item
.
pattern
)
{
return
{
...
item
,
pattern
:
eval
(
item
.
pattern
)
}
}
else
{
return
{
...
item
}
}
})]
}
else
{
this
.
rules
[
genList
[
i
].
model
]
=
[...
genList
[
i
].
rules
.
map
(
item
=>
{
if
(
item
.
pattern
)
{
return
{
...
item
,
pattern
:
eval
(
item
.
pattern
)
}
}
else
{
return
{
...
item
}
}
})]
}
}
}
}
...
...
src/views/process/list/create.vue
View file @
9e3c3ea0
...
...
@@ -32,6 +32,9 @@
currentNode.hideTpls.indexOf(tplItem.id)===-1"
:key=
"tplIndex"
:ref=
"'generateForm-'+tplItem.id"
:preview=
"currentNode.hideTpls===undefined ||
currentNode.hideTpls===null ||
currentNode.hideTpls.indexOf(tplItem.id)===-1?false:true"
:remote=
"remoteFunc"
:data=
"tplItem.form_structure"
:disabled=
"currentNode.readonlyTpls===undefined ||
...
...
@@ -154,7 +157,6 @@ export default {
'form_data'
:
[]
}
// 绑定流程任务
console
.
log
(
this
.
processStructureValue
.
process
)
this
.
ruleForm
.
tasks
=
this
.
processStructureValue
.
process
.
task
===
undefined
?
[]
:
this
.
processStructureValue
.
process
.
task
// 追加节点任务
if
(
this
.
processStructureValue
.
nodes
[
this
.
active
].
task
!==
undefined
&&
this
.
processStructureValue
.
nodes
[
this
.
active
].
task
.
length
>
0
)
{
...
...
src/views/process/list/handle.vue
View file @
9e3c3ea0
...
...
@@ -67,9 +67,12 @@
currentNode.hideTpls.indexOf(tplItem.form_structure.id)===-1"
:key=
"tplIndex"
:ref=
"'generateForm-'+tplItem.id"
:preview=
"currentNode.writeTpls===undefined ||
:preview=
"(currentNode.hideTpls!==undefined &&
currentNode.hideTpls!==null &&
currentNode.hideTpls.indexOf(tplItem.form_structure.id)!==-1) ||
(currentNode.writeTpls===undefined ||
currentNode.writeTpls===null ||
currentNode.writeTpls.indexOf(tplItem.form_structure.id)===-1?true:false"
currentNode.writeTpls.indexOf(tplItem.form_structure.id)===-1
)
?true:false"
:remote=
"remoteFunc"
:value=
"tplItem.form_data"
:data=
"tplItem.form_structure"
...
...
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