SQuiz/frontPanel
2
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

неотображение кнопки ветвления у 4 вопросов без ветвления

Browse Source
This commit is contained in:
Nastya 2023-12-27 11:42:10 +03:00
parent ec93f8a052
commit 24c1311631
3 changed files with 60 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.tsx
View File

@ -53,7 +53,7 @@ export default function App() {
}); });
useUserAccountFetcher({ useUserAccountFetcher({
url: "https://squiz.pena.digital/squiz/account", url: "https://squiz.pena.digital/customer/account",
userId, userId,
onNewUserAccount: setUserAccount, onNewUserAccount: setUserAccount,
onError: (error) => { onError: (error) => {

104
src/pages/Questions/ButtonsOptions.tsx
View File

@ -118,53 +118,57 @@ export default function ButtonsOptions({
> >
{buttonSetting.map(({ icon, title, value, myFunc }) => ( {buttonSetting.map(({ icon, title, value, myFunc }) => (
<Box key={value}> <Box key={value}>
{value === "branching" ? ( {value === "branching" ?
<Tooltip question.type === "page" || question.type === "text" || question.type === "date" || question.type === "number" ?
arrow <></>
placement="right" :
componentsProps={{ (
tooltip: { // <Tooltip
sx: { // arrow
background: "#fff", // placement="right"
borderRadius: "6px", // componentsProps={{
color: "#9A9AAF", // tooltip: {
boxShadow: "0px 8px 24px rgba(210, 208, 225, 0.4)", // sx: {
"& .MuiTooltip-arrow": { // background: "#fff",
color: "#FFF", // borderRadius: "6px",
}, // color: "#9A9AAF",
}, // boxShadow: "0px 8px 24px rgba(210, 208, 225, 0.4)",
}, // "& .MuiTooltip-arrow": {
}} // color: "#FFF",
title={ // },
<Box> // },
<Typography // },
sx={{ // }}
color: "#4D4D4D", // title={
fontWeight: "bold", // <Box>
fontSize: "14px", // <Typography
marginBottom: "10px", // sx={{
}} // color: "#4D4D4D",
> // fontWeight: "bold",
Будет показан при условии // fontSize: "14px",
</Typography> // marginBottom: "10px",
<Typography sx={{ fontWeight: "bold", fontSize: "12px" }}> // }}
Название // >
</Typography> // Будет показан при условии
<Typography // </Typography>
sx={{ // <Typography sx={{ fontWeight: "bold", fontSize: "12px" }}>
fontWeight: "bold", // Название
fontSize: "12px", // </Typography>
marginBottom: "10px", // <Typography
}} // sx={{
> // fontWeight: "bold",
Условие 1, Условие 2 // fontSize: "12px",
</Typography> // marginBottom: "10px",
<Typography sx={{ color: "#7E2AEA", fontSize: "12px" }}> // }}
Все условия обязательны // >
</Typography> // Условие 1, Условие 2
</Box> // </Typography>
} // <Typography sx={{ color: "#7E2AEA", fontSize: "12px" }}>
> // Все условия обязательны
// </Typography>
// </Box>
// }
// >
<MiniButtonSetting <MiniButtonSetting
key={title} key={title}
onClick={() => { onClick={() => {
@ -193,7 +197,7 @@ export default function ButtonsOptions({
{icon} {icon}
{isWrappMiniButtonSetting ? null : title} {isWrappMiniButtonSetting ? null : title}
</MiniButtonSetting> </MiniButtonSetting>
</Tooltip> // </Tooltip>
) : ( ) : (
<> <>
<MiniButtonSetting <MiniButtonSetting
@ -226,7 +230,7 @@ export default function ButtonsOptions({
)} )}
</Box> </Box>
))} ))}
<> {/* <>
<MiniButtonSetting <MiniButtonSetting
onClick={undefined} // TODO onClick={undefined} // TODO
sx={{ sx={{
@ -257,7 +261,7 @@ export default function ButtonsOptions({
> >
<VectorQuestions style={{ color: "#FC712F", fontSize: "9px" }} /> <VectorQuestions style={{ color: "#FC712F", fontSize: "9px" }} />
</MiniButtonSetting> </MiniButtonSetting>
</> </> */}
</Box> </Box>
<Box <Box
sx={{ sx={{

10
src/pages/Questions/ButtonsOptionsAndPict.tsx
View File

@ -147,7 +147,7 @@ export default function ButtonsOptionsAndPict({
{isIconMobile ? null : "Подсказка"} {isIconMobile ? null : "Подсказка"}
</MiniButtonSetting> </MiniButtonSetting>
<> <>
<Tooltip {/* <Tooltip
arrow arrow
placement="right" placement="right"
componentsProps={{ componentsProps={{
@ -192,7 +192,7 @@ export default function ButtonsOptionsAndPict({
</Typography> </Typography>
</Box> </Box>
} }
> > */}
<MiniButtonSetting <MiniButtonSetting
onMouseEnter={() => setButtonHover("branching")} onMouseEnter={() => setButtonHover("branching")}
onMouseLeave={() => setButtonHover("")} onMouseLeave={() => setButtonHover("")}
@ -232,7 +232,7 @@ export default function ButtonsOptionsAndPict({
/> />
{isIconMobile ? null : "Ветвление"} {isIconMobile ? null : "Ветвление"}
</MiniButtonSetting> </MiniButtonSetting>
</Tooltip> {/* </Tooltip> */}
<MiniButtonSetting <MiniButtonSetting
onMouseEnter={() => setButtonHover("image")} onMouseEnter={() => setButtonHover("image")}
onMouseLeave={() => setButtonHover("")} onMouseLeave={() => setButtonHover("")}
@ -266,7 +266,7 @@ export default function ButtonsOptionsAndPict({
/> />
{isIconMobile ? null : "Изображение"} {isIconMobile ? null : "Изображение"}
</MiniButtonSetting> </MiniButtonSetting>
<MiniButtonSetting {/* <MiniButtonSetting
onClick={() => setOpenedReallyChangingModal(true)} onClick={() => setOpenedReallyChangingModal(true)}
sx={{ sx={{
minWidth: "30px", minWidth: "30px",
@ -295,7 +295,7 @@ export default function ButtonsOptionsAndPict({
}} }}
> >
<VectorQuestions style={{ color: "#FC712F", fontSize: "9px" }} /> <VectorQuestions style={{ color: "#FC712F", fontSize: "9px" }} />
</MiniButtonSetting> </MiniButtonSetting> */}
</> </>
</Box> </Box>
<Box <Box