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

frontend/src/components/canvas/utils/utils.js

@@ -66,7 +66,8 @@ export function mobile2MainCanvas(mainSource, mobileSource) {
 export function panelInit(componentDatas) {
   componentDatas.forEach(item => {
     if (item.component && item.component === 'de-date') {
-      if (item.options.attrs && !item.options.attrs.default) {
+      if (item.options.attrs &&
+        (!item.options.attrs.default || (item.serviceName === 'timeYearWidget' && item.options.attrs.default.dynamicInfill !== 'year') || (item.serviceName === 'timeMonthWidget' && item.options.attrs.default.dynamicInfill !== 'month'))) {
         const widget = ApplicationContext.getService(item.serviceName)
         if (widget && widget.defaultSetting) {
           item.options.attrs.default = widget.defaultSetting()

frontend/src/store/getters.js

@@ -16,6 +16,7 @@ const getters = {
   errorLogs: state => state.errorLog.logs,
   sceneData: state => state.dataset.sceneData,
   table: state => state.dataset.table,
+  chartTable: state => state.chart.table,
   hideCustomDs: state => state.dataset.hideCustomDs,
   loadingMap: state => state.request.loadingMap,
   currentPath: state => state.permission.currentPath,

frontend/src/styles/index.scss

@@ -534,14 +534,7 @@ div:focus {
   color: var(--Main) !important;
 }
 
-/* .blackTheme .el-dialog {
-    background: var(--ContentBG) !important;
-    color: var(--TextPrimary) !important;
-}
- */
-.blackTheme .el-dialog__title {
-  color: #ffffff !important;
-}
+
 
 .blackTheme .title-text {
   color: var(--TextPrimary) !important;
@@ -663,9 +656,7 @@ div:focus {
   background: #38393a !important;
 }
 
-.blackTheme .el-message-box__content {
-  color: #F2F6FC;
-}
+
 
 .blackTheme .el-message-box__btns {
   .el-button--default:not(.el-button--primary) {

frontend/src/views/chart/chart/map/map.js

@@ -26,7 +26,7 @@ export function baseMapOption(chart_option, chart) {
   // 处理data
   if (chart.data) {
     chart_option.title.text = chart.title
-    if (chart.data.series.length > 0) {
+    if (chart.data.series && chart.data.series.length > 0) {
       chart_option.series[0].name = chart.data.series[0].name
       // label
       if (customAttr.label) {

frontend/src/views/chart/components/ChartComponent.vue

@@ -74,7 +74,7 @@ import {
 import {
   baseMixOption
 } from '@/views/chart/chart/mix/mix'
-  // import eventBus from '@/components/canvas/utils/eventBus'
+// import eventBus from '@/components/canvas/utils/eventBus'
 import {
   uuid
 } from 'vue-uuid'
@@ -130,7 +130,8 @@ export default {
       pointParam: null,
 
       dynamicAreaCode: null,
-      borderRadius: '0px'
+      borderRadius: '0px',
+      mapCenter: null
     }
   },
 
@@ -276,6 +277,11 @@ export default {
       const base_json = JSON.parse(JSON.stringify(BASE_MAP))
       const chart_option = baseMapOption(base_json, chart)
       this.myEcharts(chart_option)
+      const opt = this.myChart.getOption()
+      if (opt && opt.series) {
+        const center = opt.series[0].center
+        this.mapCenter = center
+      }
     },
     myEcharts(option) {
       // 指定图表的配置项和数据
@@ -356,6 +362,7 @@ export default {
     resetZoom() {
       const options = JSON.parse(JSON.stringify(this.myChart.getOption()))
       options.series[0].zoom = 1
+      options.series[0].center = this.mapCenter
       this.myChart.setOption(options)
     }
   }

frontend/src/views/chart/group/Group.vue

@@ -558,7 +558,7 @@ export default {
               showClose: true
             })
             this.treeNode()
-            this.$store.dispatch('chart/setTable', null)
+            this.$store.dispatch('chart/setTable', new Date().getTime())
           })
         } else {
           // this.$message({

frontend/src/views/chart/view/ChartEdit.vue

 <template>
   <el-row v-loading="loading" style="height: 100%;overflow-y: hidden;width: 100%;">
     <el-row style="height: 40px;" class="padding-lr">
+      <span v-show="false">{{ refreshPage }}</span>
       <span class="title-text" style="line-height: 40px;">{{ view.name }}</span>
       <el-popover
         placement="right-start"
@@ -1105,11 +1106,10 @@ export default {
     }
   },
   computed: {
-    // vId() {
-    //   // console.log(this.$store.state.chart.viewId);
-    //   this.getData(this.$store.state.chart.viewId)
-    //   return this.$store.state.chart.viewId
-    // }
+    refreshPage: function() {
+      this.getChart(this.param.id)
+      return this.$store.getters.chartTable
+    },
     chartType() {
       return this.chart.type
     }

frontend/src/views/dataset/data/ViewTable.vue

 <template>
   <el-row style="height: 100%;overflow-y: hidden;width: 100%;">
-    <!--    <span v-show="false">{{ tableRefresh }}</span>-->
+    <span v-show="false">{{ refreshPage }}</span>
     <el-row style="height: 26px;">
       <span class="title-text" style="line-height: 26px;">
         {{ table.name }}
@@ -57,7 +57,7 @@
         <update-info v-if="tabActive=='updateInfo'" :param="param" :table="table" />
       </el-tab-pane>
       <el-tab-pane v-if="isPluginLoaded && hasDataPermission('manage',param.privileges)" :lazy="true" :label="$t('dataset.row_permissions')" name="rowPermissions">
-        <plugin-com v-if="isPluginLoaded && tabActive=='rowPermissions'" ref="RowPermissions" component-name="RowPermissions" :obj="table"/>
+        <plugin-com v-if="isPluginLoaded && tabActive=='rowPermissions'" ref="RowPermissions" component-name="RowPermissions" :obj="table" />
       </el-tab-pane>
     </el-tabs>
   </el-row>
@@ -75,7 +75,7 @@ import PluginCom from '@/views/system/plugin/PluginCom'
 
 export default {
   name: 'ViewTable',
-  components: {FieldEdit, UnionView, DatasetChartDetail, UpdateInfo, TabDataPreview, PluginCom },
+  components: { FieldEdit, UnionView, DatasetChartDetail, UpdateInfo, TabDataPreview, PluginCom },
   props: {
     param: {
       type: Object,
@@ -102,14 +102,13 @@ export default {
       isPluginLoaded: false
     }
   },
-  beforeCreate() {
-    pluginLoaded().then(res => {
-      this.isPluginLoaded = res.success && res.data
-    })
-  },
   computed: {
     hideCustomDs: function() {
       return this.$store.getters.hideCustomDs
+    },
+    refreshPage: function() {
+      this.initTable(this.param.id)
+      return this.$store.getters.table
     }
   },
   watch: {
@@ -118,6 +117,11 @@ export default {
       this.initTable(this.param.id)
     }
   },
+  beforeCreate() {
+    pluginLoaded().then(res => {
+      this.isPluginLoaded = res.success && res.data
+    })
+  },
   created() {
 
   },

mobile/dist/build/h5/index.html

-<!DOCTYPE html><html lang="zh-CN"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><title></title><script>document.addEventListener('DOMContentLoaded', function() {
-                document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
-            })
-            var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel="stylesheet" href="/de-app/static/index.a5c69d49.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script src="/de-app/static/js/chunk-vendors.2822c2ee.js"></script><script src="/de-app/static/js/index.12bd8b7a.js"></script></body></html>
\ No newline at end of file