@seafile/sdoc-editor 1.0.200 → 1.0.202

package/dist/basic-sdk/extension/plugins/seatable-tables/helpers.js

@@ -80,9 +80,9 @@ const insertSeaTableTable = function (editor, item) {
   _slate.Transforms.setNodes(editor, node);
 };
 exports.insertSeaTableTable = insertSeaTableTable;
-const updateSeaTableTable = (editor, props) => {
+const updateSeaTableTable = (editor, props, options) => {
   _slate.Transforms.setNodes(editor, {
     ...props
-  });
+  }, options);
 };
 exports.updateSeaTableTable = updateSeaTableTable;

package/dist/basic-sdk/extension/plugins/seatable-tables/op-menu/index.js

@@ -107,14 +107,32 @@ function OpMenu(_ref3) {
   const [isShowHideColumn, setIsShowHideColumn] = (0, _react.useState)(false);
   const [isShowSeaTableSetting, setIsShowSeaTableSetting] = (0, _react.useState)(false);
   const onCloseOther = (0, _react.useCallback)(closeList => {
+    const {
+      filterData,
+      sortsData
+    } = seaTableRef.current;
     closeList.forEach(item => {
       item === 'tableList' && setIsShowTablesList(false);
-      item === 'tableFilter' && setIsShowFilter(false);
-      item === 'tableSort' && setIsShowSort(false);
+      if (item === 'tableFilter') {
+        if (filterData && Object.keys(filterData).length > 0) {
+          (0, _helpers.updateSeaTableTable)(editor, filterData);
+          seaTableRef.current['filterData'] = {};
+        }
+        setTimeout(() => {
+          setIsShowFilter(false);
+        }, 1000);
+      }
+      if (item === 'tableSort') {
+        if (sortsData && Object.keys(sortsData).length > 0) {
+          (0, _helpers.updateSeaTableTable)(editor, sortsData);
+          seaTableRef.current['sortsData'] = {};
+        }
+        setIsShowSort(false);
+      }
       item === 'tableColumnHidden' && setIsShowHideColumn(false);
       item === 'tableSetting' && setIsShowSeaTableSetting(false);
     });
-  }, []);
+  }, [editor, seaTableRef]);
   const onClickOutside = (0, _react.useCallback)(e => {
     if (seaTableRef !== null && seaTableRef !== void 0 && seaTableRef.current.contains(e.target)) {
       onCloseOther(['tableList', 'tableFilter', 'tableSort', 'tableColumnHidden', 'tableSetting']);
@@ -190,21 +208,25 @@ function OpMenu(_ref3) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isShowFilter]);
   const onFiltersChange = (0, _react.useCallback)((filters, filter_conjunction) => {
-    updatePageSettings({
-      filters,
-      filter_conjunction
-    });
-  }, [updatePageSettings]);
+    if (seaTableRef.current) {
+      seaTableRef.current['filterData'] = {
+        filters,
+        filter_conjunction
+      };
+    }
+  }, [seaTableRef]);
   const onSort = (0, _react.useCallback)(() => {
     setIsShowSort(!isShowSort);
     onCloseOther(['tableList', 'tableFilter', 'tableColumnHidden', 'tableSetting']);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isShowSort]);
   const onSortsChange = (0, _react.useCallback)(sorts => {
-    updatePageSettings({
-      sorts
-    });
-  }, [updatePageSettings]);
+    if (seaTableRef.current) {
+      seaTableRef.current['sortsData'] = {
+        sorts
+      };
+    }
+  }, [seaTableRef]);
   const onHiddenColumn = (0, _react.useCallback)(() => {
     setIsShowHideColumn(!isShowHideColumn);
     onCloseOther(['tableList', 'tableSort', 'tableFilter', 'tableSetting']);

package/dist/basic-sdk/extension/plugins/seatable-tables/render-element/seatable-table.js

@@ -18,6 +18,7 @@ var _recordList = _interopRequireDefault(require("./record-list"));
 var _opMenu = _interopRequireDefault(require("../op-menu"));
 var _useScrollContext = require("../../../../hooks/use-scroll-context");
 var _helpers = require("../../seatable-column/helpers");
+var _helpers2 = require("../helpers");
 require("./index.css");
 function SeaTableTable(_ref) {
   var _tableInfoRef$current, _tableInfoRef$current2;
@@ -218,13 +219,54 @@ function SeaTableTable(_ref) {
       observerRefValue.removeEventListener('scroll', handleScroll);
     };
   }, [handleScroll, readOnly, scrollRef]);
+  const handleSaveData = (0, _react.useCallback)(() => {
+    const {
+      filterData,
+      sortsData
+    } = seaTableRef.current;
+    if (filterData && Object.keys(filterData).length > 0) {
+      const path = _slateReact.ReactEditor.findPath(editor, element);
+      (0, _helpers2.updateSeaTableTable)(editor, filterData, {
+        at: {
+          anchor: {
+            offset: 0,
+            path
+          },
+          focus: {
+            offset: 0,
+            path
+          }
+        }
+      });
+      seaTableRef.current['filterData'] = {};
+    }
+    if (sortsData && Object.keys(sortsData).length > 0) {
+      const path = _slateReact.ReactEditor.findPath(editor, element);
+      (0, _helpers2.updateSeaTableTable)(editor, sortsData, {
+        at: {
+          anchor: {
+            offset: 0,
+            path
+          },
+          focus: {
+            offset: 0,
+            path
+          }
+        }
+      });
+      seaTableRef.current['sortsData'] = {};
+    }
+  }, [editor, element]);
   (0, _react.useEffect)(() => {
     if (!isSelected) {
-      setIsShowMenu(false);
-      setIsShowColumnWidth(false);
-      setIsCanModifyColumnWidth(false);
+      handleSaveData();
+      queueMicrotask(() => {
+        setIsShowMenu(false);
+        setIsShowColumnWidth(false);
+        setIsCanModifyColumnWidth(false);
+      });
     }
-  }, [isSelected]);
+  }, [editor, element, handleSaveData, isSelected]);
   const onTableClick = (0, _react.useCallback)(event => {
     if (readOnly) return;
     const {
@@ -254,7 +296,8 @@ function SeaTableTable(_ref) {
   });
   return /*#__PURE__*/_react.default.createElement("div", Object.assign({}, attributes, {
     className: "seatable-table-wrapper",
-    contentEditable: true
+    contentEditable: true,
+    suppressContentEditableWarning: true
   }), /*#__PURE__*/_react.default.createElement("div", {
     ref: seaTableRef,
     className: containerClass,

package/dist/basic-sdk/extension/plugins/table/helpers.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateTableRowHeight = exports.updateColumnWidth = exports.splitCell = exports.setTableSelectedRange = exports.setTableFragmentData = exports.setCellStyle = exports.removeTableElement = exports.removeTable = exports.normalizeTableELement = exports.moveRows = exports.moveColumns = exports.isTableWidthFitScreen = exports.isTableMenuDisabled = exports.isTableLocation = exports.isSelectedAllCell = exports.isPreventResetTableSelectedRange = exports.isLastTableCell = exports.isInTableSameCell = exports.isInTable = exports.isHideDragHandlerLine = exports.isCursorAtCellStart = exports.isCursorAtCellEnd = exports.isCombineCellsDisabled = exports.isAllInTable = exports.insertTableRow = exports.insertTableElement = exports.insertTableColumn = exports.insertTableByTemplate = exports.insertTable = exports.insertMultipleRowsAndColumns = exports.handleInsertTable = exports.handleCombinedCellsBeforeDeleteTableRow = exports.handleCombinedCellsBeforeDeleteTableColumn = exports.handleCombinedCellsAfterInsertTableRow = exports.handleCombinedCellsAfterInsertTableColumn = exports.getTableSelectedRangeAfterDrag = exports.getTableRowSelectedRange = exports.getTableDragType = exports.getTableColumnsWidth = exports.getTableColumnsAfterInsertColumn = exports.getTableColumns = exports.getTableColumnSelectedRange = exports.getSelectedInfo = exports.getRowHeight = exports.getRowDomHeight = exports.getResizeMaskCellInfo = exports.getInsertPosition = exports.getHighlightClass = exports.getFirstTableCell = exports.getCellInheritStyles = exports.getCellHighlightClassName = exports.getCellColumn = exports.generateTableRow = exports.generateTableCell = exports.generateInheritStyle = exports.generateEmptyTable = exports.generateDragMoveElement = exports.focusClosestCellWhenJustifyCellSize = exports.focusCell = exports.fitTableColumnToScreen = exports.elementHasImage = exports.deleteTableSelectCells = exports.deleteTableRangeData = exports.deleteHandler = exports.combineCells = exports.colorBlend = exports.adjustCombinedCellRange = void 0;
+exports.updateTableRowHeight = exports.updateColumnWidth = exports.syncRemoveTable = exports.splitCell = exports.setTableSelectedRange = exports.setTableFragmentData = exports.setCellStyle = exports.removeTableElement = exports.removeTable = exports.normalizeTableELement = exports.moveRows = exports.moveColumns = exports.isTableWidthFitScreen = exports.isTableMenuDisabled = exports.isTableLocation = exports.isSelectedAllCell = exports.isPreventResetTableSelectedRange = exports.isLastTableCell = exports.isInTableSameCell = exports.isInTable = exports.isHideDragHandlerLine = exports.isCursorAtCellStart = exports.isCursorAtCellEnd = exports.isCombineCellsDisabled = exports.isAllInTable = exports.insertTableRow = exports.insertTableElement = exports.insertTableColumn = exports.insertTableByTemplate = exports.insertTable = exports.insertMultipleRowsAndColumns = exports.handleInsertTable = exports.handleCombinedCellsBeforeDeleteTableRow = exports.handleCombinedCellsBeforeDeleteTableColumn = exports.handleCombinedCellsAfterInsertTableRow = exports.handleCombinedCellsAfterInsertTableColumn = exports.getTableSelectedRangeAfterDrag = exports.getTableRowSelectedRange = exports.getTableDragType = exports.getTableColumnsWidth = exports.getTableColumnsAfterInsertColumn = exports.getTableColumns = exports.getTableColumnSelectedRange = exports.getSelectedInfo = exports.getRowHeight = exports.getRowDomHeight = exports.getResizeMaskCellInfo = exports.getInsertPosition = exports.getHighlightClass = exports.getFirstTableCell = exports.getCellInheritStyles = exports.getCellHighlightClassName = exports.getCellColumn = exports.generateTableRow = exports.generateTableCell = exports.generateInheritStyle = exports.generateEmptyTable = exports.generateDragMoveElement = exports.focusClosestCellWhenJustifyCellSize = exports.focusCell = exports.fitTableColumnToScreen = exports.elementHasImage = exports.deleteTableSelectCells = exports.deleteTableRangeData = exports.deleteHandler = exports.combineCells = exports.colorBlend = exports.adjustCombinedCellRange = void 0;
 var _slugid = _interopRequireDefault(require("slugid"));
 var _slate = require("@seafile/slate");
 var _slateReact = require("@seafile/slate-react");
@@ -580,7 +580,7 @@ const splitCell = (editor, rowNumber, columnNumber) => {
   });
 };
 exports.splitCell = splitCell;
-const removeTable = (editor, path) => {
+const syncRemoveTable = (editor, path) => {
   let validPath = path;
   if (!validPath) {
     const {
@@ -593,6 +593,32 @@ const removeTable = (editor, path) => {
     at: validPath
   });
 };
+exports.syncRemoveTable = syncRemoveTable;
+const removeTable = (editor, path) => {
+  let validPath = path;
+  if (!validPath) {
+    const {
+      tablePath
+    } = getSelectedInfo(editor);
+    validPath = tablePath;
+  }
+  editor.reSetTableSelectedRange();
+
+  // Clicking the menu causes the table to be re-rendered, and the deletion operation is performed synchronously. When rendering, it is found that the data is lost and an error is reported.
+  setTimeout(() => {
+    _slate.Transforms.removeNodes(editor, {
+      at: validPath
+    });
+    if (_slate.Editor.hasPath(editor, validPath)) {
+      const endOfLastNodePoint = _slate.Editor.end(editor, validPath);
+      const range = {
+        anchor: endOfLastNodePoint,
+        focus: endOfLastNodePoint
+      };
+      (0, _core.focusEditor)(editor, range);
+    }
+  }, 0);
+};
 exports.removeTable = removeTable;
 const removeTableElement = (editor, type) => {
   const {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "1.0.200",
+  "version": "1.0.202",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",