dtable-ui-component 6.0.113-mzn.2 → 6.0.113-mzn.4

package/lib/DTableFiltersPopover/index.js

@@ -193,11 +193,10 @@ var _jsxRuntime = require("react/jsx-runtime");
           className: "filter-popover-footer",
           children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactstrap.Button, {
             disabled: readOnly,
-            className: "dtable-button mr-2",
+            className: "mr-2",
             onClick: this.onClosePopover,
             children: (0, _lang.getLocale)('Cancel')
           }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactstrap.Button, {
-            className: "dtable-button",
             disabled: this.state.isSubmitDisabled || readOnly,
             color: "primary",
             onClick: this.onSubmitFilters,

package/lib/DeleteTip/index.js

@@ -9,7 +9,6 @@ var _react = _interopRequireDefault(require("react"));
 var _ClickOutside = _interopRequireDefault(require("../ClickOutside"));
 var _ModalPortal = _interopRequireDefault(require("../ModalPortal"));
 var _lang = require("../lang");
-var _reactstrap = require("reactstrap");
 require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
 class DeleteTip extends _react.default.Component {
@@ -43,13 +42,12 @@ class DeleteTip extends _react.default.Component {
             children: deleteTip
           }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
             className: "d-flex justify-content-end",
-            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactstrap.Button, {
-              className: "dtable-button mr-2",
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("button", {
+              className: "btn btn-secondary mr-2",
               onClick: toggle,
               children: (0, _lang.getLocale)('Cancel')
-            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactstrap.Button, {
-              className: "dtable-button",
-              color: "primary",
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)("button", {
+              className: "btn btn-primary",
               onClick: handleDelete,
               children: (0, _lang.getLocale)('Delete')
             })]

package/lib/DigitalSignEditor/pc-editor/index.js

@@ -180,13 +180,11 @@ class PCDigitalSignEditor extends _react.Component {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactstrap.Button, {
           onClick: this.props.onCommitCancel,
           color: "secondary",
-          className: "dtable-button",
           children: (0, _lang.getLocale)('Cancel')
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactstrap.Button, {
           onClick: this.saveSignature,
           color: "primary",
           disabled: saving,
-          className: "dtable-button",
           children: (0, _lang.getLocale)(saving ? 'Saving' : 'Save')
         })]
       })]

package/lib/GeolocationEditor/pc-editor/location-editor.js

@@ -340,12 +340,10 @@ class LocationEditor extends _react.Component {
         children: this.state.errMessage
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_DTableCustomFooter.default, {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactstrap.Button, {
-          className: "dtable-button",
           onClick: this.props.onCancel,
           color: "secondary",
           children: (0, _lang.getLocale)('Cancel')
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactstrap.Button, {
-          className: "dtable-button",
           onClick: this.onSubmit,
           color: "primary",
           children: (0, _lang.getLocale)('Submit')

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

@@ -261,12 +261,10 @@ class ProvinceCityEditor extends _react.Component {
         children: this.state.errMessage
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_DTableCustomFooter.default, {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactstrap.Button, {
-          className: "dtable-button",
           onClick: this.props.onCancel,
           color: "secondary",
           children: (0, _lang.getLocale)('Cancel')
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactstrap.Button, {
-          className: "dtable-button",
           onClick: this.onSubmit,
           color: "primary",
           autoFocus: true,

package/lib/IconButton/index.js

@@ -28,10 +28,10 @@ const IconButton = _ref => {
       noBackground
     } = _ref,
     otherProperties = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  const buttonIdRef = (0, _react.useRef)("dtable-icon-button-".concat((0, _dtableUtils.generatorBase64Code)(8)));
+  const buttonId = (0, _react.useMemo)(() => "dtable-icon-button-".concat((0, _dtableUtils.generatorBase64Code)(8)), []);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      id: buttonIdRef.current,
+      id: buttonId,
       className: (0, _classnames.default)('dtable-icon-btn', className, {
         'disabled': disabled,
         'outline': outline,
@@ -48,7 +48,7 @@ const IconButton = _ref => {
       }), children]
     })), title && /*#__PURE__*/(0, _jsxRuntime.jsx)(_DTableToolTip.default, {
       placement: tooltipPlacement || 'bottom',
-      target: buttonIdRef.current,
+      target: buttonId,
       children: title
     })]
   });

package/lib/RowExpandDialog/index.js

@@ -223,12 +223,10 @@ const RowExpandDialog = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
           children: children[1]
         })), (!saveImmediately || isInsertingRow) && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactstrap.ModalFooter, {
           children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactstrap.Button, {
-            className: "dtable-button",
             onClick: toggle,
             color: "secondary",
             children: (0, _lang.getLocale)('Cancel')
           }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactstrap.Button, {
-            className: "dtable-button",
             onClick: onSubmit,
             disabled: isSaving || !isChangedRef.current,
             color: "primary",

package/lib/css/icon-button-styles.css

@@ -10,8 +10,8 @@
   transition: all 0.2s ease !important;
   outline: none !important;
   border-radius: 3px !important;
-  min-width: 32px;
-  min-height: 32px;
+  min-width: 24px;
+  min-height: 24px;
 }
 
 .dtable-icon-btn:focus {

package/lib/index.js

@@ -667,6 +667,7 @@ var _FileItemFormatter = _interopRequireDefault(require("./FileItemFormatter"));
 var _DigitalSignFormatter = _interopRequireDefault(require("./DigitalSignFormatter"));
 var _DepartmentSingleSelectFormatter = _interopRequireDefault(require("./DepartmentSingleSelectFormatter"));
 var _SimpleLongTextFormatter = _interopRequireDefault(require("./SimpleLongTextFormatter"));
+var _DTableToolTip = _interopRequireDefault(require("./DTableToolTip"));
 var _RowExpandFormatter = _interopRequireDefault(require("./RowExpandFormatter"));
 var _RowExpandEditor = _interopRequireDefault(require("./RowExpandEditor"));
 var _RowExpand = _interopRequireDefault(require("./RowExpand"));
@@ -697,7 +698,6 @@ var _index = _interopRequireDefault(require("./DTableGroupSelect/index"));
 var _dtableSelectLabel = _interopRequireDefault(require("./DTableSelect/dtable-select-label"));
 var _DTableSwitch = _interopRequireDefault(require("./DTableSwitch"));
 var _DTableCustomizeSelect = _interopRequireDefault(require("./DTableCustomizeSelect"));
-var _DTableToolTip = _interopRequireDefault(require("./DTableToolTip"));
 var _DTableCustomizeCollaboratorSelect = _interopRequireDefault(require("./DTableCustomizeCollaboratorSelect"));
 var _DTableSearchInput = _interopRequireDefault(require("./DTableSearchInput"));
 var _DTableColorPicker = _interopRequireDefault(require("./DTableColorPicker"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "6.0.113mzn.2",
+  "version": "6.0.113mzn.4",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "^5.0.6",

package/lib/css/button-styles.css

@@ -1,152 +0,0 @@
-.dtable-button {
-  display: inline-flex !important;
-  align-items: center !important;
-  justify-content: center !important;
-  gap: 6px !important;
-  padding: 0 12px !important;
-  min-height: 32px !important;
-  font-size: 14px !important;
-  font-weight: normal !important;
-  border-radius: 3px !important;
-  cursor: pointer !important;
-  transition: all 0.2s ease !important;
-  white-space: nowrap !important;
-  outline: none !important;
-  font-family: inherit !important;
-  border: 1px solid transparent !important;
-}
-
-.dtable-button:focus {
-  outline: none !important;
-  box-shadow: none !important;
-}
-
-.dtable-button:active:focus {
-  box-shadow: none !important;
-}
-
-.btn-sm.dtable-button,
-.dtable-button.btn-sm {
-  min-height: 26px !important;
-  padding: 0 8px !important;
-  font-size: 12px !important;
-  gap: 4px !important;
-}
-
-.btn-lg.dtable-button,
-.dtable-button.btn-lg {
-  min-height: 38px !important;
-  padding: 0 16px !important;
-  font-size: 14px !important;
-}
-
-.dtable-button.btn-warning,
-.btn-warning.dtable-button {
-  background-color: #FF8000 !important;
-  color: #FFFFFF !important;
-  border-color: #FF8000 !important;
-}
-
-.dtable-button.btn-warning:hover:not(:disabled),
-.btn-warning.dtable-button:hover:not(:disabled) {
-  background-color: #ED7109 !important;
-  border-color: #ED7109 !important;
-  color: #FFFFFF !important;
-}
-
-.dtable-button.btn-warning:active:not(:disabled),
-.btn-warning.dtable-button:active:not(:disabled) {
-  background-color: #E16B09 !important;
-  border-color: #E16B09 !important;
-  color: #FFFFFF !important;
-}
-
-/* light color - 映射到 DTable 默认样式 */
-.dtable-button.btn-light,
-.btn-light.dtable-button {
-  background-color: #FFFFFF !important;
-  color: #ED7109 !important;
-  border-color: #ED7109 !important;
-}
-
-.dtable-button.btn-light:hover:not(:disabled),
-.btn-light.dtable-button:hover:not(:disabled) {
-  background-color: #ED7109 !important;
-  color: #FFFFFF !important;
-  border-color: #ED7109 !important;
-}
-
-.dtable-button.btn-light:active:not(:disabled),
-.btn-light.dtable-button:active:not(:disabled) {
-  background-color: #E16B09 !important;
-  color: #FFFFFF !important;
-  border-color: #E16B09 !important;
-}
-
-.dtable-button.btn-secondary,
-.btn-secondary.dtable-button {
-  background-color: #FFFFFF !important;
-  color: #212529 !important;
-  border-color: rgba(0, 40, 100, 0.12) !important;
-}
-
-.dtable-button.btn-secondary:hover:not(:disabled),
-.btn-secondary.dtable-button:hover:not(:disabled) {
-  background-color: rgba(0, 0, 0, 0.04) !important;
-  border-color: rgba(0, 40, 100, 0.12) !important;
-  color: #212529 !important;
-}
-
-.dtable-button.btn-secondary:active:not(:disabled),
-.btn-secondary.dtable-button:active:not(:disabled) {
-  background-color: #E9E9E9 !important;
-  border-color: rgba(0, 40, 100, 0.12) !important;
-  color: #212529 !important;
-}
-
-.dtable-button.btn-primary,
-.btn-primary.dtable-button {
-  background-color: #FF8000 !important;
-  color: #FFFFFF !important;
-  border-color: #FF8000 !important;
-}
-
-.dtable-button.btn-primary:hover:not(:disabled),
-.btn-primary.dtable-button:hover:not(:disabled) {
-  background-color: #ED7109 !important;
-  border-color: #ED7109 !important;
-  color: #FFFFFF !important;
-}
-
-.dtable-button.btn-primary:active:not(:disabled),
-.btn-primary.dtable-button:active:not(:disabled) {
-  background-color: #E16B09 !important;
-  border-color: #E16B09 !important;
-  color: #FFFFFF !important;
-}
-
-.dtable-button:disabled,
-.dtable-button.disabled {
-  opacity: 0.65 !important;
-  cursor: not-allowed !important;
-}
-
-.dtable-button.block {
-  display: flex !important;
-  width: 100% !important;
-}
-
-.dtable-button i,
-.dtable-button svg,
-.dtable-button .icon {
-  display: inline-block;
-  font-size: 14px;
-  line-height: 1;
-  margin: 0;
-}
-
-.btn-sm.dtable-button i,
-.btn-sm.dtable-button svg,
-.btn-sm.dtable-button .icon {
-  font-size: 12px;
-}