dtable-statistic 5.3.46 → 5.3.47-beta.2

package/es/assets/css/dashboard.css

@@ -171,12 +171,12 @@
 }
 
 .statistic-list .statistic-chart-preview-container .sea-chart-pivot-table td {
-  min-width: 32px; 
+  min-width: 32px;
   width: auto
 }
 
 .statistic-list .statistic-chart-preview-container .sea-chart-pivot-table th {
-  min-width: 32px; 
+  min-width: 32px;
   width: auto
 }
 
@@ -288,38 +288,28 @@
   font-size: 12px;
 }
 
-.statistic-chart-preview .stat-item-dropdown-menu {
-  background-color: var(--dropdown-bg-color);
-  color: var(--common-font-color);
-  border: 1px solid var(--dropdown-border-color);
-}
-
-.statistic-chart-preview .dtable-dropdown-menu .toggle-icon {
+.statistic-chart-preview .dtable-dropdown .toggle-icon {
   font-size: 14px;
   color: var(--stat-item-font-color);
 }
 
-.statistic-chart-preview .dtable-dropdown-menu .dropdown-item {
-  padding: 3px 12px;
-  line-height: 1.5;
-  font-size: 14px;
-  color: var(--common-font-color);
-  cursor: pointer;
+.statistic-dropdown-dark.dtable-dropdown-menu {
+  background-color: rgba(28, 29, 31, 1);
+  border: 1px solid rgba(51, 52, 53, 1);
+  box-shadow: none;
 }
 
-.statistic-chart-preview .dtable-dropdown-menu .dropdown-item .item-icon {
-  font-size: 14px;
-  margin-right: 10px;
-  color: #8c8c8c;
+.statistic-dropdown-dark.dtable-dropdown-menu,
+.statistic-dropdown-dark.dtable-dropdown-menu .dropdown-item {
+  color: rgba(255, 255, 255, .9);
 }
 
-.statistic-chart-preview .dtable-dropdown-menu .dropdown-item:hover {
-  color: #fff;
-  background-color: #20a0ff;
+.statistic-dropdown-dark.dtable-dropdown-menu .dropdown-item .item-icon {
+  color: hsla(0, 0%, 100%, .7);
 }
 
-.statistic-chart-preview .dtable-dropdown-menu .dropdown-item:hover .item-icon {
-  color: #fff;
+.statistic-dropdown-dark.dtable-dropdown-menu .dropdown-item:hover {
+  background-color: hsla(0, 0%, 100%, .1);
 }
 
 .statistic-chart-preview .dtable-icon-more-level:hover {
@@ -398,40 +388,6 @@
   --font-hover-color: #ffffff;
 }
 
-.statistic-dropdown-menu {
-  font-weight: normal;
-  background-color: var(--dropdown-bg-color);
-  border: 1px solid var(--dropdown-border-color);
-}
-
-.statistic-dropdown-menu .no-options {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 40px;
-  color: #c2c2c2;
-}
-
-.statistic-dropdown-menu .dropdown-item {
-  color: var(--font-color);
-  cursor: pointer;
-}
-
-.statistic-dropdown-menu .dropdown-item:hover {
-  color: var(--font-hover-color);
-  background-color: #20a0ff;
-}
-
-.statistic-dropdown-menu .dropdown-item .item-icon {
-  font-size: 14px;
-  margin-right: 10px;
-  color: var(--font-color);
-}
-
-.statistic-dropdown-menu .dropdown-item:hover .item-icon {
-  color: var(--font-hover-color);
-}
-
 /* basic-number-card */
 .statistic-number-card .g2-html-annotation {
   transform: translate(-50%, -50%);
@@ -666,15 +622,3 @@
   margin-top: -16px !important;
   margin-left: 8px !important;
 }
-
-.statistic-views-dropdown-menu .dropdown-item {
-  display: flex;
-  align-items: center;
-  min-height: 32px;
-  padding: 3px 12px;
-}
-
-.statistic-views-dropdown-menu .statistic-view-name {
-  display: inline-block;
-  width: 100%;
-}

package/es/components/dropdown-menu/statistic-dropdown-menu.js

@@ -8,9 +8,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
+var _classnames = _interopRequireDefault(require("classnames"));
 var _reactstrap = require("reactstrap");
 var _seaChart = require("sea-chart");
 var _icon = _interopRequireDefault(require("../icon"));
+var _constants = require("../../constants");
 class StatisticDropdownMenu extends _react.default.Component {
   constructor(props) {
     super(props);
@@ -60,12 +62,13 @@ class StatisticDropdownMenu extends _react.default.Component {
   render() {
     const {
       isTableReadOnly,
-      chartType
+      chartType,
+      theme
     } = this.props;
     const otherViews = this.props.getOtherStatistics();
     const hasOtherViews = otherViews && otherViews.length > 0;
     return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactstrap.Dropdown, {
-      className: "dtable-dropdown-menu",
+      className: "dtable-dropdown",
       isOpen: this.state.isItemMenuShow,
       onMouseDown: this.onMouseDown,
       toggle: this.onDropdownToggleClick
@@ -76,7 +79,9 @@ class StatisticDropdownMenu extends _react.default.Component {
     }, /*#__PURE__*/_react.default.createElement("i", {
       className: "toggle-icon dtable-font dtable-icon-more-level"
     })), /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownMenu, {
-      className: "stat-item-dropdown-menu",
+      className: (0, _classnames.default)('dtable-dropdown-menu', {
+        'statistic-dropdown-dark': theme === _constants.THEME_NAME_MAP.DARK
+      }),
       end: true
     }, !isTableReadOnly && /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
       onMouseDown: this.editStatItem
@@ -138,7 +143,9 @@ class StatisticDropdownMenu extends _react.default.Component {
     })), /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownToggle, {
       className: "move-to-statistic-views-toggle"
     })), this.state.isShowViewsMenu && /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownMenu, {
-      className: "statistic-views-dropdown-menu",
+      className: (0, _classnames.default)('statistic-views-dropdown-menu dtable-dropdown-menu', {
+        'statistic-dropdown-dark': theme === _constants.THEME_NAME_MAP.DARK
+      }),
       flip: false,
       positionFixed: true,
       modifiers: [{

package/es/index.js

@@ -65,7 +65,7 @@ class Statistic {
   static mount(props) {
     const customProps = this.getInitProps();
     if (!customProps) return;
-    window.app.mountWidget( /*#__PURE__*/_react.default.createElement(_dashboard.default, Object.assign({}, props, customProps)));
+    window.app.mountWidget(/*#__PURE__*/_react.default.createElement(_dashboard.default, Object.assign({}, props, customProps)));
   }
   static unmount() {
     let {

package/es/setting.local.js

@@ -4,26 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-let config = {
-  username: 'cffbc4dbc6364befbdccb8623842a8ed@auth.local',
-  password: '123456',
-  dtableUuid: '842e9c84-8311-432d-b818-27012c807b13',
-  // required
-  APIToken: '83a5ec5848242d4da6c086acabd8e3a6e2fefa10',
-  // required
-  server: 'https://dev.seatable.cn',
-  mediaUrl: '/media/',
-  // required
-  dtableBaiduMapKey: '1qRjaf9gprzfG6Kykg54jSzAEZZI0NZV',
-  // required
-  dtableMineMapKey: '57bccfdf646e4118aa68accfa1f256a5',
-  // optional
-  dtableGoogleMapKey: 'AIzaSyC0K2fPe31FfLm3fyoPT5YXQcqO-GrSTi8',
-  workspaceID: '291',
-  // optional
-  fileName: '通用应用表格测试',
-  // optional
-  lang: 'en' // optional
-  // lang:'en'
-};
-var _default = exports.default = config;
+/**
+ * local development settings
+ */
+var _default = exports.default = {
+  // dtable api token (required)
+  APIToken: '9ae2df4c95a9a42d33bb794c100f7b1fcc2b8cfb',
+  // server URL of the dtable of the plugin (required)
+  server: 'https://dev.seatable.cn/',
+  // id of the workspace with the dtable of the plugin (required, workspace must exist)
+  workspaceID: '5',
+  // name of the dtable to add the plugin to (required, dtable must exist under this name)
+  fileName: '测试专用',
+  dtableUuid: '77e70288-7ae3-410e-bec8-374569e3d6c1',
+  // default language ('en' or 'zh-cn' are common, see "src/locale/index.js" for all lang keys)
+  lang: 'zh-cn',
+  username: 'jie.ren@seafile.com',
+  password: 'missu101258'
+};

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

@@ -129,6 +129,7 @@ class ChartPreview extends _react.Component {
     }, /*#__PURE__*/_react.default.createElement("i", {
       className: "dtable-font dtable-icon-open"
     })), /*#__PURE__*/_react.default.createElement(_statisticDropdownMenu.default, {
+      theme: this.props.theme,
       isTableReadOnly: isTableReadOnly,
       chartType: type,
       getOtherStatistics: this.props.getOtherStatistics,

package/es/tabs/tab.js

@@ -143,7 +143,7 @@ class DashBoardTab extends _react.Component {
     }, /*#__PURE__*/_react.default.createElement("i", {
       className: `${_statisticTabsModule.default['icon']} dtable-font dtable-icon-down3`
     }), isShowViewDropdown && /*#__PURE__*/_react.default.createElement(_ModalPortal2.default, null, /*#__PURE__*/_react.default.createElement("div", {
-      className: `${theme === _constants.THEME_NAME_MAP.DARK ? 'statistic-tabs-dropdown-dark' : 'statistic-tabs-dropdown-light'} statistic-dropdown-menu dropdown-menu large show`,
+      className: `${theme === _constants.THEME_NAME_MAP.DARK ? 'statistic-dropdown-dark' : 'statistic-tabs-dropdown-light'} dtable-dropdown-menu dropdown-menu large show`,
       style: {
         ...dropdownMenuPosition,
         zIndex: 1500

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.3.46",
+  "version": "5.3.47-beta.2",
   "name": "dtable-statistic",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
@@ -7,6 +7,7 @@
   "private": false,
   "dependencies": {
     "@antv/util": "^3.3.2",
+    "classnames": "^2.5.1",
     "comlink": "^4.4.1",
     "dayjs": "1.10.7",
     "html2canvas": "^1.4.1",
@@ -15,7 +16,7 @@
     "react-grid-layout": "^1.2.5",
     "react-intl-universal": "^2.4.8",
     "reactstrap": "9.2.3",
-    "sea-chart": "^1.1.129"
+    "sea-chart": "1.1.130-beta.2"
   },
   "peerDependencies": {
     "dtable-ui-component": "~6.0.*",