github/go-view
github/go-view
3
0
Fork 0
mirror of https://gitee.com/dromara/go-view.git synced 2025-02-24 16:22:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
奔跑的面条 2022-06-27 21:36:37 +08:00
commit c2aeb420b2
3 changed files with 74 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/components/Pages/ChartItemSetting/GlobalSetting.vue
View File

@ -47,13 +47,30 @@
size="small"
></n-switch>
</template>
<setting-item-box name="名称">
<setting-item-box name="单位">
<setting-item name="名称">
<n-input v-model:value="xAxis.name" size="small"></n-input>
</setting-item>
<setting-item name="颜色">
<n-color-picker
size="small"
v-model:value="xAxis.nameTextStyle.color"
></n-color-picker>
</setting-item>
<setting-item name="大小">
<n-input-number
v-model:value="xAxis.nameTextStyle.fontSize"
:min="12"
size="small"
></n-input-number>
</setting-item>
<setting-item name="偏移量">
<n-input-number
v-model:value="xAxis.nameGap"
:min="5"
size="small"
></n-input-number>
</setting-item>
</setting-item-box>
<setting-item-box name="标签">
<setting-item v-show="inChart" name="展示">
@ -70,6 +87,13 @@
v-model:value="xAxis.axisLabel.color"
></n-color-picker>
</setting-item>
<setting-item name="大小">
<n-input-number
v-model:value="xAxis.axisLabel.fontSize"
:min="8"
size="small"
></n-input-number>
</setting-item>
</setting-item-box>
<setting-item-box name="轴线">
<setting-item name="颜色">
@ -93,6 +117,11 @@
></n-switch>
</n-space>
</setting-item>
<setting-item v-show="inChart" name="反向">
<n-space>
<n-switch v-model:value="xAxis.inverse" size="small"></n-switch>
</n-space>
</setting-item>
</setting-item-box>
<setting-item-box name="刻度">
<setting-item v-show="inChart" name="展示">
@ -155,13 +184,30 @@
size="small"
></n-switch>
</template>
<setting-item-box name="名称">
<setting-item-box name="单位">
<setting-item name="名称">
<n-input v-model:value="yAxis.name" size="small"></n-input>
</setting-item>
<setting-item name="颜色">
<n-color-picker
size="small"
v-model:value="yAxis.nameTextStyle.color"
></n-color-picker>
</setting-item>
<setting-item name="大小">
<n-input-number
v-model:value="yAxis.nameTextStyle.fontSize"
:min="8"
size="small"
></n-input-number>
</setting-item>
<setting-item name="偏移量">
<n-input-number
v-model:value="yAxis.nameGap"
:min="5"
size="small"
></n-input-number>
</setting-item>
</setting-item-box>
<setting-item-box name="标签">
<setting-item v-show="inChart" name="展示">
@ -178,6 +224,13 @@
v-model:value="yAxis.axisLabel.color"
></n-color-picker>
</setting-item>
<setting-item name="大小">
<n-input-number
v-model:value="yAxis.axisLabel.fontSize"
:min="8"
size="small"
></n-input-number>
</setting-item>
</setting-item-box>
<setting-item-box name="轴线">
<setting-item v-show="inChart" name="展示">
@ -206,6 +259,11 @@
></n-switch>
</n-space>
</setting-item>
<setting-item v-show="inChart" name="反向">
<n-space>
<n-switch v-model:value="yAxis.inverse" size="small"></n-switch>
</n-space>
</setting-item>
</setting-item-box>
<setting-item-box name="刻度">
<setting-item v-show="inChart" name="展示">

8
src/packages/public/chart.ts
View File

@ -10,12 +10,8 @@ import { globalThemeJson } from '@/settings/chartThemes/index'
* @param excludes 排除元素
* @returns object
*/
export const mergeTheme = <T, U>(
option: T,
themeSetting: U,
includes: string[]
) => {
return option = merge({}, pick(themeSetting, includes), option)
export const mergeTheme = <T, U>(option: T, themeSetting: U, includes: string[]) => {
return (option = merge({}, pick(themeSetting, includes), option))
}
/**

14
src/settings/chartThemes/global.theme.json
View File

@ -12,11 +12,16 @@
},
"xAxis": {
"show": true,
"name": "",
"nameGap": 15,
"nameTextStyle": {
"color": "#B9B8CE"
"color": "#B9B8CE",
"fontSize": 12
},
"inverse": false,
"axisLabel": {
"show": true,
"fontSize": 12,
"color": "#B9B8CE"
},
"position": "bottom",
@ -42,11 +47,16 @@
},
"yAxis": {
"show": true,
"name": "",
"nameGap": 15,
"nameTextStyle": {
"color": "#B9B8CE"
"color": "#B9B8CE",
"fontSize": 12
},
"inverse": false,
"axisLabel": {
"show": true,
"fontSize": 12,
"color": "#B9B8CE"
},
"position": "left",