|
|
|
@ -61,6 +61,7 @@ export const KEY2LABEL: AllString<IHSOption> = {
|
|
|
|
|
hinge: "铰链",
|
|
|
|
|
hwComposity: "复合实体",
|
|
|
|
|
dim: "标注",
|
|
|
|
|
noChaiDan: "不拆单的板",
|
|
|
|
|
curve: "曲线",
|
|
|
|
|
line: "直线",
|
|
|
|
|
polyline: "多段线",
|
|
|
|
@ -72,7 +73,7 @@ export const KEY2LABEL: AllString<IHSOption> = {
|
|
|
|
|
const BOARD_KEYS = [
|
|
|
|
|
"layer", "behind", "vertial", "footer", "tbBoard",
|
|
|
|
|
"closingStrip", "specialShape", "door", "drawer", "winerack",
|
|
|
|
|
"lattice", "custom",
|
|
|
|
|
"lattice", "noChaiDan", "custom",
|
|
|
|
|
];
|
|
|
|
|
const HOLE_KEYS = [
|
|
|
|
|
"hole", "wood", "nails"
|
|
|
|
@ -379,9 +380,9 @@ export class HideSelectModal extends React.Component<{ store: HideSelectStore; h
|
|
|
|
|
|
|
|
|
|
if (option[key])
|
|
|
|
|
ens.forEach(e => e && resEntSet.add(e));
|
|
|
|
|
else if (option.custom)//自定义板名搜索
|
|
|
|
|
else if (option.custom || option.noChaiDan)
|
|
|
|
|
{
|
|
|
|
|
//避免使用板名搜索时,这些实体被禁用
|
|
|
|
|
//避免被模块归类时(门、抽屉、酒格、格子抽), 其他条件失效
|
|
|
|
|
}
|
|
|
|
|
else if (option.hwComposity)//避免使用五金搜索时,这些实体被禁用
|
|
|
|
|
for (let en of ens)
|
|
|
|
@ -420,6 +421,16 @@ export class HideSelectModal extends React.Component<{ store: HideSelectStore; h
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//不拆单板件
|
|
|
|
|
if (option.noChaiDan)
|
|
|
|
|
{
|
|
|
|
|
if (!b.IsChaiDan)
|
|
|
|
|
{
|
|
|
|
|
resEntSet.add(b);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (option.specialShape)
|
|
|
|
|
{
|
|
|
|
|
if (b.IsSpecialShape)
|
|
|
|
|