Merge pull request #1857 from dataease/v1.8

V1.8

frontend/src/components/canvas/components/Editor/DateFormat.vue

@@ -119,6 +119,14 @@ export default {
       'curCanvasScale'
     ])
   },
+  watch: {
+    formatInfo: {
+      handler(newVal, oldVla) {
+        this.$store.state.styleChangeTimes++
+      },
+      deep: true
+    }
+  },
   created() {
 
   },

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

@@ -447,4 +447,13 @@ export default {
   ::v-deep .el-color-dropdown__link-btn {
     display: inline!important;
   }
+
+  ::v-deep input::-webkit-outer-spin-button,
+  ::v-deep input::-webkit-inner-spin-button {
+    /*-webkit-appearance: none !important;*/
+  }
+  ::v-deep input[type='number'] {
+    /*-moz-appearance: textfield !important;*/
+  }
+
 </style>

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

@@ -621,7 +621,6 @@ export default {
         this.currentFilterCom.mobileStyle = BASE_MOBILE_STYLE
         this.currentFilterCom.commonBackground || deepCopy(COMMON_BACKGROUND)
 
-
         if (this.currentWidget.filterDialog) {
           this.show = false
           this.openFilterDialog(true)
@@ -870,13 +869,14 @@ export default {
 
     // 如果内部样式有变化 1秒钟后保存一个镜像
     recordStyleChange(index) {
-      this.timeMachine = setTimeout(() => {
-        if (index === this.$store.state.styleChangeTimes) {
-          this.$store.commit('recordSnapshot', 'recordStyleChange')
+      if (index === this.$store.state.styleChangeTimes) {
+        this.timeMachine = setTimeout(() => {
+          // console.log('recordSnapshot')
+          this.$store.commit('recordSnapshot')
           this.$store.state.styleChangeTimes = 0
-        }
-        this.destroyTimeMachine()
-      }, 1000)
+          this.destroyTimeMachine()
+        }, 1000)
+      }
     },
     handleDragOver(e) {
       e.preventDefault()