adtec-core-package 0.3.4 → 0.3.5

package/package.json

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

package/src/components/Search/ElSearch.vue

@@ -45,14 +45,16 @@ const is_retract = ref(false)
 const ref_div = ref()
 const windowContent = useWindowSize()
 const collapsed = inject<boolean>('collapsed')
-const collapsedSearch=ref<boolean|undefined>(false)
+const collapsedSearch=ref<boolean>(false)
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 //@ts-expect-error
 watch(collapsed, () => {
-  collapsedSearch.value = collapsed
-  calculation()
+  //@ts-ignore
+  collapsedSearch.value = collapsed.value
+  // calculation()
 })
 watch(collapsedSearch, () => {
+  console.log("collapsedSearch")
   calculation()
 })
 watch(windowContent.width, () => {
@@ -110,7 +112,9 @@ const emit = defineEmits<{
   (event: 'search'): void
 }>()
 onMounted(() => {
-  collapsedSearch.value = collapsed
+  //ts-ignore
+  //@ts-expect-error
+  collapsedSearch.value = collapsed.value
   //@ts-ignore
   window.$wujie?.bus.$on("collapsedChangeBus", (val:boolean) => {
     collapsedSearch.value=val

package/src/components/baseEcharts/index.vue

@@ -13,8 +13,8 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref, watch, type PropType } from 'vue'
-import { useEcharts, type EChartsCoreOption } from '../../hooks/useEcharts.ts' // 引入hooks
+import { onMounted, type PropType, ref, watch } from 'vue'
+import { type EChartsCoreOption, useEcharts } from '../../hooks/useEcharts.ts' // 引入hooks
 const props = defineProps({
   options: { type: Object as PropType<EChartsCoreOption>, required: true },
   height: { type: String, default: '100%' },

package/src/hooks/useDictHooks.ts

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

package/src/hooks/useEcharts.ts

@@ -4,8 +4,8 @@
  * 创建时间: 2024/11/4 下午4:51
  * 修改时间: 2024/11/4 下午4:51
  */
-import { onBeforeUnmount, onDeactivated, onMounted,  shallowRef, unref } from 'vue'
-import type{Ref}from 'vue'
+import type { Ref } from 'vue'
+import { onBeforeUnmount, onDeactivated, onMounted, shallowRef, unref } from 'vue'
 import echarts from '../plugins/echartsConfig.ts'
 
 export type EChartsCoreOption = echarts.EChartsCoreOption
@@ -51,7 +51,7 @@ const useEcharts = (elRef: Ref<HTMLDivElement>, options: EChartsCoreOption) => {
   return {
     initCharts,
     setOptions,
-    resize
+    resize,
   }
 }
 

package/src/plugins/echartsConfig.ts

@@ -9,22 +9,22 @@ import * as echarts from 'echarts/core'
 //
 // 引入内置组件，组件后缀都为Component
 import {
-  TitleComponent,
-  TooltipComponent,
-  GridComponent,
-  PolarComponent,
   AriaComponent,
-  ParallelComponent,
+  CalendarComponent,
+  DatasetComponent,
+  DataZoomComponent,
+  GraphicComponent,
+  GridComponent,
   LegendComponent,
+  ParallelComponent,
+  PolarComponent,
   RadarComponent,
-  ToolboxComponent,
-  DatasetComponent, // 数据集组件
-  DataZoomComponent,
-  VisualMapComponent,
   TimelineComponent,
-  CalendarComponent,
-  GraphicComponent,
-  TransformComponent, // 数据转换器组件(filter, sort)
+  TitleComponent,
+  ToolboxComponent,
+  TooltipComponent,
+  TransformComponent,
+  VisualMapComponent
 } from 'echarts/components'
 
 // 引入渲染器：echarst默认使用canvas渲染，引入 CanvasRenderer 或者 SVGRenderer 是必须的一步
@@ -34,14 +34,7 @@ import { CanvasRenderer, SVGRenderer } from 'echarts/renderers'
 import { LabelLayout, UniversalTransition } from 'echarts/features'
 
 // 引入图表类型，后缀都为Chart
-import {
-  BarChart,
-  LineChart,
-  PieChart,
-  MapChart,
-  RadarChart,
-  PictorialBarChart,
-} from 'echarts/charts'
+import { BarChart, LineChart, MapChart, PictorialBarChart, PieChart, RadarChart } from 'echarts/charts'
 
 // 注册必须的组件
 echarts.use([