From 314daede240adf842917b65fb04ab23d3e902961 Mon Sep 17 00:00:00 2001 From: MTrun <1262327911@qq.com> Date: Sun, 6 Feb 2022 01:04:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E8=89=B2=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/canvas/noImage.png | Bin 0 -> 7897 bytes src/components/Echarts/index.ts | 2 - src/components/Echarts/index.vue | 13 -- src/components/LoadingComponent/index.vue | 2 +- src/components/UserInfo/index.vue | 7 +- src/components/UserInfo/person.png | Bin 0 -> 8927 bytes .../Charts/Bars/BarCommon/config.ts | 4 + .../Charts/Bars/BarCommon/index.vue | 9 +- .../Charts/Bars/BarCrossrange/config.ts | 8 +- .../Charts/Bars/BarCrossrange/index.vue | 7 +- .../Charts/Lines/LineCommon/config.ts | 12 +- .../Charts/Lines/LineCommon/index.vue | 7 +- .../Charts/Pies/PieCommon/config.ts | 8 +- .../Charts/Pies/PieCommon/index.vue | 7 +- src/plugins/icon.ts | 25 ++-- src/plugins/naive.ts | 4 + src/settings/chartColors.ts | 141 ++++++++++++++++++ src/settings/chartThemes/index.ts | 44 ++++++ src/settings/chartThemes/themes/chalk.json | 12 ++ src/settings/chartThemes/themes/customed.json | 13 ++ src/settings/chartThemes/themes/dark.json | 13 ++ src/settings/chartThemes/themes/essos.json | 10 ++ src/settings/chartThemes/themes/macarons.json | 24 +++ .../chartThemes/themes/purple-passion.json | 10 ++ src/settings/chartThemes/themes/roma.json | 24 +++ src/settings/chartThemes/themes/shine.json | 12 ++ src/settings/chartThemes/themes/vintage.json | 14 ++ src/settings/chartThemes/themes/walden.json | 10 ++ src/settings/chartThemes/themes/westeros.json | 10 ++ .../chartThemes/themes/wonderland.json | 10 ++ .../chartEditStore/chartEditStore.d.ts | 34 ++++- .../modules/chartEditStore/chartEditStore.ts | 56 ++++--- .../chartLayoutStore/chartLayoutStore.d.ts | 24 --- .../chartLayoutStore/chartLayoutStore.ts | 25 +--- src/styles/common/_dark.scss | 3 + src/styles/common/_light.scss | 3 + .../CanvasPage/components/ChartTheme/index.ts | 3 + .../components/ChartTheme/index.vue | 91 +++++++++++ .../components/CanvasPage/index.ts | 3 + .../components/CanvasPage/index.vue | 16 ++ .../ContentDetails/components/Page/index.ts | 3 - .../ContentDetails/components/Page/index.vue | 13 -- src/views/chart/ContentDetails/index.vue | 70 +++++++-- .../components/EditRange/index.vue | 28 +++- .../ContentEdit/components/History/index.vue | 4 - .../chart/ContentEdit/hooks/useDrop.hook.ts | 1 - src/views/chart/ContentEdit/index.vue | 13 +- src/views/chart/HeaderRightBtn/index.vue | 2 +- src/views/chart/hooks/useKeyboard.hook.ts | 4 +- src/views/chart/index.vue | 10 +- .../project/layout/components/Sider/menu.ts | 4 +- 51 files changed, 698 insertions(+), 174 deletions(-) create mode 100644 src/assets/images/canvas/noImage.png delete mode 100644 src/components/Echarts/index.ts delete mode 100644 src/components/Echarts/index.vue create mode 100644 src/components/UserInfo/person.png create mode 100644 src/settings/chartColors.ts create mode 100644 src/settings/chartThemes/index.ts create mode 100644 src/settings/chartThemes/themes/chalk.json create mode 100644 src/settings/chartThemes/themes/customed.json create mode 100644 src/settings/chartThemes/themes/dark.json create mode 100644 src/settings/chartThemes/themes/essos.json create mode 100644 src/settings/chartThemes/themes/macarons.json create mode 100644 src/settings/chartThemes/themes/purple-passion.json create mode 100644 src/settings/chartThemes/themes/roma.json create mode 100644 src/settings/chartThemes/themes/shine.json create mode 100644 src/settings/chartThemes/themes/vintage.json create mode 100644 src/settings/chartThemes/themes/walden.json create mode 100644 src/settings/chartThemes/themes/westeros.json create mode 100644 src/settings/chartThemes/themes/wonderland.json create mode 100644 src/views/chart/ContentDetails/components/CanvasPage/components/ChartTheme/index.ts create mode 100644 src/views/chart/ContentDetails/components/CanvasPage/components/ChartTheme/index.vue create mode 100644 src/views/chart/ContentDetails/components/CanvasPage/index.ts create mode 100644 src/views/chart/ContentDetails/components/CanvasPage/index.vue delete mode 100644 src/views/chart/ContentDetails/components/Page/index.ts delete mode 100644 src/views/chart/ContentDetails/components/Page/index.vue diff --git a/src/assets/images/canvas/noImage.png b/src/assets/images/canvas/noImage.png new file mode 100644 index 0000000000000000000000000000000000000000..522694e9166c9f6121f42d36631dadeaa2437af7 GIT binary patch literal 7897 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 dT;u(Pq~+n8o@kdEWJ1e#$=K4U -
- -
- - - - - \ No newline at end of file diff --git a/src/components/LoadingComponent/index.vue b/src/components/LoadingComponent/index.vue index 80cd0f9a..67ddc9fb 100644 --- a/src/components/LoadingComponent/index.vue +++ b/src/components/LoadingComponent/index.vue @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/src/components/UserInfo/index.vue b/src/components/UserInfo/index.vue index ba4647ce..c98614a8 100644 --- a/src/components/UserInfo/index.vue +++ b/src/components/UserInfo/index.vue @@ -12,7 +12,7 @@ round object-fit="cover" size="medium" - :src="imageUrl" + :src="Person" @error="errorHandle" /> @@ -28,6 +28,7 @@ import { NAvatar, NText } from 'naive-ui' import { renderIcon } from '@/utils' import { openDoc, logout, renderLang } from '@/utils' import { SystemSet } from '@/components/SystemSet/index' +import Person from './person.png' import { icon } from '@/plugins' const { @@ -42,8 +43,6 @@ const t = window['$t'] const modelShow = ref(false) -const imageUrl = 'https://www.naiveui.com/assets/naivelogo.93278402.svg' - // 是否失败 const fallback = ref(false) @@ -58,7 +57,7 @@ const renderUserInfo = () => { h(NAvatar, { round: true, style: 'margin-right: 12px;', - src: imageUrl + src: Person }), h('div', null, [ h('div', null, [ diff --git a/src/components/UserInfo/person.png b/src/components/UserInfo/person.png new file mode 100644 index 0000000000000000000000000000000000000000..2f1232c9507f33852fa9a3f406af77178f5e7470 GIT binary patch literal 8927 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 literal 0 HcmV?d00001 diff --git a/src/packages/components/Charts/Bars/BarCommon/config.ts b/src/packages/components/Charts/Bars/BarCommon/config.ts index 4203a6b9..d1eec9f9 100644 --- a/src/packages/components/Charts/Bars/BarCommon/config.ts +++ b/src/packages/components/Charts/Bars/BarCommon/config.ts @@ -26,6 +26,10 @@ export default class Config extends publicConfig implements CreateComponentType { data: [120, 200, 150, 80, 70, 110, 130], type: 'bar' + }, + { + data: [130, 130, 312, 268, 155, 117, 160], + type: 'bar' } ] }) diff --git a/src/packages/components/Charts/Bars/BarCommon/index.vue b/src/packages/components/Charts/Bars/BarCommon/index.vue index d9154456..b8f7cdb5 100644 --- a/src/packages/components/Charts/Bars/BarCommon/index.vue +++ b/src/packages/components/Charts/Bars/BarCommon/index.vue @@ -1,11 +1,11 @@ + + diff --git a/src/views/chart/ContentDetails/components/CanvasPage/index.ts b/src/views/chart/ContentDetails/components/CanvasPage/index.ts new file mode 100644 index 00000000..2926faf2 --- /dev/null +++ b/src/views/chart/ContentDetails/components/CanvasPage/index.ts @@ -0,0 +1,3 @@ +import CanvasPage from './index.vue' + +export { CanvasPage } diff --git a/src/views/chart/ContentDetails/components/CanvasPage/index.vue b/src/views/chart/ContentDetails/components/CanvasPage/index.vue new file mode 100644 index 00000000..5d9139fb --- /dev/null +++ b/src/views/chart/ContentDetails/components/CanvasPage/index.vue @@ -0,0 +1,16 @@ + + + + + diff --git a/src/views/chart/ContentDetails/components/Page/index.ts b/src/views/chart/ContentDetails/components/Page/index.ts deleted file mode 100644 index 3544af76..00000000 --- a/src/views/chart/ContentDetails/components/Page/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import Page from './index.vue' - -export { Page } diff --git a/src/views/chart/ContentDetails/components/Page/index.vue b/src/views/chart/ContentDetails/components/Page/index.vue deleted file mode 100644 index cee3864d..00000000 --- a/src/views/chart/ContentDetails/components/Page/index.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/chart/ContentDetails/index.vue b/src/views/chart/ContentDetails/index.vue index e4e0fe84..61e6abb0 100644 --- a/src/views/chart/ContentDetails/index.vue +++ b/src/views/chart/ContentDetails/index.vue @@ -14,12 +14,43 @@ @collapse="collapsedHindle" @expand="expandHindle" > - - + + + + + + + + + + +