Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix: fix some paste bugs (#2612)
ybzkycfd32278fe8a
diff --git a/packages/core/src/index.ts b/packages/core/src/index.tsindex c753078fa8..a1b158e401 100644--- a/packages/core/src/index.ts+++ b/packages/core/src/index.ts@@ -183,6 +183,7 @@ export { PermissionService } from './services/permission/permission.service';export { AuthzIoLocalService } from './services/authz-io/authz-io-local.service';export { IAuthzIoService } from './services/authz-io/type';export { createDefaultUser } from './services/user-manager/const';+export { skipParseTagNames } from './types/const/clipboard';installShims();diff --git a/packages/core/src/types/const/clipboard.ts b/packages/core/src/types/const/clipboard.tsnew file mode 100644index 0000000000..c84e21fc4d--- /dev/null+++ b/packages/core/src/types/const/clipboard.ts@@ -0,0 +1,17 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++export const skipParseTagNames = ['script', 'style', 'meta', 'comment', 'link'];diff --git a/packages/docs-ui/src/services/clipboard/html-to-udm/converter.ts b/packages/docs-ui/src/services/clipboard/html-to-udm/converter.tsindex 48efe03c99..b81ad9ddd6 100644--- a/packages/docs-ui/src/services/clipboard/html-to-udm/converter.ts+++ b/packages/docs-ui/src/services/clipboard/html-to-udm/converter.ts@@ -14,7 +14,7 @@* limitations under the License.*/-import type { IDocumentBody, ITextStyle, Nullable } from '@univerjs/core';+import { type IDocumentBody, type ITextStyle, type Nullable, skipParseTagNames } from '@univerjs/core';import { extractNodeStyle } from './parse-node-style';import parseToDom from './parse-to-dom';@@ -82,6 +82,10 @@ export class HtmlToUDMService {private _process(parent: Nullable<ChildNode>, nodes: NodeListOf<ChildNode>, doc: IDocumentBody) {for (const node of nodes) {if (node.nodeType === Node.TEXT_NODE) {+ if (node.nodeValue?.trim() === '') {+ continue;+ }+// TODO: @JOCS, More characters need to be replaced, like `\b`const text = node.nodeValue?.replace(/[\r\n]/g, '');let style;@@ -99,6 +103,8 @@ export class HtmlToUDMService {ts: style,});}+ } else if (skipParseTagNames.includes(node.nodeName.toLowerCase())) {+ continue;} else if (node.nodeType === Node.ELEMENT_NODE) {const parentStyles = parent ? this._styleCache.get(parent) : {};const styleRule = this._styleRules.find(({ filter }) => matchFilter(node as HTMLElement, filter));diff --git a/packages/docs-ui/src/services/clipboard/html-to-udm/parse-node-style.ts b/packages/docs-ui/src/services/clipboard/html-to-udm/parse-node-style.tsindex 635feeb5c0..58033bb354 100644--- a/packages/docs-ui/src/services/clipboard/html-to-udm/parse-node-style.ts+++ b/packages/docs-ui/src/services/clipboard/html-to-udm/parse-node-style.ts@@ -94,7 +94,7 @@ export function extractNodeStyle(node: HTMLElement): ITextStyle {case 'font-weight': {const MIDDLE_FONT_WEIGHT = 400;- if (Number(cssValue) > MIDDLE_FONT_WEIGHT) {+ if (Number(cssValue) > MIDDLE_FONT_WEIGHT || String(cssValue) === 'bold') {docStyles.bl = BooleanNumber.TRUE;}diff --git a/packages/docs-ui/src/services/clipboard/html-to-udm/paste-plugins/plugin-word.ts b/packages/docs-ui/src/services/clipboard/html-to-udm/paste-plugins/plugin-word.tsindex 4c36979903..82951cebfb 100644--- a/packages/docs-ui/src/services/clipboard/html-to-udm/paste-plugins/plugin-word.ts+++ b/packages/docs-ui/src/services/clipboard/html-to-udm/paste-plugins/plugin-word.ts@@ -41,7 +41,7 @@ const wordPastePlugin: IPastePlugin = {afterProcessRules: [{filter(el: HTMLElement) {- return el.tagName === 'P' && /mso/i.test(el.className);+ return el.tagName === 'P';},handler(doc, el) {if (doc.paragraphs == null) {diff --git a/packages/engine-render/src/components/sheets/sheet-skeleton.ts b/packages/engine-render/src/components/sheets/sheet-skeleton.tsindex 2c7034324d..cb028bd893 100644--- a/packages/engine-render/src/components/sheets/sheet-skeleton.ts+++ b/packages/engine-render/src/components/sheets/sheet-skeleton.ts@@ -197,7 +197,7 @@ export interface IDocumentLayoutObject {fill?: Nullable<string>;}-const DEFAULT_PADDING_DATA = {+export const DEFAULT_PADDING_DATA = {t: 0,b: 1,l: 2,diff --git a/packages/engine-render/src/index.ts b/packages/engine-render/src/index.tsindex de278b8770..f847f0077d 100644--- a/packages/engine-render/src/index.ts+++ b/packages/engine-render/src/index.ts@@ -49,3 +49,4 @@ export { DocumentSkeleton } from './components/docs/layout/doc-skeleton';export { ThinEngine } from './thin-engine';export { getCharSpaceApply, getNumberUnitValue } from './components/docs/layout/tools';export { type IChangeObserverConfig } from './scene.transformer';+export { DEFAULT_PADDING_DATA } from './components/sheets/sheet-skeleton';diff --git a/packages/sheets-formula/src/controllers/formula-clipboard.controller.ts b/packages/sheets-formula/src/controllers/formula-clipboard.controller.tsindex 8496947139..d63296eeaf 100644--- a/packages/sheets-formula/src/controllers/formula-clipboard.controller.ts+++ b/packages/sheets-formula/src/controllers/formula-clipboard.controller.ts@@ -233,10 +233,12 @@ export function getSetCellFormulaMutations(}// If there is rich text, remove the style- const richText = getCellRichText(value);- if (richText) {- valueObject.p = null;- valueObject.v = richText;+ if (copyInfo.pasteType === PREDEFINED_HOOK_NAME.SPECIAL_PASTE_FORMULA && value.p) {+ const richText = getCellRichText(value);+ if (richText) {+ valueObject.p = null;+ valueObject.v = richText;+ }}valueMatrix.setValue(range.rows[row], range.cols[col], valueObject);diff --git a/packages/sheets-ui/src/controllers/clipboard/utils.ts b/packages/sheets-ui/src/controllers/clipboard/utils.tsindex cfa9700ad2..9eb8973989 100644--- a/packages/sheets-ui/src/controllers/clipboard/utils.ts+++ b/packages/sheets-ui/src/controllers/clipboard/utils.ts@@ -15,7 +15,7 @@*/import type { ICellData, IDocumentBody, IMutationInfo, IParagraph, IRange, Nullable } from '@univerjs/core';-import { cellToRange, IUniverInstanceService, ObjectMatrix, Range, Rectangle, Tools } from '@univerjs/core';+import { cellToRange, DEFAULT_STYLES, IUniverInstanceService, ObjectMatrix, Range, Rectangle, Tools } from '@univerjs/core';import type {IAddWorksheetMergeMutationParams,IMoveRangeMutationParams,@@ -40,6 +40,7 @@ import {import type { IAccessor } from '@wendellhu/redi';import numfmt from '@univerjs/engine-numfmt';+import { DEFAULT_PADDING_DATA } from '@univerjs/engine-render';import type { ICellDataWithSpanInfo, ICopyPastePayload, ISheetDiscreteRangeLocation } from '../../services/clipboard/type';import { COPY_TYPE } from '../../services/clipboard/type';import { discreteRangeToRange, type IDiscreteRange, virtualizeDiscreteRanges } from '../utils/range-tools';@@ -291,19 +292,20 @@ export function getSetCellValueMutations(const valueMatrix = new ObjectMatrix<ICellData>();matrix.forValue((row, col, value) => {+ let originNumberValue;if (!value.p && value.v && !pasteFrom) {const content = String(value.v);const numfmtValue = numfmt.parseDate(content) || numfmt.parseTime(content) || numfmt.parseNumber(content);if (numfmtValue?.v && typeof numfmtValue.v === 'number') {- value.v = numfmtValue.v;+ originNumberValue = numfmtValue.v;}}const { row: realRow, col: realCol } = mapFunc(row, col);if (value.p?.body) {- valueMatrix.setValue(realRow, realCol, Tools.deepClone({ p: value.p, v: value.v }));+ valueMatrix.setValue(realRow, realCol, Tools.deepClone({ p: value.p, v: originNumberValue ?? value.v }));} else {- valueMatrix.setValue(realRow, realCol, Tools.deepClone({ v: value.v }));+ valueMatrix.setValue(realRow, realCol, Tools.deepClone({ v: originNumberValue ?? value.v }));}});// set cell value and style@@ -349,11 +351,29 @@ export function getSetCellStyleMutations(matrix.forValue((row, col, value) => {const newValue: ICellData = {- s: value.s,+ s: Object.assign({}, {+ ...DEFAULT_STYLES,+ pd: DEFAULT_PADDING_DATA,+ bg: null,+ }, value.s),};if (withRichFormat && value.p?.body) {newValue.p = value.p;}+ const content = String(value.v);+ const numfmtValue = numfmt.parseDate(content) || numfmt.parseTime(content) || numfmt.parseNumber(content);+ if (numfmtValue?.z) {+ if (!newValue.s) {+ newValue.s = {};+ }+ if (typeof newValue.s === 'object') {+ if (!newValue.s?.n) {+ newValue.s.n = { pattern: numfmtValue.z };+ } else {+ newValue.s.n.pattern = numfmtValue.z;+ }+ }+ }const { row: actualRow, col: actualCol } = mapFunc(row, col);valueMatrix.setValue(actualRow, actualCol, newValue);});diff --git a/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-paste-form-excel.spec.ts b/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-paste-form-excel.spec.tsindex d7146501ff..4992610856 100644--- a/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-paste-form-excel.spec.ts+++ b/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-paste-form-excel.spec.ts@@ -156,7 +156,45 @@ describe('Test clipboard', () => {expect(worksheet.getMergeData().length).toBe(3);expect(getValues(2, 2, 2, 2)?.[0]?.[0]?.v).toEqual('Univer');expect(getStyles(2, 2, 2, 2)?.[0]?.[0]).toStrictEqual({- bl: 1, cl: { rgb: 'black' }, ff: '等线', fs: 12, ht: 0, it: 1, vt: 2, tb: 1,+ bl: 1,+ cl: {+ rgb: 'rgb(0,0,0)',+ },+ ff: '等线',+ fs: 12,+ ht: 0,+ it: 1,+ ol: {+ cl: {+ rgb: 'rgb(0,0,0)',+ },+ s: 0,+ },+ pd: {+ b: 1,+ l: 2,+ r: 2,+ t: 0,+ },+ st: {+ cl: {+ rgb: 'rgb(0,0,0)',+ },+ s: 0,+ },+ tb: 1,+ td: 0,+ tr: {+ a: 0,+ v: 0,+ },+ ul: {+ cl: {+ rgb: 'rgb(0,0,0)',+ },+ s: 0,+ },+ vt: 2,});});diff --git a/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-paste-from-google.spec.ts b/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-paste-from-google.spec.tsindex 9010c1e6fb..b8da922804 100644--- a/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-paste-from-google.spec.ts+++ b/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-paste-from-google.spec.ts@@ -156,7 +156,47 @@ describe('Test clipboard', () => {expect(res).toBeTruthy();expect(worksheet.getMergeData().length).toBe(3);expect(getValues(2, 2, 2, 2)?.[0]?.[0]?.v).toEqual('Univer');- expect(getStyles(2, 2, 2, 2)?.[0]?.[0]).toStrictEqual({ vt: 3, bl: 1, it: 1 });+ expect(getStyles(2, 2, 2, 2)?.[0]?.[0]).toStrictEqual({+ bl: 1,+ cl: {+ rgb: '#000',+ },+ ff: 'Arial',+ fs: 11,+ ht: 0,+ it: 1,+ ol: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ pd: {+ b: 1,+ l: 2,+ r: 2,+ t: 0,+ },+ st: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ tb: 0,+ td: 0,+ tr: {+ a: 0,+ v: 0,+ },+ ul: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ vt: 3,+ });});it('test style with paste rich text style', async () => {diff --git a/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-service.spec.ts b/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-service.spec.tsindex 51cf4c2179..7de6f4c363 100644--- a/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-service.spec.ts+++ b/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-service.spec.ts@@ -168,8 +168,47 @@ describe('Test clipboard', () => {expect(rowHeight).toBe(81);expect(values && values[0][0]?.v).toBe('row1col2');expect(styles && styles[0][0]).toStrictEqual({- bg: { rgb: 'rgb(255,0,0)' },+ bg: {+ rgb: 'rgb(255,0,0)',+ },+ bl: 0,+ cl: {+ rgb: '#000',+ },+ ff: 'Arial',+ fs: 11,ht: 2,+ it: 0,+ ol: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ pd: {+ b: 1,+ l: 2,+ r: 2,+ t: 0,+ },+ st: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ tb: 0,+ td: 0,+ tr: {+ a: 0,+ v: 0,+ },+ ul: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },vt: 2,});expect(mergedCells && mergedCells[0]).toStrictEqual({@@ -208,8 +247,47 @@ describe('Test clipboard', () => {const mergedCells = getMergedCells(startRow, startColumn, endRow, endColumn);expect(values && values[0][0]?.v).toBe('row1col2');expect(styles && styles[0][0]).toStrictEqual({- bg: { rgb: 'rgb(255,0,0)' },+ bg: {+ rgb: 'rgb(255,0,0)',+ },+ bl: 0,+ cl: {+ rgb: '#000',+ },+ ff: 'Arial',+ fs: 11,ht: 2,+ it: 0,+ ol: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ pd: {+ b: 1,+ l: 2,+ r: 2,+ t: 0,+ },+ st: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ tb: 0,+ td: 0,+ tr: {+ a: 0,+ v: 0,+ },+ ul: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },vt: 2,});expect(mergedCells && mergedCells[0]).toStrictEqual({@@ -248,8 +326,47 @@ describe('Test clipboard', () => {const mergedCells = getMergedCells(startRow, startColumn, endRow, endColumn);expect(values && values[0][0]?.v).toBe('row1col2');expect(styles && styles[0][0]).toStrictEqual({- bg: { rgb: 'rgb(255,0,0)' },+ bg: {+ rgb: 'rgb(255,0,0)',+ },+ bl: 0,+ cl: {+ rgb: '#000',+ },+ ff: 'Arial',+ fs: 11,ht: 2,+ it: 0,+ ol: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ pd: {+ b: 1,+ l: 2,+ r: 2,+ t: 0,+ },+ st: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ tb: 0,+ td: 0,+ tr: {+ a: 0,+ v: 0,+ },+ ul: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },vt: 2,});expect(values && values[0][2]?.v).toBe(undefined);@@ -292,13 +409,91 @@ describe('Test clipboard', () => {expect(values && values[1][0]?.v).toBe('row1col2');expect(styles && styles[0][0]).toStrictEqual({- bg: { rgb: 'rgb(255,0,0)' },+ bg: {+ rgb: 'rgb(255,0,0)',+ },+ bl: 0,+ cl: {+ rgb: '#000',+ },+ ff: 'Arial',+ fs: 11,ht: 2,+ it: 0,+ ol: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ pd: {+ b: 1,+ l: 2,+ r: 2,+ t: 0,+ },+ st: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ tb: 0,+ td: 0,+ tr: {+ a: 0,+ v: 0,+ },+ ul: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },vt: 2,});expect(styles && styles[1][0]).toStrictEqual({- bg: { rgb: 'rgb(255,0,0)' },+ bg: {+ rgb: 'rgb(255,0,0)',+ },+ bl: 0,+ cl: {+ rgb: '#000',+ },+ ff: 'Arial',+ fs: 11,ht: 2,+ it: 0,+ ol: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ pd: {+ b: 1,+ l: 2,+ r: 2,+ t: 0,+ },+ st: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ tb: 0,+ td: 0,+ tr: {+ a: 0,+ v: 0,+ },+ ul: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },vt: 2,});expect(mergedCells).toStrictEqual([@@ -348,13 +543,91 @@ describe('Test clipboard', () => {expect(values && values[i][0]?.v).toBe('row1col2');expect(values && values[i][2]?.v).toBe('row1col2');expect(styles && styles[i][0]).toStrictEqual({- bg: { rgb: 'rgb(255,0,0)' },+ bg: {+ rgb: 'rgb(255,0,0)',+ },+ bl: 0,+ cl: {+ rgb: '#000',+ },+ ff: 'Arial',+ fs: 11,ht: 2,+ it: 0,+ ol: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ pd: {+ b: 1,+ l: 2,+ r: 2,+ t: 0,+ },+ st: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ tb: 0,+ td: 0,+ tr: {+ a: 0,+ v: 0,+ },+ ul: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },vt: 2,});expect(styles && styles[i][2]).toStrictEqual({- bg: { rgb: 'rgb(255,0,0)' },+ bg: {+ rgb: 'rgb(255,0,0)',+ },+ bl: 0,+ cl: {+ rgb: '#000',+ },+ ff: 'Arial',+ fs: 11,ht: 2,+ it: 0,+ ol: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ pd: {+ b: 1,+ l: 2,+ r: 2,+ t: 0,+ },+ st: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ tb: 0,+ td: 0,+ tr: {+ a: 0,+ v: 0,+ },+ ul: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },vt: 2,});}@@ -442,8 +715,47 @@ describe('Test clipboard', () => {expect(values && values[0][0]?.v).toBe('row1col2');expect(styles && styles[0][0]).toStrictEqual({- bg: { rgb: 'rgb(255,0,0)' },+ bg: {+ rgb: 'rgb(255,0,0)',+ },+ bl: 0,+ cl: {+ rgb: '#000',+ },+ ff: 'Arial',+ fs: 11,ht: 2,+ it: 0,+ ol: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ pd: {+ b: 1,+ l: 2,+ r: 2,+ t: 0,+ },+ st: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ tb: 0,+ td: 0,+ tr: {+ a: 0,+ v: 0,+ },+ ul: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },vt: 2,});expect(mergedCells && mergedCells[0]).toStrictEqual({@@ -564,7 +876,50 @@ describe('Test clipboard', () => {const mergedCells = getMergedCells(startRow, startColumn, endRow, endColumn);expect(values && values[0][0]?.v).toBe('row1col2');- expect(styles && styles[0][0]).toStrictEqual({ bg: { rgb: 'rgb(255,0,0)' }, ht: 2, vt: 2 });+ expect(styles && styles[0][0]).toStrictEqual({+ bg: {+ rgb: 'rgb(255,0,0)',+ },+ bl: 0,+ cl: {+ rgb: '#000',+ },+ ff: 'Arial',+ fs: 11,+ ht: 2,+ it: 0,+ ol: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ pd: {+ b: 1,+ l: 2,+ r: 2,+ t: 0,+ },+ st: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ tb: 0,+ td: 0,+ tr: {+ a: 0,+ v: 0,+ },+ ul: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ vt: 2,+ });expect(mergedCells && mergedCells[0]).toStrictEqual({startRow: 9,startColumn: 5,@@ -666,7 +1021,50 @@ describe('Test clipboard', () => {// first merged cells changedexpect(values && values[0][0]?.v).toBe('row1col2');- expect(styles && styles[0][0]).toStrictEqual({ bg: { rgb: 'rgb(255,0,0)' }, ht: 2, vt: 2 });+ expect(styles && styles[0][0]).toStrictEqual({+ bg: {+ rgb: 'rgb(255,0,0)',+ },+ bl: 0,+ cl: {+ rgb: '#000',+ },+ ff: 'Arial',+ fs: 11,+ ht: 2,+ it: 0,+ ol: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ pd: {+ b: 1,+ l: 2,+ r: 2,+ t: 0,+ },+ st: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ tb: 0,+ td: 0,+ tr: {+ a: 0,+ v: 0,+ },+ ul: {+ cl: {+ rgb: '#000',+ },+ s: 0,+ },+ vt: 2,+ });// second merged cells not changedexpect(values && values[2][1]?.v).toBe('456');diff --git a/packages/sheets-ui/src/services/clipboard/clipboard.service.ts b/packages/sheets-ui/src/services/clipboard/clipboard.service.tsindex 6a9354d870..d1968b6ab6 100644--- a/packages/sheets-ui/src/services/clipboard/clipboard.service.ts+++ b/packages/sheets-ui/src/services/clipboard/clipboard.service.ts@@ -307,6 +307,7 @@ export class SheetClipboardService extends Disposable implements ISheetClipboard});} else {matrixFragment.setValue(rowIndex - startRow, c - startColumn, getEmptyCell());+ matrix.setValue(r, c, getEmptyCell());}}rowIndex += 1;@@ -711,12 +712,14 @@ export class SheetClipboardService extends Disposable implements ISheetClipboardunitId,subUnitId,pluginName: NORMAL_SELECTION_PLUGIN_NAME,- selections: [{ range: {- startRow,- endRow,- startColumn,- endColumn,- }, primary, style: null }],+ selections: [{+ range: {+ startRow,+ endRow,+ startColumn,+ endColumn,+ }, primary, style: null,+ }],};return {id: SetSelectionsOperation.id,diff --git a/packages/sheets-ui/src/services/clipboard/html-to-usm/converter.ts b/packages/sheets-ui/src/services/clipboard/html-to-usm/converter.tsindex 92cc3552a6..17d1f1aa8f 100644--- a/packages/sheets-ui/src/services/clipboard/html-to-usm/converter.ts+++ b/packages/sheets-ui/src/services/clipboard/html-to-usm/converter.ts@@ -15,7 +15,7 @@*/import type { IDocumentBody, IDocumentData, ITextRun, ITextStyle, Nullable } from '@univerjs/core';-import { ObjectMatrix } from '@univerjs/core';+import { ObjectMatrix, skipParseTagNames } from '@univerjs/core';import { handleStringToStyle } from '@univerjs/ui';import type { IPastePlugin } from '@univerjs/docs-ui';@@ -309,6 +309,10 @@ export class HtmlToUSMService {index: doc?.paragraphs?.length || 0,});} else if (node.nodeType === Node.TEXT_NODE) {+ if (node.nodeValue?.trim() === '') {+ continue;+ }+// TODO: @JOCS, More characters need to be replaced, like `\b`const text = node.nodeValue?.replace(/[\r\n]/g, '');let style;@@ -335,6 +339,8 @@ export class HtmlToUSMService {ts: style,});}+ } else if (skipParseTagNames.includes(node.nodeName.toLowerCase())) {+ continue;} else if (node.nodeType === Node.ELEMENT_NODE) {if (node.nodeName === 'STYLE') {continue;diff --git a/packages/sheets-ui/src/services/clipboard/usm-to-html/convertor.ts b/packages/sheets-ui/src/services/clipboard/usm-to-html/convertor.tsindex da3f21122b..1778fcfc43 100644--- a/packages/sheets-ui/src/services/clipboard/usm-to-html/convertor.ts+++ b/packages/sheets-ui/src/services/clipboard/usm-to-html/convertor.ts@@ -17,7 +17,6 @@import type { ICellData, IRange, ObjectMatrix } from '@univerjs/core';import type { ICellDataWithSpanInfo, IClipboardPropertyItem, ISheetClipboardHook } from '../type';-import { escapeSpecialCode } from '../clipboard.service';/***@@ -76,9 +75,7 @@ function getTDContent(const mergedProperties = mergeProperties(properties);const str = zipClipboardPropertyItemToString(mergedProperties);const content = hooks.reduce((acc, hook) => acc || hook.onCopyCellContent?.(row, col) || '', '');- const escapedContent = escapeSpecialCode(content);-- return `<td${str}>${escapedContent}</td>`;+ return `<td${str}>${content}</td>`;}function getColStyle(cols: number[], hooks: ISheetClipboardHook[]) {diff --git a/packages/ui/src/utils/cell.ts b/packages/ui/src/utils/cell.tsindex 959e06da75..ae491627f0 100644--- a/packages/ui/src/utils/cell.ts+++ b/packages/ui/src/utils/cell.ts@@ -204,8 +204,9 @@ export function handleStringToStyle($dom?: HTMLElement, cssStyle: string = '') {}// font colorelse if (key === 'color') {+ const rgbStr = new ColorKit(value).toRgbString();styleList.cl = {- rgb: value,+ rgb: rgbStr,};}// fill color / background