adtec-core-package 2.3.4 → 2.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "2.3.4",
+  "version": "2.3.6",
   "private": false,
   "type": "module",
   "scripts": {

package/src/components/OperationAuth/operationAuth.vue

@@ -10,22 +10,33 @@
 import { useRoute } from 'vue-router'
 import type { ISysMenuInfoVo } from '../../interface/ISysMenuInfoVo.ts'
 import { computed } from 'vue'
-
+import { userInfoStore } from '../../stores/userInfoStore.ts'
+const userInfo = userInfoStore()
 const props = defineProps<{
-  operCode: string | string[]
+  operCode: string | string[],
+  menuCode?: string
 }>()
 
 const route = useRoute()
-
 const formatedOperCode = computed(() => {
   return Array.isArray(props.operCode) ? props.operCode : [props.operCode]
 })
-
 const isOperationAuth = () => {
-  const data = route.meta?.sysMenuData as ISysMenuInfoVo
-  if (!data?.operation) return false
-  const o = data.operation.find((c) => formatedOperCode.value.includes(c.code))
-  return !!o
+  if(props.menuCode){
+    const find = userInfo.getUserInfo.menuList.find((c) => c.code === props.menuCode)
+    if (find) {
+      if (!find?.operation) return false
+      const o = find.operation.find((c) => formatedOperCode.value.includes(c.code))
+      return !!o
+    }else{
+      return false
+    }
+  }else {
+    const data = route.meta?.sysMenuData as ISysMenuInfoVo
+    if (!data?.operation) return false
+    const o = data.operation.find((c) => formatedOperCode.value.includes(c.code))
+    return !!o
+  }
 }
 </script>
 

package/src/components/workflow/WorkflowTodoDialog.vue

@@ -19,17 +19,18 @@
 <script setup lang="ts">
 import type { IParameter } from '../../interface/Message'
 import { nextTick, onMounted, onUnmounted, ref } from 'vue'
-const applicationModule = import.meta.env.VITE_APPLICATION_MODULE
 import TaskOperation from './TaskOperation.vue'
 import modules from '../../utils/modules'
 import { ElMessage } from 'element-plus'
 import { useEventBus } from '@vueuse/core'
+
+const applicationModule = import.meta.env.VITE_APPLICATION_MODULE
 // const emit = defineEmits(['workflowComplete'])
 const compInst = ref()
 const compRef = ref()
 const showComp = ref(false)
 const taskId = ref('')
-const taskOperationShow=ref(true)
+const taskOperationShow = ref(true)
 onMounted(() => {
   //@ts-ignore
   window.$wujie?.bus.$off(applicationModule + 'WorkflowTodoBus')
@@ -55,7 +56,6 @@ const initTodoDialog = async (params: IParameter[]) => {
     return
   }
   if (linkModelPath) {
-
     if (linkModelPath.indexOf('/') > -1) {
       //组件
       showComp.value = true
@@ -72,11 +72,13 @@ const initTodoDialog = async (params: IParameter[]) => {
             taskId: taskId.value,
             nodeTag: params?.find((x: IParameter) => x.code === 'nodeTag')?.value,
             nodeParam: params?.find((x: IParameter) => x.code === 'nodeParam')?.value,
+            taskName: params?.find((x: IParameter) => x.code === 'taskName')?.value,
           }
           compRef.value?.initByWorkflow(wParam)
         }
       })
-    } else { //菜单
+    } else {
+      //菜单
       const menuCode = params?.find((x: IParameter) => x.code === 'menuCode')?.value
       const bus = useEventBus<IParameter[]>((menuCode ?? linkModelPath) + '_message')
       bus.emit(params)