sea-chart 0.0.3 → 0.0.4-beta

package/dist/api/index.js

@@ -80,7 +80,24 @@ class SeaChartAPI {
     this.instance = new SeaChartAPI(config);
     return this.instance;
   }
-  async init() {
+  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;
+    }
     const accessTokenRes = await this.getDTableAccessToken();
     const {
       app_name,

package/dist/context.js

@@ -3,13 +3,20 @@ import CollaboratorManager from './utils/collaborator-manager';
 import { ChartDataSQL } from './utils';
 class Context {
   constructor() {
-    this.queryResultFromDB = _ref => {
+    this.queryResult = _ref => {
       let {
         chart,
         tables,
         onSuccess,
         onFail
       } = _ref;
+      if (this.api.queryResult) {
+        return this.api.queryResult({
+          chart,
+          onSuccess,
+          onFail
+        });
+      }
       const table = getTableById(tables, chart.config.table_id);
       const chartDataSQL = new ChartDataSQL({
         table,

package/dist/editor/index.js

@@ -29,7 +29,6 @@ class Editor extends React.PureComponent {
   }
 }
 Editor.defaultProps = {
-  isStatisticalData: true,
   canvasStyle: {},
   tables: [],
   chart: {

package/dist/index.js

@@ -1,9 +1,10 @@
 import SeaChartAPI from './api';
-import { CHART_TYPES } from './constants/type';
+import { CHART_TYPE, CHART_TYPES } from './constants/type';
+import { ChartModel } from './model';
 import View from './view';
 import Editor from './editor';
 import Settings, { StyleSettings } from './settings';
 import { ChartDataSQL } from './utils';
 import Context from './context';
 export default View;
-export { SeaChartAPI, CHART_TYPES, View, Editor, Settings, StyleSettings, Context, ChartDataSQL };
+export { SeaChartAPI, CHART_TYPE, CHART_TYPES, View, Editor, Settings, StyleSettings, Context, ChartModel, ChartDataSQL };

package/dist/settings/table-settings/data-settings.js

@@ -544,6 +544,6 @@ const DataSettings = _ref => {
     value: getSelectedGroupType(),
     onChange: onGroupTypeChange,
     options: groupTypeOptions
-  })), renderAdvancedStatistic);
+  })), renderAdvancedStatistic());
 };
 export default DataSettings;

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, isChartData) => {
+ChartUtils.calculateChart = (chart, tables, callback) => {
   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, isChartData) => {
     const error_message = 'There_are_some_problems_with_the_filters';
     return callback && callback(error_message, '', null);
   }
-  context.queryResultFromDB({
+  context.queryResult({
     chart,
     tables,
     onSuccess: res => {
@@ -1422,26 +1422,24 @@ ChartUtils.calculateChart = (chart, tables, callback, isChartData) => {
         error_message
       } = res.data;
       if (success) {
-        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
-          });
+        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(error_message, '', null);
     },
@@ -1568,11 +1566,13 @@ ChartUtils.isChartEqual = (preChartElement, curChartElement) => {
   return shallowEqual(preChartElement.config, curChartElement.config);
 };
 ChartUtils.isChartStyleChange = (preChartElement, curChartElement) => {
+  var _preChartElement$heig, _curChartElement$heig;
   const elementType = preChartElement.config.type;
   if (elementType !== curChartElement.config.type) return false;
-  if (preChartElement.height.value !== curChartElement.height.value) return true;
-  if (preChartElement.left_in_unit !== curChartElement.left_in_unit) return true;
-  if (preChartElement.width_in_unit !== curChartElement.width_in_unit) return true;
+  // used for app
+  if ((preChartElement === null || preChartElement === void 0 ? void 0 : (_preChartElement$heig = preChartElement.height) === null || _preChartElement$heig === void 0 ? void 0 : _preChartElement$heig.value) !== (curChartElement === null || curChartElement === void 0 ? void 0 : (_curChartElement$heig = curChartElement.height) === null || _curChartElement$heig === void 0 ? void 0 : _curChartElement$heig.value)) return true;
+  if ((preChartElement === null || preChartElement === void 0 ? void 0 : preChartElement.left_in_unit) !== (curChartElement === null || curChartElement === void 0 ? void 0 : curChartElement.left_in_unit)) return true;
+  if ((preChartElement === null || preChartElement === void 0 ? void 0 : preChartElement.width_in_unit) !== (curChartElement === null || curChartElement === void 0 ? void 0 : curChartElement.width_in_unit)) return true;
   if (!ObjectUtils.isSameObject(preChartElement.style_config, curChartElement.style_config)) return true;
   return !CHART_STYLE_SETTING_KEYS.every(key => preChartElement.config[key] === curChartElement.config[key]);
 };

package/dist/view/index.js

@@ -52,8 +52,7 @@ class View extends React.PureComponent {
       let isNeedRequestData = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
       const {
         tables,
-        chart,
-        isStatisticalData
+        chart
       } = _this.props;
       const {
         data
@@ -62,7 +61,7 @@ class View extends React.PureComponent {
         ChartUtils.calculateStaticChart(tables, chart, data, _this.callback);
         return;
       }
-      ChartUtils.calculateChart(chart, tables, _this.callback, isStatisticalData);
+      ChartUtils.calculateChart(chart, tables, _this.callback);
     };
     this.state = {
       isCalculated: false,
@@ -157,7 +156,6 @@ 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.3",
+  "version": "0.0.4-beta",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",