Accept Merge Request #15304: (fix_logic_auto_fill -> uat)

Merge Request: fix

Created By: @钱冠学
Accepted By: @钱冠学
URL: https://yldc.coding.yili.com/p/ylst/d/ylst-survey-web/git/merge/15304
This commit is contained in:
钱冠学
2022-10-30 15:07:31 +08:00
2 changed files with 2 additions and 1 deletions

View File

@@ -564,6 +564,7 @@ function initTinymce(data) {
toolbar_mode: "sliding",
object_resizing: true,
fontsize_formats: "10px 12px 14px 16px 18px 20px 22px 24px 26px 28px",
font_formats: "默认='sans-serif';微软雅黑='微软雅黑';宋体='宋体';黑体='黑体';仿宋='仿宋';楷体='楷体';隶书='隶书';幼圆='幼圆';",
content_style: `p { padding:0;margin:0 } body { font-size: ${defaultFontSize}px } img {max-width:100%;}`,
paste_auto_cleanup_on_paste: true,
paste_remove_styles: true,

View File

@@ -751,7 +751,7 @@ export default {
},
];
// 某些题型将自动填写功能关闭
if ([21, 22, 23, 101, 102, 103, 104, 105].includes(props.info.question_type)) {
if ([21, 22, 23, 101, 102, 103, 104, 105, 19, 20].includes(props.info.question_type)) {
logicTitles.splice(2, 1);
}
const title = ref("skip");