adtec-core-package 0.2.13 → 0.2.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "private": false,
   "type": "module",
   "scripts": {
@@ -30,7 +30,8 @@
     "vue": "^3.5.13",
     "vue-focus-lock": "^3.0.0",
     "vue-img-viewr": "2.0.11",
-    "vue-router": "^4.5.0"
+    "vue-router": "^4.5.0",
+    "wujie-vue3": "^1.0.24"
   },
   "devDependencies": {
     "@tsconfig/node22": "^22.0.0",

package/src/api/DocumentApi.ts

@@ -12,7 +12,16 @@ export default {
   getUpLoadFilesVoById(id: string): Promise<ISysUploadFiles> {
     return request.get(basePath + 'getUpLoadFilesVoById/' + id)
   },
+  getUpLoadFilesByBussinessIds(bussinessIds: string[]): Promise<ISysUploadFiles[]> {
+    return request.post(basePath + 'getUpLoadFilesByBussinessIds', bussinessIds)
+  },
   delSysUploadFile(id: string) {
     return request.get(basePath + 'delSysUploadFile/' + id)
+  },
+  getBusinessDocuments(business: string, businessId: string): Promise<ISysUploadFiles[]> {
+    return request.get(basePath + 'getBusinessDocuments/' + business + '/' + businessId)
+  },
+  fileStatusConfirmation(ids: string[]): Promise<ISysUploadFiles[]> {
+    return request.post(basePath + 'fileStatusConfirmation', ids)
   }
 }

package/src/components/OperationAuth/operationAuth.vue

@@ -12,7 +12,7 @@ const route = useRoute()
 
 const IsOperationAuth = () => {
   const data: ISysMenuInfoVo = route.meta.sysMenuData as ISysMenuInfoVo
-  const o = data.operation.find((c) => c.code === props.operCode)
+  const o = data.operation?.find((c) => c.code === props.operCode)
   if (o) {
     return true
   } else {

package/src/components/Search/ElIconSearch.vue

@@ -26,13 +26,13 @@
   >
     <template #reference>
       <el-tooltip :content="tip" placement="top" style="cursor: pointer">
-        <el-button v-if="elementType === 'button'" style="padding: 8px 10px; margin-left: 4px">
+        <el-button v-if="elementType === 'button'" style="padding: 8px 10px; margin-left: 4px" @click="iconClick">
           <el-icon
             ref="buttonRef"
             :model-value="iconName"
             :style="style"
             :tip="tip"
-            @click="iconClick"
+
             :class="getClass"
           >
             <svg v-if="selcomp" aria-hidden="true">
@@ -76,12 +76,7 @@
         </el-flex>
       </el-flex>
       <slot></slot>
-      <el-flex
-        align="flex-end"
-        justify="flex-end"
-        height="40px"
-        style="border-top: var(--border)"
-      >
+      <el-flex align="flex-end" justify="flex-end" height="40px" style="border-top: var(--border)">
         <el-button @click="reset">重置</el-button>
         <el-button type="primary" @click="search">查询</el-button>
       </el-flex>
@@ -90,24 +85,50 @@
 </template>
 <script setup lang="ts">
 // 定义Props类型
-import { useVModel } from '@vueuse/core'
-import { computed, ref, unref } from 'vue'
-import ElFlex from '../ElFlex/ElFlex.vue'
-import ElIcons from '../icon/ElIcons.vue'
-
+import { useMousePressed, useVModel } from '@vueuse/core'
+import { computed, ref, unref, watch } from 'vue'
+const { pressed } = useMousePressed()
 const iconClick = () => {
   unref(popoverRef).popperRef?.delayHide?.()
   visible.value = !visible.value
 }
+watch(pressed, () => {
+  if (pressed.value) {
+    //@ts-ignore
+    if (!hasParentWithStyle(event.target, 'el-popper')) {
+      visible.value = false
+    }
+  }
+})
+function hasParentWithStyle(element: any, styleSelector: string) {
+  let currentElement = element.parentNode
+  let i = 0
+  while (currentElement && i < 15) {
+    if (currentElement?.tagName !== 'BODY') {
+      if (currentElement.className?.indexOf(styleSelector) > -1) {
+        return true
+      }
+      currentElement = currentElement.parentNode
+      i++
+    } else {
+      return false
+    }
+  }
+  return false
+}
 const keypress = (e: KeyboardEvent) => {
   if (e.key === 'Enter') {
     visible.value = false
-    emit('search')
+    setTimeout(() => {
+      emit('search')
+    }, 200)
   }
 }
 const search = () => {
   visible.value = false
-  emit('search')
+  setTimeout(() => {
+    emit('search')
+  }, 200)
 }
 const reset = () => {
   emit('reset')

package/src/components/Search/ElSearch.vue

@@ -50,7 +50,7 @@ const collapsedSearch=ref<boolean>(false)
 //@ts-expect-error
 watch(collapsed, () => {
   //@ts-ignore
-  collapsedSearch.value = collapsed.value
+  collapsedSearch.value = collapsed?.value
   // calculation()
 })
 watch(collapsedSearch, () => {
@@ -63,7 +63,7 @@ watch(windowContent.width, () => {
 const calculation = () => {
   nextTick(()=>{
     setTimeout(() => {
-      if(ref_div.value.children.length>0) {
+      if(ref_div.value?.children.length>0) {
         if (!(ref_div.value.children[0].offsetHeight > 95)) {
           if (ref_div.value.children[0].offsetHeight !== 0) {
             is_retract.value = false
@@ -114,7 +114,7 @@ const emit = defineEmits<{
 onMounted(() => {
   //ts-ignore
   //@ts-expect-error
-  collapsedSearch.value = collapsed.value
+  collapsedSearch.value = collapsed?.value
   //@ts-ignore
   window.$wujie?.bus.$on("collapsedChangeBus", (val:boolean) => {
     collapsedSearch.value=val

package/src/components/upload/ElUploads.vue

@@ -3,7 +3,7 @@
 <!--创建时间: 2024/12/2 下午1:59-->
 <!--修改时间: 2024/12/2 下午1:59-->
 <template>
-  <el-flex v-if="!isEdlt">
+  <el-flex v-if="!isEdlt" :vertical="vertical">
     <el-flex
       v-for="item of uploadFilesList"
       :key="item.id"
@@ -102,7 +102,14 @@ const props = defineProps({
     type: Number,
     default: 1,
   },
-
+  /**
+   * @description 纵向排列
+   * @default false
+   */
+  vertical: {
+    type: Boolean,
+    default: false,
+  },
   /**
    * @description 上传文件类型
    * @default ''

package/src/hooks/useDictHooks.ts

@@ -1,40 +1,35 @@
-import { storeToRefs } from 'pinia'
 import { ElMessage } from 'element-plus'
 import SysDictCacheApi from '../api/SysDictCacheApi'
 import type { ISysDictDataCacheVo } from '../interface/ISysDictDataCacheVo'
-import { dictStore } from '../stores/dictStore'
+import { type dictDataMapVoType, dictStore } from '../stores/dictStore'
 
 export default function useDictHooks(dictTypes?: string[]) {
   const dictStores = dictStore()
-  const { dictMap, dictDefaultValueMap,dictDataMap } = storeToRefs(dictStores)
-  const getDict = async (dictTypes: string[]) => {
+  const getDict = async (dictTypes?: string[]) => {
     try {
       if (!dictTypes || !dictTypes.length) return
-      // 判断是否存在缓存数据，如果存在则不请求接口
-      const dictKeySet = new Set(Object.keys(dictMap.value))
+      //判断是否存在缓存数据，如果存在则不请求接口
+      const dictKeySet = new Set(Object.keys(dictStores.dictMap))
       const uncachedDictTypes = dictTypes.filter((dictType) => !dictKeySet.has(dictType))
       if (!uncachedDictTypes.length) return
-      const data = await SysDictCacheApi.batchGetSysDictDataCacheVo(uncachedDictTypes)
-      dictMap.value = { ...dictMap.value, ...data }
+      const data = await SysDictCacheApi.batchGetSysDictDataCacheVo(dictTypes)
+      dictStores.dictMap = { ...dictStores.dictMap, ...data }
       // 获取默认值
       Object.keys(data).forEach((item: string) => {
         findDefaultValue(data[item], item)
-        const dataMap = new Map<string, ISysDictDataCacheVo>()
+        const dataMap: dictDataMapVoType = {}
         packageDictDataMap(dataMap, data[item])
-        dictDataMap.value.set(item, dataMap)
+        dictStores.dictDataMap[item] = dataMap
       })
     } catch (error: any) {
       ElMessage.error(error.msg || error.message)
     }
   }
 
-  const packageDictDataMap = async (
-    map: Map<string, ISysDictDataCacheVo>,
-    list?: ISysDictDataCacheVo[],
-  ) => {
+  const packageDictDataMap = async (map: dictDataMapVoType, list?: ISysDictDataCacheVo[]) => {
     if (list && list.length) {
       list.forEach((item: ISysDictDataCacheVo) => {
-        map.set(item.value, { ...item, ...{ children: undefined } })
+        map[item.value] = { ...item, ...{ children: undefined } }
         packageDictDataMap(map, item.children)
       })
     }
@@ -42,7 +37,9 @@ export default function useDictHooks(dictTypes?: string[]) {
 
   const findDefaultValue = async (list: ISysDictDataCacheVo[], type: string) => {
     const find = getDefaultValue(list)
-    find && dictDefaultValueMap.value.set(type, find)
+    if (find) {
+      dictStores.dictDefaultValueMap[type] = find
+    }
   }
 
   const getDefaultValue = (list?: ISysDictDataCacheVo[]): ISysDictDataCacheVo | undefined => {
@@ -57,20 +54,25 @@ export default function useDictHooks(dictTypes?: string[]) {
   }
 
   const getDictName = (value?: string, dictType?: string) => {
-    return dictDataMap.value.get(dictType!)?.get(value!)?.label || value
+    if (dictStores.dictDataMap[dictType!]) {
+      return dictStores.dictDataMap[dictType!][value!]?.label || value
+    }
+    return value
   }
 
   const getDictData = (value: string, dictType: string) => {
-    return dictDataMap.value.get(dictType)?.get(value)
+    return dictStores.dictDataMap[dictType!][value!]
   }
   if (dictTypes && dictTypes.length) {
-    getDict(dictTypes).then(() => {})
+    getDict(dictTypes).then(() => {
+    })
   }
+
   return {
-    dictMap,
-    dictDefaultValueMap,
+    dictMap: dictStores.dictMap,
+    dictDefaultValueMap: dictStores.dictDefaultValueMap,
     getDict,
     getDictName,
-    getDictData,
+    getDictData
   }
 }

package/src/stores/dictStore.ts

@@ -7,11 +7,18 @@ export interface dictMapType {
   [key: string]: ISysDictDataCacheVo[]
 }
 
+export interface dictDataMapVoType {
+  [key: string]: ISysDictDataCacheVo
+}
+
+export interface dictDataMapType {
+  [key: string]: { [key: string]: ISysDictDataCacheVo }
+}
+
 export const dictStore = defineStore('dictStore', () => {
   const dictMap = ref<dictMapType>({})
-  const dictDataMap = ref<Map<string, Map<string, ISysDictDataCacheVo>>>(new Map())
-  const dictDefaultValueMap = ref<Map<string, ISysDictDataCacheVo>>(new Map())
-
+  const dictDataMap = ref<dictDataMapType>({})
+  const dictDefaultValueMap = ref<dictDataMapVoType>({})
   return {
     dictMap,
     dictDataMap,

package/src/stores/permissionStore.ts

@@ -0,0 +1,108 @@
+import { defineStore } from 'pinia'
+import type { ISysMenuInfoVo } from '../interface/ISysMenuInfoVo'
+import { useEventBus } from '@vueuse/core'
+import WujieVue from 'wujie-vue3'
+
+const bus = useEventBus<string>('ActiveMenuInfo')
+export const permissionStore = defineStore({
+  id: 'permissionStore',
+  state: () => ({
+    /**
+     * 当前激活的一级菜单
+     */
+    //@ts-ignore
+    activeMenuInfoLevel1: null as ISysMenuInfoVo,
+    /**
+     * 保存已经打开的菜单
+     */
+    openMenuInfo: [] as ISysMenuInfoVo[],
+    /**
+     * 当前激活菜单信息
+     */
+    //@ts-ignore
+    activeMenuInfo: null as ISysMenuInfoVo,
+  }),
+  getters: {
+    /**
+     * 获取当前选择一级菜单
+     */
+    getActiveMenuInfoLevel1(): ISysMenuInfoVo {
+      return this.activeMenuInfoLevel1
+    },
+    /**
+     * 获取当前菜单
+     */
+    getActiveMenuInfo(): ISysMenuInfoVo {
+      return this.activeMenuInfo
+    },
+    /**
+     * 获取已经打开的菜单
+     */
+    getOpenMenuInfo(): ISysMenuInfoVo[] {
+      return this.openMenuInfo
+    },
+  },
+  actions: {
+    /**
+     * 判断是否有按钮权限
+     * @param operCode
+     * @constructor
+     */
+    IsOperationAuth(operCode: string) {
+      if (this.getActiveMenuInfo.operation) {
+        const find = this.getActiveMenuInfo.operation.find((c) => c.code === operCode)
+        if (find) {
+          return true
+        } else {
+          return false
+        }
+      } else {
+        return false
+      }
+    },
+    /**
+     * 设置选择的已经菜单
+     * @param menuInfo
+     */
+    setActiveMenuInfoLevel1(menuInfo: ISysMenuInfoVo) {
+      this.activeMenuInfoLevel1 = menuInfo
+    },
+    /**
+     * 设置打开的菜单
+     * @param menuInfo
+     */
+    setOpenMenuInfo(menuInfo: ISysMenuInfoVo) {
+      const find = this.openMenuInfo.find((c) => c.id === menuInfo.id)
+      if (!find) {
+        this.openMenuInfo.push(menuInfo)
+      }
+      this.activeMenuInfo = menuInfo
+      bus.emit()
+    },
+    /**
+     * 移除打开的菜单
+     * @param menuInfo
+     */
+    removeOpenMenuInfo(menuInfo: ISysMenuInfoVo) {
+      this.openMenuInfo.splice(this.openMenuInfo.indexOf(menuInfo), 1)
+      if (menuInfo.applicationModule !== 'system' && menuInfo.isLink !== 1) {
+        //关闭子应用菜单
+        WujieVue.bus.$emit('wujie-router-close', menuInfo)
+      }
+    },
+    /**
+     * 移除所有打开的菜单
+     * @param menuInfo
+     */
+    removeAllOpenMenuInfo(menuInfo: ISysMenuInfoVo) {
+      this.openMenuInfo = []
+    },
+    clear() {
+      this.openMenuInfo = []
+      //@ts-ignore
+      this.activeMenuInfoLevel1 = null
+      //@ts-ignore
+      this.activeMenuInfo = null
+    },
+  },
+})

package/src/stores/storeConfig.ts

@@ -12,7 +12,7 @@ function decrypt(value: string): string {
 }
 
 const plugin = storePlugin({
-  stores: ['userInfoStore', 'messageStore', 'dictStore'],
+  stores: ['userInfoStore', 'messageStore', 'dictStore','permissionStore'],
   // use alone storage
   // stores: [{name:'theme_store',storage: localStorage}]
   storage: sessionStorage, //default storage