sea-chart 1.1.53-alpha.4 → 1.1.55

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

@@ -1,5 +1,6 @@
+import _DTableModalHeader from "dtable-ui-component/lib/DTableModalHeader";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { Modal, ModalHeader, ModalBody, ModalFooter, UncontrolledTooltip, Button } from 'reactstrap';
+import { Modal, ModalBody, ModalFooter, UncontrolledTooltip, Button } from 'reactstrap';
 import classnames from 'classnames';
 import { CHART_TYPE, CHART_TYPES, CHART_TYPE_SHOW, ZH_CN_SUPPORT_CHARTS } from '../../constants';
 import { eventStopPropagation } from '../../utils';
@@ -62,7 +63,7 @@ const TypesDialog = _ref => {
     toggle: onToggle,
     className: "sea-chart-types-dialog",
     zIndex: 1048
-  }, /*#__PURE__*/React.createElement(ModalHeader, {
+  }, /*#__PURE__*/React.createElement(_DTableModalHeader, {
     toggle: onToggle
   }, type ? intl.get('Edit_type') : intl.get('All_charts')), /*#__PURE__*/React.createElement(ModalBody, {
     className: "sea-chart-types-body"

package/dist/utils/index.js

@@ -14,7 +14,7 @@ export { getDateColumnFormat, isCheckboxColumn, getColumnByKey, isStatisticMapCo
 export { generatorKey } from './key-generator';
 export { translateCalendar } from './date-translate';
 export { isFunction } from './common-utils';
-export function formatXAxisLabel(label) {
+const splitLabelWithoutEnglish = label => {
   let newLabel = '';
   while (label.length > 0) {
     if (label.length > 12) {
@@ -26,6 +26,48 @@ export function formatXAxisLabel(label) {
     }
   }
   return newLabel;
+};
+export function formatXAxisLabel(label) {
+  let maxLength = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 12;
+  const regex = /\b[a-zA-Z0-9'.,-]+\b/g;
+  const words = label.match(regex);
+  if (!words || words.length === 0) {
+    return splitLabelWithoutEnglish(label);
+  }
+  let currentLine = '';
+  let result = [];
+  for (let i = 0; i < words.length; i++) {
+    const word = words[i];
+    const index = label.indexOf(word);
+    if (!currentLine) {
+      currentLine = label.slice(0, index);
+      label = label.slice(index + word.length);
+    } else {
+      currentLine = currentLine + label.slice(0, index);
+      label = label.slice(index + word.length);
+    }
+    if (currentLine.length > maxLength) {
+      while (currentLine.length > maxLength) {
+        result.push(currentLine.slice(0, maxLength));
+        currentLine = currentLine.slice(maxLength);
+      }
+    }
+    currentLine = currentLine + word;
+    if (currentLine.length > maxLength) {
+      while (currentLine.length > maxLength) {
+        result.push(currentLine.slice(0, maxLength) + '-');
+        currentLine = currentLine.slice(maxLength);
+      }
+    }
+    if (currentLine.length === maxLength || currentLine.length + 1 === maxLength) {
+      result.push(currentLine.slice(0, maxLength));
+      currentLine = '';
+    }
+    if (i === words.length - 1 && currentLine) {
+      result.push(currentLine);
+    }
+  }
+  return result.join('\n');
 }
 export function formatRowTotal(rowTotal) {
   const rowTotalNum = parseFloat(rowTotal);

package/dist/utils/row-record-utils.js

@@ -641,7 +641,15 @@ export const getFilterConditions = (statisticRecord, chart, table) => {
       const columnFilters = rows.map(row => getFilterByColumnType(config[columnKey], columns, [row], sqlGroupbyColumnKey));
       filters.push(...columnFilters);
     } else {
-      const columnFilter = getFilterByColumnType(config[columnKey], columns, rows, sqlGroupbyColumnKey);
+      let columnFilter;
+      if (['map', 'map_bubble'].includes(type)) {
+        columnFilter = {
+          column_key: config[columnKey],
+          value: name
+        };
+      } else {
+        columnFilter = getFilterByColumnType(config[columnKey], columns, rows, sqlGroupbyColumnKey);
+      }
       filters.push(columnFilter);
     }
     if (sqlColumnGroupbyColumnKey) {

package/dist/view/wrapper/table-element/components/formatter.js

@@ -1,6 +1,8 @@
 import _ButtonFormatter from "dtable-ui-component/lib/ButtonFormatter";
 import _RateFormatter from "dtable-ui-component/lib/RateFormatter";
 import _DurationFormatter from "dtable-ui-component/lib/DurationFormatter";
+import _EmailFormatter from "dtable-ui-component/lib/EmailFormatter";
+import _UrlFormatter from "dtable-ui-component/lib/UrlFormatter";
 import _AutoNumberFormatter from "dtable-ui-component/lib/AutoNumberFormatter";
 import _LastModifierFormatter from "dtable-ui-component/lib/LastModifierFormatter";
 import _CreatorFormatter from "dtable-ui-component/lib/CreatorFormatter";
@@ -24,8 +26,8 @@ import intl from '../../../../intl';
 import DtableFormulaFormatter from './formatters/formula-formatter';
 import LinkFormatter from './formatters/link-formatter';
 import FileFormatter from './formatters/FileFormatter/index';
-import UrlFormatter from './formatters/UrlFormatter/index';
-import EmailFormatter from './formatters/EmailFormatter/index';
+// import UrlFormatter from './formatters/UrlFormatter/index';
+// import EmailFormatter from './formatters/EmailFormatter/index';
 import { getTrimmedString, getValidUrl, openUrlLink } from './utils';
 class Formatter extends React.Component {
   constructor() {
@@ -247,20 +249,22 @@ class Formatter extends React.Component {
         case CellType.URL:
           {
             if (!cellValue) return this.renderEmptyFormatter();
-            return /*#__PURE__*/React.createElement(UrlFormatter, {
-              onClick: () => this.onUrlClick(cellValue),
+            return /*#__PURE__*/React.createElement("div", {
+              onClick: () => this.onUrlClick(cellValue)
+            }, /*#__PURE__*/React.createElement(_UrlFormatter, {
               value: cellValue,
               containerClassName: containerClassName
-            });
+            }), ";");
           }
         case CellType.EMAIL:
           {
             if (!cellValue) return this.renderEmptyFormatter();
-            return /*#__PURE__*/React.createElement(EmailFormatter, {
-              onClick: () => this.onEmailClick(cellValue),
+            return /*#__PURE__*/React.createElement("div", {
+              onClick: () => this.onEmailClick(cellValue)
+            }, /*#__PURE__*/React.createElement(_EmailFormatter, {
               value: cellValue,
               containerClassName: containerClassName
-            });
+            }), ";");
           }
         case CellType.DURATION:
           {

package/dist/view/wrapper/table-element/components/formatters/FileFormatter/index.css

@@ -1,4 +1,8 @@
-@import url('../css/cell-formatter.css');
+.dtable-ui.cell-formatter-container {
+  overflow: hidden;
+  line-height: 1;
+  width: 100%;
+}
 
 .dtable-ui.file-formatter {
   display: flex;
@@ -30,4 +34,4 @@
   background-color: #999;
   -webkit-transform: translate(-50%, 8px) scale(.8);
   transform: translate(-50%, 8px) scale(.8);
-}
+}

package/dist/view/wrapper/table-element/components/formatters/FileFormatter/index.js

@@ -1,8 +1,9 @@
+import _ImagePreviewerLightbox from "dtable-ui-component/lib/ImagePreviewerLightbox";
 import _FileItemFormatter from "dtable-ui-component/lib/FileItemFormatter";
 import React, { Fragment } from 'react';
 import classnames from 'classnames';
 import { imageCheck } from '../../../../../../utils/common-utils';
-import ImagePreviewerLightbox from './image-previewer-lightbox';
+import context from '../../../../../../context';
 import './index.css';
 export default class FileFormatter extends React.PureComponent {
   constructor(props) {
@@ -70,6 +71,9 @@ export default class FileFormatter extends React.PureComponent {
         largeImageIndex: -1
       });
     };
+    this.server = context.getSetting('server');
+    this.workspaceID = context.getSetting('workspaceID');
+    this.dtableUuid = context.getSetting('dtableUuid');
     this.state = {
       isShowLargeImage: false,
       largeImageIndex: -1,
@@ -114,7 +118,10 @@ export default class FileFormatter extends React.PureComponent {
       }, /*#__PURE__*/React.createElement(_FileItemFormatter, {
         file: item
       })));
-    }), this.state.isShowLargeImage && /*#__PURE__*/React.createElement(ImagePreviewerLightbox, {
+    }), this.state.isShowLargeImage && /*#__PURE__*/React.createElement(_ImagePreviewerLightbox, {
+      server: this.server,
+      workspaceID: this.workspaceID,
+      dtableUuid: this.dtableUuid,
       readOnly: true,
       imageItems: this.state.fileImageUrlList,
       imageIndex: this.state.largeImageIndex,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "1.1.53-alpha.4",
+  "version": "1.1.55",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",
@@ -27,7 +27,7 @@
   },
   "peerDependencies": {
     "@antv/scale": "0.3.14",
-    "dtable-ui-component": "^5.1.10",
+    "dtable-ui-component": "^5.2.13",
     "dtable-utils": "~5.0.*",
     "prop-types": "15.8.1",
     "react": "^17.0.0",
@@ -165,4 +165,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/dist/view/wrapper/table-element/components/formatters/EmailFormatter/index.css

@@ -1,6 +0,0 @@
-@import url('../css/cell-formatter.css');
-
-.dtable-ui.email-formatter {
-  text-decoration: underline;
-  cursor: pointer;
-}

package/dist/view/wrapper/table-element/components/formatters/EmailFormatter/index.js

@@ -1,23 +0,0 @@
-import React from 'react';
-import classnames from 'classnames';
-import './index.css';
-class EmailFormatter extends React.Component {
-  render() {
-    const {
-      containerClassName,
-      value,
-      onClick
-    } = this.props;
-    let classname = classnames('dtable-ui cell-formatter-container email-formatter', containerClassName);
-    const props = {
-      title: value
-    };
-    if (onClick) {
-      props.onClick = onClick;
-    }
-    return /*#__PURE__*/React.createElement("div", Object.assign({}, props, {
-      className: classname
-    }), value);
-  }
-}
-export default EmailFormatter;

package/dist/view/wrapper/table-element/components/formatters/FileFormatter/image-previewer-lightbox.js

@@ -1,14 +0,0 @@
-import _ImagePreviewerLightbox from "dtable-ui-component/lib/ImagePreviewerLightbox";
-import React from 'react';
-import context from '../../../../../../context';
-function ImagePreviewerLightbox(props) {
-  const server = context.getSetting('server');
-  const workspaceID = context.getSetting('workspaceID');
-  const dtableUuid = context.getSetting('dtableUuid');
-  return /*#__PURE__*/React.createElement(_ImagePreviewerLightbox, Object.assign({}, props, {
-    server: server,
-    workspaceID: workspaceID,
-    dtableUuid: dtableUuid
-  }));
-}
-export default ImagePreviewerLightbox;

package/dist/view/wrapper/table-element/components/formatters/UrlFormatter/index.css

@@ -1,6 +0,0 @@
-@import url('../css/cell-formatter.css');
-
-.dtable-ui.url-formatter {
-  text-decoration: underline;
-  cursor: pointer;
-}

package/dist/view/wrapper/table-element/components/formatters/UrlFormatter/index.js

@@ -1,23 +0,0 @@
-import React from 'react';
-import classnames from 'classnames';
-import './index.css';
-class UrlFormatter extends React.Component {
-  render() {
-    const {
-      containerClassName,
-      value,
-      onClick
-    } = this.props;
-    let classname = classnames('dtable-ui cell-formatter-container url-formatter', containerClassName);
-    const props = {
-      title: value
-    };
-    if (onClick) {
-      props.onClick = onClick;
-    }
-    return /*#__PURE__*/React.createElement("div", Object.assign({}, props, {
-      className: classname
-    }), value);
-  }
-}
-export default UrlFormatter;

package/dist/view/wrapper/table-element/components/formatters/css/cell-formatter.css

@@ -1,5 +0,0 @@
-.dtable-ui.cell-formatter-container {
-  overflow: hidden;
-  line-height: 1;
-  width: 100%;
-}