sea-chart 1.1.105 → 1.1.107

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

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import classnames from 'classnames';
+import { getColumnFilterOptions, CellType } from 'dtable-utils';
 import intl from '../../intl';
-import { CellType, FILTER_COLUMN_OPTIONS } from 'dtable-utils';
 import CommonAddTool from '../common-add-tool';
 import DTablePopover from '../dtable-popover';
 import ColorRules from './color-rules';
@@ -75,7 +75,9 @@ class ColorRulesPopover extends Component {
       switch (filterType) {
         case COLOR_RULE_FILTER_TYPE_MAP.NUMERIC_VALUE:
           {
-            return FILTER_COLUMN_OPTIONS[CellType.NUMBER];
+            return getColumnFilterOptions({
+              type: CellType.NUMBER
+            });
           }
         default:
           {

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

@@ -1,4 +1,4 @@
-import { COLUMNS_ICON_CONFIG } from 'dtable-utils';
+import _DTableColumnIcon from "dtable-ui-component/lib/DTableColumnIcon";
 import React, { useEffect, useRef } from 'react';
 import { UncontrolledPopover } from 'reactstrap';
 import isHotkey from 'is-hotkey';
@@ -93,8 +93,9 @@ export default function DrillDownFieldsPopover(_ref) {
     }, /*#__PURE__*/React.createElement("td", {
       className: "pl-5 text-truncate",
       title: column.name
-    }, /*#__PURE__*/React.createElement("i", {
-      className: `${COLUMNS_ICON_CONFIG[column.type]} mr-2 ${styles['drill-down-fields-icon']}`
+    }, /*#__PURE__*/React.createElement(_DTableColumnIcon, {
+      column: column,
+      className: `${styles['drill-down-fields-icon']} mr-2`
     }), /*#__PURE__*/React.createElement("span", null, column.name)), /*#__PURE__*/React.createElement("td", {
       className: `${styles['column-checkbox']} pr-3`
     }, /*#__PURE__*/React.createElement("input", {

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

@@ -1,4 +1,5 @@
 import _DTableSwitch from "dtable-ui-component/lib/DTableSwitch";
+import _DTableColumnIcon from "dtable-ui-component/lib/DTableColumnIcon";
 import React from 'react';
 class HideColumnItem extends React.PureComponent {
   constructor(props) {
@@ -40,11 +41,14 @@ class HideColumnItem extends React.PureComponent {
     const {
       readonly
     } = this.props;
-    const placeholder = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("i", {
-      className: `dtable-font ${setting.columnIcon}`
+    const {
+      column
+    } = setting;
+    const placeholder = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_DTableColumnIcon, {
+      column: column
     }), /*#__PURE__*/React.createElement("span", {
       className: "text-truncate"
-    }, setting.columnName));
+    }, column.name));
     return /*#__PURE__*/React.createElement(_DTableSwitch, {
       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 {
@@ -35,4 +39,4 @@
   border-radius: 50%;
   transition: .3s left;
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, .4);
-}
+}

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

@@ -2,7 +2,6 @@ import React from 'react';
 // import intl from 'react-intl-universal';
 import { UncontrolledPopover } from 'reactstrap';
 import isHotkey from 'is-hotkey';
-import { COLUMNS_ICON_CONFIG } from 'dtable-utils';
 import intl from '../../../intl';
 import { getEventClassName } from '../../../utils';
 import HideColumnItem from './hide-column-popover-widgets/hide-column-item';
@@ -112,7 +111,7 @@ class HideColumnPopover extends React.Component {
         return fieldSettings;
       }
       return fieldSettings.filter(setting => {
-        return setting.columnName.toLowerCase().includes(searchVal);
+        return setting.column.name.toLowerCase().includes(searchVal);
       });
     };
     this.state = {
@@ -137,8 +136,7 @@ class HideColumnPopover extends React.Component {
       return {
         key: column.key,
         isChecked: shownColumnKeys.includes(column.key),
-        columnName: column.name,
-        columnIcon: COLUMNS_ICON_CONFIG[column.type]
+        column: column
       };
     });
     // table page cannot hide first column

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

@@ -1,9 +1,10 @@
 import _DTableCustomizeSelect from "dtable-ui-component/lib/DTableCustomizeSelect";
+import _DTableColumnIcon from "dtable-ui-component/lib/DTableColumnIcon";
 import React, { Component, Fragment } from 'react';
 // import intl from 'react-intl-universal';
 import isHotkey from 'is-hotkey';
 import { Button, UncontrolledPopover } from 'reactstrap';
-import { COLUMNS_ICON_CONFIG, SORT_COLUMN_OPTIONS, SORT_TYPE } from 'dtable-utils';
+import { SORT_COLUMN_OPTIONS, SORT_TYPE } from 'dtable-utils';
 import { getEventClassName, getColumnByKey } from '../../../utils';
 import CommonAddTool from '../../common-add-tool';
 // import eventBus from '../../utils/event-bus';
@@ -118,7 +119,6 @@ class SortPopover extends Component {
       const sortableColumns = columns.filter(column => SORT_COLUMN_OPTIONS.includes(column.type));
       return sortableColumns.map(column => {
         const {
-          type,
           name
         } = column;
         return {
@@ -127,8 +127,8 @@ class SortPopover extends Component {
           },
           label: /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("span", {
             className: "filter-header-icon"
-          }, /*#__PURE__*/React.createElement("i", {
-            className: COLUMNS_ICON_CONFIG[type]
+          }, /*#__PURE__*/React.createElement(_DTableColumnIcon, {
+            column: column
           })), /*#__PURE__*/React.createElement("span", {
             className: "select-option-name"
           }, name))
@@ -161,8 +161,7 @@ class SortPopover extends Component {
     };
     this.renderSortItem = (column, sort, index) => {
       let {
-        name,
-        type
+        name
       } = column;
       const {
         readonly
@@ -170,8 +169,8 @@ class SortPopover extends Component {
       let selectedColumn = {
         label: /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("span", {
           className: "filter-header-icon"
-        }, /*#__PURE__*/React.createElement("i", {
-          className: COLUMNS_ICON_CONFIG[type]
+        }, /*#__PURE__*/React.createElement(_DTableColumnIcon, {
+          column: column
         })), /*#__PURE__*/React.createElement("span", {
           className: "select-option-name",
           title: name,

package/dist/settings/basic-number-card/data-settings.js

@@ -1,7 +1,8 @@
 import _DTableSelect from "dtable-ui-component/lib/DTableSelect";
+import _DTableColumnIcon from "dtable-ui-component/lib/DTableColumnIcon";
 import React, { useCallback, useMemo } from 'react';
 import { FormGroup } from 'reactstrap';
-import { COLUMNS_ICON_CONFIG, getTableById } from 'dtable-utils';
+import { getTableById } from 'dtable-utils';
 import CommonDataSettings from '../widgets/common-data-settings';
 import { BaseUtils } from '../../utils';
 import { CHART_SUMMARY_SHOW, CHART_SUMMARY_CALCULATION_METHOD, CHART_SUPPORT_COLUMNS, CHART_Y_GROUP_TYPE, BASIC_NUMBER_CARD_CALCULATION_METHOD } from '../../constants';
@@ -59,8 +60,8 @@ const DataSettings = _ref => {
         value: column,
         label: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
           className: "sea-chart-column-icon"
-        }, /*#__PURE__*/React.createElement("i", {
-          className: COLUMNS_ICON_CONFIG[column.type]
+        }, /*#__PURE__*/React.createElement(_DTableColumnIcon, {
+          column: column
         })), /*#__PURE__*/React.createElement("span", {
           className: 'select-module select-module-name ml-0'
         }, column.name))

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

@@ -1,7 +1,8 @@
 import _DTableSelect from "dtable-ui-component/lib/DTableSelect";
+import _DTableColumnIcon from "dtable-ui-component/lib/DTableColumnIcon";
 import React, { Fragment, useCallback, useMemo } from 'react';
 import { FormGroup } from 'reactstrap';
-import { COLUMNS_ICON_CONFIG, getTableById } from 'dtable-utils';
+import { getTableById } from 'dtable-utils';
 import CommonDataSettings from '../widgets/common-data-settings';
 import { BaseUtils } from '../../utils';
 import { CHART_SUMMARY_SHOW, CHART_SUMMARY_CALCULATION_METHOD, CHART_SUPPORT_COLUMNS, BASIC_NUMBER_CARD_CALCULATION_METHOD } from '../../constants';
@@ -44,8 +45,8 @@ const DataSettings = _ref => {
         value: column,
         label: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
           className: "sea-chart-column-icon"
-        }, /*#__PURE__*/React.createElement("i", {
-          className: COLUMNS_ICON_CONFIG[column.type]
+        }, /*#__PURE__*/React.createElement(_DTableColumnIcon, {
+          column: column
         })), /*#__PURE__*/React.createElement("span", {
           className: 'select-module select-module-name ml-0'
         }, column.name))

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

@@ -1,5 +1,5 @@
 import _DTableSelect from "dtable-ui-component/lib/DTableSelect";
-import { COLUMNS_ICON_CONFIG } from 'dtable-utils';
+import _DTableColumnIcon from "dtable-ui-component/lib/DTableColumnIcon";
 import React, { useCallback, useMemo } from 'react';
 import { FormGroup, Label } from 'reactstrap';
 import { cloneDeep } from 'lodash';
@@ -17,8 +17,8 @@ export default function FunnelLayerSetting(_ref) {
       value: column,
       label: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
         className: "header-icon"
-      }, /*#__PURE__*/React.createElement("i", {
-        className: COLUMNS_ICON_CONFIG[column.type]
+      }, /*#__PURE__*/React.createElement(_DTableColumnIcon, {
+        column: column
       })), /*#__PURE__*/React.createElement("span", {
         className: 'select-option-name'
       }, column.name))
@@ -37,8 +37,8 @@ export default function FunnelLayerSetting(_ref) {
       value: selectedColumn,
       label: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
         className: "header-icon"
-      }, /*#__PURE__*/React.createElement("i", {
-        className: COLUMNS_ICON_CONFIG[selectedColumn.type]
+      }, /*#__PURE__*/React.createElement(_DTableColumnIcon, {
+        column: selectedColumn
       })), /*#__PURE__*/React.createElement("span", {
         className: 'select-option-name'
       }, selectedColumn.name))

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

@@ -1,8 +1,9 @@
 import _DTableSelect from "dtable-ui-component/lib/DTableSelect";
 import _DTableSwitch from "dtable-ui-component/lib/DTableSwitch";
+import _DTableColumnIcon from "dtable-ui-component/lib/DTableColumnIcon";
 import React, { useCallback, useMemo } from 'react';
 import { FormGroup, Label } from 'reactstrap';
-import { CellType, COLUMNS_ICON_CONFIG, DATE_COLUMN_OPTIONS, getTableById } from 'dtable-utils';
+import { CellType, DATE_COLUMN_OPTIONS, getTableById } from 'dtable-utils';
 import CommonDataSettings from '../widgets/common-data-settings';
 import Divider from '../widgets/divider';
 import GroupBy from '../widgets/group-by';
@@ -37,8 +38,8 @@ const DataSettings = _ref => {
         value: column,
         label: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
           className: "sea-chart-column-icon"
-        }, /*#__PURE__*/React.createElement("i", {
-          className: COLUMNS_ICON_CONFIG[column.type]
+        }, /*#__PURE__*/React.createElement(_DTableColumnIcon, {
+          column: column
         })), /*#__PURE__*/React.createElement("span", {
           className: "select-module select-module-name ml-0"
         }, column.name))

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

@@ -1,7 +1,8 @@
 import _DTableSelect from "dtable-ui-component/lib/DTableSelect";
+import _DTableColumnIcon from "dtable-ui-component/lib/DTableColumnIcon";
 import React, { useCallback, useMemo } from 'react';
 import { Label, FormGroup } from 'reactstrap';
-import { COLUMNS_ICON_CONFIG, CellType, getTableById } from 'dtable-utils';
+import { CellType, getTableById } from 'dtable-utils';
 import { BaseUtils } from '../../../utils';
 import intl from '../../../intl';
 import StacksSettings from '../../stacks-settings';
@@ -44,8 +45,8 @@ const BasicSummary = _ref => {
         column: column,
         label: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
           className: "sea-chart-column-icon"
-        }, /*#__PURE__*/React.createElement("i", {
-          className: COLUMNS_ICON_CONFIG[column.type]
+        }, /*#__PURE__*/React.createElement(_DTableColumnIcon, {
+          column: column
         })), /*#__PURE__*/React.createElement("span", {
           className: "select-module select-module-name ml-0"
         }, column.name))

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

@@ -1,9 +1,10 @@
 import _DTableSelect from "dtable-ui-component/lib/DTableSelect";
 import _DTableCustomizeSelect from "dtable-ui-component/lib/DTableCustomizeSelect";
+import _DTableColumnIcon from "dtable-ui-component/lib/DTableColumnIcon";
 import React, { Component } from 'react';
 import classnames from 'classnames';
 import { Label, FormGroup } from 'reactstrap';
-import { CellType, COLUMNS_ICON_CONFIG, DATE_COLUMN_OPTIONS, getTableById, getTableColumnByKey } from 'dtable-utils';
+import { CellType, DATE_COLUMN_OPTIONS, getTableById, getTableColumnByKey } from 'dtable-utils';
 import { isDateFormulaColumn } from '../../utils/column-utils';
 import { CHART_SUPPORT_COLUMNS, DATE_GRANULATES, GEOLOCATION_GRANULATES, CHART_SUMMARY_SHOW, GEOLOCATION_FORMAT_MAP, CHART_TYPE, TIME_COLUMN_LIST, COMPLETENESS_GROUPBY_SUPPORTED_COLUMN_TYPE, NUMBERIC_COLUMN_TYPE, MIRROR_COLUMN_LIST } from '../../constants';
 import intl from '../../intl';
@@ -92,8 +93,8 @@ class GroupBy extends Component {
           value: column,
           label: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
             className: "header-icon"
-          }, /*#__PURE__*/React.createElement("i", {
-            className: COLUMNS_ICON_CONFIG[column.type]
+          }, /*#__PURE__*/React.createElement(_DTableColumnIcon, {
+            column: column
           })), /*#__PURE__*/React.createElement("span", {
             className: 'select-option-name'
           }, column.name))

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

@@ -1,6 +1,7 @@
 import _DTableSelect from "dtable-ui-component/lib/DTableSelect";
+import _DTableColumnIcon from "dtable-ui-component/lib/DTableColumnIcon";
 import React, { Component, Fragment } from 'react';
-import { COLUMNS_ICON_CONFIG, getTableById } from 'dtable-utils';
+import { getTableById } from 'dtable-utils';
 import { FormGroup, Label } from 'reactstrap';
 import { BaseUtils } from '../../utils';
 import { CHART_SUMMARY_SHOW, CHART_SUMMARY_CALCULATION_METHOD, CHART_SUMMARY_TYPE, CHART_Y_GROUP_TYPE, CHART_TYPE, CHART_SUPPORT_COLUMNS, CHART_DATE_SUMMARY_CALCULATION_METHOD } from '../../constants';
@@ -42,8 +43,8 @@ class SummarySettings extends Component {
           value: column,
           label: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
             className: "sea-chart-column-icon"
-          }, /*#__PURE__*/React.createElement("i", {
-            className: COLUMNS_ICON_CONFIG[column.type]
+          }, /*#__PURE__*/React.createElement(_DTableColumnIcon, {
+            column: column
           })), /*#__PURE__*/React.createElement("span", {
             className: 'select-module select-module-name ml-0'
           }, column.name))

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

@@ -1,7 +1,8 @@
 import _DTableSelect from "dtable-ui-component/lib/DTableSelect";
+import _DTableColumnIcon from "dtable-ui-component/lib/DTableColumnIcon";
 import React, { Component } from 'react';
 import { FormGroup, Label } from 'reactstrap';
-import { COLUMNS_ICON_CONFIG, getTableById } from 'dtable-utils';
+import { getTableById } from 'dtable-utils';
 import { CHART_Y_GROUP_TYPE, CHART_SUMMARY_SHOW, CHART_SUMMARY_CALCULATION_METHOD, CHART_SUMMARY_TYPE, DATE_GRANULATES, GEOLOCATION_GRANULATES, CHART_DATE_SUMMARY_CALCULATION_METHOD, CHART_SUPPORT_COLUMNS, CHART_TYPE } from '../../constants';
 import { BaseUtils } from '../../utils';
 import intl from '../../intl';
@@ -74,8 +75,8 @@ class YAxisGroupSettings extends Component {
           value: column,
           label: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
             className: "sea-chart-column-icon"
-          }, /*#__PURE__*/React.createElement("i", {
-            className: COLUMNS_ICON_CONFIG[column.type]
+          }, /*#__PURE__*/React.createElement(_DTableColumnIcon, {
+            column: column
           })), /*#__PURE__*/React.createElement("span", {
             className: 'select-module select-module-name ml-0'
           }, column.name))

package/dist/utils/column-utils.js

@@ -1,5 +1,5 @@
+import _DTableColumnIcon from "dtable-ui-component/lib/DTableColumnIcon";
 import { CellType, DEFAULT_DATE_FORMAT, FORMULA_COLUMN_TYPES_MAP, FORMULA_RESULT_TYPE, isNumber, isNumericColumn, getNumberDisplayString } from 'dtable-utils';
-import { COLUMNS_ICON_CONFIG } from 'dtable-utils';
 import React from 'react';
 import { MIRROR_COLUMN_LIST, CHART_SUMMARY_TYPE } from '../constants';
 import { getClientFormulaDisplayString } from './cell-format-utils';
@@ -205,8 +205,8 @@ export function getColumnOptions(columns) {
       value: column,
       label: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
         className: "sea-chart-column-icon"
-      }, /*#__PURE__*/React.createElement("i", {
-        className: COLUMNS_ICON_CONFIG[column.type]
+      }, /*#__PURE__*/React.createElement(_DTableColumnIcon, {
+        column: column
       })), /*#__PURE__*/React.createElement("span", {
         className: 'select-module select-module-name ml-0'
       }, column.name))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "1.1.105",
+  "version": "1.1.107",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",
@@ -11,7 +11,7 @@
     "@dnd-kit/utilities": "^3.2.2",
     "@seafile/seafile-calendar": "^0.0.24",
     "@seafile/seafile-editor": "^2.0.12",
-    "axios": "~1.8.*",
+    "axios": "~1.12.*",
     "classnames": "^2.3.2",
     "dayjs": "1.10.7",
     "is-hotkey": "0.2.0",
@@ -99,7 +99,7 @@
     "css-minimizer-webpack-plugin": "5.0.1",
     "dotenv": "6.2.0",
     "dotenv-expand": "5.1.0",
-    "dtable-store": "~6.0.3",
+    "dtable-store": "~6.0.11",
     "ejs": "3.1.10",
     "eslint": "^6.8.0",
     "eslint-config-react-app": "^5.0.2",