dtable-ui-component 6.0.34 → 6.0.36

package/lib/ActionSheet/index.js

@@ -11,7 +11,7 @@ var React = _interopRequireWildcard(require("react"));
 var _client = require("react-dom/client");
 var _rmcDialog = _interopRequireDefault(require("rmc-dialog"));
 var _rmcFeedback = _interopRequireDefault(require("rmc-feedback"));
-var _getDataAttr = _interopRequireDefault(require("../_util/getDataAttr"));
+var _getDataAttr = _interopRequireDefault(require("../utils/getDataAttr"));
 var _Badge = _interopRequireDefault(require("../Badge"));
 require("./style/index.css");
 /* tslint:disable:jsx-no-multiline-js */

package/lib/DTableCustomizeSelect/index.css

@@ -40,7 +40,6 @@
   display: inline-block;
   font-size: 12px;
   color: #999;
-  transform: translateY(2px);
   transition: all 0.1s;
 }
 

package/lib/DTableFiltersPopover/widgets/filter-list/index.css

@@ -64,7 +64,6 @@
 
 .filters-list .dtable-select .selected-option-show {
   width: calc(100% - 20px);
-  height: 20px;
 }
 
 .filters-list .dtable-select .selected-option {
@@ -130,7 +129,6 @@
 
 .filters-list .selected-option .multiple-select-option,
 .filters-list .selected-option .single-select-option {
-  margin: 0;
   display: inline-block;
 }
 

package/lib/DateEditor/mb-editor/index.js

@@ -27,7 +27,7 @@ class MBDateEditor extends _react.default.PureComponent {
   constructor(props) {
     super(props);
     this.handleDateChange = date => {
-      if (this.showTime) {
+      if (this.props.showHourAndMinute) {
         const HM = (0, _dayjs.default)(this.state.time).format('HH:mm');
         // In iOS, the time standard is ISO-8601, new Date("YYYY-MM-DD") will be wrong, new Date("YYYY/MM/DD") will be OK.
         const newTime = (0, _dayjs.default)(date).format('YYYY/MM/DD') + ' ' + HM;
@@ -131,7 +131,6 @@ class MBDateEditor extends _react.default.PureComponent {
     this.calendarContainerRef = /*#__PURE__*/_react.default.createRef();
     this.leftFormat = dateFormat ? dateFormat.indexOf(' ') === -1 ? dateFormat : dateFormat.slice(0, dateFormat.indexOf(' ')) : 'YYYY-MM-DD';
     this.rightFormat = 'HH:mm';
-    this.showTime = showHourAndMinute;
     this.format = showHourAndMinute ? 'YYYY-MM-DD HH:mm' : 'YYYY-MM-DD';
   }
   componentDidMount() {
@@ -156,7 +155,8 @@ class MBDateEditor extends _react.default.PureComponent {
   render() {
     const {
       lang,
-      column
+      column,
+      showHourAndMinute
     } = this.props;
     const {
       time
@@ -175,7 +175,7 @@ class MBDateEditor extends _react.default.PureComponent {
       className: "dtable-ui-mobile-date-editor-input"
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "date-input",
-      style: this.showTime ? {
+      style: showHourAndMinute ? {
         width: '50%'
       } : {
         width: '100%'
@@ -189,7 +189,7 @@ class MBDateEditor extends _react.default.PureComponent {
       onChange: this.handleDateChange
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "date-input-day"
-    }, (0, _dayjs.default)(time).format(this.leftFormat)))), this.showTime && /*#__PURE__*/_react.default.createElement("div", {
+    }, (0, _dayjs.default)(time).format(this.leftFormat)))), showHourAndMinute && /*#__PURE__*/_react.default.createElement("div", {
       className: "date-input",
       style: {
         width: '50%'

package/lib/DatePicker/index.js

@@ -10,7 +10,7 @@ var PropTypes = _interopRequireWildcard(require("prop-types"));
 var React = _interopRequireWildcard(require("react"));
 var _DatePicker2 = _interopRequireDefault(require("rmc-date-picker/lib/DatePicker"));
 var _Popup = _interopRequireDefault(require("rmc-date-picker/lib/Popup"));
-var _getLocale = require("../_util/getLocale");
+var _getLocale = require("../utils/getLocale");
 var _utils = require("./utils");
 require("./style/index.css");
 /* tslint:disable:jsx-no-multiline-js */

package/lib/DepartmentMultipleSelectEditor/index.js

@@ -82,12 +82,6 @@ function DepartmentMultipleSelect(props) {
       id
     } = department;
     const newLevel = level + 1;
-    const inputStyle = {
-      marginRight: "".concat(newLevel * 15 + 5, "px")
-    };
-    const nameStyle = {
-      paddingLeft: hasChild ? '' : '16px'
-    };
     const inputChecked = value.includes(id);
     return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
       key: id
@@ -98,7 +92,9 @@ function DepartmentMultipleSelect(props) {
       type: "checkbox",
       className: "vam department-select-input",
       checked: inputChecked,
-      style: inputStyle,
+      style: {
+        marginRight: "".concat(newLevel * 15 + 5, "px")
+      },
       onChange: () => {}
     }), hasChild && !searchVal && /*#__PURE__*/_react.default.createElement("div", {
       onClick: event => onExpand(event, id, isExpanded),
@@ -107,7 +103,9 @@ function DepartmentMultipleSelect(props) {
     }, /*#__PURE__*/_react.default.createElement("span", {
       className: "dtable-font expand dtable-icon-down3 ".concat(isExpanded ? '' : 'rotate-270')
     })), /*#__PURE__*/_react.default.createElement("span", {
-      style: searchVal ? {} : nameStyle,
+      style: searchVal ? {} : {
+        paddingLeft: hasChild ? '' : '16px'
+      },
       title: name,
       className: "text-truncate"
     }, name)), isExpanded && hasChild && renderSubDepartments(id, subDepartments, newLevel));

package/lib/DepartmentSingleSelectEditor/pc-editor/department-single-select.js

@@ -135,20 +135,15 @@ class DepartmentSingleSelect extends _react.Component {
         name,
         id
       } = department;
-      const noChildStyle = hasNextLevel ? '16px' : '12px';
-      const nameStyle = {
-        paddingLeft: hasChild ? '' : noChildStyle
-      };
-      const itemStyle = {
-        paddingLeft: "".concat(newLevel * 15 + 10, "px")
-      };
       const isChecked = value === id;
       return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
         key: id
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: "department-item",
         onClick: event => this.onSelectDepartment(event, id),
-        style: itemStyle
+        style: {
+          paddingLeft: "".concat(newLevel * 15 + 10, "px")
+        }
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: "department-item-left-content d-flex align-items-center"
       }, hasChild && /*#__PURE__*/_react.default.createElement("div", {
@@ -158,7 +153,9 @@ class DepartmentSingleSelect extends _react.Component {
       }, /*#__PURE__*/_react.default.createElement("span", {
         className: "dtable-font expand dtable-icon-down3 ".concat(isExpanded ? '' : 'rotate-270')
       })), /*#__PURE__*/_react.default.createElement("span", {
-        style: nameStyle,
+        style: {
+          paddingLeft: hasChild ? '' : hasNextLevel ? '16px' : '12px'
+        },
         title: name,
         className: "text-truncate department-name"
       }, name), isChecked && /*#__PURE__*/_react.default.createElement("span", {

package/lib/GeolocationFormatter/index.js

@@ -14,15 +14,13 @@ class GeolocationFormatter extends _react.default.Component {
     let {
       value,
       data,
-      containerClassName,
-      isBaiduMap
+      containerClassName
     } = this.props;
     let className = (0, _classnames.default)('dtable-ui cell-formatter-container geolocation-formatter', containerClassName);
     if (typeof value !== 'object') {
       return null;
     }
     const geolocationDisplayString = (0, _dtableUtils.getGeolocationDisplayString)(value, data, {
-      isBaiduMap,
       hyphen: ' '
     });
     return /*#__PURE__*/_react.default.createElement("div", {
@@ -39,7 +37,6 @@ GeolocationFormatter.defaultProps = {
     detail: ''
   },
   data: {},
-  containerClassName: '',
-  isBaiduMap: false
+  containerClassName: ''
 };
 var _default = exports.default = GeolocationFormatter;

package/lib/InputItem/custom-input.js

@@ -9,8 +9,8 @@ exports.default = void 0;
 var _classnames = _interopRequireDefault(require("classnames"));
 var React = _interopRequireWildcard(require("react"));
 var ReactDOM = _interopRequireWildcard(require("react-dom"));
-var _class = require("../_util/class");
-var _exenv = require("../_util/exenv");
+var _class = require("../utils/class");
+var _exenv = require("../utils/exenv");
 var _customKeyboard = _interopRequireDefault(require("./custom-keyboard"));
 var _portal = _interopRequireDefault(require("./portal"));
 let customNumberKeyboard = null;

package/lib/InputItem/custom-keyboard.js

@@ -9,7 +9,7 @@ exports.default = exports.KeyboardItem = void 0;
 var _classnames = _interopRequireDefault(require("classnames"));
 var React = _interopRequireWildcard(require("react"));
 var _rmcFeedback = _interopRequireDefault(require("rmc-feedback"));
-var _exenv = require("../_util/exenv");
+var _exenv = require("../utils/exenv");
 /**
  * determines whether an array includes a certain value among its entries, returning true or false as appropriate.
  * @param {array} arr The array to search in

package/lib/InputItem/index.js

@@ -10,7 +10,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var PropTypes = _interopRequireWildcard(require("prop-types"));
 var React = _interopRequireWildcard(require("react"));
 var _rmcFeedback = _interopRequireDefault(require("rmc-feedback"));
-var _getLocale = require("../_util/getLocale");
+var _getLocale = require("../utils/getLocale");
 var _customInput = _interopRequireDefault(require("./custom-input"));
 var _input = _interopRequireDefault(require("./input"));
 require("./style/index.css");

package/lib/Modal/alert.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = alert;
 var React = _interopRequireWildcard(require("react"));
 var _client = require("react-dom/client");
-var _closest = _interopRequireDefault(require("../_util/closest"));
+var _closest = _interopRequireDefault(require("../utils/closest"));
 var _modal = _interopRequireDefault(require("./modal"));
 function alert(title, message) {
   let actions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [{

package/lib/Modal/operation.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = operation;
 var React = _interopRequireWildcard(require("react"));
 var _client = require("react-dom/client");
-var _closest = _interopRequireDefault(require("../_util/closest"));
+var _closest = _interopRequireDefault(require("../utils/closest"));
 var _modal = _interopRequireDefault(require("./modal"));
 function operation() {
   let actions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [{

package/lib/Modal/prompt.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = prompt;
 var React = _interopRequireWildcard(require("react"));
 var _client = require("react-dom/client");
-var _closest = _interopRequireDefault(require("../_util/closest"));
+var _closest = _interopRequireDefault(require("../utils/closest"));
 var _modal = _interopRequireDefault(require("./modal"));
 function prompt(title, message, callbackOrActions) {
   let type = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'default';

package/lib/Picker/AbstractPicker.js

@@ -13,7 +13,7 @@ var _Cascader = _interopRequireDefault(require("rmc-cascader/lib/Cascader"));
 var _Popup = _interopRequireDefault(require("rmc-cascader/lib/Popup"));
 var _MultiPicker = _interopRequireDefault(require("rmc-picker/lib/MultiPicker"));
 var _Picker = _interopRequireDefault(require("rmc-picker/lib/Picker"));
-var _getLocale = require("../_util/getLocale");
+var _getLocale = require("../utils/getLocale");
 /* tslint:disable:jsx-no-multiline-js */
 
 function getDefaultProps() {

package/lib/RowExpandEditor/geolocation-editor/pc-editor/index.js

@@ -82,21 +82,10 @@ class RowExpandPCGeolocationEditor extends _react.default.Component {
       });
     };
     this.getLocationInfo = value => {
-      var _window;
       const {
-        column,
-        config
+        column
       } = this.props;
-      const {
-        dtableBaiduMapKey,
-        dtableMineMapKey
-      } = {
-        ...((_window = window) === null || _window === void 0 ? void 0 : _window.dtable),
-        ...config
-      };
-      const isBaiduMap = !!(dtableBaiduMapKey || dtableMineMapKey);
       return (0, _dtableUtils.getGeolocationDisplayString)(value, column.data, {
-        isBaiduMap,
         hyphen: ' '
       });
     };

package/lib/TabBar/index.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.Item = void 0;
 var React = _interopRequireWildcard(require("react"));
-var _getDataAttr = _interopRequireDefault(require("../_util/getDataAttr"));
+var _getDataAttr = _interopRequireDefault(require("../utils/getDataAttr"));
 var _Tabs = _interopRequireDefault(require("../Tabs"));
 var _Tab = _interopRequireDefault(require("./Tab"));
 require("./index.css");

package/lib/TextareaItem/index.js

@@ -9,7 +9,7 @@ exports.default = void 0;
 var _classnames = _interopRequireDefault(require("classnames"));
 var React = _interopRequireWildcard(require("react"));
 var _rmcFeedback = _interopRequireDefault(require("rmc-feedback"));
-var _exenv = require("../_util/exenv");
+var _exenv = require("../utils/exenv");
 require("./index.css");
 /* tslint:disable:jsx-no-multiline-js */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "6.0.34",
+  "version": "6.0.36",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "4.0.2",
@@ -8,7 +8,7 @@
     "@seafile/seafile-editor": "~2.0.6",
     "classnames": "2.3.2",
     "dayjs": "1.10.7",
-    "dtable-utils": "~5.0.19",
+    "dtable-utils": "~5.0.21",
     "is-hotkey": "0.2.0",
     "rc-checkbox": "3.5.0",
     "react-color": "2.19.3",