Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Chatopera OpenSource
/
ferry_web
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Members
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
3e1b5e3b
authored
Sep 24, 2020
by
Mr. Lan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复表单禁用属性不生效的bug。
parent
b9b38df1
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
5 deletions
src/components/VueFormMaking/components/Container.vue
src/components/VueFormMaking/components/GenerateForm.vue
src/components/VueFormMaking/components/GenerateFormItem.vue
src/components/VueFormMaking/components/WidgetConfig.vue
src/views/process/list/create.vue
src/components/VueFormMaking/components/Container.vue
View file @
3e1b5e3b
...
@@ -109,7 +109,15 @@
...
@@ -109,7 +109,15 @@
form
form
@
on-close=
"previewVisible = false"
@
on-close=
"previewVisible = false"
>
>
<generate-form
v-if=
"previewVisible"
ref=
"generateForm"
insite=
"true"
:data=
"widgetForm"
:value=
"widgetModels"
:remote=
"remoteFuncs"
@
on-change=
"handleDataChange"
>
<generate-form
v-if=
"previewVisible"
ref=
"generateForm"
insite=
"true"
:data=
"widgetForm"
:value=
"widgetModels"
:remote=
"remoteFuncs"
@
on-change=
"handleDataChange"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
Width
<el-input
v-model=
"scope.model.blank.width"
style=
"width: 100px"
/>
Width
<el-input
v-model=
"scope.model.blank.width"
style=
"width: 100px"
/>
...
...
src/components/VueFormMaking/components/GenerateForm.vue
View file @
3e1b5e3b
...
@@ -164,7 +164,6 @@ export default {
...
@@ -164,7 +164,6 @@ export default {
})
})
}
else
if
(
genList
[
i
].
type
===
'subform'
)
{
}
else
if
(
genList
[
i
].
type
===
'subform'
)
{
// this.generateModle(genList[i].columns.list)
// this.generateModle(genList[i].columns.list)
console
.
log
(
genList
[
i
].
columns
)
}
else
{
}
else
{
if
(
this
.
value
&&
Object
.
keys
(
this
.
value
).
indexOf
(
genList
[
i
].
model
)
>=
0
)
{
if
(
this
.
value
&&
Object
.
keys
(
this
.
value
).
indexOf
(
genList
[
i
].
model
)
>=
0
)
{
this
.
models
[
genList
[
i
].
model
]
=
this
.
value
[
genList
[
i
].
model
]
this
.
models
[
genList
[
i
].
model
]
=
this
.
value
[
genList
[
i
].
model
]
...
...
src/components/VueFormMaking/components/GenerateFormItem.vue
View file @
3e1b5e3b
...
@@ -63,7 +63,9 @@
...
@@ -63,7 +63,9 @@
<
template
v-else
>
<
template
v-else
>
<template
v-if=
"widget.type === 'input'"
>
<template
v-if=
"widget.type === 'input'"
>
<el-input
<el-input
v-if=
"widget.options.dataType === 'number' || widget.options.dataType === 'integer' || widget.options.dataType === 'float'"
v-if=
"widget.options.dataType === 'number'
|| widget.options.dataType === 'integer'
|| widget.options.dataType === 'float'"
v-model
.
number=
"dataModel"
v-model
.
number=
"dataModel"
:type=
"widget.options.dataType"
:type=
"widget.options.dataType"
:placeholder=
"widget.options.placeholder"
:placeholder=
"widget.options.placeholder"
...
...
src/components/VueFormMaking/components/WidgetConfig.vue
View file @
3e1b5e3b
...
@@ -396,7 +396,6 @@
...
@@ -396,7 +396,6 @@
<el-checkbox
v-if=
"Object.keys(data.options).indexOf('arrowControl')>=0"
v-model=
"data.options.arrowControl"
>
{{
$t
(
'fm.config.widget.arrowControl'
)
}}
</el-checkbox>
<el-checkbox
v-if=
"Object.keys(data.options).indexOf('arrowControl')>=0"
v-model=
"data.options.arrowControl"
>
{{
$t
(
'fm.config.widget.arrowControl'
)
}}
</el-checkbox>
<el-checkbox
v-if=
"Object.keys(data.options).indexOf('isDelete')>=0"
v-model=
"data.options.isDelete"
>
{{
$t
(
'fm.config.widget.isDelete'
)
}}
</el-checkbox>
<el-checkbox
v-if=
"Object.keys(data.options).indexOf('isDelete')>=0"
v-model=
"data.options.isDelete"
>
{{
$t
(
'fm.config.widget.isDelete'
)
}}
</el-checkbox>
<el-checkbox
v-if=
"Object.keys(data.options).indexOf('isEdit')>=0"
v-model=
"data.options.isEdit"
>
{{
$t
(
'fm.config.widget.isEdit'
)
}}
</el-checkbox>
<el-checkbox
v-if=
"Object.keys(data.options).indexOf('isEdit')>=0"
v-model=
"data.options.isEdit"
>
{{
$t
(
'fm.config.widget.isEdit'
)
}}
</el-checkbox>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('fm.config.widget.validate')"
>
<el-form-item
:label=
"$t('fm.config.widget.validate')"
>
<div
v-if=
"Object.keys(data.options).indexOf('required')>=0"
>
<div
v-if=
"Object.keys(data.options).indexOf('required')>=0"
>
...
...
src/views/process/list/create.vue
View file @
3e1b5e3b
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
:data=
"tplItem.form_structure"
:data=
"tplItem.form_structure"
:disabled=
"currentNode.readonlyTpls===undefined ||
:disabled=
"currentNode.readonlyTpls===undefined ||
currentNode.readonlyTpls===null ||
currentNode.readonlyTpls===null ||
currentNode.readonlyTpls.indexOf(tplItem.id)===-1?
false
:true"
currentNode.readonlyTpls.indexOf(tplItem.id)===-1?
null
:true"
/>
/>
</
template
>
</
template
>
</div>
</div>
...
...
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