Opim isDelete() & show gen error

source/Component/ColorInput/ColorInput.scss

@@ -4,7 +4,7 @@ div.color-input {
 
     div.color-view {
         width: $line-min-height;
-        max-width: $line-min-height;
+        min-width: $line-min-height;
         display: flex;
         justify-content: center;
         align-items: center;
@@ -24,7 +24,12 @@ div.color-input {
         align-items: center;
 
         div.text-box {
+            max-width: calc( 100% - 24px);
+            text-overflow: ellipsis;
+            overflow: hidden;
             padding-left: 1px;
+            white-space: nowrap;
+            word-break: keep-all;
         }
     }
 }

source/Component/ObjectPicker/ObjectPicker.tsx

@@ -13,7 +13,7 @@ import "./ObjectPicker.scss";
 type IObjectType = Label | Group | Range | CtrlObject;
 
 interface IObjectPickerProps extends ITextFieldProps {
-    type: Array<"L" | "G" | "R">;
+    type: string;
     value?: IObjectType;
     valueChange?: (value: IObjectType) => any;
     cleanValue?: () => any;
@@ -28,33 +28,38 @@ class ObjectPicker extends Component<IObjectPickerProps & IMixinStatusProps, IOb
 
     private getAllOption() {
         let option: Array<IObjectType> = [];
-        if (this.props.status) {
+        if (!this.props.status) return option;
 
-            for (let i = 0; i < this.props.type.length; i++) {
+        if (this.props.type.includes("L")) {
+            for (let j = 0; j < this.props.status.model.labelPool.length; j++) {
+                option.push(this.props.status.model.labelPool[j]);
+            }
 
-                if (this.props.type[i] === "L") {
+            if (this.props.type.includes("R")) {
-                    for (let j = 0; j < this.props.status.model.labelPool.length; j++) {
+                option.push(this.props.status.model.allRangeLabel);
-                        option.push(this.props.status.model.labelPool[j]);
+            }
-                    }
-                }
 
-                if (this.props.type[i] === "R") {
+            if (this.props.type.includes("G")) {
-                    for (let j = 0; j < this.props.status.model.objectPool.length; j++) {
+                option.push(this.props.status.model.allGroupLabel);
-                        if (this.props.status.model.objectPool[j] instanceof Range) {
+            }
-                            option.push(this.props.status.model.objectPool[j]);
+        }
-                        }
-                    }    
-                }
 
-                if (this.props.type[i] === "G") {
+        if (this.props.type.includes("R")) {
-                    for (let j = 0; j < this.props.status.model.objectPool.length; j++) {
+            for (let j = 0; j < this.props.status.model.objectPool.length; j++) {
-                        if (this.props.status.model.objectPool[j] instanceof Group) {
+                if (this.props.status.model.objectPool[j] instanceof Range) {
-                            option.push(this.props.status.model.objectPool[j]);
+                    option.push(this.props.status.model.objectPool[j]);
-                        }
-                    }
                 }
             }
         }
+
+        if (this.props.type.includes("G")) {
+            for (let j = 0; j < this.props.status.model.objectPool.length; j++) {
+                if (this.props.status.model.objectPool[j] instanceof Group) {
+                    option.push(this.props.status.model.objectPool[j]);
+                }
+            }
+        }
+        
         return option;
     }
 
@@ -100,9 +105,10 @@ class ObjectPicker extends Component<IObjectPickerProps & IMixinStatusProps, IOb
             isDelete = this.props.value.isDeleted();
         } else {
             disPlayInfo = {
-                name: "",
+                name: "Input.Error.Select",
                 icon: "Label",
-                color: "rgba(0,0,0,0)"
+                color: "transparent",
+                needI18n: true
             }
         }
 
@@ -139,9 +145,9 @@ class ObjectPicker extends Component<IObjectPickerProps & IMixinStatusProps, IOb
                     }}
                 >
                     {   
-                        disPlayInfo.name ? 
+                        disPlayInfo.needI18n ? 
-                            <span>{disPlayInfo.name}</span> :
+                            <Localization i18nKey={disPlayInfo.name as any}/> :
-                            <Localization i18nKey="Input.Error.Select"/>
+                            <span>{disPlayInfo.name}</span>
                     }
                 </div>
                 <div

source/Component/PickerList/PickerList.tsx

@@ -7,9 +7,15 @@ import { Range } from "@Model/Range";
 import { Component, ReactNode, RefObject } from "react";
 import "./PickerList.scss";
 
-type IDisplayInfo = Record<"color" | "icon" | "name", string>;
 type IPickerListItem = CtrlObject | Label | Range | Group;
-type IDisplayItem = {
+interface IDisplayInfo {
+    color: string;
+    icon: string;
+    name: string;
+    needI18n?: boolean;
+};
+
+interface IDisplayItem {
     nameKey: AllI18nKeys;
     key: string;
 	mark?: boolean;
@@ -20,6 +26,7 @@ function getObjectDisplayInfo(item: IPickerListItem): IDisplayInfo {
 	let color: number[] = [];
 	let icon: string = "tag";
 	let name: string = "";
+    let needI18n: boolean = false;
 
 	if (item instanceof Range) {
 		icon = "CubeShape"
@@ -34,15 +41,30 @@ function getObjectDisplayInfo(item: IPickerListItem): IDisplayInfo {
 		name = item.displayName;
 	}
 	if (item instanceof Label) {
-		icon = "tag";
+
-		color = item.color.concat([]);
+		if (item.isBuildIn) {
-		name = item.name;
+            needI18n = true;
+            if (item.id === "AllRange") {
+                icon = "ProductList";
+                name = "Build.In.Label.Name.All.Range";
+            } else if (item.id === "AllGroup") {
+                icon = "SizeLegacy";
+                name = "Build.In.Label.Name.All.Group";
+            }
+        } 
+        
+        else {
+            icon = "tag";
+            color = item.color.concat([]);
+            name = item.name;
+        }
 	}
 
 	return {
-		color: `rgb(${color[0]},${color[1]},${color[2]})`,
+		color: needI18n ? "transparent" : `rgb(${color[0]},${color[1]},${color[2]})`,
 		icon: icon,
-		name: name
+		name: name,
+        needI18n: needI18n
 	}
 }
 
@@ -79,7 +101,11 @@ class PickerList extends Component<IPickerListProps> {
 				<Icon iconName={displayInfo.icon}/>
 			</div>
 			<div className="list-item-name">
-				{displayInfo.name}
+				{
+                    displayInfo.needI18n ? 
+                        <Localization i18nKey={displayInfo.name as any}/> : 
+                        displayInfo.name
+                }
 			</div>
 		</div>;
 	}

source/Localization/EN-US.ts

@@ -44,6 +44,8 @@ const EN_US = {
     "Panel.Info.Label.Details.View": "Edit view label attributes",
     "Panel.Title.Group.Details.View": "Group",
     "Panel.Info.Group.Details.View": "Edit view group attributes",
+    "Build.In.Label.Name.All.Group": "All group",
+    "Build.In.Label.Name.All.Range": "All range",
     "Common.No.Data": "No Data",
     "Common.No.Unknown.Error": "Unknown error",
     "Common.Attr.Title.Basic": "Basic properties",
@@ -73,6 +75,10 @@ const EN_US = {
     "Common.Attr.Key.Generation.Point.X": "Generation Point X",
     "Common.Attr.Key.Generation.Point.Y": "Generation Point Y",
     "Common.Attr.Key.Generation.Point.Z": "Generation Point Z",
+    "Common.Attr.Key.Generation.Error.Empty.Object": "Please select a range object or label to add to the object",
+    "Common.Attr.Key.Generation.Error.Empty.Range.List": "The specified label does not contain any scope objects",
+    "Common.Attr.Key.Generation.Error.Invalid.Range": "The specified scope object is invalid",
+    "Common.Attr.Key.Generation.Error.Invalid.Label": "The specified label has expired",
     "Panel.Info.Range.Details.Attr.Error.Not.Range": "Object is not a Range",
     "Panel.Info.Range.Details.Attr.Error.Unspecified": "Unspecified range object",
     "Panel.Info.Group.Details.Attr.Error.Not.Group": "Object is not a Group",

source/Localization/ZH-CN.ts

@@ -44,6 +44,8 @@ const ZH_CN = {
     "Panel.Info.Label.Details.View": "编辑查看标签属性",
     "Panel.Title.Group.Details.View": "群",
     "Panel.Info.Group.Details.View": "编辑查看群属性",
+    "Build.In.Label.Name.All.Group": "全部群",
+    "Build.In.Label.Name.All.Range": "全部范围",
     "Common.No.Data": "暂无数据",
     "Common.No.Unknown.Error": "未知错误",
     "Common.Attr.Title.Basic": "基础属性",
@@ -73,6 +75,10 @@ const ZH_CN = {
     "Common.Attr.Key.Generation.Point.X": "生成位置 X 坐标",
     "Common.Attr.Key.Generation.Point.Y": "生成位置 Y 坐标",
     "Common.Attr.Key.Generation.Point.Z": "生成位置 Z 坐标",
+    "Common.Attr.Key.Generation.Error.Empty.Object": "请选择一个范围对象或添加至对象的标签",
+    "Common.Attr.Key.Generation.Error.Empty.Range.List": "指定的标签中没有包含任何范围对象",
+    "Common.Attr.Key.Generation.Error.Invalid.Range": "指定的范围对象已失效",
+    "Common.Attr.Key.Generation.Error.Invalid.Label": "指定的标签已失效",
     "Panel.Info.Range.Details.Attr.Error.Not.Range": "对象不是一个范围",
     "Panel.Info.Range.Details.Attr.Error.Unspecified": "未指定范围对象",
     "Panel.Info.Group.Details.Attr.Error.Not.Group": "对象不是一个群",

source/Model/Group.ts

@@ -47,9 +47,9 @@ class Group extends CtrlObject {
     /**
      * 生成错误信息
      */
-    public genErrorMessageShowCount?: string;
+    public genErrorMessageShowCount: number = 0;
 
-    private genInSingelRange(count: number, range: Range) {
+    private genInSingleRange(count: number, range: Range) {
         for (let i = 0; i < count; i++) {
             let individual = new Individual(this);
             individual.position[0] = range.position[0] + (Math.random() - .5) * 2 * range.radius[0];
@@ -75,18 +75,44 @@ class Group extends CtrlObject {
 
         // 单一范围对象
         if (this.genRange instanceof Range) {
-            rangeList = [this.genRange];
+
+            // 无效的对象
+            if (this.genRange.isDeleted()) {
+                this.genErrorMessage = "Common.Attr.Key.Generation.Error.Invalid.Range";
+                return false;
+            }
+            
+            else {
+                rangeList = [this.genRange];
+            }
         }
 
         // 多重范围对象
-        if (this.genRange instanceof Label) {
+        else if (this.genRange instanceof Label) {
-            let objList: CtrlObject[] = this.model.getObjectByLabel(this.genRange);
+
-            rangeList = objList.filter((obj) => obj instanceof Range) as Range[]
+            // 无效的标签
+            if (this.genRange.isDeleted()) {
+                this.genErrorMessage = "Common.Attr.Key.Generation.Error.Invalid.Label";
+                return false;
+            }
+            
+            else {
+                let objList: CtrlObject[] = this.model.getObjectByLabel(this.genRange);
+                rangeList = objList.filter((obj) => {
+                    return obj instanceof Range
+                }) as Range[];
+            }
+        }
+
+        // 空对象
+        else {
+            this.genErrorMessage = "Common.Attr.Key.Generation.Error.Empty.Object";
+            return false;
         }
 
         // 单一范围生成
         if (rangeList.length === 1) {
-            this.genInSingelRange(this.genCount, rangeList[0]);
+            this.genInSingleRange(this.genCount, rangeList[0]);
             return true;
         }
 
@@ -127,12 +153,19 @@ class Group extends CtrlObject {
 
             // 数据生成
             for (let i = 0; i < rangeList.length; i++) {
-                this.genInSingelRange(genData[i], rangeList[i]);
+                this.genInSingleRange(genData[i], rangeList[i]);
             }
             
             return true;
         }
 
+        // 空数据
+        else {
+            this.genErrorMessage = "Common.Attr.Key.Generation.Error.Empty.Range.List";
+            return false;
+        }
+
+        this.genErrorMessage = "Common.No.Unknown.Error";
         return false;
     }
 

source/Model/Label.ts

@@ -6,6 +6,11 @@ import { ObjectID } from "./Renderer";
  */
 class Label {
 
+    /**
+     * 是否为内置标签
+     */
+    public isBuildIn: boolean = false;
+    
     /**
      * 唯一标识符
      */
@@ -41,6 +46,7 @@ class Label {
      * 判断是否为相同标签
      */
     public equal(label: Label): boolean {
+        if (this.isDeleted() || label.isDeleted()) return false;
         return this === label || this.id === label.id;
     }
 
@@ -50,16 +56,32 @@ class Label {
     private deleteFlag: boolean = false;
 
     /**
-     * 是否被删除
+     * 测试是否被删除
      */
-    public isDeleted(): boolean {
+    public testDelete() {
-        if (this.deleteFlag) return true;
         for (let i = 0; i < this.model.labelPool.length; i++) {
             if (this.model.labelPool[i].equal(this)) return false;
         }
         this.deleteFlag = true;
         return true;
     }
+
+    /**
+     * 是否被删除
+     */
+    public isDeleted(): boolean {
+        if (this.isBuildIn) return false;
+        if (this.deleteFlag) return true;
+        return false;
+    }
+
+    /**
+     * 设置为内置标签
+     */
+    public setBuildInLabel(): this {
+        this.isBuildIn = true;
+        return this;
+    }
 }
 
 /**
@@ -101,9 +123,10 @@ class LabelObject {
      * 是否存在标签
      */
     public hasLabel(label: Label): boolean {
+        if (label.isDeleted()) return false;
         let has = false;
         this.labels.forEach((localLabel) => {
-            if (localLabel.equal(label)) has = true;
+            if (!localLabel.isDeleted() && localLabel.equal(label)) has = true;
         });
         return has;
     }

source/Model/Model.ts

@@ -51,6 +51,16 @@ class Model extends Emitter<ModelEvent> {
      */
     public labelPool: Label[] = [];
 
+    /**
+     * 内置标签-全部范围标签
+     */
+    public allRangeLabel = new Label(this, "AllRange").setBuildInLabel();
+
+    /**
+     * 内置标签-全部群标签
+     */
+    public allGroupLabel = new Label(this, "AllGroup").setBuildInLabel();
+
     /**
      * 添加标签
      */
@@ -85,6 +95,7 @@ class Model extends Emitter<ModelEvent> {
 
         if (deletedLabel) {
             this.labelPool.splice(index, 1);
+            deletedLabel.testDelete();
             console.log(`Model: Delete label ${deletedLabel.name ?? deletedLabel.id}`);
             this.emit("labelDelete", deletedLabel);
             this.emit("labelChange", this.labelPool);
@@ -94,23 +105,24 @@ class Model extends Emitter<ModelEvent> {
     /**
      * 通过标签获取指定类型的对象
      * @param label 标签
-     * @param type 筛选类型
      */
-    public getObjectByLabel(
+    public getObjectByLabel(label: Label): CtrlObject[] {
-        label: Label, type?: 
+
-            (new (...p: any) => Range) | 
+        if (label.isDeleted()) return [];
-            (new (...p: any) => Group)
+
-    ): CtrlObject[] {
         const res: CtrlObject[] = [];
         for (let i = 0; i < this.objectPool.length; i++) {
-            if (this.objectPool[i].hasLabel(label)) {
+
-                if (type) {
+            if (label.equal(this.allGroupLabel) && this.objectPool[i] instanceof Group) {
-                    if (this.objectPool[i] instanceof type) {
+                res.push(this.objectPool[i]);
-                        res.push(this.objectPool[i]);
+            }
-                    }
+
-                } else {
+            else if (label.equal(this.allRangeLabel) && this.objectPool[i] instanceof Range) {
-                    res.push(this.objectPool[i]);
+                res.push(this.objectPool[i]);
-                }
+            }
+
+            else if (this.objectPool[i].hasLabel(label)) {
+                res.push(this.objectPool[i]);
             }
         }
         return res;

source/Panel/GroupDetails/GroupDetails.tsx

@@ -130,7 +130,9 @@ class GroupDetails extends Component<IGroupDetailsProps & IMixinStatusProps> {
 				keyI18n="Common.Attr.Key.Generation"
 				onIconName="BuildDefinition" offIconName="BuildDefinition"
 				valueChange={() => {
-					group.genIndividuals();
+					if(!group.genIndividuals()) {
+                        this.props.status?.changeGroupAttrib(group.id, "genErrorMessageShowCount", 1);
+                    }
 				}}
 			/>
 
@@ -169,11 +171,23 @@ class GroupDetails extends Component<IGroupDetailsProps & IMixinStatusProps> {
     }
 
     private renderRangeGenOption(group: Group) {
+
+        let isRenderErrorInfo: boolean = false;
+        if (group.genErrorMessageShowCount > 0) {
+            group.genErrorMessageShowCount --;
+            if (group.genErrorMessage) {
+                isRenderErrorInfo = true;
+            }
+        } else {
+            group.genErrorMessage = undefined;
+        }
+
         return <>
             <ObjectPicker
                 keyI18n="Common.Attr.Key.Generation.Use.Range"
-                type={["L", "R"]}
+                type={"LR"}
                 value={group.genRange}
+                errorI18n={isRenderErrorInfo ? group.genErrorMessage as any : undefined}
                 valueChange={(value) => {
                     this.props.status?.changeGroupAttrib(group.id, "genRange", value);
                 }}

source/Panel/RangeDetails/RangeDetails.tsx

@@ -13,50 +13,24 @@ import "./RangeDetails.scss";
 @useStatusWithEvent("rangeAttrChange", "focusObjectChange", "rangeLabelChange")
 class RangeDetails extends Component<IMixinStatusProps> {
 
-    private renderAttrInput(
-        id: ObjectID, key: AllI18nKeys, val: string | number | undefined,
-        change: (val: string, status: Status) => any,
-        step?: number, max?: number, min?: number
-    ) {
-        const handelFunc = (e: string) => {
-            if (this.props.status) {
-                change(e, this.props.status);
-            }
-        }
-        if (step) {
-            return <AttrInput
-                id={id} isNumber={true} step={step} keyI18n={key}
-                value={val} max={max} min={min}
-                valueChange={handelFunc}
-            />
-        } else {
-            return <AttrInput
-                id={id} keyI18n={key} value={val}
-                valueChange={handelFunc}
-            />
-        }
-    }
-
     private renderFrom(range: Range) {
 
         return <>
 
             <Message i18nKey="Common.Attr.Title.Basic" isTitle first/>
 
-            {this.renderAttrInput(
+            <AttrInput
-                range.id, "Common.Attr.Key.Display.Name", range.displayName,
+                id={range.id} keyI18n="Common.Attr.Key.Display.Name" value={range.displayName}
-                (val, status) => {
+                valueChange={(val) => {
-                    status.changeRangeAttrib(range.id, "displayName", val);
+                    this.props.status?.changeRangeAttrib(range.id, "displayName", val);
-                }
+                }}
-            )}
+            />
 
             <ColorInput
                 keyI18n="Common.Attr.Key.Color"
                 value={range.color} normal
                 valueChange={(color) => {
-                    if (this.props.status) {
+                    this.props.status?.changeRangeAttrib(range.id, "color", color);
-                        this.props.status.changeRangeAttrib(range.id, "color", color);
-                    }
                 }}
             />
 
@@ -64,32 +38,17 @@ class RangeDetails extends Component<IMixinStatusProps> {
                 keyI18n="Common.Attr.Key.Label"
                 labels={range.allLabels()}
                 labelAdd={(label) => {
-                    if (this.props.status) {
+                    this.props.status?.addRangeLabel(range.id, label);
-                        this.props.status.addRangeLabel(range.id, label);
-                    }
                 }}
                 labelDelete={(label) => {
-                    if (this.props.status) {
+                    this.props.status?.deleteRangeLabel(range.id, label);
-                        this.props.status.deleteRangeLabel(range.id, label);
-                    }
                 }}
             />
             
             <TogglesInput
                 keyI18n="Common.Attr.Key.Display"
                 value={range.display} valueChange={(val) => {
-                    if (this.props.status) {
+                    this.props.status?.changeRangeAttrib(range.id, "display", val);
-                        this.props.status.changeRangeAttrib(range.id, "display", val);
-                    }
-                }}
-            />
-
-            <TogglesInput
-                keyI18n="Common.Attr.Key.Update"
-                value={range.update} valueChange={(val) => {
-                    if (this.props.status) {
-                        this.props.status.changeRangeAttrib(range.id, "update", val);
-                    }
                 }}
             />
 
@@ -106,53 +65,59 @@ class RangeDetails extends Component<IMixinStatusProps> {
 
             <Message i18nKey="Common.Attr.Title.Spatial" isTitle/>
 
-            {this.renderAttrInput(
+            <AttrInput
-                range.id, "Common.Attr.Key.Position.X", 
+                id={range.id} isNumber={true} step={.1} keyI18n={"Common.Attr.Key.Position.X"}
-                range.position[0], (val, status) => {
+                value={range.position[0]}
+                valueChange={(val) => {
                     range.position[0] = (val as any) / 1;
-                    status.changeRangeAttrib(range.id, "position", range.position);
+                    this.props.status?.changeRangeAttrib(range.id, "position", range.position);
-                }, .1
+                }}
-            )}
+            />
 
-            {this.renderAttrInput(
+            <AttrInput
-                range.id, "Common.Attr.Key.Position.Y",
+                id={range.id} isNumber={true} step={.1} keyI18n={"Common.Attr.Key.Position.Y"}
-                range.position[1],(val, status) => {
+                value={range.position[1]}
+                valueChange={(val) => {
                     range.position[1] = (val as any) / 1;
-                    status.changeRangeAttrib(range.id, "position", range.position);
+                    this.props.status?.changeRangeAttrib(range.id, "position", range.position);
-                }, .1
+                }}
-            )}
+            />
 
-            {this.renderAttrInput(
+            <AttrInput
-                range.id, "Common.Attr.Key.Position.Z",
+                id={range.id} isNumber={true} step={.1} keyI18n={"Common.Attr.Key.Position.Z"}
-                range.position[2], (val, status) => {
+                value={range.position[2]}
+                valueChange={(val) => {
                     range.position[2] = (val as any) / 1;
-                    status.changeRangeAttrib(range.id, "position", range.position);
+                    this.props.status?.changeRangeAttrib(range.id, "position", range.position);
-                }, .1
+                }}
-            )}
+            />
 			
-            {this.renderAttrInput(
+            <AttrInput
-                range.id, "Common.Attr.Key.Radius.X",
+                id={range.id} isNumber={true} step={.1} keyI18n={"Common.Attr.Key.Radius.X"}
-                range.radius[0], (val, status) => {
+                value={range.radius[0]} min={0}
+                valueChange={(val) => {
                     range.radius[0] = (val as any) / 1;
-                    status.changeRangeAttrib(range.id, "radius", range.radius);
+                    this.props.status?.changeRangeAttrib(range.id, "radius", range.radius);
-                }, .1, undefined, 0
+                }}
-            )}
+            />
 
-            {this.renderAttrInput(
+            <AttrInput
-                range.id, "Common.Attr.Key.Radius.Y",
+                id={range.id} isNumber={true} step={.1} keyI18n={"Common.Attr.Key.Radius.Y"}
-                range.radius[1], (val, status) => {
+                value={range.radius[1]} min={0}
+                valueChange={(val) => {
                     range.radius[1] = (val as any) / 1;
-                    status.changeRangeAttrib(range.id, "radius", range.radius);
+                    this.props.status?.changeRangeAttrib(range.id, "radius", range.radius);
-                }, .1, undefined, 0
+                }}
-            )}
+            />
 
-            {this.renderAttrInput(
+            <AttrInput
-                range.id, "Common.Attr.Key.Radius.Z",
+                id={range.id} isNumber={true} step={.1} keyI18n={"Common.Attr.Key.Radius.Z"}
-                range.radius[2], (val, status) => {
+                value={range.radius[2]} min={0}
+                valueChange={(val) => {
                     range.radius[2] = (val as any) / 1;
-                    status.changeRangeAttrib(range.id, "radius", range.radius);
+                    this.props.status?.changeRangeAttrib(range.id, "radius", range.radius);
-                }, .1, undefined, 0
+                }}
-            )}
+            />
 		</>
     }