Merge remote-tracking branch 'origin/dev' into dev

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

@@ -52,7 +52,7 @@
             :is-edit="isEdit"
             :active="active"
             :element="item.content"
-            :filters="filterMap[item.content.propValue && item.content.propValue.viewId]"
+            :filters="filterMap[item.content.propValue && item.content.propValue.viewId] || []"
             :out-style="outStyle"
           />
         </div>

frontend/src/utils/conditionUtil.js

@@ -48,7 +48,9 @@ export const buildFilterMap = panelItems => {
     }
     if (element.type === 'de-tabs') {
       element.options.tabList && element.options.tabList.forEach(tab => {
-        result[tab.content.propValue.viewId] = []
+        if (tab.content.propValue && tab.content.propValue.viewId) {
+          result[tab.content.propValue.viewId] = []
+        }
       })
     }
   })