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
8e8475ff
authored
Jan 24, 2025
by
YunaiV
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【代码评审】Bpm:更多设置-摘要设置
parent
ab83cee5
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
src/components/SimpleProcessDesignerV2/src/node.ts
+5
-4
src/components/SimpleProcessDesignerV2/src/nodes/DelayTimerNode.vue
+0
-1
src/views/bpm/task/copy/index.vue
+1
-0
No files found.
src/components/SimpleProcessDesignerV2/src/node.ts
View file @
8e8475ff
...
@@ -16,7 +16,8 @@ import {
...
@@ -16,7 +16,8 @@ import {
FieldPermissionType
,
FieldPermissionType
,
ListenerParam
ListenerParam
}
from
'./consts'
}
from
'./consts'
import
{
parseFormFields
}
from
'@/components/FormCreate/src/utils/index'
import
{
parseFormFields
}
from
'@/components/FormCreate/src/utils'
export
function
useWatchNode
(
props
:
{
flowNode
:
SimpleFlowNode
}):
Ref
<
SimpleFlowNode
>
{
export
function
useWatchNode
(
props
:
{
flowNode
:
SimpleFlowNode
}):
Ref
<
SimpleFlowNode
>
{
const
node
=
ref
<
SimpleFlowNode
>
(
props
.
flowNode
)
const
node
=
ref
<
SimpleFlowNode
>
(
props
.
flowNode
)
watch
(
watch
(
...
@@ -46,7 +47,7 @@ export function useFormFieldsPermission(defaultPermission: FieldPermissionType)
...
@@ -46,7 +47,7 @@ export function useFormFieldsPermission(defaultPermission: FieldPermissionType)
// 字段权限配置. 需要有 field, title, permissioin 属性
// 字段权限配置. 需要有 field, title, permissioin 属性
const
fieldsPermissionConfig
=
ref
<
Array
<
Record
<
string
,
any
>>>
([])
const
fieldsPermissionConfig
=
ref
<
Array
<
Record
<
string
,
any
>>>
([])
const
formType
=
inject
<
Ref
<
number
|
undefined
>>
(
'formType'
,
ref
())
// 表单类型
const
formType
=
inject
<
Ref
<
number
|
undefined
>>
(
'formType'
,
ref
())
// 表单类型
const
formFields
=
inject
<
Ref
<
string
[]
>>
(
'formFields'
,
ref
([]))
// 流程表单字段
const
formFields
=
inject
<
Ref
<
string
[]
>>
(
'formFields'
,
ref
([]))
// 流程表单字段
...
@@ -108,7 +109,7 @@ export function useFormFieldsPermission(defaultPermission: FieldPermissionType)
...
@@ -108,7 +109,7 @@ export function useFormFieldsPermission(defaultPermission: FieldPermissionType)
* @description 获取表单的字段
* @description 获取表单的字段
*/
*/
export
function
useFormFields
()
{
export
function
useFormFields
()
{
const
formFields
=
inject
<
Ref
<
string
[]
>>
(
'formFields'
,
ref
([]))
// 流程表单字段
const
formFields
=
inject
<
Ref
<
string
[]
>>
(
'formFields'
,
ref
([]))
// 流程表单字段
return
parseFormCreateFields
(
unref
(
formFields
))
return
parseFormCreateFields
(
unref
(
formFields
))
}
}
...
@@ -172,7 +173,7 @@ export function useNodeForm(nodeType: NodeType) {
...
@@ -172,7 +173,7 @@ export function useNodeForm(nodeType: NodeType) {
const
postOptions
=
inject
<
Ref
<
PostApi
.
PostVO
[]
>>
(
'postList'
,
ref
([]))
// 岗位列表
const
postOptions
=
inject
<
Ref
<
PostApi
.
PostVO
[]
>>
(
'postList'
,
ref
([]))
// 岗位列表
const
userOptions
=
inject
<
Ref
<
UserApi
.
UserVO
[]
>>
(
'userList'
,
ref
([]))
// 用户列表
const
userOptions
=
inject
<
Ref
<
UserApi
.
UserVO
[]
>>
(
'userList'
,
ref
([]))
// 用户列表
const
deptOptions
=
inject
<
Ref
<
DeptApi
.
DeptVO
[]
>>
(
'deptList'
,
ref
([]))
// 部门列表
const
deptOptions
=
inject
<
Ref
<
DeptApi
.
DeptVO
[]
>>
(
'deptList'
,
ref
([]))
// 部门列表
const
userGroupOptions
=
inject
<
Ref
<
UserGroupApi
.
UserGroupVO
[]
>>
(
'userGroupList'
,
ref
([]))
// 用户组列表
const
userGroupOptions
=
inject
<
Ref
<
UserGroupApi
.
UserGroupVO
[]
>>
(
'userGroupList'
,
ref
([]))
// 用户组列表
const
deptTreeOptions
=
inject
(
'deptTree'
,
ref
())
// 部门树
const
deptTreeOptions
=
inject
(
'deptTree'
,
ref
())
// 部门树
const
formFields
=
inject
<
Ref
<
string
[]
>>
(
'formFields'
,
ref
([]))
// 流程表单字段
const
formFields
=
inject
<
Ref
<
string
[]
>>
(
'formFields'
,
ref
([]))
// 流程表单字段
const
configForm
=
ref
<
UserTaskFormType
|
CopyTaskFormType
>
()
const
configForm
=
ref
<
UserTaskFormType
|
CopyTaskFormType
>
()
...
...
src/components/SimpleProcessDesignerV2/src/nodes/DelayTimerNode.vue
View file @
8e8475ff
...
@@ -9,7 +9,6 @@
...
@@ -9,7 +9,6 @@
]"
]"
>
>
<div
class=
"node-title-container"
>
<div
class=
"node-title-container"
>
<!-- TODO @芋艿 需要更换图标 -->
<div
class=
"node-title-icon delay-node"
><span
class=
"iconfont icon-delay"
></span></div>
<div
class=
"node-title-icon delay-node"
><span
class=
"iconfont icon-delay"
></span></div>
<input
<input
v-if=
"!readonly && showInput"
v-if=
"!readonly && showInput"
...
...
src/views/bpm/task/copy/index.vue
View file @
8e8475ff
...
@@ -44,6 +44,7 @@
...
@@ -44,6 +44,7 @@
<!-- 列表 -->
<!-- 列表 -->
<ContentWrap>
<ContentWrap>
<el-table
v-loading=
"loading"
:data=
"list"
>
<el-table
v-loading=
"loading"
:data=
"list"
>
<!-- TODO 芋艿:增加摘要 -->
<el-table-column
align=
"center"
label=
"流程名"
prop=
"processInstanceName"
min-width=
"180"
/>
<el-table-column
align=
"center"
label=
"流程名"
prop=
"processInstanceName"
min-width=
"180"
/>
<el-table-column
<el-table-column
align=
"center"
align=
"center"
...
...
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