dtable-ui-component 5.3.10-beta1 → 5.3.10-beta3

package/lib/RowExpandDialog/index.js

@@ -73,7 +73,7 @@ const RowExpandDialog = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     if (readonly || !column || !column.editable || _dtableUtils.NOT_SUPPORT_EDIT_COLUMN_TYPE_MAP[column.type]) return false;
     if (column.type === _dtableUtils.CellType.IMAGE || column.type === _dtableUtils.CellType.FILE) return Boolean(uploadFile);
     return true;
-  }, [isSaving, uploadFile]);
+  }, [readonly, isSaving, uploadFile]);
   const initRowData = (0, _react.useCallback)(() => {
     setLoading(true);
     setRow(defaultRow);
@@ -88,7 +88,7 @@ const RowExpandDialog = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     isChangedRef.current = isInsertingRow && Object.keys(defaultRow).length > 0;
     setColumns(validColumns);
     setLoading(false);
-  }, [isInsertingRow, checkEditable]);
+  }, [isInsertingRow, defaultColumns, defaultRow, checkEditable]);
   const toggle = (0, _react.useCallback)(() => {
     if (isSaving) return;
     onToggle();

package/lib/RowExpandEditor/RowExpandMultipleSelectEditor/index.js

@@ -11,6 +11,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _constants = require("../../constants");
 var _MultipleSelectEditor = _interopRequireDefault(require("../../MultipleSelectEditor"));
 var _lang = require("../../lang");
+var _objectUtils = _interopRequireDefault(require("../../utils/object-utils"));
 require("./index.css");
 class RowExpandMultipleSelectEditor extends _react.default.Component {
   constructor(_props) {
@@ -49,14 +50,22 @@ class RowExpandMultipleSelectEditor extends _react.default.Component {
     this.onToggleSelect = e => {
       e.preventDefault();
       e.stopPropagation();
-      this.props.updateTabIndex(this.props.columnIndex);
+      const {
+        updateTabIndex,
+        columnIndex
+      } = this.props;
+      updateTabIndex && updateTabIndex(columnIndex);
       this.toggleSingleSelect(true);
     };
     this.closeEditor = () => {
       this.toggleSingleSelect(false);
     };
     this.onFocus = () => {
-      this.props.updateTabIndex(this.props.columnIndex);
+      const {
+        updateTabIndex,
+        columnIndex
+      } = this.props;
+      updateTabIndex && updateTabIndex(columnIndex);
     };
     this.onChange = option => {
       const optionKey = option[this.key];
@@ -135,7 +144,8 @@ class RowExpandMultipleSelectEditor extends _react.default.Component {
     };
     this.renderOptions = () => {
       const {
-        isEditorFocus
+        isEditorFocus,
+        classNamePrefix
       } = this.props;
       const options = this.getMultipleSelectList();
       return /*#__PURE__*/_react.default.createElement("div", {
@@ -144,12 +154,17 @@ class RowExpandMultipleSelectEditor extends _react.default.Component {
         onClick: this.onToggleSelect,
         ref: ref => this.multipleSelectOptionsRef = ref,
         className: (0, _classnames.default)('dtable-ui dtable-ui-row-expand-select-editor custom-select', {
-          'focus': isEditorFocus
+          'focus': isEditorFocus,
+          ["".concat(classNamePrefix, "-select-editor")]: classNamePrefix
         })
       }, /*#__PURE__*/_react.default.createElement("div", {
-        className: "dtable-ui-row-expand-select-editor-inner"
+        className: (0, _classnames.default)('dtable-ui-row-expand-select-editor-inner', {
+          ["".concat(classNamePrefix, "-select-editor-inner")]: classNamePrefix
+        })
       }, /*#__PURE__*/_react.default.createElement("div", null, options.length > 0 && /*#__PURE__*/_react.default.createElement("div", {
-        className: "dtable-ui-row-expand-select-options"
+        className: (0, _classnames.default)('dtable-ui-row-expand-select-options', {
+          ["".concat(classNamePrefix, "-select-editor-options")]: classNamePrefix
+        })
       }, options)), /*#__PURE__*/_react.default.createElement("i", {
         "aria-hidden": "true",
         className: "dtable-font dtable-icon-down3"
@@ -169,9 +184,10 @@ class RowExpandMultipleSelectEditor extends _react.default.Component {
   }
   UNSAFE_componentWillReceiveProps(nextProps) {
     const {
-      value
+      value,
+      column
     } = nextProps;
-    if (value !== this.props.value) {
+    if (value !== this.props.value || !_objectUtils.default.isSameObject(column, this.props.column)) {
       this.options = this.getOptions(nextProps);
       this.setState({
         value
@@ -196,7 +212,8 @@ class RowExpandMultipleSelectEditor extends _react.default.Component {
     const {
       column,
       isSupportNewOption,
-      onAddNewOption
+      onAddNewOption,
+      classNamePrefix
     } = this.props;
     const {
       showSelectPopover,
@@ -214,6 +231,7 @@ class RowExpandMultipleSelectEditor extends _react.default.Component {
       value: value,
       valueKey: this.key,
       target: this.targetRef,
+      classNamePrefix: classNamePrefix,
       onCommit: this.onChange,
       isSupportNewOption: isSupportNewOption,
       onAddNewOption: onAddNewOption,

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

@@ -206,7 +206,8 @@ class PCSelectEditor extends _react.default.Component {
       column,
       valueKey,
       isSupportNewOption,
-      target
+      target,
+      classNamePrefix
     } = this.props;
     const {
       searchValue,
@@ -218,7 +219,9 @@ class PCSelectEditor extends _react.default.Component {
     // maxWidth = column.width > 200 ? column.width - 62 : 200 - 62
     let maxWidth = isInModal ? 250 : (column === null || column === void 0 ? void 0 : column.width) > 200 ? column.width - 62 : 138;
     const dom = /*#__PURE__*/_react.default.createElement("div", {
-      className: (0, _classnames.default)('dtable-ui-editor-container dtable-ui-select-editor-container', className),
+      className: (0, _classnames.default)('dtable-ui-editor-container dtable-ui-select-editor-container', className, {
+        ["".concat(classNamePrefix, "-select-editor-container")]: classNamePrefix
+      }),
       ref: ref => this.ref = ref
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "select-options-search"
@@ -276,7 +279,9 @@ class PCSelectEditor extends _react.default.Component {
         target: target,
         hideArrow: true,
         fade: false,
-        className: "dtable-ui dtable-ui-row-expand-select-editor-popover"
+        className: (0, _classnames.default)('dtable-ui dtable-ui-row-expand-select-editor-popover', {
+          ["".concat(classNamePrefix, "-select-editor-popover")]: classNamePrefix
+        })
       }, dom));
     }
     return dom;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "5.3.10beta1",
+  "version": "5.3.10beta3",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "3.0.1",