Merge branch 'v1.8' of github.com:dataease/dataease into v1.8

frontend/src/components/canvas/components/TextAttr.vue

@@ -450,10 +450,10 @@ export default {
 
   ::v-deep input::-webkit-outer-spin-button,
   ::v-deep input::-webkit-inner-spin-button {
-    /*-webkit-appearance: none !important;*/
+    -webkit-appearance: none !important;
   }
   ::v-deep input[type='number'] {
-    /*-moz-appearance: textfield !important;*/
+    -moz-appearance: textfield !important;
   }
 
 </style>

frontend/src/views/background/BackgroundItem.vue

@@ -10,7 +10,7 @@
       :style="classBackground"
       @click.stop="setBoard"
     />
-      <span class="demonstration">{{ template.name }}</span>
+    <span class="demonstration">{{ template.name }}</span>
   </div>
 </template>
 
@@ -29,7 +29,7 @@ export default {
   },
   computed: {
     itemActive() {
-      return this.curComponent.commonBackground.innerImage === this.template.url
+      return this.curComponent.commonBackground && this.curComponent.commonBackground.innerImage === this.template.url
     },
     classBackground() {
       if (this.template.url) {

frontend/src/views/background/index.vue

@@ -102,7 +102,7 @@ export default {
     }
   },
   mounted() {
-    if (this.curComponent.commonBackground.outerImage && typeof (this.curComponent.commonBackground.outerImage) === 'string') {
+    if (this.curComponent.commonBackground && this.curComponent.commonBackground.outerImage && typeof (this.curComponent.commonBackground.outerImage) === 'string') {
       this.fileList.push({ url: this.curComponent.commonBackground.outerImage })
     }
     this.backgroundOrigin = deepCopy(this.curComponent.commonBackground)

frontend/src/views/panel/edit/index.vue

@@ -619,7 +619,7 @@ export default {
         this.currentFilterCom.id = newComponentId
         this.currentFilterCom.auxiliaryMatrix = this.canvasStyleData.auxiliaryMatrix
         this.currentFilterCom.mobileStyle = BASE_MOBILE_STYLE
-        this.currentFilterCom.commonBackground || deepCopy(COMMON_BACKGROUND)
+        this.currentFilterCom.commonBackground = this.currentFilterCom.commonBackground || deepCopy(COMMON_BACKGROUND)
 
         if (this.currentWidget.filterDialog) {
           this.show = false
@@ -649,7 +649,7 @@ export default {
       // 新拖入的组件矩阵状态 和仪表板当前的矩阵状态 保持一致
       component.auxiliaryMatrix = this.canvasStyleData.auxiliaryMatrix
       // 统一设置背景信息
-      component.commonBackground || deepCopy(COMMON_BACKGROUND)
+      component.commonBackground = component.commonBackground || deepCopy(COMMON_BACKGROUND)
 
       // 视图统一调整为复制
       if (componentInfo.type === 'view') {