Commit 42dc71551869b03a4959c255538608df42b679a5
Merge branch 'fix/build-error' into 'main_dev'
fix(src): 修改打包,ts类型错误 See merge request yunteng/thingskit-view!246
Showing
4 changed files
with
6 additions
and
6 deletions
@@ -14,7 +14,7 @@ export const useChartInteract = ( | @@ -14,7 +14,7 @@ export const useChartInteract = ( | ||
14 | useChartEditStore: ChartEditStoreType, | 14 | useChartEditStore: ChartEditStoreType, |
15 | param: { [T: string]: any }, | 15 | param: { [T: string]: any }, |
16 | interactEventOn: string, | 16 | interactEventOn: string, |
17 | - attrNames: string[] | 17 | + attrNames?: string[] |
18 | ) => { | 18 | ) => { |
19 | const chartEditStore = useChartEditStore() | 19 | const chartEditStore = useChartEditStore() |
20 | const { interactEvents } = chartConfig.events | 20 | const { interactEvents } = chartConfig.events |
@@ -52,7 +52,7 @@ use([ | @@ -52,7 +52,7 @@ use([ | ||
52 | ]) | 52 | ]) |
53 | 53 | ||
54 | const option = computed(() => { | 54 | const option = computed(() => { |
55 | - const mergeThemeData = mergeTheme(props.chartConfig.option, props.themeSetting, includes) | 55 | + const mergeThemeData = mergeTheme(props.chartConfig.option, props.themeSetting, includes) as unknown as Recordable |
56 | Reflect.deleteProperty(mergeThemeData.yAxis, 'min') | 56 | Reflect.deleteProperty(mergeThemeData.yAxis, 'min') |
57 | Reflect.deleteProperty(mergeThemeData.yAxis, 'max') | 57 | Reflect.deleteProperty(mergeThemeData.yAxis, 'max') |
58 | return mergeThemeData | 58 | return mergeThemeData |
@@ -39,7 +39,8 @@ const onChange = (v: string) => { | @@ -39,7 +39,8 @@ const onChange = (v: string) => { | ||
39 | props.chartConfig, | 39 | props.chartConfig, |
40 | useChartEditStore, | 40 | useChartEditStore, |
41 | { [ComponentInteractParamsEnum.DATA]: encodeURIComponent(option.value.dataset) }, | 41 | { [ComponentInteractParamsEnum.DATA]: encodeURIComponent(option.value.dataset) }, |
42 | - InteractEventOn.CHANGE | 42 | + InteractEventOn.CHANGE, |
43 | + [] | ||
43 | ) | 44 | ) |
44 | } | 45 | } |
45 | 46 |
@@ -42,15 +42,14 @@ const checkedKeys = ref([]) | @@ -42,15 +42,14 @@ const checkedKeys = ref([]) | ||
42 | 42 | ||
43 | const onClick = (v: string[]) => { | 43 | const onClick = (v: string[]) => { |
44 | // nTreeRef.value?.selectedKeys(v) | 44 | // nTreeRef.value?.selectedKeys(v) |
45 | - console.log(nTreeRef.value) | ||
46 | - console.log(v) | ||
47 | // nTreeRef.value?.onUpdateCheckedKeys(v) | 45 | // nTreeRef.value?.onUpdateCheckedKeys(v) |
48 | if (Array.isArray(v) && v.length == 0) return | 46 | if (Array.isArray(v) && v.length == 0) return |
49 | useChartInteract( | 47 | useChartInteract( |
50 | props.chartConfig, | 48 | props.chartConfig, |
51 | useChartEditStore, | 49 | useChartEditStore, |
52 | { [ComponentInteractParamsEnum.DATA]: v[0] }, | 50 | { [ComponentInteractParamsEnum.DATA]: v[0] }, |
53 | - InteractEventOn.CHANGE | 51 | + InteractEventOn.CHANGE, |
52 | + [] | ||
54 | ) | 53 | ) |
55 | } | 54 | } |
56 | </script> | 55 | </script> |