sea-chart 0.0.4-beta → 0.0.5

package/dist/api/index.js

@@ -80,24 +80,7 @@ class SeaChartAPI {
     this.instance = new SeaChartAPI(config);
     return this.instance;
   }
-  async init(config) {
-    if (config && typeof config === 'object') {
-      const {
-        appName,
-        accessToken,
-        dtableUuid,
-        dtableServer,
-        dtableSocket,
-        dtableDb
-      } = config;
-      this.appName = appName;
-      this.accessToken = accessToken;
-      this.dtableUuid = dtableUuid;
-      this.dtableServer = dtableServer.replace(/\/+$/, '') + '/';
-      this.dtableSocket = dtableSocket.replace(/\/+$/, '') + '/';
-      this.dtableDB = dtableDb.replace(/\/+$/, '') + '/';
-      return;
-    }
+  async init() {
     const accessTokenRes = await this.getDTableAccessToken();
     const {
       app_name,

package/dist/context.js

@@ -3,18 +3,20 @@ import CollaboratorManager from './utils/collaborator-manager';
 import { ChartDataSQL } from './utils';
 class Context {
   constructor() {
-    this.queryResult = _ref => {
+    this.queryChartResult = _ref => {
       let {
         chart,
         tables,
         onSuccess,
         onFail
       } = _ref;
-      if (this.api.queryResult) {
-        return this.api.queryResult({
-          chart,
-          onSuccess,
-          onFail
+      // used custom api to get chart result data
+      if (this.api.queryChartResult) {
+        const chartId = chart.id;
+        return this.api.queryChartResult(chartId).then(res => {
+          onSuccess && onSuccess(res);
+        }).catch(error => {
+          onFail && onFail(error);
         });
       }
       const table = getTableById(tables, chart.config.table_id);
@@ -38,7 +40,6 @@ class Context {
     };
     this.api = null;
     this.settings = {};
-    this.hasInit = false;
     this.collaborators = [];
     this.collaboratorManager = null;
   }
@@ -50,7 +51,6 @@ class Context {
       collaborators,
       collaboratorManager
     } = props;
-    if (this.hasInit) return;
     if (!config) {
       throw new Error('Props config is required');
     }

package/dist/editor/index.css

@@ -0,0 +1,23 @@
+.sea-chart-editor {
+  flex: 1;
+  display: flex;
+  min-height: 0;
+  min-width: 0;
+}
+
+.sea-chart-editor .sea-chart-formatter {
+  flex: 1;
+  display: flex;
+  min-height: 0;
+  min-width: 0;
+}
+
+.sea-chart-editor .sea-chart-settings {
+  width: 300px;
+  height: 100%;
+  background-color: #fff;
+  margin-left: 16px;
+  border-top: 1px solid #e4e4e4;
+  border-left: 1px solid #e4e4e4;
+  border-right: 1px solid #e4e4e4;
+}

package/dist/editor/index.js

@@ -1,6 +1,4 @@
 import React from 'react';
-import ReactDOM from 'react-dom';
-import classnames from 'classnames';
 import context from '../context';
 import View from '../view';
 import Settings from '../settings';
@@ -11,24 +9,13 @@ class Editor extends React.PureComponent {
     context.init(props);
   }
   render() {
-    const {
-      settingsTarget
-    } = this.props;
-    let settingsTargetNode = '';
-    if (settingsTarget) {
-      settingsTargetNode = document.getElementById(settingsTarget);
-      if (settingsTargetNode) {
-        ReactDOM.render( /*#__PURE__*/React.createElement(Settings, this.props), settingsTargetNode);
-      }
-    }
     return /*#__PURE__*/React.createElement("div", {
-      className: classnames('sea-chart-editor', {
-        'd-flex': !settingsTargetNode
-      })
-    }, /*#__PURE__*/React.createElement(View, this.props), !settingsTargetNode && /*#__PURE__*/React.createElement(Settings, this.props));
+      className: "sea-chart-editor"
+    }, /*#__PURE__*/React.createElement(View, this.props), /*#__PURE__*/React.createElement(Settings, this.props));
   }
 }
 Editor.defaultProps = {
+  isStatisticalData: true,
   canvasStyle: {},
   tables: [],
   chart: {

package/dist/utils/chart-utils.js

@@ -1376,7 +1376,7 @@ ChartUtils.convertConfig = config => {
 ChartUtils.imEmptyChartResult = chartResult => {
   return !chartResult || !chartResult.result && chartResult.result !== 0 || Array.isArray(chartResult.result) && chartResult.result.length === 0;
 };
-ChartUtils.calculateChart = (chart, tables, callback) => {
+ChartUtils.calculateChart = (chart, tables, callback, isChartData) => {
   if (!_class.isValidExistChart(tables, chart)) {
     const tip_message = 'Please_complete_the_chart_configuration_first';
     return callback && callback('', tip_message, null);
@@ -1412,7 +1412,7 @@ ChartUtils.calculateChart = (chart, tables, callback) => {
     const error_message = 'There_are_some_problems_with_the_filters';
     return callback && callback(error_message, '', null);
   }
-  context.queryResult({
+  context.queryChartResult({
     chart,
     tables,
     onSuccess: res => {
@@ -1422,24 +1422,26 @@ ChartUtils.calculateChart = (chart, tables, callback) => {
         error_message
       } = res.data;
       if (success) {
-        const tipMessage = 'There_are_no_statistic_results_yet';
-        if (!Array.isArray(sqlRows) || sqlRows.length === 0) {
-          callback && callback('', tipMessage, null);
-          return;
-        }
-        const chartResult = _class.sqlResult2JavaScript(newChart, sqlRows, chartSQLMap, columnMap, tables);
-        if (_class.imEmptyChartResult(chartResult)) {
-          callback && callback('', tipMessage, null);
+        if (isChartData) {
+          const tipMessage = 'There_are_no_statistic_results_yet';
+          if (!Array.isArray(sqlRows) || sqlRows.length === 0) {
+            callback && callback('', tipMessage, null);
+            return;
+          }
+          const chartResult = _class.sqlResult2JavaScript(newChart, sqlRows, chartSQLMap, columnMap, tables);
+          if (_class.imEmptyChartResult(chartResult)) {
+            callback && callback('', tipMessage, null);
+            return;
+          }
+          callback && callback('', '', {
+            ...chartResult,
+            groupbyColumn,
+            columnGroupbyColumn,
+            summaryColumn,
+            chartTableColumns
+          });
           return;
         }
-        callback && callback('', '', {
-          ...chartResult,
-          groupbyColumn,
-          columnGroupbyColumn,
-          summaryColumn,
-          chartTableColumns
-        });
-        return;
       }
       callback && callback(error_message, '', null);
     },

package/dist/view/index.js

@@ -52,7 +52,8 @@ class View extends React.PureComponent {
       let isNeedRequestData = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
       const {
         tables,
-        chart
+        chart,
+        isStatisticalData
       } = _this.props;
       const {
         data
@@ -61,7 +62,7 @@ class View extends React.PureComponent {
         ChartUtils.calculateStaticChart(tables, chart, data, _this.callback);
         return;
       }
-      ChartUtils.calculateChart(chart, tables, _this.callback);
+      ChartUtils.calculateChart(chart, tables, _this.callback, isStatisticalData);
     };
     this.state = {
       isCalculated: false,
@@ -69,7 +70,6 @@ class View extends React.PureComponent {
       errorMessage: '',
       tipMessage: ''
     };
-    console.log(props);
     context.init(props);
   }
   componentDidMount() {
@@ -156,6 +156,7 @@ class View extends React.PureComponent {
   }
 }
 View.defaultProps = {
+  isStatisticalData: true,
   canvasStyle: {},
   tables: [],
   chart: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "0.0.4-beta",
+  "version": "0.0.5",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",
@@ -126,6 +126,7 @@
     "raf": "3.4.0",
     "react": "17.0.0",
     "react-app-polyfill": "^1.0.4",
+    "react-cookies": "0.1.1",
     "react-dev-utils": "^12.0.1",
     "react-dom": "17.0.0",
     "react-hot-loader": "4.13.1",