mirroring/cool-admin-vue
1
0
Fork 0
mirror of https://github.com/cool-team-official/cool-admin-vue.git synced 2024-11-01 14:10:27 +08:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
icssoa 2023-05-15 14:32:12 +08:00
commit 00468cdc20
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/modules/extend/editor/preview.vue
View File

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

4
src/modules/task/views/list.vue
View File

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

2
src/modules/user/views/list.vue
View File

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