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
544c1088
Commit
544c1088
authored
Jul 17, 2020
by
Mr. Lan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加全局只读。
parent
6bcfa858
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
45 additions
and
39 deletions
+45
-39
src/components/VueFormMaking/App.vue
+2
-7
src/components/VueFormMaking/components/CusDialog.vue
+2
-2
src/components/VueFormMaking/components/FormConfig.vue
+1
-1
src/components/VueFormMaking/components/GenerateForm.vue
+5
-4
src/components/VueFormMaking/components/GenerateFormItem.vue
+9
-3
src/components/VueFormMaking/components/WidgetConfig.vue
+2
-2
src/components/VueFormMaking/components/WidgetForm.vue
+6
-4
src/components/VueFormMaking/components/WidgetFormItem.vue
+2
-2
src/components/VueFormMaking/demo/Home.vue
+3
-2
src/components/VueFormMaking/indexBundle.js
+0
-1
src/components/VueFormMaking/router/LanguageView.vue
+6
-6
src/components/VueFormMaking/router/index.js
+1
-1
src/views/process/list/handle.vue
+6
-4
No files found.
src/components/VueFormMaking/App.vue
View file @
544c1088
...
@@ -33,9 +33,8 @@
...
@@ -33,9 +33,8 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
Vue
from
'vue'
export
default
{
export
default
{
name
:
'App'
,
name
:
'App'
,
methods
:
{
methods
:
{
handleHome
()
{
handleHome
()
{
...
@@ -46,7 +45,7 @@
...
@@ -46,7 +45,7 @@
this
.
$router
.
replace
({
name
:
this
.
$route
.
name
,
params
:
{
lang
:
command
}})
this
.
$router
.
replace
({
name
:
this
.
$route
.
name
,
params
:
{
lang
:
command
}})
}
}
}
}
}
}
</
script
>
</
script
>
<
style
lang=
"scss"
>
<
style
lang=
"scss"
>
...
@@ -96,10 +95,6 @@
...
@@ -96,10 +95,6 @@
.action-item
{
.action-item
{
display
:
inline-block
;
display
:
inline-block
;
margin-left
:
15px
;
margin-left
:
15px
;
.el-dropdown{
//
font-size
:
16px
;
//
font-weight
:
500
;
}
.el-dropdown-link{
.el-dropdown-link{
cursor
:
pointer
;
cursor
:
pointer
;
color
:
#fff
;
color
:
#fff
;
...
...
src/components/VueFormMaking/components/CusDialog.vue
View file @
544c1088
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
</
template
>
</
template
>
<
script
>
<
script
>
export
default
{
export
default
{
props
:
{
props
:
{
visible
:
Boolean
,
visible
:
Boolean
,
loadingText
:
{
loadingText
:
{
...
@@ -102,7 +102,7 @@
...
@@ -102,7 +102,7 @@
this
.
loading
=
false
this
.
loading
=
false
}
}
}
}
}
}
</
script
>
</
script
>
<
style
lang=
"scss"
>
<
style
lang=
"scss"
>
...
...
src/components/VueFormMaking/components/FormConfig.vue
View file @
544c1088
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
</
template
>
</
template
>
<
script
>
<
script
>
export
default
{
export
default
{
/* eslint-disable */
/* eslint-disable */
props
:
[
'data'
]
props
:
[
'data'
]
}
}
...
...
src/components/VueFormMaking/components/GenerateForm.vue
View file @
544c1088
...
@@ -32,8 +32,8 @@
...
@@ -32,8 +32,8 @@
:remote=
"remote"
:remote=
"remote"
:rules=
"rules"
:rules=
"rules"
:widget=
"citem"
:widget=
"citem"
@
input-change=
"onInputChange"
:data=
"data"
:data=
"data"
@
input-change=
"onInputChange"
/>
/>
</
template
>
</
template
>
</el-col>
</el-col>
...
@@ -54,6 +54,7 @@
...
@@ -54,6 +54,7 @@
:widget=
"item"
:widget=
"item"
:remote=
"remote"
:remote=
"remote"
:data=
"data"
:data=
"data"
:disabled=
"disabled"
@
input-change=
"onInputChange"
@
input-change=
"onInputChange"
/>
/>
</
template
>
</
template
>
...
@@ -64,15 +65,15 @@
...
@@ -64,15 +65,15 @@
</template>
</template>
<
script
>
<
script
>
import
GenetateFormItem
from
'./GenerateFormItem'
import
GenetateFormItem
from
'./GenerateFormItem'
export
default
{
export
default
{
name
:
'FmGenerateForm'
,
name
:
'FmGenerateForm'
,
components
:
{
components
:
{
GenetateFormItem
GenetateFormItem
},
},
/* eslint-disable */
/* eslint-disable */
props
:
[
'data'
,
'remote'
,
'value'
,
'insite'
],
props
:
[
'data'
,
'remote'
,
'value'
,
'insite'
,
'disabled'
],
data
()
{
data
()
{
return
{
return
{
models
:
{},
models
:
{},
...
...
src/components/VueFormMaking/components/GenerateFormItem.vue
View file @
544c1088
...
@@ -238,14 +238,14 @@
...
@@ -238,14 +238,14 @@
</template>
</template>
<
script
>
<
script
>
import
FmUpload
from
'./Upload'
import
FmUpload
from
'./Upload'
export
default
{
export
default
{
components
:
{
components
:
{
FmUpload
FmUpload
},
},
/* eslint-disable */
/* eslint-disable */
props
:
[
'widget'
,
'models'
,
'rules'
,
'remote'
,
'data'
],
props
:
[
'widget'
,
'models'
,
'rules'
,
'remote'
,
'data'
,
'disabled'
],
data
()
{
data
()
{
return
{
return
{
dataModel
:
this
.
models
[
this
.
widget
.
model
]
dataModel
:
this
.
models
[
this
.
widget
.
model
]
...
@@ -288,6 +288,12 @@
...
@@ -288,6 +288,12 @@
this
.
widget
.
options
.
token
=
data
this
.
widget
.
options
.
token
=
data
})
})
}
}
if
(
this
.
disabled
===
undefined
||
this
.
disabled
===
null
)
{
this
.
widget
.
options
.
disabled
=
false
}
else
{
this
.
widget
.
options
.
disabled
=
this
.
disabled
}
},
},
methods
:
{
methods
:
{
}
}
...
...
src/components/VueFormMaking/components/WidgetConfig.vue
View file @
544c1088
...
@@ -389,9 +389,9 @@
...
@@ -389,9 +389,9 @@
</template>
</template>
<
script
>
<
script
>
import
Draggable
from
'vuedraggable'
import
Draggable
from
'vuedraggable'
export
default
{
export
default
{
components
:
{
components
:
{
Draggable
Draggable
},
},
...
...
src/components/VueFormMaking/components/WidgetForm.vue
View file @
544c1088
...
@@ -35,8 +35,8 @@
...
@@ -35,8 +35,8 @@
@add="handleWidgetColAdd($event, element, colIndex)"
@add="handleWidgetColAdd($event, element, colIndex)"
>
>
<transition-group
name=
"fade"
tag=
"div"
class=
"widget-col-list"
>
<transition-group
name=
"fade"
tag=
"div"
class=
"widget-col-list"
>
<template
v-for=
"(el, i) in col.list"
>
<widget-form-item
<widget-form-item
v-for=
"(el, i) in col.list"
v-if=
"el.key"
v-if=
"el.key"
:key=
"el.key"
:key=
"el.key"
:element=
"el"
:element=
"el"
...
@@ -45,6 +45,8 @@
...
@@ -45,6 +45,8 @@
:data=
"col"
:data=
"col"
:data-config=
"data"
:data-config=
"data"
/>
/>
</
template
>
</transition-group>
</transition-group>
</draggable>
</draggable>
...
@@ -78,10 +80,10 @@
...
@@ -78,10 +80,10 @@
</template>
</template>
<
script
>
<
script
>
import
Draggable
from
'vuedraggable'
import
Draggable
from
'vuedraggable'
import
WidgetFormItem
from
'./WidgetFormItem'
import
WidgetFormItem
from
'./WidgetFormItem'
export
default
{
export
default
{
components
:
{
components
:
{
Draggable
,
Draggable
,
WidgetFormItem
WidgetFormItem
...
...
src/components/VueFormMaking/components/WidgetFormItem.vue
View file @
544c1088
...
@@ -230,8 +230,8 @@
...
@@ -230,8 +230,8 @@
</template>
</template>
<
script
>
<
script
>
import
FmUpload
from
'./Upload'
import
FmUpload
from
'./Upload'
export
default
{
export
default
{
components
:
{
components
:
{
FmUpload
FmUpload
},
},
...
...
src/components/VueFormMaking/demo/Home.vue
View file @
544c1088
...
@@ -5,8 +5,9 @@
...
@@ -5,8 +5,9 @@
</
template
>
</
template
>
<
script
>
<
script
>
export
default
{
export
default
{
mounted
()
{
mounted
()
{
}
}
}
}
</
script
>
</
script
>
src/components/VueFormMaking/indexBundle.js
View file @
544c1088
import
Vue
from
'vue'
import
GenerateForm
from
'./components/GenerateForm.vue'
import
GenerateForm
from
'./components/GenerateForm.vue'
import
'./styles/cover.scss'
import
'./styles/cover.scss'
...
...
src/components/VueFormMaking/router/LanguageView.vue
View file @
544c1088
...
@@ -3,9 +3,9 @@
...
@@ -3,9 +3,9 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
Vue
from
'vue'
import
Vue
from
'vue'
export
default
{
export
default
{
watch
:
{
watch
:
{
'$route.params.lang'
:
function
(
val
)
{
'$route.params.lang'
:
function
(
val
)
{
this
.
loadLanguage
()
this
.
loadLanguage
()
...
@@ -16,16 +16,16 @@
...
@@ -16,16 +16,16 @@
},
},
methods
:
{
methods
:
{
loadLanguage
()
{
loadLanguage
()
{
if
(
this
.
$route
.
params
.
lang
==
'zh-CN'
)
{
if
(
this
.
$route
.
params
.
lang
=
==
'zh-CN'
)
{
Vue
.
config
.
lang
=
'zh-CN'
Vue
.
config
.
lang
=
'zh-CN'
localStorage
.
setItem
(
'language'
,
'zh-CN'
)
localStorage
.
setItem
(
'language'
,
'zh-CN'
)
}
else
if
(
this
.
$route
.
params
.
lang
==
'en-US'
)
{
}
else
if
(
this
.
$route
.
params
.
lang
=
==
'en-US'
)
{
Vue
.
config
.
lang
=
'en-US'
Vue
.
config
.
lang
=
'en-US'
localStorage
.
setItem
(
'language'
,
'en-US'
)
localStorage
.
setItem
(
'language'
,
'en-US'
)
}
else
{
}
else
{
this
.
$router
.
replace
({
name
:
this
.
$route
.
name
,
params
:
{
lang
:
navigator
.
language
==
'zh-CN'
?
'zh-CN'
:
'en-US'
}})
this
.
$router
.
replace
({
name
:
this
.
$route
.
name
,
params
:
{
lang
:
navigator
.
language
===
'zh-CN'
?
'zh-CN'
:
'en-US'
}})
}
}
}
}
}
}
}
}
</
script
>
</
script
>
src/components/VueFormMaking/router/index.js
View file @
544c1088
...
@@ -6,7 +6,7 @@ import LanguageView from './LanguageView.vue'
...
@@ -6,7 +6,7 @@ import LanguageView from './LanguageView.vue'
Vue
.
use
(
Router
)
Vue
.
use
(
Router
)
const
language
=
localStorage
.
getItem
(
'language'
)
||
(
navigator
.
language
==
'zh-CN'
?
'zh-CN'
:
'en-US'
)
const
language
=
localStorage
.
getItem
(
'language'
)
||
(
navigator
.
language
==
=
'zh-CN'
?
'zh-CN'
:
'en-US'
)
export
default
new
Router
({
export
default
new
Router
({
routes
:
[
routes
:
[
...
...
src/views/process/list/handle.vue
View file @
544c1088
...
@@ -50,10 +50,11 @@
...
@@ -50,10 +50,11 @@
:remote=
"remoteFunc"
:remote=
"remoteFunc"
:value=
"tplItem.form_data"
:value=
"tplItem.form_data"
:data=
"tplItem.form_structure"
:data=
"tplItem.form_structure"
:disabled=
"true"
/>
/>
</div>
</div>
<div
v-if=
"processStructureValue.userAuthority"
>
<div
v-if=
"processStructureValue.userAuthority"
>
<
!-- <hr style="background-color: #d9d9d9; border:0; height:1px;"> --
>
<
hr
style=
"background-color: #d9d9d9; border:0; height:1px;"
>
<div
class=
"text item"
style=
"text-align: center;margin-top:18px"
>
<div
class=
"text item"
style=
"text-align: center;margin-top:18px"
>
<
template
v-for=
"(item, index) in processStructureValue.edges"
>
<
template
v-for=
"(item, index) in processStructureValue.edges"
>
<el-button
<el-button
...
@@ -169,10 +170,11 @@ export default {
...
@@ -169,10 +170,11 @@ export default {
// 获取当前展示节点列表
// 获取当前展示节点列表
for
(
var
i
=
0
;
i
<
this
.
processStructureValue
.
nodes
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
this
.
processStructureValue
.
nodes
.
length
;
i
++
)
{
if
(
this
.
processStructureValue
.
nodes
[
i
].
id
===
this
.
processStructureValue
.
workOrder
.
current_state
)
{
if
(
this
.
processStructureValue
.
nodes
[
i
].
id
===
this
.
processStructureValue
.
workOrder
.
current_state
)
{
// 当前节点
this
.
nodeStepList
.
push
(
this
.
processStructureValue
.
nodes
[
i
])
this
.
nodeStepList
.
push
(
this
.
processStructureValue
.
nodes
[
i
])
this
.
activeIndex
=
this
.
nodeStepList
.
length
-
1
this
.
activeIndex
=
this
.
nodeStepList
.
length
-
1
if
(
i
===
this
.
processStructureValue
.
nodes
.
length
-
2
)
{
if
(
i
+
1
===
this
.
processStructureValue
.
nodes
.
length
)
{
this
.
activeIndex
=
i
+
1
this
.
activeIndex
=
this
.
nodeStepList
.
length
}
}
}
else
if
(
!
this
.
processStructureValue
.
nodes
[
i
].
isHideNode
)
{
}
else
if
(
!
this
.
processStructureValue
.
nodes
[
i
].
isHideNode
)
{
// 非隐藏节点
// 非隐藏节点
...
@@ -191,7 +193,7 @@ export default {
...
@@ -191,7 +193,7 @@ export default {
flow_properties
:
item
.
flowProperties
===
undefined
?
2
:
parseInt
(
item
.
flowProperties
),
flow_properties
:
item
.
flowProperties
===
undefined
?
2
:
parseInt
(
item
.
flowProperties
),
work_order_id
:
parseInt
(
this
.
$route
.
query
.
workOrderId
)
work_order_id
:
parseInt
(
this
.
$route
.
query
.
workOrderId
)
}).
then
(
response
=>
{
}).
then
(
response
=>
{
if
(
response
.
code
===
1000
00
)
{
if
(
response
.
code
===
2
00
)
{
// this.$router.push({ name: 'upcoming' })
// this.$router.push({ name: 'upcoming' })
window
.
location
.
reload
()
window
.
location
.
reload
()
}
}
...
...
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