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

7490f8f0 · taojinlong · 8453e192 · 2a08e184 · 7490f8f0 · 7490f8f0
Commit 7490f8f0 authored 3 years ago by taojinlong
Hide whitespace changes
Inline Side-by-side

Showing

with 14 additions and 1 deletion
+14 -1
--- a/frontend/src/components/canvas/custom-component/UserViewDialog.vue
+++ b/frontend/src/components/canvas/custom-component/UserViewDialog.vue
@@ -123,10 +123,24 @@ export default {
        if (!this.curComponent && this.lastMapChart) {
          return this.lastMapChart
        }
+        if (this.curComponent && this.curComponent.options && this.curComponent.options.tabList && this.curComponent.options.tabList.length) {
+          const tabList = JSON.parse(JSON.stringify(this.curComponent.options.tabList))
+          tabList.forEach(tab => {
+            if (tab.content &&
+              tab.content.propValue &&
+              tab.content.propValue.viewId &&
+              tab.content.propValue.viewId === this.chart.id &&
+              tab.content.DetailAreaCode &&
+              tab.content.DetailAreaCode.length) {
+              DetailAreaCode = tab.content.DetailAreaCode
+            }
+          })
+        }
        const result = { ...temp, ...{ DetailAreaCode: DetailAreaCode }}
        this.setLastMapChart(result)
        return result
      }
+
      return null
    }
  },

--- a/mobile/public/index.html
+++ b/mobile/public/index.html
@@ -3,7 +3,6 @@

    <head>
        <meta charset="utf-8">
-		<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
        <title>
            <%= htmlWebpackPlugin.options.title %>