@univerjs/sheets-ui 0.22.1 → 0.23.0

package/lib/cjs/index.js

@@ -14778,26 +14778,26 @@ let SheetRenderController = class SheetRenderController extends _univerjs_core.R
 	}
 	_initRenderMetricSubscriber() {
 		const { engine } = this._context;
-		engine.beginFrame$.subscribe(() => {
+		this.disposeWithMe(engine.beginFrame$.subscribe(() => {
 			this._renderFrameTimeMetric = null;
 			this._renderFrameTags = {};
-		});
-		engine.endFrame$.subscribe(() => {
+		}));
+		this.disposeWithMe(engine.endFrame$.subscribe(() => {
 			if (this._renderFrameTimeMetric && Object.keys(this._renderFrameTimeMetric).filter((key) => key.startsWith(_univerjs_engine_render.SHEET_EXTENSION_PREFIX)).length > 0) this._afterRenderMetric$.next({
 				frameTimeMetric: this._renderFrameTimeMetric,
 				tags: this._renderFrameTags
 			});
-		});
-		engine.renderFrameTimeMetric$.subscribe(([key, value]) => {
+		}));
+		this.disposeWithMe(engine.renderFrameTimeMetric$.subscribe(([key, value]) => {
 			if (!this._renderFrameTimeMetric) this._renderFrameTimeMetric = {};
 			if (!this._renderFrameTimeMetric[key]) this._renderFrameTimeMetric[key] = [];
 			this._renderFrameTimeMetric[key].push(Math.round(value * 100) / 100);
-		});
-		engine.renderFrameTags$.subscribe(([key, value]) => {
+		}));
+		this.disposeWithMe(engine.renderFrameTags$.subscribe(([key, value]) => {
 			this._renderFrameTags[key] = value;
-		});
+		}));
 		const frameInfoList = [];
-		this._afterRenderMetric$.pipe((0, rxjs.withLatestFrom)(engine.endFrame$)).subscribe(([sceneRenderDetail, basicFrameTimeInfo]) => {
+		this.disposeWithMe(this._afterRenderMetric$.pipe((0, rxjs.withLatestFrom)(engine.endFrame$)).subscribe(([sceneRenderDetail, basicFrameTimeInfo]) => {
 			frameInfoList.push({
 				FPS: basicFrameTimeInfo.FPS,
 				elapsedTime: basicFrameTimeInfo.elapsedTime,
@@ -14809,7 +14809,7 @@ let SheetRenderController = class SheetRenderController extends _univerjs_core.R
 				this._captureRenderMetric(frameInfoList);
 				frameInfoList.length = 0;
 			}
-		});
+		}));
 	}
 	/**
 	* Send render metric to telemetry service
@@ -23990,7 +23990,7 @@ const useHighlightRange = (ranges = []) => {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-ui";
-var version = "0.22.1";
+var version = "0.23.0";
 
 //#endregion
 //#region src/services/cell-alert-manager.service.ts
@@ -26784,28 +26784,30 @@ var RangeProtectionRenderExtension = class extends _univerjs_engine_render.Sheet
 	getShadowStrategy() {
 		return this._shadowStrategy;
 	}
-	draw(ctx, _parentScale, spreadsheetSkeleton) {
+	draw(ctx, _parentScale, spreadsheetSkeleton, diffRanges) {
 		const { worksheet } = spreadsheetSkeleton;
 		if (!worksheet) return;
 		ctx.save();
 		if (!this._pattern) this._pattern = ctx.createPattern(this._img, "repeat");
 		this.renderCache.clear();
-		_univerjs_core.Range.foreach(spreadsheetSkeleton.rowColumnSegment, (row, col) => {
-			if (!worksheet.getRowVisible(row) || !worksheet.getColVisible(col)) return;
-			const { selectionProtection = [] } = worksheet.getCell(row, col) || {};
-			if (!this._pattern) return;
-			ctx.fillStyle = this._pattern;
-			selectionProtection.forEach((config) => {
-				if (!config.ruleId) return;
-				if (this.shouldRender(config)) {
-					if (this.renderCache.has(config.ruleId)) return;
-					this.renderCache.add(config.ruleId);
-					config.ranges.forEach((range) => {
-						const start = spreadsheetSkeleton.getCellWithCoordByIndex(range.startRow, range.startColumn, false);
-						const end = spreadsheetSkeleton.getCellWithCoordByIndex(range.endRow, range.endColumn, false);
-						ctx.fillRect(start.startX, start.startY, end.endX - start.startX, end.endY - start.startY);
-					});
-				}
+		((diffRanges === null || diffRanges === void 0 ? void 0 : diffRanges.length) ? diffRanges : [spreadsheetSkeleton.rowColumnSegment]).forEach((range) => {
+			_univerjs_core.Range.foreach(range, (row, col) => {
+				if (!worksheet.getRowVisible(row) || !worksheet.getColVisible(col)) return;
+				const { selectionProtection = [] } = worksheet.getCell(row, col) || {};
+				if (!this._pattern) return;
+				ctx.fillStyle = this._pattern;
+				selectionProtection.forEach((config) => {
+					if (!config.ruleId) return;
+					if (this.shouldRender(config)) {
+						if (this.renderCache.has(config.ruleId)) return;
+						this.renderCache.add(config.ruleId);
+						config.ranges.forEach((range) => {
+							const start = spreadsheetSkeleton.getCellWithCoordByIndex(range.startRow, range.startColumn, false);
+							const end = spreadsheetSkeleton.getCellWithCoordByIndex(range.endRow, range.endColumn, false);
+							ctx.fillRect(start.startX, start.startY, end.endX - start.startX, end.endY - start.startY);
+						});
+					}
+				});
 			});
 		});
 		ctx.restore();
@@ -28876,9 +28878,9 @@ let SheetSkeletonRenderController = class SheetSkeletonRenderController extends
 		this._context = _context;
 		this._sheetSkeletonManagerService = _sheetSkeletonManagerService;
 		this._renderManagerService = _renderManagerService;
-		this._sheetSkeletonManagerService.currentSkeleton$.subscribe((param) => {
+		this.disposeWithMe(this._sheetSkeletonManagerService.currentSkeleton$.subscribe((param) => {
 			this._updateSceneSize(param);
-		});
+		}));
 	}
 	_updateSceneSize(param) {
 		var _this$_renderManagerS;

package/lib/es/index.js

@@ -14749,26 +14749,26 @@ let SheetRenderController = class SheetRenderController extends RxDisposable {
 	}
 	_initRenderMetricSubscriber() {
 		const { engine } = this._context;
-		engine.beginFrame$.subscribe(() => {
+		this.disposeWithMe(engine.beginFrame$.subscribe(() => {
 			this._renderFrameTimeMetric = null;
 			this._renderFrameTags = {};
-		});
-		engine.endFrame$.subscribe(() => {
+		}));
+		this.disposeWithMe(engine.endFrame$.subscribe(() => {
 			if (this._renderFrameTimeMetric && Object.keys(this._renderFrameTimeMetric).filter((key) => key.startsWith(SHEET_EXTENSION_PREFIX)).length > 0) this._afterRenderMetric$.next({
 				frameTimeMetric: this._renderFrameTimeMetric,
 				tags: this._renderFrameTags
 			});
-		});
-		engine.renderFrameTimeMetric$.subscribe(([key, value]) => {
+		}));
+		this.disposeWithMe(engine.renderFrameTimeMetric$.subscribe(([key, value]) => {
 			if (!this._renderFrameTimeMetric) this._renderFrameTimeMetric = {};
 			if (!this._renderFrameTimeMetric[key]) this._renderFrameTimeMetric[key] = [];
 			this._renderFrameTimeMetric[key].push(Math.round(value * 100) / 100);
-		});
-		engine.renderFrameTags$.subscribe(([key, value]) => {
+		}));
+		this.disposeWithMe(engine.renderFrameTags$.subscribe(([key, value]) => {
 			this._renderFrameTags[key] = value;
-		});
+		}));
 		const frameInfoList = [];
-		this._afterRenderMetric$.pipe(withLatestFrom(engine.endFrame$)).subscribe(([sceneRenderDetail, basicFrameTimeInfo]) => {
+		this.disposeWithMe(this._afterRenderMetric$.pipe(withLatestFrom(engine.endFrame$)).subscribe(([sceneRenderDetail, basicFrameTimeInfo]) => {
 			frameInfoList.push({
 				FPS: basicFrameTimeInfo.FPS,
 				elapsedTime: basicFrameTimeInfo.elapsedTime,
@@ -14780,7 +14780,7 @@ let SheetRenderController = class SheetRenderController extends RxDisposable {
 				this._captureRenderMetric(frameInfoList);
 				frameInfoList.length = 0;
 			}
-		});
+		}));
 	}
 	/**
 	* Send render metric to telemetry service
@@ -23961,7 +23961,7 @@ const useHighlightRange = (ranges = []) => {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-ui";
-var version = "0.22.1";
+var version = "0.23.0";
 
 //#endregion
 //#region src/services/cell-alert-manager.service.ts
@@ -26755,28 +26755,30 @@ var RangeProtectionRenderExtension = class extends SheetExtension {
 	getShadowStrategy() {
 		return this._shadowStrategy;
 	}
-	draw(ctx, _parentScale, spreadsheetSkeleton) {
+	draw(ctx, _parentScale, spreadsheetSkeleton, diffRanges) {
 		const { worksheet } = spreadsheetSkeleton;
 		if (!worksheet) return;
 		ctx.save();
 		if (!this._pattern) this._pattern = ctx.createPattern(this._img, "repeat");
 		this.renderCache.clear();
-		Range.foreach(spreadsheetSkeleton.rowColumnSegment, (row, col) => {
-			if (!worksheet.getRowVisible(row) || !worksheet.getColVisible(col)) return;
-			const { selectionProtection = [] } = worksheet.getCell(row, col) || {};
-			if (!this._pattern) return;
-			ctx.fillStyle = this._pattern;
-			selectionProtection.forEach((config) => {
-				if (!config.ruleId) return;
-				if (this.shouldRender(config)) {
-					if (this.renderCache.has(config.ruleId)) return;
-					this.renderCache.add(config.ruleId);
-					config.ranges.forEach((range) => {
-						const start = spreadsheetSkeleton.getCellWithCoordByIndex(range.startRow, range.startColumn, false);
-						const end = spreadsheetSkeleton.getCellWithCoordByIndex(range.endRow, range.endColumn, false);
-						ctx.fillRect(start.startX, start.startY, end.endX - start.startX, end.endY - start.startY);
-					});
-				}
+		((diffRanges === null || diffRanges === void 0 ? void 0 : diffRanges.length) ? diffRanges : [spreadsheetSkeleton.rowColumnSegment]).forEach((range) => {
+			Range.foreach(range, (row, col) => {
+				if (!worksheet.getRowVisible(row) || !worksheet.getColVisible(col)) return;
+				const { selectionProtection = [] } = worksheet.getCell(row, col) || {};
+				if (!this._pattern) return;
+				ctx.fillStyle = this._pattern;
+				selectionProtection.forEach((config) => {
+					if (!config.ruleId) return;
+					if (this.shouldRender(config)) {
+						if (this.renderCache.has(config.ruleId)) return;
+						this.renderCache.add(config.ruleId);
+						config.ranges.forEach((range) => {
+							const start = spreadsheetSkeleton.getCellWithCoordByIndex(range.startRow, range.startColumn, false);
+							const end = spreadsheetSkeleton.getCellWithCoordByIndex(range.endRow, range.endColumn, false);
+							ctx.fillRect(start.startX, start.startY, end.endX - start.startX, end.endY - start.startY);
+						});
+					}
+				});
 			});
 		});
 		ctx.restore();
@@ -28847,9 +28849,9 @@ let SheetSkeletonRenderController = class SheetSkeletonRenderController extends
 		this._context = _context;
 		this._sheetSkeletonManagerService = _sheetSkeletonManagerService;
 		this._renderManagerService = _renderManagerService;
-		this._sheetSkeletonManagerService.currentSkeleton$.subscribe((param) => {
+		this.disposeWithMe(this._sheetSkeletonManagerService.currentSkeleton$.subscribe((param) => {
 			this._updateSceneSize(param);
-		});
+		}));
 	}
 	_updateSceneSize(param) {
 		var _this$_renderManagerS;

package/lib/index.js

@@ -14749,26 +14749,26 @@ let SheetRenderController = class SheetRenderController extends RxDisposable {
 	}
 	_initRenderMetricSubscriber() {
 		const { engine } = this._context;
-		engine.beginFrame$.subscribe(() => {
+		this.disposeWithMe(engine.beginFrame$.subscribe(() => {
 			this._renderFrameTimeMetric = null;
 			this._renderFrameTags = {};
-		});
-		engine.endFrame$.subscribe(() => {
+		}));
+		this.disposeWithMe(engine.endFrame$.subscribe(() => {
 			if (this._renderFrameTimeMetric && Object.keys(this._renderFrameTimeMetric).filter((key) => key.startsWith(SHEET_EXTENSION_PREFIX)).length > 0) this._afterRenderMetric$.next({
 				frameTimeMetric: this._renderFrameTimeMetric,
 				tags: this._renderFrameTags
 			});
-		});
-		engine.renderFrameTimeMetric$.subscribe(([key, value]) => {
+		}));
+		this.disposeWithMe(engine.renderFrameTimeMetric$.subscribe(([key, value]) => {
 			if (!this._renderFrameTimeMetric) this._renderFrameTimeMetric = {};
 			if (!this._renderFrameTimeMetric[key]) this._renderFrameTimeMetric[key] = [];
 			this._renderFrameTimeMetric[key].push(Math.round(value * 100) / 100);
-		});
-		engine.renderFrameTags$.subscribe(([key, value]) => {
+		}));
+		this.disposeWithMe(engine.renderFrameTags$.subscribe(([key, value]) => {
 			this._renderFrameTags[key] = value;
-		});
+		}));
 		const frameInfoList = [];
-		this._afterRenderMetric$.pipe(withLatestFrom(engine.endFrame$)).subscribe(([sceneRenderDetail, basicFrameTimeInfo]) => {
+		this.disposeWithMe(this._afterRenderMetric$.pipe(withLatestFrom(engine.endFrame$)).subscribe(([sceneRenderDetail, basicFrameTimeInfo]) => {
 			frameInfoList.push({
 				FPS: basicFrameTimeInfo.FPS,
 				elapsedTime: basicFrameTimeInfo.elapsedTime,
@@ -14780,7 +14780,7 @@ let SheetRenderController = class SheetRenderController extends RxDisposable {
 				this._captureRenderMetric(frameInfoList);
 				frameInfoList.length = 0;
 			}
-		});
+		}));
 	}
 	/**
 	* Send render metric to telemetry service
@@ -23961,7 +23961,7 @@ const useHighlightRange = (ranges = []) => {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-ui";
-var version = "0.22.1";
+var version = "0.23.0";
 
 //#endregion
 //#region src/services/cell-alert-manager.service.ts
@@ -26755,28 +26755,30 @@ var RangeProtectionRenderExtension = class extends SheetExtension {
 	getShadowStrategy() {
 		return this._shadowStrategy;
 	}
-	draw(ctx, _parentScale, spreadsheetSkeleton) {
+	draw(ctx, _parentScale, spreadsheetSkeleton, diffRanges) {
 		const { worksheet } = spreadsheetSkeleton;
 		if (!worksheet) return;
 		ctx.save();
 		if (!this._pattern) this._pattern = ctx.createPattern(this._img, "repeat");
 		this.renderCache.clear();
-		Range.foreach(spreadsheetSkeleton.rowColumnSegment, (row, col) => {
-			if (!worksheet.getRowVisible(row) || !worksheet.getColVisible(col)) return;
-			const { selectionProtection = [] } = worksheet.getCell(row, col) || {};
-			if (!this._pattern) return;
-			ctx.fillStyle = this._pattern;
-			selectionProtection.forEach((config) => {
-				if (!config.ruleId) return;
-				if (this.shouldRender(config)) {
-					if (this.renderCache.has(config.ruleId)) return;
-					this.renderCache.add(config.ruleId);
-					config.ranges.forEach((range) => {
-						const start = spreadsheetSkeleton.getCellWithCoordByIndex(range.startRow, range.startColumn, false);
-						const end = spreadsheetSkeleton.getCellWithCoordByIndex(range.endRow, range.endColumn, false);
-						ctx.fillRect(start.startX, start.startY, end.endX - start.startX, end.endY - start.startY);
-					});
-				}
+		((diffRanges === null || diffRanges === void 0 ? void 0 : diffRanges.length) ? diffRanges : [spreadsheetSkeleton.rowColumnSegment]).forEach((range) => {
+			Range.foreach(range, (row, col) => {
+				if (!worksheet.getRowVisible(row) || !worksheet.getColVisible(col)) return;
+				const { selectionProtection = [] } = worksheet.getCell(row, col) || {};
+				if (!this._pattern) return;
+				ctx.fillStyle = this._pattern;
+				selectionProtection.forEach((config) => {
+					if (!config.ruleId) return;
+					if (this.shouldRender(config)) {
+						if (this.renderCache.has(config.ruleId)) return;
+						this.renderCache.add(config.ruleId);
+						config.ranges.forEach((range) => {
+							const start = spreadsheetSkeleton.getCellWithCoordByIndex(range.startRow, range.startColumn, false);
+							const end = spreadsheetSkeleton.getCellWithCoordByIndex(range.endRow, range.endColumn, false);
+							ctx.fillRect(start.startX, start.startY, end.endX - start.startX, end.endY - start.startY);
+						});
+					}
+				});
 			});
 		});
 		ctx.restore();
@@ -28847,9 +28849,9 @@ let SheetSkeletonRenderController = class SheetSkeletonRenderController extends
 		this._context = _context;
 		this._sheetSkeletonManagerService = _sheetSkeletonManagerService;
 		this._renderManagerService = _renderManagerService;
-		this._sheetSkeletonManagerService.currentSkeleton$.subscribe((param) => {
+		this.disposeWithMe(this._sheetSkeletonManagerService.currentSkeleton$.subscribe((param) => {
 			this._updateSceneSize(param);
-		});
+		}));
 	}
 	_updateSceneSize(param) {
 		var _this$_renderManagerS;

package/lib/types/views/permission/extensions/range-protection.render.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { ICellDataForSheetInterceptor, IScale } from '@univerjs/core';
+import type { ICellDataForSheetInterceptor, IRange, IScale } from '@univerjs/core';
 import type { SpreadsheetSkeleton, UniverRenderingContext } from '@univerjs/engine-render';
 import type { ICellPermission } from '@univerjs/sheets';
 import { SheetExtension } from '@univerjs/engine-render';
@@ -41,7 +41,7 @@ export declare abstract class RangeProtectionRenderExtension extends SheetExtens
      */
     getShadowStrategy(): 'always' | 'non-editable' | 'non-viewable' | 'none';
     protected abstract shouldRender(config: ICellPermission): boolean;
-    draw(ctx: UniverRenderingContext, _parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton): void;
+    draw(ctx: UniverRenderingContext, _parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton, diffRanges?: IRange[]): void;
 }
 export declare class RangeProtectionCanViewRenderExtension extends RangeProtectionRenderExtension {
     uKey: string;