From 5e0cb887a14cf5153ce98f0b0feb24f360c2ad9a Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 1 Apr 2022 10:51:06 +0800
Subject: [PATCH 1/4] =?UTF-8?q?refactor:=20flv=E6=B5=81=E5=AA=92=E4=BD=93?=
=?UTF-8?q?=E6=92=AD=E6=94=BE=E7=BB=84=E4=BB=B6=E6=93=8D=E4=BD=9C=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/Editor/StreamMediaLinks.vue | 46 ++++++++++---------
.../canvas/custom-component/DeStreamMedia.vue | 29 ++++++++++--
2 files changed, 51 insertions(+), 24 deletions(-)
diff --git a/frontend/src/components/canvas/components/Editor/StreamMediaLinks.vue b/frontend/src/components/canvas/components/Editor/StreamMediaLinks.vue
index d06d19b54c..a018bf61dd 100644
--- a/frontend/src/components/canvas/components/Editor/StreamMediaLinks.vue
+++ b/frontend/src/components/canvas/components/Editor/StreamMediaLinks.vue
@@ -14,27 +14,29 @@
-
-
-
- Tips:{{ $t('panel.live_tips') }}
-
-
-
-
- {{ $t('panel.play_once') }}
- {{ $t('panel.play_circle') }}
-
-
-
-
- {{ $t('panel.yes') }}
- {{ $t('panel.no') }}
-
-
-
-
-
+
+
+
+ {{ $t('panel.yes') }}
+ {{ $t('panel.no') }}
+
+
+ Tips:{{ $t('panel.live_tips') }}
+
+
+
+
+
+
+
+ {{ $t('panel.play_once') }}
+ {{ $t('panel.play_circle') }}
+
+
+
+
+
+
{{ $t('panel.confirm') }}
{{ $t('panel.cancel') }}
@@ -48,6 +50,7 @@
From 92fe0597ae071bd3de46d1afa4ed79a78e166cde Mon Sep 17 00:00:00 2001
From: taojinlong
Date: Fri, 1 Apr 2022 11:18:08 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E6=A3=80=E9=AA=8C=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E6=BA=90=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/src/views/system/datasource/form.vue | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue
index 93007a3de4..d16f0d717d 100644
--- a/frontend/src/views/system/datasource/form.vue
+++ b/frontend/src/views/system/datasource/form.vue
@@ -539,8 +539,13 @@ export default {
return
}
let configuration = JSON.parse(child.configuration)
+ if(!configuration){
+ return
+ }
switch (this.form.type) {
case 'mysql':
+ case 'TiDB':
+ case 'StarRocks':
case 'hive':
case 'mariadb':
case 'ds_doris':
From d9a068eeb02940d04d8be783149d2941baa17105 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw
Date: Fri, 1 Apr 2022 11:33:24 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=B7=A6?=
=?UTF-8?q?=E5=8F=B3=E6=BB=91=E5=8A=A8=E5=A4=B4=E9=83=A8=E9=94=99=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mobile/src/pages/tabBar/dir/search.vue | 6 +++++-
mobile/src/pages/tabBar/home/detail.nvue | 9 ++++++---
mobile/src/pages/tabBar/home/index.nvue | 8 +++++++-
3 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/mobile/src/pages/tabBar/dir/search.vue b/mobile/src/pages/tabBar/dir/search.vue
index c9dba01034..03bb832889 100644
--- a/mobile/src/pages/tabBar/dir/search.vue
+++ b/mobile/src/pages/tabBar/dir/search.vue
@@ -43,9 +43,12 @@ export default {
timer: null
};
},
- onLoad() {
+ onLoad() {
// 本示例用的是高德 sdk ，请根据具体需求换成自己的服务器接口。
this.amapPlugin = util.mapInit();
+ this.historyList = uni.getStorageSync('search:history');
+ },
+ created() {
this.historyList = uni.getStorageSync('search:history');
},
methods: {
@@ -104,6 +107,7 @@ export default {
index: 4,
userId: node.userId
}
+ this.isHistory= false
if(node.type === 'panel') {
uni.navigateTo({
diff --git a/mobile/src/pages/tabBar/home/detail.nvue b/mobile/src/pages/tabBar/home/detail.nvue
index c163c2c1a3..f38d24ab78 100644
--- a/mobile/src/pages/tabBar/home/detail.nvue
+++ b/mobile/src/pages/tabBar/home/detail.nvue
@@ -5,10 +5,13 @@
-
-
-
+
+
+
+
+
+
diff --git a/mobile/src/pages/tabBar/home/index.nvue b/mobile/src/pages/tabBar/home/index.nvue
index 8f99107019..0b7e7c954f 100644
--- a/mobile/src/pages/tabBar/home/index.nvue
+++ b/mobile/src/pages/tabBar/home/index.nvue
@@ -205,8 +205,14 @@
this.switchTab(index);
},
ontabchange(e) {
- // let index = e.target.current || e.detail.current;
+ let index = e.target.current || e.detail.current;
// this.switchTab(index);
+
+ if (this.tabIndex === index) {
+ return;
+ }
+ this.tabIndex = index;
+ this.scrollInto = this.tabBars[index].id;
},
switchTab(index) {
if (this.newsList[index].data.length === 0) {
From d697dbb66bac4ca63547a24968615eaf170ba785 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 1 Apr 2022 11:55:30 +0800
Subject: [PATCH 4/4] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=E7=9A=84url?=
=?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=8F=AF=E4=BB=A5=E8=87=AA=E5=8A=A8=E5=8A=A0?=
=?UTF-8?q?=E4=B8=8Ahttp=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../canvas/components/Editor/FrameLinks.vue | 2 ++
.../canvas/components/Editor/Hyperlinks.vue | 2 ++
.../canvas/components/Editor/StreamMediaLinks.vue | 12 +++++++-----
.../canvas/components/Editor/VideoLinks.vue | 2 ++
.../canvas/custom-component/DeStreamMedia.vue | 4 ++--
frontend/src/utils/urlUtils.js | 9 +++++++++
frontend/src/views/panel/LinkJumpSet/index.vue | 8 +++++---
7 files changed, 29 insertions(+), 10 deletions(-)
create mode 100644 frontend/src/utils/urlUtils.js
diff --git a/frontend/src/components/canvas/components/Editor/FrameLinks.vue b/frontend/src/components/canvas/components/Editor/FrameLinks.vue
index b7f918dd96..351728af6a 100644
--- a/frontend/src/components/canvas/components/Editor/FrameLinks.vue
+++ b/frontend/src/components/canvas/components/Editor/FrameLinks.vue
@@ -27,6 +27,7 @@