Merge pull request #1997 from dataease/pr@dev@fix_panel-inner

frontend/src/components/DeDrag/index.vue

@@ -29,8 +29,7 @@
           ['de-drag-active-inner']:enabled,
           [classNameMouseOn]: mouseOn || active
         },
-        className,
-        'main-background'
+        className
       ]"
       :style="mainSlotStyle"
     >
@@ -44,7 +43,9 @@
       >
         <slot :name="handlei" />
       </div>
-      <slot />
+      <div :style="mainSlotStyleInner" class="main-background">
+        <slot />
+      </div>
     </div>
   </div>
 </template>
@@ -533,6 +534,10 @@ export default {
         width: this.computedMainSlotWidth,
         height: this.computedMainSlotHeight
       }
+      return style
+    },
+    mainSlotStyleInner() {
+      const style = {}
       if (this.element.commonBackground) {
         style['padding'] = (this.element.commonBackground.innerPadding || 0) + 'px'
         style['border-radius'] = (this.element.commonBackground.borderRadius || 0) + 'px'
@@ -1865,6 +1870,8 @@ export default {
   outline: 1px solid #70c0ff;
 }
   .main-background{
+    width: 100%;
+    height: 100%;
     background-size: 100% 100% !important;
   }
 </style>

frontend/src/components/canvas/custom-component/component-list.js

@@ -18,8 +18,8 @@ export const BASE_MOBILE_STYLE = {
 
 // 组件仪表板样式
 export const COMMON_BACKGROUND = {
-  enable: false,
-  backgroundType: 'innerImage',
+  enable: true,
+  backgroundType: 'color',
   color: '#FFFFFF',
   innerImage: null,
   outerImage: null,

frontend/src/views/background/index.vue

@@ -12,7 +12,7 @@
           <span class="params-title">{{ $t('panel.inner_padding') }}</span>
         </el-col>
         <el-col :span="15">
-          <el-slider v-model="curComponent.commonBackground.innerPadding" show-input :show-input-controls="false" input-size="mini" />
+          <el-slider v-model="curComponent.commonBackground.innerPadding" show-input :show-input-controls="false" input-size="mini" :max="15" />
         </el-col>
       </el-row>
       <el-row style="height: 50px;overflow: hidden">

frontend/src/views/chart/chart/chart.js

@@ -225,8 +225,8 @@ export const DEFAULT_YAXIS_EXT_STYLE = {
 }
 export const DEFAULT_BACKGROUND_COLOR = {
   color: '#ffffff',
-  alpha: 100,
-  borderRadius: 5
+  alpha: 0,
+  borderRadius: 0
 }
 export const DEFAULT_SPLIT = {
   name: {