adtec-core-package 0.7.3 → 0.7.5

package/package.json

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

package/src/api/BasicApi.ts

@@ -1,5 +1,7 @@
 import request from '../utils/request'
 import type { IOrgDeptInfo } from '../interface/IOrgDeptInfo'
+import type { IMdmOrgQuery } from '@/interface/IMdmOrgQuery.ts'
+import type { IMdmOrg } from '@/interface/IMdmOrg.ts'
 
 /**
  * Create by丁盼
@@ -14,4 +16,11 @@ export default {
   getMdmOrgDeptTree(): Promise<IOrgDeptInfo[]> {
     return request.post('/api/base/mdmDept/getMdmOrgDeptTree', {})
   },
+
+  /**
+   * 获取组织列表
+   */
+  getMdmOrgList(query: IMdmOrgQuery) {
+    return request.post<IMdmOrg[]>('/api/base/mdmDept/getMdmOrgList', query)
+  },
 }

package/src/api/SysDictCacheApi.ts

@@ -20,7 +20,10 @@ export default {
   /**
    * 批量获取字典数据
    */
-  batchGetSysDictDataCacheVo(dictTypes: string[]): Promise<dictMapType> {
-    return request.post<dictMapType>(basePath + 'batchGetSysDictDataCacheVo', dictTypes)
-  },
+  batchGetSysDictDataCacheVo(dictTypes: string[], orgId?: string): Promise<dictMapType> {
+    return request.post<dictMapType>(
+      basePath + 'batchGetSysDictDataCacheVo?orgId=' + (orgId ? orgId : ''),
+      dictTypes
+    )
+  }
 }

package/src/hooks/useDictHooks.ts

@@ -3,19 +3,26 @@ import SysDictCacheApi from '../api/SysDictCacheApi'
 import type { ISysDictDataCacheVo } from '../interface/ISysDictDataCacheVo'
 import { type dictDataMapVoType, dictStore } from '../stores/dictStore'
 import { storeToRefs } from 'pinia'
+import { userInfoStore } from '../stores/userInfoStore.ts'
 
-export default function useDictHooks(dictTypes?: string[]) {
+const userInfo = userInfoStore()
+export default function useDictHooks(dictTypes?: string[], orgId?: string) {
   const dictStores = dictStore()
+  const { clearDictCache } = dictStores
   const { dictMap, dictDefaultValueMap, dictDataMap } = storeToRefs(dictStores)
-
-  const getDict = async (dictTypes?: string[]) => {
+  const getDict = async (dictTypes?: string[], orgId?: string) => {
     try {
       if (!dictTypes || !dictTypes.length) return
       //判断是否存在缓存数据，如果存在则不请求接口
       const dictKeySet = new Set(Object.keys(dictMap.value))
-      const uncachedDictTypes = dictTypes.filter((dictType) => !dictKeySet.has(dictType))
+      let uncachedDictTypes = dictTypes.filter((dictType) => !dictKeySet.has(dictType))
+      if (orgId) {
+        uncachedDictTypes = uncachedDictTypes.concat(dictTypes.filter((dictType) => !dictKeySet.has(`${orgId}:${dictType}`)))
+      } else {
+        uncachedDictTypes = uncachedDictTypes.concat(dictTypes.filter((dictType) => !dictKeySet.has(`${userInfo.getUserInfo.orgId}:${dictType}`)))
+      }
       if (!uncachedDictTypes.length) return
-      const data = await SysDictCacheApi.batchGetSysDictDataCacheVo(dictTypes)
+      const data = await SysDictCacheApi.batchGetSysDictDataCacheVo(uncachedDictTypes, orgId)
       dictMap.value = { ...dictMap.value, ...data }
       // 获取默认值
       const promises = Object.keys(data).map(async (item: string) => {
@@ -41,7 +48,7 @@ export default function useDictHooks(dictTypes?: string[]) {
   const packageDictDataMap = async (
     map: dictDataMapVoType,
     defaultList: ISysDictDataCacheVo[],
-    list?: ISysDictDataCacheVo[],
+    list?: ISysDictDataCacheVo[]
   ) => {
     if (list && list.length) {
       const promises = list.map(async (item: ISysDictDataCacheVo) => {
@@ -57,23 +64,33 @@ export default function useDictHooks(dictTypes?: string[]) {
     }
   }
 
-  const getDictName = (value?: string, dictType?: string) => {
-    if (dictDataMap.value[dictType!]) {
-      return dictDataMap.value[dictType!][value!]?.label || value
-    }
+  const getDictName = (value?: string, dictType?: string, orgId?: string) => {
+    //此处需要支持多租户
+    let key = orgId ? `${orgId}:${dictType}` : dictType
+    if (dictDataMap.value[key!]) return dictDataMap.value[key!][value!]?.label || value
+    key = `${userInfo.getUserInfo.orgId}:${dictType}`
+    if (dictDataMap.value[key!]) return dictDataMap.value[key!][value!]?.label || value
     return value
   }
 
-  const getDictData = (value: string, dictType: string) => {
-    return dictDataMap.value[dictType!][value!]
+  const getDictData = (value: string, dictType: string, orgId?: string) => {
+    //此处需要支持多租户
+    let key = orgId ? `${orgId}:${dictType}` : dictType
+    if (dictDataMap.value[key!][value!]) return dictDataMap.value[key!][value!]
+    key = `${userInfo.getUserInfo.orgId}:${dictType}`
+    return dictDataMap.value[key!][value!]
   }
-  getDict(dictTypes).then(() => {})
-
+  const clearDict = (dictType?: string[], orgId?: string, all?: Boolean) => {
+    clearDictCache(dictType, userInfo.getUserInfo.orgId, orgId, all)
+  }
+  getDict(dictTypes, orgId).then(() => {
+  })
   return {
     dictMap,
     dictDefaultValueMap,
     getDict,
     getDictName,
     getDictData,
+    clearDict
   }
 }

package/src/interface/IMdmDept.ts

@@ -79,4 +79,6 @@ export interface IMdmDept extends IpageDataQuery {
   updateByName?: string
 
   level?: string
+
+  orgId?: string
 }

package/src/interface/IMdmEmployee.ts

@@ -1,10 +1,12 @@
+import type { BaseEntity } from '@/interface/BaseEntity.ts'
+
 /**
  * 创建人 胡啸东
  * 说明: IMdmEmployee
  * 创建时间: 2024/11/28 下午2:29
  * 修改时间: 2024/11/28 下午2:29
  */
-export interface IMdmEmployee {
+export interface IMdmEmployee extends BaseEntity{
   /**
    * 主键id
    */
@@ -124,19 +126,4 @@ export interface IMdmEmployee {
   orgName?: string
   deptName?: string
   postName?: string
-
-  // 是否删除，1=是，0=否。
-  isDelete?: string
-
-  // 创建者
-  createBy?: string
-
-  // 创建时间
-  createTime?: string
-
-  // 更新者
-  updateBy?: string
-
-  // 更新时间
-  updateTime?: string
 }

package/src/interface/IMdmOrg.ts

@@ -0,0 +1,29 @@
+import type { BaseEntity } from '@/interface/BaseEntity.ts'
+
+/**
+ * 创建人 胡啸东
+ * 说明: Iss
+ * 创建时间: 2024/11/21 下午3:16
+ * 修改时间: 2024/11/21 下午3:16
+ */
+export interface IMdmOrg extends BaseEntity{
+  // 组织ID
+  id?: string
+
+  // 组织编码
+  code?: string
+
+  // 组织名称
+  name?: string
+
+  // 简称
+  shortName?: string
+
+  // 备注
+  remark?: string
+
+  // 是否有效，存布尔字典“SysBool”的值：1=是，0=否。
+  isValid?: string
+  //是否系统组织
+  isSysOrg?: string
+}

package/src/interface/IMdmOrgQuery.ts

@@ -1,4 +1,4 @@
-import type { IpageDataQuery } from 'adtec-core-package/src/interface/PageData'
+import type { IpageDataQuery } from './PageData.ts'
 
 /**
  * 创建人 胡啸东

package/src/stores/dictStore.ts

@@ -1,7 +1,6 @@
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
 import type { ISysDictDataCacheVo } from '../interface/ISysDictDataCacheVo'
-
 // 定义包含map的整体类型
 export interface dictMapType {
   [key: string]: ISysDictDataCacheVo[]
@@ -20,15 +19,33 @@ export const dictStore = defineStore('dictStore', () => {
   const dictDataMap = ref<dictDataMapType>({})
   const dictDefaultValueMap = ref<dictMapType>({})
 
-  const clearDict = () => {
-    dictMap.value = {}
-    dictDataMap.value = {}
-    dictDefaultValueMap.value = {}
+  const clearDictCache = (dictType?: string[],userOrgId?: string, orgId?: string, all?: Boolean) => {
+    if (dictType) {
+      dictType.forEach((item) => {
+        if (orgId) {
+          const key = `${orgId}:${item}`
+          delete dictMap.value[key]
+          delete dictDataMap.value[key]
+          delete dictDefaultValueMap.value[key]
+        } else {
+          delete dictMap.value[item]
+          delete dictDataMap.value[item]
+          delete dictDefaultValueMap.value[item]
+          delete dictMap.value[`${userOrgId}:${item}`]
+          delete dictDataMap.value[`${userOrgId}:${item}`]
+          delete dictDefaultValueMap.value[`${userOrgId}:${item}`]
+        }
+      })
+    } else if (all) {
+      dictMap.value = {}
+      dictDataMap.value = {}
+      dictDefaultValueMap.value = {}
+    }
   }
   return {
     dictMap,
     dictDataMap,
     dictDefaultValueMap,
-    clearDict,
+    clearDictCache,
   }
 })