@jnrs/lingshu-smart 2.2.7 → 2.2.9

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

@@ -1,5 +1,6 @@
 import { IRowData, IBaseConfig, IInteractiveState } from '../base.types';
 import { EnumResourceType, EnumComponent } from '../enums';
+export type IOriginAround = 'center' | 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
 /**
  * 工位
  */
@@ -11,6 +12,9 @@ export interface IStationSlotConfig extends IBaseConfig, IInteractiveState {
     rotation?: number;
     parentRotation?: number;
     disabled?: boolean;
+    origin?: IOriginAround;
+    around?: IOriginAround;
+    showContainer?: boolean;
 }
 /**
  * 布局选项
@@ -26,8 +30,11 @@ export interface IFlowConfig {
  */
 export interface IStationSlotGroupConfig extends IBaseConfig {
     parentRotation?: number;
+    origin?: IOriginAround;
+    around?: IOriginAround;
     stationSlots: IStationSlotConfig[];
     flowOptions: IFlowConfig;
+    hittable?: boolean;
 }
 /**
  * 资源
@@ -43,10 +50,11 @@ export interface IResourceConfig extends IBaseConfig, IInteractiveState {
  * 状态灯
  */
 export interface ILightConfig extends IBaseConfig {
-    midColor?: string;
+    color?: string;
     strokeColor?: string;
     strokeWidth?: number;
-    isRingShape?: boolean;
+    cornerRadius?: number | number[];
+    showShadow?: boolean;
 }
 /**
  * 进度条

package/dist/types/enums.d.ts

@@ -11,17 +11,20 @@ export declare enum EnumTag {
     OTHER = "\u5176\u4ED6"
 }
 export declare enum EnumModel {
-    SINGLE_GRIPPER_ROBOT = "SingleGripperRobot",
-    DOUBLE_GRIPPER_ROBOT = "DoubleGripperRobot",
+    SINGLE_JOINT_ROBOT = "SingleJointRobot",
+    DOUBLE_JOINT_ROBOT = "DoubleJointRobot",
     RGV = "Rgv",
     MACHINE_TOOL = "MachineTool",
+    MARKING_MACHINE = "MarkingMachine",
     CLEANING_MACHINE = "CleaningMachine",
     LOADING_STATION = "LoadingStation",
     PALLET_STORAGE = "PalletStorage",
     TOOL_STORAGE = "ToolStorage",
     BUFFER_DOCK = "BufferDock",
     GROUND_RAIL = "GroundRail",
-    FOLLOWING_TUGGER = "FollowingTugger"
+    FOLLOWING_TUGGER = "FollowingTugger",
+    RAIL = "Rail",
+    RESOURCE_STORE = "ResourceStore"
 }
 export declare enum EnumComponent {
     STATION_SLOT = "StationSlot",

package/dist/types/guards.d.ts

@@ -1,2 +1,5 @@
 import { ILayer } from './index';
-export declare function hasStationSlotGroup(layer: ILayer | null): layer is import('./index').IMachineToolConfig;
+export declare function isMachineTool(layer: ILayer | null): layer is import('./index').IMachineToolConfig;
+export declare function hasStationSlotGroup(layer: ILayer | null): layer is import('./index').IMachineToolConfig | import('./index').ILoadingStationConfig | import('./index').IMarkingMachineConfig | import('./index').ICleaningMachineConfig | import('./index').IResourceStoreConfig;
+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;

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

@@ -1,4 +1,4 @@
-import { EnumModel, EnumTag } from '../enums';
+import { EnumModel, EnumTag, EnumResourceType } from '../enums';
 import { IRowData, IBaseConfig, IEventState } from '../base.types';
 import { IStationSlotGroupConfig } from '../components/config.types';
 /**
@@ -28,18 +28,65 @@ export interface IModel extends IBaseConfig, IEventState {
  */
 export interface IMachineToolConfig extends IModel {
     className: EnumModel.MACHINE_TOOL;
+    stationContainerDirection?: 'horizontal' | 'vertical';
     stationSlotGroup?: IStationSlotGroupConfig;
 }
 /**
- * 单手夹爪机器人
+ * 装载站
  */
-export interface ISingleGripperRobotConfig extends IModel {
-    className: EnumModel.SINGLE_GRIPPER_ROBOT;
-    currentFixture: 'pallet' | 'cutter';
+export interface ILoadingStationConfig extends IModel {
+    className: EnumModel.LOADING_STATION;
+    stationContainerDirection?: 'horizontal' | 'vertical';
+    stationSlotGroup?: IStationSlotGroupConfig;
+}
+/**
+ * 打标机
+ */
+export interface IMarkingMachineConfig extends IModel {
+    className: EnumModel.MARKING_MACHINE;
+    stationSlotGroup?: IStationSlotGroupConfig;
+}
+/**
+ * 清洗机
+ */
+export interface ICleaningMachineConfig extends IModel {
+    className: EnumModel.CLEANING_MACHINE;
+    stationSlotGroup?: IStationSlotGroupConfig;
+}
+/**
+ * 单关节机器人
+ */
+export interface ISingleJointRobotConfig extends IModel {
+    className: EnumModel.SINGLE_JOINT_ROBOT;
+    currentFixture: EnumResourceType;
     linkRailId?: string;
     linkTrailerId?: string;
 }
+/**
+ * 双关节机器人
+ */
+export interface IDoubleJointRobotConfig extends IModel {
+    className: EnumModel.DOUBLE_JOINT_ROBOT;
+    currentFixture: EnumResourceType;
+    linkRailId?: string;
+    linkTrailerId?: string;
+}
+/**
+ * 轨道
+ */
+export interface IRailConfig extends IModel {
+    className: EnumModel.RAIL;
+    chainDirection?: 'left' | 'right';
+    linkEquipIdArray?: string[];
+}
+/**
+ * 资源库
+ */
+export interface IResourceStoreConfig extends IModel {
+    className: EnumModel.RESOURCE_STORE;
+    stationSlotGroup?: IStationSlotGroupConfig;
+}
 /**
  * 设备层联合类型
  */
-export type ILayer = IMachineToolConfig | ISingleGripperRobotConfig;
+export type ILayer = IMachineToolConfig | ILoadingStationConfig | IMarkingMachineConfig | ICleaningMachineConfig | ISingleJointRobotConfig | IDoubleJointRobotConfig | IRailConfig | IResourceStoreConfig;

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

@@ -1,4 +1,4 @@
-import { EnumModel } from '../enums';
+import { EnumModel, EnumResourceType } from '../enums';
 import { IRowData } from '../base.types';
 import { ILightOperating, IProgressOperating, IEntranceOperating, IResourceOperating } from '../components/operating.types';
 /**
@@ -18,17 +18,83 @@ export interface IMachineToolOperating extends IModelOperating {
     light?: ILightOperating;
     progress?: IProgressOperating;
     entrance?: IEntranceOperating;
+    stationRotatable?: boolean;
 }
 /**
- * 单手夹爪机器人运转状态
+ * 装载站运转状态
  */
-export interface ISingleGripperRobotOperating extends IModelOperating {
-    className: EnumModel.SINGLE_GRIPPER_ROBOT;
-    light: ILightOperating;
-    x: number;
-    y: number;
+export interface ILoadingStationOperating extends IModelOperating {
+    className: EnumModel.LOADING_STATION;
+    light?: Omit<ILightOperating, 'rotating'>;
+    progress?: IProgressOperating;
+    entrance?: IEntranceOperating;
+    stationRotatable?: boolean;
+}
+/**
+ * 打标机站点状态
+ */
+export interface ILaserSiteState {
+    site: number;
+    active: boolean;
+}
+/**
+ * 打标机运转状态
+ */
+export interface IMarkingMachineOperating extends IModelOperating {
+    className: EnumModel.MARKING_MACHINE;
+    light?: Omit<ILightOperating, 'rotating'>;
+    progress?: IProgressOperating;
+    entrance?: IEntranceOperating;
+    laserSiteNumberArray?: ILaserSiteState[];
+}
+/**
+ * 清洗机运转状态
+ */
+export interface ICleaningMachineOperating extends IModelOperating {
+    className: EnumModel.CLEANING_MACHINE;
+    light?: Omit<ILightOperating, 'rotating'>;
+    progress?: IProgressOperating;
+    entrance?: IEntranceOperating;
+}
+/**
+ * 单关节机器人运转状态
+ */
+export interface ISingleJointRobotOperating extends IModelOperating {
+    className: EnumModel.SINGLE_JOINT_ROBOT;
+    light?: ILightOperating;
+    x?: number;
+    y?: number;
+    j1?: number;
+    currentFixture?: EnumResourceType;
+}
+/**
+ * 双关节机器人运转状态
+ */
+export interface IDoubleJointRobotOperating extends IModelOperating {
+    className: EnumModel.DOUBLE_JOINT_ROBOT;
+    light?: ILightOperating;
+    x?: number;
+    y?: number;
+    j1?: number;
+    j2?: number;
+    currentFixture?: EnumResourceType;
+}
+/**
+ * 轨道运转状态
+ */
+export interface IRailOperating extends IModelOperating {
+    className: EnumModel.RAIL;
+    x?: number;
+    botId?: string;
+}
+/**
+ * 资源库运转状态
+ */
+export interface IResourceStoreOperating extends IModelOperating {
+    className: EnumModel.RESOURCE_STORE;
+    light?: ILightOperating;
 }
 /**
  * 设备层运转状态的联合类型
  */
-export type ILayerOperating = IMachineToolOperating | ISingleGripperRobotOperating;
+export type ILayerOperating = IMachineToolOperating | ILoadingStationOperating | IMarkingMachineOperating | ICleaningMachineOperating | ISingleJointRobotOperating | IDoubleJointRobotOperating | IRailOperating | IResourceStoreOperating;

package/dist/ui/abstract/ModelAbs.d.ts

@@ -9,6 +9,8 @@ export declare abstract class ModelAbs<T extends ILayer = ILayer> {
     get ui(): UI<import('leafer').IUIInputData>;
     get config(): T;
     protected get width_05(): number;
+    protected get width_02(): number;
+    protected get width_08(): number;
     protected get height_05(): number;
     protected abstract createUi(): UI;
     protected abstract operating(data: ILayerOperating): void;

package/dist/ui/components/Light.d.ts

@@ -1,8 +1,24 @@
 import { ILightConfig, ILightOperating } from '../../types';
 import { Box } from 'leafer';
 import { ComponentAbs } from '../abstract/ComponentAbs';
-export declare class Light extends ComponentAbs<ILightConfig> {
-    constructor(options: ILightConfig);
+export interface IEllipseLight extends ILightConfig {
+    isRingShape?: boolean;
+}
+export interface IRectLightOperating extends Omit<ILightOperating, 'rotating'> {
+}
+/**
+ * 圆形灯
+ */
+export declare class EllipseLight extends ComponentAbs<IEllipseLight> {
+    constructor(options: IEllipseLight);
     protected createUi(): Box;
     operating(val: ILightOperating): void;
 }
+/**
+ * 矩形灯
+ */
+export declare class RectLight extends ComponentAbs<ILightConfig> {
+    constructor(options: ILightConfig);
+    protected createUi(): Box;
+    operating(val: IRectLightOperating): void;
+}

package/dist/ui/components/StationSlot.d.ts

@@ -7,7 +7,6 @@ export declare class StationSlot extends ComponentAbs<IStationSlotConfig> {
     protected createUi(): Box;
     private get autoFixRotation();
     private get autoCornerRadius();
-    private setupClickableArea;
     /**
      * 添加托盘
      * @param d
@@ -23,6 +22,7 @@ export declare class StationSlot extends ComponentAbs<IStationSlotConfig> {
      * @param flag
      */
     setSiteWorking(flag: boolean): void;
+    toggleVisible(visible: boolean | 0): void;
     /**
      * 销毁
      */

package/dist/ui/factories/createGlass.d.ts

@@ -4,7 +4,9 @@ export interface IGlassConfig {
     y?: number;
     width: number;
     height: number;
-    cornerRadius?: number;
+    cornerRadius?: number | number[];
+    origin?: 'center' | 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
+    around?: 'center' | 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
 }
 /**
  * 创建具有磨砂玻璃效果的 Box 容器

package/dist/ui/factories/createShadow.d.ts

@@ -2,8 +2,8 @@ import { Canvas, IShadowEffect } from 'leafer';
 export interface IShadow {
     width: number;
     height: number;
-    cornerRadius?: number;
-    shadow?: IShadowEffect | IShadowEffect[];
-    innerShadow?: IShadowEffect | IShadowEffect[];
+    cornerRadius?: number | number[];
+    shadow?: IShadowEffect | IShadowEffect[] | null;
+    innerShadow?: IShadowEffect | IShadowEffect[] | null;
 }
 export declare function createShadow(options: IShadow): Canvas;

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

@@ -0,0 +1,14 @@
+import { ICleaningMachineConfig, ICleaningMachineOperating } from '../../types';
+import { Box } from 'leafer';
+import { ModelAbs } from '../abstract/ModelAbs';
+/**
+ * 清洗机
+ */
+export declare class CleaningMachine extends ModelAbs<ICleaningMachineConfig> {
+    private light;
+    private progress;
+    private entrance;
+    private stationSlotGroup;
+    protected createUi(): Box;
+    protected operating(data: ICleaningMachineOperating): void;
+}

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

@@ -0,0 +1,22 @@
+import { IDoubleJointRobotConfig, IDoubleJointRobotOperating } from '../../types';
+import { Box } from 'leafer';
+import { ModelAbs } from '../abstract/ModelAbs';
+/**
+ * 双关节机器人（DoubleJointRobot）
+ */
+export declare class DoubleJointRobot extends ModelAbs<IDoubleJointRobotConfig> {
+    private static readonly DEFAULT_WIDTH;
+    private static readonly DEFAULT_HEIGHT;
+    private static readonly DEFAULT_LIGHT_COLOR;
+    private light1;
+    private light2;
+    private defaultLightColor;
+    private palletStationSlot;
+    private cutterStationSlot;
+    protected createUi(): Box;
+    protected operating(data: IDoubleJointRobotOperating): void;
+    private handleRotateR1;
+    private handleRotateR2;
+    private moveX;
+    private switchFork;
+}

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

@@ -0,0 +1,16 @@
+import { ILoadingStationConfig, ILoadingStationOperating } from '../../types';
+import { Box } from 'leafer';
+import { ModelAbs } from '../abstract/ModelAbs';
+/**
+ * 装载站（LoadingStation）
+ */
+export declare class LoadingStation extends ModelAbs<ILoadingStationConfig> {
+    private static readonly PROGRESS_Y_OFFSET;
+    private static readonly NAME_PLATE_Y_OFFSET;
+    private light;
+    private progress;
+    private entrance;
+    private stationSlotGroup;
+    protected createUi(): Box;
+    protected operating(data: ILoadingStationOperating): void;
+}

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

@@ -5,13 +5,14 @@ import { ModelAbs } from '../abstract/ModelAbs';
  * 机床
  */
 export declare class MachineTool extends ModelAbs<IMachineToolConfig> {
+    private static readonly STATION_OFFSET;
     private light;
     private progress;
     private entrance;
     private stationSlotGroup;
-    constructor(options: IMachineToolConfig);
-    private get width_02();
-    private get width_08();
+    private stationContainer;
+    private stationContainerBaseRotation;
     protected createUi(): Box;
     protected operating(data: IMachineToolOperating): void;
+    private rotateStationContainerWithAnimation;
 }

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

@@ -0,0 +1,16 @@
+import { IMarkingMachineConfig, IMarkingMachineOperating } from '../../types';
+import { Box } from 'leafer';
+import { ModelAbs } from '../abstract/ModelAbs';
+/**
+ * 打标机
+ */
+export declare class MarkingMachine extends ModelAbs<IMarkingMachineConfig> {
+    private light;
+    private progress;
+    private entrance;
+    private stationSlotGroup;
+    protected createUi(): Box;
+    protected operating(data: IMarkingMachineOperating): void;
+    private renderLaser;
+    private setLaserWorking;
+}

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

@@ -0,0 +1,15 @@
+import { IRailConfig, IRailOperating } from '../../types';
+import { Box } from 'leafer';
+import { ModelAbs } from '../abstract/ModelAbs';
+/**
+ * 轨道（Rail）
+ */
+export declare class Rail extends ModelAbs<IRailConfig> {
+    private static readonly DEFAULT_HEIGHT;
+    private chains;
+    protected createUi(): Box;
+    protected operating(data: IRailOperating): void;
+    private initChains;
+    private createChain;
+    private moveChain;
+}

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

@@ -0,0 +1,12 @@
+import { IResourceStoreConfig, IResourceStoreOperating } from '../../types';
+import { Box } from 'leafer';
+import { ModelAbs } from '../abstract/ModelAbs';
+/**
+ * 资源库
+ */
+export declare class ResourceStore extends ModelAbs<IResourceStoreConfig> {
+    private light;
+    private stationSlotGroup;
+    protected createUi(): Box;
+    protected operating(data: IResourceStoreOperating): void;
+}

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

@@ -0,0 +1,22 @@
+import { ISingleJointRobotConfig, ISingleJointRobotOperating } from '../../types';
+import { Box } from 'leafer';
+import { ModelAbs } from '../abstract/ModelAbs';
+/**
+ * 单关节机器人
+ * 基于 ModelAbs 重构，保留 Bot.js 核心运行行为：状态灯、沿 X 移动、手臂旋转、夹具切换。
+ */
+export declare class SingleJointRobot extends ModelAbs<ISingleJointRobotConfig> {
+    private static readonly DEFAULT_WIDTH;
+    private static readonly DEFAULT_HEIGHT;
+    private static readonly DEFAULT_LIGHT_COLOR;
+    private light1;
+    private light2;
+    private defaultLightColor;
+    private palletStationSlot;
+    private cutterStationSlot;
+    protected createUi(): Box;
+    protected operating(data: ISingleJointRobotOperating): void;
+    private handleRotate;
+    private moveX;
+    private switchFork;
+}

package/dist/ui/shapes/NamePlate.d.ts

@@ -9,7 +9,9 @@ export interface NamePlateOptions {
     fill?: string;
     textColor?: string;
     fontSize?: number;
+    stroke?: string;
+    strokeWidth?: number;
     screwHole?: boolean;
     zIndex?: number | string;
 }
-export declare function NamePlateUi(options: NamePlateOptions): Box;
+export declare function NamePlate(options: NamePlateOptions): Box;

package/dist/ui/shapes/ScrewHole.d.ts

@@ -8,4 +8,4 @@ export interface ScrewHoleOptions {
     fill?: string;
     styleType?: ScrewHoleStyle;
 }
-export declare function ScrewHoleUi(options?: ScrewHoleOptions): Box;
+export declare function ScrewHole(options?: ScrewHoleOptions): Box;

package/dist/ui/shapes/Texture.d.ts

@@ -1,12 +1,14 @@
-import { Box } from 'leafer';
+import { Box, IFill } from 'leafer';
 export type TextureEffect = 'LightGrid' | 'DarkGrid' | 'MatrixGrid' | 'LightDot' | 'DarkDot' | 'WoodFloor' | 'VerticalBar';
 export interface ITextureOptions {
+    className?: string;
     width?: number;
     height?: number;
     effect?: TextureEffect;
     opacity?: number;
     scale?: number;
     rotation?: number;
-    cornerRadius?: number;
+    cornerRadius?: number | number[];
+    fill?: IFill;
 }
-export declare function TextureUi(options?: ITextureOptions): Box;
+export declare function Texture(options?: ITextureOptions): Box;

package/dist/ui/utils/attr.d.ts

@@ -4,6 +4,6 @@ import { IInteractiveState, IEventState } from '../../types';
  * 根据交互属性设置鼠标样式和 hover 效果
  * @param target UI 目标对象
  * @param data 交互属性数据
- * @param type 效果类型，默认为 'shadow'，可选 'border'
+ * @param type 效果类型，默认为 'shadow'，可选 'border'('border' 特别适用于 overflow: 'hidden' 的容器)
  */
 export declare function setCursor(target: UI, data: IInteractiveState & IEventState, type?: 'shadow' | 'border'): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jnrs/lingshu-smart",
-  "version": "2.2.7",
+  "version": "2.2.9",
   "description": "LingShu Smart 2D Digital Twin System.",
   "keywords": [
     "jnrs",
@@ -45,7 +45,7 @@
     "pinia-plugin-persistedstate": "^4.7.1",
     "vue": "^3.5.22",
     "vue-i18n": "^9.14.5",
-    "@jnrs/shared": "1.1.20"
+    "@jnrs/shared": "1.1.23"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",
@@ -66,8 +66,8 @@
   },
   "scripts": {
     "dev": "vite",
-    "build": "vue-tsc --build && vite build",
+    "build": "rimraf dist && pnpm type-check && vite build",
     "release": "node ./scripts/release.mjs",
-    "type-check": "vue-tsc --build"
+    "type-check": "vue-tsc --noEmit"
   }
 }