This commit is contained in:
weipengfei 2023-08-31 16:08:26 +08:00
parent dfa9ac7dd8
commit ea28959d81
3 changed files with 361 additions and 280 deletions

View File

@ -1,153 +1,193 @@
<template> <template>
<div class="edit-popup"> <div class="edit-popup">
<popup <popup
ref="popupRef" ref="popupRef"
:title="popupTitle" :title="popupTitle"
:async="true" :async="true"
width="550px" width="550px"
@confirm="handleSubmit" @confirm="handleSubmit"
@close="handleClose" @close="handleClose"
> >
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules"> <el-form
<el-form-item label="标题" prop="title"> ref="formRef"
<el-input v-model="formData.title" clearable placeholder="请输入标题" /> :model="formData"
</el-form-item> label-width="120px"
<el-form-item label="内容" prop="content"> :rules="formRules"
<el-input v-model="formData.content" clearable placeholder="请输入内容" /> >
</el-form-item> <el-form-item label="标题" prop="title">
<el-form-item label="APP类型" prop="type"> <el-input
<el-radio-group v-model="formData.type" placeholder="请选择APP类型"> v-model="formData.title"
<el-radio clearable
v-for="(item, index) in dictData.app_type" placeholder="请输入标题"
:key="index" />
:label="parseInt(item.value)" </el-form-item>
> <el-form-item label="内容" prop="content">
{{ item.name }} <el-input
</el-radio> v-model="formData.content"
</el-radio-group> clearable
</el-form-item> placeholder="请输入内容"
<el-form-item label="版本" prop="version"> type="textarea"
<el-input v-model="formData.version" clearable placeholder="请输入版本" /> autosize
</el-form-item> />
<el-form-item label="app链接" prop="dow_url"> </el-form-item>
<el-input v-model="formData.dow_url" clearable placeholder="请输入app链接" /> <el-form-item label="APP类型" prop="type">
</el-form-item> <el-radio-group v-model="formData.type" placeholder="请选择APP类型">
<el-form-item label="是否强制更新" prop="force"> <el-radio
<el-radio-group v-model="formData.force" placeholder="请选择是否强制更新"> v-for="(item, index) in dictData.app_type"
<el-radio :key="index"
v-for="(item, index) in dictData.app_force_quiet" :label="parseInt(item.value)"
:key="index" >
:label="parseInt(item.value)" {{ item.name }}
> </el-radio>
{{ item.name }} </el-radio-group>
</el-radio> </el-form-item>
</el-radio-group> <el-form-item label="版本" prop="version">
</el-form-item> <el-input
<el-form-item label="是否静默更新" prop="quiet"> v-model="formData.version"
<el-radio-group v-model="formData.quiet" placeholder="请选择是否静默更新"> clearable
<el-radio placeholder="请输入版本,例如1.0.1"
v-for="(item, index) in dictData.app_force_quiet" />
:key="index" </el-form-item>
:label="parseInt(item.value)" <el-form-item label="更新包文件" prop="dow_url">
> <el-upload
{{ item.name }} class="upload-demo"
</el-radio> style="width: 100%"
</el-radio-group> drag
</el-form-item> :headers="{ Token: userStore.token }"
</el-form> action="https://worker-task.lihaink.cn/adminapi/upload/file"
</popup> :limit="1"
</div> :on-success="handleFile"
>
<el-icon class="el-icon--upload"><upload-filled /></el-icon>
<div class="el-upload__text">文件拖入或点击上传</div>
<template #tip>
<div class="el-upload__tip">请上传APK/IPA/WGT文件</div>
</template>
</el-upload>
</el-form-item>
<el-form-item label="是否强制更新" prop="force">
<el-radio-group
v-model="formData.force"
placeholder="请选择是否强制更新"
>
<el-radio
v-for="(item, index) in dictData.app_force_quiet"
:key="index"
:label="parseInt(item.value)"
>
{{ item.name }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否静默更新" prop="quiet">
<el-radio-group
v-model="formData.quiet"
placeholder="请选择是否静默更新"
>
<el-radio
v-for="(item, index) in dictData.app_force_quiet"
:key="index"
:label="parseInt(item.value)"
>
{{ item.name }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
</popup>
</div>
</template> </template>
<script lang="ts" setup name="appUpdateEdit"> <script lang="ts" setup name="appUpdateEdit">
import type { FormInstance } from 'element-plus' import type { FormInstance } from "element-plus";
import Popup from '@/components/popup/index.vue' import Popup from "@/components/popup/index.vue";
import { apiAppUpdateAdd, apiAppUpdateEdit, apiAppUpdateDetail } from '@/api/app_update' import {
import { timeFormat } from '@/utils/util' apiAppUpdateAdd,
import type { PropType } from 'vue' apiAppUpdateEdit,
apiAppUpdateDetail,
} from "@/api/app_update";
import { timeFormat } from "@/utils/util";
import type { PropType } from "vue";
import useUserStore from "@/stores/modules/user";
defineProps({ defineProps({
dictData: { dictData: {
type: Object as PropType<Record<string, any[]>>, type: Object as PropType<Record<string, any[]>>,
default: () => ({}) default: () => ({}),
} },
}) });
const emit = defineEmits(['success', 'close']) const emit = defineEmits(["success", "close"]);
const formRef = shallowRef<FormInstance>() const formRef = shallowRef<FormInstance>();
const popupRef = shallowRef<InstanceType<typeof Popup>>() const popupRef = shallowRef<InstanceType<typeof Popup>>();
const mode = ref('add') const mode = ref("add");
const userStore = useUserStore();
const handleFile = (e: any) => {
formData.dow_url = e.data.uri;
};
// //
const popupTitle = computed(() => { const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑app更新' : '新增app更新' return mode.value == "edit" ? "编辑app更新" : "新增app更新";
}) });
// //
const formData = reactive({ const formData = reactive({
id: '', id: "",
title: '', title: "",
content: '', content: "",
type: '', type: "",
version: '', version: "",
dow_url: '', dow_url: "",
force: '', force: "",
quiet: '', quiet: "",
}) });
// //
const formRules = reactive<any>({ const formRules = reactive<any>({});
})
// //
const setFormData = async (data: Record<any, any>) => { const setFormData = async (data: Record<any, any>) => {
for (const key in formData) { for (const key in formData) {
if (data[key] != null && data[key] != undefined) { if (data[key] != null && data[key] != undefined) {
//@ts-ignore //@ts-ignore
formData[key] = data[key] formData[key] = data[key];
}
} }
}
};
}
const getDetail = async (row: Record<string, any>) => { const getDetail = async (row: Record<string, any>) => {
const data = await apiAppUpdateDetail({ const data = await apiAppUpdateDetail({
id: row.id id: row.id,
}) });
setFormData(data) setFormData(data);
} };
// //
const handleSubmit = async () => { const handleSubmit = async () => {
await formRef.value?.validate() await formRef.value?.validate();
const data = { ...formData, } const data = { ...formData };
mode.value == 'edit' mode.value == "edit"
? await apiAppUpdateEdit(data) ? await apiAppUpdateEdit(data)
: await apiAppUpdateAdd(data) : await apiAppUpdateAdd(data);
popupRef.value?.close() popupRef.value?.close();
emit('success') emit("success");
} };
// //
const open = (type = 'add') => { const open = (type = "add") => {
mode.value = type mode.value = type;
popupRef.value?.open() popupRef.value?.open();
} };
// //
const handleClose = () => { const handleClose = () => {
emit('close') emit("close");
} };
defineExpose({ defineExpose({
open, open,
setFormData, setFormData,
getDetail getDetail,
}) });
</script> </script>

View File

@ -1,191 +1,231 @@
<template> <template>
<div> <div>
<el-card class="!border-none mb-4" shadow="never"> <el-card class="!border-none mb-4" shadow="never">
<el-form <el-form class="mb-[-16px]" :model="queryParams" inline>
class="mb-[-16px]" <el-form-item label="标题" prop="title">
:model="queryParams" <el-input
inline class="w-[280px]"
> v-model="queryParams.title"
<el-form-item label="标题" prop="title"> clearable
<el-input class="w-[280px]" v-model="queryParams.title" clearable placeholder="请输入标题" /> placeholder="请输入标题"
</el-form-item> />
<el-form-item label="内容" prop="content"> </el-form-item>
<el-input class="w-[280px]" v-model="queryParams.content" clearable placeholder="请输入内容" /> <el-form-item label="内容" prop="content">
</el-form-item> <el-input
<el-form-item label="APP类型" prop="type"> class="w-[280px]"
<el-select class="w-[280px]" v-model="queryParams.type" clearable placeholder="请选择APP类型"> v-model="queryParams.content"
<el-option label="全部" value=""></el-option> clearable
<el-option placeholder="请输入内容"
v-for="(item, index) in dictData.app_type" type="textarea"
:key="index" autosize
:label="item.name" />
:value="item.value" </el-form-item>
/> <el-form-item label="APP类型" prop="type">
</el-select> <el-select
</el-form-item> class="w-[280px]"
<el-form-item label="版本" prop="version"> v-model="queryParams.type"
<el-input class="w-[280px]" v-model="queryParams.version" clearable placeholder="请输入版本" /> clearable
</el-form-item> placeholder="请选择APP类型"
<el-form-item label="app链接" prop="dow_url"> >
<el-input class="w-[280px]" v-model="queryParams.dow_url" clearable placeholder="请输入app链接" /> <el-option label="全部" value=""></el-option>
</el-form-item> <el-option
<el-form-item label="是否强制更新" prop="force"> v-for="(item, index) in dictData.app_type"
<el-select class="w-[280px]" v-model="queryParams.force" clearable placeholder="请选择是否强制更新"> :key="index"
<el-option label="全部" value=""></el-option> :label="item.name"
<el-option :value="item.value"
v-for="(item, index) in dictData.app_force_quiet" />
:key="index" </el-select>
:label="item.name" </el-form-item>
:value="item.value" <el-form-item label="版本" prop="version">
/> <el-input
</el-select> class="w-[280px]"
</el-form-item> v-model="queryParams.version"
<el-form-item label="是否静默更新" prop="quiet"> clearable
<el-select class="w-[280px]" v-model="queryParams.quiet" clearable placeholder="请选择是否静默更新"> placeholder="请输入版本"
<el-option label="全部" value=""></el-option> />
<el-option </el-form-item>
v-for="(item, index) in dictData.app_force_quiet" <el-form-item label="是否强制更新" prop="force">
:key="index" <el-select
:label="item.name" class="w-[280px]"
:value="item.value" v-model="queryParams.force"
/> clearable
</el-select> placeholder="请选择是否强制更新"
</el-form-item> >
<el-form-item> <el-option label="全部" value=""></el-option>
<el-button type="primary" @click="resetPage">查询</el-button> <el-option
<el-button @click="resetParams">重置</el-button> v-for="(item, index) in dictData.app_force_quiet"
</el-form-item> :key="index"
</el-form> :label="item.name"
</el-card> :value="item.value"
<el-card class="!border-none" v-loading="pager.loading" shadow="never"> />
<el-button v-perms="['app_update/add']" type="primary" @click="handleAdd"> </el-select>
<template #icon> </el-form-item>
<icon name="el-icon-Plus" /> <el-form-item label="是否静默更新" prop="quiet">
</template> <el-select
新增 class="w-[280px]"
</el-button> v-model="queryParams.quiet"
<el-button clearable
placeholder="请选择是否静默更新"
>
<el-option label="全部" value=""></el-option>
<el-option
v-for="(item, index) in dictData.app_force_quiet"
:key="index"
:label="item.name"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['app_update/add']" type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button
v-perms="['app_update/delete']"
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
删除
</el-button>
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="标题" prop="title" show-overflow-tooltip />
<el-table-column label="内容" prop="content" show-overflow-tooltip />
<el-table-column label="APP类型" prop="type">
<template #default="{ row }">
<dict-value :options="dictData.app_type" :value="row.type" />
</template>
</el-table-column>
<el-table-column label="版本" prop="version" show-overflow-tooltip />
<el-table-column
label="app链接"
prop="dow_url"
show-overflow-tooltip
/>
<el-table-column label="是否强制更新" prop="force">
<template #default="{ row }">
<dict-value
:options="dictData.app_force_quiet"
:value="row.force"
/>
</template>
</el-table-column>
<el-table-column label="是否静默更新" prop="quiet">
<template #default="{ row }">
<dict-value
:options="dictData.app_force_quiet"
:value="row.quiet"
/>
</template>
</el-table-column>
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['app_update/edit']"
type="primary"
link
@click="handleEdit(row)"
>
编辑
</el-button>
<el-button
v-perms="['app_update/delete']" v-perms="['app_update/delete']"
:disabled="!selectData.length" type="danger"
@click="handleDelete(selectData)" link
> @click="handleDelete(row.id)"
>
删除 删除
</el-button> </el-button>
<div class="mt-4"> </template>
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> </el-table-column>
<el-table-column type="selection" width="55" /> </el-table>
<el-table-column label="标题" prop="title" show-overflow-tooltip /> </div>
<el-table-column label="内容" prop="content" show-overflow-tooltip /> <div class="flex mt-4 justify-end">
<el-table-column label="APP类型" prop="type"> <pagination v-model="pager" @change="getLists" />
<template #default="{ row }"> </div>
<dict-value :options="dictData.app_type" :value="row.type" /> </el-card>
</template> <edit-popup
</el-table-column> v-if="showEdit"
<el-table-column label="版本" prop="version" show-overflow-tooltip /> ref="editRef"
<el-table-column label="app链接" prop="dow_url" show-overflow-tooltip /> :dict-data="dictData"
<el-table-column label="是否强制更新" prop="force"> @success="getLists"
<template #default="{ row }"> @close="showEdit = false"
<dict-value :options="dictData.app_force_quiet" :value="row.force" /> />
</template> </div>
</el-table-column>
<el-table-column label="是否静默更新" prop="quiet">
<template #default="{ row }">
<dict-value :options="dictData.app_force_quiet" :value="row.quiet" />
</template>
</el-table-column>
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['app_update/edit']"
type="primary"
link
@click="handleEdit(row)"
>
编辑
</el-button>
<el-button
v-perms="['app_update/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
</div>
</template> </template>
<script lang="ts" setup name="appUpdateLists"> <script lang="ts" setup name="appUpdateLists">
import { usePaging } from '@/hooks/usePaging' import { usePaging } from "@/hooks/usePaging";
import { useDictData } from '@/hooks/useDictOptions' import { useDictData } from "@/hooks/useDictOptions";
import { apiAppUpdateLists, apiAppUpdateDelete } from '@/api/app_update' import { apiAppUpdateLists, apiAppUpdateDelete } from "@/api/app_update";
import { timeFormat } from '@/utils/util' import { timeFormat } from "@/utils/util";
import feedback from '@/utils/feedback' import feedback from "@/utils/feedback";
import EditPopup from './edit.vue' import EditPopup from "./edit.vue";
const editRef = shallowRef<InstanceType<typeof EditPopup>>() const editRef = shallowRef<InstanceType<typeof EditPopup>>();
// //
const showEdit = ref(false) const showEdit = ref(false);
// //
const queryParams = reactive({ const queryParams = reactive({
title: '', title: "",
content: '', content: "",
type: '', type: "",
version: '', version: "",
dow_url: '', dow_url: "",
force: '', force: "",
quiet: '' quiet: "",
}) });
// //
const selectData = ref<any[]>([]) const selectData = ref<any[]>([]);
// //
const handleSelectionChange = (val: any[]) => { const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id) selectData.value = val.map(({ id }) => id);
} };
// //
const { dictData } = useDictData('app_type,app_force_quiet') const { dictData } = useDictData("app_type,app_force_quiet");
// //
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiAppUpdateLists, fetchFun: apiAppUpdateLists,
params: queryParams params: queryParams,
}) });
// //
const handleAdd = async () => { const handleAdd = async () => {
showEdit.value = true showEdit.value = true;
await nextTick() await nextTick();
editRef.value?.open('add') editRef.value?.open("add");
} };
// //
const handleEdit = async (data: any) => { const handleEdit = async (data: any) => {
showEdit.value = true showEdit.value = true;
await nextTick() await nextTick();
editRef.value?.open('edit') editRef.value?.open("edit");
editRef.value?.setFormData(data) editRef.value?.setFormData(data);
} };
// //
const handleDelete = async (id: number | any[]) => { const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除?') await feedback.confirm("确定要删除?");
await apiAppUpdateDelete({ id }) await apiAppUpdateDelete({ id });
getLists() getLists();
} };
getLists() getLists();
</script> </script>

View File

@ -423,6 +423,7 @@ const clickTaskAdmin = async () => {
const handleSubmit = async () => { const handleSubmit = async () => {
await formRef.value?.validate(); await formRef.value?.validate();
const data = { ...formData }; const data = { ...formData };
if (data.type != 32) data.extend = {}; // ,
mode.value == "edit" mode.value == "edit"
? await apiTaskTemplateEdit(data) ? await apiTaskTemplateEdit(data)
: await apiTaskTemplateAdd(data); : await apiTaskTemplateAdd(data);