@univerjs/sheets 1.4.0 → 1.5.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/README.md +21 -5
- package/lib/cjs/facade.js +223 -13
- package/lib/cjs/index.js +1 -1
- package/lib/cjs/{plugin-BbO0p0x9.js → plugin-BS0W2CXX.js} +159 -59
- package/lib/cjs/worker.js +1 -1
- package/lib/es/facade.js +233 -23
- package/lib/es/index.js +1 -1
- package/lib/es/{plugin-ipfwehrC.js → plugin-DSoshIDg.js} +163 -63
- package/lib/es/worker.js +1 -1
- package/lib/facade.js +233 -23
- package/lib/index.js +1 -1
- package/lib/{plugin-ipfwehrC.js → plugin-DSoshIDg.js} +163 -63
- package/lib/types/facade/f-range.d.ts +146 -1
- package/lib/types/facade/f-worksheet.d.ts +76 -2
- package/lib/types/services/permission/range-permission/range-protection.ref-range.d.ts +10 -1
- package/lib/types/services/ref-range/util.d.ts +16 -1
- package/lib/umd/facade.js +1 -1
- package/lib/umd/index.js +2 -2
- package/lib/worker.js +1 -1
- package/package.json +10 -10
|
@@ -214,7 +214,7 @@ let InterceptCellContentPriority = /* @__PURE__ */ function(InterceptCellContent
|
|
|
214
214
|
const RangeThemeInterceptorId = "sheet.interceptor.range-theme-id";
|
|
215
215
|
const IgnoreRangeThemeInterceptorKey = "sheet.interceptor.ignore-range-theme";
|
|
216
216
|
|
|
217
|
-
// \0@oxc-project+runtime@0.
|
|
217
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/typeof.js
|
|
218
218
|
function _typeof(o) {
|
|
219
219
|
"@babel/helpers - typeof";
|
|
220
220
|
return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
|
|
@@ -224,25 +224,25 @@ function _typeof(o) {
|
|
|
224
224
|
}, _typeof(o);
|
|
225
225
|
}
|
|
226
226
|
|
|
227
|
-
// \0@oxc-project+runtime@0.
|
|
228
|
-
function toPrimitive(t,
|
|
227
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/toPrimitive.js
|
|
228
|
+
function toPrimitive(t, e) {
|
|
229
229
|
if ("object" != _typeof(t) || !t) return t;
|
|
230
|
-
var
|
|
231
|
-
if (void 0 !==
|
|
232
|
-
var i =
|
|
230
|
+
var r;
|
|
231
|
+
if ("undefined" != typeof Symbol && void 0 !== (r = t[Symbol.toPrimitive])) {
|
|
232
|
+
var i = r.call(t, e || "default");
|
|
233
233
|
if ("object" != _typeof(i)) return i;
|
|
234
234
|
throw new TypeError("@@toPrimitive must return a primitive value.");
|
|
235
235
|
}
|
|
236
|
-
return ("string" ===
|
|
236
|
+
return ("string" === e ? String : Number)(t);
|
|
237
237
|
}
|
|
238
238
|
|
|
239
|
-
// \0@oxc-project+runtime@0.
|
|
239
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/toPropertyKey.js
|
|
240
240
|
function toPropertyKey(t) {
|
|
241
241
|
var i = toPrimitive(t, "string");
|
|
242
242
|
return "symbol" == _typeof(i) ? i : i + "";
|
|
243
243
|
}
|
|
244
244
|
|
|
245
|
-
// \0@oxc-project+runtime@0.
|
|
245
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/defineProperty.js
|
|
246
246
|
function _defineProperty(e, r, t) {
|
|
247
247
|
return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
|
|
248
248
|
value: t,
|
|
@@ -252,14 +252,14 @@ function _defineProperty(e, r, t) {
|
|
|
252
252
|
}) : e[r] = t, e;
|
|
253
253
|
}
|
|
254
254
|
|
|
255
|
-
// \0@oxc-project+runtime@0.
|
|
255
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/decorateParam.js
|
|
256
256
|
function __decorateParam(paramIndex, decorator) {
|
|
257
257
|
return function(target, key) {
|
|
258
258
|
decorator(target, key, paramIndex);
|
|
259
259
|
};
|
|
260
260
|
}
|
|
261
261
|
|
|
262
|
-
// \0@oxc-project+runtime@0.
|
|
262
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/decorate.js
|
|
263
263
|
function __decorate(decorators, target, key, desc) {
|
|
264
264
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
265
265
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -3769,6 +3769,7 @@ let SheetSkeletonService = class SheetSkeletonService extends _univerjs_core.Dis
|
|
|
3769
3769
|
const unitId = workbook.getUnitId();
|
|
3770
3770
|
this._initSheetsSkeleton(workbook);
|
|
3771
3771
|
this.disposeWithMe(workbook.sheetCreated$.subscribe((worksheet) => {
|
|
3772
|
+
if (worksheet.getConfig().type === _univerjs_core.SheetTypes.CHART) return;
|
|
3772
3773
|
const sheetSkeletonMap = this._sheetSkeletonParamStore.get(unitId);
|
|
3773
3774
|
if (!sheetSkeletonMap) return;
|
|
3774
3775
|
const sheetId = worksheet.getSheetId();
|
|
@@ -3793,6 +3794,7 @@ let SheetSkeletonService = class SheetSkeletonService extends _univerjs_core.Dis
|
|
|
3793
3794
|
const unitId = workbook.getUnitId();
|
|
3794
3795
|
const sheetSkeletonMap = /* @__PURE__ */ new Map();
|
|
3795
3796
|
workbook.getWorksheets().forEach((worksheet) => {
|
|
3797
|
+
if (worksheet.getConfig().type === _univerjs_core.SheetTypes.CHART) return;
|
|
3796
3798
|
const sheetId = worksheet.getSheetId();
|
|
3797
3799
|
const skeleton = this._buildSkeleton(worksheet, workbook.getStyles());
|
|
3798
3800
|
sheetSkeletonMap.set(sheetId, {
|
|
@@ -3805,6 +3807,7 @@ let SheetSkeletonService = class SheetSkeletonService extends _univerjs_core.Dis
|
|
|
3805
3807
|
this._sheetSkeletonParamStore.set(unitId, sheetSkeletonMap);
|
|
3806
3808
|
}
|
|
3807
3809
|
_buildSkeleton(worksheet, styles) {
|
|
3810
|
+
if (worksheet.getConfig().type === _univerjs_core.SheetTypes.CHART) throw new Error("Cannot create a SpreadsheetSkeleton for SheetTypes.CHART");
|
|
3808
3811
|
const spreadsheetSkeleton = this._injector.createInstance(_univerjs_engine_render.SpreadsheetSkeleton, worksheet, styles);
|
|
3809
3812
|
const unitId = worksheet.getUnitId();
|
|
3810
3813
|
const scene = this._sceneMap.get(unitId);
|
|
@@ -3857,7 +3860,7 @@ let SheetSkeletonService = class SheetSkeletonService extends _univerjs_core.Dis
|
|
|
3857
3860
|
const workbook = this._univerInstanceService.getUnit(unitId);
|
|
3858
3861
|
if (!workbook) return;
|
|
3859
3862
|
const worksheet = workbook.getSheetBySheetId(subUnitId);
|
|
3860
|
-
if (!worksheet) return;
|
|
3863
|
+
if (!worksheet || worksheet.getConfig().type === _univerjs_core.SheetTypes.CHART) return;
|
|
3861
3864
|
return this.newSkeleton(unitId, subUnitId, worksheet, workbook.getStyles());
|
|
3862
3865
|
}
|
|
3863
3866
|
};
|
|
@@ -6900,55 +6903,46 @@ const handleRemoveRowCommon = (param, targetRange) => {
|
|
|
6900
6903
|
endRow: targetEndRow
|
|
6901
6904
|
}];
|
|
6902
6905
|
};
|
|
6906
|
+
/**
|
|
6907
|
+
* A ref range follows the data it covers, whichever command entry produced the insertion:
|
|
6908
|
+
* inserting above the range shifts it down, inserting inside the range expands it, and
|
|
6909
|
+
* inserting below the range leaves it untouched.
|
|
6910
|
+
*
|
|
6911
|
+
* `direction` only decides which row the inserted cells inherit styles and height from, so it
|
|
6912
|
+
* is deliberately ignored here: two entry points that insert a row at the same position must
|
|
6913
|
+
* return the same range. This matches `handleBaseInsertRange`, which serves the mutation based
|
|
6914
|
+
* ref-range paths, and the collaboration transform algorithms, which cannot supply a direction
|
|
6915
|
+
* at all.
|
|
6916
|
+
*/
|
|
6903
6917
|
const handleInsertRowCommon = (info, targetRange) => {
|
|
6904
6918
|
const param = info.params;
|
|
6905
6919
|
const insertRow = param.range.startRow;
|
|
6906
6920
|
const insertCount = param.range.endRow - param.range.startRow + 1;
|
|
6907
|
-
|
|
6908
|
-
|
|
6909
|
-
|
|
6910
|
-
|
|
6911
|
-
endRow: targetRange.endRow + insertCount
|
|
6912
|
-
}];
|
|
6913
|
-
else if (insertRow <= targetRange.endRow) return [{
|
|
6914
|
-
...targetRange,
|
|
6915
|
-
endRow: targetRange.endRow + insertCount
|
|
6916
|
-
}];
|
|
6917
|
-
} else if (insertRow <= targetRange.startRow) return [{
|
|
6918
|
-
...targetRange,
|
|
6919
|
-
startRow: targetRange.startRow + insertCount,
|
|
6920
|
-
endRow: targetRange.endRow + insertCount
|
|
6921
|
-
}];
|
|
6922
|
-
else if (insertRow <= targetRange.endRow + 1) return [{
|
|
6921
|
+
const startOffset = insertRow <= targetRange.startRow ? insertCount : 0;
|
|
6922
|
+
const endOffset = insertRow <= targetRange.endRow ? insertCount : 0;
|
|
6923
|
+
if (!startOffset && !endOffset) return [targetRange];
|
|
6924
|
+
return [{
|
|
6923
6925
|
...targetRange,
|
|
6924
|
-
|
|
6926
|
+
startRow: targetRange.startRow + startOffset,
|
|
6927
|
+
endRow: targetRange.endRow + endOffset
|
|
6925
6928
|
}];
|
|
6926
|
-
return [targetRange];
|
|
6927
6929
|
};
|
|
6930
|
+
/**
|
|
6931
|
+
* Column counterpart of {@link handleInsertRowCommon}: a ref range follows the data it covers,
|
|
6932
|
+
* so `direction` is deliberately ignored here as well.
|
|
6933
|
+
*/
|
|
6928
6934
|
const handleInsertColCommon = (info, targetRange) => {
|
|
6929
6935
|
const param = info.params;
|
|
6930
6936
|
const insertColumn = param.range.startColumn;
|
|
6931
6937
|
const insertCount = param.range.endColumn - param.range.startColumn + 1;
|
|
6932
|
-
|
|
6933
|
-
|
|
6934
|
-
|
|
6935
|
-
|
|
6936
|
-
endColumn: targetRange.endColumn + insertCount
|
|
6937
|
-
}];
|
|
6938
|
-
else if (insertColumn <= targetRange.endColumn) return [{
|
|
6939
|
-
...targetRange,
|
|
6940
|
-
endColumn: targetRange.endColumn + insertCount
|
|
6941
|
-
}];
|
|
6942
|
-
} else if (insertColumn <= targetRange.startColumn) return [{
|
|
6943
|
-
...targetRange,
|
|
6944
|
-
startColumn: targetRange.startColumn + insertCount,
|
|
6945
|
-
endColumn: targetRange.endColumn + insertCount
|
|
6946
|
-
}];
|
|
6947
|
-
else if (insertColumn <= targetRange.endColumn + 1) return [{
|
|
6938
|
+
const startOffset = insertColumn <= targetRange.startColumn ? insertCount : 0;
|
|
6939
|
+
const endOffset = insertColumn <= targetRange.endColumn ? insertCount : 0;
|
|
6940
|
+
if (!startOffset && !endOffset) return [targetRange];
|
|
6941
|
+
return [{
|
|
6948
6942
|
...targetRange,
|
|
6949
|
-
|
|
6943
|
+
startColumn: targetRange.startColumn + startOffset,
|
|
6944
|
+
endColumn: targetRange.endColumn + endOffset
|
|
6950
6945
|
}];
|
|
6951
|
-
return [targetRange];
|
|
6952
6946
|
};
|
|
6953
6947
|
const runRefRangeMutations = (operators, range) => {
|
|
6954
6948
|
let result = { ...range };
|
|
@@ -7020,7 +7014,77 @@ const handleDefaultRangeChangeWithEffectRefCommandsSkipNoInterests = (range, com
|
|
|
7020
7014
|
if (getEffectedRangesOnCommand(commandInfo, deps).some((effectRange) => _univerjs_core.Rectangle.intersects(effectRange, range))) return handleDefaultRangeChangeWithEffectRefCommands(range, commandInfo);
|
|
7021
7015
|
return range;
|
|
7022
7016
|
};
|
|
7017
|
+
const ROW_AXIS_COMMANDS = [
|
|
7018
|
+
EffectRefRangId.InsertRowCommandId,
|
|
7019
|
+
EffectRefRangId.RemoveRowCommandId,
|
|
7020
|
+
EffectRefRangId.MoveRowsCommandId,
|
|
7021
|
+
EffectRefRangId.InsertRangeMoveDownCommandId,
|
|
7022
|
+
EffectRefRangId.DeleteRangeMoveUpCommandId
|
|
7023
|
+
];
|
|
7024
|
+
const COLUMN_AXIS_COMMANDS = [
|
|
7025
|
+
EffectRefRangId.InsertColCommandId,
|
|
7026
|
+
EffectRefRangId.RemoveColCommandId,
|
|
7027
|
+
EffectRefRangId.MoveColsCommandId,
|
|
7028
|
+
EffectRefRangId.InsertRangeMoveRightCommandId,
|
|
7029
|
+
EffectRefRangId.DeleteRangeMoveLeftCommandId
|
|
7030
|
+
];
|
|
7031
|
+
/**
|
|
7032
|
+
* A whole column/row/sheet range always covers the whole axis, so it does not follow concrete
|
|
7033
|
+
* coordinates on that axis: structural edits there keep the range anchored at 0 and only move its
|
|
7034
|
+
* end. Edits on the opposite axis still go through the regular coordinate based rules.
|
|
7035
|
+
*
|
|
7036
|
+
* @returns the adjusted ranges, or `undefined` when the regular logic should handle the command
|
|
7037
|
+
*/
|
|
7038
|
+
function handleWholeRangeCommand(targetRange, commandInfo) {
|
|
7039
|
+
const coversAllRows = targetRange.rangeType === _univerjs_core.RANGE_TYPE.COLUMN || targetRange.rangeType === _univerjs_core.RANGE_TYPE.ALL;
|
|
7040
|
+
const coversAllColumns = targetRange.rangeType === _univerjs_core.RANGE_TYPE.ROW || targetRange.rangeType === _univerjs_core.RANGE_TYPE.ALL;
|
|
7041
|
+
if (!coversAllRows && !coversAllColumns) return;
|
|
7042
|
+
if (coversAllRows && !Number.isFinite(targetRange.endRow) || coversAllColumns && !Number.isFinite(targetRange.endColumn)) return;
|
|
7043
|
+
if (ROW_AXIS_COMMANDS.includes(commandInfo.id)) return coversAllRows ? [adjustWholeRange(targetRange, true, commandInfo)] : void 0;
|
|
7044
|
+
if (COLUMN_AXIS_COMMANDS.includes(commandInfo.id)) return coversAllColumns ? [adjustWholeRange(targetRange, false, commandInfo)] : void 0;
|
|
7045
|
+
if (commandInfo.id === EffectRefRangId.MoveRangeCommandId || commandInfo.id === EffectRefRangId.ReorderRangeCommandId) return [targetRange];
|
|
7046
|
+
}
|
|
7047
|
+
function adjustWholeRange(targetRange, isRow, commandInfo) {
|
|
7048
|
+
const currentEnd = isRow ? targetRange.endRow : targetRange.endColumn;
|
|
7049
|
+
switch (commandInfo.id) {
|
|
7050
|
+
case EffectRefRangId.InsertRowCommandId:
|
|
7051
|
+
case EffectRefRangId.InsertColCommandId: {
|
|
7052
|
+
const params = commandInfo.params;
|
|
7053
|
+
const count = isRow ? params.range.endRow - params.range.startRow + 1 : params.range.endColumn - params.range.startColumn + 1;
|
|
7054
|
+
return isRow ? {
|
|
7055
|
+
...targetRange,
|
|
7056
|
+
startRow: 0,
|
|
7057
|
+
endRow: currentEnd + count
|
|
7058
|
+
} : {
|
|
7059
|
+
...targetRange,
|
|
7060
|
+
startColumn: 0,
|
|
7061
|
+
endColumn: currentEnd + count
|
|
7062
|
+
};
|
|
7063
|
+
}
|
|
7064
|
+
case EffectRefRangId.RemoveRowCommandId:
|
|
7065
|
+
case EffectRefRangId.RemoveColCommandId: {
|
|
7066
|
+
const params = commandInfo.params;
|
|
7067
|
+
const intervals = (params.ranges ?? (params.range ? [params.range] : [])).map((range) => isRow ? [range.startRow, range.endRow] : [range.startColumn, range.endColumn]);
|
|
7068
|
+
const removedCount = (0, _univerjs_core.mergeIntervals)(intervals).reduce((total, [start, end]) => {
|
|
7069
|
+
const overlap = Math.min(end, currentEnd) - Math.max(start, 0) + 1;
|
|
7070
|
+
return total + Math.max(0, overlap);
|
|
7071
|
+
}, 0);
|
|
7072
|
+
return isRow ? {
|
|
7073
|
+
...targetRange,
|
|
7074
|
+
startRow: 0,
|
|
7075
|
+
endRow: Math.max(0, currentEnd - removedCount)
|
|
7076
|
+
} : {
|
|
7077
|
+
...targetRange,
|
|
7078
|
+
startColumn: 0,
|
|
7079
|
+
endColumn: Math.max(0, currentEnd - removedCount)
|
|
7080
|
+
};
|
|
7081
|
+
}
|
|
7082
|
+
default: return targetRange;
|
|
7083
|
+
}
|
|
7084
|
+
}
|
|
7023
7085
|
const handleCommonDefaultRangeChangeWithEffectRefCommands = (range, commandInfo) => {
|
|
7086
|
+
const wholeRangeResult = handleWholeRangeCommand(range, commandInfo);
|
|
7087
|
+
if (wholeRangeResult) return wholeRangeResult;
|
|
7024
7088
|
let operator = [];
|
|
7025
7089
|
switch (commandInfo.id) {
|
|
7026
7090
|
case EffectRefRangId.DeleteRangeMoveLeftCommandId: return handleDeleteRangeMoveLeftCommon(commandInfo, range);
|
|
@@ -18612,7 +18676,7 @@ RangeProtectionCache = __decorate([
|
|
|
18612
18676
|
|
|
18613
18677
|
// package.json
|
|
18614
18678
|
var name = "@univerjs/sheets";
|
|
18615
|
-
var version = "1.
|
|
18679
|
+
var version = "1.5.1";
|
|
18616
18680
|
|
|
18617
18681
|
// src/controllers/active-worksheet.controller.ts
|
|
18618
18682
|
let ActiveWorksheetController = class ActiveWorksheetController extends _univerjs_core.Disposable {
|
|
@@ -19257,7 +19321,7 @@ let RangeProtectionRefRangeService = class RangeProtectionRefRangeService extend
|
|
|
19257
19321
|
_getRefRangeMutationsByDeleteCols(params, unitId, subUnitId) {
|
|
19258
19322
|
const permissionRangeLapRules = this._selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).filter((rule) => {
|
|
19259
19323
|
return rule.ranges.some((range) => {
|
|
19260
|
-
return _univerjs_core.Rectangle.intersects(range, params.range);
|
|
19324
|
+
return !this._coversAllColumns(range) && _univerjs_core.Rectangle.intersects(range, params.range);
|
|
19261
19325
|
});
|
|
19262
19326
|
});
|
|
19263
19327
|
const removeRange = params.range;
|
|
@@ -19267,6 +19331,10 @@ let RangeProtectionRefRangeService = class RangeProtectionRefRangeService extend
|
|
|
19267
19331
|
permissionRangeLapRules.forEach((rule) => {
|
|
19268
19332
|
const cloneRule = _univerjs_core.Tools.deepClone(rule);
|
|
19269
19333
|
cloneRule.ranges = cloneRule.ranges.reduce((p, c) => {
|
|
19334
|
+
if (this._coversAllColumns(c)) {
|
|
19335
|
+
p.push(c);
|
|
19336
|
+
return p;
|
|
19337
|
+
}
|
|
19270
19338
|
if (_univerjs_core.Rectangle.intersects(c, removeRange)) {
|
|
19271
19339
|
const cloneRange = _univerjs_core.Tools.deepClone(c);
|
|
19272
19340
|
const { startColumn, endColumn } = removeRange;
|
|
@@ -19332,7 +19400,7 @@ let RangeProtectionRefRangeService = class RangeProtectionRefRangeService extend
|
|
|
19332
19400
|
_getRefRangeMutationsByDeleteRows(params, unitId, subUnitId) {
|
|
19333
19401
|
const permissionRangeLapRules = this._selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).filter((rule) => {
|
|
19334
19402
|
return rule.ranges.some((range) => {
|
|
19335
|
-
return _univerjs_core.Rectangle.intersects(range, params.range);
|
|
19403
|
+
return !this._coversAllRows(range) && _univerjs_core.Rectangle.intersects(range, params.range);
|
|
19336
19404
|
});
|
|
19337
19405
|
});
|
|
19338
19406
|
const removeRange = params.range;
|
|
@@ -19342,6 +19410,10 @@ let RangeProtectionRefRangeService = class RangeProtectionRefRangeService extend
|
|
|
19342
19410
|
permissionRangeLapRules.forEach((rule) => {
|
|
19343
19411
|
const cloneRule = _univerjs_core.Tools.deepClone(rule);
|
|
19344
19412
|
cloneRule.ranges = cloneRule.ranges.reduce((p, c) => {
|
|
19413
|
+
if (this._coversAllRows(c)) {
|
|
19414
|
+
p.push(c);
|
|
19415
|
+
return p;
|
|
19416
|
+
}
|
|
19345
19417
|
if (_univerjs_core.Rectangle.intersects(c, removeRange)) {
|
|
19346
19418
|
const cloneRange = _univerjs_core.Tools.deepClone(c);
|
|
19347
19419
|
const { startRow, endRow } = removeRange;
|
|
@@ -19389,7 +19461,7 @@ let RangeProtectionRefRangeService = class RangeProtectionRefRangeService extend
|
|
|
19389
19461
|
const insertLength = params.range.endColumn - params.range.startColumn + 1;
|
|
19390
19462
|
const permissionRangeLapRules = this._selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).filter((rule) => {
|
|
19391
19463
|
return rule.ranges.some((range) => {
|
|
19392
|
-
return insertStart > range.startColumn && insertStart <= range.endColumn;
|
|
19464
|
+
return !this._coversAllColumns(range) && insertStart > range.startColumn && insertStart <= range.endColumn;
|
|
19393
19465
|
});
|
|
19394
19466
|
});
|
|
19395
19467
|
if (permissionRangeLapRules.length) {
|
|
@@ -19399,7 +19471,7 @@ let RangeProtectionRefRangeService = class RangeProtectionRefRangeService extend
|
|
|
19399
19471
|
const cloneRule = _univerjs_core.Tools.deepClone(rule);
|
|
19400
19472
|
let hasLap = false;
|
|
19401
19473
|
cloneRule.ranges.forEach((range) => {
|
|
19402
|
-
if (insertStart > range.startColumn && insertStart <= range.endColumn) {
|
|
19474
|
+
if (!this._coversAllColumns(range) && insertStart > range.startColumn && insertStart <= range.endColumn) {
|
|
19403
19475
|
range.endColumn += insertLength;
|
|
19404
19476
|
hasLap = true;
|
|
19405
19477
|
}
|
|
@@ -19440,7 +19512,7 @@ let RangeProtectionRefRangeService = class RangeProtectionRefRangeService extend
|
|
|
19440
19512
|
const insertLength = params.range.endRow - params.range.startRow + 1;
|
|
19441
19513
|
const permissionRangeLapRules = this._selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).filter((rule) => {
|
|
19442
19514
|
return rule.ranges.some((range) => {
|
|
19443
|
-
return insertStart > range.startRow && insertStart <= range.endRow;
|
|
19515
|
+
return !this._coversAllRows(range) && insertStart > range.startRow && insertStart <= range.endRow;
|
|
19444
19516
|
});
|
|
19445
19517
|
});
|
|
19446
19518
|
if (permissionRangeLapRules.length) {
|
|
@@ -19450,7 +19522,7 @@ let RangeProtectionRefRangeService = class RangeProtectionRefRangeService extend
|
|
|
19450
19522
|
const cloneRule = _univerjs_core.Tools.deepClone(rule);
|
|
19451
19523
|
let hasLap = false;
|
|
19452
19524
|
cloneRule.ranges.forEach((range) => {
|
|
19453
|
-
if (insertStart > range.startRow && insertStart <= range.endRow) {
|
|
19525
|
+
if (!this._coversAllRows(range) && insertStart > range.startRow && insertStart <= range.endRow) {
|
|
19454
19526
|
range.endRow += insertLength;
|
|
19455
19527
|
hasLap = true;
|
|
19456
19528
|
}
|
|
@@ -19492,7 +19564,7 @@ let RangeProtectionRefRangeService = class RangeProtectionRefRangeService extend
|
|
|
19492
19564
|
const moveLength = toRange.endRow - toRange.startRow + 1;
|
|
19493
19565
|
const permissionRangeLapRules = this._selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).filter((rule) => {
|
|
19494
19566
|
return rule.ranges.some((range) => {
|
|
19495
|
-
return moveToStartRow > range.startRow && moveToStartRow <= range.endRow;
|
|
19567
|
+
return !this._coversAllRows(range) && moveToStartRow > range.startRow && moveToStartRow <= range.endRow;
|
|
19496
19568
|
});
|
|
19497
19569
|
});
|
|
19498
19570
|
if (permissionRangeLapRules.length) {
|
|
@@ -19503,7 +19575,7 @@ let RangeProtectionRefRangeService = class RangeProtectionRefRangeService extend
|
|
|
19503
19575
|
const moveFromStartRow = params.fromRange.startRow;
|
|
19504
19576
|
let hasLap = false;
|
|
19505
19577
|
cloneRule.ranges.forEach((range) => {
|
|
19506
|
-
if (moveToStartRow > range.startRow && moveToStartRow <= range.endRow) {
|
|
19578
|
+
if (!this._coversAllRows(range) && moveToStartRow > range.startRow && moveToStartRow <= range.endRow) {
|
|
19507
19579
|
if (moveFromStartRow < range.startRow) {
|
|
19508
19580
|
range.startRow = range.startRow - moveLength;
|
|
19509
19581
|
range.endRow = range.endRow - moveLength;
|
|
@@ -19549,7 +19621,7 @@ let RangeProtectionRefRangeService = class RangeProtectionRefRangeService extend
|
|
|
19549
19621
|
const moveLength = toRange.endColumn - toRange.startColumn + 1;
|
|
19550
19622
|
const permissionRangeLapRules = this._selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).filter((rule) => {
|
|
19551
19623
|
return rule.ranges.some((range) => {
|
|
19552
|
-
return moveToStartCol > range.startColumn && moveToStartCol <= range.endColumn;
|
|
19624
|
+
return !this._coversAllColumns(range) && moveToStartCol > range.startColumn && moveToStartCol <= range.endColumn;
|
|
19553
19625
|
});
|
|
19554
19626
|
});
|
|
19555
19627
|
if (permissionRangeLapRules.length) {
|
|
@@ -19560,7 +19632,7 @@ let RangeProtectionRefRangeService = class RangeProtectionRefRangeService extend
|
|
|
19560
19632
|
const moveFromStartCol = params.fromRange.startColumn;
|
|
19561
19633
|
let hasLap = false;
|
|
19562
19634
|
cloneRule.ranges.forEach((range) => {
|
|
19563
|
-
if (moveToStartCol > range.startColumn && moveToStartCol <= range.endColumn) {
|
|
19635
|
+
if (!this._coversAllColumns(range) && moveToStartCol > range.startColumn && moveToStartCol <= range.endColumn) {
|
|
19564
19636
|
if (moveFromStartCol < range.startColumn) {
|
|
19565
19637
|
range.startColumn = range.startColumn - moveLength;
|
|
19566
19638
|
range.endColumn = range.endColumn - moveLength;
|
|
@@ -19615,6 +19687,7 @@ let RangeProtectionRefRangeService = class RangeProtectionRefRangeService extend
|
|
|
19615
19687
|
const targetStart = isRowMove ? targetRange.startRow : targetRange.startColumn;
|
|
19616
19688
|
this._selectionProtectionRuleModel.getSubunitRuleList(workbook.getUnitId(), worksheet.getSheetId()).forEach((rule) => {
|
|
19617
19689
|
rule.ranges.forEach((range) => {
|
|
19690
|
+
if (isRowMove && this._coversAllRows(range) || !isRowMove && this._coversAllColumns(range)) return;
|
|
19618
19691
|
let { startRow, endRow, startColumn, endColumn } = range;
|
|
19619
19692
|
if (!_univerjs_core.Rectangle.intersects(range, sourceRange)) {
|
|
19620
19693
|
if (isRowMove) {
|
|
@@ -19673,6 +19746,7 @@ let RangeProtectionRefRangeService = class RangeProtectionRefRangeService extend
|
|
|
19673
19746
|
const operationCount = operationEnd - operationStart + 1;
|
|
19674
19747
|
this._selectionProtectionRuleModel.getSubunitRuleList(workbook.getUnitId(), worksheet.getSheetId()).forEach((rule) => {
|
|
19675
19748
|
rule.ranges.forEach((range) => {
|
|
19749
|
+
if (this._adjustWholeRangeForStructuralChange(range, isRowOperation, isAddOperation, operationStart, operationEnd, operationCount)) return;
|
|
19676
19750
|
let { startRow, endRow, startColumn, endColumn } = range;
|
|
19677
19751
|
if (isAddOperation) {
|
|
19678
19752
|
if (isRowOperation) {
|
|
@@ -19723,6 +19797,32 @@ let RangeProtectionRefRangeService = class RangeProtectionRefRangeService extend
|
|
|
19723
19797
|
_checkIsRightRange(range) {
|
|
19724
19798
|
return range.startRow <= range.endRow && range.startColumn <= range.endColumn;
|
|
19725
19799
|
}
|
|
19800
|
+
_coversAllRows(range) {
|
|
19801
|
+
return range.rangeType === _univerjs_core.RANGE_TYPE.COLUMN || range.rangeType === _univerjs_core.RANGE_TYPE.ALL;
|
|
19802
|
+
}
|
|
19803
|
+
_coversAllColumns(range) {
|
|
19804
|
+
return range.rangeType === _univerjs_core.RANGE_TYPE.ROW || range.rangeType === _univerjs_core.RANGE_TYPE.ALL;
|
|
19805
|
+
}
|
|
19806
|
+
/**
|
|
19807
|
+
* A whole column/row/sheet protection range always covers that axis, so inserting or removing
|
|
19808
|
+
* rows/columns there only moves its end instead of shifting it.
|
|
19809
|
+
*
|
|
19810
|
+
* @returns `true` when the range was adjusted as a whole range
|
|
19811
|
+
*/
|
|
19812
|
+
_adjustWholeRangeForStructuralChange(range, isRowOperation, isAddOperation, operationStart, operationEnd, operationCount) {
|
|
19813
|
+
if (!(isRowOperation ? this._coversAllRows(range) : this._coversAllColumns(range))) return false;
|
|
19814
|
+
const startKey = isRowOperation ? "startRow" : "startColumn";
|
|
19815
|
+
const endKey = isRowOperation ? "endRow" : "endColumn";
|
|
19816
|
+
if (isAddOperation) {
|
|
19817
|
+
range[startKey] = 0;
|
|
19818
|
+
range[endKey] += operationCount;
|
|
19819
|
+
return true;
|
|
19820
|
+
}
|
|
19821
|
+
const removed = Math.min(operationEnd, range[endKey]) - Math.max(operationStart, 0) + 1;
|
|
19822
|
+
range[startKey] = 0;
|
|
19823
|
+
range[endKey] = Math.max(0, range[endKey] - Math.max(0, removed));
|
|
19824
|
+
return true;
|
|
19825
|
+
}
|
|
19726
19826
|
_initReBuildCache() {
|
|
19727
19827
|
this.disposeWithMe(this._commandService.onCommandExecuted((command) => {
|
|
19728
19828
|
if (mutationIdByRowCol.includes(command.id) || mutationIdArrByMove.includes(command.id)) {
|
package/lib/cjs/worker.js
CHANGED