Skip to content

Commit 741ba0b

Browse files
YunaiVYunaiV
committed
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm
# Conflicts: # yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java # yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java
2 parents 5ef8668 + 1851d58 commit 741ba0b

File tree

38 files changed

+152
-123
lines changed

38 files changed

+152
-123
lines changed

‎src/api/mp/user.js renamed to ‎src/api/mp/mpuser.js

File renamed without changes.

‎src/components/DocAlert/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,6 @@ export default {
2828
<style scoped>
2929
.el-alert--success.is-light {
3030
margin-bottom: 10px;
31+
cursor: pointer;
3132
}
3233
</style>

‎src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<el-table-column label="字段类型" prop="type" min-width="80px" :formatter="row => fieldType[row.type] || row.type" show-overflow-tooltip />
2222
<el-table-column label="默认值" prop="defaultValue" min-width="80px" show-overflow-tooltip />
2323
<el-table-column label="操作" width="90px">
24-
<template slot-scope="{ row, $index }">
24+
<template v-slot="{ row, $index }">
2525
<el-button size="mini" type="text" @click="openFieldForm(row, $index)">编辑</el-button>
2626
<el-divider direction="vertical" />
2727
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeField(row, $index)">移除</el-button>
@@ -70,7 +70,7 @@
7070
<el-table-column label="枚举值编号" prop="id" min-width="100px" show-overflow-tooltip />
7171
<el-table-column label="枚举值名称" prop="name" min-width="100px" show-overflow-tooltip />
7272
<el-table-column label="操作" width="90px">
73-
<template slot-scope="{ row, $index }">
73+
<template v-slot="{ row, $index }">
7474
<el-button size="mini" type="text" @click="openFieldOptionForm(row, $index, 'enum')">编辑</el-button>
7575
<el-divider direction="vertical" />
7676
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'enum')">移除</el-button>
@@ -90,7 +90,7 @@
9090
<el-table-column label="约束名称" prop="name" min-width="100px" show-overflow-tooltip />
9191
<el-table-column label="约束配置" prop="config" min-width="100px" show-overflow-tooltip />
9292
<el-table-column label="操作" width="90px">
93-
<template slot-scope="{ row, $index }">
93+
<template v-slot="{ row, $index }">
9494
<el-button size="mini" type="text" @click="openFieldOptionForm(row, $index, 'constraint')">编辑</el-button>
9595
<el-divider direction="vertical" />
9696
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'constraint')">移除</el-button>
@@ -109,7 +109,7 @@
109109
<el-table-column label="属性编号" prop="id" min-width="100px" show-overflow-tooltip />
110110
<el-table-column label="属性值" prop="value" min-width="100px" show-overflow-tooltip />
111111
<el-table-column label="操作" width="90px">
112-
<template slot-scope="{ row, $index }">
112+
<template v-slot="{ row, $index }">
113113
<el-button size="mini" type="text" @click="openFieldOptionForm(row, $index, 'property')">编辑</el-button>
114114
<el-divider direction="vertical" />
115115
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'property')">移除</el-button>

‎src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<el-table-column label="事件类型" min-width="100px" prop="event" />
66
<el-table-column label="监听器类型" min-width="100px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" />
77
<el-table-column label="操作" width="90px">
8-
<template slot-scope="{ row, $index }">
8+
<template v-slot="{ row, $index }">
99
<el-button size="mini" type="text" @click="openListenerForm(row, $index)">编辑</el-button>
1010
<el-divider direction="vertical" />
1111
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button>
@@ -108,7 +108,7 @@
108108
<el-table-column label="字段类型" min-width="80px" show-overflow-tooltip :formatter="row => fieldTypeObject[row.fieldType]" />
109109
<el-table-column label="字段值/表达式" min-width="100px" show-overflow-tooltip :formatter="row => row.string || row.expression" />
110110
<el-table-column label="操作" width="100px">
111-
<template slot-scope="{ row, $index }">
111+
<template v-slot="{ row, $index }">
112112
<el-button size="mini" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button>
113113
<el-divider direction="vertical" />
114114
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button>

‎src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<el-table-column label="事件id" min-width="80px" prop="id" show-overflow-tooltip />
77
<el-table-column label="监听器类型" min-width="80px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" />
88
<el-table-column label="操作" width="90px">
9-
<template slot-scope="{ row, $index }">
9+
<template v-slot="{ row, $index }">
1010
<el-button size="mini" type="text" @click="openListenerForm(row, $index)">编辑</el-button>
1111
<el-divider direction="vertical" />
1212
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button>
@@ -132,7 +132,7 @@
132132
<el-table-column label="字段类型" min-width="80px" show-overflow-tooltip :formatter="row => fieldTypeObject[row.fieldType]" />
133133
<el-table-column label="字段值/表达式" min-width="100px" show-overflow-tooltip :formatter="row => row.string || row.expression" />
134134
<el-table-column label="操作" width="100px">
135-
<template slot-scope="{ row, $index }">
135+
<template v-slot="{ row, $index }">
136136
<el-button size="mini" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button>
137137
<el-divider direction="vertical" />
138138
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button>

‎src/components/bpmnProcessDesigner/package/penal/listeners/template.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export const template = isTaskListener => {
66
<el-table-column label="事件类型" min-width="100px" prop="event" />
77
<el-table-column label="监听器类型" min-width="100px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" />
88
<el-table-column label="操作" width="90px">
9-
<template slot-scope="{ row, $index }">
9+
<template v-slot="{ row, $index }">
1010
<el-button size="mini" type="text" @click="openListenerForm(row, $index)">编辑</el-button>
1111
<el-divider direction="vertical" />
1212
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button>
@@ -124,7 +124,7 @@ export const template = isTaskListener => {
124124
<el-table-column label="字段类型" min-width="80px" show-overflow-tooltip :formatter="row => fieldTypeObject[row.fieldType]" />
125125
<el-table-column label="字段值/表达式" min-width="100px" show-overflow-tooltip :formatter="row => row.string || row.expression" />
126126
<el-table-column label="操作" width="100px">
127-
<template slot-scope="{ row, $index }">
127+
<template v-slot="{ row, $index }">
128128
<el-button size="mini" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button>
129129
<el-divider direction="vertical" />
130130
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button>

‎src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<el-table-column label="属性名" prop="name" min-width="100px" show-overflow-tooltip />
66
<el-table-column label="属性值" prop="value" min-width="100px" show-overflow-tooltip />
77
<el-table-column label="操作" width="90px">
8-
<template slot-scope="{ row, $index }">
8+
<template v-slot="{ row, $index }">
99
<el-button size="mini" type="text" @click="openAttributesForm(row, $index)">编辑</el-button>
1010
<el-divider direction="vertical" />
1111
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeAttributes(row, $index)">移除</el-button>

‎src/layout/components/Message/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<el-table v-loading="loading" :data="list">
1111
<el-table-column width="120" property="templateNickname" label="发送人" />
1212
<el-table-column width="180" property="createTime" label="发送时间">
13-
<template slot-scope="scope">
13+
<template v-slot="scope">
1414
<span>{{ parseTime(scope.row.createTime) }}</span>
1515
</template>
1616
</el-table-column>

‎src/store/modules/permission.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
7373
} else {
7474
route.component = ParentView
7575
}
76+
// 解决只有一个菜单时无法显示目录
77+
route.alwaysShow = true
7678
} else { // 根节点
7779
route.component = loadView(route.component)
7880
}

‎src/utils/request.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,13 @@ service.interceptors.response.use(async res => {
119119
type: 'error'
120120
})
121121
return Promise.reject(new Error(msg))
122+
} else if (code === 501) {
123+
Message({
124+
type: 'error',
125+
duration: 0,
126+
message: msg
127+
})
128+
return Promise.reject(new Error(msg))
122129
} else if (code === 901) {
123130
Message({
124131
type: 'error',

0 commit comments

Comments
 (0)