@jnrs/lingshu-smart 2.2.35 → 2.2.36

package/dist/stores/useDebugStore.d.ts

@@ -45,7 +45,10 @@ export declare const useDebugStore: import('pinia').StoreDefinition<"@jnrs/lings
     wsProxyConfig: import('vue').Ref<{
         name: string;
         version: number;
+        dataSource?: import('../components/debug/WsProxy/proxy').WsProxyDataSource | undefined;
         wsUrl?: string | undefined;
+        requestMode?: import('../components/debug/WsProxy/proxy').WsProxyRequestMode | undefined;
+        autoConnect?: boolean | undefined;
         payloadKey?: string | undefined;
         sourceTypeField?: string | undefined;
         heartbeatInterval?: number | undefined;
@@ -60,9 +63,9 @@ export declare const useDebugStore: import('pinia').StoreDefinition<"@jnrs/lings
                 source?: string | undefined;
                 constant?: boolean | number | string | undefined;
                 valueMap?: Record<string, boolean | number | string> | undefined;
-                defaultValue?: boolean | number | string | undefined;
+                defaultValue?: (boolean | number | string | Record<string, unknown>) | undefined;
                 enabled?: boolean | undefined;
-                transform?: "percentToPixel" | "runtimeToPixel" | "dictLabel" | "dictColor" | "condition" | undefined;
+                transform?: "percentToPixel" | "runtimeToPixel" | "dictLabel" | "dictColor" | "dictColorMap" | "condition" | undefined;
                 transformType?: "width" | "height" | undefined;
                 transformPrecision?: number | undefined;
                 dictName?: string | undefined;
@@ -99,7 +102,10 @@ export declare const useDebugStore: import('pinia').StoreDefinition<"@jnrs/lings
     }, WsProxyConfig | {
         name: string;
         version: number;
+        dataSource?: import('../components/debug/WsProxy/proxy').WsProxyDataSource | undefined;
         wsUrl?: string | undefined;
+        requestMode?: import('../components/debug/WsProxy/proxy').WsProxyRequestMode | undefined;
+        autoConnect?: boolean | undefined;
         payloadKey?: string | undefined;
         sourceTypeField?: string | undefined;
         heartbeatInterval?: number | undefined;
@@ -114,9 +120,9 @@ export declare const useDebugStore: import('pinia').StoreDefinition<"@jnrs/lings
                 source?: string | undefined;
                 constant?: boolean | number | string | undefined;
                 valueMap?: Record<string, boolean | number | string> | undefined;
-                defaultValue?: boolean | number | string | undefined;
+                defaultValue?: (boolean | number | string | Record<string, unknown>) | undefined;
                 enabled?: boolean | undefined;
-                transform?: "percentToPixel" | "runtimeToPixel" | "dictLabel" | "dictColor" | "condition" | undefined;
+                transform?: "percentToPixel" | "runtimeToPixel" | "dictLabel" | "dictColor" | "dictColorMap" | "condition" | undefined;
                 transformType?: "width" | "height" | undefined;
                 transformPrecision?: number | undefined;
                 dictName?: string | undefined;
@@ -204,7 +210,10 @@ export declare const useDebugStore: import('pinia').StoreDefinition<"@jnrs/lings
     wsProxyConfig: import('vue').Ref<{
         name: string;
         version: number;
+        dataSource?: import('../components/debug/WsProxy/proxy').WsProxyDataSource | undefined;
         wsUrl?: string | undefined;
+        requestMode?: import('../components/debug/WsProxy/proxy').WsProxyRequestMode | undefined;
+        autoConnect?: boolean | undefined;
         payloadKey?: string | undefined;
         sourceTypeField?: string | undefined;
         heartbeatInterval?: number | undefined;
@@ -219,9 +228,9 @@ export declare const useDebugStore: import('pinia').StoreDefinition<"@jnrs/lings
                 source?: string | undefined;
                 constant?: boolean | number | string | undefined;
                 valueMap?: Record<string, boolean | number | string> | undefined;
-                defaultValue?: boolean | number | string | undefined;
+                defaultValue?: (boolean | number | string | Record<string, unknown>) | undefined;
                 enabled?: boolean | undefined;
-                transform?: "percentToPixel" | "runtimeToPixel" | "dictLabel" | "dictColor" | "condition" | undefined;
+                transform?: "percentToPixel" | "runtimeToPixel" | "dictLabel" | "dictColor" | "dictColorMap" | "condition" | undefined;
                 transformType?: "width" | "height" | undefined;
                 transformPrecision?: number | undefined;
                 dictName?: string | undefined;
@@ -258,7 +267,10 @@ export declare const useDebugStore: import('pinia').StoreDefinition<"@jnrs/lings
     }, WsProxyConfig | {
         name: string;
         version: number;
+        dataSource?: import('../components/debug/WsProxy/proxy').WsProxyDataSource | undefined;
         wsUrl?: string | undefined;
+        requestMode?: import('../components/debug/WsProxy/proxy').WsProxyRequestMode | undefined;
+        autoConnect?: boolean | undefined;
         payloadKey?: string | undefined;
         sourceTypeField?: string | undefined;
         heartbeatInterval?: number | undefined;
@@ -273,9 +285,9 @@ export declare const useDebugStore: import('pinia').StoreDefinition<"@jnrs/lings
                 source?: string | undefined;
                 constant?: boolean | number | string | undefined;
                 valueMap?: Record<string, boolean | number | string> | undefined;
-                defaultValue?: boolean | number | string | undefined;
+                defaultValue?: (boolean | number | string | Record<string, unknown>) | undefined;
                 enabled?: boolean | undefined;
-                transform?: "percentToPixel" | "runtimeToPixel" | "dictLabel" | "dictColor" | "condition" | undefined;
+                transform?: "percentToPixel" | "runtimeToPixel" | "dictLabel" | "dictColor" | "dictColorMap" | "condition" | undefined;
                 transformType?: "width" | "height" | undefined;
                 transformPrecision?: number | undefined;
                 dictName?: string | undefined;
@@ -363,7 +375,10 @@ export declare const useDebugStore: import('pinia').StoreDefinition<"@jnrs/lings
     wsProxyConfig: import('vue').Ref<{
         name: string;
         version: number;
+        dataSource?: import('../components/debug/WsProxy/proxy').WsProxyDataSource | undefined;
         wsUrl?: string | undefined;
+        requestMode?: import('../components/debug/WsProxy/proxy').WsProxyRequestMode | undefined;
+        autoConnect?: boolean | undefined;
         payloadKey?: string | undefined;
         sourceTypeField?: string | undefined;
         heartbeatInterval?: number | undefined;
@@ -378,9 +393,9 @@ export declare const useDebugStore: import('pinia').StoreDefinition<"@jnrs/lings
                 source?: string | undefined;
                 constant?: boolean | number | string | undefined;
                 valueMap?: Record<string, boolean | number | string> | undefined;
-                defaultValue?: boolean | number | string | undefined;
+                defaultValue?: (boolean | number | string | Record<string, unknown>) | undefined;
                 enabled?: boolean | undefined;
-                transform?: "percentToPixel" | "runtimeToPixel" | "dictLabel" | "dictColor" | "condition" | undefined;
+                transform?: "percentToPixel" | "runtimeToPixel" | "dictLabel" | "dictColor" | "dictColorMap" | "condition" | undefined;
                 transformType?: "width" | "height" | undefined;
                 transformPrecision?: number | undefined;
                 dictName?: string | undefined;
@@ -417,7 +432,10 @@ export declare const useDebugStore: import('pinia').StoreDefinition<"@jnrs/lings
     }, WsProxyConfig | {
         name: string;
         version: number;
+        dataSource?: import('../components/debug/WsProxy/proxy').WsProxyDataSource | undefined;
         wsUrl?: string | undefined;
+        requestMode?: import('../components/debug/WsProxy/proxy').WsProxyRequestMode | undefined;
+        autoConnect?: boolean | undefined;
         payloadKey?: string | undefined;
         sourceTypeField?: string | undefined;
         heartbeatInterval?: number | undefined;
@@ -432,9 +450,9 @@ export declare const useDebugStore: import('pinia').StoreDefinition<"@jnrs/lings
                 source?: string | undefined;
                 constant?: boolean | number | string | undefined;
                 valueMap?: Record<string, boolean | number | string> | undefined;
-                defaultValue?: boolean | number | string | undefined;
+                defaultValue?: (boolean | number | string | Record<string, unknown>) | undefined;
                 enabled?: boolean | undefined;
-                transform?: "percentToPixel" | "runtimeToPixel" | "dictLabel" | "dictColor" | "condition" | undefined;
+                transform?: "percentToPixel" | "runtimeToPixel" | "dictLabel" | "dictColor" | "dictColorMap" | "condition" | undefined;
                 transformType?: "width" | "height" | undefined;
                 transformPrecision?: number | undefined;
                 dictName?: string | undefined;

package/dist/types/components/config.types.d.ts

@@ -15,6 +15,10 @@ export interface IStationSlotConfig extends IBaseConfig, IInteractiveState {
     origin?: IOriginAround;
     around?: IOriginAround;
     hideBounds?: boolean;
+    background?: string;
+    stroke?: string;
+    strokeWidth?: number;
+    textColor?: string;
 }
 /**
  * 布局选项
@@ -38,6 +42,7 @@ export interface IStationSlotGroupConfig extends Omit<IBaseConfig, 'width' | 'he
     around?: IOriginAround;
     stationSlots: IStationSlotConfig[];
     flowOptions: IFlowConfig;
+    hideBounds?: boolean;
 }
 /**
  * 资源

package/dist/types/enums.d.ts

@@ -20,7 +20,8 @@ export declare enum EnumModel {
     LOADING_STATION = "LoadingStation",
     SHUTTLE_STATION = "ShuttleStation",
     RAIL = "Rail",
-    RESOURCE_STORE = "ResourceStore"
+    RESOURCE_STORE = "ResourceStore",
+    PALLET = "Pallet"
 }
 export declare enum EnumComponent {
     STATION_SLOT = "StationSlot",

package/dist/types/guards.d.ts

@@ -1,4 +1,4 @@
-import { ILayer } from './index';
+import { ILayer, EnumModel } from './index';
 export declare function isMachineTool(layer: ILayer | null): layer is import('./index').IMachineToolConfig;
 export declare function hasStationSlotGroup(layer: ILayer | null): layer is Extract<ILayer, {
     stationSlotGroup?: any;
@@ -7,6 +7,12 @@ export declare function isStationSlotGroupBoth(layer: ILayer | null): layer is E
     stationSlotGroupPallet?: any;
     stationSlotGroupTool?: any;
 }>;
+export declare function hasStationSlotLayers(layer: ILayer | null): layer is Extract<ILayer, {
+    stationSlotGroups?: any[];
+}>;
 export declare function hasFixtureChange(layer: ILayer | null): layer is import('./index').ISingleJointRobotConfig | import('./index').IDoubleJointRobotConfig;
 export declare function isRail(layer: ILayer | null): layer is import('./index').IRailConfig;
 export declare function isShuttleStation(layer: ILayer | null): layer is import('./index').IShuttleStationConfig;
+export declare function isPallet(layer: ILayer | null): layer is Extract<ILayer, {
+    className: EnumModel.PALLET;
+}>;

package/dist/types/models/config.types.d.ts

@@ -43,11 +43,26 @@ export interface ILoadingStationConfig extends IModel {
     stationContainerDirection?: 'horizontal' | 'vertical';
     stationSlotGroup?: IStationSlotGroupConfig;
 }
+/**
+ * 接驳站工位层配置
+ */
+export interface IShuttleStationLayerConfig {
+    /** 层索引（从 1 开始） */
+    index: number;
+    /** 工位组配置（托盘或刀具） */
+    stationSlotGroup: IStationSlotGroupConfig;
+    /** 层状态灯颜色（默认 '#666' 灰色，运行时由 layerStatus 驱动） */
+    lightColor?: string;
+    /** 是否显示层状态灯（默认 true） */
+    lightEnabled?: boolean;
+}
 /**
  * 接驳站
  */
 export interface IShuttleStationConfig extends IModel {
     className: EnumModel.SHUTTLE_STATION;
+    /** 多工位层配置数组（一层=一个工位组，可托盘或刀具） */
+    stationSlotGroups?: IShuttleStationLayerConfig[];
 }
 /**
  * 打标机
@@ -114,7 +129,16 @@ export interface IResourceStoreConfig extends IModel {
     stationSlotGroupPallet?: IStationSlotGroupConfig;
     stationSlotGroupTool?: IStationSlotGroupConfig;
 }
+/**
+ * 托盘（独立设备）
+ * 参考 ResourceStore：带铭牌、状态灯；主体背景色可配置（默认 #3C3C3C）
+ */
+export interface IPalletConfig extends IModel {
+    className: EnumModel.PALLET;
+    /** 主体背景色（默认 '#3C3C3C'） */
+    backgroundColor?: string;
+}
 /**
  * 设备层联合类型
  */
-export type ILayer = IMachineToolConfig | ILoadingStationConfig | IShuttleStationConfig | IMarkingMachineConfig | ICleaningMachineConfig | ISingleJointRobotConfig | IDoubleJointRobotConfig | IRGVConfig | IRailConfig | IResourceStoreConfig;
+export type ILayer = IMachineToolConfig | ILoadingStationConfig | IShuttleStationConfig | IMarkingMachineConfig | ICleaningMachineConfig | ISingleJointRobotConfig | IDoubleJointRobotConfig | IRGVConfig | IRailConfig | IResourceStoreConfig | IPalletConfig;

package/dist/types/models/operating.types.d.ts

@@ -49,6 +49,10 @@ export interface ILoadingStationOperating extends IModelOperating {
 export interface IShuttleStationOperating extends IModelOperating {
     className: EnumModel.SHUTTLE_STATION;
     light?: Omit<ILightOperating, 'rotating'>;
+    /** 各层工位组运行状态，键为层索引（1-based），值为状态码或颜色字符串
+     *  代理器 dictColorMap 转换后值为颜色字符串；未转换时值为状态数字码
+     */
+    layerStatus?: Record<number, number | string>;
 }
 /**
  * 打标机站点状态
@@ -127,7 +131,16 @@ export interface IResourceStoreOperating extends IModelOperating {
     x?: number;
     resource?: IResourceOperating;
 }
+/**
+ * 托盘运转状态
+ */
+export interface IPalletOperating extends IModelOperating {
+    className: EnumModel.PALLET;
+    light?: ILightOperating;
+    x?: number;
+    y?: number;
+}
 /**
  * 设备层运转状态的联合类型
  */
-export type ILayerOperating = IMachineToolOperating | ILoadingStationOperating | IShuttleStationOperating | IMarkingMachineOperating | ICleaningMachineOperating | ISingleJointRobotOperating | IDoubleJointRobotOperating | IRGVOperating | IRailOperating | IResourceStoreOperating | IGlobalResourceOperating;
+export type ILayerOperating = IMachineToolOperating | ILoadingStationOperating | IShuttleStationOperating | IMarkingMachineOperating | ICleaningMachineOperating | ISingleJointRobotOperating | IDoubleJointRobotOperating | IRGVOperating | IRailOperating | IResourceStoreOperating | IPalletOperating | IGlobalResourceOperating;

package/dist/ui/models/Pallet.d.ts

@@ -0,0 +1,16 @@
+import { IPalletConfig, IPalletOperating } from '../../types';
+import { Box } from 'leafer';
+import { ModelAbs } from '../abstract/ModelAbs';
+/**
+ * 托盘（独立设备）
+ * 参考 ResourceStore：带铭牌、状态灯；
+ * 主体样式参考 ShuttleStation 的 layerContainer（内嵌纹理、溢出隐藏），支持修改背景色。
+ */
+export declare class Pallet extends ModelAbs<IPalletConfig> {
+    private static readonly CORNER_RADIUS;
+    private light;
+    protected createUi(): Box;
+    private moveX;
+    private moveY;
+    protected operating(data: IPalletOperating): void;
+}

package/dist/ui/models/ShuttleStation.d.ts

@@ -3,19 +3,32 @@ import { Box } from 'leafer';
 import { ModelAbs } from '../abstract/ModelAbs';
 /**
  * 接驳站（ShuttleStation）
- * 整体为 U 型结构，通过单个 Path 元素一体化绘制，内部透明；
- * U 型下方底部区域较宽大，用于放置铭牌与长条状态灯；
- * 该模型仅支持 light 运转状态
+ * 整体为 U 型结构，支持多层工位组配置（每层 = 一个工位组容器）；
+ * 每层独立拥有状态灯，通过 layerStatus 字典数据驱动颜色；
+ * 主体底部有 #EA9734 底座 + 两端半露轮子。
  */
 export declare class ShuttleStation extends ModelAbs<IShuttleStationConfig> {
     private static readonly WALL_THICKNESS;
     private static readonly BASE_HEIGHT;
-    private static readonly BOTTOM_RADIUS;
     private static readonly LIGHT_Y_OFFSET;
     private static readonly NAME_PLATE_Y_OFFSET;
+    private static readonly LAYER_GAP;
+    private static readonly BASE_THICKNESS;
+    private static readonly BASE_EXTEND;
+    private static readonly WHEEL_SIZE;
+    private static readonly WHEEL_INSET;
+    private static readonly WHEEL_COVER_RATIO;
     private light;
+    private layerLights;
+    private layerGroups;
+    private lastLayerStatus;
     private buildUPath;
     private buildOutlinePath;
+    private buildLayers;
+    private buildBaseAndWheels;
     protected createUi(): Box;
     protected operating(data: IShuttleStationOperating): void;
+    private applyLayerStatus;
+    private resolveStatusColor;
+    private statusToColor;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jnrs/lingshu-smart",
-  "version": "2.2.35",
+  "version": "2.2.36",
   "description": "LingShu Smart 2D Digital Twin System.",
   "keywords": [
     "jnrs",

package/dist/components/debug/WsProxy/WsProxyPage.vue.d.ts

@@ -1,14 +0,0 @@
-import { IScene } from '../../../types';
-import { DictFn } from './proxy';
-type __VLS_Props = {
-    /** 场景信息：用于字段映射中像素换算（如 currentCase.scene） */
-    scene?: IScene | null;
-    /** 字典转换函数：用于「字典 Label / 字典 Color」特殊处理
-     *  入参 (name, value, type)，返回 string 赋给画布字段 */
-    dictFn?: DictFn;
-};
-declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
-    scene: IScene | null;
-    dictFn: DictFn;
-}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, HTMLDivElement>;
-export default _default;

package/dist/components/debug/WsProxy/broadcast.d.ts

@@ -1,31 +0,0 @@
-/**
- * @File   : broadcast.ts
- * @Desc.  : WsProxy 跨标签页数据流转（BroadcastChannel）
- *           独立标签页运行代理器（standalone）时，将转换后的 operating / raw / 状态
- *           通过 BroadcastChannel 广播给同源的其他标签页（如数字孪生预览页），
- *           实现「独立 tab 配置代理 → 预览页驱动图形运转」的数据流转。
- */
-/** 广播频道名：同源多个标签页共享 */
-export declare const PROXY_CHANNEL = "jnrs-wsproxy-v1";
-/** 广播消息类型 */
-export type ProxyBroadcastMsg = {
-    type: 'operating';
-    data: unknown;
-} | {
-    type: 'raw';
-    data: unknown;
-} | {
-    type: 'status';
-    connected: boolean;
-};
-/**
- * 创建广播通道
- * @returns BroadcastChannel 实例（浏览器不支持时返回 null）
- */
-export declare function createProxyChannel(): BroadcastChannel | null;
-/** 向广播通道发送消息（standalone 代理器广播用） */
-export declare function broadcastProxy(channel: BroadcastChannel | null, msg: ProxyBroadcastMsg): void;
-/** 订阅广播通道消息（预览页接收用），返回取消订阅函数 */
-export declare function subscribeProxy(channel: BroadcastChannel | null, handler: (msg: ProxyBroadcastMsg) => void): () => void;
-/** 关闭广播通道 */
-export declare function closeProxyChannel(channel: BroadcastChannel | null): void;