!2992 优化:显示隐藏功能其他项增加“文字”选项

pull/2991/MERGE
钱若寒 1 month ago committed by ChenX
parent 7957ee93be
commit 05824835db

@ -994,7 +994,7 @@ export const DefaultR2b2Option: IRect2Br2Option = {
Object.freeze(DefaultR2b2Option); Object.freeze(DefaultR2b2Option);
export const DefaultHSOption: IHSOption = { export const DefaultHSOption: IHSOption = {
version: 6, version: 7,
isAll: true, isAll: true,
isHide: true, isHide: true,
isDelete: false, isDelete: false,
@ -1029,7 +1029,8 @@ export const DefaultHSOption: IHSOption = {
pointLight: false, pointLight: false,
rectAreaLight: false, rectAreaLight: false,
customBoardName: "", customBoardName: "",
matchType: ECompareType.Equal matchType: ECompareType.Equal,
text: false,
}; };
export const DefaultCommonPanelOption: CommonPanelConfigOption = { export const DefaultCommonPanelOption: CommonPanelConfigOption = {

@ -29,6 +29,7 @@ import { RectAreaLight } from '../../../DatabaseServices/Lights/RectAreaLight';
import { SpotLight } from '../../../DatabaseServices/Lights/SpotLight'; import { SpotLight } from '../../../DatabaseServices/Lights/SpotLight';
import { ProcessingGroupRecord } from '../../../DatabaseServices/ProcessingGroup/ProcessingGroupRecord'; import { ProcessingGroupRecord } from '../../../DatabaseServices/ProcessingGroup/ProcessingGroupRecord';
import { TemplateRecord } from '../../../DatabaseServices/Template/TemplateRecord'; import { TemplateRecord } from '../../../DatabaseServices/Template/TemplateRecord';
import { Text } from '../../../DatabaseServices/Text/Text';
import { CommandWrap } from '../../../Editor/CommandMachine'; import { CommandWrap } from '../../../Editor/CommandMachine';
import { PromptStatus } from '../../../Editor/PromptResult'; import { PromptStatus } from '../../../Editor/PromptResult';
import { SelectSetBase } from '../../../Editor/SelectBase'; import { SelectSetBase } from '../../../Editor/SelectBase';
@ -79,8 +80,8 @@ export const KEY2LABEL: AllString<IHSOption> = {
custom: '板名', custom: '板名',
spotlight: "射灯", spotlight: "射灯",
pointLight: "点光源", pointLight: "点光源",
rectAreaLight: "矩形光源" rectAreaLight: "矩形光源",
text: "文字",
}; };
const BOARD_KEYS = [ const BOARD_KEYS = [
@ -98,7 +99,7 @@ const CURVE_KEYS = [
"curve", "line", "polyline", "circle", "arc" "curve", "line", "polyline", "circle", "arc"
]; ];
const OTHERS = [ const OTHERS = [
"dim", "visual" "dim", "visual", "text"
]; ];
const LIGHTING = [ const LIGHTING = [
"spotlight", "pointLight", "rectAreaLight" "spotlight", "pointLight", "rectAreaLight"
@ -685,6 +686,11 @@ export class HideSelectModal extends React.Component<{ store: HideSelectStore; h
if (option.visual) if (option.visual)
resEntSet.add(e); resEntSet.add(e);
} }
if (e instanceof Text)
{
if (option.text)
resEntSet.add(e);
}
} }
return resEntSet; return resEntSet;
}; };

@ -38,4 +38,5 @@ export interface IHSOption extends IBaseOption
spotlight?: boolean; //射灯 spotlight?: boolean; //射灯
pointLight?: boolean; //点光源 pointLight?: boolean; //点光源
rectAreaLight?: boolean; //矩形光 rectAreaLight?: boolean; //矩形光
text: boolean;
} }

@ -70,6 +70,11 @@ export class HideSelectStore implements IConfigStore
cof.option.rectAreaLight = false; cof.option.rectAreaLight = false;
cof.option.pointLight = false; cof.option.pointLight = false;
} }
if (cof.option.version < 7)
{
cof.option.version = 7;
cof.option.text = false;
}
Object.assign(this.m_Option, cof.option); Object.assign(this.m_Option, cof.option);
this.CheckIsAll(); this.CheckIsAll();
this.isRev = false; this.isRev = false;

Loading…
Cancel
Save