Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TF-MOM-WEB
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
TFMOM
TF-MOM-WEB
Commits
905d3a21
Commit
905d3a21
authored
Sep 15, 2023
by
jingnan
👀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合并底层代码【6636】,解决流程模板表单配置bug
parent
38b0dcc8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
9 deletions
+21
-9
chunk-12d55490.ab8ec915.js
...ecture-dee/public/dee-workflow/chunk-12d55490.ab8ec915.js
+0
-0
chunk-75e82b85.5dd15992.js
...ecture-dee/public/dee-workflow/chunk-75e82b85.5dd15992.js
+2
-2
main.js
applications/architecture-dee/public/dee-workflow/main.js
+2
-2
report.html
...ications/architecture-dee/public/dee-workflow/report.html
+2
-2
task-detail.vue
...ask-center/src/business-components/tabCom/task-detail.vue
+15
-3
No files found.
applications/architecture-dee/public/dee-workflow/chunk-12d55490.
185c7dac
.js
→
applications/architecture-dee/public/dee-workflow/chunk-12d55490.
ab8ec915
.js
View file @
905d3a21
File moved
applications/architecture-dee/public/dee-workflow/chunk-75e82b85.
47810a63
.js
→
applications/architecture-dee/public/dee-workflow/chunk-75e82b85.
5dd15992
.js
View file @
905d3a21
This diff is collapsed.
Click to expand it.
applications/architecture-dee/public/dee-workflow/main.js
View file @
905d3a21
This diff is collapsed.
Click to expand it.
applications/architecture-dee/public/dee-workflow/report.html
View file @
905d3a21
This diff is collapsed.
Click to expand it.
applications/dee-task-center/src/business-components/tabCom/task-detail.vue
View file @
905d3a21
...
...
@@ -47,8 +47,8 @@
v-else-if=
"name && name.type && name.type === 'formConfig'&&basicData.businessObject"
:ref=
"name.refKey"
:lay-config=
"
{
typeName: name.
model
Name,
layKey: name.
key
Name
typeName: name.
webServer
Name,
layKey: name.
config
Name
}"
editor-immediately
:basic-data="basicData.businessObject"
...
...
@@ -121,6 +121,18 @@
:process-instance-id="processInstanceId"
:basic-data="basicData.businessObject"
/>
<dee-as-com
v-else-if=
"currTab && currTab.comType && currTab.comType === 'formConfig'"
:key=
"'formConfig' + id"
:ref=
"currTab.configName"
v-bind=
"currTab.configParams ? JSON.parse(currTab.configParams) :
{}"
:component-prop="{...currTab, selfComponentPath: currTab.configName}"
:lay-config="{
typeName:currTab.webServerName,
layKey: currTab.configName
}"
:basic-data="basicData.businessObject"
/>
<component
:is=
"currTab.comName"
v-else-if=
"currTab && currTab.comName"
:ref=
"currTab.name"
v-bind=
"currTab.configParams ? JSON.parse(currTab.configParams) :
{}" :process-instance-id="processInstanceId" :basic-data="basicData" />
<component
:is=
"currTab.configName"
v-else-if=
"currTab && currTab.configName"
:ref=
"currTab.name"
v-bind=
"currTab.configParams ? JSON.parse(currTab.configParams) :
{}" :process-instance-id="processInstanceId" :basic-data="basicData" />
</div>
...
...
@@ -768,7 +780,7 @@ export default {
validateArray
.
push
(
vm
.
validate
())
}
else
if
(
vm
.
$refs
.
asCom
&&
vm
.
$refs
.
asCom
.
hasOwnProperty
(
'validate'
))
{
validateArray
.
push
(
vm
.
$refs
.
asCom
.
validate
())
}
else
if
(
vm
.
$refs
.
asCom
.
$refs
&&
vm
.
$refs
.
asCom
.
$refs
.
deeForm
&&
vm
.
$refs
.
asCom
.
$refs
.
deeForm
.
hasOwnProperty
(
'validate'
))
{
}
else
if
(
vm
.
$refs
.
asCom
&&
vm
.
$refs
.
asCom
.
$refs
&&
vm
.
$refs
.
asCom
.
$refs
.
deeForm
&&
vm
.
$refs
.
asCom
.
$refs
.
deeForm
.
hasOwnProperty
(
'validate'
))
{
validateArray
.
push
(
vm
.
$refs
.
asCom
.
$refs
.
deeForm
.
validate
())
}
})
...
...
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