adtec-core-package 2.3.0 → 2.3.1

package/src/hooks/useDictHooks.ts

@@ -1,119 +1,119 @@
-import { ElMessage } from 'element-plus'
-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'
-import frameworkUtils from '../utils/FrameworkUtils.ts'
-
-export default function useDictHooks(dictTypes?: string[], orgId?: string) {
-  const userInfo = userInfoStore()
-  const dictStores = dictStore()
-  const { clearDictCache } = dictStores
-  const { dictMap, dictDefaultValueMap, dictDataMap } = storeToRefs(dictStores)
-  const getDict = async (dictTypes?: string[], orgId?: string): Promise<void> => {
-    try {
-      if (!dictTypes || !dictTypes.length) return
-      //判断是否存在缓存数据，如果存在则不请求接口
-      const dictKeySet = new Set(Object.keys(dictMap.value))
-      let uncachedDictTypes = []
-      if (orgId) {
-        uncachedDictTypes = dictTypes.filter((dictType) => !dictKeySet.has(`${orgId}:${dictType}`))
-      } else {
-        uncachedDictTypes = dictTypes.filter(
-          (dictType) =>
-            !dictKeySet.has(`${userInfo.getUserInfo.orgId}:${dictType}`) &&
-            !dictKeySet.has(dictType),
-        )
-      }
-      if (!uncachedDictTypes.length) return
-      const data = await SysDictCacheApi.batchGetSysDictDataCacheVo(uncachedDictTypes, orgId)
-      dictMap.value = { ...dictMap.value, ...data }
-      // 获取默认值
-      const promises = Object.keys(data).map(async (item: string) => {
-        const dataMap: dictDataMapVoType = {}
-        const defaultList: ISysDictDataCacheVo[] = []
-        await packageDictDataMap(dataMap, defaultList, data[item])
-        return { item, dataMap, defaultList }
-      })
-      const results = await Promise.allSettled(promises)
-      results.forEach((result, index) => {
-        if (result.status === 'fulfilled') {
-          const { item, dataMap, defaultList } = result.value
-          dictDataMap.value[item] = dataMap
-          dictDefaultValueMap.value[item] = defaultList
-        } else {
-          ElMessage.error(`处理键 ${Object.keys(data)[index]} 时出错:`, result.reason)
-        }
-      })
-    } catch (error: any) {
-      frameworkUtils.messageError(error)
-    }
-  }
-  const packageDictDataMap = async (
-    map: dictDataMapVoType,
-    defaultList: ISysDictDataCacheVo[],
-    list?: ISysDictDataCacheVo[],
-  ) => {
-    if (list && list.length) {
-      const promises = list.map(async (item: ISysDictDataCacheVo) => {
-        map[item.value] = { ...item, ...{ children: undefined } }
-        if (item.isDefault === '1') {
-          defaultList.push({ ...item, ...{ children: undefined } })
-        }
-        if (item.children && item.children.length > 0) {
-          await packageDictDataMap(map, defaultList, item.children)
-        }
-      })
-      await Promise.all(promises)
-    }
-  }
-
-  const getDictName = (value?: string, dictType?: string, orgId?: string): string | undefined => {
-    //此处需要支持多租户
-    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, orgId?: string): ISysDictDataCacheVo => {
-    //此处需要支持多租户
-    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!]
-  }
-  const getDictDefaultValue = (
-    dictType: string,
-    orgId?: string,
-  ): ISysDictDataCacheVo[] => {
-    //此处需要支持多租户
-    let key = orgId ? `${orgId}:${dictType}` : dictType
-    if (dictDefaultValueMap.value[key!]) return dictDefaultValueMap.value[key!]
-    key = `${userInfo.getUserInfo.orgId}:${dictType}`
-    if (dictDefaultValueMap.value[key!]) return dictDefaultValueMap.value[key!]
-    return []
-  }
-  const getDictTypeData = (dictType: string, orgId?: string): ISysDictDataCacheVo[] => {
-    //此处需要支持多租户
-    let key = orgId ? `${orgId}:${dictType}` : dictType
-    if (dictMap.value[key!]) return dictMap.value[key!]
-    key = `${userInfo.getUserInfo.orgId}:${dictType}`
-    if (dictMap.value[key!]) return dictMap.value[key!]
-    return []
-  }
-  const clearDict = (dictType?: string[], orgId?: string, all?: Boolean) => {
-    clearDictCache(dictType, userInfo.getUserInfo.orgId, orgId, all)
-  }
-  getDict(dictTypes, orgId).then(() => {})
-  return {
-    getDict,
-    getDictName,
-    getDictData,
-    getDictTypeData,
-    getDictDefaultValue,
-    clearDict,
-  }
-}
+import { ElMessage } from 'element-plus'
+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'
+import frameworkUtils from '../utils/FrameworkUtils.ts'
+
+export default function useDictHooks(dictTypes?: string[], orgId?: string) {
+  const userInfo = userInfoStore()
+  const dictStores = dictStore()
+  const { clearDictCache } = dictStores
+  const { dictMap, dictDefaultValueMap, dictDataMap } = storeToRefs(dictStores)
+  const getDict = async (dictTypes?: string[], orgId?: string): Promise<void> => {
+    try {
+      if (!dictTypes || !dictTypes.length) return
+      //判断是否存在缓存数据，如果存在则不请求接口
+      const dictKeySet = new Set(Object.keys(dictMap.value))
+      let uncachedDictTypes = []
+      if (orgId) {
+        uncachedDictTypes = dictTypes.filter((dictType) => !dictKeySet.has(`${orgId}:${dictType}`))
+      } else {
+        uncachedDictTypes = dictTypes.filter(
+          (dictType) =>
+            !dictKeySet.has(`${userInfo.getUserInfo.orgId}:${dictType}`) &&
+            !dictKeySet.has(dictType),
+        )
+      }
+      if (!uncachedDictTypes.length) return
+      const data = await SysDictCacheApi.batchGetSysDictDataCacheVo(uncachedDictTypes, orgId)
+      dictMap.value = { ...dictMap.value, ...data }
+      // 获取默认值
+      const promises = Object.keys(data).map(async (item: string) => {
+        const dataMap: dictDataMapVoType = {}
+        const defaultList: ISysDictDataCacheVo[] = []
+        await packageDictDataMap(dataMap, defaultList, data[item])
+        return { item, dataMap, defaultList }
+      })
+      const results = await Promise.allSettled(promises)
+      results.forEach((result, index) => {
+        if (result.status === 'fulfilled') {
+          const { item, dataMap, defaultList } = result.value
+          dictDataMap.value[item] = dataMap
+          dictDefaultValueMap.value[item] = defaultList
+        } else {
+          ElMessage.error(`处理键 ${Object.keys(data)[index]} 时出错:`, result.reason)
+        }
+      })
+    } catch (error: any) {
+      frameworkUtils.messageError(error)
+    }
+  }
+  const packageDictDataMap = async (
+    map: dictDataMapVoType,
+    defaultList: ISysDictDataCacheVo[],
+    list?: ISysDictDataCacheVo[],
+  ) => {
+    if (list && list.length) {
+      const promises = list.map(async (item: ISysDictDataCacheVo) => {
+        map[item.value] = { ...item, ...{ children: undefined } }
+        if (item.isDefault === '1') {
+          defaultList.push({ ...item, ...{ children: undefined } })
+        }
+        if (item.children && item.children.length > 0) {
+          await packageDictDataMap(map, defaultList, item.children)
+        }
+      })
+      await Promise.all(promises)
+    }
+  }
+
+  const getDictName = (value?: string, dictType?: string, orgId?: string): string | undefined => {
+    //此处需要支持多租户
+    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, orgId?: string): ISysDictDataCacheVo => {
+    //此处需要支持多租户
+    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!]
+  }
+  const getDictDefaultValue = (
+    dictType: string,
+    orgId?: string,
+  ): ISysDictDataCacheVo[] => {
+    //此处需要支持多租户
+    let key = orgId ? `${orgId}:${dictType}` : dictType
+    if (dictDefaultValueMap.value[key!]) return dictDefaultValueMap.value[key!]
+    key = `${userInfo.getUserInfo.orgId}:${dictType}`
+    if (dictDefaultValueMap.value[key!]) return dictDefaultValueMap.value[key!]
+    return []
+  }
+  const getDictTypeData = (dictType: string, orgId?: string): ISysDictDataCacheVo[] => {
+    //此处需要支持多租户
+    let key = orgId ? `${orgId}:${dictType}` : dictType
+    if (dictMap.value[key!]) return dictMap.value[key!]
+    key = `${userInfo.getUserInfo.orgId}:${dictType}`
+    if (dictMap.value[key!]) return dictMap.value[key!]
+    return []
+  }
+  const clearDict = (dictType?: string[], orgId?: string, all?: Boolean) => {
+    clearDictCache(dictType, userInfo.getUserInfo.orgId, orgId, all)
+  }
+  getDict(dictTypes, orgId).then(() => {})
+  return {
+    getDict,
+    getDictName,
+    getDictData,
+    getDictTypeData,
+    getDictDefaultValue,
+    clearDict,
+  }
+}

package/src/hooks/useEcharts.ts

@@ -1,58 +1,58 @@
-/**
- * 创建人 胡啸东
- * 说明: useEcharts
- * 创建时间: 2024/11/4 下午4:51
- * 修改时间: 2024/11/4 下午4:51
- */
-import type { Ref } from 'vue'
-import { onBeforeUnmount, onDeactivated, onMounted, shallowRef, unref } from 'vue'
-import echarts from '../plugins/echartsConfig.ts'
-
-export type EChartsCoreOption = echarts.EChartsCoreOption
-
-const useEcharts = (elRef: Ref<HTMLDivElement>, options: EChartsCoreOption) => {
-  const charts = shallowRef<echarts.ECharts>()
-
-  const setOptions = (options: EChartsCoreOption) => {
-    charts.value && charts.value.setOption(options)
-  }
-
-  // 初始化
-  const initCharts = (themeColor?: Array<string>) => {
-    const el = unref(elRef)
-    if (!el || !unref(el)) {
-      return
-    }
-    charts.value = echarts.init(el)
-    if (themeColor) {
-      options.color = themeColor
-    }
-    setOptions(options)
-  }
-
-  // 重新窗口变化时，重新计算
-  const resize = () => {
-    charts.value && charts.value.resize()
-  }
-
-  onMounted(() => {
-    window.addEventListener('resize', resize)
-  })
-
-  // 页面keepAlive时，不监听页面
-  onDeactivated(() => {
-    window.removeEventListener('resize', resize)
-  })
-
-  onBeforeUnmount(() => {
-    window.removeEventListener('resize', resize)
-  })
-
-  return {
-    initCharts,
-    setOptions,
-    resize,
-  }
-}
-
-export { useEcharts }
+/**
+ * 创建人 胡啸东
+ * 说明: useEcharts
+ * 创建时间: 2024/11/4 下午4:51
+ * 修改时间: 2024/11/4 下午4:51
+ */
+import type { Ref } from 'vue'
+import { onBeforeUnmount, onDeactivated, onMounted, shallowRef, unref } from 'vue'
+import echarts from '../plugins/echartsConfig.ts'
+
+export type EChartsCoreOption = echarts.EChartsCoreOption
+
+const useEcharts = (elRef: Ref<HTMLDivElement>, options: EChartsCoreOption) => {
+  const charts = shallowRef<echarts.ECharts>()
+
+  const setOptions = (options: EChartsCoreOption) => {
+    charts.value && charts.value.setOption(options)
+  }
+
+  // 初始化
+  const initCharts = (themeColor?: Array<string>) => {
+    const el = unref(elRef)
+    if (!el || !unref(el)) {
+      return
+    }
+    charts.value = echarts.init(el)
+    if (themeColor) {
+      options.color = themeColor
+    }
+    setOptions(options)
+  }
+
+  // 重新窗口变化时，重新计算
+  const resize = () => {
+    charts.value && charts.value.resize()
+  }
+
+  onMounted(() => {
+    window.addEventListener('resize', resize)
+  })
+
+  // 页面keepAlive时，不监听页面
+  onDeactivated(() => {
+    window.removeEventListener('resize', resize)
+  })
+
+  onBeforeUnmount(() => {
+    window.removeEventListener('resize', resize)
+  })
+
+  return {
+    initCharts,
+    setOptions,
+    resize,
+  }
+}
+
+export { useEcharts }

package/src/hooks/useFileView.ts

@@ -1,11 +1,11 @@
-import WujieVue from 'wujie-vue3'
-const useFileView = () => {
-  const fileView = (id: string) => {
-    WujieVue.bus.$emit('viewFile', id)
-  }
-  return {
-    fileView,
-  }
-}
-
-export default useFileView
+import WujieVue from 'wujie-vue3'
+const useFileView = () => {
+  const fileView = (id: string) => {
+    WujieVue.bus.$emit('viewFile', id)
+  }
+  return {
+    fileView,
+  }
+}
+
+export default useFileView

package/src/hooks/useListenerHooks.ts

@@ -1,137 +1,137 @@
-import { useEventListener } from '@vueuse/core'
-import { onMounted, onUnmounted, ref } from 'vue'
-const moduleName =  ref<string|undefined>(undefined)
-export default function useListenerHooks ({keyUp=true,blur=true,submit=true}:{keyUp?:boolean,blur?:boolean,submit?:boolean} = {},module?: string){
-  const cleanupFunctions: (() => void)[] = [];
-  moduleName.value = module
-  onMounted(() => {
-
-    if (keyUp) {
-      const cleanupKeyUp = useEventListener(document, 'keyup', keyUpEvent, true);
-      cleanupFunctions.push(cleanupKeyUp);
-    }
-
-    if (blur) {
-      const cleanupBlur = useEventListener(document, 'blur', blurEvent, true);
-      cleanupFunctions.push(cleanupBlur);
-    }
-
-    if (submit) {
-      const cleanupSubmit = useEventListener(document, 'submit', submitEvent, true);
-      cleanupFunctions.push(cleanupSubmit);
-    }
-  });
-
-  onUnmounted(() => {
-    cleanupFunctions.forEach(cleanup => cleanup());
-  });
-}
-
-
-const submitEvent = (event: KeyboardEvent) => {
-  const target = event.target as Element
-  if (target) {
-    const elForm = target.closest?.('.el-form')
-    if (elForm) {
-      event.stopPropagation()
-    }
-  }
-}
-
-
-const blurEvent = (event: FocusEvent) => {
-  const INPUT_SELECTORS = ['.el-input', '.el-textarea', '.el-input-number']
-  const DATA_KEEP_SPACE = 'data-keep-space'
-
-  const target = event.target
-  if (!(target instanceof HTMLElement)) {
-    return
-  }
-
-  const inputEl = target as HTMLInputElement | HTMLTextAreaElement
-  if (!(inputEl instanceof HTMLInputElement || inputEl instanceof HTMLTextAreaElement)) {
-    return
-  }
-
-  const componentWrapper = INPUT_SELECTORS.reduce<HTMLElement | null>((result, selector) => {
-    if (result) return result
-    return inputEl.closest(selector)
-  }, null)
-
-  if (!componentWrapper) {
-    return
-  }
-
-  const keepSpace = componentWrapper.hasAttribute(DATA_KEEP_SPACE)
-
-  if (!keepSpace) {
-    const originalValue = inputEl.value
-
-    if (typeof originalValue === 'string' && (originalValue.startsWith(' ') || originalValue.endsWith(' '))) {
-      const trimmedValue = originalValue.trim()
-
-      if (trimmedValue !== originalValue) {
-        inputEl.value = trimmedValue
-
-        let inputEvent: Event
-        if (typeof Event === 'function') {
-          inputEvent = new Event('input', {
-            bubbles: true,
-            cancelable: true
-          })
-        } else {
-          inputEvent = document.createEvent('Event')
-          inputEvent.initEvent('input', true, true)
-        }
-
-        const dispatched = inputEl.dispatchEvent(inputEvent)
-        if (!dispatched) {
-          console.warn('Input event was canceled.')
-        }
-      }
-    }
-  }
-}
-
-const keyUpEvent = (event: KeyboardEvent) => {
-  if (event.key === 'Enter') {
-    const applicationModule = moduleName.value || sessionStorage.getItem('applicationModule')
-    //首先判断当前页面有没有抽屉
-    const docTemp = event.currentTarget as any
-    const doc =
-      applicationModule === 'system'
-        ? (docTemp as Document)
-        : (docTemp && docTemp[applicationModule ?? 'default'] && docTemp[applicationModule ?? 'default'].document) || undefined
-    if (!doc) return
-    if (!doc) return
-    const loginButton = doc.body.querySelector('.login_button')
-    if (loginButton) {
-      event.stopPropagation()
-      ;(loginButton as HTMLElement).click()
-      return
-    }
-    if (
-      doc.body.className === 'el-popup-parent--hidden' ||
-      doc.body.querySelector('.el-drawer .open')
-    ) {
-      const drawer = doc.body.querySelector('.el-drawer__body')
-      if (drawer) {
-        const target = drawer.querySelector(
-          '.' + (sessionStorage.getItem('activationRouteCode') as string) + '_search',
-        )
-        if (target) {
-          event.stopPropagation()
-          ;(target as HTMLElement).click()
-        }
-      }
-    } else {
-      const target = doc.body.querySelector(
-        '.' + (sessionStorage.getItem('activationRouteCode') as string) + '_search',
-      )
-      if (target) {
-        event.stopPropagation()
-        ;(target as HTMLElement).click()
-      }
-    }
-  }
-}
+import { useEventListener } from '@vueuse/core'
+import { onMounted, onUnmounted, ref } from 'vue'
+const moduleName =  ref<string|undefined>(undefined)
+export default function useListenerHooks ({keyUp=true,blur=true,submit=true}:{keyUp?:boolean,blur?:boolean,submit?:boolean} = {},module?: string){
+  const cleanupFunctions: (() => void)[] = [];
+  moduleName.value = module
+  onMounted(() => {
+
+    if (keyUp) {
+      const cleanupKeyUp = useEventListener(document, 'keyup', keyUpEvent, true);
+      cleanupFunctions.push(cleanupKeyUp);
+    }
+
+    if (blur) {
+      const cleanupBlur = useEventListener(document, 'blur', blurEvent, true);
+      cleanupFunctions.push(cleanupBlur);
+    }
+
+    if (submit) {
+      const cleanupSubmit = useEventListener(document, 'submit', submitEvent, true);
+      cleanupFunctions.push(cleanupSubmit);
+    }
+  });
+
+  onUnmounted(() => {
+    cleanupFunctions.forEach(cleanup => cleanup());
+  });
+}
+
+
+const submitEvent = (event: KeyboardEvent) => {
+  const target = event.target as Element
+  if (target) {
+    const elForm = target.closest?.('.el-form')
+    if (elForm) {
+      event.stopPropagation()
+    }
+  }
+}
+
+
+const blurEvent = (event: FocusEvent) => {
+  const INPUT_SELECTORS = ['.el-input', '.el-textarea', '.el-input-number']
+  const DATA_KEEP_SPACE = 'data-keep-space'
+
+  const target = event.target
+  if (!(target instanceof HTMLElement)) {
+    return
+  }
+
+  const inputEl = target as HTMLInputElement | HTMLTextAreaElement
+  if (!(inputEl instanceof HTMLInputElement || inputEl instanceof HTMLTextAreaElement)) {
+    return
+  }
+
+  const componentWrapper = INPUT_SELECTORS.reduce<HTMLElement | null>((result, selector) => {
+    if (result) return result
+    return inputEl.closest(selector)
+  }, null)
+
+  if (!componentWrapper) {
+    return
+  }
+
+  const keepSpace = componentWrapper.hasAttribute(DATA_KEEP_SPACE)
+
+  if (!keepSpace) {
+    const originalValue = inputEl.value
+
+    if (typeof originalValue === 'string' && (originalValue.startsWith(' ') || originalValue.endsWith(' '))) {
+      const trimmedValue = originalValue.trim()
+
+      if (trimmedValue !== originalValue) {
+        inputEl.value = trimmedValue
+
+        let inputEvent: Event
+        if (typeof Event === 'function') {
+          inputEvent = new Event('input', {
+            bubbles: true,
+            cancelable: true
+          })
+        } else {
+          inputEvent = document.createEvent('Event')
+          inputEvent.initEvent('input', true, true)
+        }
+
+        const dispatched = inputEl.dispatchEvent(inputEvent)
+        if (!dispatched) {
+          console.warn('Input event was canceled.')
+        }
+      }
+    }
+  }
+}
+
+const keyUpEvent = (event: KeyboardEvent) => {
+  if (event.key === 'Enter') {
+    const applicationModule = moduleName.value || sessionStorage.getItem('applicationModule')
+    //首先判断当前页面有没有抽屉
+    const docTemp = event.currentTarget as any
+    const doc =
+      applicationModule === 'system'
+        ? (docTemp as Document)
+        : (docTemp && docTemp[applicationModule ?? 'default'] && docTemp[applicationModule ?? 'default'].document) || undefined
+    if (!doc) return
+    if (!doc) return
+    const loginButton = doc.body.querySelector('.login_button')
+    if (loginButton) {
+      event.stopPropagation()
+      ;(loginButton as HTMLElement).click()
+      return
+    }
+    if (
+      doc.body.className === 'el-popup-parent--hidden' ||
+      doc.body.querySelector('.el-drawer .open')
+    ) {
+      const drawer = doc.body.querySelector('.el-drawer__body')
+      if (drawer) {
+        const target = drawer.querySelector(
+          '.' + (sessionStorage.getItem('activationRouteCode') as string) + '_search',
+        )
+        if (target) {
+          event.stopPropagation()
+          ;(target as HTMLElement).click()
+        }
+      }
+    } else {
+      const target = doc.body.querySelector(
+        '.' + (sessionStorage.getItem('activationRouteCode') as string) + '_search',
+      )
+      if (target) {
+        event.stopPropagation()
+        ;(target as HTMLElement).click()
+      }
+    }
+  }
+}