sea-chart 0.0.40 → 0.0.41-beta.0

package/dist/components/types-dialog/index.js

@@ -10,6 +10,7 @@ import './index.css';
 const TypesDialog = _ref => {
   let {
     type,
+    mediaUrl,
     onToggle: propsOnToggle,
     onChange
   } = _ref;
@@ -44,8 +45,8 @@ const TypesDialog = _ref => {
   }, [selectedType]);
   const onSubmit = useCallback(() => {
     onChange(selectedType);
-    onToggle();
-  }, [selectedType, onToggle, onChange]);
+    type && onToggle();
+  }, [onChange, selectedType, type, onToggle]);
   return /*#__PURE__*/React.createElement(Modal, {
     isOpen: true,
     toggle: onToggle,
@@ -53,7 +54,7 @@ const TypesDialog = _ref => {
     zIndex: 1048
   }, /*#__PURE__*/React.createElement(ModalHeader, {
     toggle: onToggle
-  }, intl.get('Edit_type')), /*#__PURE__*/React.createElement(ModalBody, {
+  }, type ? intl.get('Edit_type') : intl.get('All_charts')), /*#__PURE__*/React.createElement(ModalBody, {
     className: "sea-chart-types-body"
   }, /*#__PURE__*/React.createElement("div", {
     className: "sea-chart-types-container d-flex flex-column h-100"
@@ -101,7 +102,7 @@ const TypesDialog = _ref => {
       }, intl.get(CHART_TYPE_SHOW[chartType])), /*#__PURE__*/React.createElement("div", {
         className: "sea-chart-type-image-container"
       }, /*#__PURE__*/React.createElement("img", {
-        src: context.getChartImageUrl(chartType),
+        src: context.getChartImageUrl(chartType, mediaUrl),
         alt: "",
         className: "sea-chart-type-demo-image"
       })));

package/dist/context.js

@@ -101,12 +101,15 @@ class Context {
     this.getTableFormulaResults = (table, rows, value) => {
       return this.api.getTableFormulaResults(table, rows, value);
     };
-    this.getChartImageUrl = type => {
+    this.getChartImageUrl = (type, serverMediaUrl) => {
+      const name = CHART_TYPE_IMAGE[type];
+      if (serverMediaUrl) {
+        return "".concat(serverMediaUrl, "dtable-statistic/img/").concat(name);
+      }
       const {
         server,
         mediaUrl
       } = this.settings;
-      const name = CHART_TYPE_IMAGE[type];
       return "".concat(server).concat(mediaUrl, "dtable-statistic/img/").concat(name);
     };
     this.api = null;

package/dist/index.js

@@ -4,7 +4,8 @@ import { ChartModel } from './model';
 import View from './view';
 import Editor from './editor';
 import Settings, { StyleSettings, Divider } from './settings';
+import TypesDialog from './components/types-dialog';
 import { ChartDataSQL } from './utils';
 import Context from './context';
 export default View;
-export { SeaChartAPI, CHART_TYPE, CHART_TYPES, View, Editor, Settings, StyleSettings, Divider, Context, ChartModel, ChartDataSQL };
+export { SeaChartAPI, CHART_TYPE, CHART_TYPES, View, Editor, Settings, TypesDialog, StyleSettings, Divider, Context, ChartModel, ChartDataSQL };

package/dist/locale/lang/en.js

@@ -129,6 +129,7 @@ const en = {
   "Title": "Title",
   "Custom_title": "Custom title",
   "Edit_type": "Edit type",
+  "All_charts": "All charts",
   "Cancel": "Cancel",
   "Submit": "Submit",
   "There_are_no_statistic_results_yet": "There are no statistic results yet",

package/dist/locale/lang/zh_CN.js

@@ -129,6 +129,7 @@ const zh_CN = {
   "Title": "标题",
   "Custom_title": "自定义标题",
   "Edit_type": "编辑类型",
+  "All_charts": "所有图表",
   "Cancel": "取消",
   "Submit": "提交",
   "There_are_no_statistic_results_yet": "目前还没有统计结果",

package/dist/view/wrapper/chart-component.js

@@ -428,7 +428,9 @@ export default class ChartComponent extends Component {
       let offsetX = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
       if (!_this.chart) return;
       const basicLegendConfig = _this.getLegendConfig(theme, legendPosition);
-      basicLegendConfig.offsetX = offsetX;
+      if (offsetX) {
+        basicLegendConfig.offsetX = offsetX;
+      }
       basicLegendConfig.itemName.style.fontSize = theme.fontSize;
       _this.chart.legend(legendName, basicLegendConfig);
     };

package/dist/view/wrapper/combination.js

@@ -215,20 +215,7 @@ class Combination extends ChartComponent {
       } : {
         type: 'dodge'
       };
-      const interval = this.chart.interval().label(display_data ? 'value_left' : false, {
-        content: data => {
-          if (this.currentName) {
-            return data.name === this.currentName ? data.value_left : '';
-          }
-          return data.value_left;
-        },
-        style: {
-          fontSize: BaseUtils.getLabelFontSize(label_font_size),
-          fill: theme.labelColor,
-          stroke: '#fff',
-          lineWidth: 1
-        }
-      }).position('name*value_left').color('color', color => {
+      const interval = this.chart.interval().position('name*value_left').color('color', color => {
         if (!y_axis_left_group_by_multiple_numeric_column) {
           return currentTheme.colors[0];
         }
@@ -370,7 +357,6 @@ class Combination extends ChartComponent {
           radius: [singleBarRadius, singleBarRadius, 0, 0],
           fillOpacity: 0.3
         });
-        console.log(e);
         point.style('name', name => {
           let r = 4;
           if (name === e.data.data.name) {

package/dist/view/wrapper/pie.js

@@ -56,8 +56,7 @@ class Pie extends ChartComponent {
         this.props.toggleRecords(e.data.data);
       });
       if (show_legend) {
-        // lengend itself has a width of nearly 30px, 90 + 30 = 120
-        this.setLegendForTheta('name', undefined, 'right', -90);
+        this.setLegendForTheta('name', undefined, 'right');
       } else {
         this.chart.legend(false);
       }

package/dist/view/wrapper/ring.js

@@ -60,8 +60,7 @@ class Ring extends ChartComponent {
         this.props.toggleRecords(e.data.data);
       });
       if (show_legend) {
-        // lengend itself has a width of nearly 30px, 90 + 30 = 120
-        this.setLegendForTheta('name', undefined, 'right', -90);
+        this.setLegendForTheta('name', undefined, 'right');
       } else {
         this.chart.legend(false);
       }
@@ -124,9 +123,11 @@ class Ring extends ChartComponent {
             stroke: 0
           }
         }
-      }).shape('withGap').style('value', value => {
+      })
+      // .shape('withGap')
+      .style('value', value => {
         return {
-          lineWidth: 3,
+          lineWidth: 2,
           stroke: '#fff'
         };
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "0.0.40",
+  "version": "0.0.41-beta.0",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",