sea-chart 2.0.35 → 2.0.36

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

@@ -71,7 +71,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
@@ -85,7 +85,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/basic-number-card/data-settings.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _DTableSelect2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableSelect"));
+var _DTableColumnIcon2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableColumnIcon"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactstrap = require("reactstrap");
 var _dtableUtils = require("dtable-utils");
@@ -67,8 +68,8 @@ const DataSettings = _ref => {
         value: column,
         label: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
           className: "sea-chart-column-icon"
-        }, /*#__PURE__*/_react.default.createElement("i", {
-          className: _dtableUtils.COLUMNS_ICON_CONFIG[column.type]
+        }, /*#__PURE__*/_react.default.createElement(_DTableColumnIcon2.default, {
+          column: column
         })), /*#__PURE__*/_react.default.createElement("span", {
           className: 'select-module select-module-name ml-0'
         }, column.name))

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

@@ -13,7 +13,6 @@ var _commonDataSettings = _interopRequireDefault(require("../widgets/common-data
 var _divider = _interopRequireDefault(require("../widgets/divider"));
 var _groupBy = _interopRequireDefault(require("../widgets/group-by"));
 var _summarySettings = _interopRequireDefault(require("../widgets/summary-settings"));
-var _utils = require("../../utils");
 var _constants = require("../../constants");
 var _intl = _interopRequireDefault(require("../../intl"));
 const DataSettings = _ref => {

package/dist/settings/combination-settings/style-settings.js

@@ -63,7 +63,7 @@ const StyleSettings = _ref => {
     onChange && onChange(update);
   }, [chart, onChange]);
   const onYAxisMinChange = (0, _react.useCallback)((key, min) => {
-    const newMin = parseInt(min);
+    const newMin = parseFloat(min);
     if (Number.isNaN(newMin)) return;
     const update = {
       [key]: newMin
@@ -71,7 +71,7 @@ const StyleSettings = _ref => {
     onChange && onChange(update);
   }, [onChange]);
   const onYAxisMaxChange = (0, _react.useCallback)((key, max) => {
-    const newMax = parseInt(max);
+    const newMax = parseFloat(max);
     if (Number.isNaN(newMax)) return;
     const update = {
       [key]: newMax

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _DTableSelect2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableSelect"));
+var _DTableColumnIcon2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableColumnIcon"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactstrap = require("reactstrap");
 var _dtableUtils = require("dtable-utils");
@@ -52,8 +53,8 @@ const DataSettings = _ref => {
         value: column,
         label: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
           className: "sea-chart-column-icon"
-        }, /*#__PURE__*/_react.default.createElement("i", {
-          className: _dtableUtils.COLUMNS_ICON_CONFIG[column.type]
+        }, /*#__PURE__*/_react.default.createElement(_DTableColumnIcon2.default, {
+          column: column
         })), /*#__PURE__*/_react.default.createElement("span", {
           className: 'select-module select-module-name ml-0'
         }, column.name))

package/dist/settings/funnel-settings/components/funnel-layer-setting.js

@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = FunnelLayerSetting;
 var _DTableSelect2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableSelect"));
-var _dtableUtils = require("dtable-utils");
+var _DTableColumnIcon2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableColumnIcon"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactstrap = require("reactstrap");
-var _lodashEs = require("lodash-es");
+var _lodash = require("lodash");
 var _intl = _interopRequireDefault(require("../../../intl"));
 var _dndList = _interopRequireDefault(require("./dnd-list"));
 function FunnelLayerSetting(_ref) {
@@ -25,8 +25,8 @@ function FunnelLayerSetting(_ref) {
       value: column,
       label: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
         className: "header-icon"
-      }, /*#__PURE__*/_react.default.createElement("i", {
-        className: _dtableUtils.COLUMNS_ICON_CONFIG[column.type]
+      }, /*#__PURE__*/_react.default.createElement(_DTableColumnIcon2.default, {
+        column: column
       })), /*#__PURE__*/_react.default.createElement("span", {
         className: 'select-option-name'
       }, column.name))
@@ -45,8 +45,8 @@ function FunnelLayerSetting(_ref) {
       value: selectedColumn,
       label: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
         className: "header-icon"
-      }, /*#__PURE__*/_react.default.createElement("i", {
-        className: _dtableUtils.COLUMNS_ICON_CONFIG[selectedColumn.type]
+      }, /*#__PURE__*/_react.default.createElement(_DTableColumnIcon2.default, {
+        column: selectedColumn
       })), /*#__PURE__*/_react.default.createElement("span", {
         className: 'select-option-name'
       }, selectedColumn.name))
@@ -57,7 +57,7 @@ function FunnelLayerSetting(_ref) {
     const {
       value
     } = option;
-    const newList = (0, _lodashEs.cloneDeep)(value.data.options);
+    const newList = (0, _lodash.cloneDeep)(value.data.options);
     onChange({
       'x_axis_column_key': value.key,
       'x_axis_option_list': newList

package/dist/settings/index.js

@@ -41,7 +41,8 @@ const Settings = _ref => {
     children,
     departments,
     globalTheme,
-    lang
+    lang,
+    firstDayOfWeek
   } = _ref;
   const [type, setType] = (0, _react.useState)(_constants.CHART_SETTINGS_TYPE.DATA);
   const [labelColorConfigs, setLabelColorConfigs] = (0, _react.useState)([]);
@@ -119,7 +120,11 @@ const Settings = _ref => {
   }, /*#__PURE__*/_react.default.createElement("div", {
     id: "sea-chart-settings-content",
     className: "chart-settings-content"
-  }, type === _constants.CHART_SETTINGS_TYPE.DATA && /*#__PURE__*/_react.default.createElement(_contexts.DepartmentsContext.Provider, {
+  }, type === _constants.CHART_SETTINGS_TYPE.DATA && /*#__PURE__*/_react.default.createElement(_contexts.FirstDayOfWeekContext.Provider, {
+    value: {
+      firstDayOfWeek
+    }
+  }, /*#__PURE__*/_react.default.createElement(_contexts.DepartmentsContext.Provider, {
     value: {
       departments
     }
@@ -128,7 +133,7 @@ const Settings = _ref => {
     chart: chart,
     tables: tables,
     onChange: modifyStatistic
-  })), type === _constants.CHART_SETTINGS_TYPE.CHART_STYLE && /*#__PURE__*/_react.default.createElement(_styleSettings.default, {
+  }))), type === _constants.CHART_SETTINGS_TYPE.CHART_STYLE && /*#__PURE__*/_react.default.createElement(_styleSettings.default, {
     chart: chart,
     tables: tables,
     labelColorConfigs: labelColorConfigs,

package/dist/settings/table-element-settings/components/data-filter.js

@@ -13,10 +13,9 @@ var _utils = require("../../../utils");
 var _intl = _interopRequireDefault(require("../../../intl"));
 var _context = _interopRequireDefault(require("../../../context"));
 var _contexts = require("../../../utils/contexts");
-var _constants = require("../../../constants");
 require("./data-filter.css");
 const DataFilter = _ref => {
-  var _availableFilters;
+  var _window$dtable;
   let {
     chart,
     tables,
@@ -26,23 +25,25 @@ const DataFilter = _ref => {
   const {
     departments
   } = (0, _react.useContext)(_contexts.DepartmentsContext);
+  const {
+    firstDayOfWeek
+  } = (0, _react.useContext)(_contexts.FirstDayOfWeekContext);
   const {
     config
   } = chart;
   const {
-    type,
     table_id,
-    shown_column_keys,
     filters,
     filter_conjunction
   } = config;
-  let availableFilters = [];
-  // some of the filters of TABLE_ELEMENT maybe one of the hidden columns, so we need to filter them out
-  if (shown_column_keys && type === _constants.CHART_TYPE.TABLE_ELEMENT) {
-    availableFilters = filters === null || filters === void 0 ? void 0 : filters.filter(filter => shown_column_keys.includes(filter.column_key));
-  } else {
-    availableFilters = filters;
-  }
+  const columns = (0, _react.useMemo)(() => {
+    const table = (0, _dtableUtils.getTableById)(tables, table_id);
+    if (!table || !table.columns) return [];
+    return table.columns;
+  }, [table_id, tables]);
+  const validFilters = (0, _react.useMemo)(() => {
+    return (0, _dtableUtils.getValidFilters)(filters, columns);
+  }, [filters, columns]);
   const toggleFilterPopover = (0, _react.useCallback)(event => {
     (0, _utils.eventStopPropagation)(event);
     setIsFilterSetterShow(!isFilterSetterShow);
@@ -53,16 +54,7 @@ const DataFilter = _ref => {
   const id = (0, _react.useMemo)(() => {
     return 'sea-chart-data-filter-' + (0, _utils.generatorKey)();
   }, []);
-  const shownColumns = (0, _react.useMemo)(() => {
-    const table = (0, _dtableUtils.getTableById)(tables, table_id);
-    if (!table || !table.columns) return [];
-    if (!shown_column_keys) {
-      return table.columns;
-    } else {
-      return table.columns.filter(column => shown_column_keys.includes(column.key));
-    }
-  }, [shown_column_keys, table_id, tables]);
-  const filterLength = ((_availableFilters = availableFilters) === null || _availableFilters === void 0 ? void 0 : _availableFilters.length) || 0;
+  const filterLength = (validFilters === null || validFilters === void 0 ? void 0 : validFilters.length) || 0;
   const filterMessage = (0, _react.useMemo)(() => {
     let filterMessage = _intl.default.get('Filter');
     if (filterLength === 1) {
@@ -76,6 +68,10 @@ const DataFilter = _ref => {
     return filter_conjunction || 'And';
   }, [filter_conjunction]);
   const collaborators = _context.default.getCollaboratorsFromCache();
+  const userDepartmentIdsMap = ((_window$dtable = window.dtable) === null || _window$dtable === void 0 ? void 0 : _window$dtable.userDepartmentIdsMap) || {
+    'current_user_department_ids': [],
+    'current_user_department_and_sub_ids': []
+  };
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     id: id,
     className: "sea-chart-data-filter mb-1",
@@ -84,14 +80,17 @@ const DataFilter = _ref => {
     className: "dtable-font dtable-icon-filter"
   }), /*#__PURE__*/_react.default.createElement("span", null, filterMessage)), isFilterSetterShow && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_DTableFiltersPopover2.default, {
     isNeedSubmit: true,
+    userDepartmentIdsMap: userDepartmentIdsMap,
+    departments: departments,
     target: id,
-    filters: availableFilters,
+    columns: columns,
     filterConjunction: filterConjunction,
-    columns: shownColumns,
-    departments: departments,
+    filters: validFilters,
     collaborators: collaborators,
     hidePopover: toggleFilterPopover,
-    update: updateFilters
+    update: updateFilters,
+    firstDayOfWeek: firstDayOfWeek,
+    isSupportAdvanced: true
   })));
 };
 var _default = exports.default = DataFilter;

package/dist/settings/table-element-settings/index.css

@@ -127,16 +127,7 @@
   color: #666666;
 }
 
-.setting-item-permission-title:hover {
-  cursor: pointer;
-}
-
-.setting-item-permission-title.disable:hover {
-  cursor: default;
-}
-
-.setting-item .filters-setting-btn.disable:hover,
-.setting-item .setting-item-permission-title.disabled:hover {
+.setting-item .filters-setting-btn.disable:hover {
   cursor: not-allowed;
   color: hsl(0, 0%, 60%);
   background-color: hsl(0, 0%, 95%);
@@ -151,27 +142,6 @@
   color: #666666;
 }
 
-.setting-item .setting-item-permission-title .dtable-icon-right {
-  color: #ccc;
-  font-size: 10px;
-  cursor: pointer;
-  transition: transform 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-}
-
-.setting-item .setting-item-permission-title .dtable-icon-right:hover {
-  color: #666666;
-}
-
-.setting-item .setting-item-permission-title .dtable-icon-right.rotate {
-  transform: rotate(90deg);
-}
-
-.setting-item .setting-item-permission-title.disabled {
-  padding: 3px 4px;
-  border-radius: 4px;
-  line-height: 22px;
-}
-
 .setting-item .check-record-format-switch .custom-switch .custom-switch-description {
   width: 230px;
   white-space: break-spaces;

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

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _DTableSelect2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableSelect"));
 var _DTableSwitch2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableSwitch"));
+var _DTableColumnIcon2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableColumnIcon"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactstrap = require("reactstrap");
 var _dtableUtils = require("dtable-utils");
@@ -45,8 +46,8 @@ const DataSettings = _ref => {
         value: column,
         label: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
           className: "sea-chart-column-icon"
-        }, /*#__PURE__*/_react.default.createElement("i", {
-          className: _dtableUtils.COLUMNS_ICON_CONFIG[column.type]
+        }, /*#__PURE__*/_react.default.createElement(_DTableColumnIcon2.default, {
+          column: column
         })), /*#__PURE__*/_react.default.createElement("span", {
           className: "select-module select-module-name ml-0"
         }, column.name))

package/dist/settings/time-comparison-settings/style-settings.js

@@ -55,7 +55,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
@@ -69,7 +69,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/widgets/basic-summary/index.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _DTableSelect2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableSelect"));
+var _DTableColumnIcon2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableColumnIcon"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactstrap = require("reactstrap");
 var _dtableUtils = require("dtable-utils");
@@ -20,13 +21,13 @@ const BasicSummary = _ref => {
     tables,
     chart,
     onChange,
-    summaryTypeOptions: oldSummaryTypeOptions = _constants.CHART_SUMMARY_TYPES,
+    showSummaryTypes = true,
     summaryTypeKey = 'y_axis_summary_type',
-    summaryColumnKey = 'y_axis_summary_column_key',
     summaryMethodKey = 'y_axis_summary_method',
-    showSummaryTypes = true,
-    label,
-    supportColumnTypes = [_dtableUtils.CellType.NUMBER, _dtableUtils.CellType.DATE]
+    summaryColumnKey = 'y_axis_summary_column_key',
+    supportColumnTypes = [_dtableUtils.CellType.NUMBER, _dtableUtils.CellType.DATE],
+    summaryTypeOptions: oldSummaryTypeOptions = _constants.CHART_SUMMARY_TYPES,
+    label
   } = _ref;
   const selectedTable = (0, _react.useMemo)(() => {
     const {
@@ -52,8 +53,8 @@ const BasicSummary = _ref => {
         column: column,
         label: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
           className: "sea-chart-column-icon"
-        }, /*#__PURE__*/_react.default.createElement("i", {
-          className: _dtableUtils.COLUMNS_ICON_CONFIG[column.type]
+        }, /*#__PURE__*/_react.default.createElement(_DTableColumnIcon2.default, {
+          column: column
         })), /*#__PURE__*/_react.default.createElement("span", {
           className: "select-module select-module-name ml-0"
         }, column.name))

package/dist/settings/widgets/common-data-settings.js

@@ -21,6 +21,7 @@ const CommonDataSettings = _ref => {
     tables,
     onChange
   } = _ref;
+  const validTables = Array.isArray(tables) ? tables : [];
   const {
     config
   } = chart;
@@ -57,14 +58,14 @@ const CommonDataSettings = _ref => {
     });
   }, [onChange]);
   const generateConfig = (0, _react.useCallback)(config => {
-    return (0, _utils.generateChartConfig)(config, tables);
-  }, [tables]);
+    return (0, _utils.generateChartConfig)(config, validTables);
+  }, [validTables]);
   const {
     table_id,
     drill_down_status,
     drill_down_fields
   } = config;
-  const selectedTable = tables.find(table => table._id === table_id);
+  const selectedTable = validTables.find(table => table._id === table_id);
   const columns = selectedTable ? selectedTable.columns : [];
   const drillDownStatus = drill_down_status !== undefined && drill_down_status !== null ? drill_down_status : true;
   // use all columns as default
@@ -75,15 +76,15 @@ const CommonDataSettings = _ref => {
     generateChartConfig: generateConfig,
     onChange: onChange
   }), /*#__PURE__*/_react.default.createElement(_selectTable.default, {
-    tables: tables,
+    tables: validTables,
     selectedTableId: table_id,
     onChange: onTableChange
   }), dataSources === 'filter' && /*#__PURE__*/_react.default.createElement(_dataFilter.default, {
-    tables: tables,
+    tables: validTables,
     chart: chart,
     onChange: onChange
   }), dataSources === 'view' && /*#__PURE__*/_react.default.createElement(_selectView.default, {
-    tables: tables,
+    tables: validTables,
     selectedTableId: table_id,
     selectedViewId: chart.config.view_id,
     onChange: onViewChange

package/dist/settings/widgets/data-filter/index.js

@@ -16,6 +16,7 @@ var _context = _interopRequireDefault(require("../../../context"));
 var _contexts = require("../../../utils/contexts");
 require("./index.css");
 const DataFilter = _ref => {
+  var _window$dtable;
   let {
     chart,
     tables,
@@ -25,6 +26,9 @@ const DataFilter = _ref => {
   const {
     departments
   } = (0, _react.useContext)(_contexts.DepartmentsContext);
+  const {
+    firstDayOfWeek
+  } = (0, _react.useContext)(_contexts.FirstDayOfWeekContext);
   const toggleFilterPopover = (0, _react.useCallback)(event => {
     (0, _utils.eventStopPropagation)(event);
     setIsFilterSetterShow(!isFilterSetterShow);
@@ -44,21 +48,24 @@ const DataFilter = _ref => {
     } = config;
     return (0, _dtableUtils.getTableById)(tables, table_id);
   }, [tables, chart]);
+  const {
+    config
+  } = chart;
+  const {
+    filters
+  } = config;
+  const validFilters = (0, _react.useMemo)(() => {
+    return (0, _dtableUtils.getValidFilters)(filters, table === null || table === void 0 ? void 0 : table.columns);
+  }, [filters, table]);
   const filterMessage = (0, _react.useMemo)(() => {
-    const {
-      config
-    } = chart;
-    const {
-      filters
-    } = config;
     let filterMessage = _intl.default.get('Filter');
-    if (filters.length === 1) {
+    if (validFilters.length === 1) {
       filterMessage = _intl.default.get('1 Filter');
-    } else if (filters.length > 1) {
-      filterMessage = filters.length + ' ' + _intl.default.get('Filters');
+    } else if (validFilters.length > 1) {
+      filterMessage = validFilters.length + ' ' + _intl.default.get('Filters');
     }
     return filterMessage;
-  }, [chart]);
+  }, [validFilters]);
   const filterConjunction = (0, _react.useMemo)(() => {
     const {
       config
@@ -69,12 +76,10 @@ const DataFilter = _ref => {
     return filter_conjunction || 'And';
   }, [chart]);
   const collaborators = _context.default.getCollaboratorsFromCache();
-  const {
-    config
-  } = chart;
-  const {
-    filters
-  } = config;
+  const userDepartmentIdsMap = ((_window$dtable = window.dtable) === null || _window$dtable === void 0 ? void 0 : _window$dtable.userDepartmentIdsMap) || {
+    'current_user_department_ids': [],
+    'current_user_department_and_sub_ids': []
+  };
   return /*#__PURE__*/_react.default.createElement(_reactstrap.FormGroup, {
     className: "sea-chart-parameter-item"
   }, /*#__PURE__*/_react.default.createElement(_reactstrap.Label, null, _intl.default.get('Data_settings')), table ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
@@ -83,17 +88,20 @@ const DataFilter = _ref => {
     onClick: toggleFilterPopover
   }, /*#__PURE__*/_react.default.createElement("i", {
     className: "dtable-font dtable-icon-filter"
-  }), /*#__PURE__*/_react.default.createElement("span", null, filterMessage)), isFilterSetterShow && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_DTableFiltersPopover2.default, {
+  }), /*#__PURE__*/_react.default.createElement("span", null, filterMessage)), isFilterSetterShow && /*#__PURE__*/_react.default.createElement(_DTableFiltersPopover2.default, {
     isNeedSubmit: true,
+    userDepartmentIdsMap: userDepartmentIdsMap,
+    departments: departments,
     target: id,
-    filters: filters,
-    filterConjunction: filterConjunction,
     columns: table.columns,
-    departments: departments,
+    filterConjunction: filterConjunction,
+    filters: validFilters,
     collaborators: collaborators,
     hidePopover: toggleFilterPopover,
-    update: updateFilters
-  }))) : /*#__PURE__*/_react.default.createElement("div", {
+    update: updateFilters,
+    firstDayOfWeek: firstDayOfWeek,
+    isSupportAdvanced: true
+  })) : /*#__PURE__*/_react.default.createElement("div", {
     id: id,
     className: "sea-chart-data-filter disabled"
   }, /*#__PURE__*/_react.default.createElement("i", {

package/dist/settings/widgets/group-by.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _DTableSelect2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableSelect"));
 var _DTableCustomizeSelect2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableCustomizeSelect"));
+var _DTableColumnIcon2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableColumnIcon"));
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reactstrap = require("reactstrap");
@@ -100,8 +101,8 @@ class GroupBy extends _react.Component {
           value: column,
           label: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
             className: "header-icon"
-          }, /*#__PURE__*/_react.default.createElement("i", {
-            className: _dtableUtils.COLUMNS_ICON_CONFIG[column.type]
+          }, /*#__PURE__*/_react.default.createElement(_DTableColumnIcon2.default, {
+            column: column
           })), /*#__PURE__*/_react.default.createElement("span", {
             className: 'select-option-name'
           }, column.name))
@@ -193,7 +194,7 @@ class GroupBy extends _react.Component {
       const {
         type: groupbyColumnType
       } = groupbyColumn;
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (_dtableUtils.DATE_COLUMN_OPTIONS.includes(groupbyColumnType) || (0, _columnUtils.islinkDateFormula)(groupbyColumn)) && this.renderGroupbyDateGranulates(), groupbyColumnType === _dtableUtils.CellType.GEOLOCATION && this.geolocationGranulatesOptions.length > 0 && this.renderGroupbyGeolocationGranulates());
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (_dtableUtils.DATE_COLUMN_OPTIONS.includes(groupbyColumnType) || (0, _columnUtils.isDateFormulaColumn)(groupbyColumn)) && this.renderGroupbyDateGranulates(), groupbyColumnType === _dtableUtils.CellType.GEOLOCATION && this.geolocationGranulatesOptions.length > 0 && this.renderGroupbyGeolocationGranulates());
     };
     this.dateGranulatesOptions = this.generatorGranulatesOptions(_constants.DATE_GRANULATES);
     this.initOptions(_props);

package/dist/settings/widgets/summary-settings.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _DTableSelect2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableSelect"));
+var _DTableColumnIcon2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableColumnIcon"));
 var _react = _interopRequireWildcard(require("react"));
 var _dtableUtils = require("dtable-utils");
 var _reactstrap = require("reactstrap");
@@ -50,8 +51,8 @@ class SummarySettings extends _react.Component {
           value: column,
           label: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
             className: "sea-chart-column-icon"
-          }, /*#__PURE__*/_react.default.createElement("i", {
-            className: _dtableUtils.COLUMNS_ICON_CONFIG[column.type]
+          }, /*#__PURE__*/_react.default.createElement(_DTableColumnIcon2.default, {
+            column: column
           })), /*#__PURE__*/_react.default.createElement("span", {
             className: 'select-module select-module-name ml-0'
           }, column.name))

package/dist/settings/widgets/y-axis-group-settings.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _DTableSelect2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableSelect"));
+var _DTableColumnIcon2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableColumnIcon"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactstrap = require("reactstrap");
 var _dtableUtils = require("dtable-utils");
@@ -82,8 +83,8 @@ class YAxisGroupSettings extends _react.Component {
           value: column,
           label: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
             className: "sea-chart-column-icon"
-          }, /*#__PURE__*/_react.default.createElement("i", {
-            className: _dtableUtils.COLUMNS_ICON_CONFIG[column.type]
+          }, /*#__PURE__*/_react.default.createElement(_DTableColumnIcon2.default, {
+            column: column
           })), /*#__PURE__*/_react.default.createElement("span", {
             className: 'select-module select-module-name ml-0'
           }, column.name))

package/dist/utils/cell-format-utils.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.getClientLinkDisplayString = exports.getClientFormulaDisplayString = exports.getClientCellValueDisplayString = void 0;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _dtableUtils = require("dtable-utils");
-var _objectUtils = _interopRequireDefault(require("./object-utils"));
 const getClientFormulaDisplayString = function (value, columnData) {
   let {
     collaborators = []
@@ -38,12 +37,15 @@ const getClientLinkDisplayString = (links, columnData, _ref) => {
   if (!columnData || !Array.isArray(links) || links.length === 0) {
     return null;
   }
-
-  // eslint-disable-next-line
-  const formulaData = _objectUtils.default.hasOwnProperty(columnData, 'result_type') ? columnData : {
-    ...columnData,
-    result_type: _dtableUtils.FORMULA_RESULT_TYPE.ARRAY
-  };
+  let formulaData = columnData;
+  const hasResultType = Object.prototype.hasOwnProperty.call(columnData, 'result_type');
+  if (!hasResultType) {
+    formulaData = {
+      ...columnData,
+      result_type: _dtableUtils.FORMULA_RESULT_TYPE.ARRAY,
+      array_type: 'text'
+    };
+  }
   const displayValue = links.map(link => link.display_value);
   return getClientFormulaDisplayString(displayValue, formulaData, {
     collaborators