diff --git a/src/UI/Components/Board/BoardFindCommon.tsx b/src/UI/Components/Board/BoardFindCommon.tsx
index 9897713ec..6b40dbf26 100644
--- a/src/UI/Components/Board/BoardFindCommon.tsx
+++ b/src/UI/Components/Board/BoardFindCommon.tsx
@@ -60,14 +60,18 @@ export class BoardFindItem extends React.Component<IBoardProps, {}> {
                         option.compareType[k] = e.target.value;
                     }}
                 />
-                <ToasterInput
-                    inputClassName='toasterInput'
-                    type={CheckObjectType.BF}
-                    option={option}
-                    uiOption={uiOption}
-                    optKey={k}
-                    onChange={e => option[k] = e.target.value}
-                />
+                <Tooltip
+                    content={option[k]}
+                >
+                    <ToasterInput
+                        inputClassName='toasterInput'
+                        type={CheckObjectType.BF}
+                        option={option}
+                        uiOption={uiOption}
+                        optKey={k}
+                        onChange={e => option[k] = e.target.value}
+                    />
+                </Tooltip>
                 {
                     hasTolerance &&
                     <input
@@ -173,11 +177,21 @@ export class MatColorCom extends React.Component<IMatColorComProps>
                                 }}
                             />
                         }
-                        <input
-                            tabIndex={1}
-                            className={Classes.INPUT}
-                            value={option[EBoardKeyList.BrMat]}
-                            onChange={e => option[EBoardKeyList.BrMat] = e.target.value} />
+                        <div>
+                            <Tooltip
+                                content={option[EBoardKeyList.BrMat]}
+                            >
+                                <input
+                                    style={{
+                                        margin: "0 5px",
+                                        width: "75px",
+                                    }}
+                                    tabIndex={1}
+                                    className={Classes.INPUT}
+                                    value={option[EBoardKeyList.BrMat]}
+                                    onChange={e => option[EBoardKeyList.BrMat] = e.target.value} />
+                            </Tooltip>
+                        </div>
                     </div>
                     <div>
                         <Checkbox
@@ -202,11 +216,21 @@ export class MatColorCom extends React.Component<IMatColorComProps>
                                 }}
                             />
                         }
-                        <input
-                            tabIndex={1}
-                            className={Classes.INPUT}
-                            value={option[EBoardKeyList.Mat]}
-                            onChange={e => option[EBoardKeyList.Mat] = e.target.value} />
+                        <div>
+                            <Tooltip
+                                content={option[EBoardKeyList.Mat]}
+                            >
+                                <input
+                                    style={{
+                                        margin: "0 5px",
+                                        width: "75px",
+                                    }}
+                                    tabIndex={1}
+                                    className={Classes.INPUT}
+                                    value={option[EBoardKeyList.Mat]}
+                                    onChange={e => option[EBoardKeyList.Mat] = e.target.value} />
+                            </Tooltip>
+                        </div>
                     </div>
                     <div>
                         <span>颜色</span>
@@ -221,11 +245,21 @@ export class MatColorCom extends React.Component<IMatColorComProps>
                                 }}
                             />
                         }
-                        <input
-                            tabIndex={1}
-                            className={Classes.INPUT}
-                            value={option[EBoardKeyList.Color]}
-                            onChange={e => option[EBoardKeyList.Color] = e.target.value} />
+                        <div>
+                            <Tooltip
+                                content={option[EBoardKeyList.Color]}
+                            >
+                                <input
+                                    style={{
+                                        margin: "0 5px",
+                                        width: "75px",
+                                    }}
+                                    tabIndex={1}
+                                    className={Classes.INPUT}
+                                    value={option[EBoardKeyList.Color]}
+                                    onChange={e => option[EBoardKeyList.Color] = e.target.value} />
+                            </Tooltip>
+                        </div>
                     </div>
                 </div>
                 <div className="flex">
diff --git a/src/UI/Components/Board/BoardFindModify.tsx b/src/UI/Components/Board/BoardFindModify.tsx
index 19bdc5ba1..b647068bf 100644
--- a/src/UI/Components/Board/BoardFindModify.tsx
+++ b/src/UI/Components/Board/BoardFindModify.tsx
@@ -434,16 +434,24 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar
                                 option.compareType.brName = e.target.value as ECompareType;
                             }}
                         />
-                        <input
-                            tabIndex={1}
-                            className={Classes.INPUT}
-                            value={option.brName}
-                            onChange={e =>
-                            {
-                                option.brName = e.target.value;
-                                this.setState({ userInputName: e.target.value });
-                            }}
-                        />
+                        <Tooltip
+                            content={option.brName}
+                        >
+                            <input
+                                style={{
+                                    margin: "0 5px",
+                                    width: "75px",
+                                }}
+                                tabIndex={1}
+                                className={Classes.INPUT}
+                                value={option.brName}
+                                onChange={e =>
+                                {
+                                    option.brName = e.target.value;
+                                    this.setState({ userInputName: e.target.value });
+                                }}
+                            />
+                        </Tooltip>
                         <div className="select-name">
                             <Button text="拾取" onClick={() => this.getBoardOption("brName", "选择板件获取板名")} />
                             <Popover
@@ -522,16 +530,24 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar
                                 option.compareType.hardwareName = e.target.value as ECompareType;
                             }}
                         />
-                        <input
-                            tabIndex={1}
-                            className={Classes.INPUT}
-                            value={option.hardwareName}
-                            onChange={e =>
-                            {
-                                option.hardwareName = e.target.value;
-                                this.setState({ hardwareInput: e.target.value });
-                            }}
-                        />
+                        <Tooltip
+                            content={option.hardwareName}
+                        >
+                            <input
+                                style={{
+                                    margin: "0 5px",
+                                    width: "75px",
+                                }}
+                                tabIndex={1}
+                                className={Classes.INPUT}
+                                value={option.hardwareName}
+                                onChange={e =>
+                                {
+                                    option.hardwareName = e.target.value;
+                                    this.setState({ hardwareInput: e.target.value });
+                                }}
+                            />
+                        </Tooltip>
                         <div className="select-name">
                             <Button text="拾取" onClick={() => this.getHardWareOption("hardwareName", "选择五金获取实体名")} />
                             <Popover