sea-chart 2.0.35 → 2.0.36

package/dist/api/index.js

@@ -24,42 +24,16 @@ class SeaChartAPI {
       });
     };
     this.getBaseData = () => {
-      const {
-        dtableServer,
-        dtableUuid,
-        accessToken
-      } = this;
-      const url = dtableServer + 'dtables/' + dtableUuid;
-      const headers = {
-        'Authorization': 'Token ' + accessToken
-      };
-      return _axios.default.get(url, {
-        headers
-      });
+      const url = "/api/v2/dtables/".concat(this.dtableUuid, "/");
+      return this.req.get(url);
     };
     this.getBaseMetaData = () => {
-      const {
-        dtableServer,
-        dtableUuid,
-        accessToken
-      } = this;
-      const url = dtableServer + 'api/v1/dtables/' + dtableUuid + '/metadata';
-      const headers = {
-        'Authorization': 'Token ' + accessToken
-      };
-      return _axios.default.get(url, {
-        headers
-      });
+      const url = "/api/v2/dtables/".concat(this.dtableUuid, "/metadata/");
+      return this.req.get(url);
     };
     this.sqlQuery = function (sql, parameters) {
       let convert_keys = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-      // dtable-db
-      const {
-        dtableDB,
-        dtableUuid,
-        accessToken
-      } = _this;
-      const url = dtableDB + '/api/v2/dtables/' + dtableUuid + '/sql/';
+      const url = "/api/v2/dtables/".concat(_this.dtableUuid, "/sql/");
       const data = {
         sql,
         convert_keys,
@@ -67,20 +41,16 @@ class SeaChartAPI {
           parameters: parameters
         })
       };
-      const headers = {
-        'Authorization': 'Token ' + accessToken
-      };
-      return _axios.default.post(url, data, {
-        headers
-      });
+      return _this.req.post(url, data);
     };
     this.config = config;
+    const {
+      server: _server
+    } = config;
     this.instance = null;
     this.appName = '';
-    this.accessToken = '';
     this.dtableUuid = '';
-    this.dtableServer = '';
-    this.dtableSocket = '';
+    this.baseURL = _server[_server.length - 1] === '/' ? "".concat(_server, "api-gateway") : "".concat(_server, "/api-gateway");
   }
   static getInstance(config) {
     if (this.instance) return this.instance;
@@ -92,28 +62,16 @@ class SeaChartAPI {
     const {
       app_name,
       access_token,
-      dtable_uuid,
-      dtable_server,
-      dtable_socket,
-      dtable_db
+      dtable_uuid
     } = accessTokenRes.data;
     this.appName = app_name;
-    this.accessToken = access_token;
     this.dtableUuid = dtable_uuid;
-    this.dtableServer = dtable_server.replace(/\/+$/, '') + '/';
-    this.dtableSocket = dtable_socket.replace(/\/+$/, '') + '/';
-    this.dtableDB = dtable_db.replace(/\/+$/, '') + '/';
+    this.req = _axios.default.create({
+      baseURL: this.baseURL,
+      headers: {
+        'Authorization': 'Token ' + access_token
+      }
+    });
   }
-
-  // queryUsers(userIdList) {
-  //   const { dtableServer, accessToken } = this;
-  //   const url =  dtableServer + 'api/v2.1/user-list';
-  //   let operation = { user_id_list: userIdList };
-  //   const headers = {
-  //     'Content-type': 'application/json',
-  //     'Authorization': 'Token ' +  accessToken
-  //   };
-  //   return axios.post(url, operation, { headers });
-  // }
 }
 var _default = exports.default = SeaChartAPI;

package/dist/assets/css/sea-chart-d3-tooltip.css

@@ -1,7 +1,6 @@
 .sea-chart-d3-tooltip-container {
   position: absolute;
   transform: translate(-9999px, -9999px);
-  transition: transform 0.1s;
   background-color: rgb(255, 255, 255);
   box-shadow: rgba(196, 175, 175, 0.1) 0px 0px 1px 1px;
   border-radius: 3px;

package/dist/components/color-popover/color-rules-popover.js

@@ -8,8 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _intl = _interopRequireDefault(require("../../intl"));
 var _dtableUtils = require("dtable-utils");
+var _intl = _interopRequireDefault(require("../../intl"));
 var _commonAddTool = _interopRequireDefault(require("../common-add-tool"));
 var _dtablePopover = _interopRequireDefault(require("../dtable-popover"));
 var _colorRules = _interopRequireDefault(require("./color-rules"));
@@ -83,7 +83,9 @@ class ColorRulesPopover extends _react.Component {
       switch (filterType) {
         case _colorRules2.COLOR_RULE_FILTER_TYPE_MAP.NUMERIC_VALUE:
           {
-            return _dtableUtils.FILTER_COLUMN_OPTIONS[_dtableUtils.CellType.NUMBER];
+            return (0, _dtableUtils.getColumnFilterOptions)({
+              type: _dtableUtils.CellType.NUMBER
+            });
           }
         default:
           {

package/dist/components/drill-down-settings/drill-down-fields-popover/index.js

@@ -1,12 +1,12 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = DrillDownFieldsPopover;
-var _dtableUtils = require("dtable-utils");
+var _DTableColumnIcon2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableColumnIcon"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactstrap = require("reactstrap");
 var _isHotkey = _interopRequireDefault(require("is-hotkey"));
@@ -101,8 +101,9 @@ function DrillDownFieldsPopover(_ref) {
     }, /*#__PURE__*/_react.default.createElement("td", {
       className: "pl-5 text-truncate",
       title: column.name
-    }, /*#__PURE__*/_react.default.createElement("i", {
-      className: "".concat(_dtableUtils.COLUMNS_ICON_CONFIG[column.type], " mr-2 ").concat(_indexModule.default['drill-down-fields-icon'])
+    }, /*#__PURE__*/_react.default.createElement(_DTableColumnIcon2.default, {
+      column: column,
+      className: "".concat(_indexModule.default['drill-down-fields-icon'], " mr-2")
     }), /*#__PURE__*/_react.default.createElement("span", null, column.name)), /*#__PURE__*/_react.default.createElement("td", {
       className: "".concat(_indexModule.default['column-checkbox'], " pr-3")
     }, /*#__PURE__*/_react.default.createElement("input", {

package/dist/components/icon/index.js

@@ -7,25 +7,21 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 require("./index.css");
-const importAll = requireContext => {
-  requireContext.keys().forEach(requireContext);
-};
-try {
-  importAll(require.context('../../assets/icons', true, /\.svg$/));
-} catch (error) {
-  // eslint-disable-next-line no-console
-  console.log(error);
-}
+const components = {};
+const requireContext = require.context('../../assets/icons', false, /\.svg$/);
+requireContext.keys().forEach(path => {
+  const iconName = path.replace(/^\.\/(.*?)\.svg$/, '$1').toLowerCase();
+  components[iconName] = requireContext(path).default;
+});
 const Icon = props => {
   const {
     className,
     symbol
   } = props;
   const iconClass = "sea-chart-icon sea-chart-icon-".concat(symbol, " ").concat(className || '');
-  return /*#__PURE__*/_react.default.createElement("svg", {
+  const IconComponent = components[symbol];
+  return /*#__PURE__*/_react.default.createElement(IconComponent, {
     className: iconClass
-  }, /*#__PURE__*/_react.default.createElement("use", {
-    xlinkHref: "#".concat(symbol)
-  }));
+  });
 };
 var _default = exports.default = Icon;

package/dist/components/number-input/index.js

@@ -7,18 +7,18 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactstrap = require("reactstrap");
-function NumberInput(props) {
-  const {
+function NumberInput(_ref) {
+  let {
     value,
     onChange,
-    min,
-    step,
-    max,
-    readOnly,
+    min = 0,
+    step = 1,
+    max = Infinity,
+    readOnly = false,
     className,
     useEmpty,
     ...otherProps
-  } = props;
+  } = _ref;
   // useempty is used to control whether to use empty string or '0'
   const number = value ? value : useEmpty ? '' : '0';
   return /*#__PURE__*/_react.default.createElement(_reactstrap.Input, Object.assign({
@@ -32,10 +32,4 @@ function NumberInput(props) {
     onChange: onChange
   }, otherProps));
 }
-NumberInput.defaultProps = {
-  min: 0,
-  step: 1,
-  max: Infinity,
-  readOnly: false
-};
 var _default = exports.default = NumberInput;

package/dist/components/popover/hide-column-popover/hide-column-popover-widgets/hide-column-item.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _DTableSwitch2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableSwitch"));
+var _DTableColumnIcon2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableColumnIcon"));
 var _react = _interopRequireDefault(require("react"));
 class HideColumnItem extends _react.default.PureComponent {
   constructor(props) {
@@ -47,11 +48,14 @@ class HideColumnItem extends _react.default.PureComponent {
     const {
       readonly
     } = this.props;
-    const placeholder = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("i", {
-      className: "dtable-font ".concat(setting.columnIcon)
+    const {
+      column
+    } = setting;
+    const placeholder = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_DTableColumnIcon2.default, {
+      column: column
     }), /*#__PURE__*/_react.default.createElement("span", {
       className: "text-truncate"
-    }, setting.columnName));
+    }, column.name));
     return /*#__PURE__*/_react.default.createElement(_DTableSwitch2.default, {
       checked: setting.isChecked,
       disabled: readonly,

package/dist/components/popover/hide-column-popover/hide-column-popover.css

@@ -2,8 +2,12 @@
   width: 192px;
   display: inline-flex;
   align-items: center;
-  margin: 0;
   padding-right: 5px;
+  margin: 0;
+}
+
+.hidden-column-popover .field-settings-body .dtable-switch.dropdown-item {
+  padding: 0 10px;
 }
 
 .hidden-column-popover .custom-switch .dtable-font {

package/dist/components/popover/hide-column-popover/hide-column-popover.js

@@ -8,7 +8,6 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactstrap = require("reactstrap");
 var _isHotkey = _interopRequireDefault(require("is-hotkey"));
-var _dtableUtils = require("dtable-utils");
 var _intl = _interopRequireDefault(require("../../../intl"));
 var _utils = require("../../../utils");
 var _hideColumnItem = _interopRequireDefault(require("./hide-column-popover-widgets/hide-column-item"));
@@ -120,7 +119,7 @@ class HideColumnPopover extends _react.default.Component {
         return fieldSettings;
       }
       return fieldSettings.filter(setting => {
-        return setting.columnName.toLowerCase().includes(searchVal);
+        return setting.column.name.toLowerCase().includes(searchVal);
       });
     };
     this.state = {
@@ -145,8 +144,7 @@ class HideColumnPopover extends _react.default.Component {
       return {
         key: column.key,
         isChecked: shownColumnKeys.includes(column.key),
-        columnName: column.name,
-        columnIcon: _dtableUtils.COLUMNS_ICON_CONFIG[column.type]
+        column: column
       };
     });
     // table page cannot hide first column

package/dist/components/popover/sort-popover/sort-popover.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _DTableCustomizeSelect2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableCustomizeSelect"));
+var _DTableColumnIcon2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableColumnIcon"));
 var _react = _interopRequireWildcard(require("react"));
 var _isHotkey = _interopRequireDefault(require("is-hotkey"));
 var _reactstrap = require("reactstrap");
@@ -128,7 +129,6 @@ class SortPopover extends _react.Component {
       const sortableColumns = columns.filter(column => _dtableUtils.SORT_COLUMN_OPTIONS.includes(column.type));
       return sortableColumns.map(column => {
         const {
-          type,
           name
         } = column;
         return {
@@ -137,8 +137,8 @@ class SortPopover extends _react.Component {
           },
           label: /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
             className: "filter-header-icon"
-          }, /*#__PURE__*/_react.default.createElement("i", {
-            className: _dtableUtils.COLUMNS_ICON_CONFIG[type]
+          }, /*#__PURE__*/_react.default.createElement(_DTableColumnIcon2.default, {
+            column: column
           })), /*#__PURE__*/_react.default.createElement("span", {
             className: "select-option-name"
           }, name))
@@ -171,8 +171,7 @@ class SortPopover extends _react.Component {
     };
     this.renderSortItem = (column, sort, index) => {
       let {
-        name,
-        type
+        name
       } = column;
       const {
         readonly
@@ -180,8 +179,8 @@ class SortPopover extends _react.Component {
       let selectedColumn = {
         label: /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
           className: "filter-header-icon"
-        }, /*#__PURE__*/_react.default.createElement("i", {
-          className: _dtableUtils.COLUMNS_ICON_CONFIG[type]
+        }, /*#__PURE__*/_react.default.createElement(_DTableColumnIcon2.default, {
+          column: column
         })), /*#__PURE__*/_react.default.createElement("span", {
           className: "select-option-name",
           title: name,

package/dist/components/statistic-record-dialog/index.js

@@ -22,6 +22,7 @@ var _rowRecordUtils = require("../../utils/row-record-utils");
 var _rowCard = _interopRequireDefault(require("../row-card/row-card"));
 var _commonConstants = require("../../constants/common-constants");
 var _utils = require("../../utils");
+var _constants = require("../../constants");
 require("./index.css");
 class StatisticRecordDialog extends _react.default.Component {
   constructor(_props) {
@@ -64,7 +65,11 @@ class StatisticRecordDialog extends _react.default.Component {
           // if more then 2 filters, use 'Or' conjunction to get them all
           // if the statistic record is '_Others', use 'Or' conjunction to get them all
           if ((detailFilterConditions === null || detailFilterConditions === void 0 ? void 0 : detailFilterConditions.filters.length) > 2 || statisticRecord.name === '_Others') {
-            detailFilterConditions.filter_conjunction = 'Or';
+            if (chart.config.type === _constants.CHART_TYPE.SCATTER) {
+              detailFilterConditions.filter_conjunction = 'And';
+            } else {
+              detailFilterConditions.filter_conjunction = 'Or';
+            }
           }
           _context.default.api.customQueryRows(currentElementId, detailFilterConditions).then(res => {
             const {
@@ -355,14 +360,10 @@ class StatisticRecordDialog extends _react.default.Component {
       zIndex: 1048
     }, /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
       className: "search-header"
-    }, /*#__PURE__*/_react.default.createElement("span", null, title), /*#__PURE__*/_react.default.createElement("button", {
-      type: "button",
-      className: "close",
-      "aria-label": "Close",
+    }, /*#__PURE__*/_react.default.createElement("span", null, title), /*#__PURE__*/_react.default.createElement("span", {
+      className: "dtable-font dtable-icon-x btn-close-row-detail",
       onClick: this.toggle
-    }, /*#__PURE__*/_react.default.createElement("span", {
-      "aria-hidden": "true"
-    }, "\xD7"))), /*#__PURE__*/_react.default.createElement("div", {
+    })), /*#__PURE__*/_react.default.createElement("div", {
       className: "search-input-container"
     }, /*#__PURE__*/_react.default.createElement("i", {
       className: "header-search-icon dtable-font dtable-icon-search"

package/dist/components/tooltip/index.js

@@ -25,7 +25,10 @@ const ToolTip = _ref => {
     title: '',
     items: []
   };
-  (0, _react.useEffect)(() => {
+
+  // use layout effect to measure tooltip size and adjust its position before the browser paints,
+  // to preventing a visible flicker
+  (0, _react.useLayoutEffect)(() => {
     if (!toolTipPosition) {
       setPosition({
         offsetX: -9999,
@@ -33,7 +36,7 @@ const ToolTip = _ref => {
       });
       return;
     }
-    if (chart && toolTipPosition) {
+    if (chart && toolTipPosition && tooltipRef.current) {
       const width = Number(chart.node().getAttribute('width'));
       const height = Number(chart.node().getAttribute('height'));
       const {
@@ -48,12 +51,26 @@ const ToolTip = _ref => {
       const insertPadding = 30;
       let translateX = offsetX + distance;
       let translateY = offsetY;
-      const endOffsetX = offsetX + distance + tooltipWidth + insertPadding;
-      const endOffsetY = offsetY + tooltipHeight + insertPadding;
-      // Right overflow
-      if (endOffsetX > width) {
+      const minX = insertPadding;
+      const maxX = width - tooltipWidth - insertPadding;
+      const rightAvailableWidth = width - (offsetX + distance) - insertPadding;
+      const leftAvailableWidth = offsetX - distance - insertPadding;
+      const canShowOnRight = rightAvailableWidth >= tooltipWidth;
+      const canShowOnLeft = leftAvailableWidth >= tooltipWidth;
+      if (canShowOnRight) {
+        translateX = offsetX + distance;
+      } else if (canShowOnLeft) {
         translateX = offsetX - distance - tooltipWidth - insertPadding;
+      } else {
+        // If neither side has enough space, choose the side with more space.
+        if (rightAvailableWidth >= leftAvailableWidth) {
+          translateX = offsetX + distance;
+        } else {
+          translateX = offsetX - distance - tooltipWidth - insertPadding;
+        }
+        translateX = Math.max(minX, Math.min(translateX, maxX));
       }
+      const endOffsetY = offsetY + tooltipHeight + insertPadding;
       // Bottom overflow
       if (endOffsetY > height) {
         translateY = offsetY - (endOffsetY - height);
@@ -63,13 +80,14 @@ const ToolTip = _ref => {
         offsetY: translateY
       });
     }
-  }, [chart, toolTipPosition, tooltipRef]);
+  }, [chart, toolTipPosition]);
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: tooltipRef,
     className: "sea-chart-d3-tooltip-container",
     style: {
       transform: "translate(".concat(position.offsetX, "px, ").concat(position.offsetY, "px)"),
-      display: position.offsetX === -9999 ? 'none' : 'block'
+      visibility: position.offsetX === -9999 ? 'hidden' : 'visible',
+      opacity: position.offsetX === -9999 ? 0 : 1
     }
   }, title && /*#__PURE__*/_react.default.createElement("div", {
     className: "sea-chart-d3-tooltip-title"

package/dist/editor/index.js

@@ -10,7 +10,11 @@ var _react = _interopRequireDefault(require("react"));
 var _view = _interopRequireWildcard(require("../view"));
 var _settings = _interopRequireWildcard(require("../settings"));
 require("./index.css");
-function Editor(props) {
+function Editor() {
+  let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+    ...defaultProps,
+    ...settingsDefaultProps
+  };
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "sea-chart-editor"
   }, /*#__PURE__*/_react.default.createElement(_view.default, props), /*#__PURE__*/_react.default.createElement(_settings.default, props, props.children));

package/dist/locale/lang/de.js

@@ -153,6 +153,7 @@ const de = {
   "Execution_time_of_the_query_exceeds_the_limit": "Le temps d'exécution de la requête dépasse la limite. Les données ne peuvent pas être chargées.",
   "There_are_some_problems_with_the_filters": "Die Filterbedingungen sind abnormal. Bitte setzen sie die Filterbedingungen in den Ansichtseinstellungen zurück.",
   "Please_complete_the_chart_configuration_first": "Configure chart in element settings",
+  "The_chart_settings_are_invalid_please_contact_the_administrator_for_relevant_configurations": "The chart settings are invalid. Please contact the administrator for relevant configurations",
   "Not_used": "Nicht verwendet",
   "Select_field": "Feld auswählen",
   "Display_total": "Gesamtwert anzeigen",

package/dist/locale/lang/en.js

@@ -153,6 +153,7 @@ const en = {
   "Execution_time_of_the_query_exceeds_the_limit": "Execution time of the query exceeds the limit. Data cannot be loaded.",
   "There_are_some_problems_with_the_filters": "There are some problems with the filters.",
   "Please_complete_the_chart_configuration_first": "Configure chart in element settings",
+  "The_chart_settings_are_invalid_please_contact_the_administrator_for_relevant_configurations": "The chart settings are invalid. Please contact the administrator for relevant configurations",
   "Not_used": "Not used",
   "Select_field": "Select field",
   "Display_total": "Display total",

package/dist/locale/lang/es.js

@@ -153,6 +153,7 @@ const es = {
   "Execution_time_of_the_query_exceeds_the_limit": "Execution time of the query exceeds the limit. Data cannot be loaded.",
   "There_are_some_problems_with_the_filters": "There are some problems with the filters.",
   "Please_complete_the_chart_configuration_first": "Configure chart in element settings",
+  "The_chart_settings_are_invalid_please_contact_the_administrator_for_relevant_configurations": "The chart settings are invalid. Please contact the administrator for relevant configurations",
   "Not_used": "Not used",
   "Select_field": "Select field",
   "Display_total": "Display total",

package/dist/locale/lang/fr.js

@@ -153,6 +153,7 @@ const fr = {
   "Execution_time_of_the_query_exceeds_the_limit": "Le temps d'exécution de la requête dépasse la limite. Les données ne peuvent pas être chargées.",
   "There_are_some_problems_with_the_filters": "Les conditions de filtrage sont anormales. Veuillez réinitialiser les conditions de filtrage dans les paramètres de vue.",
   "Please_complete_the_chart_configuration_first": "Configure chart in element settings",
+  "The_chart_settings_are_invalid_please_contact_the_administrator_for_relevant_configurations": "The chart settings are invalid. Please contact the administrator for relevant configurations",
   "Not_used": "Ne pas utilisé",
   "Select_field": "Sélectionner un champ",
   "Display_total": "Afficher le total",

package/dist/locale/lang/pt.js

@@ -153,6 +153,7 @@ const pt = {
   "Execution_time_of_the_query_exceeds_the_limit": "Execution time of the query exceeds the limit. Data cannot be loaded.",
   "There_are_some_problems_with_the_filters": "There are some problems with the filters.",
   "Please_complete_the_chart_configuration_first": "Configure chart in element settings",
+  "The_chart_settings_are_invalid_please_contact_the_administrator_for_relevant_configurations": "The chart settings are invalid. Please contact the administrator for relevant configurations",
   "Not_used": "Not used",
   "Select_field": "Select field",
   "Display_total": "Display total",

package/dist/locale/lang/ru.js

@@ -153,6 +153,7 @@ const ru = {
   "Execution_time_of_the_query_exceeds_the_limit": "Execution time of the query exceeds the limit. Data cannot be loaded.",
   "There_are_some_problems_with_the_filters": "There are some problems with the filters.",
   "Please_complete_the_chart_configuration_first": "Configure chart in element settings",
+  "The_chart_settings_are_invalid_please_contact_the_administrator_for_relevant_configurations": "The chart settings are invalid. Please contact the administrator for relevant configurations",
   "Not_used": "Not used",
   "Select_field": "Select field",
   "Display_total": "Display total",

package/dist/locale/lang/zh_CN.js

@@ -153,6 +153,7 @@ const zh_CN = {
   "Execution_time_of_the_query_exceeds_the_limit": "查询的执行时间超出限制。无法加载数据。",
   "There_are_some_problems_with_the_filters": "过滤器有一些问题。",
   "Please_complete_the_chart_configuration_first": "在元素设置中配置图表",
+  "The_chart_settings_are_invalid_please_contact_the_administrator_for_relevant_configurations": "图表设置无效，请联系管理员进行相关配置",
   "Not_used": "不使用",
   "Select_field": "选择字段",
   "Display_total": "显示总计",

package/dist/model/funnel.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _dtableUtils = require("dtable-utils");
-var _lodashEs = require("lodash-es");
+var _lodash = require("lodash");
 var _constants = require("../constants");
 var _baseModel = _interopRequireDefault(require("./base-model"));
 class Funnel extends _baseModel.default {
@@ -31,7 +31,7 @@ class Funnel extends _baseModel.default {
       const table = tables.find(table => table._id === options.table_id);
       const column = table.columns.find(column => column.key === options.x_axis_column_key);
       if (column.type === _dtableUtils.CellType.SINGLE_SELECT) {
-        this.x_axis_option_list = (0, _lodashEs.cloneDeep)(column.data.options);
+        this.x_axis_option_list = (0, _lodash.cloneDeep)(column.data.options);
       } else {
         this.x_axis_option_list = [];
       }

package/dist/model/map-bubble.js

@@ -24,6 +24,10 @@ class MapBubble extends _baseModel.default {
       }
     }
     this.geolocation_granularity = options.x_axis_geolocation_granularity;
+    this.map_level = options.map_level || _constants.MAP_LEVEL.COUNTRY;
+    this.map_location = options.map_location || {
+      province: _constants.regions[0].name
+    };
     this.summary_type = options.y_axis_summary_type || 'count';
     this.summary_method = options.y_axis_summary_method;
     this.summary_column_key = options.y_axis_summary_column_key;

package/dist/services/map-json.js

@@ -95,6 +95,9 @@ async function fetchMapJson(mapLevel, mapLocation, mediaUrl) {
   let mapJson;
   try {
     const res = await fetch("".concat(mediaUrl, "dtable-statistic/geolocation/").concat(url, ".json"));
+    if (!res.ok) {
+      return null;
+    }
     mapJson = await res.json();
   } catch (error) {
     console.error('on fetchMapJson: fetch error', error);

package/dist/settings/advance-bar-settings/data-settings.js

@@ -46,7 +46,7 @@ const DataSettings = _ref => {
       update['x_axis_date_granularity'] = null;
       update['x_axis_geolocation_granularity'] = null;
     } else {
-      if (_dtableUtils.DATE_COLUMN_OPTIONS.includes(type) || (0, _columnUtils.islinkDateFormula)(column)) {
+      if (_dtableUtils.DATE_COLUMN_OPTIONS.includes(type) || (0, _columnUtils.isDateFormulaColumn)(column)) {
         update['x_axis_date_granularity'] = _constants.CHART_SUMMARY_TYPE.MONTH;
         update['x_axis_geolocation_granularity'] = null;
       } else if (type === _dtableUtils.CellType.GEOLOCATION) {

package/dist/settings/advance-bar-settings/style-settings.js

@@ -59,7 +59,8 @@ const StyleSettings = _ref => {
     goal_label
   } = style_config || {};
   const table = tables.find(table => table._id === table_id);
-  const column = (0, _utils.getColumnByKey)(column_groupby_column_key, table.columns);
+  const columns = (table === null || table === void 0 ? void 0 : table.columns) || [];
+  const column = (0, _utils.getColumnByKey)(column_groupby_column_key, columns);
   const isGroupBySingleSelectColumn = (column === null || column === void 0 ? void 0 : column.type) === _dtableUtils.CellType.SINGLE_SELECT;
   const defaultColorTheme = _colorRules.SUPPORT_SINGLE_SELECT_THEMES_OPTIONS.DEFAULT;
   const [currYaxisTitle, setCurrYaxisTitle] = (0, _react.useState)(title_name || '');
@@ -106,7 +107,7 @@ const StyleSettings = _ref => {
     });
   }, [chart, onChange]);
   const onYAxisMinChange = (0, _react.useCallback)(min => {
-    const newMin = parseInt(min);
+    const newMin = parseFloat(min);
     if (Number.isNaN(newMin)) return;
     const {
       config
@@ -120,7 +121,7 @@ const StyleSettings = _ref => {
     });
   }, [chart, onChange]);
   const onYAxisMaxChange = (0, _react.useCallback)(max => {
-    const newMax = parseInt(max);
+    const newMax = parseFloat(max);
     if (Number.isNaN(newMax)) return;
     const {
       config

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

@@ -46,7 +46,7 @@ const DataSettings = _ref => {
       update['x_axis_date_granularity'] = null;
       update['x_axis_geolocation_granularity'] = null;
     } else {
-      if (_dtableUtils.DATE_COLUMN_OPTIONS.includes(type) || (0, _columnUtils.islinkDateFormula)(column)) {
+      if (_dtableUtils.DATE_COLUMN_OPTIONS.includes(type) || (0, _columnUtils.isDateFormulaColumn)(column)) {
         update['x_axis_date_granularity'] = _constants.CHART_SUMMARY_TYPE.MONTH;
         update['x_axis_geolocation_granularity'] = null;
       } else if (type === _dtableUtils.CellType.GEOLOCATION) {