Pre Merge pull request !153 from dingxs/master-fetch-dev

This commit is contained in:
dingxs 2023-05-15 03:30:09 +00:00 committed by Gitee
commit 21314bde42
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
8 changed files with 31 additions and 4 deletions

View File

@ -7,6 +7,7 @@ import dataJson from './data.json'
export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
export const seriesItem = {
type: 'line',
smooth: false,
label: {
show: true,
position: 'top',

View File

@ -15,6 +15,12 @@
<SettingItem name="类型">
<n-select v-model:value="item.lineStyle.type" size="small" :options="lineConf.lineStyle.type"></n-select>
</SettingItem>
<SettingItem >
<n-space>
<n-switch v-model:value="item.smooth" size="small"/>
<n-text>平滑曲线</n-text>
</n-space>
</SettingItem>
</SettingItemBox>
<SettingItemBox name="实心点">
<SettingItem name="大小">

View File

@ -11,6 +11,7 @@ export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
const options = {
tooltip: {
show: true,
smooth: false,
trigger: 'axis',
axisPointer: {
type: 'line'

View File

@ -15,6 +15,12 @@
<SettingItem name="类型">
<n-select v-model:value="item.lineStyle.type" size="small" :options="lineConf.lineStyle.type"></n-select>
</SettingItem>
<SettingItem>
<n-space>
<n-switch v-model:value="item.smooth" size="small"/>
<n-text>平滑曲线</n-text>
</n-space>
</SettingItem>
</SettingItemBox>
<SettingItemBox name="实心点">
<SettingItem name="大小">

View File

@ -23,6 +23,12 @@
:options="lineConf.lineStyle.type"
></n-select>
</SettingItem>
<SettingItem>
<n-space>
<n-switch v-model:value="item.smooth" size="small"/>
<n-text>平滑曲线</n-text>
</n-space>
</SettingItem>
</SettingItemBox>
<SettingItemBox name="实心点">
<SettingItem name="大小">

View File

@ -27,6 +27,7 @@ export const option = {
series: [
{
type: 'line',
smooth: false,
symbolSize: 5, //设定实心点的大小
lineStyle: {
type: 'solid',

View File

@ -38,6 +38,12 @@
:options="lineConf.lineStyle.type"
></n-select>
</SettingItem>
<SettingItem>
<n-space>
<n-switch v-model:value="item.smooth" size="small"/>
<n-text>平滑曲线</n-text>
</n-space>
</SettingItem>
</SettingItemBox>
<SettingItemBox name="实心点">
<SettingItem name="大小">

View File

@ -39,9 +39,9 @@ const onChange = (v: number | number[]) => {
props.chartConfig,
useChartEditStore,
{
[ComponentInteractParamsEnum.DATE_START]: v[0] | dayjs().valueOf(),
[ComponentInteractParamsEnum.DATE_END]: v[1] | dayjs().valueOf(),
[ComponentInteractParamsEnum.DATE_RANGE]: `${v[0]}-${v[1]}`
[ComponentInteractParamsEnum.DATE_START]: v[0] || dayjs().valueOf(),
[ComponentInteractParamsEnum.DATE_END]: v[1] || dayjs().valueOf(),
[ComponentInteractParamsEnum.DATE_RANGE]: `${v[0] || dayjs().valueOf() }-${v[1] || dayjs().valueOf()}`
},
InteractEventOn.CHANGE
)
@ -50,7 +50,7 @@ const onChange = (v: number | number[]) => {
useChartInteract(
props.chartConfig,
useChartEditStore,
{ [ComponentInteractParamsEnum.DATE]: v },
{ [ComponentInteractParamsEnum.DATE]: v || dayjs().valueOf() },
InteractEventOn.CHANGE
)
}