dtable-ui-component 6.0.19-alpha1 → 6.0.19

package/lib/DigitalSignEditor/index.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactstrap = require("reactstrap");
-var _DTableCustomFooter = _interopRequireDefault(require("../DTableCustomFooter"));
 var _signatureBoard = _interopRequireDefault(require("./signature-board"));
 var _service = _interopRequireDefault(require("./service"));
 var _utils = _interopRequireDefault(require("./utils"));
@@ -168,7 +167,9 @@ class DigitalSignEditor extends _react.Component {
     }, /*#__PURE__*/_react.default.createElement(_signatureBoard.default, {
       ref: ref => this.signatureBoard = ref,
       signImageUrl: signImageUrl
-    })), /*#__PURE__*/_react.default.createElement(_DTableCustomFooter.default, null, /*#__PURE__*/_react.default.createElement(_reactstrap.Button, {
+    })), /*#__PURE__*/_react.default.createElement(_reactstrap.ModalFooter, {
+      className: "dtable-ui-geolocation-editor-footer"
+    }, /*#__PURE__*/_react.default.createElement(_reactstrap.Button, {
       onClick: this.props.onCommitCancel,
       color: "secondary"
     }, (0, _lang.getLocale)('Cancel')), /*#__PURE__*/_react.default.createElement(_reactstrap.Button, {

package/lib/GeolocationEditor/location-editor.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactstrap = require("reactstrap");
-var _DTableCustomFooter = _interopRequireDefault(require("../DTableCustomFooter"));
 var _selectorList = _interopRequireDefault(require("./selector-list"));
 var _selectorHeaderItem = _interopRequireDefault(require("./selector-header-item"));
 var _constants = require("../constants");
@@ -201,6 +200,17 @@ class LocationEditor extends _react.Component {
       }
       this.props.onSubmit();
     };
+    this.createFooter = () => {
+      return /*#__PURE__*/_react.default.createElement(_reactstrap.ModalFooter, {
+        className: "dtable-ui-geolocation-editor-footer"
+      }, /*#__PURE__*/_react.default.createElement(_reactstrap.Button, {
+        onClick: this.props.onCancel,
+        color: "secondary"
+      }, (0, _lang.getLocale)('Cancel')), /*#__PURE__*/_react.default.createElement(_reactstrap.Button, {
+        onClick: this.onSubmit,
+        color: "primary"
+      }, (0, _lang.getLocale)('Submit')));
+    };
     this.value = props.value;
     this.locations = {};
     this.state = {
@@ -346,17 +356,13 @@ class LocationEditor extends _react.Component {
       onCompositionEnd: this.onCompositionEnd,
       onCompositionStart: this.onCompositionStart
     })))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_Loading.default, null), /*#__PURE__*/_react.default.createElement("div", {
-      className: "align-items-center"
+      style: {
+        textAlign: 'center'
+      }
     }, (0, _lang.getLocale)('Loading_geolocation_data'))), this.state.errMessage && /*#__PURE__*/_react.default.createElement(_reactstrap.Alert, {
       color: "danger",
       className: "mt-2"
-    }, this.state.errMessage), /*#__PURE__*/_react.default.createElement(_DTableCustomFooter.default, null, /*#__PURE__*/_react.default.createElement(_reactstrap.Button, {
-      onClick: this.props.onCancel,
-      color: "secondary"
-    }, (0, _lang.getLocale)('Cancel')), /*#__PURE__*/_react.default.createElement(_reactstrap.Button, {
-      onClick: this.onSubmit,
-      color: "primary"
-    }, (0, _lang.getLocale)('Submit'))));
+    }, this.state.errMessage), this.createFooter());
   }
 }
 var _default = exports.default = LocationEditor;

package/lib/GeolocationEditor/province-city-editor.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactstrap = require("reactstrap");
-var _DTableCustomFooter = _interopRequireDefault(require("../DTableCustomFooter"));
 var _selectorList = _interopRequireDefault(require("./selector-list"));
 var _selectorHeaderItem = _interopRequireDefault(require("./selector-header-item"));
 var _Loading = _interopRequireDefault(require("../Loading"));
@@ -159,6 +158,18 @@ class ProvinceCityEditor extends _react.Component {
       }
       this.props.onSubmit();
     };
+    this.createFooter = () => {
+      return /*#__PURE__*/_react.default.createElement(_reactstrap.ModalFooter, {
+        className: "dtable-ui-geolocation-editor-footer"
+      }, /*#__PURE__*/_react.default.createElement(_reactstrap.Button, {
+        onClick: this.props.onCancel,
+        color: "secondary"
+      }, (0, _lang.getLocale)('Cancel')), /*#__PURE__*/_react.default.createElement(_reactstrap.Button, {
+        onClick: this.onSubmit,
+        color: "primary",
+        autoFocus: true
+      }, (0, _lang.getLocale)('Submit')));
+    };
     this.value = props.value || {};
     this.locations = {};
     this.state = {
@@ -275,14 +286,7 @@ class ProvinceCityEditor extends _react.Component {
     })))) : /*#__PURE__*/_react.default.createElement(_Loading.default, null), this.state.errMessage && /*#__PURE__*/_react.default.createElement(_reactstrap.Alert, {
       color: "danger",
       className: "mt-2"
-    }, this.state.errMessage), /*#__PURE__*/_react.default.createElement(_DTableCustomFooter.default, null, /*#__PURE__*/_react.default.createElement(_reactstrap.Button, {
-      onClick: this.props.onCancel,
-      color: "secondary"
-    }, (0, _lang.getLocale)('Cancel')), /*#__PURE__*/_react.default.createElement(_reactstrap.Button, {
-      onClick: this.onSubmit,
-      color: "primary",
-      autoFocus: true
-    }, (0, _lang.getLocale)('Submit'))));
+    }, this.state.errMessage), this.createFooter());
   }
 }
 var _default = exports.default = ProvinceCityEditor;

package/lib/index.js

@@ -82,12 +82,6 @@ Object.defineProperty(exports, "DTableCommonAddTool", {
     return _DTableCommonAddTool.default;
   }
 });
-Object.defineProperty(exports, "DTableCustomFooter", {
-  enumerable: true,
-  get: function () {
-    return _DTableCustomFooter.default;
-  }
-});
 Object.defineProperty(exports, "DTableCustomizeCollaboratorSelect", {
   enumerable: true,
   get: function () {
@@ -539,7 +533,6 @@ var _DTableColorPicker = _interopRequireDefault(require("./DTableColorPicker"));
 var _ModalPortal = _interopRequireDefault(require("./ModalPortal"));
 var _RoleStatusEditor = _interopRequireDefault(require("./RoleStatusEditor"));
 var _DTableModalHeader = _interopRequireDefault(require("./DTableModalHeader"));
-var _DTableCustomFooter = _interopRequireDefault(require("./DTableCustomFooter"));
 var _DepartmentSelectFilter = _interopRequireDefault(require("./DepartmentSelectFilter"));
 var _FieldDisplaySetting = _interopRequireDefault(require("./FieldDisplaySetting"));
 var _DTableFiltersPopover = _interopRequireDefault(require("./DTableFiltersPopover"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "6.0.19-alpha1",
+  "version": "6.0.19",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "4.0.2",

package/lib/DTableCustomFooter/index.css

@@ -1,10 +0,0 @@
-.dtable-custom-footer {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  justify-content: flex-end;
-  padding: 0.75rem;
-  border-top: 1px solid rgba(0, 40, 100, 0.12);
-  border-bottom-right-radius: 2px;
-  border-bottom-left-radius: 2px;
-}

package/lib/DTableCustomFooter/index.js

@@ -1,19 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _react = _interopRequireDefault(require("react"));
-require("./index.css");
-// DTableCustomFooter is used in geolocation editor and digital sign editor
-const DTableCustomFooter = _ref => {
-  let {
-    children
-  } = _ref;
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: "dtable-custom-footer"
-  }, children);
-};
-var _default = exports.default = DTableCustomFooter;