Merge branch 'master-fetch-dev' into master-fetch

2026-01-30 00:05:29 +08:00 · 2024-03-14 17:15:42 +08:00 · 2024-03-14 12:10:21 +08:00 · 2024-03-06 11:33:25 +08:00 · 2023-12-18 22:06:48 +08:00 · 2023-12-17 20:47:49 +08:00
3 changed files with 2 additions and 10 deletions
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
 ## 总览

-![logo](readme/logo-t-y.png)
-
 **`master-fetch` 分支是带有后端接口请求的分支**

 **后端项目地址：[https://gitee.com/MTrun/go-view-serve](https://gitee.com/MTrun/go-view-serve)**
@@ -14,12 +12,6 @@

 接口地址修改：`.env`

-### 🤯 后端项目
-
-后端项目 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)
-
 ```shell
 # port
 VITE_DEV_PORT = '8080'
--- a/src/hooks/useChartDataPondFetch.hook.ts
+++ b/src/hooks/useChartDataPondFetch.hook.ts
@@ -116,7 +116,7 @@ export const useChartDataPondFetch = () => {
      const requestDataPondItem = computed(() => {
        return requestGlobalConfig.requestDataPond.find(item => item.dataPondId === pondKey)
      }) as ComputedRef<RequestDataPondItemType>
-      if (requestDataPondItem) {
+      if (requestDataPondItem.value) {
        newPondItemInterval(chartEditStore.requestGlobalConfig, requestDataPondItem, mittDataPondMap.get(pondKey))
      }
    }
--- a/src/views/chart/hooks/useSync.hook.ts
+++ b/src/views/chart/hooks/useSync.hook.ts
@@ -322,7 +322,7 @@ export const useSync = () => {
    // 保存数据
    let params = new FormData()
    params.append('projectId', projectId)
-    params.append('content', JSONStringify(chartEditStore.getStorageInfo || {}))
+    params.append('content', JSONStringify(chartEditStore.getStorageInfo() || {}))
    const res= await saveProjectApi(params)

    if (res && res.code === ResultEnum.SUCCESS) {
Author	SHA1	Message	Date
奔跑的面条	fa93624cf7	Merge branch 'master-fetch-dev' into master-fetch	2024-03-14 17:15:42 +08:00
奔跑的面条	8db3741725	Merge branch 'master-fetch-dev' into master-fetch	2024-03-14 12:10:21 +08:00
奔跑的面条	dd6c730021	Merge branch 'master-fetch-dev' into master-fetch	2024-03-06 11:33:25 +08:00
奔跑的面条	81e2e4784d	Merge branch 'master-fetch-dev' into master-fetch	2023-12-18 22:06:48 +08:00
奔跑的面条	d925a8e104	Merge branch 'master-fetch-dev' into master-fetch	2023-12-17 20:47:49 +08:00
奔跑的面条	278d67945a	!216 fixed：requestDataPondItem应该为响应式ref类型，因此有value，原来写法会造成undefined报错 Merge pull request !216 from fresh66/2.2.6-fixed	2023-12-17 06:40:19 +00:00
hujiangnan	e62f9cbd02	应该为响应式ref类型，因此有value，原来写法会造成undefined报错	2023-10-30 09:28:52 +08:00
奔跑的面条	131abbb28e	Merge branch 'master-fetch-dev' into master-fetch	2023-10-08 16:00:22 +08:00
奔跑的面条	656949f7b8	fix: 解决 getStorageInfo 调用错误的问题	2023-09-18 21:14:27 +08:00
奔跑的面条	601e1a2ea7	Merge branch 'master-fetch-dev' into master-fetch	2023-09-18 17:15:48 +08:00
奔跑的面条	75c47dc97e	Merge branch 'master-fetch-dev' into master-fetch	2023-09-18 11:45:45 +08:00
奔跑的面条	bb1bfc564d	Merge branch 'master-fetch-dev' into master-fetch	2023-09-18 11:08:32 +08:00
奔跑的面条	0cf5e175cf	Merge branch 'master-fetch-dev' into master-fetch	2023-09-18 10:52:18 +08:00
奔跑的面条	006a0edca9	Merge branch 'master-fetch-dev' into master-fetch	2023-08-17 10:02:10 +08:00
奔跑的面条	d6f4f20be0	Merge branch 'master-fetch-dev' into master-fetch	2023-07-09 17:09:06 +08:00
奔跑的面条	634f689f07	Merge branch 'master-fetch-dev' into master-fetch	2023-07-09 15:55:11 +08:00
奔跑的面条	24bcccdf2b	Merge branch 'master-fetch-dev' into master-fetch	2023-07-08 22:03:58 +08:00
奔跑的面条	45254c3dc4	Merge branch 'master-fetch-dev' into master-fetch	2023-05-28 18:00:25 +08:00
奔跑的面条	5340e89f7d	Merge branch 'master-fetch-dev' into master-fetch	2023-05-28 17:56:59 +08:00
奔跑的面条	68c77760ca	Merge branch 'master-fetch-dev' into master-fetch	2023-05-28 17:36:48 +08:00
奔跑的面条	6b7f759071	Merge branch 'master-fetch-dev' into master-fetch	2023-05-08 20:44:30 +08:00
奔跑的面条	8809022e8c	Merge branch 'master-fetch-dev' into master-fetch	2023-05-08 20:36:15 +08:00
奔跑的面条	0309c567e6	Merge branch 'master-fetch-dev' into master-fetch	2023-04-23 21:17:28 +08:00
奔跑的面条	03be42b910	Merge branch 'master-fetch-dev' into master-fetch	2023-04-23 21:09:40 +08:00
奔跑的面条	15f2d77bec	Merge branch 'master-fetch-dev' into master-fetch	2023-04-05 16:39:50 +08:00
奔跑的面条	73524283ed	Merge branch 'master-fetch-dev' into master-fetch	2023-04-03 20:11:31 +08:00
奔跑的面条	5fce7f163e	Merge branch 'master-fetch-dev' into master-fetch	2023-04-02 18:21:01 +08:00
奔跑的面条	2acf1f4351	Merge branch 'master-fetch-dev' into master-fetch	2023-04-02 18:20:01 +08:00
奔跑的面条	7836332a97	build: 升级版本到 2.2.0	2023-03-16 21:00:13 +08:00
奔跑的面条	b5fe803059	Merge branch 'master-fetch-dev' into master-fetch	2023-03-16 20:59:37 +08:00
奔跑的面条	23e459de94	Merge branch 'master-fetch-dev' into master-fetch	2023-03-04 17:32:50 +08:00
奔跑的面条	43aefe7b6e	Merge branch 'master-fetch-dev' into master-fetch	2023-03-04 17:07:17 +08:00
奔跑的面条	824c7a29d8	Merge branch 'master-fetch-dev' into master-fetch	2023-03-04 16:25:17 +08:00
奔跑的面条	92f50f0be2	Merge branch 'master-fetch-dev' into master-fetch	2023-03-04 16:22:02 +08:00
奔跑的面条	dd0170eecc	!133 解决adcode类型不正确可能导致的问题 Merge pull request !133 from wallellen/master-fetch-dev	2023-03-04 16:10:45 +08:00
奔跑的面条	aef798c382	!132 fix: 动态请求中，body的json参数使用javasctipt Merge pull request !132 from guo_ddt/master-fetch	2023-03-04 05:46:01 +00:00
郭孔泉	1922213f8b	fix: 动态请求中，body的json参数使用javasctipt拼接	2023-03-03 11:03:05 +08:00
奔跑的面条	92afc0f366	Merge branch 'master-fetch-dev' into master-fetch	2023-02-27 19:04:38 +08:00
奔跑的面条	ef39ecb3c6	Merge branch 'master-fetch-dev' into master-fetch	2023-02-17 18:15:50 +08:00
奔跑的面条	7ff21d6156	Merge branch 'master-fetch-dev' into master-fetch	2023-02-17 14:34:28 +08:00
奔跑的面条	a53d9c4da2	Merge branch 'master-fetch-dev' into master-fetch	2023-02-17 14:33:18 +08:00
奔跑的面条	e586311744	Merge branch 'master-fetch-dev' into master-fetch	2023-01-17 15:35:40 +08:00
奔跑的面条	3eb1ce7ec5	Merge branch 'master-fetch-dev' into master-fetch	2023-01-16 17:59:40 +08:00
奔跑的面条	f04864ed7f	build: 升级版本到 2.1.6	2023-01-13 16:53:12 +08:00
奔跑的面条	4c968aee18	Merge branch 'master-fetch-dev' into master-fetch	2023-01-13 16:52:43 +08:00
奔跑的面条	4351aef5cd	build: 升级版本 2.1.5	2023-01-08 20:08:37 +08:00
奔跑的面条	8214b30653	Merge remote-tracking branch 'origin/master-fetch-dev' into master-fetch	2022-12-31 21:26:42 +08:00
奔跑的面条	648f4f479e	feat: 合并 2.1.4	2022-12-31 21:07:51 +08:00
奔跑的面条	ab22db62f7	build: 升级版本到2.1.3	2022-12-16 14:02:09 +08:00
奔跑的面条	cb750c73b9	Merge branch 'master-fetch-dev' into master-fetch	2022-12-16 13:55:55 +08:00
奔跑的面条	8cf47e9005	!104 fix:图片hash会出现404问题 Merge pull request !104 from lastbee1204/master-fetch	2022-12-16 04:03:40 +00:00
奔跑的面条	666841458e	!108 饼状图新增功能显示标签,标签显示内容,引导线显示,饼状图圆角设置 Merge pull request !108 from 李少白/master-fetch	2022-12-16 02:44:00 +00:00
slxb	dafdbeca4b	饼状图新增功能显示标签,标签显示内容,引导线显示,饼状图圆角设置	2022-12-13 19:07:47 +08:00
刘彪	5aac8c0546	fix:图片hash会出现404问题	2022-11-29 11:56:37 +08:00
刘彪	0609b95a28	fix:图片hash会出现404问题	2022-11-29 11:47:54 +08:00
奔跑的面条	70ee06d622	Merge remote-tracking branch 'origin/master-fetch-dev' into master-fetch	2022-11-22 12:44:37 +08:00
奔跑的面条	74c9d1df65	Merge branch 'master-fetch-dev' into master-fetch	2022-11-21 10:50:33 +08:00
奔跑的面条	7b327df38e	build: 升级版本到 2.1.2	2022-11-19 21:05:32 +08:00
奔跑的面条	2ec4f56943	Merge branch 'master-fetch-dev' into master-fetch	2022-11-19 21:05:15 +08:00
奔跑的面条	60a2bf7f4f	docs: 优化说明文档	2022-11-14 10:00:30 +08:00