Merge branch '6.x' of https://e.coding.net/shancool/cool-admin/front-next into 6.x

src/modules/extend/editor/preview.vue

@@ -1,18 +1,20 @@
 <template>
-	<cl-dialog width="1000px" :title="title" v-model="visible">
-		<cl-editor
-			:name="`cl-editor-${name}`"
-			:ref="setRefs('editor')"
-			:height="600"
-			v-bind="props.props"
-			v-model="text"
-		/>
+	<div>
+		<cl-dialog width="1000px" :title="title" append-to-body v-model="visible">
+			<cl-editor
+				:name="`cl-editor-${name}`"
+				:ref="setRefs('editor')"
+				:height="600"
+				v-bind="props.props"
+				v-model="text"
+			/>
 
-		<template #footer>
-			<el-button @click="close">关闭</el-button>
-			<el-button type="success" @click="toCopy">复制</el-button>
-		</template>
-	</cl-dialog>
+			<template #footer>
+				<el-button @click="close">关闭</el-button>
+				<el-button type="success" @click="toCopy">复制</el-button>
+			</template>
+		</cl-dialog>
+	</div>
 </template>
 
 <script lang="ts" name="cl-editor-preview" setup>

src/modules/task/views/list.vue

@@ -19,7 +19,7 @@
 				</p>
 				<p class="row">
 					<span>定时规则</span>
-					<span>{{ item.taskType == 1 ? `间隔${item.every}秒执行` : item.cron }}</span>
+					<span>{{ item.taskType == 1 ? `间隔${item._every}秒执行` : item.cron }}</span>
 				</p>
 
 				<div class="status">
@@ -106,7 +106,7 @@ function refresh() {
 	service.task.info.page({ size: 100, page: 1 }).then((res) => {
 		list.value = res.list.map((e) => {
 			if (e.every) {
-				e.every /= 1000;
+				e._every = parseInt(String(e.every / 1000));
 			}
 
 			return e;

src/modules/user/views/list.vue

@@ -15,7 +15,7 @@
 			</cl-filter>
 			<cl-flex1 />
 			<!-- 关键字搜索 -->
-			<cl-search-key placeholder="请输入昵称、手机号" />
+			<cl-search-key placeholder="搜索昵称、手机号" />
 		</cl-row>
 
 		<cl-row>