@univerjs/sheets-ui 1.0.0-alpha.0 → 1.0.0-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cjs/index.js +163 -35
- package/lib/cjs/locale/ar-SA.js +9 -2
- package/lib/cjs/locale/ca-ES.js +9 -2
- package/lib/cjs/locale/de-DE.js +9 -2
- package/lib/cjs/locale/en-US.js +9 -2
- package/lib/cjs/locale/es-ES.js +9 -2
- package/lib/cjs/locale/fa-IR.js +9 -2
- package/lib/cjs/locale/fr-FR.js +9 -2
- package/lib/cjs/locale/id-ID.js +9 -2
- package/lib/cjs/locale/it-IT.js +9 -2
- package/lib/cjs/locale/ja-JP.js +9 -2
- package/lib/cjs/locale/ko-KR.js +9 -2
- package/lib/cjs/locale/pl-PL.js +9 -2
- package/lib/cjs/locale/pt-BR.js +9 -2
- package/lib/cjs/locale/ru-RU.js +9 -2
- package/lib/cjs/locale/sk-SK.js +9 -2
- package/lib/cjs/locale/vi-VN.js +9 -2
- package/lib/cjs/locale/zh-CN.js +9 -2
- package/lib/cjs/locale/zh-HK.js +9 -2
- package/lib/cjs/locale/zh-TW.js +9 -2
- package/lib/es/index.js +164 -37
- package/lib/es/locale/ar-SA.js +9 -2
- package/lib/es/locale/ca-ES.js +9 -2
- package/lib/es/locale/de-DE.js +9 -2
- package/lib/es/locale/en-US.js +9 -2
- package/lib/es/locale/es-ES.js +9 -2
- package/lib/es/locale/fa-IR.js +9 -2
- package/lib/es/locale/fr-FR.js +9 -2
- package/lib/es/locale/id-ID.js +9 -2
- package/lib/es/locale/it-IT.js +9 -2
- package/lib/es/locale/ja-JP.js +9 -2
- package/lib/es/locale/ko-KR.js +9 -2
- package/lib/es/locale/pl-PL.js +9 -2
- package/lib/es/locale/pt-BR.js +9 -2
- package/lib/es/locale/ru-RU.js +9 -2
- package/lib/es/locale/sk-SK.js +9 -2
- package/lib/es/locale/vi-VN.js +9 -2
- package/lib/es/locale/zh-CN.js +9 -2
- package/lib/es/locale/zh-HK.js +9 -2
- package/lib/es/locale/zh-TW.js +9 -2
- package/lib/index.js +164 -37
- package/lib/locale/ar-SA.js +9 -2
- package/lib/locale/ca-ES.js +9 -2
- package/lib/locale/de-DE.js +9 -2
- package/lib/locale/en-US.js +9 -2
- package/lib/locale/es-ES.js +9 -2
- package/lib/locale/fa-IR.js +9 -2
- package/lib/locale/fr-FR.js +9 -2
- package/lib/locale/id-ID.js +9 -2
- package/lib/locale/it-IT.js +9 -2
- package/lib/locale/ja-JP.js +9 -2
- package/lib/locale/ko-KR.js +9 -2
- package/lib/locale/pl-PL.js +9 -2
- package/lib/locale/pt-BR.js +9 -2
- package/lib/locale/ru-RU.js +9 -2
- package/lib/locale/sk-SK.js +9 -2
- package/lib/locale/vi-VN.js +9 -2
- package/lib/locale/zh-CN.js +9 -2
- package/lib/locale/zh-HK.js +9 -2
- package/lib/locale/zh-TW.js +9 -2
- package/lib/types/commands/commands/clipboard.command.d.ts +1 -0
- package/lib/types/controllers/clipboard/clipboard.controller.d.ts +4 -2
- package/lib/types/controllers/editor/data-sync.controller.d.ts +5 -2
- package/lib/types/index.d.ts +1 -1
- package/lib/types/locale/en-US.d.ts +10 -1
- package/lib/types/services/clipboard/clipboard.service.d.ts +8 -2
- package/lib/umd/index.js +8 -8
- package/lib/umd/locale/ar-SA.js +1 -1
- package/lib/umd/locale/ca-ES.js +1 -1
- package/lib/umd/locale/de-DE.js +1 -1
- package/lib/umd/locale/en-US.js +1 -1
- package/lib/umd/locale/es-ES.js +1 -1
- package/lib/umd/locale/fa-IR.js +1 -1
- package/lib/umd/locale/fr-FR.js +1 -1
- package/lib/umd/locale/id-ID.js +1 -1
- package/lib/umd/locale/it-IT.js +1 -1
- package/lib/umd/locale/ja-JP.js +1 -1
- package/lib/umd/locale/ko-KR.js +1 -1
- package/lib/umd/locale/pl-PL.js +1 -1
- package/lib/umd/locale/pt-BR.js +1 -1
- package/lib/umd/locale/ru-RU.js +1 -1
- package/lib/umd/locale/sk-SK.js +1 -1
- package/lib/umd/locale/vi-VN.js +1 -1
- package/lib/umd/locale/zh-CN.js +1 -1
- package/lib/umd/locale/zh-HK.js +1 -1
- package/lib/umd/locale/zh-TW.js +1 -1
- package/package.json +14 -14
package/lib/cjs/locale/ko-KR.js
CHANGED
|
@@ -90,9 +90,16 @@ const locale = { "sheets-ui": {
|
|
|
90
90
|
horizontal: "가로 병합",
|
|
91
91
|
cancel: "병합 해제",
|
|
92
92
|
overlappingError: "겹치는 영역은 병합할 수 없습니다",
|
|
93
|
-
partiallyError: "부분 병합된 셀에서는 작업할 수 없습니다"
|
|
93
|
+
partiallyError: "부분 병합된 셀에서는 작업할 수 없습니다",
|
|
94
|
+
confirm: {
|
|
95
|
+
warning: "경고",
|
|
96
|
+
dismantleMergeCellWarning: "이 작업은 병합된 셀을 해제합니다. 계속하시겠습니까?"
|
|
97
|
+
}
|
|
94
98
|
},
|
|
95
|
-
filter: {
|
|
99
|
+
filter: { confirm: {
|
|
100
|
+
error: "이 작업을 수행할 수 없습니다",
|
|
101
|
+
notAllowedToInsertRange: "범위에 필터링된 행이 포함되어 있어 이 작업을 수행할 수 없습니다."
|
|
102
|
+
} },
|
|
96
103
|
textWrap: {
|
|
97
104
|
overflow: "넘침",
|
|
98
105
|
wrap: "줄바꿈",
|
package/lib/cjs/locale/pl-PL.js
CHANGED
|
@@ -90,9 +90,16 @@ const locale = { "sheets-ui": {
|
|
|
90
90
|
horizontal: "Scalanie poziome",
|
|
91
91
|
cancel: "Anuluj scalenie",
|
|
92
92
|
overlappingError: "Nie można scalić nakładających się obszarów",
|
|
93
|
-
partiallyError: "Nie można wykonać tej operacji na częściowo scalonych komórkach"
|
|
93
|
+
partiallyError: "Nie można wykonać tej operacji na częściowo scalonych komórkach",
|
|
94
|
+
confirm: {
|
|
95
|
+
warning: "Ostrzeżenie",
|
|
96
|
+
dismantleMergeCellWarning: "Ta operacja rozłączy scalone komórki. Kontynuować?"
|
|
97
|
+
}
|
|
94
98
|
},
|
|
95
|
-
filter: {
|
|
99
|
+
filter: { confirm: {
|
|
100
|
+
error: "Nie można wykonać tej operacji",
|
|
101
|
+
notAllowedToInsertRange: "Ta operacja jest niedozwolona, ponieważ zakres zawiera filtrowane wiersze."
|
|
102
|
+
} },
|
|
96
103
|
textWrap: {
|
|
97
104
|
overflow: "Przepełnienie",
|
|
98
105
|
wrap: "Zawijaj",
|
package/lib/cjs/locale/pt-BR.js
CHANGED
|
@@ -90,9 +90,16 @@ const locale = { "sheets-ui": {
|
|
|
90
90
|
horizontal: "Mesclagem horizontal",
|
|
91
91
|
cancel: "Cancelar mesclagem",
|
|
92
92
|
overlappingError: "Não é possível mesclar áreas sobrepostas",
|
|
93
|
-
partiallyError: "Não é possível realizar esta operação em células parcialmente mescladas"
|
|
93
|
+
partiallyError: "Não é possível realizar esta operação em células parcialmente mescladas",
|
|
94
|
+
confirm: {
|
|
95
|
+
warning: "Aviso",
|
|
96
|
+
dismantleMergeCellWarning: "Esta operação desfará a mesclagem das células. Continuar?"
|
|
97
|
+
}
|
|
94
98
|
},
|
|
95
|
-
filter: {
|
|
99
|
+
filter: { confirm: {
|
|
100
|
+
error: "Não é possível realizar esta operação",
|
|
101
|
+
notAllowedToInsertRange: "Esta operação não é permitida porque o intervalo contém linhas filtradas."
|
|
102
|
+
} },
|
|
96
103
|
textWrap: {
|
|
97
104
|
overflow: "Transbordar",
|
|
98
105
|
wrap: "Quebrar",
|
package/lib/cjs/locale/ru-RU.js
CHANGED
|
@@ -90,9 +90,16 @@ const locale = { "sheets-ui": {
|
|
|
90
90
|
horizontal: "Горизонтальное объединение",
|
|
91
91
|
cancel: "Отменить объединение",
|
|
92
92
|
overlappingError: "Невозможно объединить перекрывающиеся области",
|
|
93
|
-
partiallyError: "Невозможно выполнить эту операцию на частично объединенных ячейках"
|
|
93
|
+
partiallyError: "Невозможно выполнить эту операцию на частично объединенных ячейках",
|
|
94
|
+
confirm: {
|
|
95
|
+
warning: "Предупреждение",
|
|
96
|
+
dismantleMergeCellWarning: "Эта операция отменит объединение ячеек. Продолжить?"
|
|
97
|
+
}
|
|
94
98
|
},
|
|
95
|
-
filter: {
|
|
99
|
+
filter: { confirm: {
|
|
100
|
+
error: "Невозможно выполнить эту операцию",
|
|
101
|
+
notAllowedToInsertRange: "Эта операция запрещена, так как диапазон содержит отфильтрованные строки."
|
|
102
|
+
} },
|
|
96
103
|
textWrap: {
|
|
97
104
|
overflow: "Переполнение",
|
|
98
105
|
wrap: "Перенос",
|
package/lib/cjs/locale/sk-SK.js
CHANGED
|
@@ -90,9 +90,16 @@ const locale = { "sheets-ui": {
|
|
|
90
90
|
horizontal: "Zlúčiť vodorovne",
|
|
91
91
|
cancel: "Zrušiť zlúčenie",
|
|
92
92
|
overlappingError: "Nedá sa zlúčiť prekrývajúce sa oblasti",
|
|
93
|
-
partiallyError: "Túto operáciu nemožno vykonať na čiastočne zlúčených bunkách"
|
|
93
|
+
partiallyError: "Túto operáciu nemožno vykonať na čiastočne zlúčených bunkách",
|
|
94
|
+
confirm: {
|
|
95
|
+
warning: "Upozornenie",
|
|
96
|
+
dismantleMergeCellWarning: "Táto operácia zruší zlúčenie buniek. Pokračovať?"
|
|
97
|
+
}
|
|
94
98
|
},
|
|
95
|
-
filter: {
|
|
99
|
+
filter: { confirm: {
|
|
100
|
+
error: "Túto operáciu nemožno vykonať",
|
|
101
|
+
notAllowedToInsertRange: "Táto operácia nie je povolená, pretože rozsah obsahuje filtrované riadky."
|
|
102
|
+
} },
|
|
96
103
|
textWrap: {
|
|
97
104
|
overflow: "Pretečenie",
|
|
98
105
|
wrap: "Zalomiť",
|
package/lib/cjs/locale/vi-VN.js
CHANGED
|
@@ -90,9 +90,16 @@ const locale = { "sheets-ui": {
|
|
|
90
90
|
horizontal: "Hợp nhất ngang",
|
|
91
91
|
cancel: "Hủy hợp nhất",
|
|
92
92
|
overlappingError: "Không thể hợp nhất vùng chồng chéo",
|
|
93
|
-
partiallyError: "Không thể thực hiện thao tác này trên ô đã hợp nhất"
|
|
93
|
+
partiallyError: "Không thể thực hiện thao tác này trên ô đã hợp nhất",
|
|
94
|
+
confirm: {
|
|
95
|
+
warning: "Cảnh báo",
|
|
96
|
+
dismantleMergeCellWarning: "Thao tác này sẽ bỏ hợp nhất các ô đã hợp nhất. Tiếp tục?"
|
|
97
|
+
}
|
|
94
98
|
},
|
|
95
|
-
filter: {
|
|
99
|
+
filter: { confirm: {
|
|
100
|
+
error: "Không thể thực hiện thao tác này",
|
|
101
|
+
notAllowedToInsertRange: "Thao tác này không được phép vì phạm vi chứa các hàng đã lọc."
|
|
102
|
+
} },
|
|
96
103
|
textWrap: {
|
|
97
104
|
overflow: "Tràn",
|
|
98
105
|
wrap: "Tự động ngắt dòng",
|
package/lib/cjs/locale/zh-CN.js
CHANGED
|
@@ -90,9 +90,16 @@ const locale = { "sheets-ui": {
|
|
|
90
90
|
horizontal: "水平合并",
|
|
91
91
|
cancel: "取消合并",
|
|
92
92
|
overlappingError: "不能合并重叠区域",
|
|
93
|
-
partiallyError: "无法对部分合并单元格执行此操作"
|
|
93
|
+
partiallyError: "无法对部分合并单元格执行此操作",
|
|
94
|
+
confirm: {
|
|
95
|
+
warning: "警告",
|
|
96
|
+
dismantleMergeCellWarning: "此操作将取消合并单元格,是否继续?"
|
|
97
|
+
}
|
|
94
98
|
},
|
|
95
|
-
filter: {
|
|
99
|
+
filter: { confirm: {
|
|
100
|
+
error: "无法执行此操作",
|
|
101
|
+
notAllowedToInsertRange: "该范围包含筛选行,无法执行此操作。"
|
|
102
|
+
} },
|
|
96
103
|
textWrap: {
|
|
97
104
|
overflow: "溢出",
|
|
98
105
|
wrap: "自动换行",
|
package/lib/cjs/locale/zh-HK.js
CHANGED
|
@@ -90,9 +90,16 @@ const locale = { "sheets-ui": {
|
|
|
90
90
|
horizontal: "水平合併",
|
|
91
91
|
cancel: "取消合併",
|
|
92
92
|
overlappingError: "不能合併重疊區域",
|
|
93
|
-
partiallyError: "無法對部分合併儲存格執行此操作"
|
|
93
|
+
partiallyError: "無法對部分合併儲存格執行此操作",
|
|
94
|
+
confirm: {
|
|
95
|
+
warning: "警告",
|
|
96
|
+
dismantleMergeCellWarning: "此操作將取消合併儲存格,是否繼續?"
|
|
97
|
+
}
|
|
94
98
|
},
|
|
95
|
-
filter: {
|
|
99
|
+
filter: { confirm: {
|
|
100
|
+
error: "無法執行此操作",
|
|
101
|
+
notAllowedToInsertRange: "該範圍包含篩選列,無法執行此操作。"
|
|
102
|
+
} },
|
|
96
103
|
textWrap: {
|
|
97
104
|
overflow: "溢出",
|
|
98
105
|
wrap: "自動換行",
|
package/lib/cjs/locale/zh-TW.js
CHANGED
|
@@ -90,9 +90,16 @@ const locale = { "sheets-ui": {
|
|
|
90
90
|
horizontal: "水平合併",
|
|
91
91
|
cancel: "取消合併",
|
|
92
92
|
overlappingError: "不能合併重疊區域",
|
|
93
|
-
partiallyError: "無法對部分合併儲存格執行此操作"
|
|
93
|
+
partiallyError: "無法對部分合併儲存格執行此操作",
|
|
94
|
+
confirm: {
|
|
95
|
+
warning: "警告",
|
|
96
|
+
dismantleMergeCellWarning: "此操作將取消合併儲存格,是否繼續?"
|
|
97
|
+
}
|
|
94
98
|
},
|
|
95
|
-
filter: {
|
|
99
|
+
filter: { confirm: {
|
|
100
|
+
error: "無法執行此操作",
|
|
101
|
+
notAllowedToInsertRange: "該範圍包含篩選列,無法執行此操作。"
|
|
102
|
+
} },
|
|
96
103
|
textWrap: {
|
|
97
104
|
overflow: "溢出",
|
|
98
105
|
wrap: "自動換行",
|
package/lib/es/index.js
CHANGED
|
@@ -7,7 +7,7 @@ import { BehaviorSubject, EMPTY, Observable, Subject, Subscription, combineLates
|
|
|
7
7
|
import { DocSelectionManagerService, DocSkeletonManagerService, InsertTextCommand, RichTextEditingMutation, SetTextSelectionsOperation } from "@univerjs/docs";
|
|
8
8
|
import { ObjectScope, UnitAction, UnitObject, UnitRole } from "@univerjs/protocol";
|
|
9
9
|
import { Avatar, Button, Calendar, CascaderList, ColorPicker, Confirm, Dropdown, DropdownMenu, FormLayout, Input, InputNumber, MessageType, Radio, RadioGroup, Select, Separator, Switch, TimeInput, Tooltip, borderBottomClassName, borderClassName, borderRightClassName, borderTopClassName, clsx, scrollbarClassName } from "@univerjs/design";
|
|
10
|
-
import { AddImageIcon, AdjustHeightDoubleIcon, AdjustWidthDoubleIcon, AlignBottomIcon, AlignTopIcon, AllBorderIcon, AutoHeightDoubleIcon, AutoWidthDoubleIcon, AutofillDoubleIcon, AutowrapIcon, BackSlashDoubleIcon, BoldIcon, BrushIcon, CancelFreezeIcon, CancelMergeIcon, CheckMarkIcon, ClearFormatDoubleIcon, CloseIcon, CodeIcon, ConvertIcon, CopyDoubleIcon, CutIcon, DeleteCellShiftLeftDoubleIcon, DeleteCellShiftUpDoubleIcon, DeleteColumnDoubleIcon, DeleteIcon, DeleteRowDoubleIcon, DownBorderDoubleIcon, DownloadImageIcon, DropdownIcon, ErrorIcon, EyeOutlineIcon, EyelashIcon, FontColorDoubleIcon, FontSizeIncreaseIcon, FontSizeReduceIcon, FreezeColumnIcon, FreezeRowIcon, FreezeToSelectedIcon, FxIcon, HideDoubleIcon, HideGridlinesDoubleIcon, HorizontalBorderDoubleIcon, HorizontalMergeIcon, HorizontallyIcon, IncreaseIcon, InfoIcon, InnerBorderDoubleIcon, InsertCellDownDoubleIcon, InsertCellShiftRightDoubleIcon, InsertDoubleIcon, InsertRowAboveDoubleIcon, InsertRowBelowDoubleIcon, ItalicIcon, LeftBorderDoubleIcon, LeftDoubleDiagonalDoubleIcon, LeftInsertColumnDoubleIcon, LeftJustifyingIcon, LeftRotationFortyFiveDegreesIcon, LeftRotationNinetyDegreesIcon, LeftTridiagonalDoubleIcon, LockIcon, MergeAllIcon, MoreDownIcon,
|
|
10
|
+
import { AddImageIcon, AdjustHeightDoubleIcon, AdjustWidthDoubleIcon, AlignBottomIcon, AlignTopIcon, AllBorderIcon, AutoHeightDoubleIcon, AutoWidthDoubleIcon, AutofillDoubleIcon, AutowrapIcon, BackSlashDoubleIcon, BoldIcon, BrushIcon, CancelFreezeIcon, CancelMergeIcon, CheckMarkIcon, ClearFormatDoubleIcon, CloseIcon, CodeIcon, ConvertIcon, CopyDoubleIcon, CutIcon, DeleteCellShiftLeftDoubleIcon, DeleteCellShiftUpDoubleIcon, DeleteColumnDoubleIcon, DeleteIcon, DeleteRowDoubleIcon, DownBorderDoubleIcon, DownloadImageIcon, DropdownIcon, ErrorIcon, EyeOutlineIcon, EyelashIcon, FontColorDoubleIcon, FontSizeIncreaseIcon, FontSizeReduceIcon, FreezeColumnIcon, FreezeRowIcon, FreezeToSelectedIcon, FxIcon, HideDoubleIcon, HideGridlinesDoubleIcon, HorizontalBorderDoubleIcon, HorizontalMergeIcon, HorizontallyIcon, IncreaseIcon, InfoIcon, InnerBorderDoubleIcon, InsertCellDownDoubleIcon, InsertCellShiftRightDoubleIcon, InsertDoubleIcon, InsertRowAboveDoubleIcon, InsertRowBelowDoubleIcon, ItalicIcon, LeftBorderDoubleIcon, LeftDoubleDiagonalDoubleIcon, LeftInsertColumnDoubleIcon, LeftJustifyingIcon, LeftRotationFortyFiveDegreesIcon, LeftRotationNinetyDegreesIcon, LeftTridiagonalDoubleIcon, LockIcon, MergeAllIcon, MoreDownIcon, MoreLeftIcon, MoreRightIcon, NoBorderIcon, NoColorDoubleIcon, NoRotationIcon, OuterBorderDoubleIcon, OverflowIcon, PaintBucketDoubleIcon, PasteSpecialDoubleIcon, PenIcon, PipingIcon, ProtectIcon, ReduceDoubleIcon, RightBorderDoubleIcon, RightDoubleDiagonalDoubleIcon, RightInsertColumnDoubleIcon, RightJustifyingIcon, RightRotationFortyFiveDegreesIcon, RightRotationNinetyDegreesIcon, SlashDoubleIcon, StrikethroughIcon, SubscriptIcon, SuperscriptIcon, TruncationIcon, UnderlineIcon, UpBorderDoubleIcon, VerticalBorderDoubleIcon, VerticalCenterIcon, VerticalIntegrationIcon, VerticalTextIcon, WarningIcon, WriteIcon } from "@univerjs/icons";
|
|
11
11
|
import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
|
|
12
12
|
import { Fragment, jsx, jsxs } from "react/jsx-runtime";
|
|
13
13
|
import { FUNCTION_NAMES_MATH, FUNCTION_NAMES_STATISTICAL, FUNCTION_NAMES_TEXT, FormulaDataModel, IDefinedNamesService, IFunctionService, ISuperTableService, LexerTreeBuilder, NullValueObject, SetFormulaCalculationNotificationMutation, deserializeRangeWithSheet, isReferenceStringWithEffectiveColumn, isReferenceStrings, matchToken, operatorToken, sequenceNodeType, serializeRange, serializeRangeWithSheet } from "@univerjs/engine-formula";
|
|
@@ -4035,6 +4035,7 @@ const IMAGE_MIME_TO_EXTENSION = {
|
|
|
4035
4035
|
[FILE__WEBP_CLIPBOARD_MIME_TYPE]: "webp",
|
|
4036
4036
|
[FILE__BMP_CLIPBOARD_MIME_TYPE]: "bmp"
|
|
4037
4037
|
};
|
|
4038
|
+
const FORMULA_CLIPBOARD_MIME_TYPE = "web application/x-univer-sheets-formula";
|
|
4038
4039
|
/**
|
|
4039
4040
|
* This service provide hooks for sheet features to supplement content or modify behavior of clipboard.
|
|
4040
4041
|
*/
|
|
@@ -4100,6 +4101,7 @@ let SheetClipboardService = class SheetClipboardService extends Disposable {
|
|
|
4100
4101
|
return (_h$onBeforeCopy = h.onBeforeCopy) === null || _h$onBeforeCopy === void 0 ? void 0 : _h$onBeforeCopy.call(h, workbookId, worksheetId, range, copyType);
|
|
4101
4102
|
});
|
|
4102
4103
|
const copyContent = this._generateCopyContent(workbookId, worksheetId, range, hooks, copyHookType);
|
|
4104
|
+
if (copyContent && copyType === "COPY") copyContent.formulaClipboardPayload = this._generateFormulaClipboardPayload(workbookId, worksheetId, range, copyContent, hooks);
|
|
4103
4105
|
hooks.forEach((h) => {
|
|
4104
4106
|
var _h$onAfterCopy;
|
|
4105
4107
|
return (_h$onAfterCopy = h.onAfterCopy) === null || _h$onAfterCopy === void 0 ? void 0 : _h$onAfterCopy.call(h);
|
|
@@ -4120,7 +4122,7 @@ let SheetClipboardService = class SheetClipboardService extends Disposable {
|
|
|
4120
4122
|
copyHookType
|
|
4121
4123
|
});
|
|
4122
4124
|
if (!copyContent) return false;
|
|
4123
|
-
const { html, plain, matrixFragment, copyId, discreteRange } = copyContent;
|
|
4125
|
+
const { html, plain, matrixFragment, copyId, discreteRange, formulaClipboardPayload } = copyContent;
|
|
4124
4126
|
this._copyContentCache.set(copyId, {
|
|
4125
4127
|
unitId: workbook.getUnitId(),
|
|
4126
4128
|
subUnitId: worksheet.getSheetId(),
|
|
@@ -4128,7 +4130,7 @@ let SheetClipboardService = class SheetClipboardService extends Disposable {
|
|
|
4128
4130
|
matrix: matrixFragment,
|
|
4129
4131
|
copyType
|
|
4130
4132
|
});
|
|
4131
|
-
await this._clipboardInterfaceService.write(plain, html);
|
|
4133
|
+
await this._clipboardInterfaceService.write(plain, html, formulaClipboardPayload ? { [FORMULA_CLIPBOARD_MIME_TYPE]: formulaClipboardPayload } : void 0);
|
|
4132
4134
|
this._markSelectionService.removeAllShapes();
|
|
4133
4135
|
const style = createCopyPasteSelectionStyle(this._themeService);
|
|
4134
4136
|
this._copyMarkId = this._markSelectionService.addShape({
|
|
@@ -4144,6 +4146,7 @@ let SheetClipboardService = class SheetClipboardService extends Disposable {
|
|
|
4144
4146
|
const types = item.types;
|
|
4145
4147
|
const text = types.indexOf(PLAIN_TEXT_CLIPBOARD_MIME_TYPE) !== -1 ? await item.getType(PLAIN_TEXT_CLIPBOARD_MIME_TYPE).then((blob) => blob && blob.text()) : "";
|
|
4146
4148
|
const html = types.indexOf(HTML_CLIPBOARD_MIME_TYPE) !== -1 ? await item.getType(HTML_CLIPBOARD_MIME_TYPE).then((blob) => blob && blob.text()) : "";
|
|
4149
|
+
const formulaClipboardPayload = types.indexOf("web application/x-univer-sheets-formula") !== -1 ? await item.getType(FORMULA_CLIPBOARD_MIME_TYPE).then((blob) => blob && blob.text()).catch(() => "") : "";
|
|
4147
4150
|
const imageIndex = types.findIndex((type) => imageMimeTypeSet.has(type));
|
|
4148
4151
|
const shouldUseHTMLPaste = imageIndex === -1 || !htmlContainsImage(html);
|
|
4149
4152
|
if (html && shouldUseHTMLPaste) {
|
|
@@ -4152,7 +4155,7 @@ let SheetClipboardService = class SheetClipboardService extends Disposable {
|
|
|
4152
4155
|
title: this._localeService.t("sheets-ui.clipboard.shortCutNotify.title"),
|
|
4153
4156
|
content: this._localeService.t("sheets-ui.clipboard.shortCutNotify.useShortCutInstead")
|
|
4154
4157
|
});
|
|
4155
|
-
return this._pasteHTML(html, pasteType);
|
|
4158
|
+
return this._pasteHTML(html, pasteType, formulaClipboardPayload);
|
|
4156
4159
|
}
|
|
4157
4160
|
if (imageIndex !== -1) {
|
|
4158
4161
|
const imageMimeType = types[imageIndex];
|
|
@@ -4170,10 +4173,10 @@ let SheetClipboardService = class SheetClipboardService extends Disposable {
|
|
|
4170
4173
|
async pasteByCopyId(copyId, pasteType = PREDEFINED_HOOK_NAME_PASTE.DEFAULT_PASTE) {
|
|
4171
4174
|
return this._pasteInternal(copyId, pasteType);
|
|
4172
4175
|
}
|
|
4173
|
-
async legacyPaste(html, text, files) {
|
|
4176
|
+
async legacyPaste(html, text, files, formulaClipboardPayload) {
|
|
4174
4177
|
const isFromExcel = htmlIsFromExcel(html !== null && html !== void 0 ? html : "");
|
|
4175
4178
|
if (files && !isFromExcel) return this._pasteFiles(files, PREDEFINED_HOOK_NAME_PASTE.DEFAULT_PASTE);
|
|
4176
|
-
else if (html) return this._pasteHTML(html, PREDEFINED_HOOK_NAME_PASTE.DEFAULT_PASTE);
|
|
4179
|
+
else if (html) return this._pasteHTML(html, PREDEFINED_HOOK_NAME_PASTE.DEFAULT_PASTE, formulaClipboardPayload);
|
|
4177
4180
|
else if (text) if (/[\n\t]/.test(text)) return this._pasteHTML(convertTextToTable(text), PREDEFINED_HOOK_NAME_PASTE.DEFAULT_PASTE);
|
|
4178
4181
|
else return this._pastePlainText(text, PREDEFINED_HOOK_NAME_PASTE.DEFAULT_PASTE);
|
|
4179
4182
|
else return this._pasteUnrecognized();
|
|
@@ -4280,6 +4283,40 @@ let SheetClipboardService = class SheetClipboardService extends Disposable {
|
|
|
4280
4283
|
discreteRange
|
|
4281
4284
|
};
|
|
4282
4285
|
}
|
|
4286
|
+
_generateFormulaClipboardPayload(unitId, subUnitId, range, copyContent, hooks) {
|
|
4287
|
+
if (this._hasFilteredRows(unitId, subUnitId, range, hooks)) return;
|
|
4288
|
+
const { startRow, startColumn, endRow, endColumn } = range;
|
|
4289
|
+
const rowCount = endRow - startRow + 1;
|
|
4290
|
+
const columnCount = endColumn - startColumn + 1;
|
|
4291
|
+
const formulaOnlyHook = hooks.find((hook) => hook.id === PREDEFINED_HOOK_NAME_COPY.SPECIAL_COPY_FORMULA_ONLY);
|
|
4292
|
+
const formulas = [];
|
|
4293
|
+
for (let row = 0; row < rowCount; row++) for (let column = 0; column < columnCount; column++) {
|
|
4294
|
+
var _formulaOnlyHook$onCo, _copyContent$matrixFr;
|
|
4295
|
+
const formula = (formulaOnlyHook === null || formulaOnlyHook === void 0 || (_formulaOnlyHook$onCo = formulaOnlyHook.onCopyCellContent) === null || _formulaOnlyHook$onCo === void 0 ? void 0 : _formulaOnlyHook$onCo.call(formulaOnlyHook, startRow + row, startColumn + column)) || ((_copyContent$matrixFr = copyContent.matrixFragment.getValue(row, column)) === null || _copyContent$matrixFr === void 0 ? void 0 : _copyContent$matrixFr.f);
|
|
4296
|
+
if (typeof formula === "string" && isFormulaString(formula)) formulas.push({
|
|
4297
|
+
row,
|
|
4298
|
+
column,
|
|
4299
|
+
f: formula
|
|
4300
|
+
});
|
|
4301
|
+
}
|
|
4302
|
+
if (!formulas.length) return;
|
|
4303
|
+
return JSON.stringify({
|
|
4304
|
+
rowCount,
|
|
4305
|
+
columnCount,
|
|
4306
|
+
origin: {
|
|
4307
|
+
row: startRow,
|
|
4308
|
+
column: startColumn
|
|
4309
|
+
},
|
|
4310
|
+
formulas
|
|
4311
|
+
});
|
|
4312
|
+
}
|
|
4313
|
+
_hasFilteredRows(unitId, subUnitId, range, hooks) {
|
|
4314
|
+
return hooks.some((hook) => {
|
|
4315
|
+
var _hook$getFilteredOutR;
|
|
4316
|
+
const rows = (_hook$getFilteredOutR = hook.getFilteredOutRows) === null || _hook$getFilteredOutR === void 0 ? void 0 : _hook$getFilteredOutR.call(hook, unitId, subUnitId, range);
|
|
4317
|
+
return !!(rows === null || rows === void 0 ? void 0 : rows.length);
|
|
4318
|
+
});
|
|
4319
|
+
}
|
|
4283
4320
|
_notifyClipboardHook() {
|
|
4284
4321
|
this._clipboardHooks$.next(this._clipboardHooks);
|
|
4285
4322
|
}
|
|
@@ -4346,15 +4383,49 @@ let SheetClipboardService = class SheetClipboardService extends Disposable {
|
|
|
4346
4383
|
return (_h$onPasteUnrecognize = h.onPasteUnrecognized) === null || _h$onPasteUnrecognize === void 0 ? void 0 : _h$onPasteUnrecognize.call(h, payload);
|
|
4347
4384
|
});
|
|
4348
4385
|
}
|
|
4349
|
-
async _pasteHTML(html, pasteType) {
|
|
4386
|
+
async _pasteHTML(html, pasteType, formulaClipboardPayload) {
|
|
4350
4387
|
const copyId = extractId(html);
|
|
4351
4388
|
if (copyId && this._copyContentCache.get(copyId)) return this._pasteInternal(copyId, pasteType);
|
|
4352
|
-
return this._pasteExternal(html, pasteType);
|
|
4389
|
+
return this._pasteExternal(html, pasteType, formulaClipboardPayload);
|
|
4353
4390
|
}
|
|
4354
|
-
async _pasteExternal(html, pasteType) {
|
|
4355
|
-
var _this$_univerInstance;
|
|
4391
|
+
async _pasteExternal(html, pasteType, formulaClipboardPayload) {
|
|
4356
4392
|
const { rowProperties, colProperties, cellMatrix } = this._htmlToUSM.convert(html);
|
|
4357
4393
|
if (!cellMatrix) return false;
|
|
4394
|
+
const sourceRange = formulaClipboardPayload ? this._applyFormulaClipboardPayload(cellMatrix, formulaClipboardPayload) : void 0;
|
|
4395
|
+
return this._pasteExternalData({
|
|
4396
|
+
rowProperties,
|
|
4397
|
+
colProperties,
|
|
4398
|
+
cellMatrix
|
|
4399
|
+
}, pasteType, sourceRange);
|
|
4400
|
+
}
|
|
4401
|
+
_applyFormulaClipboardPayload(cellMatrix, text) {
|
|
4402
|
+
let payload;
|
|
4403
|
+
try {
|
|
4404
|
+
payload = JSON.parse(text);
|
|
4405
|
+
} catch {
|
|
4406
|
+
return;
|
|
4407
|
+
}
|
|
4408
|
+
if (!payload || !payload.origin || !Array.isArray(payload.formulas) || payload.rowCount <= 0 || payload.columnCount <= 0) return;
|
|
4409
|
+
cellMatrix.setValue(payload.rowCount - 1, payload.columnCount - 1, {
|
|
4410
|
+
...getEmptyCell(),
|
|
4411
|
+
...cellMatrix.getValue(payload.rowCount - 1, payload.columnCount - 1)
|
|
4412
|
+
});
|
|
4413
|
+
payload.formulas.forEach((formula) => {
|
|
4414
|
+
if (isFormulaString(formula.f) && formula.row >= 0 && formula.row < payload.rowCount && formula.column >= 0 && formula.column < payload.columnCount) cellMatrix.setValue(formula.row, formula.column, {
|
|
4415
|
+
...getEmptyCell(),
|
|
4416
|
+
...cellMatrix.getValue(formula.row, formula.column),
|
|
4417
|
+
f: formula.f
|
|
4418
|
+
});
|
|
4419
|
+
});
|
|
4420
|
+
return {
|
|
4421
|
+
rows: Array.from({ length: payload.rowCount }, (_, index) => payload.origin.row + index),
|
|
4422
|
+
cols: Array.from({ length: payload.columnCount }, (_, index) => payload.origin.column + index)
|
|
4423
|
+
};
|
|
4424
|
+
}
|
|
4425
|
+
_pasteExternalData(data, pasteType, sourceRange) {
|
|
4426
|
+
var _this$_univerInstance;
|
|
4427
|
+
const { rowProperties, colProperties, cellMatrix } = data;
|
|
4428
|
+
if (!cellMatrix) return false;
|
|
4358
4429
|
const pasteTarget = this._getPastedRange(cellMatrix);
|
|
4359
4430
|
if (!pasteTarget) return false;
|
|
4360
4431
|
const worksheet = (_this$_univerInstance = this._univerInstanceService.getUniverSheetInstance(pasteTarget.unitId)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getSheetBySheetId(pasteTarget.subUnitId);
|
|
@@ -4368,11 +4439,18 @@ let SheetClipboardService = class SheetClipboardService extends Disposable {
|
|
|
4368
4439
|
return false;
|
|
4369
4440
|
}
|
|
4370
4441
|
}
|
|
4442
|
+
const source = sourceRange ? {
|
|
4443
|
+
range: sourceRange,
|
|
4444
|
+
unitId: pasteTarget.unitId,
|
|
4445
|
+
subUnitId: pasteTarget.subUnitId,
|
|
4446
|
+
copyType: "COPY",
|
|
4447
|
+
copyId: ""
|
|
4448
|
+
} : void 0;
|
|
4371
4449
|
return this._pasteUSM({
|
|
4372
4450
|
rowProperties,
|
|
4373
4451
|
colProperties,
|
|
4374
4452
|
cellMatrix
|
|
4375
|
-
}, pasteTarget, pasteType);
|
|
4453
|
+
}, pasteTarget, pasteType, source);
|
|
4376
4454
|
}
|
|
4377
4455
|
async _pasteInternal(copyId, pasteType) {
|
|
4378
4456
|
var _this$_univerInstance2, _this$_univerInstance3;
|
|
@@ -5004,8 +5082,8 @@ const SheetPasteShortKeyCommand = {
|
|
|
5004
5082
|
type: CommandType.COMMAND,
|
|
5005
5083
|
handler: async (accessor, params) => {
|
|
5006
5084
|
const clipboardService = accessor.get(ISheetClipboardService);
|
|
5007
|
-
const { htmlContent, textContent, files } = params;
|
|
5008
|
-
clipboardService.legacyPaste(htmlContent, textContent, files);
|
|
5085
|
+
const { htmlContent, textContent, files, formulaClipboardPayload } = params;
|
|
5086
|
+
clipboardService.legacyPaste(htmlContent, textContent, files, formulaClipboardPayload);
|
|
5009
5087
|
return true;
|
|
5010
5088
|
}
|
|
5011
5089
|
};
|
|
@@ -9361,6 +9439,7 @@ let SheetCellEditorResizeService = class SheetCellEditorResizeService extends Di
|
|
|
9361
9439
|
if (documentDataModel == null) return;
|
|
9362
9440
|
const documentSkeleton = this._getEditorSkeleton();
|
|
9363
9441
|
if (!documentSkeleton) return;
|
|
9442
|
+
documentSkeleton.resetInitialWidth();
|
|
9364
9443
|
const info = this._predictingSize(position, canvasOffset, documentSkeleton, documentLayoutObject, scaleX, scaleY);
|
|
9365
9444
|
if (!info || info.actualWidth <= 0) return;
|
|
9366
9445
|
let { actualWidth, actualHeight } = info;
|
|
@@ -10785,6 +10864,9 @@ let EditingRenderController = class EditingRenderController extends Disposable {
|
|
|
10785
10864
|
this._contextService.setContextValue(FOCUSING_EDITOR_BUT_HIDDEN, false);
|
|
10786
10865
|
this._contextService.setContextValue(FOCUSING_FX_BAR_EDITOR, false);
|
|
10787
10866
|
this._cellEditorManagerService.setState({ show: param.visible });
|
|
10867
|
+
const formulaBarEditor = this._editorService.getEditor(DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY);
|
|
10868
|
+
formulaBarEditor === null || formulaBarEditor === void 0 || formulaBarEditor.setSelectionRanges([], false);
|
|
10869
|
+
formulaBarEditor === null || formulaBarEditor === void 0 || formulaBarEditor.blur();
|
|
10788
10870
|
const editorObject = this._getEditorObject();
|
|
10789
10871
|
editorObject === null || editorObject === void 0 || (_editorObject$scene$g = editorObject.scene.getViewport(VIEWPORT_KEY.VIEW_MAIN)) === null || _editorObject$scene$g === void 0 || _editorObject$scene$g.scrollToViewportPos({
|
|
10790
10872
|
viewportScrollX: 0,
|
|
@@ -11383,7 +11465,7 @@ const shouldRemoveShapeIds = [
|
|
|
11383
11465
|
MoveColsMutation.id
|
|
11384
11466
|
];
|
|
11385
11467
|
let SheetClipboardController = class SheetClipboardController extends RxDisposable {
|
|
11386
|
-
constructor(_injector, _instanceService, _renderManagerService, _commandService, _contextService, _configService, _sheetClipboardService, _messageService, _localService, _uiPartsService) {
|
|
11468
|
+
constructor(_injector, _instanceService, _renderManagerService, _commandService, _contextService, _configService, _sheetClipboardService, _clipboardInterfaceService, _messageService, _localService, _uiPartsService) {
|
|
11387
11469
|
super();
|
|
11388
11470
|
this._injector = _injector;
|
|
11389
11471
|
this._instanceService = _instanceService;
|
|
@@ -11392,6 +11474,7 @@ let SheetClipboardController = class SheetClipboardController extends RxDisposab
|
|
|
11392
11474
|
this._contextService = _contextService;
|
|
11393
11475
|
this._configService = _configService;
|
|
11394
11476
|
this._sheetClipboardService = _sheetClipboardService;
|
|
11477
|
+
this._clipboardInterfaceService = _clipboardInterfaceService;
|
|
11395
11478
|
this._messageService = _messageService;
|
|
11396
11479
|
this._localService = _localService;
|
|
11397
11480
|
this._uiPartsService = _uiPartsService;
|
|
@@ -11408,7 +11491,7 @@ let SheetClipboardController = class SheetClipboardController extends RxDisposab
|
|
|
11408
11491
|
_pasteWithDoc() {
|
|
11409
11492
|
var _this$_renderManagerS;
|
|
11410
11493
|
const sheetPasteShortKeyFn = (docSelectionRenderService) => {
|
|
11411
|
-
docSelectionRenderService.onPaste$.pipe(takeUntil(this.dispose$)).subscribe((config) => {
|
|
11494
|
+
docSelectionRenderService.onPaste$.pipe(takeUntil(this.dispose$)).subscribe(async (config) => {
|
|
11412
11495
|
var _clipboardEvent$clipb, _clipboardEvent$clipb2;
|
|
11413
11496
|
if (!whenSheetEditorFocused(this._contextService)) return;
|
|
11414
11497
|
config.event.preventDefault();
|
|
@@ -11416,10 +11499,12 @@ let SheetClipboardController = class SheetClipboardController extends RxDisposab
|
|
|
11416
11499
|
const htmlContent = (_clipboardEvent$clipb = clipboardEvent.clipboardData) === null || _clipboardEvent$clipb === void 0 ? void 0 : _clipboardEvent$clipb.getData("text/html");
|
|
11417
11500
|
const textContent = (_clipboardEvent$clipb2 = clipboardEvent.clipboardData) === null || _clipboardEvent$clipb2 === void 0 ? void 0 : _clipboardEvent$clipb2.getData("text/plain");
|
|
11418
11501
|
const files = this._resolveClipboardFiles(clipboardEvent.clipboardData);
|
|
11502
|
+
const formulaClipboardPayload = await this._readFormulaClipboardPayload();
|
|
11419
11503
|
this._commandService.executeCommand(SheetPasteShortKeyCommand.id, {
|
|
11420
11504
|
htmlContent,
|
|
11421
11505
|
textContent,
|
|
11422
|
-
files
|
|
11506
|
+
files,
|
|
11507
|
+
formulaClipboardPayload
|
|
11423
11508
|
});
|
|
11424
11509
|
});
|
|
11425
11510
|
docSelectionRenderService === null || docSelectionRenderService === void 0 || docSelectionRenderService.onKeydown$.subscribe((event) => {
|
|
@@ -11441,6 +11526,16 @@ let SheetClipboardController = class SheetClipboardController extends RxDisposab
|
|
|
11441
11526
|
const files = Array.from(clipboardData.items).map((item) => item.kind === "file" ? item.getAsFile() : void 0).filter(Boolean);
|
|
11442
11527
|
return files.length > 0 ? files : void 0;
|
|
11443
11528
|
}
|
|
11529
|
+
async _readFormulaClipboardPayload() {
|
|
11530
|
+
if (!this._clipboardInterfaceService.supportClipboard) return;
|
|
11531
|
+
try {
|
|
11532
|
+
const item = (await this._clipboardInterfaceService.read()).find((clipboardItem) => clipboardItem.types.includes(FORMULA_CLIPBOARD_MIME_TYPE));
|
|
11533
|
+
if (!item) return;
|
|
11534
|
+
return (await item.getType(FORMULA_CLIPBOARD_MIME_TYPE)).text();
|
|
11535
|
+
} catch {
|
|
11536
|
+
return;
|
|
11537
|
+
}
|
|
11538
|
+
}
|
|
11444
11539
|
_init() {
|
|
11445
11540
|
[
|
|
11446
11541
|
SheetCopyCommand,
|
|
@@ -11895,9 +11990,10 @@ SheetClipboardController = __decorate([
|
|
|
11895
11990
|
__decorateParam(4, IContextService),
|
|
11896
11991
|
__decorateParam(5, IConfigService),
|
|
11897
11992
|
__decorateParam(6, ISheetClipboardService),
|
|
11898
|
-
__decorateParam(7,
|
|
11899
|
-
__decorateParam(8,
|
|
11900
|
-
__decorateParam(9,
|
|
11993
|
+
__decorateParam(7, IClipboardInterfaceService),
|
|
11994
|
+
__decorateParam(8, IMessageService),
|
|
11995
|
+
__decorateParam(9, Inject(LocaleService)),
|
|
11996
|
+
__decorateParam(10, IUIPartsService)
|
|
11901
11997
|
], SheetClipboardController);
|
|
11902
11998
|
|
|
11903
11999
|
//#endregion
|
|
@@ -15173,7 +15269,7 @@ let SheetRenderController = class SheetRenderController extends RxDisposable {
|
|
|
15173
15269
|
this._renderFrameTags = {};
|
|
15174
15270
|
}));
|
|
15175
15271
|
this.disposeWithMe(engine.endFrame$.subscribe(() => {
|
|
15176
|
-
if (this._renderFrameTimeMetric && Object.keys(this._renderFrameTimeMetric).
|
|
15272
|
+
if (this._renderFrameTimeMetric && Object.keys(this._renderFrameTimeMetric).some((key) => key.startsWith(SHEET_EXTENSION_PREFIX))) this._afterRenderMetric$.next({
|
|
15177
15273
|
frameTimeMetric: this._renderFrameTimeMetric,
|
|
15178
15274
|
tags: this._renderFrameTags
|
|
15179
15275
|
});
|
|
@@ -19671,7 +19767,7 @@ function DefinedNameOverlay({ search, isInputEvent }) {
|
|
|
19671
19767
|
const unitId = univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET).getUnitId();
|
|
19672
19768
|
const getDefinedNameMap = () => {
|
|
19673
19769
|
const definedNameMap = definedNamesService.getDefinedNameMap(unitId);
|
|
19674
|
-
if (definedNameMap) return
|
|
19770
|
+
if (definedNameMap) return Object.values(definedNameMap);
|
|
19675
19771
|
return [];
|
|
19676
19772
|
};
|
|
19677
19773
|
const [definedNames, setDefinedNames] = useState(getDefinedNameMap());
|
|
@@ -19786,7 +19882,7 @@ function DefinedName({ disable }) {
|
|
|
19786
19882
|
const inputRef = useRef(null);
|
|
19787
19883
|
const getDefinedNameMap = () => {
|
|
19788
19884
|
const definedNameMap = definedNamesService.getDefinedNameMap(unitId);
|
|
19789
|
-
if (definedNameMap) return
|
|
19885
|
+
if (definedNameMap) return Object.values(definedNameMap);
|
|
19790
19886
|
return [];
|
|
19791
19887
|
};
|
|
19792
19888
|
const focusDefinedName = async (definedName) => {
|
|
@@ -21744,11 +21840,11 @@ const SheetBar = () => {
|
|
|
21744
21840
|
children: [/* @__PURE__ */ jsx(SheetBarButton, {
|
|
21745
21841
|
disabled: leftScrollState,
|
|
21746
21842
|
onClick: handleScrollLeft,
|
|
21747
|
-
children: /* @__PURE__ */ jsx(
|
|
21843
|
+
children: /* @__PURE__ */ jsx(MoreLeftIcon, {})
|
|
21748
21844
|
}), /* @__PURE__ */ jsx(SheetBarButton, {
|
|
21749
21845
|
disabled: rightScrollState,
|
|
21750
21846
|
onClick: handleScrollRight,
|
|
21751
|
-
children: /* @__PURE__ */ jsx(
|
|
21847
|
+
children: /* @__PURE__ */ jsx(MoreRightIcon, {})
|
|
21752
21848
|
})]
|
|
21753
21849
|
})
|
|
21754
21850
|
]
|
|
@@ -22646,7 +22742,7 @@ const useHighlightRange = (ranges = []) => {
|
|
|
22646
22742
|
//#endregion
|
|
22647
22743
|
//#region package.json
|
|
22648
22744
|
var name = "@univerjs/sheets-ui";
|
|
22649
|
-
var version = "1.0.0-alpha.
|
|
22745
|
+
var version = "1.0.0-alpha.1";
|
|
22650
22746
|
|
|
22651
22747
|
//#endregion
|
|
22652
22748
|
//#region src/controllers/cell-alert.controller.ts
|
|
@@ -24466,7 +24562,7 @@ const DefinedNameContainer = () => {
|
|
|
24466
24562
|
const getDefinedNameMap = () => {
|
|
24467
24563
|
if (!unitId) return [];
|
|
24468
24564
|
const definedNameMap = definedNamesService.getDefinedNameMap(unitId);
|
|
24469
|
-
if (definedNameMap) return
|
|
24565
|
+
if (definedNameMap) return Object.values(definedNameMap);
|
|
24470
24566
|
return [];
|
|
24471
24567
|
};
|
|
24472
24568
|
const [editState, setEditState] = useState(false);
|
|
@@ -26122,7 +26218,7 @@ const formulaEditorStyle = {
|
|
|
26122
26218
|
}
|
|
26123
26219
|
};
|
|
26124
26220
|
let EditorDataSyncController = class EditorDataSyncController extends Disposable {
|
|
26125
|
-
constructor(_univerInstanceService, _renderManagerService, _editorBridgeService, _commandService, _rangeProtectionRuleModel, _worksheetProtectionRuleModel, _formulaEditorController, _formulaEditorManagerService) {
|
|
26221
|
+
constructor(_univerInstanceService, _renderManagerService, _editorBridgeService, _commandService, _rangeProtectionRuleModel, _worksheetProtectionRuleModel, _formulaEditorController, _formulaEditorManagerService, _contextService) {
|
|
26126
26222
|
super();
|
|
26127
26223
|
this._univerInstanceService = _univerInstanceService;
|
|
26128
26224
|
this._renderManagerService = _renderManagerService;
|
|
@@ -26132,11 +26228,13 @@ let EditorDataSyncController = class EditorDataSyncController extends Disposable
|
|
|
26132
26228
|
this._worksheetProtectionRuleModel = _worksheetProtectionRuleModel;
|
|
26133
26229
|
this._formulaEditorController = _formulaEditorController;
|
|
26134
26230
|
this._formulaEditorManagerService = _formulaEditorManagerService;
|
|
26231
|
+
this._contextService = _contextService;
|
|
26135
26232
|
this._initialize();
|
|
26136
26233
|
}
|
|
26137
26234
|
_initialize() {
|
|
26138
26235
|
this._syncFormulaEditorContent();
|
|
26139
26236
|
this._commandExecutedListener();
|
|
26237
|
+
this._syncFormulaRefRenderStyleOnFocusChange();
|
|
26140
26238
|
}
|
|
26141
26239
|
_getEditorViewModel(unitId) {
|
|
26142
26240
|
var _this$_renderManagerS;
|
|
@@ -26222,6 +26320,7 @@ let EditorDataSyncController = class EditorDataSyncController extends Disposable
|
|
|
26222
26320
|
unitId,
|
|
26223
26321
|
syncer: parmas.unitId
|
|
26224
26322
|
});
|
|
26323
|
+
this._checkAndSetRenderStyleConfig(docDataModel);
|
|
26225
26324
|
docViewModel.reset(docDataModel);
|
|
26226
26325
|
skeleton.calculate();
|
|
26227
26326
|
if (INCLUDE_LIST.includes(unitId)) {
|
|
@@ -26253,27 +26352,54 @@ let EditorDataSyncController = class EditorDataSyncController extends Disposable
|
|
|
26253
26352
|
}
|
|
26254
26353
|
if (unitId === DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY) this._formulaEditorController.autoScroll();
|
|
26255
26354
|
}
|
|
26355
|
+
_syncFormulaRefRenderStyleOnFocusChange() {
|
|
26356
|
+
this.disposeWithMe(this._contextService.subscribeContextValue$(FOCUSING_FX_BAR_EDITOR).subscribe(() => {
|
|
26357
|
+
this._refreshRenderStyleConfig(DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
|
|
26358
|
+
this._refreshRenderStyleConfig(DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY);
|
|
26359
|
+
}));
|
|
26360
|
+
}
|
|
26361
|
+
_refreshRenderStyleConfig(unitId) {
|
|
26362
|
+
var _currentRender$mainCo3;
|
|
26363
|
+
const currentRender = this._renderManagerService.getRenderById(unitId);
|
|
26364
|
+
const skeleton = currentRender === null || currentRender === void 0 ? void 0 : currentRender.with(DocSkeletonManagerService).getSkeleton();
|
|
26365
|
+
const docDataModel = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_DOC);
|
|
26366
|
+
const docViewModel = this._getEditorViewModel(unitId);
|
|
26367
|
+
if (currentRender == null || skeleton == null || docDataModel == null || docViewModel == null) return;
|
|
26368
|
+
this._checkAndSetRenderStyleConfig(docDataModel);
|
|
26369
|
+
docViewModel.reset(docDataModel);
|
|
26370
|
+
skeleton.calculate();
|
|
26371
|
+
(_currentRender$mainCo3 = currentRender.mainComponent) === null || _currentRender$mainCo3 === void 0 || _currentRender$mainCo3.makeDirty();
|
|
26372
|
+
if (unitId === DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY) this._formulaEditorController.autoScroll();
|
|
26373
|
+
}
|
|
26256
26374
|
_checkAndSetRenderStyleConfig(documentDataModel) {
|
|
26257
|
-
var
|
|
26375
|
+
var _snapshot$body$dataSt, _snapshot$body;
|
|
26258
26376
|
const snapshot = documentDataModel.getSnapshot();
|
|
26259
|
-
|
|
26260
|
-
|
|
26261
|
-
snapshot.documentStyle = formulaEditorStyle;
|
|
26377
|
+
if (snapshot.id !== DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY && snapshot.id !== DOCS_NORMAL_EDITOR_UNIT_ID_KEY) return;
|
|
26378
|
+
const isFormulaBar = snapshot.id === DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY;
|
|
26379
|
+
if (isFormulaBar) snapshot.documentStyle = formulaEditorStyle;
|
|
26380
|
+
else {
|
|
26381
|
+
var _snapshot$documentSty;
|
|
26382
|
+
(_snapshot$documentSty = snapshot.documentStyle) !== null && _snapshot$documentSty !== void 0 || (snapshot.documentStyle = {});
|
|
26383
|
+
}
|
|
26262
26384
|
let renderConfig = snapshot.documentStyle.renderConfig;
|
|
26263
26385
|
if (renderConfig == null) {
|
|
26264
26386
|
renderConfig = {};
|
|
26265
26387
|
snapshot.documentStyle.renderConfig = renderConfig;
|
|
26266
26388
|
}
|
|
26267
|
-
const position = this._formulaEditorManagerService.getPosition();
|
|
26268
|
-
if (position) {
|
|
26389
|
+
const position = isFormulaBar ? this._formulaEditorManagerService.getPosition() : null;
|
|
26390
|
+
if (isFormulaBar && position) {
|
|
26269
26391
|
const width = position.width;
|
|
26270
26392
|
snapshot.documentStyle.pageSize = {
|
|
26271
26393
|
width,
|
|
26272
26394
|
height: Infinity
|
|
26273
26395
|
};
|
|
26274
26396
|
}
|
|
26275
|
-
if (((
|
|
26276
|
-
|
|
26397
|
+
if (!((_snapshot$body$dataSt = (_snapshot$body = snapshot.body) === null || _snapshot$body === void 0 ? void 0 : _snapshot$body.dataStream) !== null && _snapshot$body$dataSt !== void 0 ? _snapshot$body$dataSt : "").startsWith("=")) {
|
|
26398
|
+
renderConfig.isRenderStyle = isFormulaBar ? BooleanNumber.FALSE : BooleanNumber.TRUE;
|
|
26399
|
+
return;
|
|
26400
|
+
}
|
|
26401
|
+
const isFocusFxBar = this._contextService.getContextValue(FOCUSING_FX_BAR_EDITOR);
|
|
26402
|
+
renderConfig.isRenderStyle = isFormulaBar === isFocusFxBar ? BooleanNumber.TRUE : BooleanNumber.FALSE;
|
|
26277
26403
|
}
|
|
26278
26404
|
_clearParagraph(paragraphs) {
|
|
26279
26405
|
const newParagraphs = Tools.deepClone(paragraphs);
|
|
@@ -26289,7 +26415,8 @@ EditorDataSyncController = __decorate([
|
|
|
26289
26415
|
__decorateParam(4, Inject(RangeProtectionRuleModel)),
|
|
26290
26416
|
__decorateParam(5, Inject(WorksheetProtectionRuleModel)),
|
|
26291
26417
|
__decorateParam(6, Inject(FormulaEditorController)),
|
|
26292
|
-
__decorateParam(7, IFormulaEditorManagerService)
|
|
26418
|
+
__decorateParam(7, IFormulaEditorManagerService),
|
|
26419
|
+
__decorateParam(8, IContextService)
|
|
26293
26420
|
], EditorDataSyncController);
|
|
26294
26421
|
|
|
26295
26422
|
//#endregion
|
|
@@ -30978,4 +31105,4 @@ UniverSheetsUIPlugin = __decorate([
|
|
|
30978
31105
|
], UniverSheetsUIPlugin);
|
|
30979
31106
|
|
|
30980
31107
|
//#endregion
|
|
30981
|
-
export { AddRangeProtectionFromContextMenuCommand, AddRangeProtectionFromSheetBarCommand, AddRangeProtectionFromToolbarCommand, ApplyFormatPainterCommand, AutoFillUIController, AutoHeightController, AutoWidthController, BaseSelectionRenderService, COPY_SPECIAL_MENU_ID, COPY_TYPE, CellAlertManagerService, CellAlertType, CellCustomRenderController, CellEditorManagerService, CellPopupManagerService, ChangeSheetProtectionFromSheetBarCommand, ChangeZoomRatioCommand, DeleteRangeMoveLeftConfirmCommand, DeleteRangeMoveUpConfirmCommand, DeleteRangeProtectionFromContextMenuCommand, DeleteWorksheetProtectionFormSheetBarCommand, DragManagerService, DragRenderController, EMBEDDING_FORMULA_EDITOR, EMBEDDING_FORMULA_EDITOR_COMPONENT_KEY, EditingRenderController, EditorBridgeService, ExpandSelectionCommand, FormatPainterStatus, FormulaEditorController, HEADER_UNHIDE_RANGE_VISIBLE_CHECK, HeaderFreezeRenderController, HeaderMoveRenderController, HeaderResizeRenderController, HeaderUnhideRangeAxis, HeaderUnhideRangeService, HeaderUnhideRenderController, HideColConfirmCommand, HideRowConfirmCommand, HoverManagerService, HoverRenderController, ICellEditorManagerService, IEditorBridgeService, IFormatPainterService, IFormulaEditorManagerService, IMarkSelectionService, IRepeatLastActionService, ISheetCellDropdownManagerService, ISheetClipboardService, ISheetSelectionRenderService, IStatusBarService, InsertRangeMoveDownConfirmCommand, InsertRangeMoveRightConfirmCommand, JumpOver, MarkSelectionService, MoveSelectionCommand, MoveSelectionEnterAndTabCommand, PASTE_SPECIAL_MENU_ID, PREDEFINED_HOOK_NAME, PREDEFINED_HOOK_NAME_COPY, PREDEFINED_HOOK_NAME_PASTE, RANGE_SELECTOR_COMPONENT_KEY, RANGE_SELECTOR_SYMBOLS, RemoveColConfirmCommand, RemoveRowConfirmCommand, RemoveSheetConfirmCommand, RenameSheetOperation, RepeatLastActionPermission, ResetRangeTextColorCommand, ResetScrollCommand, SELECTION_SHAPE_DEPTH, SHEET_UI_PLUGIN_NAME, SHEET_VIEW_KEY, ScrollCommand, ScrollToCellCommand, ScrollToRangeOperation, SelectAllCommand, SelectionControl, SelectionControl as SelectionShape, SelectionShapeExtension, SetActivateCellEditOperation, SetCellEditVisibleArrowOperation, SetCellEditVisibleOperation, SetCellEditVisibleWithF2Operation, SetColumnFrozenCommand, SetColumnHeaderHeightCommand, SetFirstColumnFrozenCommand, SetFirstRowFrozenCommand, SetFormatPainterOperation, SetInfiniteFormatPainterCommand, SetOnceFormatPainterCommand, SetRangeBoldCommand, SetRangeFontDecreaseCommand, SetRangeFontFamilyCommand, SetRangeFontIncreaseCommand, SetRangeFontSizeCommand, SetRangeItalicCommand, SetRangeProtectionFromContextMenuCommand, SetRangeStrickThroughCommand, SetRangeSubscriptCommand, SetRangeSuperscriptCommand, SetRangeTextColorCommand, SetRangeUnderlineCommand, SetRowFrozenCommand, SetRowHeaderWidthCommand, SetScrollOperation, SetScrollRelativeCommand, SetSelectionFrozenCommand, SetWorksheetColAutoWidthCommand, SetZoomRatioCommand, SetZoomRatioOperation, SheetCanvasPopManagerService, SheetCellDropdownManagerService, SheetCellEditorResizeService, SheetClipboardController, SheetClipboardService, SheetCopyCommand, SheetCutCommand, SheetMenuPosition, SheetPasteBesidesBorderCommand, SheetPasteColWidthCommand, SheetPasteCommand, SheetPasteFormatCommand, SheetPasteShortKeyCommand, SheetPasteValueCommand, SheetPermissionCheckUIController, SheetPermissionOpenDialogOperation, SheetPermissionOpenPanelOperation, SheetPermissionRenderManagerService, SheetPermissionUserManagerService, SheetPrintInterceptorService, SheetRenderController, SheetScrollManagerService, SheetSelectionRenderService, SheetSkeletonManagerService, SheetUIController, SheetsRenderService, SheetsScrollRenderController, menuSchema as SheetsUIMenuSchema, SheetsUIPart, ShowMenuListCommand, SidebarDefinedNameOperation, StatusBarController, StatusBarService, UNIVER_SHEET_PERMISSION_USER_PART, UniverSheetsMobileUIPlugin, UniverSheetsUIPlugin, ViewSheetPermissionFromContextMenuCommand, ViewSheetPermissionFromSheetBarCommand, calculateDocSkeletonRects, matchedSelectionByRowColIndex as checkInHeaderRanges, deriveStateFromActiveSheet$, functionDisplayNames, genNormalSelectionStyle, genSelectionByRange, selectionDataForSelectAll as getAllSelection, getCellRealRange, getCoordByCell, getCoordByOffset, getCurrentExclusiveRangeInterest$, getCurrentRangeDisable$, getCustomRangePosition, getEditingCustomRangePosition, getEditorObject, getMatrixPlainText, getObservableWithExclusiveRange$, getRepeatRange, getSheetObject, getTopLeftSelectionOfCurrSheet, getTransformCoord, getViewportByCell, isEmbeddingFormulaEditor, isRangeSelector, menuClipboardDisabledObservable, mergeSetRangeValues, useActiveWorkbook, useActiveWorksheet, useHighlightRange, useKeyEventConfig, useWorkbooks, virtualizeDiscreteRanges, whenFormulaEditorActivated, whenSheetEditorActivated, whenSheetEditorFocused };
|
|
31108
|
+
export { AddRangeProtectionFromContextMenuCommand, AddRangeProtectionFromSheetBarCommand, AddRangeProtectionFromToolbarCommand, ApplyFormatPainterCommand, AutoFillUIController, AutoHeightController, AutoWidthController, BaseSelectionRenderService, COPY_SPECIAL_MENU_ID, COPY_TYPE, CellAlertManagerService, CellAlertType, CellCustomRenderController, CellEditorManagerService, CellPopupManagerService, ChangeSheetProtectionFromSheetBarCommand, ChangeZoomRatioCommand, DeleteRangeMoveLeftConfirmCommand, DeleteRangeMoveUpConfirmCommand, DeleteRangeProtectionFromContextMenuCommand, DeleteWorksheetProtectionFormSheetBarCommand, DragManagerService, DragRenderController, EMBEDDING_FORMULA_EDITOR, EMBEDDING_FORMULA_EDITOR_COMPONENT_KEY, EditingRenderController, EditorBridgeService, ExpandSelectionCommand, FORMULA_CLIPBOARD_MIME_TYPE, FormatPainterStatus, FormulaEditorController, HEADER_UNHIDE_RANGE_VISIBLE_CHECK, HeaderFreezeRenderController, HeaderMoveRenderController, HeaderResizeRenderController, HeaderUnhideRangeAxis, HeaderUnhideRangeService, HeaderUnhideRenderController, HideColConfirmCommand, HideRowConfirmCommand, HoverManagerService, HoverRenderController, ICellEditorManagerService, IEditorBridgeService, IFormatPainterService, IFormulaEditorManagerService, IMarkSelectionService, IRepeatLastActionService, ISheetCellDropdownManagerService, ISheetClipboardService, ISheetSelectionRenderService, IStatusBarService, InsertRangeMoveDownConfirmCommand, InsertRangeMoveRightConfirmCommand, JumpOver, MarkSelectionService, MoveSelectionCommand, MoveSelectionEnterAndTabCommand, PASTE_SPECIAL_MENU_ID, PREDEFINED_HOOK_NAME, PREDEFINED_HOOK_NAME_COPY, PREDEFINED_HOOK_NAME_PASTE, RANGE_SELECTOR_COMPONENT_KEY, RANGE_SELECTOR_SYMBOLS, RemoveColConfirmCommand, RemoveRowConfirmCommand, RemoveSheetConfirmCommand, RenameSheetOperation, RepeatLastActionPermission, ResetRangeTextColorCommand, ResetScrollCommand, SELECTION_SHAPE_DEPTH, SHEET_UI_PLUGIN_NAME, SHEET_VIEW_KEY, ScrollCommand, ScrollToCellCommand, ScrollToRangeOperation, SelectAllCommand, SelectionControl, SelectionControl as SelectionShape, SelectionShapeExtension, SetActivateCellEditOperation, SetCellEditVisibleArrowOperation, SetCellEditVisibleOperation, SetCellEditVisibleWithF2Operation, SetColumnFrozenCommand, SetColumnHeaderHeightCommand, SetFirstColumnFrozenCommand, SetFirstRowFrozenCommand, SetFormatPainterOperation, SetInfiniteFormatPainterCommand, SetOnceFormatPainterCommand, SetRangeBoldCommand, SetRangeFontDecreaseCommand, SetRangeFontFamilyCommand, SetRangeFontIncreaseCommand, SetRangeFontSizeCommand, SetRangeItalicCommand, SetRangeProtectionFromContextMenuCommand, SetRangeStrickThroughCommand, SetRangeSubscriptCommand, SetRangeSuperscriptCommand, SetRangeTextColorCommand, SetRangeUnderlineCommand, SetRowFrozenCommand, SetRowHeaderWidthCommand, SetScrollOperation, SetScrollRelativeCommand, SetSelectionFrozenCommand, SetWorksheetColAutoWidthCommand, SetZoomRatioCommand, SetZoomRatioOperation, SheetCanvasPopManagerService, SheetCellDropdownManagerService, SheetCellEditorResizeService, SheetClipboardController, SheetClipboardService, SheetCopyCommand, SheetCutCommand, SheetMenuPosition, SheetPasteBesidesBorderCommand, SheetPasteColWidthCommand, SheetPasteCommand, SheetPasteFormatCommand, SheetPasteShortKeyCommand, SheetPasteValueCommand, SheetPermissionCheckUIController, SheetPermissionOpenDialogOperation, SheetPermissionOpenPanelOperation, SheetPermissionRenderManagerService, SheetPermissionUserManagerService, SheetPrintInterceptorService, SheetRenderController, SheetScrollManagerService, SheetSelectionRenderService, SheetSkeletonManagerService, SheetUIController, SheetsRenderService, SheetsScrollRenderController, menuSchema as SheetsUIMenuSchema, SheetsUIPart, ShowMenuListCommand, SidebarDefinedNameOperation, StatusBarController, StatusBarService, UNIVER_SHEET_PERMISSION_USER_PART, UniverSheetsMobileUIPlugin, UniverSheetsUIPlugin, ViewSheetPermissionFromContextMenuCommand, ViewSheetPermissionFromSheetBarCommand, calculateDocSkeletonRects, matchedSelectionByRowColIndex as checkInHeaderRanges, deriveStateFromActiveSheet$, functionDisplayNames, genNormalSelectionStyle, genSelectionByRange, selectionDataForSelectAll as getAllSelection, getCellRealRange, getCoordByCell, getCoordByOffset, getCurrentExclusiveRangeInterest$, getCurrentRangeDisable$, getCustomRangePosition, getEditingCustomRangePosition, getEditorObject, getMatrixPlainText, getObservableWithExclusiveRange$, getRepeatRange, getSheetObject, getTopLeftSelectionOfCurrSheet, getTransformCoord, getViewportByCell, isEmbeddingFormulaEditor, isRangeSelector, menuClipboardDisabledObservable, mergeSetRangeValues, useActiveWorkbook, useActiveWorksheet, useHighlightRange, useKeyEventConfig, useWorkbooks, virtualizeDiscreteRanges, whenFormulaEditorActivated, whenSheetEditorActivated, whenSheetEditorFocused };
|