diff --git a/src/components/SimpleProcessDesigner/src/addNode.vue b/src/components/SimpleProcessDesigner/src/addNode.vue index 4d8053d9..1fe66ab5 100644 --- a/src/components/SimpleProcessDesigner/src/addNode.vue +++ b/src/components/SimpleProcessDesigner/src/addNode.vue @@ -67,10 +67,10 @@ let props = defineProps({ type: Object, default: () => ({}) }, - showAddButton:{ - type:Boolean, - default:true - }, + showAddButton: { + type: Boolean, + default: true + } }) let emits = defineEmits(['update:childNodeP']) let visible = ref(false) @@ -89,7 +89,7 @@ const addType = (type: number) => { approveMethod: undefined, candidateStrategy: undefined, candidateParam: undefined, - fieldsPermission: defaultFieldsPermission, + fieldsPermission: defaultFieldsPermission }, childNode: props.childNodeP } @@ -99,7 +99,7 @@ const addType = (type: number) => { if (type === NodeType.CC_USER_NODE) { const data = { name: '抄送人', - type: 2, + type: 2, // TODO @jason:这个要不要搞成枚举?NodeType 里貌似有枚举 error: true, // 抄送节点配置 attributes: { @@ -161,7 +161,7 @@ const addType = (type: number) => { name: '并行分支_JOIN', type: 6, error: true, - childNode: props.childNodeP, + childNode: props.childNodeP } } emits('update:childNodeP', data) @@ -190,7 +190,7 @@ const addType = (type: number) => { name: '包容分支_JOIN', type: 8, error: true, - childNode: props.childNodeP, + childNode: props.childNodeP } } emits('update:childNodeP', data) diff --git a/src/components/SimpleProcessDesigner/src/drawer/approverDrawer.vue b/src/components/SimpleProcessDesigner/src/drawer/approverDrawer.vue index f6196daa..d6ad5c2c 100644 --- a/src/components/SimpleProcessDesigner/src/drawer/approverDrawer.vue +++ b/src/components/SimpleProcessDesigner/src/drawer/approverDrawer.vue @@ -162,7 +162,7 @@ - +
@@ -324,12 +324,12 @@ const changecandidateStrategy = () => { candidateConfig.value.candidateParam = [] } const handleAllCheck = (event, type) => { - console.log('event', event); - console.log('type', type); - event.target.checked = true; + console.log('event', event) + console.log('type', type) + event.target.checked = true let permission = '1' if (type === 'edit' && editAllChecked.value) { - permission = '1' + permission = '1' // TODO @jaosn:这个要不要用枚举里的哈 } if (type === 'read' && readAllChecked.value) { permission = '2' @@ -344,7 +344,7 @@ const handleAllCheck = (event, type) => { onMounted(async () => { // 获得角色列表 roleOptions.value = await RoleApi.getSimpleRoleList() - + // 获得岗位列表 postOptions.value = await PostApi.getSimplePostList() // 获得用户列表 userOptions.value = await UserApi.getSimpleUserList() diff --git a/src/components/SimpleProcessDesigner/src/drawer/copyerDrawer.vue b/src/components/SimpleProcessDesigner/src/drawer/copyerDrawer.vue index 4b074ab8..70b1fc5b 100644 --- a/src/components/SimpleProcessDesigner/src/drawer/copyerDrawer.vue +++ b/src/components/SimpleProcessDesigner/src/drawer/copyerDrawer.vue @@ -12,7 +12,12 @@
- + ([]) // 用户组列表 const candidateConfig = ref({ candidateStrategy: undefined, - candidateParam: [], + candidateParam: [] }) const store = useWorkFlowStoreWithOut() const { setCopyerDrawer, setCopyerConfig } = store @@ -178,30 +183,29 @@ const visible = computed({ }) watch(copyerConfig, (val) => { if (val.value.attributes) { - console.log('val.value.attributes', val.value.attributes); + console.log('val.value.attributes', val.value.attributes) candidateConfig.value.candidateStrategy = val.value.attributes.candidateStrategy - const candidateParamStr = val.value.attributes.candidateParam; - if(val.value.attributes.candidateStrategy === 60) { + const candidateParamStr = val.value.attributes.candidateParam + if (val.value.attributes.candidateStrategy === 60) { candidateConfig.value.candidateParam = [candidateParamStr] } else { - if(candidateParamStr){ - candidateConfig.value.candidateParam = candidateParamStr.split(',').map((item) => +item) + if (candidateParamStr) { + candidateConfig.value.candidateParam = candidateParamStr.split(',').map((item) => +item) } } - + // candidateConfig.value = val.value.attributes } }) - const saveConfig = () => { const rawConfig = toRaw(copyerConfig.value) - const { candidateStrategy , candidateParam} = toRaw(candidateConfig.value); + const { candidateStrategy, candidateParam } = toRaw(candidateConfig.value) const candidateParamStr = candidateParam.join(',') rawConfig.value.attributes = { candidateStrategy, candidateParam: candidateParamStr - } + } rawConfig.flag = true // TODO 进行校验 // setApproverConfig({ @@ -213,7 +217,7 @@ const saveConfig = () => { setCopyerConfig({ value: rawConfig.value, flag: true, - id: copyerConfig.value.id, + id: copyerConfig.value.id }) console.log('after is copyerConfig', copyerConfig.value) closeDrawer() @@ -228,7 +232,7 @@ const changecandidateStrategy = () => { onMounted(async () => { // 获得角色列表 roleOptions.value = await RoleApi.getSimpleRoleList() - + // 获得岗位列表 postOptions.value = await PostApi.getSimplePostList() // 获得用户列表 userOptions.value = await UserApi.getSimpleUserList() diff --git a/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue b/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue index 60369120..d112cf5b 100644 --- a/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue +++ b/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue @@ -146,7 +146,7 @@ onMounted(async () => { processNodeTree.value = { name: '开始', type: NodeType.START_EVENT_NODE, - id: 'StartEvent_1', + id: 'StartEvent_1', // TODO @jason:这个我们要不要 StartEvent 哈? childNode: { id: 'EndEvent_1', name: '结束', diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts index 70188590..449e193e 100644 --- a/src/components/SimpleProcessDesignerV2/src/consts.ts +++ b/src/components/SimpleProcessDesignerV2/src/consts.ts @@ -213,7 +213,7 @@ export type ButtonSetting = { enable: boolean } -// 操作按钮类型枚举 (用于审批节点) +// 操作按钮类型枚举 (用于审批节点) // TODO @jason:建议不缩写哈 export enum OpsButtonType { /** * 通过 diff --git a/src/main.ts b/src/main.ts index af30240d..874f7668 100644 --- a/src/main.ts +++ b/src/main.ts @@ -28,7 +28,7 @@ import '@/plugins/animate.css' // 路由 import router, { setupRouter } from '@/router' -// 其它指令 +// 指令 import { setupAuth, setupMountedFocus } from '@/directives' import { createApp } from 'vue' @@ -58,8 +58,8 @@ const setupAll = async () => { setupRouter(app) + // directives 指令 setupAuth(app) - setupMountedFocus(app) await router.isReady() diff --git a/src/views/bpm/processInstance/detail/index.vue b/src/views/bpm/processInstance/detail/index.vue index 128ddf6f..332499ef 100644 --- a/src/views/bpm/processInstance/detail/index.vue +++ b/src/views/bpm/processInstance/detail/index.vue @@ -56,12 +56,14 @@
+ + {{ item.buttonsSetting?.[OpsButtonType.APPROVE]?.displayName || OPERATION_BUTTON_NAME.get(OpsButtonType.APPROVE) diff --git a/src/views/bpm/simpleWorkflow/index.vue b/src/views/bpm/simpleWorkflow/index.vue index dac9aa82..fe73971c 100644 --- a/src/views/bpm/simpleWorkflow/index.vue +++ b/src/views/bpm/simpleWorkflow/index.vue @@ -1,8 +1,8 @@ - - +