@seafile/sdoc-editor 1.0.83 → 1.0.85

package/dist/basic-sdk/extension/core/utils/index.js

@@ -60,6 +60,8 @@ function Placeholder(props) {
     t
   } = (0, _reactI18next.useTranslation)();
   return /*#__PURE__*/_react.default.createElement("span", {
+    contentEditable: "false",
+    suppressContentEditableWarning: true,
     style: {
       position: 'absolute',
       top: `${top}px`,

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

@@ -9,10 +9,12 @@ var _urlJoin = _interopRequireDefault(require("url-join"));
 var _slate = require("@seafile/slate");
 var _slateReact = require("@seafile/slate-react");
 var _slugid = _interopRequireDefault(require("slugid"));
+var _dtableUtils = require("dtable-utils");
 var _context = _interopRequireDefault(require("../../../../context"));
 var _eventBus = _interopRequireDefault(require("../../../utils/event-bus"));
 var _core = require("../../core");
 var _helpers = require("../../toolbar/side-toolbar/helpers");
+var _helpers2 = require("../seatable-column/helpers");
 var _constants = require("../../../constants");
 var _constants2 = require("../../constants");
 var _base64ToUnit8array = _interopRequireDefault(require("../../../../utils/base64-to-unit8array"));
@@ -129,7 +131,26 @@ const updateImage = (editor, data) => {
   });
 };
 exports.updateImage = updateImage;
-const getImageURL = url => {
+const getImageURL = (data, editor) => {
+  const {
+    src: url,
+    column_key
+  } = data;
+  if (column_key) {
+    const column = (0, _helpers2.getColumnByKey)(editor.columns || [], column_key);
+    const {
+      type
+    } = column || {};
+    if (type === _dtableUtils.CellType.IMAGE) {
+      const imgUrl = editor.getColumnCellValue(column_key) || '';
+      const firstSrc = imgUrl.split(',')[0];
+      return firstSrc;
+    } else if (type === _dtableUtils.CellType.DIGITAL_SIGN) {
+      const partUrl = editor.getColumnCellValue(column_key) || '';
+      const imgUrl = (0, _helpers2.getDigitalSignImgUrl)(partUrl);
+      return imgUrl;
+    }
+  }
   if (url && url.startsWith('http')) return url;
   const serviceUrl = _context.default.getSetting('serviceUrl');
   const assetsUrl = _context.default.getSetting('assetsUrl');

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

@@ -19,6 +19,7 @@ var _hoverMenu = _interopRequireDefault(require("./hover-menu"));
 var _useScrollContext = require("../../../hooks/use-scroll-context");
 var _constants2 = require("./constants");
 var _constants3 = require("../../constants");
+var _constants4 = require("../../../../constants");
 var _imagePlaceholder = _interopRequireDefault(require("../../../assets/images/image-placeholder.png"));
 const Image = _ref => {
   var _imageRef$current, _imageRef$current2;
@@ -37,7 +38,8 @@ const Image = _ref => {
     border_type = _constants2.IMAGE_BORDER_TYPE[0].type
   } = element;
   const {
-    show_caption = false
+    show_caption = false,
+    column_key
   } = data;
   const path = _slateReact.ReactEditor.findPath(editor, element);
   const nodeEntry = _slate.Editor.node(editor, [path[0]]);
@@ -158,6 +160,21 @@ const Image = _ref => {
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isShowImageHoverMenu, onHideImageHoverMenu]);
+  const onImageColumnToggle = (0, _react.useCallback)(() => {
+    // Handle switching to empty data and switching back
+    setIsShowImagePlaceholder(false);
+  }, []);
+  (0, _react.useEffect)(() => {
+    let unsubscribeImageColumnToggle = null;
+    if (column_key) {
+      const eventBus = _eventBus.default.getInstance();
+      unsubscribeImageColumnToggle = eventBus.subscribe(_constants4.EXTERNAL_EVENT.IMAGE_COLUMN_TOGGLE, onImageColumnToggle);
+    }
+    return () => {
+      unsubscribeImageColumnToggle && unsubscribeImageColumnToggle();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [column_key]);
   const setPosition = (0, _react.useCallback)(() => {
     if (imageRef.current) {
       const {
@@ -176,10 +193,10 @@ const Image = _ref => {
   }, [setPosition]);
   const reloadImage = (0, _react.useCallback)(() => {
     if (imageRef.current) {
-      imageRef.current['src'] = (0, _helpers.getImageURL)(data.src);
+      imageRef.current['src'] = (0, _helpers.getImageURL)(data, editor);
       setIsShowImagePlaceholder(false);
     }
-  }, [data.src]);
+  }, [data, editor]);
   const onImageLoadError = (0, _react.useCallback)(() => {
     // Check is due to the image is pasted from the clipboard in base64
     if (data.src.startsWith('data:image/jpeg;base64')) {
@@ -244,7 +261,7 @@ const Image = _ref => {
     }),
     onClick: onClickImage,
     ref: imageRef,
-    src: (0, _helpers.getImageURL)(data.src),
+    src: (0, _helpers.getImageURL)(data, editor),
     style: getImageStyle(),
     draggable: false,
     onError: onImageLoadError,

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

@@ -40,6 +40,7 @@ const RenderQuickInsert = (_ref, editor) => {
     }
   }, [editor, element]);
   const genStyle = (top, left) => {
+    if (editor.isRemote) return null;
     const overflowY = top + sideMenuRef.current.offsetHeight - document.body.clientHeight;
     if (overflowY > 0) {
       top = top - overflowY - 10;

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

@@ -5,12 +5,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setSeaTableColumn = exports.isMenuDisabled = exports.insertSeaTableColumn = exports.getColumnWidth = exports.getColumnType = exports.getColumnByKey = void 0;
+exports.setSeaTableColumn = exports.isMenuDisabled = exports.insertSeaTableColumn = exports.getDigitalSignImgUrl = exports.getColumnWidth = exports.getColumnType = exports.getColumnByKey = void 0;
 var _slate = require("@seafile/slate");
 var _slugid = _interopRequireDefault(require("slugid"));
+var _context = _interopRequireDefault(require("../../../../context"));
 var _elementType = require("../../constants/element-type");
 var _constants = require("../../constants");
 var _core = require("../../core");
+var _helpers = require("../image/helpers");
 var _model = _interopRequireDefault(require("./model"));
 var CellType = _interopRequireWildcard(require("./constants/cell-types"));
 const isMenuDisabled = (editor, readonly) => {
@@ -56,15 +58,45 @@ const getColumnType = editor => {
   return (0, _core.getNodeType)(n);
 };
 exports.getColumnType = getColumnType;
+const getDigitalSignImgUrl = partUrl => {
+  const server = _context.default.getSetting('serviceUrl');
+  const workspaceID = _context.default.getSetting('workspaceID');
+  const dtableUuid = _context.default.getSetting('dtableUuid');
+  if (!partUrl || typeof partUrl !== 'string') return '';
+  return `${server}/workspace/${workspaceID}/asset/${dtableUuid}${partUrl}`;
+};
+exports.getDigitalSignImgUrl = getDigitalSignImgUrl;
+const getColumnByKey = (columns, key) => {
+  const column = columns.find(item => item.key === key);
+  return column || null;
+};
+exports.getColumnByKey = getColumnByKey;
 const insertSeaTableColumn = function (editor, active, option) {
   let insertPosition = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _constants.INSERT_POSITION.CURRENT;
   if (!active) {
-    const column = new _model.default(option);
-    column.id = _slugid.default.nice();
+    const {
+      value
+    } = option;
+    const column = getColumnByKey(editor.columns || [], value);
+    const {
+      type,
+      key
+    } = column || {};
+    let columnNode = {};
+    if (type === CellType.IMAGE) {
+      columnNode = (0, _helpers.generateImageNode)('');
+      columnNode['data']['column_key'] = key;
+    } else if (type === CellType.DIGITAL_SIGN) {
+      columnNode = (0, _helpers.generateImageNode)('');
+      columnNode['data']['column_key'] = key;
+    } else {
+      columnNode = new _model.default(option);
+      columnNode.id = _slugid.default.nice();
+    }
     if (insertPosition === _constants.INSERT_POSITION.AFTER) {
       const path = _slate.Editor.path(editor, editor.selection);
       path && _slate.Transforms.insertNodes(editor, {
-        ...column
+        ...columnNode
       }, {
         at: [path[0] + 1]
       });
@@ -72,7 +104,7 @@ const insertSeaTableColumn = function (editor, active, option) {
       return;
     }
     _slate.Transforms.insertNodes(editor, {
-      ...column
+      ...columnNode
     });
   }
   (0, _core.focusEditor)(editor);
@@ -87,11 +119,6 @@ const setSeaTableColumn = (editor, data) => {
   });
 };
 exports.setSeaTableColumn = setSeaTableColumn;
-const getColumnByKey = (columns, key) => {
-  const column = columns.find(item => item.key === key);
-  return column || null;
-};
-exports.getColumnByKey = getColumnByKey;
 const getColumnWidth = column => {
   let {
     type,

package/dist/basic-sdk/extension/plugins/seatable-tables/formatter/link-formatter/utils.js

@@ -16,7 +16,7 @@ const isValidCellValue = value => {
   return true;
 };
 exports.isValidCellValue = isValidCellValue;
-const getCellDisplayValue = (record, column, collaborators) => {
+const getCellDisplayValue = (record, column, collaborators, formulaRows) => {
   const {
     type,
     data,
@@ -25,6 +25,7 @@ const getCellDisplayValue = (record, column, collaborators) => {
   return (0, _dtableUtils.getCellValueDisplayString)(record, type, key, {
     data,
     collaborators,
+    formulaRows,
     geolocationHyphen: ' '
   });
 };

package/dist/constants/index.js

@@ -39,7 +39,8 @@ const EXTERNAL_EVENT = exports.EXTERNAL_EVENT = {
   // wiki
   INSERT_LINK: 'insert_link',
   // document
-  COLLABORATORS_UPDATED: 'collaborators_updated'
+  COLLABORATORS_UPDATED: 'collaborators_updated',
+  IMAGE_COLUMN_TOGGLE: 'Image_column_toggle'
 };
 const TIP_TYPE = exports.TIP_TYPE = {
   DELETE_NO_CHANGES_REVISION: 'delete_no_changes_revision',

package/dist/pages/document-plugin-editor.js

@@ -32,6 +32,7 @@ const DocumentPluginEditor = _ref => {
     tables,
     getTableById,
     collaborators,
+    formulaRows,
     getTableFormulaResults,
     getArticleStyle
   } = _ref;
@@ -63,6 +64,7 @@ const DocumentPluginEditor = _ref => {
     newEditor.tables = tables || [];
     newEditor.getTableById = getTableById;
     newEditor.collaborators = collaborators;
+    newEditor.formulaRows = formulaRows;
     newEditor.getTableFormulaResults = getTableFormulaResults;
     newEditor.cursors = cursors || {};
     newEditor.width = _constants.PAGE_EDIT_AREA_WIDTH; // default width

package/package.json

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