diff --git a/README.md b/README.md
index 5f754761..79c4f653 100644
--- a/README.md
+++ b/README.md
@@ -1,30 +1,89 @@
-## 总览
+#### 总览
-
+
+ 
+
-GoView 是一个高效的拖拽式低代码数据可视化开发平台，将图表或页面元素封装为基础组件，无需编写代码即可制作数据大屏，减少心智负担。
+开源、精美、便捷的「数据可视化」低代码开发平台
-### 😶 纯 **前端** 分支： **`master`**
+#### 长期赞助商
-### 👻 携带 **后端** 请求分支: **`master-fetch`**
+
-### 📚 GoView **文档** 地址：[http://www.mtruning.club:81/](http://www.mtruning.club:81/)
+#### 😶 **纯前端** 分支： **`master`**
-项目纯前端-Demo 地址：[https://www.mtruning.club](https://www.mtruning.club)
+#### 👻 携带 **后端** 请求分支: **`master-fetch`**
-项目带后端-Demo 地址：[后端 Demo 地址](http://1.117.240.165:8080/goview/#/login)
+#### 📚 GoView **文档** 地址：[https://www.mtruning.club/](https://www.mtruning.club/)
-文档-在线地址：[http://www.mtruning.club:81/](http://www.mtruning.club:81/)
+项目纯前端-Demo 地址：[https://vue.mtruning.club/](https://vue.mtruning.club/)
-文档-源码地址：[https://gitee.com/MTrun/go-view-doc](https://gitee.com/MTrun/go-view-doc)
+项目带后端-Demo 地址：[https://demo.mtruning.club/](https://demo.mtruning.club/)
-### 🤯 后端项目
+Cloud IDE 代码在线预览地址：[https://idegitee.com/dromara/go-view](https://idegitee.com/dromara/go-view)
后端项目 gitee 地址：[https://gitee.com/MTrun/go-view-serve](https://gitee.com/MTrun/go-view-serve)
-接口说明地址：[https://docs.apipost.cn/preview/5aa85d10a59d66ce/ddb813732007ad2b?target_id=84dbc5b0-158f-4bcb-8f74-793ac604ada3#3e053622-1e76-43f9-a039-756aee822dbb](https://docs.apipost.cn/preview/5aa85d10a59d66ce/ddb813732007ad2b?target_id=84dbc5b0-158f-4bcb-8f74-793ac604ada3#3e053622-1e76-43f9-a039-756aee822dbb)
+后端地址（社区实现，仅供参考）：
-技术点：
+- `JAVA` [https://gitee.com/MTrun/go-view-serve](https://gitee.com/MTrun/go-view-serve) (当前使用)
+- `.NET` [https://gitee.com/sun_xiang_yu/go-view-dotnet](https://gitee.com/sun_xiang_yu/go-view-dotnet)
+- `NODE` [https://gitee.com/qwdingyu/led](https://gitee.com/qwdingyu/led)
+- `Docker 镜像` [https://gitee.com/AHEAD4/go-view-docker](https://gitee.com/AHEAD4/go-view-docker)
+- `接口文档`[https://docs.apipost.cn](https://docs.apipost.cn/preview/5aa85d10a59d66ce/ddb813732007ad2b?target_id=84dbc5b0-158f-4bcb-8f74-793ac604ada3) (不是最新, 以前端代码为准)
+
+#### 整体介绍
- 框架：基于 `Vue3` 框架编写，使用 `hooks` 写法抽离部分逻辑，使代码结构更加清晰；
@@ -36,17 +95,34 @@ GoView 是一个高效的拖拽式低代码数据可视化开发平台，将图
- 封装：项目进行了详细的工具类封装如：路由、存储、加/解密、文件处理、主题、NaiveUI 全局方法、组件等
+- 入选 NaiveUI 社区精选资源推荐：[查看 NaiveUI 推荐列表](https://www.naiveui.com/zh-CN/light/docs/community)
+
+说明文档：
+
+
工作台：
-
+
请求配置：
-
+
数据过滤：
-
+
+
+高级事件编辑:
+
+
+自定义组件颜色:
+
+
+快捷主页：
+
主题色：
-
+
+
+亮白主题：
+
主要技术栈为：
@@ -55,7 +131,7 @@ GoView 是一个高效的拖拽式低代码数据可视化开发平台，将图
| Vue | 3.2.x | TypeScript4 | 4.6.x |
| Vite | 4.2.x | NaiveUI | 2.34.x |
| ECharts | 5.3.x | Pinia | 2.0.x |
-| 详见 `package.json` | 😁 | 🥰 | 🤗 |
+| 详见 `package.json` | 😁 | 🥰 | 🤗 |
开发环境:
@@ -66,14 +142,17 @@ GoView 是一个高效的拖拽式低代码数据可视化开发平台，将图
已完成图表：
-| 分类 | 名称 | 名称 | 名称 |
-| ------ | ---------------- | ---------------- | -------- |
-| 图表 | 柱状图 | 横向柱状图 | 折线图 |
-| \* | 单/多 折线面积图 | 饼图 | 水球图 |
-| \* | 环形图 | NaiveUI 多种进度 | 🤠 |
-| 信息 | 文字 | 图片 | 😶 |
-| 列表 | 滚动排名列表 | 滚动表格 | 🤓 |
-| 小组件 | 边框-01~13 | 装饰-01~05 | 数字翻牌 |
+| 分类 | 名称 | 名称 | 名称 | 名称 |
+| ------ | ---------------- | ---------- | -------------- | ------------------------ |
+| 图表 | 柱状图 | 横向柱状图 | 折线图 | 单/多 折线面积图(渐变色) |
+| \* | 饼图 | 环形图 | 水球图 | 雷达图 |
+| \* | NaiveUI 多种进度 | 散点图 | 对数回归散点图 | 热力图 |
+| \* | 漏斗图 | 中国地图 | 高德地图 | 🦊 |
+| 信息 | 文字 | 渐变文字 | 词云 | 嵌套网页 |
+| \* | 图片 | 视频 | 😺 | 🐯 |
+| 列表 | 滚动排名列表 | 滚动表格 | 🐮 | 🐐 |
+| 小组件 | 边框-01~13 | 装饰-01~05 | 数字翻牌 | 通用时间 |
+| \* | 数字计数 | 倒计时 | 时钟 | 🦁 |
## 浏览器支持
@@ -81,52 +160,7 @@ GoView 是一个高效的拖拽式低代码数据可视化开发平台，将图
## 安装
-本项目采用` pnpm` 进行包管理
-
-```shell
-#建议使用 nrm 切换到淘宝源 https://registry.npmmirror.com/
-#pnpm
-pnpm install
-
-#yarn
-yarn install
-
-#npm
-npm install
-```
-
-## 启动
-
-```shell
-#pnpm
-pnpm dev
-
-# npm
-npm run dev
-
-#yarn
-yarn dev
-
-#Makefile
-make dev
-```
-
-## 编译
-
-```shell
-#pnpm
-pnpm run build
-
-# npm
-npm run build
-
-#yarn
-yarn run build
-
-#Makefile
-make dist
-
-```
+请查看文档：[https://www.mtruning.club/](https://www.mtruning.club/)
## 代码提交
@@ -142,10 +176,9 @@ make dist
- style: 不影响程序逻辑的代码修改
- chore: 不属于以上类型的其他类型(日常事务)
-## 交流
+## 交流群
-QQ 群：1030129384
-
-
+QQ 群：663629294
+
diff --git a/package.json b/package.json
index d261a95b..22dfcdd4 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
{
"name": "go-view",
- "version": "1.1.11",
+ "version": "1.2.5",
"engines": {
- "node": ">=16.14 <18.0.0"
+ "node": ">=12.0"
},
"scripts": {
"dev": "vite --host",
diff --git a/preview.yml b/preview.yml
new file mode 100644
index 00000000..1a26db2c
--- /dev/null
+++ b/preview.yml
@@ -0,0 +1,10 @@
+# preview.yml
+autoOpen: true # 打开工作空间时是否自动开启所有应用的预览
+apps:
+ - port: 3000 # 应用的端口
+ run: npm i --registry=https://registry.npmmirror.com && npm run dev # 应用的启动命令
+ command: # 使用此命令启动服务，且不执行run
+ root: ./ # 应用的启动目录
+ name: GoView # 应用名称
+ description: 开源、精美、便捷的「数据可视化」低代码开发平台 # 应用描述
+ autoOpen: true # 打开工作空间时是否自动开启预览（优先级高于根级 autoOpen)
\ No newline at end of file
diff --git a/readme/go-view-doc.png b/readme/go-view-doc.png
new file mode 100644
index 00000000..0e5187c5
Binary files /dev/null and b/readme/go-view-doc.png differ
diff --git a/readme/go-view-echarts-color.png b/readme/go-view-echarts-color.png
new file mode 100644
index 00000000..73eb2125
Binary files /dev/null and b/readme/go-view-echarts-color.png differ
diff --git a/readme/go-view-event.png b/readme/go-view-event.png
new file mode 100644
index 00000000..8752bce3
Binary files /dev/null and b/readme/go-view-event.png differ
diff --git a/readme/go-view-indexpage.png b/readme/go-view-indexpage.png
new file mode 100644
index 00000000..ba0dc202
Binary files /dev/null and b/readme/go-view-indexpage.png differ
diff --git a/readme/go-view-qq.png b/readme/go-view-qq.png
index daeed712..2bfd4b59 100644
Binary files a/readme/go-view-qq.png and b/readme/go-view-qq.png differ
diff --git a/readme/go-view-theme.png b/readme/go-view-theme.png
new file mode 100644
index 00000000..0f21f1a4
Binary files /dev/null and b/readme/go-view-theme.png differ
diff --git a/readme/sponsors/ccflow-banner.png b/readme/sponsors/ccflow-banner.png
new file mode 100644
index 00000000..7f537a70
Binary files /dev/null and b/readme/sponsors/ccflow-banner.png differ
diff --git a/readme/sponsors/fb-banner.gif b/readme/sponsors/fb-banner.gif
new file mode 100644
index 00000000..811bbc37
Binary files /dev/null and b/readme/sponsors/fb-banner.gif differ
diff --git a/readme/sponsors/qyy-banner.png b/readme/sponsors/qyy-banner.png
new file mode 100644
index 00000000..04e4fefe
Binary files /dev/null and b/readme/sponsors/qyy-banner.png differ
diff --git a/readme/sponsors/zyplayer-banner.png b/readme/sponsors/zyplayer-banner.png
new file mode 100644
index 00000000..40dcf2a4
Binary files /dev/null and b/readme/sponsors/zyplayer-banner.png differ
diff --git a/src/components/Pages/ChartItemSetting/GlobalSetting.vue b/src/components/Pages/ChartItemSetting/GlobalSetting.vue
index a416e69c..81f9d3d7 100644
--- a/src/components/Pages/ChartItemSetting/GlobalSetting.vue
+++ b/src/components/Pages/ChartItemSetting/GlobalSetting.vue
@@ -257,9 +257,36 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -309,9 +336,9 @@
diff --git a/src/packages/chartConfiguration/echarts/index.ts b/src/packages/chartConfiguration/echarts/index.ts
index 29fa8f02..a8604e33 100644
--- a/src/packages/chartConfiguration/echarts/index.ts
+++ b/src/packages/chartConfiguration/echarts/index.ts
@@ -1,3 +1,4 @@
export * from './axis'
export * from './line'
-export * from './label'
\ No newline at end of file
+export * from './label'
+export * from './legend'
\ No newline at end of file
diff --git a/src/packages/chartConfiguration/echarts/legend.ts b/src/packages/chartConfiguration/echarts/legend.ts
new file mode 100644
index 00000000..c243431d
--- /dev/null
+++ b/src/packages/chartConfiguration/echarts/legend.ts
@@ -0,0 +1,70 @@
+export const legendConfig = {
+ // X轴位置
+ lengendX: [
+ {
+ label: '靠左',
+ value: 'left'
+ },
+ {
+ label: '居中',
+ value: 'center'
+ },
+ {
+ label: '靠右',
+ value: 'right'
+ }
+ ],
+ // y轴位置
+ lengendY: [
+ {
+ label: '靠上',
+ value: 'top'
+ },
+ {
+ label: '居中',
+ value: 'center'
+ },
+ {
+ label: '靠下',
+ value: 'bottom'
+ }
+ ],
+ // 排列方向
+ orient: [
+ {
+ label: '水平',
+ value: 'horizontal'
+ },
+ {
+ label: '垂直',
+ value: 'vertical'
+ }
+ ],
+ // 形状
+ shape: [
+ {
+ label: '圆形',
+ value: 'circle'
+ },
+ {
+ label: '方形',
+ value: 'rect'
+ },
+ {
+ label: '圆角方形',
+ value: 'roundRect'
+ },
+ {
+ label: '三角形',
+ value: 'triangle'
+ },
+ {
+ label: '钢笔形',
+ value: 'pin'
+ },
+ {
+ label: '箭头形',
+ value: 'arrow'
+ }
+ ]
+}
diff --git a/src/packages/components/Charts/Maps/MapAmap/config.ts b/src/packages/components/Charts/Maps/MapAmap/config.ts
index 97bf903c..a7ba4ac9 100644
--- a/src/packages/components/Charts/Maps/MapAmap/config.ts
+++ b/src/packages/components/Charts/Maps/MapAmap/config.ts
@@ -16,7 +16,8 @@ export enum ThemeEnum {
MACARON = 'macaron',
BLUE = 'blue',
DARKBLUE = 'darkblue',
- WINE = 'wine'
+ WINE = 'wine',
+ WEIXIN = 'tileLayer'
}
export enum LangEnum {
diff --git a/src/packages/components/Charts/Maps/MapAmap/config.vue b/src/packages/components/Charts/Maps/MapAmap/config.vue
index be3864bc..8d8936b5 100644
--- a/src/packages/components/Charts/Maps/MapAmap/config.vue
+++ b/src/packages/components/Charts/Maps/MapAmap/config.vue
@@ -134,6 +134,10 @@ const themeOptions = [
{
value: ThemeEnum.WINE,
label: '酱籽'
+ },
+ {
+ value: ThemeEnum.WEIXIN,
+ label: '卫星'
}
]
diff --git a/src/packages/components/Charts/Maps/MapAmap/index.vue b/src/packages/components/Charts/Maps/MapAmap/index.vue
index 741013cb..6e678634 100644
--- a/src/packages/components/Charts/Maps/MapAmap/index.vue
+++ b/src/packages/components/Charts/Maps/MapAmap/index.vue
@@ -8,7 +8,7 @@ import AMapLoader from '@amap/amap-jsapi-loader'
import { CreateComponentType } from '@/packages/index.d'
import { useChartDataFetch } from '@/hooks'
import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { MarkerEnum } from './config'
+import { MarkerEnum, ThemeEnum } from './config'
import { isArray } from '@/utils'
const props = defineProps({
@@ -51,7 +51,6 @@ const initMap = (newData: any) => {
resizeEnable: true,
zoom: amapZindex.value, // 地图显示的缩放级别
center: [amapLon.value, amapLat.value],
- mapStyle: `amap://styles/${amapStyleKeyCustom.value !== '' ? amapStyleKeyCustom.value : amapStyleKey.value}`, //自定义地图的显示样式
lang: lang.value,
features: features.value,
pitch: pitch.value, // 地图俯仰角度，有效范围 0 度- 83 度
@@ -60,6 +59,14 @@ const initMap = (newData: any) => {
willReadFrequently: true
})
dataHandle(props.chartConfig.option.dataset)
+ let satellite = new AMap.TileLayer.Satellite()
+ let roadNet = new AMap.TileLayer.RoadNet()
+ if (newData.amapStyleKey === ThemeEnum.WEIXIN) {
+ mapIns.add([satellite, roadNet])
+ } else {
+ mapIns.remove([satellite, roadNet])
+ mapIns.setMapStyle(`amap://styles/${amapStyleKeyCustom.value !== '' ? amapStyleKeyCustom.value : amapStyleKey.value}`)
+ }
})
.catch(e => {})
}
diff --git a/src/settings/chartThemes/global.theme.json b/src/settings/chartThemes/global.theme.json
index 1c099af8..0fd24712 100644
--- a/src/settings/chartThemes/global.theme.json
+++ b/src/settings/chartThemes/global.theme.json
@@ -86,8 +86,18 @@
},
"legend": {
"show": true,
- "top": "5%",
+ "type": "scroll",
+ "x": "center",
+ "y": "top",
+ "icon": "circle",
+ "orient": "horizontal",
"textStyle": {
+ "color": "#B9B8CE",
+ "fontSize": 18
+ },
+ "itemHeight": 15,
+ "itemWidth": 15,
+ "pageTextStyle": {
"color": "#B9B8CE"
}
},
diff --git a/src/views/chart/ContentHeader/headerRightBtn/index.vue b/src/views/chart/ContentHeader/headerRightBtn/index.vue
index 18369413..7b26d6f3 100644
--- a/src/views/chart/ContentHeader/headerRightBtn/index.vue
+++ b/src/views/chart/ContentHeader/headerRightBtn/index.vue
@@ -58,7 +58,7 @@ const previewHandle = () => {
// 发布
const sendHandle = () => {
goDialog({
- message: '想体验发布功能，请前往 master-fetch 分支查看: https://gitee.com/MTrun/go-view/tree/master-fetch',
+ message: '想体验发布功能，请前往查看: https://demo.mtruning.club/#/login。源码需切换到：master-fetch 分支。',
positiveText: '了然',
closeNegativeText: true,
onPositiveCallback: () => {}
+ 
+ 
+ 
+