Merge branch 'dev' of github.com:dataease/dataease into dev

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 设置当前组件数据及状态

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',
@@ -113,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: '双击输入文字',
@@ -138,11 +133,8 @@ export default {
     // 监听内容变化
     active(val) {
       if (!val) {
-        this.editShow = false
         this.canEdit = false
-        this.$nextTick(() => {
-          this.editShow = true
-        })
+        this.reShow()
       }
     },
     // 监听内容变化
@@ -165,7 +157,14 @@ export default {
       if (this.editStatus) {
         this.canEdit = true
         this.element.editing = true
+        this.reShow()
       }
+    },
+    reShow() {
+      this.editShow = false
+      this.$nextTick(() => {
+        this.editShow = true
+      })
     }
   }
 }

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
+}

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')">

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;

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;

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;

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;

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;

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;

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;

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 {

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)
+        })
       }
     }
   }

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;
   }