!2383 还原:根据板材名改板颜色,单击板件亮显列表

src/Add-on/ChangeColorByBoard/ChangeColorByMaterial.tsx

@@ -2,7 +2,7 @@ import { Classes } from '@blueprintjs/core';
 import { observable } from 'mobx';
 import { observer } from 'mobx-react';
 import * as React from 'react';
-import { end } from 'xaop';
+import { begin, end } from 'xaop';
 import { app } from "../../ApplicationServices/Application";
 import { arrayRemoveOnce } from '../../Common/ArrayExt';
 import { EBoardKeyList } from "../../Common/BoardKeyList";
@@ -13,6 +13,7 @@ import { FixedNotZero } from "../../Common/Utils";
 import { Board } from "../../DatabaseServices/Entity/Board";
 import { Command, commandMachine } from "../../Editor/CommandMachine";
 import { PromptSsgetResult, PromptStatus } from '../../Editor/PromptResult';
+import { SelectSetBase } from '../../Editor/SelectBase';
 import { Production } from '../../Production/Product';
 import { BoardModalType } from '../../UI/Components/Board/BoardModalType';
 import { DialogUserConfig } from '../../UI/Components/Board/UserConfigComponent';
@@ -151,6 +152,36 @@ export class BoardColorMaterialMapDialog extends React.Component<BoardColorMater
                 }
             })
         );
+
+        let selectCtrl = app.Editor.SelectCtrl;
+        this.removeAop.push(
+            begin(selectCtrl, selectCtrl.AddSelect, (ss: SelectSetBase) =>
+            {
+                if (this.onCtrlKeyBoard) return;
+                let br = ss.SelectEntityList[0];
+                if (!br) return;
+                if (br instanceof Board)
+                {
+                    let option = ChangeColorByBoardMaterialStore.GetInstance().m_Option;
+                    let key: string = `板材料:${br.BoardProcessOption[EBoardKeyList.Mat] !== "" ? br.BoardProcessOption[EBoardKeyList.Mat] : "无"}`;
+                    if (option.accordMaterialName)
+                    {
+                        key += `  -  板材名:${br.BoardProcessOption[EBoardKeyList.BrMat] !== "" ? br.BoardProcessOption[EBoardKeyList.BrMat] : "无"}`;
+                    }
+                    if (option.accordMaterialColor)
+                    {
+                        key += `  -  板材颜色:${br.BoardProcessOption[EBoardKeyList.Color] !== "" ? br.BoardProcessOption[EBoardKeyList.Color] : "无"}`;
+                    }
+                    if (option.accordThickness)
+                    {
+                        let size = Production.GetSpiteSize(br);
+                        let brbh = size?.spliteThickness ?? br.Thickness;
+                        key += `  -  板厚:${FixedNotZero(brbh, 1).padEnd(3)}`;
+                    }
+                    this.selectIndexs = [this.props.data.findIndex(item => item.mtl === key)];
+                }
+            })
+        );
     }
 
     componentWillUnmount()

src/Add-on/ChangeColorByRoomOrCabinet/ChangeColorByRoomOrCabinet.tsx

@@ -12,6 +12,7 @@ import { KeyBoard } from '../../Common/KeyEnum';
 import { Board } from "../../DatabaseServices/Entity/Board";
 import { Command, commandMachine } from "../../Editor/CommandMachine";
 import { PromptSsgetResult, PromptStatus } from '../../Editor/PromptResult';
+import { SelectSetBase } from '../../Editor/SelectBase';
 import { BoardModalType } from '../../UI/Components/Board/BoardModalType';
 import { DialogUserConfig } from '../../UI/Components/Board/UserConfigComponent';
 import { CommonModal } from '../../UI/Components/Modal/ModalContainer';
@@ -142,6 +143,30 @@ export class BoardColorByRoomOrCabinetDialog extends React.Component<{
                 }
             })
         );
+
+        let selectCtrl = app.Editor.SelectCtrl;
+        this._RemoveFun.push(
+            begin(selectCtrl, selectCtrl.AddSelect, (ss: SelectSetBase) =>
+            {
+                if (this._OnCtrlKeyBoard) return;
+                let br = ss.SelectEntityList[0];
+                if (!br) return;
+                if (br instanceof Board)
+                {
+                    let option = ChangeColorByRoomOrCabinetStore.GetInstance().m_Option;
+                    let key: string = "";
+                    if (option.accordRoomName)
+                    {
+                        key += `房间名:${br.BoardProcessOption[EBoardKeyList.RoomName] !== "" ? br.BoardProcessOption[EBoardKeyList.RoomName] : "无"}`;
+                    }
+                    if (option.accordCabinetName)
+                    {
+                        key += `  ${option.accordRoomName ? "-" : ""}  柜名:${br.BoardProcessOption[EBoardKeyList.CabinetName] !== "" ? br.BoardProcessOption[EBoardKeyList.CabinetName] : "无"}`;
+                    }
+                    this._SelectIndexs = [this.props.data.findIndex(item => item.mtl === key)];
+                }
+            })
+        );
     }
 
     componentWillUnmount()