@pisell/materials 6.11.42 → 6.11.44

package/lib/components/dataSourceComponents/fields/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const formFieldMap: {
     FormItemCheckbox: import("react").FC<{}> & {
         Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
@@ -20,7 +19,7 @@ declare const formFieldMap: {
         Subdomain: import("react").FC<import("antd").InputProps & {
             onChange: (value: string) => void;
             onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-            rootDomain: "saas" | "custom" | "xzero";
+            rootDomain: "custom" | "saas" | "xzero";
             customDomain?: string | undefined;
             value?: string | undefined;
             tenantId: string;
@@ -35,7 +34,7 @@ declare const formFieldMap: {
     };
     FormItemSelect: (props: import("antd").SelectProps<any, import("antd/es/select").DefaultOptionType> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
         options?: any;
-        optionSourceType?: "default" | "api" | "custom" | undefined;
+        optionSourceType?: "default" | "custom" | "api" | undefined;
         labelField: string;
         valueField: string;
         extraParams?: Record<string, any> | undefined;
@@ -62,7 +61,7 @@ declare const formFieldMap: {
     FormItemIconSelect: import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     FormItemRecordListWrapper: (props: import("./RecordListWrapper/type").RecordListWrapperProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
         options?: any;
-        optionSourceType?: "default" | "api" | "custom" | undefined;
+        optionSourceType?: "default" | "custom" | "api" | undefined;
         labelField: string;
         valueField: string;
         extraParams?: Record<string, any> | undefined;
@@ -72,7 +71,7 @@ declare const formFieldMap: {
     }) => JSX.Element;
     FormItemTabs: (props: import("./Tabs/type").TabsProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
         options?: any;
-        optionSourceType?: "default" | "api" | "custom" | undefined;
+        optionSourceType?: "default" | "custom" | "api" | undefined;
         labelField: string;
         valueField: string;
         extraParams?: Record<string, any> | undefined;
@@ -81,9 +80,11 @@ declare const formFieldMap: {
         extraParams?: Record<string, any> | undefined;
     }) => JSX.Element;
 };
-declare const getFieldComponent: (fieldComponent: string) => import("react").FC<any> | import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & {
-    onChange: (value: string) => void;
-} & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Mobile/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<import("./Input/type").InputProps> & {
+declare const getFieldComponent: (fieldComponent: string) => import("react").FC<any> | import("react").FC<(import("antd").DatePickerProps & import("../dataSourceForm/utils").WithModeProps) & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<{}> & {
+    Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
+} & {
+    Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
+}) | import("react").FC<import("./ColorPicker/type").ColorPickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<import("./Input/type").InputProps> & {
     JSON: import("react").FC<any>;
     Password: import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     TextArea: import("react").FC<import("antd/es/input").TextAreaProps & import("react").RefAttributes<import("antd/es/input/TextArea").TextAreaRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
@@ -96,7 +97,7 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     Subdomain: import("react").FC<import("antd").InputProps & {
         onChange: (value: string) => void;
         onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-        rootDomain: "saas" | "custom" | "xzero";
+        rootDomain: "custom" | "saas" | "xzero";
         customDomain?: string | undefined;
         value?: string | undefined;
         tenantId: string;
@@ -104,25 +105,23 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
         fieldKey?: string | undefined;
     } & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 }) | (import("react").FC<{}> & {
-    Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
-} & {
-    Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
-}) | import("react").FC<import("./ColorPicker/type").ColorPickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<(import("antd").DatePickerProps & import("../dataSourceForm/utils").WithModeProps) & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 }) | ((props: import("antd").SelectProps<any, import("antd/es/select").DefaultOptionType> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
     options?: any;
-    optionSourceType?: "default" | "api" | "custom" | undefined;
+    optionSourceType?: "default" | "custom" | "api" | undefined;
     labelField: string;
     valueField: string;
     extraParams?: Record<string, any> | undefined;
 } & {
     dataSource?: any;
     extraParams?: Record<string, any> | undefined;
-}) => JSX.Element) | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | ((props: import("./RecordListWrapper/type").RecordListWrapperProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
+}) => JSX.Element) | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Mobile/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & {
+    onChange: (value: string) => void;
+} & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | ((props: import("./RecordListWrapper/type").RecordListWrapperProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
     options?: any;
-    optionSourceType?: "default" | "api" | "custom" | undefined;
+    optionSourceType?: "default" | "custom" | "api" | undefined;
     labelField: string;
     valueField: string;
     extraParams?: Record<string, any> | undefined;
@@ -131,7 +130,7 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     extraParams?: Record<string, any> | undefined;
 }) => JSX.Element) | ((props: import("./Tabs/type").TabsProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
     options?: any;
-    optionSourceType?: "default" | "api" | "custom" | undefined;
+    optionSourceType?: "default" | "custom" | "api" | undefined;
     labelField: string;
     valueField: string;
     extraParams?: Record<string, any> | undefined;

package/lib/components/date-picker/datePickerCpt.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PickerDateProps } from 'antd/es/date-picker/generatePicker';
 import { Dayjs } from 'dayjs';
 import './index.less';

package/lib/components/date-picker/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const DatePicker: (props: any) => JSX.Element;
 export default DatePicker;

package/lib/components/drag-sort-tree/TreeItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 import { ValueProps, SortType } from '../types';
 declare type IdType = string | number;

package/lib/components/filter/components/FilterItem/index.js

@@ -105,11 +105,12 @@ var FilterItem = (props) => {
     if (!CustomComponent) return null;
     const componentProps2 = { ...itemProps || {}, ...other || {} };
     delete componentProps2.component;
+    const isMultiFieldComposite = Array.isArray(other == null ? void 0 : other.compositeFilterFieldNames) && other.compositeFilterFieldNames.length > 0;
     return /* @__PURE__ */ import_react.default.createElement(
       import_antd.Form.Item,
       {
         label,
-        name,
+        name: isMultiFieldComposite ? void 0 : name,
         hidden: isHidden,
         ...(other == null ? void 0 : other.formItemProps) || {}
       },

package/lib/components/filter/components/QuickFilter/index.js

@@ -41,13 +41,14 @@ var QuickFilter = (props) => {
   const filterArr = (0, import_react.useMemo)(() => {
     return [...notSortFilter || [], ...quickFilter || []];
   }, [quickFilter, notSortFilter]);
-  return /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { wrap: true }, filterArr.map((item) => {
+  return /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { wrap: true }, filterArr.map((item, index) => {
     var _a;
     const name = [formFiltersPrefix, (_a = item.name) == null ? void 0 : _a.toString()].filter(Boolean);
+    const keyHint = name.length > 0 ? name.join("-") : "";
     return /* @__PURE__ */ import_react.default.createElement(
       import_FilterItem.default,
       {
-        key: name.join("-"),
+        key: item.key && String(item.key) || keyHint || `quick-filter-${index}`,
         name,
         type: item.type,
         other: item.other,

package/lib/components/filter/components/items/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const fieldMaps: {
     text: {
         field: {

package/lib/components/filter/components/items/text/Editor/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Text: () => JSX.Element;
 export default Text;

package/lib/components/filter/components/items/text/Preview/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Text: (props: any) => JSX.Element;
 export default Text;

package/lib/components/filter/components/items/text/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: {
     field: {
         field_icon: string;

package/lib/components/filter/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { FilterProps } from "./types";
 declare const Filter: (props: FilterProps) => JSX.Element | null;
 export default Filter;

package/lib/components/list/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const List: {
     (props: any): JSX.Element;

package/lib/components/lowCodePage/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare type LowCodePageProps = {
     id: number;
 };

package/lib/components/pisellAdjustPrice/PisellAdjustPriceInputNumber.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { InputNumberProps } from 'antd/es/input-number';
 export interface PisellAdjustPriceInputNumberProps extends Omit<InputNumberProps, 'onChange'> {
     value?: number;

package/lib/components/pisellDataSourceContainer/PisellDataSourceContainer.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { DataSourceContainerProps } from './type';
 declare const PisellDataSourceContainer: (props: DataSourceContainerProps) => JSX.Element;
 export default PisellDataSourceContainer;

package/lib/components/pisellDataSourceContainer/hooks/useDataSourceKey.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 declare const useDataSourceKey: () => {
-    dataSourceKey: string | undefined;
-    dataSourceKeyRef: import("react").MutableRefObject<string | undefined>;
+    dataSourceKey: string | import("../../dataSourceComponents/provider/dataSource/DataSourceContext").DataSourceType | undefined;
+    dataSourceKeyRef: import("react").MutableRefObject<string | import("../../dataSourceComponents/provider/dataSource/DataSourceContext").DataSourceType | undefined>;
 };
 export default useDataSourceKey;

package/lib/components/pisellDatePicker/datePickerCpt.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PickerDateProps } from 'antd/es/date-picker/generatePicker';
 import { Dayjs } from 'dayjs';
 import './detePickerCpt.less';

package/lib/components/pisellFilter/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PisellFilterProps } from './type';
 declare const PisellFilter: (props: PisellFilterProps) => JSX.Element;
 export default PisellFilter;

package/lib/components/pisellFloorMapLayout/PisellFloorMapLayout.js

@@ -58,8 +58,8 @@ var import_mergeFloorMapLayoutContext = require("./context/mergeFloorMapLayoutCo
 var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
 var import_utils = require("@pisell/utils");
 var import_floorMapCanvasDisplay = require("./utils/floorMapCanvasDisplay");
+var import_floorMapLayoutConstants = require("./floorMapLayoutConstants");
 var import_PisellFloorMapLayout = require("./PisellFloorMapLayout.less");
-var PREFIX = "pisell-floor-map-layout";
 function PisellFloorMapLayoutInner(props, ref) {
   var _a, _b;
   const layoutCtx = (0, import_FloorMapLayoutContext.useFloorMapLayoutContext)();
@@ -86,6 +86,7 @@ function PisellFloorMapLayoutInner(props, ref) {
     floorMapConfig: floorMapConfigProp,
     dataSources,
     onSave,
+    onExitEdit,
     onDataSourceRecordSave,
     dataSourceLabels,
     dataSourceFormColumns,
@@ -100,7 +101,9 @@ function PisellFloorMapLayoutInner(props, ref) {
     viewportOverlayPlacement = "top-start",
     viewportOverlayClassName,
     canvasTabsBarTrailing,
-    viewportDockTrailing
+    viewportDockTrailing,
+    viewportPersist = true,
+    viewportPersistNamespace
   } = p;
   const { token } = import_antd.theme.useToken();
   const isFloorMapView = Boolean(floorMapConfigProp);
@@ -118,7 +121,7 @@ function PisellFloorMapLayoutInner(props, ref) {
     dataSourceFormColumns,
     dataSourceRecordForm,
     dataSourceLabels,
-    layoutPrefix: PREFIX,
+    layoutPrefix: import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX,
     contentOffsetRef,
     showDataSourceRecordFormBlock
   });
@@ -146,8 +149,17 @@ function PisellFloorMapLayoutInner(props, ref) {
     toggleDraftCanvasShowGrid,
     toggleSelectedLayoutLock,
     duplicateSelectedElement,
-    deleteSelectedElement
+    deleteSelectedElement,
+    undoDraft,
+    redoDraft,
+    canUndo,
+    canRedo,
+    discardDraft
   } = edit;
+  const handleCancelEdit = (0, import_react.useCallback)(() => {
+    discardDraft();
+    onExitEdit == null ? void 0 : onExitEdit();
+  }, [discardDraft, onExitEdit]);
   const effectiveMapLayer = (0, import_react.useMemo)(() => {
     if (!isFloorMapView || !config || !currentCanvasId) {
       return mapLayer;
@@ -247,6 +259,16 @@ function PisellFloorMapLayoutInner(props, ref) {
     [effectiveMapLayer == null ? void 0 : effectiveMapLayer.gap]
   );
   const effectiveItemUnit = isFloorMapView ? "pixel" : itemUnit;
+  const viewportPersistKey = (0, import_react.useMemo)(() => {
+    if (viewportPersist === false) return void 0;
+    if (!isFloorMapView || !currentCanvasId) return void 0;
+    return viewportPersistNamespace ? `${viewportPersistNamespace}:${currentCanvasId}` : currentCanvasId;
+  }, [
+    viewportPersist,
+    viewportPersistNamespace,
+    isFloorMapView,
+    currentCanvasId
+  ]);
   const metrics = (0, import_useFloorMapTransformMetrics.useFloorMapTransformMetrics)({
     items,
     cellSize,
@@ -258,7 +280,8 @@ function PisellFloorMapLayoutInner(props, ref) {
     transformRef,
     contentOffsetRef,
     boundingPadding: effectiveMapLayer == null ? void 0 : effectiveMapLayer.boundingPadding,
-    frameResetKey: isFloorMapView ? transformWrapperKey : void 0
+    frameResetKey: isFloorMapView ? transformWrapperKey : void 0,
+    viewportPersistKey
   });
   const {
     containerRef,
@@ -276,21 +299,35 @@ function PisellFloorMapLayoutInner(props, ref) {
     isFullscreen,
     toggleFullscreen,
     fitBounds,
-    lastTransformRef,
+    isAtFitBounds,
+    notifyTransformed,
+    persistCurrentViewport,
+    attachTransformContext,
     isInteractingWithElement,
-    setIsInteractingWithElement
+    setIsInteractingWithElement,
+    viewportLocked,
+    toggleViewportLocked
   } = metrics;
   const fsMode = floorMapFullscreenMode ?? "toggle";
   const useFullTopChrome = isFloorMapView && mode === "edit" && (fsMode === "locked" || fsMode === "toggle" && isFullscreen);
-  const dockToggleFullscreen = isFloorMapView && fsMode === "toggle" ? toggleFullscreen : void 0;
+  const dockToggleFullscreen = void 0;
+  (0, import_react.useEffect)(() => {
+    if (!isFloorMapView) return;
+    if (fsMode !== "toggle") return;
+    const shouldBeFullscreen = mode === "edit";
+    if (shouldBeFullscreen !== isFullscreen) {
+      toggleFullscreen();
+    }
+  }, [mode, isFloorMapView, fsMode, isFullscreen, toggleFullscreen]);
   const showEditCompactTopBar = isFloorMapView && mode === "edit" && Boolean(config) && !useFullTopChrome;
   const viewControlsConfig = (0, import_react.useMemo)(() => {
     if (!isFloorMapView) return controls;
     return {
       ...controls,
-      showFullscreen: controls.showFullscreen ?? Boolean(dockToggleFullscreen)
+      showFullscreen: controls.showFullscreen ?? Boolean(dockToggleFullscreen),
+      showViewportLock: controls.showViewportLock ?? Boolean(viewportPersistKey)
     };
-  }, [isFloorMapView, controls, dockToggleFullscreen]);
+  }, [isFloorMapView, controls, dockToggleFullscreen, viewportPersistKey]);
   const topBarExtraActions = null;
   const [mapPaletteDragActive, setMapPaletteDragActive] = (0, import_react.useState)(false);
   (0, import_react.useEffect)(() => {
@@ -298,6 +335,49 @@ function PisellFloorMapLayoutInner(props, ref) {
     window.addEventListener("dragend", clear);
     return () => window.removeEventListener("dragend", clear);
   }, []);
+  (0, import_react.useEffect)(() => {
+    if (!isFloorMapView || mode !== "edit" || !(config == null ? void 0 : config.canvasUi.canEdit)) {
+      return;
+    }
+    const onKeyDown = (e) => {
+      const mod = e.ctrlKey || e.metaKey;
+      if (!mod) return;
+      const key = e.key.toLowerCase();
+      const isUndoCombo = key === "z" && !e.shiftKey && !e.altKey;
+      const isRedoCombo = key === "z" && e.shiftKey && !e.altKey || key === "y" && !e.shiftKey && !e.altKey;
+      if (!isUndoCombo && !isRedoCombo) return;
+      const target = e.target;
+      if (target) {
+        const tag = target.tagName;
+        if (tag === "INPUT" || tag === "TEXTAREA") return;
+        if (target.isContentEditable) return;
+      }
+      const root = containerRef.current;
+      if (!root) return;
+      const active = document.activeElement;
+      const focusInside = active ? root.contains(active) : false;
+      const targetInside = target ? root.contains(target) : false;
+      if (!focusInside && !targetInside) return;
+      if (isUndoCombo && canUndo) {
+        e.preventDefault();
+        undoDraft();
+      } else if (isRedoCombo && canRedo) {
+        e.preventDefault();
+        redoDraft();
+      }
+    };
+    window.addEventListener("keydown", onKeyDown);
+    return () => window.removeEventListener("keydown", onKeyDown);
+  }, [
+    isFloorMapView,
+    mode,
+    config == null ? void 0 : config.canvasUi.canEdit,
+    canUndo,
+    canRedo,
+    undoDraft,
+    redoDraft,
+    containerRef
+  ]);
   const handlePaletteDropOnCanvas = (0, import_react.useCallback)(
     (e) => {
       e.preventDefault();
@@ -423,12 +503,12 @@ function PisellFloorMapLayoutInner(props, ref) {
     (e) => {
       if (!isFloorMapView || mode !== "edit") return;
       const t = e.target;
-      if (t.closest(`.${PREFIX}-editable-item`)) return;
-      if (t.closest(`.${PREFIX}-edit-panel-wrap`)) return;
-      if (t.closest(`.${PREFIX}-view-controls`)) return;
-      if (t.closest(`.${PREFIX}-viewport-overlay`)) return;
-      if (t.closest(`.${PREFIX}-place-overlay`)) return;
-      if (t.closest(`.${PREFIX}-map-drop-layer`)) return;
+      if (t.closest(`.${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-editable-item`)) return;
+      if (t.closest(`.${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-edit-panel-wrap`)) return;
+      if (t.closest(`.${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-view-controls`)) return;
+      if (t.closest(`.${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-viewport-overlay`)) return;
+      if (t.closest(`.${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-place-overlay`)) return;
+      if (t.closest(`.${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-map-drop-layer`)) return;
       setSelectedId(null);
     },
     [isFloorMapView, mode, setSelectedId]
@@ -437,9 +517,11 @@ function PisellFloorMapLayoutInner(props, ref) {
     "div",
     {
       ref: containerRef,
-      className: (0, import_classnames.default)(PREFIX, className, {
-        [`${PREFIX}-floor-map-view`]: isFloorMapView,
-        [`${PREFIX}-mode-edit`]: isFloorMapView && mode === "edit"
+      className: (0, import_classnames.default)(import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX, className, {
+        [`${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-floor-map-view`]: isFloorMapView,
+        [`${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-mode-edit`]: isFloorMapView && mode === "edit",
+        /** 伪全屏：让根容器 fixed 撑满视口，替代浏览器原生 Fullscreen API */
+        [`${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}--pseudo-fullscreen`]: isFullscreen
       }),
       style: {
         display: "flex",
@@ -467,7 +549,11 @@ function PisellFloorMapLayoutInner(props, ref) {
         onRemoveCanvas: handleRemoveCanvas,
         onRenameCanvas: handleRenameCanvas,
         controls,
-        canvasTabsBarTrailing
+        canvasTabsBarTrailing,
+        onUndo: config.canvasUi.canEdit ? undoDraft : void 0,
+        onRedo: config.canvasUi.canEdit ? redoDraft : void 0,
+        canUndo,
+        canRedo
       }
     ),
     isFloorMapView && mode === "edit" && config && useFullTopChrome && /* @__PURE__ */ import_react.default.createElement(
@@ -492,17 +578,23 @@ function PisellFloorMapLayoutInner(props, ref) {
         isFullscreen,
         controls,
         extraActions: topBarExtraActions,
-        canvasTabsBarTrailing
+        canvasTabsBarTrailing,
+        onUndo: config.canvasUi.canEdit ? undoDraft : void 0,
+        onRedo: config.canvasUi.canEdit ? redoDraft : void 0,
+        canUndo,
+        canRedo,
+        onExitEdit,
+        onCancelEdit: onExitEdit ? handleCancelEdit : void 0
       }
     ),
     showReadModeCanvasTabsBar && /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
-        className: `${PREFIX}-edit-top-bar ${PREFIX}-read-canvas-tabs-bar`,
+        className: `${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-edit-top-bar ${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-read-canvas-tabs-bar`,
         role: "toolbar",
         "aria-label": readCanvasTabsAriaLabel
       },
-      /* @__PURE__ */ import_react.default.createElement("div", { className: `${PREFIX}-edit-top-bar-tabs` }, /* @__PURE__ */ import_react.default.createElement(
+      /* @__PURE__ */ import_react.default.createElement("div", { className: `${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-edit-top-bar-tabs` }, /* @__PURE__ */ import_react.default.createElement(
         import_CanvasTabs.CanvasTabs,
         {
           canvases: canvasesForTabs,
@@ -512,17 +604,17 @@ function PisellFloorMapLayoutInner(props, ref) {
             setSelectedId(null);
           },
           canEdit: false,
-          className: `${PREFIX}-edit-top-bar-canvas-tabs`
+          className: `${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-edit-top-bar-canvas-tabs`
         }
       )),
-      hasCanvasTabsBarTrailing ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${PREFIX}-edit-top-bar-actions` }, canvasTabsBarTrailing) : null
+      hasCanvasTabsBarTrailing ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-edit-top-bar-actions` }, canvasTabsBarTrailing) : null
     ),
-    loading && /* @__PURE__ */ import_react.default.createElement("div", { className: `${PREFIX}-loading` }, /* @__PURE__ */ import_react.default.createElement("span", null, loadingLabel)),
-    saveError && !(isFloorMapView && mode === "edit" && config) && /* @__PURE__ */ import_react.default.createElement("div", { className: `${PREFIX}-save-error` }, typeof saveError === "string" ? saveError : saveError == null ? void 0 : saveError.message),
+    loading && /* @__PURE__ */ import_react.default.createElement("div", { className: `${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-loading` }, /* @__PURE__ */ import_react.default.createElement("span", null, loadingLabel)),
+    saveError && !(isFloorMapView && mode === "edit" && config) && /* @__PURE__ */ import_react.default.createElement("div", { className: `${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-save-error` }, typeof saveError === "string" ? saveError : saveError == null ? void 0 : saveError.message),
     /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
-        className: showSidebar ? `${PREFIX}-edit-layout` : void 0,
+        className: showSidebar ? `${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-edit-layout` : void 0,
         style: { flex: 1, display: "flex", minHeight: 0 }
       },
       showSidebar && /* @__PURE__ */ import_react.default.createElement(
@@ -551,8 +643,8 @@ function PisellFloorMapLayoutInner(props, ref) {
         {
           ref: mapAreaRef,
           className: (0, import_classnames.default)(
-            showSidebar && `${PREFIX}-map-area`,
-            editPanelVisible && `${PREFIX}-map-area--edit-panel-inset`
+            showSidebar && `${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-map-area`,
+            editPanelVisible && `${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-map-area--edit-panel-inset`
           ),
           style: {
             flex: 1,
@@ -596,21 +688,23 @@ function PisellFloorMapLayoutInner(props, ref) {
             limitToBounds: pan.boundary !== "none",
             ...{ step: zoomConfig.step },
             panning: {
-              disabled: pan.enabled === false || isInteractingWithElement,
+              disabled: pan.enabled === false || isInteractingWithElement || viewportLocked,
               velocityDisabled: true
             },
+            wheel: { disabled: viewportLocked },
+            pinch: { disabled: viewportLocked },
             doubleClick: { disabled: true },
             onTransformed: (_, state) => {
               setScale(state.scale);
-              lastTransformRef.current = {
-                x: state.positionX,
-                y: state.positionY,
-                scale: state.scale
-              };
-            }
+              notifyTransformed(state.positionX, state.positionY, state.scale);
+            },
+            onPanningStop: persistCurrentViewport,
+            onZoomStop: persistCurrentViewport,
+            onPinchingStop: persistCurrentViewport,
+            onWheelStop: persistCurrentViewport
           },
           (ctx) => {
-            transformRef.current = ctx;
+            attachTransformContext(ctx);
             return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
               import_react_zoom_pan_pinch.TransformComponent,
               {
@@ -697,8 +791,8 @@ function PisellFloorMapLayoutInner(props, ref) {
                 "div",
                 {
                   ref: mapDropLayerRef,
-                  className: (0, import_classnames.default)(`${PREFIX}-map-drop-layer`, {
-                    [`${PREFIX}-map-drop-layer-active`]: mapPaletteDragActive
+                  className: (0, import_classnames.default)(`${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-map-drop-layer`, {
+                    [`${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-map-drop-layer-active`]: mapPaletteDragActive
                   }),
                   style: { width: contentWidth, height: contentHeight },
                   onDragOver: (ev) => {
@@ -714,10 +808,13 @@ function PisellFloorMapLayoutInner(props, ref) {
                 config: viewControlsConfig,
                 scale,
                 isFullscreen,
+                fitBoundsActive: isAtFitBounds,
                 fitBounds,
                 toggleFullscreen: dockToggleFullscreen,
                 mapGridVisible: Boolean(effectiveMapLayer == null ? void 0 : effectiveMapLayer.showGrid),
                 onToggleMapGrid: isFloorMapView ? toggleDraftCanvasShowGrid : void 0,
+                viewportLocked,
+                onToggleViewportLock: isFloorMapView && viewportPersistKey ? toggleViewportLocked : void 0,
                 dockChrome: isFloorMapView,
                 dockExpandedTrailing: viewportDockTrailing,
                 autoCollapseDockMs: 1e4
@@ -726,9 +823,9 @@ function PisellFloorMapLayoutInner(props, ref) {
               "div",
               {
                 className: (0, import_classnames.default)(
-                  `${PREFIX}-viewport-overlay`,
+                  `${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-viewport-overlay`,
                   {
-                    [`${PREFIX}-viewport-overlay--bottom-start`]: viewportOverlayPlacement === "bottom-start"
+                    [`${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-viewport-overlay--bottom-start`]: viewportOverlayPlacement === "bottom-start"
                   },
                   viewportOverlayClassName
                 )
@@ -743,8 +840,8 @@ function PisellFloorMapLayoutInner(props, ref) {
               "div",
               {
                 className: (0, import_classnames.default)(
-                  `${PREFIX}-edit-panel-wrap`,
-                  mapAreaSize.height > 0 && `${PREFIX}-edit-panel-wrap-constrained`
+                  `${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-edit-panel-wrap`,
+                  mapAreaSize.height > 0 && `${import_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-edit-panel-wrap-constrained`
                 ),
                 style: mapAreaSize.height > 0 ? {
                   height: mapAreaSize.height - 32,

package/lib/components/pisellFloorMapLayout/PisellFloorMapLayout.less

@@ -1,3 +1,8 @@
+/* 伪全屏宿主：锁定 body 滚动，避免双滚动条与触摸滑动穿透 */
+body.pisell-floor-map-layout-fullscreen-host {
+  overflow: hidden !important;
+}
+
 .pisell-floor-map-layout {
   position: relative;
   width: 100%;
@@ -5,6 +10,23 @@
   overflow: hidden;
   background: #fafafa;
 
+  /**
+   * 伪全屏：撑满视口，替代浏览器 Fullscreen API；与资源墙大屏（pisell-resource-wall-fixed-viewport）
+   * 一致体验。z-index 故意高于常见弹层但低于 antd Modal 默认 1000，必要时可在宿主侧覆盖。
+   */
+  &--pseudo-fullscreen {
+    position: fixed !important;
+    inset: 0 !important;
+    width: 100% !important;
+    height: 100% !important;
+    max-width: 100% !important;
+    max-height: 100% !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    z-index: 2000;
+    background: #fff;
+  }
+
   &-loading,
   &-save-error {
     position: absolute;