Skip to content

phsl / admin

Go to a project
Commit 8f7a75bf by GoldenZqqq
Options

Merge branch 'feature/bpm' of https://github.com/GoldenZqqq/yudao-ui-admin-vue3 into feature/bpm

parents 29a0c691 24e13749
Showing with 450 additions and 173 deletions
package.json
...@@ -144,6 +144,7 @@ ...@@ -144,6 +144,7 @@
"url": "https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues" "url": "https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues"
}, },
"homepage": "https://gitee.com/yudaocode/yudao-ui-admin-vue3", "homepage": "https://gitee.com/yudaocode/yudao-ui-admin-vue3",
"web-types": "./web-types.json",
"engines": { "engines": {
"node": ">= 16.0.0", "node": ">= 16.0.0",
"pnpm": ">=8.6.0" "pnpm": ">=8.6.0"
......
src/api/login/oauth2/index.ts
...@@ -27,7 +27,7 @@ export const authorize = ( ...@@ -27,7 +27,7 @@ export const authorize = (
return request.post({ return request.post({
url: '/system/oauth2/authorize', url: '/system/oauth2/authorize',
headers: { headers: {
'Content-type': 'application/x-www-form-urlencoded' 'Content-Type': 'application/x-www-form-urlencoded'
}, },
params: { params: {
response_type: responseType, response_type: responseType,
......
src/components/FormCreate/src/components/useApiSelect.tsx
...@@ -185,7 +185,6 @@ export const useApiSelect = (option: ApiSelectProps) => { ...@@ -185,7 +185,6 @@ export const useApiSelect = (option: ApiSelectProps) => {
</el-select> </el-select>
) )
} }
debugger
return ( return (
<el-select <el-select
class="w-1/1" class="w-1/1"
......
src/components/SimpleProcessDesignerV2/src/consts.ts
...@@ -79,7 +79,7 @@ export interface SimpleFlowNode { ...@@ -79,7 +79,7 @@ export interface SimpleFlowNode {
// 审批按钮设置 // 审批按钮设置
buttonsSetting?: any[] buttonsSetting?: any[]
// 表单权限 // 表单权限
fieldsPermission?: Array<Record<string, string>> fieldsPermission?: Array<Record<string, any>>
// 审批任务超时处理 // 审批任务超时处理
timeoutHandler?: TimeoutHandler timeoutHandler?: TimeoutHandler
// 审批任务拒绝处理 // 审批任务拒绝处理
...@@ -97,7 +97,7 @@ export interface SimpleFlowNode { ...@@ -97,7 +97,7 @@ export interface SimpleFlowNode {
// 是否默认的条件 // 是否默认的条件
defaultFlow?: boolean defaultFlow?: boolean
// 活动的状态，用于前端节点状态展示 // 活动的状态，用于前端节点状态展示
activityStatus? : TaskStatusEnum activityStatus?: TaskStatusEnum
} }
// 候选人策略枚举 （ 用于审批节点。抄送节点 ) // 候选人策略枚举 （ 用于审批节点。抄送节点 )
export enum CandidateStrategy { export enum CandidateStrategy {
...@@ -146,6 +146,14 @@ export enum CandidateStrategy { ...@@ -146,6 +146,14 @@ export enum CandidateStrategy {
*/ */
USER_GROUP = 40, USER_GROUP = 40,
/** /**
* 表单内用户字段
*/
FORM_USER = 50,
/**
* 表单内部门负责人
*/
FORM_DEPT_LEADER = 51,
/**
* 流程表达式 * 流程表达式
*/ */
EXPRESSION = 60 EXPRESSION = 60
...@@ -424,6 +432,8 @@ export const CANDIDATE_STRATEGY: DictDataVO[] = [ ...@@ -424,6 +432,8 @@ export const CANDIDATE_STRATEGY: DictDataVO[] = [
{ label: '发起人部门负责人', value: CandidateStrategy.START_USER_DEPT_LEADER }, { label: '发起人部门负责人', value: CandidateStrategy.START_USER_DEPT_LEADER },
{ label: '发起人连续部门负责人', value: CandidateStrategy.START_USER_MULTI_LEVEL_DEPT_LEADER }, { label: '发起人连续部门负责人', value: CandidateStrategy.START_USER_MULTI_LEVEL_DEPT_LEADER },
{ label: '用户组', value: CandidateStrategy.USER_GROUP }, { label: '用户组', value: CandidateStrategy.USER_GROUP },
{ label: '表单内用户字段', value: CandidateStrategy.FORM_USER },
{ label: '表单内部门负责人', value: CandidateStrategy.FORM_DEPT_LEADER },
{ label: '流程表达式', value: CandidateStrategy.EXPRESSION } { label: '流程表达式', value: CandidateStrategy.EXPRESSION }
] ]
// 审批节点 的审批类型 // 审批节点 的审批类型
...@@ -548,3 +558,13 @@ export const MULTI_LEVEL_DEPT: DictDataVO = [ ...@@ -548,3 +558,13 @@ export const MULTI_LEVEL_DEPT: DictDataVO = [
{ label: '第 14 级部门', value: 14 }, { label: '第 14 级部门', value: 14 },
{ label: '第 15 级部门', value: 15 } { label: '第 15 级部门', value: 15 }
] ]
/**
* 流程实例的变量枚举
*/
export enum ProcessVariableEnum {
/**
* 发起用户 ID
*/
START_USER_ID = 'PROCESS_START_USER_ID'
}
src/components/SimpleProcessDesignerV2/src/nodes-config/CopyTaskNodeConfig.vue
...@@ -60,7 +60,8 @@ ...@@ -60,7 +60,8 @@
<el-form-item <el-form-item
v-if=" v-if="
configForm.candidateStrategy == CandidateStrategy.DEPT_MEMBER || configForm.candidateStrategy == CandidateStrategy.DEPT_MEMBER ||
configForm.candidateStrategy == CandidateStrategy.DEPT_LEADER configForm.candidateStrategy == CandidateStrategy.DEPT_LEADER ||
configForm.candidateStrategy == CandidateStrategy.MULTI_LEVEL_DEPT_LEADER
" "
label="指定部门" label="指定部门"
prop="deptIds" prop="deptIds"
...@@ -122,7 +123,55 @@ ...@@ -122,7 +123,55 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item
v-if="configForm.candidateStrategy === CandidateStrategy.FORM_USER"
label="表单内用户字段"
prop="userFieldOnForm"
>
<el-select v-model="configForm.userFieldOnForm" clearable style="width: 100%">
<el-option
v-for="(item, idx) in userFieldOnFormOptions"
:key="idx"
:label="item.title"
:value="item.field"
/>
</el-select>
</el-form-item>
<el-form-item
v-if="configForm.candidateStrategy === CandidateStrategy.FORM_DEPT_LEADER"
label="表单内部门字段"
prop="deptFieldOnForm"
>
<el-select v-model="configForm.deptFieldOnForm" clearable style="width: 100%">
<el-option
v-for="(item, idx) in deptFieldOnFormOptions"
:key="idx"
:label="item.title"
:value="item.field"
/>
</el-select>
</el-form-item>
<el-form-item
v-if="
configForm.candidateStrategy == CandidateStrategy.MULTI_LEVEL_DEPT_LEADER ||
configForm.candidateStrategy == CandidateStrategy.START_USER_DEPT_LEADER ||
configForm.candidateStrategy ==
CandidateStrategy.START_USER_MULTI_LEVEL_DEPT_LEADER ||
configForm.candidateStrategy == CandidateStrategy.FORM_DEPT_LEADER
"
:label="deptLevelLabel!"
prop="deptLevel"
span="24"
>
<el-select v-model="configForm.deptLevel" clearable>
<el-option
v-for="(item, index) in MULTI_LEVEL_DEPT"
:key="index"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item <el-form-item
v-if="configForm.candidateStrategy === CandidateStrategy.EXPRESSION" v-if="configForm.candidateStrategy === CandidateStrategy.EXPRESSION"
label="流程表达式" label="流程表达式"
...@@ -201,7 +250,8 @@ import { ...@@ -201,7 +250,8 @@ import {
CandidateStrategy, CandidateStrategy,
NodeType, NodeType,
CANDIDATE_STRATEGY, CANDIDATE_STRATEGY,
FieldPermissionType FieldPermissionType,
MULTI_LEVEL_DEPT
} from '../consts' } from '../consts'
import { import {
useWatchNode, useWatchNode,
...@@ -221,6 +271,15 @@ const props = defineProps({ ...@@ -221,6 +271,15 @@ const props = defineProps({
required: true required: true
} }
}) })
const deptLevelLabel = computed(() => {
let label = '部门负责人来源'
if (configForm.value.candidateStrategy == CandidateStrategy.MULTI_LEVEL_DEPT_LEADER) {
label = label + '(指定部门向上)'
} else {
label = label + '(发起人部门向上)'
}
return label
})
// 抽屉配置 // 抽屉配置
const { settingVisible, closeDrawer, openDrawer } = useDrawer() const { settingVisible, closeDrawer, openDrawer } = useDrawer()
// 当前节点 // 当前节点
...@@ -230,9 +289,16 @@ const { nodeName, showInput, clickIcon, blurEvent } = useNodeName(NodeType.COPY_ ...@@ -230,9 +289,16 @@ const { nodeName, showInput, clickIcon, blurEvent } = useNodeName(NodeType.COPY_
// 激活的 Tab 标签页 // 激活的 Tab 标签页
const activeTabName = ref('user') const activeTabName = ref('user')
// 表单字段权限配置 // 表单字段权限配置
const { formType, fieldsPermissionConfig, getNodeConfigFormFields } = useFormFieldsPermission( const { formType, fieldsPermissionConfig, formFieldOptions, getNodeConfigFormFields } =
FieldPermissionType.READ useFormFieldsPermission(FieldPermissionType.READ)
) // 表单内用户字段选项, 必须是必填和用户选择器
const userFieldOnFormOptions = computed(() => {
return formFieldOptions.filter((item) => item.required && item.type === 'UserSelect')
})
// 表单内部门字段选项, 必须是必填和部门选择器
const deptFieldOnFormOptions = computed(() => {
return formFieldOptions.filter((item) => item.required && item.type === 'DeptSelect')
})
// 抄送人表单配置 // 抄送人表单配置
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref
// 表单校验规则 // 表单校验规则
...@@ -243,6 +309,8 @@ const formRules = reactive({ ...@@ -243,6 +309,8 @@ const formRules = reactive({
deptIds: [{ required: true, message: '部门不能为空', trigger: 'change' }], deptIds: [{ required: true, message: '部门不能为空', trigger: 'change' }],
userGroups: [{ required: true, message: '用户组不能为空', trigger: 'change' }], userGroups: [{ required: true, message: '用户组不能为空', trigger: 'change' }],
postIds: [{ required: true, message: '岗位不能为空', trigger: 'change' }], postIds: [{ required: true, message: '岗位不能为空', trigger: 'change' }],
userFieldOnForm: [{ required: true, message: '表单内用户字段不能为空', trigger: 'change' }],
deptFieldOnForm: [{ required: true, message: '表单内部门字段不能为空', trigger: 'change' }],
expression: [{ required: true, message: '流程表达式不能为空', trigger: 'blur' }] expression: [{ required: true, message: '流程表达式不能为空', trigger: 'blur' }]
}) })
...@@ -260,9 +328,7 @@ const { ...@@ -260,9 +328,7 @@ const {
const configForm = tempConfigForm as Ref<CopyTaskFormType> const configForm = tempConfigForm as Ref<CopyTaskFormType>
// 抄送人策略， 去掉发起人自选 和 发起人自己 // 抄送人策略， 去掉发起人自选 和 发起人自己
const copyUserStrategies = computed(() => { const copyUserStrategies = computed(() => {
return CANDIDATE_STRATEGY.filter( return CANDIDATE_STRATEGY.filter((item) => item.value !== CandidateStrategy.START_USER)
(item) => item.value !== CandidateStrategy.START_USER
)
}) })
// 改变抄送人设置策略 // 改变抄送人设置策略
const changeCandidateStrategy = () => { const changeCandidateStrategy = () => {
...@@ -272,6 +338,7 @@ const changeCandidateStrategy = () => { ...@@ -272,6 +338,7 @@ const changeCandidateStrategy = () => {
configForm.value.postIds = [] configForm.value.postIds = []
configForm.value.userGroups = [] configForm.value.userGroups = []
configForm.value.deptLevel = 1 configForm.value.deptLevel = 1
configForm.value.userFieldOnForm = ''
} }
// 保存配置 // 保存配置
const saveConfig = async () => { const saveConfig = async () => {
......
src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-if="configForm.candidateStrategy == CandidateStrategy.ROLE" v-if="configForm.candidateStrategy == CandidateStrategy.ROLE"
label="指定角色" label="指定角色"
...@@ -95,25 +94,6 @@ ...@@ -95,25 +94,6 @@
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-if="
configForm.candidateStrategy == CandidateStrategy.MULTI_LEVEL_DEPT_LEADER ||
configForm.candidateStrategy == CandidateStrategy.START_USER_DEPT_LEADER ||
configForm.candidateStrategy == CandidateStrategy.START_USER_MULTI_LEVEL_DEPT_LEADER
"
:label="deptLevelLabel!"
prop="deptLevel"
span="24"
>
<el-select v-model="configForm.deptLevel" clearable>
<el-option
v-for="(item, index) in MULTI_LEVEL_DEPT"
:key="index"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item
v-if="configForm.candidateStrategy == CandidateStrategy.POST" v-if="configForm.candidateStrategy == CandidateStrategy.POST"
label="指定岗位" label="指定岗位"
prop="postIds" prop="postIds"
...@@ -157,6 +137,55 @@ ...@@ -157,6 +137,55 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item
v-if="configForm.candidateStrategy === CandidateStrategy.FORM_USER"
label="表单内用户字段"
prop="userFieldOnForm"
>
<el-select v-model="configForm.userFieldOnForm" clearable style="width: 100%">
<el-option
v-for="(item, idx) in userFieldOnFormOptions"
:key="idx"
:label="item.title"
:value="item.field"
/>
</el-select>
</el-form-item>
<el-form-item
v-if="configForm.candidateStrategy === CandidateStrategy.FORM_DEPT_LEADER"
label="表单内部门字段"
prop="deptFieldOnForm"
>
<el-select v-model="configForm.deptFieldOnForm" clearable style="width: 100%">
<el-option
v-for="(item, idx) in deptFieldOnFormOptions"
:key="idx"
:label="item.title"
:value="item.field"
/>
</el-select>
</el-form-item>
<el-form-item
v-if="
configForm.candidateStrategy == CandidateStrategy.MULTI_LEVEL_DEPT_LEADER ||
configForm.candidateStrategy == CandidateStrategy.START_USER_DEPT_LEADER ||
configForm.candidateStrategy ==
CandidateStrategy.START_USER_MULTI_LEVEL_DEPT_LEADER ||
configForm.candidateStrategy == CandidateStrategy.FORM_DEPT_LEADER
"
:label="deptLevelLabel!"
prop="deptLevel"
span="24"
>
<el-select v-model="configForm.deptLevel" clearable>
<el-option
v-for="(item, index) in MULTI_LEVEL_DEPT"
:key="index"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<!-- TODO @jason：后续要支持选择已经存好的表达式 --> <!-- TODO @jason：后续要支持选择已经存好的表达式 -->
<el-form-item <el-form-item
v-if="configForm.candidateStrategy === CandidateStrategy.EXPRESSION" v-if="configForm.candidateStrategy === CandidateStrategy.EXPRESSION"
...@@ -468,6 +497,8 @@ const deptLevelLabel = computed(() => { ...@@ -468,6 +497,8 @@ const deptLevelLabel = computed(() => {
let label = '部门负责人来源' let label = '部门负责人来源'
if (configForm.value.candidateStrategy == CandidateStrategy.MULTI_LEVEL_DEPT_LEADER) { if (configForm.value.candidateStrategy == CandidateStrategy.MULTI_LEVEL_DEPT_LEADER) {
label = label + '(指定部门向上)' label = label + '(指定部门向上)'
} else if (configForm.value.candidateStrategy == CandidateStrategy.FORM_DEPT_LEADER) {
label = label + '(表单内部门向上)'
} else { } else {
label = label + '(发起人部门向上)' label = label + '(发起人部门向上)'
} }
...@@ -482,9 +513,16 @@ const { nodeName, showInput, clickIcon, blurEvent } = useNodeName(NodeType.USER_ ...@@ -482,9 +513,16 @@ const { nodeName, showInput, clickIcon, blurEvent } = useNodeName(NodeType.USER_
// 激活的 Tab 标签页 // 激活的 Tab 标签页
const activeTabName = ref('user') const activeTabName = ref('user')
// 表单字段权限设置 // 表单字段权限设置
const { formType, fieldsPermissionConfig, getNodeConfigFormFields } = useFormFieldsPermission( const { formType, fieldsPermissionConfig, formFieldOptions, getNodeConfigFormFields } =
FieldPermissionType.READ useFormFieldsPermission(FieldPermissionType.READ)
) // 表单内用户字段选项, 必须是必填和用户选择器
const userFieldOnFormOptions = computed(() => {
return formFieldOptions.filter((item) => item.required && item.type === 'UserSelect')
})
// 表单内部门字段选项, 必须是必填和部门选择器
const deptFieldOnFormOptions = computed(() => {
return formFieldOptions.filter((item) => item.required && item.type === 'DeptSelect')
})
// 操作按钮设置 // 操作按钮设置
const { buttonsSetting, btnDisplayNameEdit, changeBtnDisplayName, btnDisplayNameBlurEvent } = const { buttonsSetting, btnDisplayNameEdit, changeBtnDisplayName, btnDisplayNameBlurEvent } =
useButtonsSetting() useButtonsSetting()
...@@ -498,6 +536,8 @@ const formRules = reactive({ ...@@ -498,6 +536,8 @@ const formRules = reactive({
roleIds: [{ required: true, message: '角色不能为空', trigger: 'change' }], roleIds: [{ required: true, message: '角色不能为空', trigger: 'change' }],
deptIds: [{ required: true, message: '部门不能为空', trigger: 'change' }], deptIds: [{ required: true, message: '部门不能为空', trigger: 'change' }],
userGroups: [{ required: true, message: '用户组不能为空', trigger: 'change' }], userGroups: [{ required: true, message: '用户组不能为空', trigger: 'change' }],
userFieldOnForm: [{ required: true, message: '表单内用户字段不能为空', trigger: 'change' }],
deptFieldOnForm: [{ required: true, message: '表单内部门字段不能为空', trigger: 'change' }],
postIds: [{ required: true, message: '岗位不能为空', trigger: 'change' }], postIds: [{ required: true, message: '岗位不能为空', trigger: 'change' }],
expression: [{ required: true, message: '流程表达式不能为空', trigger: 'blur' }], expression: [{ required: true, message: '流程表达式不能为空', trigger: 'blur' }],
approveMethod: [{ required: true, message: '多人审批方式不能为空', trigger: 'change' }], approveMethod: [{ required: true, message: '多人审批方式不能为空', trigger: 'change' }],
...@@ -533,6 +573,9 @@ const changeCandidateStrategy = () => { ...@@ -533,6 +573,9 @@ const changeCandidateStrategy = () => {
configForm.value.postIds = [] configForm.value.postIds = []
configForm.value.userGroups = [] configForm.value.userGroups = []
configForm.value.deptLevel = 1 configForm.value.deptLevel = 1
// TODO @jason：是不是 userFieldOnForm => formUser；deptFieldOnForm => formDeptLeader；原因是：想通前缀，好管理点
configForm.value.userFieldOnForm = ''
configForm.value.deptFieldOnForm = ''
configForm.value.approveMethod = ApproveMethodType.SEQUENTIAL_APPROVE configForm.value.approveMethod = ApproveMethodType.SEQUENTIAL_APPROVE
} }
......
src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json
...@@ -1211,6 +1211,20 @@ ...@@ -1211,6 +1211,20 @@
"isAttr": true "isAttr": true
} }
] ]
},
{
"name": "AssignStartUserHandlerType",
"superClass": ["Element"],
"meta": {
"allowedIn": ["bpmn:StartEvent", "bpmn:UserTask"]
},
"properties": [
{
"name": "value",
"type": "Integer",
"isBody": true
}
]
} }
], ],
"emumerations": [] "emumerations": []
......
src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue
...@@ -54,6 +54,10 @@ ...@@ -54,6 +54,10 @@
<template #title><Icon icon="ep:promotion" />其他</template> <template #title><Icon icon="ep:promotion" />其他</template>
<element-other-config :id="elementId" /> <element-other-config :id="elementId" />
</el-collapse-item> </el-collapse-item>
<el-collapse-item name="customConfig" v-if="elementType.indexOf('Task') !== -1" key="customConfig">
<template #title><Icon icon="ep:circle-plus-filled" />自定义配置</template>
<element-custom-config :id="elementId" :type="elementType" />
</el-collapse-item>
</el-collapse> </el-collapse>
</div> </div>
</template> </template>
......
src/components/bpmnProcessDesigner/package/penal/custom-config/ElementCustomConfig.vue 0 → 100644
<!-- UserTask 自定义配置：
1. 审批人与提交人为同一人时
-->
<template>
<div class="panel-tab__content">
<el-divider content-position="left">审批人与提交人为同一人时</el-divider>
<el-radio-group v-model="assignStartUserHandlerType" @change="updateAssignStartUserHandlerType">
<div class="flex-col">
<div v-for="(item, index) in ASSIGN_START_USER_HANDLER_TYPES" :key="index">
<el-radio :key="item.value" :value="item.value" :label="item.label" />
</div>
</div>
</el-radio-group>
</div>
</template>
<script lang="ts" setup>
import { ASSIGN_START_USER_HANDLER_TYPES } from '@/components/SimpleProcessDesignerV2/src/consts'
defineOptions({ name: 'ElementCustomConfig' })
const props = defineProps({
id: String,
type: String
})
const prefix = inject('prefix')
const elExtensionElements = ref()
const assignStartUserHandlerTypeEl = ref()
const assignStartUserHandlerType = ref()
const otherExtensions = ref()
const bpmnElement = ref()
const bpmnInstances = () => (window as any)?.bpmnInstances
const resetAttributesList = () => {
bpmnElement.value = bpmnInstances().bpmnElement
// 获取元素扩展属性 或者 创建扩展属性
elExtensionElements.value =
bpmnElement.value.businessObject?.extensionElements ??
bpmnInstances().moddle.create('bpmn:ExtensionElements', { values: [] })
assignStartUserHandlerTypeEl.value =
elExtensionElements.value.values?.filter(
(ex) => ex.$type === `${prefix}:AssignStartUserHandlerType`
)?.[0] || bpmnInstances().moddle.create(`${prefix}:AssignStartUserHandlerType`, { value: 1 })
assignStartUserHandlerType.value = assignStartUserHandlerTypeEl.value.value
// 保留剩余扩展元素，便于后面更新该元素对应属性
otherExtensions.value =
elExtensionElements.value.values?.filter(
(ex) => ex.$type !== `${prefix}:AssignStartUserHandlerType`
) ?? []
// 更新元素扩展属性，避免后续报错
updateElementExtensions()
}
const updateAssignStartUserHandlerType = () => {
assignStartUserHandlerTypeEl.value.value = assignStartUserHandlerType.value
updateElementExtensions()
}
const updateElementExtensions = () => {
const extensions = bpmnInstances().moddle.create('bpmn:ExtensionElements', {
values: otherExtensions.value.concat([assignStartUserHandlerTypeEl.value])
})
bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
extensionElements: extensions
})
}
watch(
() => props.id,
(val) => {
val &&
val.length &&
nextTick(() => {
resetAttributesList()
})
},
{ immediate: true }
)
</script>
src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue
...@@ -268,9 +268,9 @@ const bpmnInstances = () => (window as any)?.bpmnInstances ...@@ -268,9 +268,9 @@ const bpmnInstances = () => (window as any)?.bpmnInstances
const resetFormList = () => { const resetFormList = () => {
bpmnELement.value = bpmnInstances().bpmnElement bpmnELement.value = bpmnInstances().bpmnElement
formKey.value = bpmnELement.value.businessObject.formKey formKey.value = bpmnELement.value.businessObject.formKey
if (formKey.value?.length > 0) { // if (formKey.value?.length > 0) {
formKey.value = parseInt(formKey.value) // formKey.value = parseInt(formKey.value)
} // }
// 获取元素扩展属性 或者 创建扩展属性 // 获取元素扩展属性 或者 创建扩展属性
elExtensionElements.value = elExtensionElements.value =
bpmnELement.value.businessObject.get('extensionElements') || bpmnELement.value.businessObject.get('extensionElements') ||
......
src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue
...@@ -80,7 +80,7 @@ const resetAttributesList = () => { ...@@ -80,7 +80,7 @@ const resetAttributesList = () => {
otherExtensionList.value = [] // 其他扩展配置 otherExtensionList.value = [] // 其他扩展配置
bpmnElementProperties.value = bpmnElementProperties.value =
// bpmnElement.value.businessObject?.extensionElements?.filter((ex) => { // bpmnElement.value.businessObject?.extensionElements?.filter((ex) => {
bpmnElement.value.businessObject?.extensionElements?.values.filter((ex) => { bpmnElement.value.businessObject?.extensionElements?.values?.filter((ex) => {
if (ex.$type !== `${prefix}:Properties`) { if (ex.$type !== `${prefix}:Properties`) {
otherExtensionList.value.push(ex) otherExtensionList.value.push(ex)
} }
......
src/config/axios/index.ts
...@@ -5,16 +5,12 @@ import { config } from './config' ...@@ -5,16 +5,12 @@ import { config } from './config'
const { default_headers } = config const { default_headers } = config
const request = (option: any) => { const request = (option: any) => {
const { url, method, params, data, headersType, responseType, ...config } = option const { headersType, headers, ...otherOption } = option
return service({ return service({
url: url, ...otherOption,
method,
params,
data,
...config,
responseType: responseType,
headers: { headers: {
'Content-Type': headersType || default_headers 'Content-Type': headersType || default_headers,
...headers
} }
}) })
} }
......
src/config/axios/service.ts
import axios, { import axios, { AxiosError, AxiosInstance, AxiosResponse, InternalAxiosRequestConfig } from 'axios'
AxiosError,
AxiosInstance,
AxiosRequestHeaders,
AxiosResponse,
InternalAxiosRequestConfig
} from 'axios'
import { ElMessage, ElMessageBox, ElNotification } from 'element-plus' import { ElMessage, ElMessageBox, ElNotification } from 'element-plus'
import qs from 'qs' import qs from 'qs'
...@@ -37,7 +31,11 @@ const whiteList: string[] = ['/login', '/refresh-token'] ...@@ -37,7 +31,11 @@ const whiteList: string[] = ['/login', '/refresh-token']
const service: AxiosInstance = axios.create({ const service: AxiosInstance = axios.create({
baseURL: base_url, // api 的 base_url baseURL: base_url, // api 的 base_url
timeout: request_timeout, // 请求超时时间 timeout: request_timeout, // 请求超时时间
withCredentials: false // 禁用 Cookie 等信息 withCredentials: false, // 禁用 Cookie 等信息
// 自定义参数序列化函数
paramsSerializer: (params) => {
return qs.stringify(params, { allowDots: true })
}
}) })
// request拦截器 // request拦截器
...@@ -52,28 +50,26 @@ service.interceptors.request.use( ...@@ -52,28 +50,26 @@ service.interceptors.request.use(
} }
}) })
if (getAccessToken() && !isToken) { if (getAccessToken() && !isToken) {
;(config as Recordable).headers.Authorization = 'Bearer ' + getAccessToken() // 让每个请求携带自定义token config.headers.Authorization = 'Bearer ' + getAccessToken() // 让每个请求携带自定义token
} }
// 设置租户 // 设置租户
if (tenantEnable && tenantEnable === 'true') { if (tenantEnable && tenantEnable === 'true') {
const tenantId = getTenantId() const tenantId = getTenantId()
if (tenantId) (config as Recordable).headers['tenant-id'] = tenantId if (tenantId) config.headers['tenant-id'] = tenantId
} }
const params = config.params || {} const method = config.method?.toUpperCase()
const data = config.data || false // 防止 GET 请求缓存
if ( if (method === 'GET') {
config.method?.toUpperCase() === 'POST' && config.headers['Cache-Control'] = 'no-cache'
(config.headers as AxiosRequestHeaders)['Content-Type'] === config.headers['Pragma'] = 'no-cache'
'application/x-www-form-urlencoded'
) {
config.data = qs.stringify(data)
} }
// get参数编码 // 自定义参数序列化函数
if (config.method?.toUpperCase() === 'GET' && params) { else if (method === 'POST') {
config.params = {} const contentType = config.headers['Content-Type'] || config.headers['content-type']
const paramsStr = qs.stringify(params, { allowDots: true }) if (contentType === 'application/x-www-form-urlencoded') {
if (paramsStr) { if (config.data && typeof config.data !== 'string') {
config.url = config.url + '?' + paramsStr config.data = qs.stringify(config.data)
}
} }
} }
return config return config
......
src/layout/components/Setting/src/Setting.vue
...@@ -297,5 +297,6 @@ $prefix-cls: #{$namespace}-setting; ...@@ -297,5 +297,6 @@ $prefix-cls: #{$namespace}-setting;
.#{$prefix-cls} { .#{$prefix-cls} {
border-radius: 6px 0 0 6px; border-radius: 6px 0 0 6px;
z-index: 1200;/*修正没有z-index会被表格层覆盖,值不要超过4000*/
} }
</style> </style>
src/views/bpm/form/index.vue
...@@ -143,8 +143,9 @@ const openForm = (id?: number) => { ...@@ -143,8 +143,9 @@ const openForm = (id?: number) => {
const toRouter: { name: string; query?: { id: number } } = { const toRouter: { name: string; query?: { id: number } } = {
name: 'BpmFormEditor' name: 'BpmFormEditor'
} }
console.log(typeof id)
// 表单新建的时候id传的是event需要排除 // 表单新建的时候id传的是event需要排除
if (typeof id === 'number') { if (typeof id === 'number' || typeof id === 'string') {
toRouter.query = { toRouter.query = {
id id
} }
......
src/views/bpm/processInstance/create/index.vue
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import * as DefinitionApi from '@/api/bpm/definition' import * as DefinitionApi from '@/api/bpm/definition'
import * as ProcessInstanceApi from '@/api/bpm/processInstance' import * as ProcessInstanceApi from '@/api/bpm/processInstance'
import { CategoryApi } from '@/api/bpm/category' import { CategoryApi, CategoryVO } from '@/api/bpm/category'
import ProcessDefinitionDetail from './ProcessDefinitionDetail.vue' import ProcessDefinitionDetail from './ProcessDefinitionDetail.vue'
import { groupBy } from 'lodash-es' import { groupBy } from 'lodash-es'
...@@ -221,14 +221,14 @@ const handleSelect = async (row, formVariables?) => { ...@@ -221,14 +221,14 @@ const handleSelect = async (row, formVariables?) => {
processDefinitionDetailRef.value?.initProcessInfo(row, formVariables) processDefinitionDetailRef.value?.initProcessInfo(row, formVariables)
} }
/** 处理滚动事件 */ /** 处理滚动事件，和左侧分类联动 */
const handleScroll = (e) => { const handleScroll = (e: any) => {
// 直接使用事件对象获取滚动位置 // 直接使用事件对象获取滚动位置
const scrollTop = e.scrollTop const scrollTop = e.scrollTop
// 获取所有分类区域的位置信息 // 获取所有分类区域的位置信息
const categoryPositions = categoryList.value const categoryPositions = categoryList.value
.map((category) => { .map((category: CategoryVO) => {
const categoryRef = proxy.$refs[`category-${category.code}`] const categoryRef = proxy.$refs[`category-${category.code}`]
if (categoryRef?.[0]) { if (categoryRef?.[0]) {
return { return {
...@@ -254,29 +254,31 @@ const handleScroll = (e) => { ...@@ -254,29 +254,31 @@ const handleScroll = (e) => {
// 更新当前 active 的分类 // 更新当前 active 的分类
if (currentCategory && categoryActive.value.code !== currentCategory.code) { if (currentCategory && categoryActive.value.code !== currentCategory.code) {
categoryActive.value = categoryList.value.find((c) => c.code === currentCategory.code) categoryActive.value = categoryList.value.find(
(c: CategoryVO) => c.code === currentCategory.code
)
} }
} }
/** 初始化 */ /** 过滤出有流程的分类列表。目的：只展示有流程的分类 */
onMounted(() => {
getList()
})
/** 过滤出有流程的分类列表 */
const availableCategories = computed(() => { const availableCategories = computed(() => {
if (!categoryList.value?.length || !processDefinitionGroup.value) { if (!categoryList.value?.length || !processDefinitionGroup.value) {
return [] return []
} }
// 获取所有有流程的分类代码 // 获取所有有流程的分类代码
const availableCategoryCodes = Object.keys(processDefinitionGroup.value) const availableCategoryCodes = Object.keys(processDefinitionGroup.value)
// 过滤出有流程的分类 // 过滤出有流程的分类
return categoryList.value.filter(category => return categoryList.value.filter((category: CategoryVO) =>
availableCategoryCodes.includes(category.code) availableCategoryCodes.includes(category.code)
) )
}) })
/** 初始化 */
onMounted(() => {
getList()
})
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
web-types.json 0 → 100644
{
"$schema": "https://json.schemastore.org/web-types",
"framework": "vue",
"name": "name written in package.json",
"version": "version written in package.json",
"contributions": {
"html": {
"types-syntax": "typescript",
"attributes": [
{
"name": "v-hasPermi"
},
{
"name": "v-hasRole"
}
]
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment