From cfcbe04cae6ebb41a573601af6fb7521798de461 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 1 Aug 2022 17:21:01 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A):=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=8F=91=E9=80=81=E8=A7=86=E5=9B=BE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=8C=85=E5=90=AB=E6=97=A0=E6=95=88=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/service/chart/ViewExportExcel.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java b/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java
index 67f830aee8..ee7cd97324 100644
--- a/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java
+++ b/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java
@@ -104,7 +104,7 @@ public class ViewExportExcel {
             Object val = row.get(key);
             if (ObjectUtils.isEmpty(val))
                 return StringUtils.EMPTY;
-            return val.toString();
+            return filterInvalidDecimal(val.toString());
         }).collect(Collectors.toList())).collect(Collectors.toList());
         result.setHeads(heads);
         result.setDatas(details);
@@ -112,4 +112,12 @@ public class ViewExportExcel {
         result.setSheetName(title);
         return result;
     }
+
+    private String filterInvalidDecimal(String sourceNumberStr) {
+        if (StringUtils.isNotBlank(sourceNumberStr) && StringUtils.contains(sourceNumberStr, ".")) {
+            sourceNumberStr = sourceNumberStr.replaceAll("0+?$", "");
+            sourceNumberStr = sourceNumberStr.replaceAll("[.]$", "");
+        }
+        return sourceNumberStr;
+    }
 }

From ae5cc25d8af8e1dff129f0ecf88bb398ec3f73a3 Mon Sep 17 00:00:00 2001
From: fit2cloudrd <reaperww@gmail.com>
Date: Mon, 1 Aug 2022 18:39:05 +0800
Subject: [PATCH 2/4] =?UTF-8?q?style(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE=E3=80=81=E8=81=94=E5=8A=A8?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=80=89=E6=8B=A9=E6=8C=89=E9=92=AE=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=8F=98=E6=9B=B4=20(#2755)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor(仪表板): 主题色更换保留原标题显示方式

* refator(仪表板): 主题色切换，过滤组件默认颜色设置

* refator(仪表板): 主题色切换，适配tab组件

* refactor(仪表板): 符号地图适配主题变化

* style(仪表板): 批量设置、联动设置选择按钮位置变更

Co-authored-by: wangjiahao <1522128093@qq.com>
---
 frontend/src/components/canvas/components/Editor/EditBar.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue
index 387363fd08..1f9efcce4d 100644
--- a/frontend/src/components/canvas/components/Editor/EditBar.vue
+++ b/frontend/src/components/canvas/components/Editor/EditBar.vue
@@ -101,7 +101,7 @@ export default {
   },
   computed: {
     showEditPosition() {
-      if (this.activeModel === 'edit') {
+      if (this.activeModel === 'edit' && !this.linkageAreaShow && !this.batchOptAreaShow) {
         const toRight = (this.canvasStyleData.width - this.element.style.left - this.element.style.width) * this.curCanvasScale.scalePointWidth
         const toLeft = this.element.style.left * this.curCanvasScale.scalePointWidth
         if (this.barWidth < toRight) {
@@ -183,7 +183,7 @@ export default {
         this.$store.commit('addCurMultiplexingComponent', { 'component': this.element, 'componentId': this.element.id })
       } else {
         // remove
-        this.$store.commit('removeCurMultiplexingComponentWithId', this.element.id )
+        this.$store.commit('removeCurMultiplexingComponentWithId', this.element.id)
       }
     },
     closePreview() {

From 955977ab13789cfd21d28205a84f11392323d2e3 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 1 Aug 2022 20:59:14 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF-=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=BF=87=E6=BB=A4=E5=99=A8):=20=E7=B2=BE=E7=A1=AE?=
 =?UTF-8?q?=E5=88=B0=E5=B0=8F=E6=97=B6=E4=BD=86=E6=98=AF=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=88=86=E9=92=9F=E9=80=89=E6=8B=A9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/widget/DeWidget/DeDate.vue | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/widget/DeWidget/DeDate.vue b/frontend/src/components/widget/DeWidget/DeDate.vue
index 93ef2f6c07..9d2944983e 100644
--- a/frontend/src/components/widget/DeWidget/DeDate.vue
+++ b/frontend/src/components/widget/DeWidget/DeDate.vue
@@ -1,9 +1,9 @@
 <template>
   <el-date-picker
-    v-if="element.options!== null && element.options.attrs!==null"
+    v-if="element.options!== null && element.options.attrs!==null && show"
     ref="dateRef"
     v-model="values"
-    popper-class="coustom-date-picker"
+    :popper-class="'coustom-date-picker' + ' ' + extPoperClass"
     :type="componentType"
     :range-separator="$t(element.options.attrs.rangeSeparator)"
     :start-placeholder="$t(element.options.attrs.startPlaceholder)"
@@ -56,10 +56,17 @@ export default {
     return {
       operator: 'between',
       values: null,
-      onFocus: false
+      onFocus: false,
+      show: true
     }
   },
   computed: {
+    extPoperClass() {
+      if(this.labelFormat && this.labelFormat.includes('HH') && !this.labelFormat.includes('HH:mm')) {
+        return 'de-no-minite'
+      }
+      return ''
+    },
     defaultoptions() {
       if (!this.element || !this.element.options || !this.element.options.attrs.default) return ''
       return JSON.stringify(this.element.options.attrs.default)
@@ -118,6 +125,14 @@ export default {
       const widget = ApplicationContext.getService(this.element.serviceName)
       this.values = widget.dynamicDateFormNow(this.element)
       this.dateChange(this.values)
+    },
+    'labelFormat': function(val, old) {
+      if(val !== old) {
+        this.show = false
+        this.$nextTick(() => {
+          this.show = true
+        })
+      }
     }
   },
   created() {
@@ -285,4 +300,13 @@ export default {
     color: #409EFF;
   }
 }
+
+.de-no-minite {
+  .el-time-spinner__wrapper {
+    width: 100% !important;
+  }
+  .el-scrollbar:nth-of-type(2) {
+    display: none;
+  }
+}
 </style>

From 53313b5dddc2718245e373f810e135b3cca29d59 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 2 Aug 2022 11:53:59 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9F=A9=E5=BD=A2=E7=BB=84=E4=BB=B6=E5=A4=8D?=
 =?UTF-8?q?=E7=94=A8=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F=E4=B8=A2=E5=A4=B1?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Editor/ComponentWrapper.vue    |  7 ++++++-
 .../canvas/components/Editor/EditBar.vue      |  6 +++++-
 .../canvas/components/Editor/Preview.vue      |  1 +
 frontend/src/components/canvas/store/copy.js  | 19 ++++++++++++-------
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
index 06ea2fb30b..1e2092f4e7 100644
--- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
@@ -5,7 +5,7 @@
     @click="handleClick"
     @mousedown="elementMouseDown"
   >
-    <edit-bar v-if="componentActiveFlag" :element="config" :show-position="showPosition" @showViewDetails="showViewDetails" />
+    <edit-bar v-if="componentActiveFlag" :source-element="sourceConfig" :element="config" :show-position="showPosition" @showViewDetails="showViewDetails" />
     <div :id="componentCanvasId" :style="commonStyle" class="main_view">
       <close-bar v-if="previewVisible" @closePreview="closePreview" />
       <de-out-widget
@@ -62,6 +62,11 @@ export default {
   components: { CloseBar, MobileCheckBar, DeOutWidget, EditBar },
   mixins: [mixins],
   props: {
+    sourceConfig: {
+      type: Object,
+      require: true,
+      default: null
+    },
     config: {
       type: Object,
       require: true,
diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue
index 1f9efcce4d..84408c7dc2 100644
--- a/frontend/src/components/canvas/components/Editor/EditBar.vue
+++ b/frontend/src/components/canvas/components/Editor/EditBar.vue
@@ -58,6 +58,10 @@ export default {
   components: { SettingMenu, LinkageField },
 
   props: {
+    sourceElement: {
+      type: Object,
+      required: true
+    },
     element: {
       type: Object,
       required: true
@@ -180,7 +184,7 @@ export default {
     multiplexingCheck(val) {
       if (val) {
         // push
-        this.$store.commit('addCurMultiplexingComponent', { 'component': this.element, 'componentId': this.element.id })
+        this.$store.commit('addCurMultiplexingComponent', { 'component': this.sourceElement, 'componentId': this.element.id })
       } else {
         // remove
         this.$store.commit('removeCurMultiplexingComponentWithId', this.element.id)
diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index cc0ea8e755..d16bf49c09 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -26,6 +26,7 @@
           :key="index"
           ref="viewWrapperChild"
           :config="item"
+          :source-config="componentData[index]"
           :search-count="searchCount"
           :in-screen="inScreen"
           :terminal="terminal"
diff --git a/frontend/src/components/canvas/store/copy.js b/frontend/src/components/canvas/store/copy.js
index d483731abb..a353aa4737 100644
--- a/frontend/src/components/canvas/store/copy.js
+++ b/frontend/src/components/canvas/store/copy.js
@@ -9,13 +9,13 @@ export default {
   state: {
     copyData: null, // 复制粘贴剪切
     isCut: false,
+    baseStyle: {
+      width: 300,
+      height: 200,
+      top: 0,
+      left: 0
+    },
     viewBase: {
-      style: {
-        width: 300,
-        height: 200,
-        top: 0,
-        left: 0
-      },
       x: 1,
       y: 216,
       sizex: 48,
@@ -39,10 +39,15 @@ export default {
         const component =
           {
             ...deepCopy(state.curMultiplexingComponents[componentId]),
-            ...deepCopy(deepCopy(state.viewBase)),
+            ...deepCopy(state.viewBase),
             'auxiliaryMatrix': canvasStyleData.auxiliaryMatrix
           }
 
+        component.style = {
+          ...component.style,
+          ...deepCopy(state.baseStyle)
+        }
+
         const tilePosition = index % 3
         const divisiblePosition = parseInt(index / 3)
         if (canvasStyleData.auxiliaryMatrix) {