dtable-statistic 4.4.24-alpha.9 → 5.0.0

package/es/stat-editor/stat-settings/public-setting/type-settings/index.css

@@ -0,0 +1,29 @@
+.statistic-chart-parameter-item .statistic-selected-type-container {
+  height: 38px;
+  border: 1px solid hsl(0, 0%, 80%);
+  border-radius: 4px;
+  padding-left: 8px;
+  padding-right: 3px;
+  justify-content: space-between;
+  background-color: #fff;
+}
+
+.statistic-chart-parameter-item .statistic-switch-type-container {
+  height: 24px;
+  width: 24px;
+  text-align: center;
+  line-height: 24px;
+  margin-left: 10px;
+}
+
+.statistic-chart-parameter-item .statistic-switch-type-container:hover {
+  cursor: pointer;
+}
+
+.statistic-chart-parameter-item .statistic-switch-type-container .statistic-type-switch-icon {
+  color: hsl(0, 0%, 80%);
+}
+
+.statistic-chart-parameter-item .statistic-switch-type-container:hover .statistic-type-switch-icon {
+  color: hsl(0, 0%, 60%);
+}

package/es/stat-editor/stat-settings/public-setting/type-settings/index.js

@@ -0,0 +1,82 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
+var _icon = _interopRequireDefault(require("../../../../components/icon"));
+var _statisticTypesDialog = _interopRequireDefault(require("../../../../components/dialog/statistic-types-dialog"));
+var _constants = require("../../../../constants");
+require("./index.css");
+class TypeSettings extends _react.Component {
+  constructor(props) {
+    super(props);
+    this.openTypesDialog = () => {
+      this.setState({
+        isShowDialog: true
+      });
+    };
+    this.closeTypesDialog = () => {
+      this.setState({
+        isShowDialog: false
+      });
+    };
+    this.getChartTypeName = () => {
+      const {
+        type: chartType
+      } = this.props.chart;
+      switch (chartType) {
+        case _constants.STAT_TYPE.MAP:
+          {
+            return '中国地图';
+          }
+        case _constants.STAT_TYPE.MAP_BUBBLE:
+          {
+            return '中国地图(气泡图)';
+          }
+        case _constants.STAT_TYPE.WORLD_MAP_BUBBLE:
+          {
+            return "".concat(_reactIntlUniversal.default.get(_constants.STATISTIC_TYPE_SHOW[_constants.STAT_TYPE.WORLD_MAP]), "(").concat(_reactIntlUniversal.default.get('Bubble'), ")");
+          }
+        default:
+          {
+            return _reactIntlUniversal.default.get(_constants.STATISTIC_TYPE_SHOW[chartType]);
+          }
+      }
+    };
+    this.state = {
+      isShowDialog: false
+    };
+  }
+  render() {
+    const {
+      isShowDialog
+    } = this.state;
+    const {
+      chart
+    } = this.props;
+    const {
+      type: chartType
+    } = chart;
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+      className: "statistic-chart-parameter-item"
+    }, /*#__PURE__*/_react.default.createElement("label", null, _reactIntlUniversal.default.get('Chart_type')), /*#__PURE__*/_react.default.createElement("div", {
+      className: "statistic-selected-type-container d-flex align-items-center"
+    }, /*#__PURE__*/_react.default.createElement("span", null, this.getChartTypeName()), /*#__PURE__*/_react.default.createElement("div", {
+      className: "statistic-switch-type-container",
+      onClick: this.openTypesDialog
+    }, /*#__PURE__*/_react.default.createElement(_icon.default, {
+      symbol: "switch-icon",
+      className: "statistic-type-switch-icon"
+    })))), isShowDialog && /*#__PURE__*/_react.default.createElement(_statisticTypesDialog.default, {
+      type: chartType,
+      onChange: this.props.onChange,
+      onToggle: this.closeTypesDialog
+    }));
+  }
+}
+var _default = exports.default = TypeSettings;

package/es/stat-list/chart-preview.js

@@ -11,6 +11,7 @@ var _reactDom = _interopRequireDefault(require("react-dom"));
 var _html2canvas = _interopRequireDefault(require("html2canvas"));
 var _statView = _interopRequireDefault(require("../stat-view"));
 var _statisticDropdownMenu = _interopRequireDefault(require("../components/dropdown-menu/statistic-dropdown-menu"));
+var _constants = require("../constants");
 class ChartPreview extends _react.Component {
   constructor() {
     super(...arguments);
@@ -33,7 +34,7 @@ class ChartPreview extends _react.Component {
       // for charts rendered with `<canvas>`
       const {
         _id: id
-      } = statItem.config;
+      } = statItem;
       const originalElement = document.querySelector("#stat-item-".concat(id, " .statistic-chart-container > div"));
       if (originalElement) {
         const containerWidth = originalElement.scrollWidth + 15 * 2;
@@ -51,7 +52,7 @@ class ChartPreview extends _react.Component {
         }).then(canvas => {
           let eleA = document.createElement('a');
           eleA.href = canvas.toDataURL('image/png');
-          eleA.download = "".concat(statItem.style_config.title.text || 'image', ".png");
+          eleA.download = "".concat(statItem.name || 'image', ".png");
           eleA.click();
           document.body.removeChild(exportContainer);
         });
@@ -71,50 +72,50 @@ class ChartPreview extends _react.Component {
     };
     this.renderChart = statItem => {
       const {
+        dtableChangedTime,
+        chartCalculator,
         theme,
         colorThemeName,
-        api,
-        value,
-        getTableById,
-        toggleStatisticRecordsDialog
+        eventBus
       } = this.props;
       return /*#__PURE__*/_react.default.createElement(_statView.default, {
         ref: ref => this.chartView = ref,
+        isPreview: true,
+        isEnlarge: false,
+        dtableChangedTime: dtableChangedTime,
         theme: theme,
         colorThemeName: colorThemeName,
         statItem: statItem,
-        api: api,
-        value: value,
-        getTableById: getTableById,
-        toggleStatisticRecordsDialog: toggleStatisticRecordsDialog
+        chartCalculator: chartCalculator,
+        eventBus: eventBus,
+        getTableById: this.props.getTableById,
+        queryMapJson: this.props.queryMapJson,
+        toggleStatisticRecordsDialog: this.props.toggleStatisticRecordsDialog
       });
     };
     this.moveChartToView = viewId => {
       const {
         statItem
       } = this.props;
-      this.props.moveChartToView(statItem.config._id, viewId);
+      this.props.moveChartToView(statItem._id, viewId);
     };
   }
   render() {
-    var _statItem$config;
     const {
       isTableReadOnly,
       statItem
     } = this.props;
     const {
       _id: statId,
+      name: statName,
       type
-    } = statItem.config;
-    const {
-      text: statName
-    } = statItem.style_config.title;
-    const statItemId = statItem === null || statItem === void 0 ? void 0 : (_statItem$config = statItem.config) === null || _statItem$config === void 0 ? void 0 : _statItem$config._id;
+    } = statItem;
+    const showStatName = !(type === _constants.STAT_TYPE.BASIC_NUMBER_CARD || type === _constants.STAT_TYPE.DASHBOARD);
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
       className: "statistic-chart-preview-header"
     }, /*#__PURE__*/_react.default.createElement("span", {
       className: "statistic-chart-preview-name"
-    }, statName), /*#__PURE__*/_react.default.createElement("span", {
+    }, showStatName ? statName : ''), /*#__PURE__*/_react.default.createElement("span", {
       className: "statistic-chart-preview-operations"
     }, /*#__PURE__*/_react.default.createElement("span", {
       className: "statistic-chart-preview-microscope",
@@ -134,7 +135,7 @@ class ChartPreview extends _react.Component {
       onNewTableDialogToggle: this.onNewTableDialogToggle,
       onUpdateTableDialogToggle: this.onUpdateTableDialogToggle
     }))), /*#__PURE__*/_react.default.createElement("div", {
-      id: "stat-item-".concat(statItemId),
+      id: "stat-item-".concat(statItem._id),
       className: "statistic-chart-preview-container"
     }, this.renderChart(statItem)), /*#__PURE__*/_react.default.createElement("div", {
       className: "statistic-chart-preview-container-resize"

package/es/stat-list/index.js

@@ -10,9 +10,8 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactGridLayout = _interopRequireWildcard(require("react-grid-layout"));
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
 var _toaster = _interopRequireDefault(require("dtable-ui-component/lib/toaster"));
-var _seaChart = require("sea-chart");
 var _chartPreview = _interopRequireDefault(require("./chart-preview"));
-var _components = require("../components");
+var _newTableDialog = _interopRequireDefault(require("../components/dialog/new-table-dialog"));
 var _enlargedChartDialog = _interopRequireDefault(require("../components/dialog/enlarged-chart-dialog"));
 var _tableSelectDialog = _interopRequireDefault(require("../components/dialog/table-select-dialog"));
 var _exportTableUtils = require("../utils/export-table-utils");
@@ -60,7 +59,7 @@ class StatList extends _react.Component {
       });
     };
     this.exportChart2Table = (tableName, chart) => {
-      if (chart.type !== _seaChart.CHART_TYPE.TABLE) {
+      if (chart.type !== _constants.STAT_TYPE.PIVOT_TABLE) {
         this.statisticalResult4Export = null;
         _toaster.default.danger(_reactIntlUniversal.default.get('Failed_export_statistic_to_Table'));
         this.closeNewTableDialog();
@@ -101,7 +100,7 @@ class StatList extends _react.Component {
       const {
         getTableById
       } = this.props;
-      if (chartUpdate2Table.type !== _seaChart.CHART_TYPE.TABLE) {
+      if (chartUpdate2Table.type !== _constants.STAT_TYPE.PIVOT_TABLE) {
         this.statisticalResult4Update = null;
         _toaster.default.danger(_reactIntlUniversal.default.get('Failed_export_statistic_to_Table'));
         this.closeSelectTableDialog();
@@ -152,7 +151,6 @@ class StatList extends _react.Component {
       chartIndexExport2Table: -1,
       chartIndexUpdate2Table: -1
     };
-    this.value = props.getValue();
   }
   UNSAFE_componentWillReceiveProps(nextProps) {
     const {
@@ -165,10 +163,12 @@ class StatList extends _react.Component {
   render() {
     const {
       isTableReadOnly,
+      dtableChangedTime,
       theme,
       colorThemeName,
       statItems,
-      api
+      chartCalculator,
+      eventBus
     } = this.props;
     const {
       layout,
@@ -192,9 +192,8 @@ class StatList extends _react.Component {
       onLayoutChange: this.onLayoutChange,
       cols: 4,
       useCSSTransforms: false
-    }, statItems.map((item, index) => {
-      var _item$config;
-      const statId = item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config._id;
+    }, statItems.map((statItem, index) => {
+      const statId = statItem._id;
       if (!statId) return null;
       return /*#__PURE__*/_react.default.createElement("div", {
         id: statId,
@@ -202,13 +201,16 @@ class StatList extends _react.Component {
         className: "statistic-chart-preview"
       }, /*#__PURE__*/_react.default.createElement(_chartPreview.default, {
         isTableReadOnly: isTableReadOnly,
+        dtableChangedTime: dtableChangedTime,
         theme: theme,
         colorThemeName: colorThemeName,
-        statItem: item,
-        api: api,
-        value: this.value,
+        statItem: statItem,
+        chartCalculator: chartCalculator,
+        eventBus: eventBus,
         getOtherStatistics: this.props.getOtherStatistics,
         getTableById: this.props.getTableById,
+        getTables: this.props.getTables,
+        queryMapJson: this.props.queryMapJson,
         copyChart: this.props.copyChart,
         moveChartToView: this.props.moveChartToView,
         deleteChart: this.props.deleteChart,
@@ -226,17 +228,21 @@ class StatList extends _react.Component {
           return this.showSelectTableDialog(index, statisticalResult);
         },
         onToggleEditChart: this.props.onToggleEditChart,
+        onCloseDashboard: this.props.onCloseDashboard,
         toggleStatisticRecordsDialog: this.props.toggleStatisticRecordsDialog
       }));
     })), enlargedChart && /*#__PURE__*/_react.default.createElement(_enlargedChartDialog.default, {
+      dtableChangedTime: dtableChangedTime,
       colorThemeName: colorThemeName,
       statItem: enlargedChart,
-      api: api,
-      value: this.value,
+      eventBus: eventBus,
+      chartCalculator: chartCalculator,
       getTableById: this.props.getTableById,
+      queryMapJson: this.props.queryMapJson,
       onEnlargeToggle: this.closeEnlargedChart,
+      onToggleShowEnlarged: this.closeEnlargedChart,
       toggleStatisticRecordsDialog: this.props.toggleStatisticRecordsDialog
-    }), chartExport2Table && /*#__PURE__*/_react.default.createElement(_components.NewTableDialog, {
+    }), chartExport2Table && /*#__PURE__*/_react.default.createElement(_newTableDialog.default, {
       getTables: this.props.getTables,
       tableName: chartExport2Table.name,
       onNewTableConfirm: tableName => this.exportChart2Table(tableName, chartExport2Table),