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

backend/src/main/resources/i18n/messages_en_US.properties

@@ -288,4 +288,5 @@ i18n_Stopped=END
 i18n_Exec=Running
 i18n_no_trigger=The current setting does not trigger task generation.
 i18n_dataset_field_delete=Union field deleted,please set again and redo.
-i18n_es_limit=Elasticsearch version cannot be less than 6.3
+i18n_es_limit=Elasticsearch version cannot be less than 6.3
\ No newline at end of file
+i18n_ds_error=Preview fail：Execute SQL error。Cause field、table、dataset changed，please check
\ No newline at end of file

backend/src/main/resources/i18n/messages_zh_CN.properties

@@ -288,3 +288,4 @@ i18n_Exec=运行中
 i18n_no_trigger=当前设置没有触发任务生成
 i18n_dataset_field_delete=该自定义数据集有关联字段被删除，请重新确认关联关系并重做该数据集
 i18n_es_limit=Elasticsearch 版本不能小于6.3
+i18n_ds_error=预览数据错误：执行SQL失败。可能因相关字段、表、数据集等元素发生变更，请检查

backend/src/main/resources/i18n/messages_zh_TW.properties

@@ -290,4 +290,5 @@ i18n_Stopped=執行結束
 i18n_Exec=運行中
 i18n_no_trigger=当前设置没有触发任务生成 當前設置沒有觸發任務生成.
 i18n_dataset_field_delete=該自定義數據集有關聯字段被刪除，請重新確認關聯關系並重做該數據集
-i18n_es_limit=Elasticsearch 版本不能小於6.3
+i18n_es_limit=Elasticsearch 版本不能小於6.3
\ No newline at end of file
+i18n_ds_error=預覽數據錯誤：執行SQL失敗。可能因相關字段、表、數據集等元素發生變更，請檢查
\ No newline at end of file

frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue

@@ -154,11 +154,16 @@ export default {
       })
     },
     querySubjectWithGroup() {
-      this.slidersLoading = true
+      const _this = this
+      _this.slidersLoading = true
       querySubjectWithGroup({}).then(response => {
-        this.sliders = []
-        this.sliders = response.data
-        this.slidersLoading = false
+        _this.sliders = []
+        _this.sliders = response.data
+        _this.slidersLoading = false
+        if (_this.sliders.length < _this.currentIndex) {
+          _this.currentIndex = 1
+          this.$emit('reload')
+        }
       }).catch(() => {
         this.slidersLoading = false
       })

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

@@ -9,7 +9,7 @@
       style="height: 1px; position: absolute; left: 15px; right: 15px; top: 40px; box-sizing:border-box;border-bottom: 1px solid #e8eaed"
     />
     <div>
-      <slider />
+      <slider v-if="sliderShow" @reload="sliderReload" />
     </div>
     <!--折叠面板-->
     <div v-if="collapseShow" style="margin: 10px;overflow-y: auto">
@@ -83,6 +83,7 @@ export default {
   },
   data() {
     return {
+      sliderShow: true,
       panelInfo: this.$store.state.panel.panelInfo,
       activeNames: ['panel'],
       chart: null,
@@ -110,7 +111,12 @@ export default {
   },
 
   methods: {
-
+    sliderReload() {
+      this.sliderShow = false
+      this.$nextTick(() => {
+        this.sliderShow = true
+      })
+    },
     init() {
       // 初始化赋值
       const chart = deepCopy(this.canvasStyleData.chart)