@seafile/sdoc-editor 1.0.29 → 1.0.31

package/dist/basic-sdk/extension/plugins/callout/helper.js

@@ -136,8 +136,8 @@ export const getCalloutMenuPosition = (element, editor) => {
     top: menuTop,
     left: left // left = callout left distance
   };
-  // 165 is distance with browser top
-  if (editor.editorType === DOCUMENT_PLUGIN_EDITOR && menuTop < 165) {
+  // 201 is distance with browser top
+  if (editor.editorType === DOCUMENT_PLUGIN_EDITOR && menuTop < 201) {
     newMenuPosition['display'] = 'none';
   }
   return newMenuPosition;

package/dist/basic-sdk/extension/plugins/link/render-elem.js

@@ -44,7 +44,7 @@ class Link extends React.Component {
         editor
       } = this.props;
       const menuPosition = getMenuPosition(element);
-      if (editor.editorType === DOCUMENT_PLUGIN_EDITOR && menuPosition.top < 165) {
+      if (editor.editorType === DOCUMENT_PLUGIN_EDITOR && menuPosition.top < 201) {
         menuPosition['display'] = 'none';
       }
       this.setState({

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

@@ -1,4 +1,5 @@
 import React from 'react';
+import { FORMULA_COLUMN_TYPES } from 'dtable-utils';
 import { getColumnWidth } from '../../seatable-column/helpers';
 import Formatter from '../formatter';
 export default function RecordItem(_ref) {
@@ -6,6 +7,7 @@ export default function RecordItem(_ref) {
     element,
     index,
     record,
+    formulaRow,
     columns,
     editor
   } = _ref;
@@ -15,6 +17,10 @@ export default function RecordItem(_ref) {
     className: "seatable-view-body-column-cell first-cell"
   }, index), columns.map(column => {
     const width = getColumnWidth(column);
+    let cellValue = record[column.key];
+    if (FORMULA_COLUMN_TYPES.includes(column.type)) {
+      cellValue = formulaRow[column.key];
+    }
     return /*#__PURE__*/React.createElement("td", {
       className: "seatable-view-body-column-cell",
       key: record._id + '_' + column.key,
@@ -24,7 +30,7 @@ export default function RecordItem(_ref) {
     }, /*#__PURE__*/React.createElement(Formatter, {
       isSample: true,
       column: column,
-      cellValue: record[column.key],
+      cellValue: cellValue,
       collaborators: editor.collaborators
     }));
   }));

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

@@ -5,14 +5,17 @@ export default function RecordList(_ref) {
     editor,
     records,
     columns,
-    element
+    element,
+    formulaRows
   } = _ref;
   return /*#__PURE__*/React.createElement(React.Fragment, null, records.map((record, index) => {
+    const formulaRow = formulaRows[record._id] || {};
     return /*#__PURE__*/React.createElement(RecordItem, {
       key: record._id,
       index: index,
       editor: editor,
       record: record,
+      formulaRow: formulaRow,
       columns: columns,
       element: element
     });

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

@@ -10,7 +10,7 @@ import OpMenu from '../op-menu';
 import { useScrollContext } from '../../../../hooks/use-scroll-context';
 import './index.css';
 function SeaTableTable(_ref) {
-  var _tableInfoRef$current;
+  var _tableInfoRef$current, _tableInfoRef$current2;
   let {
     element,
     className,
@@ -135,8 +135,8 @@ function SeaTableTable(_ref) {
         top: menuTop,
         left: left // left = code-block left distance
       };
-      // 165 is distance with browser top
-      if (menuTop < 165) {
+      // 201 is distance with browser top
+      if (menuTop < 201) {
         newMenuPosition['display'] = 'none';
       }
       setMenuPosition(newMenuPosition);
@@ -169,8 +169,8 @@ function SeaTableTable(_ref) {
       top: menuTop,
       left: left // left = callout left distance
     };
-    // 165 is distance with browser top
-    if (menuTop < 165) {
+    // 201 is distance with browser top
+    if (menuTop <= 201) {
       newMenuPosition['display'] = 'none';
     }
     setMenuPosition(newMenuPosition);
@@ -202,7 +202,7 @@ function SeaTableTable(_ref) {
     editor: editor,
     records: shownRecords,
     columns: columns,
-    formulaRows: tableInfoRef === null || tableInfoRef === void 0 ? void 0 : (_tableInfoRef$current = tableInfoRef.current) === null || _tableInfoRef$current === void 0 ? void 0 : _tableInfoRef$current[element.table_id]
+    formulaRows: tableInfoRef === null || tableInfoRef === void 0 ? void 0 : (_tableInfoRef$current = tableInfoRef.current) === null || _tableInfoRef$current === void 0 ? void 0 : (_tableInfoRef$current2 = _tableInfoRef$current[element.table_id]) === null || _tableInfoRef$current2 === void 0 ? void 0 : _tableInfoRef$current2.formulaRows
   }))), !readOnly && isShowTipMessage && /*#__PURE__*/React.createElement("div", {
     className: "d-print-none ml-2 m-2"
   }, t('And_x_more_records', {

package/dist/basic-sdk/layout/article-container.js

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react';
-import { INTERNAL_EVENT } from '../constants';
+import { INTERNAL_EVENT, WIKI_EDITOR } from '../constants';
 import { useScrollContext } from '../hooks/use-scroll-context';
 import EventBus from '../utils/event-bus';
 import { getOutlineSetting } from '../outline';
@@ -48,6 +48,7 @@ export default function ArticleContainer(_ref) {
     return unsubscribeOutline;
   }, [handleWindowResize]);
   useEffect(() => {
+    if (editor.editorType === WIKI_EDITOR) return;
     handleWindowResize();
     window.addEventListener('resize', handleWindowResize);
     return () => {

package/dist/pages/sdoc-wiki-editor.js

@@ -8,7 +8,6 @@ import withNodeId from '../basic-sdk/node-id';
 import { withSocketIO } from '../basic-sdk/socket';
 import { TITLE } from '../basic-sdk/extension/constants';
 import WikiEditor from '../basic-sdk/editor/wiki-editor';
-import { setOutlineSetting } from '../basic-sdk/outline';
 import '../assets/css/simple-viewer.css';
 const SdocWikiEditor = _ref => {
   let {
@@ -45,7 +44,6 @@ const SdocWikiEditor = _ref => {
   }, [docUuid]);
   useEffect(() => {
     validEditor.openConnection();
-    setOutlineSetting(false);
     return () => {
       validEditor.closeConnection();
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",
@@ -100,6 +100,7 @@
     "css-minimizer-webpack-plugin": "5.0.1",
     "dotenv": "6.2.0",
     "dotenv-expand": "5.1.0",
+    "dtable-sdk": "5.0.3",
     "dtable-utils": "5.0.1",
     "ejs": "3.1.10",
     "eslint": "6.8.0",