fixed form builder object bug
This commit is contained in:
parent
2b4795dfc2
commit
c19e4c684e
6 changed files with 17 additions and 8 deletions
1
p.json
Normal file
1
p.json
Normal file
|
@ -0,0 +1 @@
|
||||||
|
{"name": "default","collision_shape": "BOX","loc_xyz": [0, 0, 0],"rot_euler": [0,0, 0],"material_randomization": { "specular": [0, 1], "roughness": [0, 1], "metallic": [0, 1], "base_color": [ [ 0, 0, 0, 1 ], [ 1, 1, 1, 1 ] ]}}
|
|
@ -158,7 +158,11 @@ export class FormViewModel {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (inputResult instanceof Array) inputResult = JSON.stringify(inputResult.map((el) => JSON.parse(el)));
|
|
||||||
|
// if(inputResult instanceof Array) console.log(inputResult.map((el) => JSON.parse(el)))
|
||||||
|
|
||||||
|
if (inputResult instanceof Array)
|
||||||
|
inputResult = JSON.stringify(inputResult.map((el) => JSON.parse(el.replace(/[^\x00-\x7F]/g, ""))));
|
||||||
operations.push({ regExp: new RegExp("\\${" + element.name + ".*?}"), result: inputResult });
|
operations.push({ regExp: new RegExp("\\${" + element.name + ".*?}"), result: inputResult });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -15,6 +15,7 @@ import { TemplateModelCard } from "./ui/template_model_card";
|
||||||
import { Icon } from "../../../core/ui/icons/icons";
|
import { Icon } from "../../../core/ui/icons/icons";
|
||||||
import { useStore } from "../../../core/helper/use_store";
|
import { useStore } from "../../../core/helper/use_store";
|
||||||
import { FormBuilderValidationModel } from "../../../core/model/form_builder_validation_model";
|
import { FormBuilderValidationModel } from "../../../core/model/form_builder_validation_model";
|
||||||
|
import { InputV2 } from "../../../core/ui/input/input_v2";
|
||||||
|
|
||||||
interface IItem {
|
interface IItem {
|
||||||
name: string;
|
name: string;
|
||||||
|
@ -144,15 +145,15 @@ export const CalculationInstanceScreen = observer(() => {
|
||||||
/>
|
/>
|
||||||
<CoreInput label="Имя" onChange={(text) => store.updateForm({ name: text })} />
|
<CoreInput label="Имя" onChange={(text) => store.updateForm({ name: text })} />
|
||||||
<CoreInput label="Команда для запуска" onChange={(text) => store.updateForm({ script: text })} />
|
<CoreInput label="Команда для запуска" onChange={(text) => store.updateForm({ script: text })} />
|
||||||
<CoreInput
|
<InputV2
|
||||||
label="FormBuilder Result"
|
label="FormBuilder Result"
|
||||||
onChange={(text) => (store.viewModel.formBuilder.result = text)}
|
onChange={(text) => (store.viewModel.formBuilder.result = text)}
|
||||||
style={{ height: 200, overflow: "overlay" }}
|
// style={{ height: 200, overflow: "overlay" }}
|
||||||
/>
|
/>
|
||||||
<CoreInput
|
<InputV2
|
||||||
label="FormBuilder Context"
|
label="FormBuilder Context"
|
||||||
onChange={(text) => (store.viewModel.formBuilder.context = text)}
|
onChange={(text) => (store.viewModel.formBuilder.context = text)}
|
||||||
style={{ height: 200, overflow: "overlay" }}
|
// style={{ height: 200, overflow: "overlay" }}
|
||||||
/>
|
/>
|
||||||
<div style={{ height: 10 }} />
|
<div style={{ height: 10 }} />
|
||||||
<CoreButton
|
<CoreButton
|
||||||
|
|
|
@ -96,7 +96,6 @@ export const datasetFormMockResult = `
|
||||||
"loc_range_low": [\${LOC_RANGE_LOW_1:number:-1}, \${LOC_RANGE_LOW_2:number:-1},\${LOC_RANGE_LOW_3:number:0}],
|
"loc_range_low": [\${LOC_RANGE_LOW_1:number:-1}, \${LOC_RANGE_LOW_2:number:-1},\${LOC_RANGE_LOW_3:number:0}],
|
||||||
"loc_range_high": [\${LOC_RANGE_HIGH_1:number:1}, \${LOC_RANGE_HIGH_2:number:1},\${LOC_RANGE_HIGH_3:number:2}]
|
"loc_range_high": [\${LOC_RANGE_HIGH_1:number:1}, \${LOC_RANGE_HIGH_2:number:1},\${LOC_RANGE_HIGH_3:number:2}]
|
||||||
},
|
},
|
||||||
"selectParts":\${<SelectScene/>:OBJECT:{"details": []},
|
|
||||||
"scene":{
|
"scene":{
|
||||||
"objects": \${OBJECTS_SCENE:Array<OBJECTS_SCENE>:[]},
|
"objects": \${OBJECTS_SCENE:Array<OBJECTS_SCENE>:[]},
|
||||||
"lights": \${LIGHTS:Array<LIGHTS>:[]}
|
"lights": \${LIGHTS:Array<LIGHTS>:[]}
|
||||||
|
|
|
@ -29,7 +29,7 @@ export const DigitalTwinsScreen = observer(() => {
|
||||||
onClick={() => store.editDrawer(DrawersDigitalTwin.newInstanceTwinTemplate, true)}
|
onClick={() => store.editDrawer(DrawersDigitalTwin.newInstanceTwinTemplate, true)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
<div>{store.digitalTwinsInstances?.map((el) => <>{el.name}</>)}</div>
|
||||||
<Drawer
|
<Drawer
|
||||||
width={(window.innerWidth / 100) * 50}
|
width={(window.innerWidth / 100) * 50}
|
||||||
title={store.titleDrawer}
|
title={store.titleDrawer}
|
||||||
|
|
|
@ -7,6 +7,8 @@ import { RouterProvider } from "react-router-dom";
|
||||||
import { router } from "./core/routers/routers";
|
import { router } from "./core/routers/routers";
|
||||||
import { configure } from "mobx";
|
import { configure } from "mobx";
|
||||||
import { ThemeStore } from "./core/store/theme_store";
|
import { ThemeStore } from "./core/store/theme_store";
|
||||||
|
import { FormBuilder } from "./core/ui/form_builder/form_builder";
|
||||||
|
import { FormBuilderValidationModel } from "./core/model/form_builder_validation_model";
|
||||||
|
|
||||||
configure({
|
configure({
|
||||||
enforceActions: "never",
|
enforceActions: "never",
|
||||||
|
@ -21,6 +23,8 @@ root.render(
|
||||||
<>
|
<>
|
||||||
<SocketListener>
|
<SocketListener>
|
||||||
<RouterProvider router={router} />
|
<RouterProvider router={router} />
|
||||||
|
|
||||||
|
|
||||||
</SocketListener>
|
</SocketListener>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue