Merge branch 'dev-3.0.0' into dev

* dev-3.0.0:
  flx更校验

src/views/home/Announcement/form.vue

@@ -3,9 +3,14 @@
 		<a-form :model="formState" ref="formStateRef" :rules="formStateRules" name="basic" autocomplete="off">
 			<div class="form">
 				<a-row>
-					<!-- 	:rules="[{ required: true, message: '请输入!', trigger: 'change' }]" -->
 					<a-col :span="12">
-						<a-form-item class="form-item" label="标题" name="title" :label-col="{ span: 10 }">
+						<a-form-item
+							class="form-item"
+							label="标题"
+							name="title"
+							:label-col="{ span: 10 }"
+							:rules="[{ required: true, message: '请输入新闻标题!', trigger: 'change' }]"
+						>
 							<a-input
 								placeholder="请输入新闻标题"
 								style="width: 600px"
@@ -86,15 +91,18 @@
 					</a-form-item>
 				</a-col>
 			</a-row>
-			<!-- <div><span style="color: red">* </span>新闻内容:</div> -->
-			<div>新闻内容:</div>
+			<div><span style="color: red">* </span>新闻内容:</div>
 			<br />
-
-			<!-- ref="EditorRef" -->
-			<!-- 	:rules="[{ required: true, message: '请输入!', trigger: 'change' }]" -->
-			<!-- 	@getTXTLE="getTXTLEDEL" -->
-			<a-form-item class="form-item" label="''" name="noticeContent" :label-col="{ span: 0 }">
+			<a-form-item
+				class="form-item"
+				label="''"
+				ref="EditorRef"
+				name="noticeContent"
+				:label-col="{ span: 0 }"
+				:rules="[{ required: true, message: '请输入新闻内容!', trigger: 'change' }]"
+			>
 				<Editor
+					@getTXTLE="getTXTLEDEL"
 					:fileUploadFunction="global.uploadFile"
 					:placeholder="'请输入新闻内容'"
 					:disabled="disabled"

src/views/home/Council/form.vue

@@ -4,7 +4,13 @@
 			<div class="form">
 				<a-row>
 					<a-col :span="12">
-						<a-form-item class="form-item" label="标题" name="title" :label-col="{ span: 10 }">
+						<a-form-item
+							class="form-item"
+							label="标题"
+							name="title"
+							:label-col="{ span: 10 }"
+							:rules="[{ required: true, message: '请输入标题!', trigger: 'change' }]"
+						>
 							<a-input
 								placeholder="请输入标题"
 								style="width: 600px"

src/views/home/LBmanagement/formCopy.vue

@@ -15,7 +15,13 @@
 			<div class="form">
 				<a-row>
 					<a-col :span="12">
-						<a-form-item class="form-item" label="标题" name="title" :label-col="{ span: 10 }">
+						<a-form-item
+							class="form-item"
+							label="标题"
+							name="title"
+							:label-col="{ span: 10 }"
+							:rules="[{ required: true, message: '请输入标题!', trigger: 'change' }]"
+						>
 							<a-input
 								placeholder="请输入标题"
 								style="width: 600px"
@@ -55,24 +61,37 @@
 					></DIYUPLoad>
 				</a-form-item>
 			</div>
-			<a-form-item class="form-item" label="公告内容" name="announcementContent" :label-col="{ span: 2 }">
-				<!-- <a-textarea
+			<!-- <a-form-item class="form-item" label="公告内容" name="announcementContent" :label-col="{ span: 2 }"> -->
+			<!-- <a-textarea
 								style="width: 600px"
 								placeholder="请输入公告内容"
 								v-model:value="formState.announcementContent"
 								:disabled="disabled"
 								allow-clear
 							/> -->
-				<!-- <Del :value="formState.announcementContent" @updateValue="getMsg" /> -->
-			</a-form-item>
+			<!-- <Del :value="formState.announcementContent" @updateValue="getMsg" /> -->
+			<!-- </a-form-item> -->
 			<!-- <ACC @editor-content="formState.announcementContent" :content="formState.announcementContent" /> -->
 			<!-- <a-form-item class="form-item" label="公告内容" name="announcementContent" :label-col="{ span: 2 }"> -->
-			<Editor
-				:fileUploadFunction="global.uploadFile"
-				:placeholder="'请输入公告内容'"
-				:disabled="disabled"
-				v-model:modelValue="formState.announcementContent"
-			/>
+
+			<div><span style="color: red">* </span>公告内容:</div>
+			<br />
+			<a-form-item
+				class="form-item"
+				label="''"
+				ref="EditorRef"
+				name="announcementContent"
+				:label-col="{ span: 0 }"
+				:rules="[{ required: true, message: '请输入公告内容!', trigger: 'change' }]"
+			>
+				<Editor
+					@getTXTLE="getTXTLEDEL"
+					:fileUploadFunction="global.uploadFile"
+					:placeholder="'请输入公告内容'"
+					:disabled="disabled"
+					v-model:modelValue="formState.announcementContent"
+				/>
+			</a-form-item>
 			<!-- </a-form-item> -->
 			<a-form-item>
 				<div class="item-submit">
@@ -202,8 +221,16 @@
 				// formState.value.announcementContent = val
 				console.log(val)
 			}
-
+			// EditorRef
+			const EditorRef = ref(null)
+			const getTXTLEDEL = (v) => {
+				if (v !== undefined || v !== null || v !== '') {
+					EditorRef.value.clearValidate()
+				}
+			}
 			return {
+				getTXTLEDEL,
+				EditorRef,
 				delacc,
 				global,
 				getMsg,

src/views/home/Notification/form.vue

@@ -4,7 +4,13 @@
 			<div class="form">
 				<a-row>
 					<a-col :span="12">
-						<a-form-item class="form-item" label="标题" name="title" :label-col="{ span: 10 }">
+						<a-form-item
+							class="form-item"
+							label="标题"
+							name="title"
+							:label-col="{ span: 10 }"
+							:rules="[{ required: true, message: '请输入标题!', trigger: 'change' }]"
+						>
 							<a-input
 								placeholder="请输入标题"
 								style="width: 600px"
@@ -40,24 +46,25 @@
 
 				<!--  -->
 			</div>
-			<!-- 公告内容 -->
-			<div>公告内容:</div>
-			<!-- <div class="input">
-				<a-textarea
-					placeholder="请输入公告内容"
-					v-model:value="formState.announcementContent"
-					:disabled="disabled"
-					allow-clear
-				/>
-			</div> -->
+			<div><span style="color: red">* </span>公告内容:</div>
 			<br />
-			<Editor
-				:fileUploadFunction="global.uploadFile"
-				:placeholder="'请输入公告内容'"
-				:disabled="disabled"
-				v-model:modelValue="formState.announcementContent"
-			/>
 
+			<a-form-item
+				class="form-item"
+				label="''"
+				ref="EditorRef"
+				name="announcementContent"
+				:label-col="{ span: 0 }"
+				:rules="[{ required: true, message: '请输入公告内容!', trigger: 'change' }]"
+			>
+				<Editor
+					@getTXTLE="getTXTLEDEL"
+					:fileUploadFunction="global.uploadFile"
+					:placeholder="'请输入公告内容'"
+					:disabled="disabled"
+					v-model:modelValue="formState.announcementContent"
+				/>
+			</a-form-item>
 			<a-form-item>
 				<div class="item-submit">
 					<a-button class="btn1" :disabled="disabled" @click="onFinish(2)">提交</a-button>
@@ -170,7 +177,16 @@
 				uploadDataList.value.clearValidate()
 			}
 
+			// EditorRef
+			const EditorRef = ref(null)
+			const getTXTLEDEL = (v) => {
+				if (v !== undefined || v !== null || v !== '') {
+					EditorRef.value.clearValidate()
+				}
+			}
 			return {
+				getTXTLEDEL,
+				EditorRef,
 				global,
 				beforeUpload,
 				uploadDataList,

src/views/home/Qinghai/form.vue

@@ -4,7 +4,13 @@
 			<div class="form">
 				<a-row>
 					<a-col :span="12">
-						<a-form-item class="form-item" label="标题" name="title" :label-col="{ span: 10 }">
+						<a-form-item
+							class="form-item"
+							label="标题"
+							name="title"
+							:label-col="{ span: 10 }"
+							:rules="[{ required: true, message: '请输入标题!', trigger: 'change' }]"
+						>
 							<a-input
 								placeholder="请输入标题"
 								style="width: 600px"

src/views/home/Related/form.vue

@@ -4,7 +4,13 @@
 			<!-- <div class="form"> -->
 			<a-row>
 				<a-col :span="24">
-					<a-form-item class="form-item" label="模块名称" name="moduleName" :label-col="{ span: 3 }">
+					<a-form-item
+						class="form-item"
+						label="模块名称"
+						name="moduleName"
+						:label-col="{ span: 3 }"
+						:rules="[{ required: true, message: '请输入模块名称!', trigger: 'change' }]"
+					>
 						<a-input
 							placeholder="请输入模块名称"
 							style="width: 500px"

src/views/home/carousel/form.vue

@@ -4,7 +4,13 @@
 			<div class="form">
 				<a-row>
 					<a-col :span="12">
-						<a-form-item class="form-item" label="头条标题" name="headlineTitle" :label-col="{ span: 10 }">
+						<a-form-item
+							class="form-item"
+							label="头条标题"
+							name="headlineTitle"
+							:label-col="{ span: 10 }"
+							:rules="[{ required: true, message: '请输入头条标题!', trigger: 'change' }]"
+						>
 							<a-input
 								placeholder="请输入头条标题"
 								style="width: 600px"
@@ -36,22 +42,24 @@
 			</div>
 
 			<div class="attachment"></div>
-			<div>头条内容:</div>
+			<div><span style="color: red">* </span>头条内容:</div>
 			<br />
-			<!-- <div class="input">
-				<a-textarea
-					placeholder="请输入头条内容"
-					v-model:value="formState.carouselContent"
+			<a-form-item
+				class="form-item"
+				label="''"
+				ref="EditorRef"
+				name="carouselContent"
+				:label-col="{ span: 0 }"
+				:rules="[{ required: true, message: '请输入头条内容!', trigger: 'change' }]"
+			>
+				<Editor
+					@getTXTLE="getTXTLEDEL"
+					:fileUploadFunction="global.uploadFile"
+					:placeholder="'请输入头条内容'"
 					:disabled="disabled"
-					allow-clear
+					v-model:modelValue="formState.carouselContent"
 				/>
-			</div> -->
-			<Editor
-				:fileUploadFunction="global.uploadFile"
-				:placeholder="'请输入头条内容'"
-				:disabled="disabled"
-				v-model:modelValue="formState.carouselContent"
-			/>
+			</a-form-item>
 
 			<a-form-item>
 				<div class="item-submit">
@@ -152,8 +160,16 @@
 			const onFinishFailed = (errorInfo) => {
 				console.log('Failed:', errorInfo)
 			}
-
+			// EditorRef
+			const EditorRef = ref(null)
+			const getTXTLEDEL = (v) => {
+				if (v !== undefined || v !== null || v !== '') {
+					EditorRef.value.clearValidate()
+				}
+			}
 			return {
+				getTXTLEDEL,
+				EditorRef,
 				global,
 				formStateRef,
 				formStateRules,

src/views/home/tabloid/form.vue

@@ -4,7 +4,13 @@
 			<div class="form">
 				<a-row>
 					<a-col :span="12">
-						<a-form-item class="form-item" label="新闻标题" name="newsTitle" :label-col="{ span: 10 }">
+						<a-form-item
+							class="form-item"
+							label="新闻标题"
+							name="newsTitle"
+							:label-col="{ span: 10 }"
+							:rules="[{ required: true, message: '请输入新闻标题!', trigger: 'change' }]"
+						>
 							<a-input
 								placeholder="请输入新闻标题"
 								style="width: 600px"
@@ -48,22 +54,24 @@
 					<div class="back">(建议尺寸:955px*533px)</div>
 				</a-form-item>
 			</div>
-			<div>新闻内容:</div>
+			<div><span style="color: red">* </span>新闻内容:</div>
 			<br />
-			<!-- <div class="input">
-				<a-textarea
-					placeholder="请输入新闻内容"
-					v-model:value="formState.newsContent"
+			<a-form-item
+				class="form-item"
+				label="''"
+				ref="EditorRef"
+				name="newsContent"
+				:label-col="{ span: 0 }"
+				:rules="[{ required: true, message: '请输入新闻内容!', trigger: 'change' }]"
+			>
+				<Editor
+					@getTXTLE="getTXTLEDEL"
+					:fileUploadFunction="global.uploadFile"
+					:placeholder="'请输入新闻内容'"
 					:disabled="disabled"
-					allow-clear
+					v-model:modelValue="formState.newsContent"
 				/>
-			</div> -->
-			<Editor
-				:fileUploadFunction="global.uploadFile"
-				:placeholder="'请输入新闻内容'"
-				:disabled="disabled"
-				v-model:modelValue="formState.newsContent"
-			/>
+			</a-form-item>
 
 			<a-form-item>
 				<div class="item-submit">
@@ -182,7 +190,16 @@
 					formState.value[key] = ''
 				}
 			}
+			// EditorRef
+			const EditorRef = ref(null)
+			const getTXTLEDEL = (v) => {
+				if (v !== undefined || v !== null || v !== '') {
+					EditorRef.value.clearValidate()
+				}
+			}
 			return {
+				getTXTLEDEL,
+				EditorRef,
 				global,
 				beforeUpload,
 				uploadDataList,