lisy 5 месяцев назад
Родитель
Сommit
fcaf949695

+ 1 - 1
src/components/Editor/index.vue

@@ -28,7 +28,7 @@ const props = defineProps({
     /* 只读 */
     /* 只读 */
     readOnly: propTypes.bool.def(false),
     readOnly: propTypes.bool.def(false),
     /* 上传文件大小限制(MB) */
     /* 上传文件大小限制(MB) */
-    fileSize: propTypes.number.def(5),
+    fileSize: propTypes.number.def(20),
     /* 类型(base64格式、url格式) */
     /* 类型(base64格式、url格式) */
     type: propTypes.string.def('url')
     type: propTypes.string.def('url')
 });
 });

+ 1 - 1
src/views/news/input/index.vue

@@ -43,7 +43,7 @@
                             </el-col>
                             </el-col>
                             <el-col :span="8">
                             <el-col :span="8">
                                 <el-form-item label="封面图" prop="newsImg">
                                 <el-form-item label="封面图" prop="newsImg">
-                                    <imageUpload v-model="form.newsImg" :limit="1" isString :isShowTip="false">
+                                    <imageUpload v-model="form.newsImg" :limit="1" isString :isShowTip="false" :fileSize="20">
                                     </imageUpload>
                                     </imageUpload>
                                 </el-form-item>
                                 </el-form-item>
                             </el-col>
                             </el-col>

+ 4 - 3
src/views/training/models/meeting-custom.vue

@@ -3,7 +3,7 @@
         <el-form ref="formRef" label-width="auto" label-position="top" :model="field" :rules="rules" :scroll-to-error="true">
         <el-form ref="formRef" label-width="auto" label-position="top" :model="field" :rules="rules" :scroll-to-error="true">
             <template v-if="field.type === '1' || field.type === '7' || field.type === '10'">
             <template v-if="field.type === '1' || field.type === '7' || field.type === '10'">
                 <el-form-item v-if="field.name.includes('text1-')" prop="label">
                 <el-form-item v-if="field.name.includes('text1-')" prop="label">
-                    <div class="d-flex flex-cln w-100% " >
+                    <div class="d-flex flex-cln w-100% ">
                         <el-tag type="info" size="small" style="width: 70px;" class="drag-handle">单行文本</el-tag>
                         <el-tag type="info" size="small" style="width: 70px;" class="drag-handle">单行文本</el-tag>
                         <div class="pb-5 f-s-16 f-w-6 c-#606266 " @click="changeShowtitle()" v-show="!showtitle">{{ field.label }}</div>
                         <div class="pb-5 f-s-16 f-w-6 c-#606266 " @click="changeShowtitle()" v-show="!showtitle">{{ field.label }}</div>
                         <el-input ref="titleInput" class="pd-5 no-disabled-input no-drag" v-show="showtitle || !field.label" v-model="field.label" :placeholder="'请输入标题'" style="width: 340px;font-size: 16px;" clearable @blur="showtitle = false" />
                         <el-input ref="titleInput" class="pd-5 no-disabled-input no-drag" v-show="showtitle || !field.label" v-model="field.label" :placeholder="'请输入标题'" style="width: 340px;font-size: 16px;" clearable @blur="showtitle = false" />
@@ -29,9 +29,10 @@
                             minRows: 4, maxRows: 7
                             minRows: 4, maxRows: 7
                         }"
                         }"
                 />
                 />
-                <el-form-item v-if="field.name.includes('desc1-')" prop="defValue" :rules="[{ required: true, message: '请输入描述', trigger: 'blur' }]">
+                <el-form-item v-if="field.name.includes('desc1-')" prop="defValue" :rules="[{ required: true, message: '请输入描述', trigger: 'change' }]">
                     <el-tag type="info" size="small">文本描述</el-tag>
                     <el-tag type="info" size="small">文本描述</el-tag>
                     <el-input
                     <el-input
+                        ref="inputRef"
                         class="pd-5 no-disabled-input no-drag"
                         class="pd-5 no-disabled-input no-drag"
                         v-model="field.defValue"
                         v-model="field.defValue"
                         :placeholder="'请输入'"
                         :placeholder="'请输入'"
@@ -252,7 +253,7 @@ defineExpose({
 
 
 :deep(.no-disabled-input .el-input__inner) {
 :deep(.no-disabled-input .el-input__inner) {
     font-weight: bold !important;
     font-weight: bold !important;
-    
+
 }
 }
 :deep(.no-disabled-input .el-textarea__inner){
 :deep(.no-disabled-input .el-textarea__inner){
     font-weight: bold !important;
     font-weight: bold !important;

+ 1 - 1
src/views/training/models/meeting-editors.vue

@@ -157,7 +157,7 @@
                             <span>(固定字段,不可编辑)</span>
                             <span>(固定字段,不可编辑)</span>
                         </div>
                         </div>
                     </template>
                     </template>
-                    <VueDraggable ref="el" v-model="fields" handle=".drag-handle" :filter="'.no-drag'">
+                    <VueDraggable ref="el" v-model="fields" handle=".drag-handle" :filter="'.no-drag'" :preventOnFilter="false">
                         <template v-for="(field, index) in fields" :key="index">
                         <template v-for="(field, index) in fields" :key="index">
                             <div class="meeting-custom-wrapper" :class="{ 'active-border': activeField === field }"
                             <div class="meeting-custom-wrapper" :class="{ 'active-border': activeField === field }"
                                 @click="setActive(field)" :ref="el => setFieldRef(el, index)">
                                 @click="setActive(field)" :ref="el => setFieldRef(el, index)">