Date: Fri, 1 Jul 2022 13:57:57 +0800
Subject: [PATCH 02/11] =?UTF-8?q?fix:=20=E6=95=B0=E5=AD=97=E4=B8=8B?=
=?UTF-8?q?=E6=8B=89=E5=8F=82=E6=95=B0=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/widget/serviceImpl/NumberSelectServiceImpl.js | 1 +
frontend/src/views/panel/filter/filterMain/FilterControl.vue | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js b/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js
index e2e64eacb3..6707f530c7 100644
--- a/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js
@@ -14,6 +14,7 @@ const dialogPanel = {
placeholder: 'denumberselect.placeholder',
datas: [],
viewIds: [],
+ parameters: [],
key: 'id',
label: 'text',
value: 'id',
diff --git a/frontend/src/views/panel/filter/filterMain/FilterControl.vue b/frontend/src/views/panel/filter/filterMain/FilterControl.vue
index 4ea8917ac7..cadbe34d96 100644
--- a/frontend/src/views/panel/filter/filterMain/FilterControl.vue
+++ b/frontend/src/views/panel/filter/filterMain/FilterControl.vue
@@ -75,7 +75,6 @@
class="de-checkbox"
>
-
{{ item.variableName }}
{{ item.variableName }}
From c4afe835ddff422e796a0c0f606a3b50cd128b5d Mon Sep 17 00:00:00 2001
From: taojinlong
Date: Fri, 1 Jul 2022 16:39:06 +0800
Subject: [PATCH 03/11] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20SQL?=
=?UTF-8?q?=20=E5=8F=98=E9=87=8F=E7=AE=A1=E7=90=86=E7=9A=84=E6=8C=89?=
=?UTF-8?q?=E9=92=AE=E6=8C=A4=E5=8D=A0=E5=88=B0=E4=B8=8B=E4=B8=80=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/src/views/dataset/add/AddSQL.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index d3c277b08b..753e823ac7 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -49,10 +49,11 @@
-
+
+
{{ $t('sql_variable.variable_mgm') }}
-
+
From 19804617ea6d48762342ef858d32ae60838b7fa5 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw
Date: Fri, 1 Jul 2022 16:41:54 +0800
Subject: [PATCH 04/11] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E7=AC=A6?=
=?UTF-8?q?=E5=8F=B7=E5=9C=B0=E5=9B=BE=E6=9F=A5=E7=9C=8B=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E6=98=8E=E7=BB=86=E6=A0=B7=E5=BC=8F=E9=94=99=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/canvas/custom-component/UserViewDialog.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontend/src/components/canvas/custom-component/UserViewDialog.vue b/frontend/src/components/canvas/custom-component/UserViewDialog.vue
index 18b8eeca13..ce8a4e8a09 100644
--- a/frontend/src/components/canvas/custom-component/UserViewDialog.vue
+++ b/frontend/src/components/canvas/custom-component/UserViewDialog.vue
@@ -68,7 +68,7 @@ export default {
},
computed: {
isAbsoluteContainer() {
- return this.chart.type === 'symbol-map'
+ return this.showChartCanvas && this.chart.type === 'symbol-map'
},
showChartCanvas() {
return this.openType === 'enlarge'
From c81e7f1852110d25b87cbe5cf1ca7284cb17d6dd Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Fri, 1 Jul 2022 16:50:05 +0800
Subject: [PATCH 05/11] =?UTF-8?q?fix(=E4=BF=AE=E5=A4=8D=E8=BF=87=E6=BB=A4?=
=?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=B7=BB=E5=8A=A0=E8=99=9A=E6=8B=9F=E5=8C=96?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=90=8E,=E5=AF=BC=E8=87=B4=E7=9A=84?=
=?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=B7=E5=BC=8F=E4=B8=8D=E7=94=9F?=
=?UTF-8?q?=E6=95=88):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/src/components/ElVisualSelect/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontend/src/components/ElVisualSelect/index.vue b/frontend/src/components/ElVisualSelect/index.vue
index e97ac20409..87b6183616 100644
--- a/frontend/src/components/ElVisualSelect/index.vue
+++ b/frontend/src/components/ElVisualSelect/index.vue
@@ -3,7 +3,7 @@
ref="visualSelect"
v-model="selectValue"
:class="classId"
- popper-class="VisualSelects"
+ popper-class="VisualSelects coustom-de-select"
no-match-text=" "
v-bind="$attrs"
v-on="$listeners"
From 998369e920f2a589ffb66f3147073b9e3e8a5c20 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 1 Jul 2022 16:57:02 +0800
Subject: [PATCH 06/11] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
=?UTF-8?q?=E5=8D=A1=E7=89=87=E7=BB=84=E4=BB=B6=E5=86=85=E9=83=A8=E8=A7=86?=
=?UTF-8?q?=E5=9B=BE=E5=A2=9E=E5=8A=A0=E6=94=BE=E5=A4=A7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/canvas/components/Editor/EditBarView.vue | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/frontend/src/components/canvas/components/Editor/EditBarView.vue b/frontend/src/components/canvas/components/Editor/EditBarView.vue
index 4131ff84cd..3a7aab4566 100644
--- a/frontend/src/components/canvas/components/Editor/EditBarView.vue
+++ b/frontend/src/components/canvas/components/Editor/EditBarView.vue
@@ -7,6 +7,9 @@
+
+
+
@@ -88,7 +91,7 @@ export default {
this.$emit('amRemoveItem')
},
showViewDetails(params) {
- this.$emit('showViewDetails', params)
+ this.$emit('showViewDetails', { openType: params })
},
positionCheck(position) {
return this.showPosition.includes(position)
From 38d832448ff0ed6981e4243e393fae2aff09f6c0 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 1 Jul 2022 17:07:26 +0800
Subject: [PATCH 07/11] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E6=A8=AA?=
=?UTF-8?q?=E5=90=91=E6=9F=B1=E7=8A=B6=E5=9B=BE=E6=9C=80=E5=A4=A7=E5=80=BC?=
=?UTF-8?q?=E8=BE=93=E5=85=A5=E4=B8=8D=E4=BA=86=E6=95=B0=E6=8D=AE=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../chart/components/component-style/XAxisSelectorAntV.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue b/frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue
index 5804cfc1f5..975c7aefe9 100644
--- a/frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue
+++ b/frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue
@@ -46,7 +46,7 @@
-
+
From 3a8fb1de261e7314363d945f42ab38a317386ef8 Mon Sep 17 00:00:00 2001
From: taojinlong
Date: Fri, 1 Jul 2022 17:09:16 +0800
Subject: [PATCH 08/11] =?UTF-8?q?fix(=E6=8A=BD=E5=8F=96=E6=95=B0=E6=8D=AE)?=
=?UTF-8?q?:=20=E8=B0=83=E6=95=B4=20doris=20=E5=BB=BA=E8=A1=A8=E8=AF=AD?=
=?UTF-8?q?=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../io/dataease/provider/engine/doris/DorisDDLProvider.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java b/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java
index f613541175..cda19b32b5 100644
--- a/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java
+++ b/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java
@@ -66,7 +66,7 @@ public class DorisDDLProvider extends DDLProviderImpl {
break;
case 1:
size = size < 50? 50 : size;
- Column_Fields.append("varchar(length)".replace("length", String.valueOf(size))).append(",`");
+ Column_Fields.append("STRING".replace("length", String.valueOf(size))).append(",`");
break;
case 2:
Column_Fields.append("bigint").append(",`");
@@ -78,7 +78,7 @@ public class DorisDDLProvider extends DDLProviderImpl {
Column_Fields.append("TINYINT(length)".replace("length", String.valueOf(size))).append(",`");
break;
default:
- Column_Fields.append("varchar(length)".replace("length", String.valueOf(size))).append(",`");
+ Column_Fields.append("STRING".replace("length", String.valueOf(size))).append(",`");
break;
}
}
From 94871bdbc370bdf8e18a7cd24e066aa524388db0 Mon Sep 17 00:00:00 2001
From: taojinlong
Date: Fri, 1 Jul 2022 17:34:11 +0800
Subject: [PATCH 09/11] =?UTF-8?q?fix(=E6=8A=BD=E5=8F=96=E6=95=B0=E6=8D=AE)?=
=?UTF-8?q?:=20=E8=B0=83=E6=95=B4=20doris=20=E5=BB=BA=E8=A1=A8=E8=AF=AD?=
=?UTF-8?q?=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../io/dataease/provider/engine/doris/DorisDDLProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java b/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java
index cda19b32b5..bae7ae9fba 100644
--- a/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java
+++ b/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java
@@ -62,7 +62,7 @@ public class DorisDDLProvider extends DDLProviderImpl {
}
switch (datasetTableField.getDeExtractType()) {
case 0:
- Column_Fields.append("varchar(length)".replace("length", String.valueOf(size))).append(",`");
+ Column_Fields.append("STRING".replace("length", String.valueOf(size))).append(",`");
break;
case 1:
size = size < 50? 50 : size;
From 8d13c10d9783263905afba32aa130ee14dd5eb77 Mon Sep 17 00:00:00 2001
From: taojinlong
Date: Fri, 1 Jul 2022 17:43:29 +0800
Subject: [PATCH 10/11] =?UTF-8?q?fix(API):=20=E5=8E=BB=E6=8E=89=E9=BB=98?=
=?UTF-8?q?=E8=AE=A4=20http=20client=20=E8=AF=B7=E6=B1=82=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/io/dataease/commons/utils/HttpClientUtil.java | 8 --------
1 file changed, 8 deletions(-)
diff --git a/backend/src/main/java/io/dataease/commons/utils/HttpClientUtil.java b/backend/src/main/java/io/dataease/commons/utils/HttpClientUtil.java
index fb71455a64..70565fed75 100755
--- a/backend/src/main/java/io/dataease/commons/utils/HttpClientUtil.java
+++ b/backend/src/main/java/io/dataease/commons/utils/HttpClientUtil.java
@@ -86,9 +86,6 @@ public class HttpClientUtil {
for (String key : header.keySet()) {
httpGet.addHeader(key, header.get(key));
}
-
- httpGet.addHeader(HTTP.CONTENT_ENCODING, config.getCharset());
-
HttpResponse response = httpClient.execute(httpGet);
return getResponseStr(response, config);
} catch (Exception e) {
@@ -124,9 +121,6 @@ public class HttpClientUtil {
for (String key : header.keySet()) {
httpPost.addHeader(key, header.get(key));
}
- httpPost.addHeader(HTTP.CONTENT_TYPE, "application/json");
- httpPost.addHeader(HTTP.CONTENT_ENCODING, config.getCharset());
-
EntityBuilder entityBuilder = EntityBuilder.create();
entityBuilder.setText(json);
entityBuilder.setContentType(ContentType.APPLICATION_JSON);
@@ -180,8 +174,6 @@ public class HttpClientUtil {
for (String key : header.keySet()) {
httpPost.addHeader(key, header.get(key));
}
- httpPost.addHeader(HTTP.CONTENT_ENCODING, config.getCharset());
-
if (body != null && body.size() > 0) {
List nvps = new ArrayList<>();
for (String key : body.keySet()) {
From 6f7dd7dd7a001b607ff818c362931c5834c6d65b Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 1 Jul 2022 17:47:52 +0800
Subject: [PATCH 11/11] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8B=E6=9E=B6=E6=9C=89=E6=9D=83=E9=99=90?=
=?UTF-8?q?=E7=9A=84=E4=BB=AA=E8=A1=A8=E6=9D=BF=EF=BC=8C=E7=BC=96=E8=BE=91?=
=?UTF-8?q?=E9=A2=84=E8=A7=88=E6=97=B6=E6=8F=90=E7=A4=BA=E5=B7=B2=E4=B8=8B?=
=?UTF-8?q?=E6=9E=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/src/components/canvas/components/Editor/Preview.vue | 5 +++--
frontend/src/views/panel/edit/index.vue | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index 65f1bda35c..3c33311250 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -185,8 +185,9 @@ export default {
return this.$store.state.panel.mainActiveName
},
showUnpublishedArea() {
- // return this.panelInfo.status === 'unpublished'
- if (this.panelInfo && this.panelInfo.showType === 'view') {
+ if (this.showPosition === 'edit') {
+ return false
+ } else if (this.panelInfo && this.panelInfo.showType === 'view') {
return false
} else if ((this.mainActiveName === 'PanelMain' && this.activeTab === 'PanelList') || this.showPosition.includes('multiplexing')) {
return this.panelInfo.status === 'unpublished' && !hasDataPermission('manage', this.panelInfo.privileges)
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 1995bdfe1b..2cc9423b81 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -269,6 +269,7 @@
:show-type="canvasStyleData.selfAdaption?'full':'width'"
:canvas-style-data="canvasStyleData"
:component-data="componentData"
+ show-position="edit"
/>