From 19d344f4df70331b27ff52f89acd9cb46e3eee0e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 25 May 2022 13:36:26 +0800
Subject: [PATCH 1/5] =?UTF-8?q?refactor:=20=E8=A7=86=E5=9B=BE=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=B7=A5=E5=85=B7=E6=A0=8F=E5=AE=BD=E5=BA=A6=E6=89=A9?=
 =?UTF-8?q?=E5=A4=A7=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/components/drag-item/ChartDragItem.vue   |  2 +-
 .../components/drag-item/DimensionExtItem.vue      |  2 +-
 .../chart/components/drag-item/DimensionItem.vue   |  2 +-
 .../views/chart/components/drag-item/DrillItem.vue |  2 +-
 .../chart/components/drag-item/FilterItem.vue      |  2 +-
 .../chart/components/drag-item/QuotaExtItem.vue    |  2 +-
 .../views/chart/components/drag-item/QuotaItem.vue |  2 +-
 frontend/src/views/chart/view/ChartEdit.vue        | 14 +++++++-------
 frontend/src/views/panel/edit/index.vue            |  2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/frontend/src/views/chart/components/drag-item/ChartDragItem.vue b/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
index a89f168e1c..0f77f73cb9 100644
--- a/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
+++ b/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
@@ -257,7 +257,7 @@ export default {
 
   .item-span-style{
     display: inline-block;
-    width: 70px;
+    width: 100px;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
diff --git a/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue b/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue
index 30295cc9f9..5076a946bd 100644
--- a/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue
+++ b/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue
@@ -245,7 +245,7 @@ export default {
 
   .item-span-style{
     display: inline-block;
-    width: 70px;
+    width: 100px;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
diff --git a/frontend/src/views/chart/components/drag-item/DimensionItem.vue b/frontend/src/views/chart/components/drag-item/DimensionItem.vue
index 7e1278f9ca..67934cfa43 100644
--- a/frontend/src/views/chart/components/drag-item/DimensionItem.vue
+++ b/frontend/src/views/chart/components/drag-item/DimensionItem.vue
@@ -284,7 +284,7 @@ export default {
 
   .item-span-style{
     display: inline-block;
-    width: 70px;
+    width: 100px;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
diff --git a/frontend/src/views/chart/components/drag-item/DrillItem.vue b/frontend/src/views/chart/components/drag-item/DrillItem.vue
index 3920254080..0103c45771 100644
--- a/frontend/src/views/chart/components/drag-item/DrillItem.vue
+++ b/frontend/src/views/chart/components/drag-item/DrillItem.vue
@@ -141,7 +141,7 @@ export default {
 
   .item-span-style{
     display: inline-block;
-    width: 100px;
+    width: 115px;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
diff --git a/frontend/src/views/chart/components/drag-item/FilterItem.vue b/frontend/src/views/chart/components/drag-item/FilterItem.vue
index 52a84d28a4..4c96c40683 100644
--- a/frontend/src/views/chart/components/drag-item/FilterItem.vue
+++ b/frontend/src/views/chart/components/drag-item/FilterItem.vue
@@ -149,7 +149,7 @@ export default {
 
   .item-span-style{
     display: inline-block;
-    width: 100px;
+    width: 115px;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
diff --git a/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue b/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
index cfc44ec5a6..f6cca755eb 100644
--- a/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
+++ b/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
@@ -359,7 +359,7 @@ export default {
 
   .item-span-style{
     display: inline-block;
-    width: 50px;
+    width: 80px;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
diff --git a/frontend/src/views/chart/components/drag-item/QuotaItem.vue b/frontend/src/views/chart/components/drag-item/QuotaItem.vue
index 7bd7c72bba..257411e597 100644
--- a/frontend/src/views/chart/components/drag-item/QuotaItem.vue
+++ b/frontend/src/views/chart/components/drag-item/QuotaItem.vue
@@ -355,7 +355,7 @@ export default {
 
   .item-span-style{
     display: inline-block;
-    width: 50px;
+    width: 80px;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 364cdfa3b9..4874cd3f03 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -40,7 +40,7 @@
     </el-row>
     <el-row class="view-panel-row">
       <el-tabs :stretch="true" class="tab-header">
-        <el-tab-pane :label="$t('chart.chart_data')" class="padding-tab" style="width: 300px">
+        <el-tab-pane :label="$t('chart.chart_data')" class="padding-tab" style="width: 350px">
           <div v-if="view.dataFrom==='template'" class="view-panel-Mask">
             <span style="opacity: 1;">
               <el-button
@@ -56,7 +56,7 @@
             </span>
           </div>
           <el-row class="view-panel">
-            <el-col class="theme-border-class" :span="12" style="border-right: 1px solid #E6E6E6;">
+            <el-col class="theme-border-class" :span="11" style="border-right: 1px solid #E6E6E6;">
               <div style="display: flex;align-items: center;justify-content: center;padding: 6px;">
                 <el-input
                   v-model="searchField"
@@ -145,7 +145,7 @@
             </el-col>
 
             <el-col
-              :span="12"
+              :span="13"
               style="height: 100%;border-right: 1px solid #E6E6E6;"
               class="theme-border-class"
             >
@@ -650,7 +650,7 @@
             </el-col>
           </el-row>
         </el-tab-pane>
-        <el-tab-pane :label="$t('chart.chart_style')" class="padding-tab" style="width: 300px">
+        <el-tab-pane :label="$t('chart.chart_style')" class="padding-tab" style="width: 350px">
           <chart-style
             v-if="chartProperties || view.isPlugin"
             :param="param"
@@ -675,7 +675,7 @@
             @onChangeBackgroundForm="onChangeBackgroundForm"
           />
         </el-tab-pane>
-        <el-tab-pane :label="$t('chart.senior')" class="padding-tab" style="width: 300px;">
+        <el-tab-pane :label="$t('chart.senior')" class="padding-tab" style="width: 350px;">
           <el-row class="view-panel">
             <div
               v-if="view.type && (view.type.includes('bar') || view.type.includes('line') || view.type.includes('mix') || view.type.includes('gauge')) || view.type === 'text'"
@@ -2523,7 +2523,7 @@ export default {
   position:absolute;
   top:0px;
   left: 0px;
-  width: 300px;
+  width: 350px;
   z-index: 2;
   cursor:not-allowed;
   display: flex;
@@ -2848,7 +2848,7 @@ span {
 }
 
 ::v-deep .item-axis {
-  width: 128px !important;
+  width: 168px !important;
 }
 
 ::v-deep .el-slider__input {
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 7a902d50c6..8f8ac300e1 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -1366,7 +1366,7 @@ export default {
   }
 
   .tools-window-main {
-    width: 300px;
+    width: 350px;
     background-color: #FFFFFF;
     transition: 1s;
   }

From 929d1f64e2700b9974e8bd29728e61bd68f33099 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 25 May 2022 14:09:24 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=A0=87=E9=A2=98=E9=A2=9C=E8=89=B2=E6=94=B9?=
 =?UTF-8?q?=E5=8F=98=E6=9C=AA=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/components/component-style/TitleSelectorAntV.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue b/frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue
index 47c0119534..63178fcfbe 100644
--- a/frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue
+++ b/frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue
@@ -22,7 +22,7 @@
             </el-select>
           </el-form-item>
            <el-form-item v-show="showProperty('color')" :label="$t('chart.text_color')" class="form-item">
-            <el-color-picker v-model="titleForm.color" class="color-picker-style" :predefine="predefineColors" @change="changeTitleStyle('fontSize')" />
+            <el-color-picker v-model="titleForm.color" class="color-picker-style" :predefine="predefineColors" @change="changeTitleStyle('color')" />
           </el-form-item>
            <el-form-item v-show="showProperty('hPosition')" :label="$t('chart.text_h_position')" class="form-item">
             <el-radio-group v-model="titleForm.hPosition" size="mini" @change="changeTitleStyle('hPosition')">

From e176d364c660397ac7e4ca58c6639b184751c6db Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 25 May 2022 14:51:15 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E5=AD=98=E9=87=8F=E8=A7=86=E5=9B=BE=E6=9C=AA=E6=B8=85=E7=90=86?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E9=80=89=E6=8B=A9=E6=A1=86=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/Editor/ComponentWrapper.vue         | 8 +++++---
 frontend/src/views/panel/ViewSelect/multiplexing.vue      | 8 ++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
index 6076398ad2..2348da6501 100644
--- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
@@ -208,9 +208,11 @@ export default {
 
     handleClick() {
       const events = this.config.events
-      Object.keys(events).forEach(event => {
-        this[event](events[event])
-      })
+      if (events) {
+        Object.keys(events).forEach(event => {
+          this[event](events[event])
+        })
+      }
     },
     elementMouseDown(e) {
       // private 设置当前组件数据及状态
diff --git a/frontend/src/views/panel/ViewSelect/multiplexing.vue b/frontend/src/views/panel/ViewSelect/multiplexing.vue
index 920dee4020..787989953c 100644
--- a/frontend/src/views/panel/ViewSelect/multiplexing.vue
+++ b/frontend/src/views/panel/ViewSelect/multiplexing.vue
@@ -75,18 +75,22 @@ export default {
           })
         })
       } else if (params.showType === 'view') {
+        _this.componentData = []
         const componentId = uuid.v1()
         _this.canvasStyleData = deepCopy(DEFAULT_COMMON_CANVAS_STYLE_STRING)
         const userView = {
           ... deepCopy(USER_VIEW),
-          'id': componentId }
+          'id': componentId,
+          'auxiliaryMatrix': false }
         userView.style.width = _this.canvasStyleData.width
         userView.style.height = _this.canvasStyleData.height
         userView['propValue'] = {
           'viewId': params.showId,
           'id': componentId
         }
-        _this.componentData.push(userView)
+        _this.$nextTick(() => {
+          _this.componentData.push(userView)
+        })
       }
     }
   }

From 9135aa4e977c5bc5cb5d5c618903ef46ab181047 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 25 May 2022 16:54:44 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=8C=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E8=A1=A8=E6=A0=BC=E3=80=81=E5=9B=BE=E7=89=87=E7=AD=89?=
 =?UTF-8?q?=E6=8B=96=E6=8B=BD=E7=84=A6=E7=82=B9=E7=BC=96=E8=BE=91=E6=97=B6?=
 =?UTF-8?q?=E9=94=99=E4=BD=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/custom-component/DeRichText.vue    | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/canvas/custom-component/DeRichText.vue b/frontend/src/components/canvas/custom-component/DeRichText.vue
index 52d34d89d7..3f245890e7 100644
--- a/frontend/src/components/canvas/custom-component/DeRichText.vue
+++ b/frontend/src/components/canvas/custom-component/DeRichText.vue
@@ -9,13 +9,7 @@
       :disabled="!canEdit"
       @onClick="onClick"
     />
-    <!--    <div v-show="!canEdit" style="width: 100%;height: 100%" @dblclick="setEdit" v-html="myValue" />-->
   </div>
-<!--  <div v-else class="rich-main-class">-->
-<!--    <Editor :id="tinymceId"/>-->
-<!--    <div v-html="myValue" />-->
-<!--  </div>-->
-
 </template>
 
 <script>
@@ -101,10 +95,10 @@ export default {
       editShow: true,
       canEdit: false,
       // 初始化配置
-      tinymceId: 'tinymce',
+      tinymceId: 'tinymce-' + this.element.id,
       myValue: this.propValue,
       init: {
-        selector: '#tinymce',
+        selector: '#tinymce-' + this.element.id,
         toolbar_items_size: 'small',
         language_url: '/tinymce/langs/zh_CN.js', // 汉化路径是自定义的，一般放在public或static里面
         language: 'zh_CN',
@@ -138,11 +132,8 @@ export default {
     // 监听内容变化
     active(val) {
       if (!val) {
-        this.editShow = false
         this.canEdit = false
-        this.$nextTick(() => {
-          this.editShow = true
-        })
+        this.reShow()
       }
     },
     // 监听内容变化
@@ -165,7 +156,14 @@ export default {
       if (this.editStatus) {
         this.canEdit = true
         this.element.editing = true
+        this.reShow()
       }
+    },
+    reShow() {
+      this.editShow = false
+      this.$nextTick(() => {
+        this.editShow = true
+      })
     }
   }
 }

From fb894df6c9f3574d7474df4bddb805b70e036c88 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 25 May 2022 17:51:19 +0800
Subject: [PATCH 5/5] =?UTF-8?q?refactor:=20=E5=AF=8C=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E4=BD=93=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/custom-component/DeRichText.vue   | 3 ++-
 frontend/src/styles/index.scss                              | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/canvas/custom-component/DeRichText.vue b/frontend/src/components/canvas/custom-component/DeRichText.vue
index 3f245890e7..b5af64ff45 100644
--- a/frontend/src/components/canvas/custom-component/DeRichText.vue
+++ b/frontend/src/components/canvas/custom-component/DeRichText.vue
@@ -107,11 +107,12 @@ export default {
         plugins: 'advlist autolink link image lists charmap  media wordcount table contextmenu directionality pagebreak', // 插件
         // 工具栏
         // toolbar: 'undo redo |  fontsizeselect fontselect | bold italic forecolor backcolor underline strikethrough | alignleft aligncenter alignright | lists image media table link | bullist numlist ',
-        toolbar: 'undo redo |fontsizeselect forecolor backcolor bold italic underline strikethrough link | ' +
+        toolbar: 'undo redo |formatselect fontselect fontsizeselect forecolor backcolor bold italic underline strikethrough link | ' +
             'alignleft aligncenter alignright | bullist numlist |' +
             ' blockquote subscript superscript removeformat | table image media | fullscreen ' +
             '| bdmap indent2em lineheight formatpainter axupimgs',
         toolbar_location: '/',
+        font_formats: '微软雅黑=Microsoft YaHei;宋体=SimSun;黑体=SimHei;仿宋=FangSong;华文黑体=STHeiti;华文楷体=STKaiti;华文宋体=STSong;华文仿宋=STFangsong;Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings',
         fontsize_formats: '12px 14px 16px 18px 20px 22px 24px 28px 32px 36px 48px 56px 72px', // 字体大小
         menubar: false,
         placeholder: '双击输入文字',
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index fe27ea6c07..004dcede6a 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -27,7 +27,7 @@ body {
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
-  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial,FangSong,SimHei,STHeiti,STKaiti,STSong,STFangsong sans-serif;
 }
 
 label {
@@ -815,7 +815,7 @@ div:focus {
 }
 
 .pwd-tips > span {
-    
+
     font-weight: 800;
     color: #F56C6C;
 }
@@ -832,4 +832,4 @@ div:focus {
 }
 .fu-operator-component__label {
   width: 100px !important;
-}
\ No newline at end of file
+}