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
2db1f726
authored
Oct 15, 2024
by
GoldenZqqq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 流程模型分类排序按钮显示逻辑完善
parent
57820cb3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
47 additions
and
5 deletions
+47
-5
src/views/bpm/model/CategoryDraggableModel.vue
+9
-1
src/views/bpm/model/index_new.vue
+38
-4
No files found.
src/views/bpm/model/CategoryDraggableModel.vue
View file @
2db1f726
...
@@ -36,6 +36,13 @@
...
@@ -36,6 +36,13 @@
</template>
</template>
<
template
#
title
>
<
template
#
title
>
<div
class=
"flex items-center"
>
<div
class=
"flex items-center"
>
<el-tooltip
content=
"拖动排序"
v-if=
"isCategorySorting"
>
<Icon
:size=
"22"
icon=
"ic:round-drag-indicator"
class=
"ml-10px category-drag-icon cursor-move text-#8a909c"
/>
</el-tooltip>
<h3
class=
"ml-20px mr-8px text-18px"
>
{{
title
}}
</h3>
<h3
class=
"ml-20px mr-8px text-18px"
>
{{
title
}}
</h3>
<div
class=
"color-gray-600 text-16px"
>
(
{{
dataList
?.
length
||
0
}}
)
</div>
<div
class=
"color-gray-600 text-16px"
>
(
{{
dataList
?.
length
||
0
}}
)
</div>
</div>
</div>
...
@@ -228,7 +235,8 @@ const renameVisible = ref(false)
...
@@ -228,7 +235,8 @@ const renameVisible = ref(false)
const
props
=
defineProps
({
const
props
=
defineProps
({
// 分类后的数据
// 分类后的数据
dataList
:
propTypes
.
object
.
def
([]),
dataList
:
propTypes
.
object
.
def
([]),
title
:
propTypes
.
string
.
def
(
''
)
title
:
propTypes
.
string
.
def
(
''
),
isCategorySorting
:
propTypes
.
bool
.
def
(
false
)
})
})
const
emit
=
defineEmits
([
'success'
])
const
emit
=
defineEmits
([
'success'
])
const
appStore
=
useAppStore
()
const
appStore
=
useAppStore
()
...
...
src/views/bpm/model/index_new.vue
View file @
2db1f726
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
<h3
class=
"font-extrabold"
>
流程模型
</h3>
<h3
class=
"font-extrabold"
>
流程模型
</h3>
<!-- 搜索工作栏 -->
<!-- 搜索工作栏 -->
<el-form
<el-form
v-if=
"!isCategorySorting"
class=
"-mb-15px flex"
class=
"-mb-15px flex"
:model=
"queryParams"
:model=
"queryParams"
ref=
"queryFormRef"
ref=
"queryFormRef"
...
@@ -30,17 +31,17 @@
...
@@ -30,17 +31,17 @@
</el-form-item>
</el-form-item>
<el-form-item>
<el-form-item>
<el-dropdown
placement=
"bottom-end"
>
<el-dropdown
@
command=
"(command) => handleCommand(command)"
placement=
"bottom-end"
>
<el-button
class=
"w-30px"
plain
>
<el-button
class=
"w-30px"
plain
>
<Icon
icon=
"ep:setting"
/>
<Icon
icon=
"ep:setting"
/>
</el-button>
</el-button>
<
template
#
dropdown
>
<
template
#
dropdown
>
<el-dropdown-menu>
<el-dropdown-menu>
<el-dropdown-item>
<el-dropdown-item
command=
"handleAddCategory"
>
<Icon
icon=
"ep:circle-plus"
:size=
"13"
class=
"mr-5px"
/>
<Icon
icon=
"ep:circle-plus"
:size=
"13"
class=
"mr-5px"
/>
新建分类
新建分类
</el-dropdown-item>
</el-dropdown-item>
<el-dropdown-item>
<el-dropdown-item
command=
"handleSort"
>
<Icon
icon=
"fa:sort-amount-desc"
:size=
"13"
class=
"mr-5px"
/>
<Icon
icon=
"fa:sort-amount-desc"
:size=
"13"
class=
"mr-5px"
/>
分类排序
分类排序
</el-dropdown-item>
</el-dropdown-item>
...
@@ -49,6 +50,10 @@
...
@@ -49,6 +50,10 @@
</el-dropdown>
</el-dropdown>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<
template
v-else
>
<el-button
type=
"primary"
@
click=
"cancelSort"
>
取 消
</el-button>
<el-button
type=
"primary"
@
click=
"saveSort"
>
保存排序
</el-button>
</
template
>
</div>
</div>
<el-divider
/>
<el-divider
/>
...
@@ -63,6 +68,7 @@
...
@@ -63,6 +68,7 @@
>
>
<CategoryDraggableModel
<CategoryDraggableModel
ref=
"draggableModelRef"
ref=
"draggableModelRef"
:isCategorySorting=
"isCategorySorting"
:dataList=
"list"
:dataList=
"list"
:title=
"title"
:title=
"title"
@
success=
"getList"
@
success=
"getList"
...
@@ -91,6 +97,7 @@ defineOptions({ name: 'BpmModel' })
...
@@ -91,6 +97,7 @@ defineOptions({ name: 'BpmModel' })
const
draggableModelRef
=
ref
()
const
draggableModelRef
=
ref
()
const
loading
=
ref
(
true
)
// 列表的加载中
const
loading
=
ref
(
true
)
// 列表的加载中
const
isCategorySorting
=
ref
(
false
)
// 是否正处于排序状态
const
queryParams
=
reactive
({
const
queryParams
=
reactive
({
pageNo
:
1
,
pageNo
:
1
,
pageSize
:
10
,
pageSize
:
10
,
...
@@ -105,7 +112,7 @@ const categoryGroup = ref<any>({}) // 按照category分组的数据
...
@@ -105,7 +112,7 @@ const categoryGroup = ref<any>({}) // 按照category分组的数据
const
getList
=
async
()
=>
{
const
getList
=
async
()
=>
{
loading
.
value
=
true
loading
.
value
=
true
try
{
try
{
// TODO 芋艿:这里需要一个不分页查全部的流程模型接口
// TODO 芋艿:这里需要一个不分页查全部的流程模型接口
,并且每条数据都应包含categoryId字段,用于重命名/删除分类。
const
data
=
await
ModelApi
.
getModelPage
(
queryParams
)
const
data
=
await
ModelApi
.
getModelPage
(
queryParams
)
data
.
list
=
mockData
data
.
list
=
mockData
categoryGroup
.
value
=
groupBy
(
data
.
list
,
'categoryName'
)
categoryGroup
.
value
=
groupBy
(
data
.
list
,
'categoryName'
)
...
@@ -133,6 +140,33 @@ const formDetailPreview = ref({
...
@@ -133,6 +140,33 @@ const formDetailPreview = ref({
option
:
{}
option
:
{}
})
})
/** 右上角设置按钮 */
const
handleCommand
=
(
command
:
string
)
=>
{
switch
(
command
)
{
case
'handleAddCategory'
:
handleAddCategory
()
break
case
'handleSort'
:
handleSort
()
break
default
:
break
}
}
// 新建分类
const
handleAddCategory
=
()
=>
{}
// 分类排序
const
handleSort
=
()
=>
{
isCategorySorting
.
value
=
true
}
// 取消排序
const
cancelSort
=
()
=>
{
isCategorySorting
.
value
=
false
}
// 保存排序
const
saveSort
=
()
=>
{}
/** 初始化 **/
/** 初始化 **/
onMounted
(
async
()
=>
{
onMounted
(
async
()
=>
{
await
getList
()
await
getList
()
...
...
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