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

frontend/src/components/ElVisualSelect/index.vue

@@ -1,5 +1,6 @@
 <template>
   <el-select
+    v-if="show"
     ref="visualSelect"
     v-model="selectValue"
     :class="classId"
@@ -52,7 +53,8 @@ export default {
       maxLength: 9, // 弹出框最大支持9个条目
       itemHeight: 34, // select组件选项高度
       maxHeightDom: null,
-      defaultFirst: false
+      defaultFirst: false,
+      show: true
     }
   },
   watch: {
@@ -69,9 +71,13 @@ export default {
     },
     list() {
       this.resetList()
+      this.show = false
+      this.$nextTick(() => {
+        this.show = true
         this.$nextTick(() => {
           this.init()
         })
+      })
     }
   },
   mounted() {

frontend/src/components/widget/DeWidget/DeSelect.vue

@@ -128,6 +128,8 @@ export default {
       this.element.options.attrs.fieldId.length > 0 &&
       method(param).then(res => {
         this.datas = this.optionDatas(res.data)
+      }).catch(e => {
+        bus.$emit('valid-values-change', false)
       }) || (this.element.options.value = '')
     },
     'element.options.attrs.multiple': function(value, old) {
@@ -167,6 +169,8 @@ export default {
           this.show = true
           this.handleCoustomStyle()
         })
+      }).catch(e => {
+        bus.$emit('valid-values-change', false)
       }) || (this.element.options.value = '')
     }
 
@@ -222,6 +226,8 @@ export default {
         }
         method({ fieldIds: this.element.options.attrs.fieldId.split(','), sort: this.element.options.attrs.sort }).then(res => {
           this.datas = this.optionDatas(res.data)
+        }).catch(e => {
+          bus.$emit('valid-values-change', false)
         })
       }
       if (this.element.options.value) {