瀏覽代碼

fix: 优化日历组件数据解析部分

李帅武 4 月之前
父節點
當前提交
af96edf734

+ 14 - 1
report-ui/src/mixins/queryform.js

@@ -288,7 +288,20 @@ export default {
       return analysisData;
     },
     widgetcalendar (chartProperties, data) {
-      return data
+      const analysisData = [];
+      for (let i = 0; i < data.length; i++) {
+        const obj = {};
+        for (const key in chartProperties) {
+          const value = chartProperties[key];
+          if (value === "date") {
+            obj["date"] = data[i][key];
+          } else {
+            obj["data"] = data[i][key];
+          }
+        }
+        analysisData.push(obj);
+      }
+      return analysisData;
     },
     // 坐标系数据解析
     coordChartFn(chartProperties, data) {

+ 1 - 1
report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-calendar.js

@@ -181,7 +181,7 @@ export const widgetCalendar = {
         relactiveDom: 'dataType',
         relactiveDomValue: 'dynamicData',
         chartType: 'widget-calendar',
-        dictKey: 'TEXT_PROPERTIES',
+        dictKey: 'CALENDAR_PROPERTIES',
         value: '',
       }
     ],