epx-frame 4.1.12 → 4.1.13

package/lib/chart.js

@@ -17313,8 +17313,8 @@ var Table_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var Table = (Table_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/chart/Common.vue?vue&type=template&id=2440ef9a
-var Commonvue_type_template_id_2440ef9a_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/chart/Common.vue?vue&type=template&id=08c7ff96
+var Commonvue_type_template_id_08c7ff96_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -17573,11 +17573,11 @@ var Commonvue_type_template_id_2440ef9a_render = function () {
     ]
   )
 }
-var Commonvue_type_template_id_2440ef9a_staticRenderFns = []
-Commonvue_type_template_id_2440ef9a_render._withStripped = true
+var Commonvue_type_template_id_08c7ff96_staticRenderFns = []
+Commonvue_type_template_id_08c7ff96_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/frame/packages/chart/Common.vue?vue&type=template&id=2440ef9a
+// CONCATENATED MODULE: ./src/frame/packages/chart/Common.vue?vue&type=template&id=08c7ff96
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/typeof.js
 var esm_typeof = __webpack_require__(4);
@@ -18076,18 +18076,8 @@ var Commonvue_type_script_lang_js_excluded = ["total", "colItemSize", "rowItemSi
       this.oldScopeParams = this.$_.cloneDeep(this.allScopeParams);
       this.getDefaultConfigs();
       this.getChartData().then(function (data) {
-        var config = Object(objectSpread2["a" /* default */])({}, _this11.chartConfig);
-        for (var key in _this11.defaultConfigs) {
-          if (!_this11.chartConfig[key]) {
-            config[key] = _this11.defaultConfigs[key];
-          } else {
-            if (Object(esm_typeof["a" /* default */])(_this11.chartConfig[key]) === 'object' && !Array.isArray(_this11.chartConfig[key])) {
-              config[key] = Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, _this11.defaultConfigs[key]), _this11.chartConfig[key]);
-            }
-          }
-        }
         // 绘制图表
-        _this11.getChartOption(config, data);
+        _this11.getChartOption(_this11.chartConfig, data);
         if (!_this11.hasData) return;
         _this11.createChart();
         _this11.resizeObserver = _this11.openObserver();
@@ -18141,7 +18131,7 @@ var Commonvue_type_script_lang_js_excluded = ["total", "colItemSize", "rowItemSi
         var data = configs.series[0].data.map(function (item) {
           return item.name || '';
         });
-        if (configs.xAxis.type === 'value') {
+        if (configs.xAxis && configs.xAxis.type === 'value') {
           configs.yAxis.type = 'category';
           configs.yAxis.data = data;
         } else {
@@ -18159,6 +18149,10 @@ var Commonvue_type_script_lang_js_excluded = ["total", "colItemSize", "rowItemSi
           if (value.showArea) {
             delete value.showArea;
             value.areaStyle = {};
+          } else {
+            if (_this12.$_.isEmpty(value.areaStyle)) {
+              delete value.areaStyle;
+            }
           }
           if (value.radius) {
             item = Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, value), {}, {
@@ -18346,6 +18340,9 @@ var Commonvue_type_script_lang_js_excluded = ["total", "colItemSize", "rowItemSi
         nullShowPosition: nullShowPosition,
         totalFlag: totalFlag
       });
+      if (this.designMode) {
+        params.entityId = 'FM_REPORT_BASE';
+      }
       if (this.chartCache || this.chartConfigs.chartCache) {
         params.dataStatisType = 'cache';
       }
@@ -18364,7 +18361,17 @@ var Commonvue_type_script_lang_js_excluded = ["total", "colItemSize", "rowItemSi
         _this13.$message.error(err.message);
       });
     },
-    getChartOption: function getChartOption(config, data) {
+    getChartOption: function getChartOption(chartConfig, data) {
+      var config = Object(objectSpread2["a" /* default */])({}, chartConfig);
+      for (var key in this.defaultConfigs) {
+        if (!this.chartConfig[key]) {
+          config[key] = this.defaultConfigs[key];
+        } else {
+          if (Object(esm_typeof["a" /* default */])(chartConfig[key]) === 'object' && !Array.isArray(chartConfig[key])) {
+            config[key] = Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, this.defaultConfigs[key]), this.chartConfig[key]);
+          }
+        }
+      }
       var total = data.total,
         colItemSize = data.colItemSize,
         rowItemSize = data.rowItemSize,
@@ -18652,8 +18659,8 @@ var Commonvue_type_script_lang_js_excluded = ["total", "colItemSize", "rowItemSi
 
 var Common_component = Object(componentNormalizer["a" /* default */])(
   chart_Commonvue_type_script_lang_js,
-  Commonvue_type_template_id_2440ef9a_render,
-  Commonvue_type_template_id_2440ef9a_staticRenderFns,
+  Commonvue_type_template_id_08c7ff96_render,
+  Commonvue_type_template_id_08c7ff96_staticRenderFns,
   false,
   null,
   null,