This commit is contained in:
孟帅
2023-11-25 18:36:11 +08:00
parent 40117c700d
commit 70e9f966c3
142 changed files with 5407 additions and 2058 deletions

View File

@@ -0,0 +1,76 @@
import { http, jumpExport } from '@/utils/http/axios';
// 列表
export function List(params) {
return http.request({
url: '/hgexample/treeTable/list',
method: 'get',
params,
});
}
// 删除/批量删除
export function Delete(params) {
return http.request({
url: '/hgexample/treeTable/delete',
method: 'POST',
params,
});
}
// 添加/编辑
export function Edit(params) {
return http.request({
url: '/hgexample/treeTable/edit',
method: 'POST',
params,
});
}
// 修改状态
export function Status(params) {
return http.request({
url: '/hgexample/treeTable/status',
method: 'POST',
params,
});
}
// 操作开关
export function Switch(params) {
return http.request({
url: '/hgexample/treeTable/switch',
method: 'POST',
params,
});
}
// 详情
export function View(params) {
return http.request({
url: '/hgexample/treeTable/view',
method: 'GET',
params,
});
}
// 获取最大排序
export function MaxSort() {
return http.request({
url: '/hgexample/treeTable/maxSort',
method: 'GET',
});
}
// 树形选项
export function Select() {
return http.request({
url: '/hgexample/treeTable/select',
method: 'get',
});
}
// 导出
export function Export(params) {
jumpExport('/hgexample/treeTable/export', params);
}

View File

@@ -95,3 +95,11 @@ export function OnlineExec(params) {
params,
});
}
export function DispatchLog(params) {
return http.request({
url: '/cron/dispatchLog',
method: 'POST',
params,
});
}

View File

@@ -52,6 +52,13 @@
</n-radio-button>
</n-radio-group>
</template>
<template v-else-if="schema.component === 'NTreeSelect'">
<n-tree-select
:class="{ isFull: schema.isFull !== false && getProps.isFull }"
v-model:value="formModel[schema.field]"
v-bind="getComponentProps(schema)"
/>
</template>
<!--动态渲染表单组件-->
<component
v-else

View File

@@ -164,7 +164,6 @@
}
//切换
function onChange(checkList) {
console.log('checkList:' + JSON.stringify(checkList));
if (state.selection) {
checkList.unshift('selection');
}

View File

@@ -55,6 +55,7 @@ export interface ConfigState {
domain: string;
version: string;
wsAddr: string;
mode:string;
}
export interface LoginConfigState {
@@ -229,7 +230,6 @@ export const useUserStore = defineStore({
if (this.loginConfig !== null && this.loginConfig.loginAutoOpenId !== 1) {
return false;
}
return this.info === null || this.info.openId === '';
},
// 登出

View File

@@ -241,7 +241,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
return new VAxios(
deepMerge(
{
timeout: 10 * 1000,
timeout: 30 * 1000,
authenticationScheme: '',
// 接口前缀
prefixUrl: urlPrefix,

View File

@@ -192,16 +192,12 @@ export function getTreeItem(data: any[], key?: string | number): any {
return result;
}
/**
* 找到所有节点
* */
const treeAll: any[] = [];
export function getTreeAll(data: any[]): any[] {
const treeAll: any[] = [];
data.map((item) => {
treeAll.push(item.key);
if (item.children && item.children.length) {
getTreeAll(item.children);
treeAll.push(...getTreeAll(item.children));
}
});
return treeAll;

View File

@@ -25,6 +25,7 @@
:row-key="(row) => row.id"
ref="actionRef"
:actionColumn="actionColumn"
:checked-row-keys="checkedIds"
@update:checked-row-keys="onCheckedRow"
:scroll-x="1090"
:resizeHeightOffset="-10000"
@@ -227,6 +228,8 @@
negativeText: '取消',
onPositiveClick: () => {
Delete({ id: checkedIds.value }).then((_res) => {
batchDeleteDisabled.value = true;
checkedIds.value = [];
message.success('删除成功');
reloadTable();
});

View File

@@ -0,0 +1,249 @@
<template>
<div>
<n-modal
v-model:show="isShowModal"
:show-icon="false"
preset="dialog"
:title="params?.id > 0 ? '编辑 #' + params?.id : '添加'"
:style="{
width: dialogWidth,
}"
>
<n-form
:model="params"
:rules="rules"
ref="formRef"
label-placement="left"
:label-width="80"
class="py-4"
>
<n-form-item label="上级" path="pid">
<n-tree-select
:options="optionTreeData"
:default-value="params.pid"
v-model:value="params.pid"
/>
</n-form-item>
<n-form-item label="标题" path="title">
<n-input placeholder="请输入标题" v-model:value="params.title" />
</n-form-item>
<n-form-item label="分类ID" path="categoryId">
<n-input-number placeholder="请输入分类ID" v-model:value="params.categoryId" />
</n-form-item>
<n-form-item label="标签" path="flag">
<n-checkbox-group v-model:value="params.flag">
<n-space>
<n-checkbox
v-for="item in options.sys_notice_type"
:key="item.value"
:value="item.value"
:label="item.label"
/>
</n-space>
</n-checkbox-group>
</n-form-item>
<n-form-item label="描述" path="description">
<n-input type="textarea" placeholder="描述" v-model:value="params.description" />
</n-form-item>
<n-form-item label="内容" path="content">
<Editor style="height: 450px" v-model:value="params.content" />
</n-form-item>
<n-form-item label="单图" path="image">
<UploadImage v-model:value="params.image" />
</n-form-item>
<n-form-item label="多图" path="images">
<FileChooser :maxNumber="10" v-model:value="params.images" fileType="image" />
</n-form-item>
<n-form-item label="单附件" path="attachfile">
<FileChooser v-model:value="params.attachfile" />
</n-form-item>
<n-form-item label="多附件" path="attachfiles">
<UploadFile :maxNumber="10" v-model:value="params.attachfiles" />
</n-form-item>
<n-form-item label="键值对" path="map">
<n-dynamic-input
v-model:value="params.map"
preset="pair"
key-placeholder="键名"
value-placeholder="键值"
/>
</n-form-item>
<n-form-item label="推荐星" path="star">
<n-rate allow-half :default-value="params.star" :on-update:value="updateStar" />
</n-form-item>
<n-form-item label="价格" path="price">
<n-input-number
placeholder="请输入价格"
clearable
v-model:value="params.price"
:precision="2"
/>
</n-form-item>
<n-form-item label="活动时间" path="activityAt">
<DatePicker v-model:formValue="params.activityAt" type="date" />
</n-form-item>
<n-form-item label="开放时间" path="startAt">
<DatePicker
v-model:startValue="params.startAt"
v-model:endValue="params.endAt"
type="datetimerange"
/>
</n-form-item>
<n-form-item label="用户渠道" path="channel">
<n-select v-model:value="params.channel" :options="options.sys_user_channel" />
</n-form-item>
<n-form-item label="所在城市" path="cityId">
<CitySelector v-model:value="params.cityId" />
</n-form-item>
<n-form-item label="用户爱好" path="hobby">
<n-select multiple v-model:value="params.hobby" :options="options.sys_user_hobby" />
</n-form-item>
<n-form-item label="QQ" path="qq">
<n-input placeholder="请输入QQ号" v-model:value="params.qq" />
</n-form-item>
<n-form-item label="邮箱" path="email">
<n-input placeholder="请输入邮箱地址" v-model:value="params.email" />
</n-form-item>
<n-form-item label="手机号" path="mobile">
<n-input placeholder="请输入手机号" v-model:value="params.mobile" />
</n-form-item>
<n-form-item label="排序" path="sort">
<n-input-number v-model:value="params.sort" clearable />
</n-form-item>
<n-form-item label="状态" path="status">
<n-radio-group v-model:value="params.status" name="status">
<n-radio-button
v-for="status in options.sys_normal_disable"
:key="Number(status.value)"
:value="Number(status.value)"
:label="status.label"
/>
</n-radio-group>
</n-form-item>
<n-form-item label="备注" path="remark">
<n-input type="textarea" placeholder="请输入备注" v-model:value="params.remark" />
</n-form-item>
</n-form>
<template #action>
<n-space>
<n-button @click="closeForm">取消</n-button>
<n-button type="info" :loading="formBtnLoading" @click="confirmForm">确定</n-button>
</n-space>
</template>
</n-modal>
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref, computed, watch } from 'vue';
import { rules, options, State, newState } from './model';
import { Edit, MaxSort } from '@/api/addons/hgexample/treeTable';
import { useMessage } from 'naive-ui';
import { adaModalWidth } from '@/utils/hotgo';
import DatePicker from '@/components/DatePicker/datePicker.vue';
import Editor from '@/components/Editor/editor.vue';
import UploadImage from '@/components/Upload/uploadImage.vue';
import UploadFile from '@/components/Upload/uploadFile.vue';
import CitySelector from '@/components/CitySelector/citySelector.vue';
import FileChooser from '@/components/FileChooser/index.vue';
const emit = defineEmits(['reloadTable', 'updateShowModal']);
interface Props {
showModal: boolean;
formParams?: State;
optionTreeData: any;
}
const props = withDefaults(defineProps<Props>(), {
showModal: false,
formParams: () => {
return newState(null);
},
optionTreeData: [],
});
const isShowModal = computed({
get: () => {
return props.showModal;
},
set: (value) => {
emit('updateShowModal', value);
},
});
const params = computed(() => {
return props.formParams;
});
const message = useMessage();
const formRef = ref<any>({});
const dialogWidth = ref('75%');
const formBtnLoading = ref(false);
function confirmForm(e) {
e.preventDefault();
formBtnLoading.value = true;
formRef.value.validate((errors) => {
if (!errors) {
Edit(params.value).then((_res) => {
message.success('操作成功');
setTimeout(() => {
isShowModal.value = false;
emit('reloadTable');
});
});
} else {
message.error('请填写完整信息');
}
formBtnLoading.value = false;
});
}
function updateStar(num) {
params.value.star = num;
}
function closeForm() {
isShowModal.value = false;
}
watch(
() => params.value,
(value) => {
if (value.id === 0) {
MaxSort().then((res) => {
params.value.sort = res.sort;
});
}
}
);
onMounted(async () => {
adaModalWidth(dialogWidth);
});
</script>
<style lang="less"></style>

View File

@@ -0,0 +1,232 @@
<template>
<div>
<div class="n-layout-page-header">
<n-card :bordered="false" title="表格例子"> 一个树形表格例子 </n-card>
</div>
<n-grid class="mt-6" cols="1 s:1 m:1 l:4 xl:4 2xl:4" responsive="screen" :x-gap="12">
<n-gi span="1">
<n-card :segmented="{ content: true }" :bordered="false" size="small">
<template #header>
<n-space>
<n-button type="info" icon-placement="left" @click="openCreateDrawer">
<template #icon>
<div class="flex items-center">
<n-icon size="14">
<PlusOutlined />
</n-icon>
</div>
</template>
添加
</n-button>
<n-button
type="info"
icon-placement="left"
@click="openEditDrawer"
:disabled="formParams?.id === null || formParams?.id <= 0"
>
<template #icon>
<div class="flex items-center">
<n-icon size="14">
<EditOutlined />
</n-icon>
</div>
</template>
编辑
</n-button>
<n-button type="error" icon-placement="left" @click="handleDel">
<template #icon>
<div class="flex items-center">
<n-icon size="14">
<DeleteOutlined />
</n-icon>
</div>
</template>
删除
</n-button>
<n-button type="info" icon-placement="left" @click="packHandle">
{{ expandedKeys.length ? '收起' : '展开' }}
<template #icon>
<div class="flex items-center">
<n-icon size="14">
<AlignLeftOutlined />
</n-icon>
</div>
</template>
</n-button>
</n-space>
</template>
<div class="w-full menu">
<n-input v-model:value="pattern" placeholder="输入地区名称搜索">
<template #suffix>
<n-icon size="18" class="cursor-pointer">
<SearchOutlined />
</n-icon>
</template>
</n-input>
<div class="py-3 menu-list">
<template v-if="loading">
<div class="flex items-center justify-center py-4">
<n-spin size="medium" />
</div>
</template>
<template v-else>
<n-tree
block-line
cascade
checkable
:virtual-scroll="true"
:pattern="pattern"
:data="treeData"
:expandedKeys="expandedKeys"
style="height: 75vh"
@update:selected-keys="selectedTree"
@update:expanded-keys="onExpandedKeys"
/>
</template>
</div>
</div>
</n-card>
</n-gi>
<n-gi span="3">
<n-card :segmented="{ content: true }" :bordered="false" size="small">
<template #header>
<n-space>
<n-icon size="18">
<FormOutlined />
</n-icon>
<span>正在编辑 {{ treeItemTitle ? `${treeItemTitle}` : '' }}</span>
<span style="font-size: 14px">{{
treeItemTitle ? '' : '从列表选择一项后,进行编辑'
}}</span>
</n-space>
</template>
<List
:checkedId="checkedId"
:optionTreeData="optionTreeData"
@reloadTable="reloadTable"
/>
</n-card>
</n-gi>
</n-grid>
<Edit
@reloadTable="reloadTable"
@updateShowModal="updateShowModal"
:showModal="showModal"
:formParams="formParams"
:optionTreeData="optionTreeData"
/>
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref, unref } from 'vue';
import { useDialog, useMessage } from 'naive-ui';
import {
AlignLeftOutlined,
FormOutlined,
PlusOutlined,
EditOutlined,
SearchOutlined,
DeleteOutlined,
} from '@vicons/antd';
import { getTreeItem } from '@/utils';
import List from './list.vue';
import { Delete, Select } from '@/api/addons/hgexample/treeTable';
import Edit from './edit.vue';
import { newState } from './model';
const showModal = ref(false);
const message = useMessage();
const dialog = useDialog();
let treeItemKey = ref([]);
let expandedKeys = ref([]);
const treeData = ref([]);
const loading = ref(true);
const treeItemTitle = ref('');
const checkedId = ref(0);
const pattern = ref('');
const optionTreeData = ref<any>([]);
const formParams = ref(newState(null));
function openCreateDrawer() {
showModal.value = true;
formParams.value = newState(null);
}
function openEditDrawer() {
showModal.value = true;
}
function selectedTree(keys) {
if (keys.length) {
const treeItem = getTreeItem(unref(treeData), keys[0]);
treeItemKey.value = keys;
treeItemTitle.value = treeItem.label;
formParams.value = newState(treeItem);
checkedId.value = treeItem.id;
} else {
treeItemKey.value = [];
treeItemTitle.value = '';
}
}
function handleDel() {
dialog.info({
title: '提示',
content: `您确定想删除吗?`,
positiveText: '确定',
negativeText: '取消',
onPositiveClick: () => {
Delete({ ...formParams.value }).then(async (_res) => {
message.success('操作成功');
await reloadTable();
});
},
onNegativeClick: () => {
message.error('已取消');
},
});
}
function packHandle() {
if (expandedKeys.value.length) {
expandedKeys.value = [];
} else {
expandedKeys.value = unref(treeData).map((item: any) => item.key as string) as [];
}
}
onMounted(async () => {
await reloadTable();
});
async function reloadTable() {
const treeMenuList = await Select();
Object.assign(
formParams,
treeMenuList.list.map((item) => item.key)
);
treeData.value = [];
optionTreeData.value = [
{
id: 0,
key: 0,
label: '根目录',
pid: 0,
title: '根目录',
},
];
treeData.value = treeMenuList.list;
optionTreeData.value = optionTreeData.value.concat(treeMenuList.list);
loading.value = false;
}
function onExpandedKeys(keys) {
expandedKeys.value = keys;
}
function updateShowModal(value) {
showModal.value = value;
}
</script>

View File

@@ -0,0 +1,250 @@
<template>
<div>
<n-card :bordered="false" class="proCard">
<n-result
v-show="checkedId <= 0"
status="info"
title="提示"
description="请选择一个想要编辑的树"
/>
<div v-show="checkedId > 0">
<BasicForm
@register="register"
@submit="reloadTable"
@reset="reloadTable"
@keyup.enter="reloadTable"
ref="searchFormRef"
>
<template #statusSlot="{ model, field }">
<n-input v-model:value="model[field]" />
</template>
</BasicForm>
<BasicTable
:openChecked="true"
:columns="columns"
:request="loadDataTable"
:row-key="(row) => row.id"
ref="actionRef"
:actionColumn="actionColumn"
:checked-row-keys="checkedIds"
@update:checked-row-keys="onCheckedRow"
:scroll-x="1090"
:resizeHeightOffset="-10000"
size="small"
@update:sorter="handleUpdateSorter"
>
<template #tableTitle>
<n-button type="primary" @click="addTable" class="min-left-space">
<template #icon>
<n-icon>
<PlusOutlined />
</n-icon>
</template>
添加
</n-button>
<n-button
type="error"
@click="handleBatchDelete"
:disabled="batchDeleteDisabled"
class="min-left-space"
>
<template #icon>
<n-icon>
<DeleteOutlined />
</n-icon>
</template>
批量删除
</n-button>
<n-button type="primary" @click="handleExport" class="min-left-space">
<template #icon>
<n-icon>
<ExportOutlined />
</n-icon>
</template>
导出
</n-button>
</template>
</BasicTable>
</div>
</n-card>
<Edit
@reloadTable="reloadTable"
@updateShowModal="updateShowModal"
:showModal="showModal"
:formParams="formParams"
:optionTreeData="optionTreeData"
/>
</div>
</template>
<script lang="ts" setup>
import { h, reactive, ref, watch } from 'vue';
import { useDialog, useMessage } from 'naive-ui';
import { BasicTable, TableAction } from '@/components/Table';
import { BasicForm, useForm } from '@/components/Form/index';
import { useSorter } from '@/hooks/common';
import { Delete, List, Status, Export } from '@/api/addons/hgexample/treeTable';
import { State, columns, schemas, options, newState } from './model';
import { DeleteOutlined, PlusOutlined, ExportOutlined } from '@vicons/antd';
import { getOptionLabel } from '@/utils/hotgo';
import Edit from './edit.vue';
interface Props {
checkedId?: number;
optionTreeData: any;
}
const props = withDefaults(defineProps<Props>(), { checkedId: 0, optionTreeData: [] });
const emit = defineEmits(['reloadTable']);
const dialog = useDialog();
const message = useMessage();
const searchFormRef = ref<any>();
const batchDeleteDisabled = ref(true);
const checkedIds = ref([]);
const showModal = ref(false);
const formParams = ref<State>();
const actionRef = ref();
const { updateSorter: handleUpdateSorter, sortStatesRef: sortStatesRef } = useSorter(reloadTable);
const pid = ref(0);
const actionColumn = reactive({
width: 300,
title: '操作',
key: 'action',
// fixed: 'right',
render(record) {
return h(TableAction as any, {
style: 'button',
actions: [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
},
{
label: '禁用',
onClick: handleStatus.bind(null, record, 2),
ifShow: () => {
return record.status === 1;
},
},
{
label: '启用',
onClick: handleStatus.bind(null, record, 1),
ifShow: () => {
return record.status === 2;
},
},
{
label: '删除',
onClick: handleDelete.bind(null, record),
},
],
});
},
});
const [register, {}] = useForm({
gridProps: { cols: '1 s:1 m:2 l:3 xl:4 2xl:4' },
labelWidth: 80,
schemas,
});
const loadDataTable = async (res) => {
if (pid.value <= 0) {
return [];
}
return await List({
...searchFormRef.value?.formModel,
...{ sorters: sortStatesRef.value },
...{ pid: pid.value },
...res,
});
};
function addTable() {
showModal.value = true;
formParams.value = newState(null);
formParams.value.pid = pid.value;
}
function updateShowModal(value) {
showModal.value = value;
}
function onCheckedRow(rowKeys) {
batchDeleteDisabled.value = rowKeys.length <= 0;
checkedIds.value = rowKeys;
}
function reloadTable() {
emit('reloadTable');
actionRef.value.reload();
}
function handleEdit(record: Recordable) {
showModal.value = true;
formParams.value = newState(record as State);
}
function handleDelete(record: Recordable) {
dialog.warning({
title: '警告',
content: '你确定要删除?',
positiveText: '确定',
negativeText: '取消',
onPositiveClick: () => {
Delete(record).then((_res) => {
message.success('删除成功');
reloadTable();
});
},
});
}
function handleBatchDelete() {
dialog.warning({
title: '警告',
content: '你确定要批量删除?',
positiveText: '确定',
negativeText: '取消',
onPositiveClick: () => {
Delete({ id: checkedIds.value }).then((_res) => {
batchDeleteDisabled.value = true;
checkedIds.value = [];
message.success('删除成功');
reloadTable();
});
},
});
}
function handleExport() {
message.loading('正在导出列表...', { duration: 1200 });
Export(searchFormRef.value?.formModel);
}
function handleStatus(record: Recordable, status: number) {
Status({ id: record.id, status: status }).then((_res) => {
message.success('设为' + getOptionLabel(options.value.sys_normal_disable, status) + '成功');
setTimeout(() => {
reloadTable();
});
});
}
watch(props, (_newVal, _oldVal) => {
if (pid.value === _newVal.checkedId) {
return;
}
pid.value = Number(_newVal.checkedId);
if (_newVal.checkedId > 0) {
reloadTable();
}
});
</script>
<style lang="less" scoped></style>

View File

@@ -0,0 +1,529 @@
import { h, ref } from 'vue';
import { NAvatar, NImage, NTag, NSwitch, NRate } from 'naive-ui';
import { cloneDeep } from 'lodash-es';
import { FormSchema } from '@/components/Form';
import { Dicts } from '@/api/dict/dict';
import { Switch } from '@/api/addons/hgexample/table';
import { isNullObject } from '@/utils/is';
import { getFileExt } from '@/utils/urlUtils';
import { defRangeShortcuts, defShortcuts, formatToDate } from '@/utils/dateUtil';
import { validate } from '@/utils/validateUtil';
import { errorImg, getOptionLabel, getOptionTag, Options } from '@/utils/hotgo';
const $message = window['$message'];
export interface State {
id: number;
memberId: number;
categoryId: number;
flag: number[] | null;
title: string;
content: string;
image: string;
images: string[] | null;
attachfile: string;
attachfiles: string[] | null;
map: unknown[] | null;
star: number;
description: string;
price: number;
views: number;
activityAt: string;
startAt: null;
endAt: null;
switch: number;
sort: number;
avatar: string;
sex: number;
qq: string;
email: string;
mobile: string;
channel: number;
cityId: number;
hobby: string[] | null;
pid: number;
level: number;
tree: string;
remark: string;
status: number;
createdBy: number;
createdAt: string;
updatedAt: string;
}
export const defaultState = {
id: 0,
memberId: 0,
categoryId: 0,
flag: [1],
title: '',
content: '',
image: '',
images: null,
attachfile: '',
attachfiles: null,
map: null,
star: 0,
description: '',
price: 0,
views: 0,
activityAt: '',
startAt: null,
endAt: null,
switch: 0,
sort: 0,
avatar: '',
sex: 0,
qq: '',
email: '',
mobile: '',
channel: 0,
cityId: 0,
hobby: null,
pid: 0,
level: 1,
tree: '',
remark: '',
status: 1,
createdBy: 0,
createdAt: '',
updatedAt: '',
};
export function newState(state: State | null): State {
if (state !== null) {
return cloneDeep(state);
}
return cloneDeep(defaultState);
}
export const options = ref<Options>({
sys_normal_disable: [],
sys_user_sex: [],
sys_notice_type: [],
sys_user_channel: [],
sys_user_hobby: [],
sys_switch: [],
});
export const rules = {
title: {
required: true,
trigger: ['blur', 'input'],
message: '请输入标题',
},
price: {
required: true,
trigger: ['blur', 'input'],
validator: validate.amount,
},
qq: {
required: false,
trigger: ['blur', 'input'],
validator: validate.qq,
},
email: {
required: true,
trigger: ['blur', 'input'],
validator: validate.email,
},
mobile: {
required: true,
trigger: ['blur', 'input'],
validator: validate.phone,
},
};
export const schemas = ref<FormSchema[]>([
{
field: 'title',
component: 'NInput',
label: '标题',
componentProps: {
placeholder: '请输入标题',
onUpdateValue: (e: any) => {
console.log(e);
},
},
rules: [{ message: '请输入标题', trigger: ['blur'] }],
},
{
field: 'content',
component: 'NInput',
label: '内容',
componentProps: {
placeholder: '请输入内容关键词',
showButton: false,
onUpdateValue: (e: any) => {
console.log(e);
},
},
},
{
field: 'price',
labelMessage: '我是自定义提示',
component: 'NInput',
label: '价格',
componentProps: {
pair: true,
separator: '-',
clearable: true,
placeholder: ['从', '到'],
onInput: (e: any) => {
console.log(e);
},
},
},
{
field: 'activityAt',
component: 'NDatePicker',
label: '活动时间',
componentProps: {
type: 'date',
clearable: true,
shortcuts: defShortcuts(),
onUpdateValue: (e: any) => {
console.log(e);
},
},
},
{
field: 'createdAt',
component: 'NDatePicker',
label: '创建时间',
componentProps: {
type: 'datetimerange',
clearable: true,
shortcuts: defRangeShortcuts(),
onUpdateValue: (e: any) => {
console.log(e);
},
},
},
{
field: 'flag',
component: 'NCheckbox',
label: '标签',
giProps: {
span: 1,
},
componentProps: {
placeholder: '请选择标签',
options: [],
onUpdateChecked: (e: any) => {
console.log(e);
},
},
},
{
field: 'switch',
component: 'NRadioGroup',
label: '开关',
giProps: {
//span: 24,
},
componentProps: {
options: [],
onUpdateChecked: (e: any) => {
console.log(e);
},
},
},
{
field: 'hobby',
component: 'NSelect',
label: '爱好',
defaultValue: null,
componentProps: {
multiple: true,
placeholder: '请选择爱好',
options: [],
onUpdateValue: (e: any) => {
console.log(e);
},
},
},
{
field: 'status',
component: 'NSelect',
label: '状态',
defaultValue: null,
componentProps: {
placeholder: '请选择类型',
options: [],
onUpdateValue: (e: any) => {
console.log(e);
},
},
},
]);
export const columns = [
{
title: 'ID',
key: 'id',
sorter: true, // 单列排序
},
{
title: '标题',
key: 'title',
render(row) {
return row.title;
},
sorter: {
multiple: 1, // 为多列排序的优先级,越高优先级越高
},
},
{
title: '标签',
key: 'flag',
render(row) {
if (isNullObject(row.flag)) {
return ``;
}
return row.flag.map((tagKey) => {
return h(
NTag,
{
style: {
marginRight: '6px',
},
type: getOptionTag(options.value.sys_notice_type, tagKey),
bordered: false,
},
{
default: () => getOptionLabel(options.value.sys_notice_type, tagKey),
}
);
});
},
},
{
title: '单图',
key: 'image',
render(row) {
return h(NImage, {
width: 32,
height: 32,
src: row.image,
fallbackSrc: errorImg,
style: {
width: '32px',
height: '32px',
'max-width': '100%',
'max-height': '100%',
},
});
},
},
{
title: '多图',
key: 'images',
render(row) {
if (isNullObject(row.images)) {
return ``;
}
return row.images.map((image) => {
return h(NImage, {
width: 32,
height: 32,
src: image,
fallbackSrc: errorImg,
style: {
width: '32px',
height: '32px',
'max-width': '100%',
'max-height': '100%',
'margin-left': '2px',
},
});
});
},
},
{
title: '附件',
key: 'attachfile',
render(row) {
if (row.attachfile === '') {
return ``;
}
return h(
NAvatar,
{
size: 'small',
},
{
default: () => getFileExt(row.attachfile),
}
);
},
},
{
title: '多附件',
key: 'attachfiles',
render(row) {
if (isNullObject(row.attachfiles)) {
return ``;
}
return row.attachfiles.map((attachfile) => {
return h(
NAvatar,
{
size: 'small',
style: {
'margin-left': '2px',
},
},
{
default: () => getFileExt(attachfile),
}
);
});
},
},
{
title: '推荐星',
key: 'star',
// width: 180,
render(row) {
return h(NRate, {
allowHalf: true,
readonly: true,
defaultValue: row.star,
});
},
},
{
title: '描述',
key: 'description',
},
{
title: '价格',
key: 'price',
sorter: {
multiple: 2, // 为多列排序的优先级,越高优先级越高
},
render(row) {
return h(
NTag,
{
style: {
marginRight: '6px',
},
type: 'success',
bordered: false,
},
{
default: () => row.price.toFixed(2),
}
);
},
},
{
title: '开关',
key: 'switch',
width: 100,
render(row) {
return h(NSwitch, {
value: row.switch === 1,
checked: '开启',
unchecked: '关闭',
onUpdateValue: function (e) {
row.switch = e ? 1 : 2;
Switch({ id: row.id, key: 'switch', value: row.switch }).then((_res) => {
$message.success('操作成功');
});
},
});
},
},
// {
// title: '排序',
// key: 'sort',
// },
{
title: '状态',
key: 'status',
render(row) {
if (isNullObject(row.status)) {
return ``;
}
return h(
NTag,
{
style: {
marginRight: '6px',
},
type: getOptionTag(options.value.sys_normal_disable, row.status),
bordered: false,
},
{
default: () => getOptionLabel(options.value.sys_normal_disable, row.status),
}
);
},
},
{
title: '爱好',
key: 'hobby',
render(row) {
if (isNullObject(row.hobby)) {
return ``;
}
return row.hobby.map((tagKey) => {
return h(
NTag,
{
style: {
marginRight: '6px',
},
type: getOptionTag(options.value.sys_user_hobby, tagKey),
bordered: false,
},
{
default: () => getOptionLabel(options.value.sys_user_hobby, tagKey),
}
);
});
},
},
{
title: '活动时间',
key: 'activityAt',
render(row) {
return formatToDate(row.activityAt);
},
sorter: {
multiple: 3, // 为多列排序的优先级,越高优先级越高
},
},
];
async function loadOptions() {
options.value = await Dicts({
types: [
'sys_normal_disable',
'sys_user_sex',
'sys_notice_type',
'sys_switch',
'sys_user_hobby',
'sys_user_channel',
],
});
for (const item of schemas.value) {
switch (item.field) {
case 'status':
item.componentProps.options = options.value.sys_normal_disable;
break;
case 'flag':
item.componentProps.options = options.value.sys_notice_type;
break;
case 'switch':
item.componentProps.options = options.value.sys_switch;
break;
case 'hobby':
item.componentProps.options = options.value.sys_user_hobby;
break;
}
}
}
await loadOptions();

View File

@@ -26,6 +26,7 @@
:row-key="(row) => row.id"
ref="actionRef"
:actionColumn="actionColumn"
:checked-row-keys="checkedIds"
@update:checked-row-keys="onCheckedRow"
:scroll-x="1090"
:resizeHeightOffset="-10000"
@@ -63,7 +64,7 @@
type="primary"
@click="handleExport"
class="min-left-space"
v-if="hasPermission(['/curdDemo/delete'])"
v-if="hasPermission(['/curdDemo/export'])"
>
<template #icon>
<n-icon>
@@ -222,6 +223,8 @@
negativeText: '取消',
onPositiveClick: () => {
Delete({ id: checkedIds.value }).then((_res) => {
batchDeleteDisabled.value = true;
checkedIds.value = [];
message.success('删除成功');
reloadTable();
});

View File

@@ -20,6 +20,7 @@
:row-key="(row) => row.id"
ref="actionRef"
:actionColumn="actionColumn"
:checked-row-keys="checkedIds"
@update:checked-row-keys="onCheckedRow"
:scroll-x="1090"
:resizeHeightOffset="-10000"
@@ -246,6 +247,8 @@
negativeText: '取消',
onPositiveClick: () => {
Delete({ id: checkedIds.value }).then((_res) => {
batchDeleteDisabled.value = true;
checkedIds.value = [];
message.success('删除成功');
reloadTable();
});

View File

@@ -25,6 +25,7 @@
:row-key="(row) => row.id"
ref="actionRef"
:actionColumn="actionColumn"
:checked-row-keys="checkedIds"
@update:checked-row-keys="onCheckedRow"
:scroll-x="1800"
:resizeHeightOffset="-10000"
@@ -206,6 +207,8 @@
negativeText: '取消',
onPositiveClick: () => {
Delete({ id: checkedIds.value }).then((_res) => {
batchDeleteDisabled.value = true;
checkedIds.value = [];
message.success('删除成功');
reloadTable();
});

View File

@@ -137,6 +137,28 @@ const schemas: FormSchema[] = [
},
},
},
{
field: 'id',
component: 'NInput',
label: '用户ID',
componentProps: {
placeholder: '请输入用户ID',
onInput: (e: any) => {
console.log(e);
},
},
},
{
field: 'pid',
component: 'NInput',
label: '上级ID',
componentProps: {
placeholder: '请输入上级用户ID',
onInput: (e: any) => {
console.log(e);
},
},
},
{
field: 'status',
component: 'NSelect',

View File

@@ -21,6 +21,7 @@
</n-form-item>
<n-form-item label="上级目录" path="pid">
<n-tree-select
filterable
:options="optionTreeData"
:default-value="formParams.pid"
@update:value="handleUpdateValue"

View File

@@ -124,7 +124,8 @@
<n-gi>
<n-form-item label="上级目录" path="pid">
<n-tree-select
:options="optionTreeData"
filterable
:options="optionTreeDataEdit"
:value="formParams.pid"
@update:value="handleUpdateValue"
/>
@@ -374,7 +375,7 @@
</div>
</template>
<script lang="ts" setup>
import { onMounted, reactive, ref, unref } from 'vue';
import { onMounted, reactive, ref, unref, computed } from 'vue';
import { FormItemRule, useDialog, useMessage } from 'naive-ui';
import {
AlignLeftOutlined,
@@ -388,6 +389,7 @@
import CreateDrawer from './CreateDrawer.vue';
import IconSelector from '@/components/IconSelector/index.vue';
import { newState, State } from '@/views/permission/menu/model';
import { cloneDeep } from 'lodash-es';
const menuTypes = [
{
@@ -466,11 +468,52 @@
const treeItemTitle = ref('');
const pattern = ref('');
const drawerTitle = ref('');
const treeItemKey = ref([]);
const expandedKeys = ref([]);
const optionTreeData = ref<any>([]);
const formParams = reactive<State>(newState(null));
const optionTreeDataEdit = computed(() => {
let list = cloneDeep(optionTreeData.value);
for (let i = 0; i < list.length; i++) {
const item = list[i];
if (item.id === formParams.id) {
item.disabled = true;
setChildrenDisabled(item.children);
} else {
const foundChild = findItemById(item.children, formParams.id);
if (foundChild) {
foundChild.disabled = true;
setChildrenDisabled(foundChild.children);
}
}
}
return list;
});
function setChildrenDisabled(children) {
if (!children) return;
for (let i = 0; i < children.length; i++) {
const child = children[i];
child.disabled = true;
setChildrenDisabled(child.children);
}
}
function findItemById(children, id) {
if (!children) return null;
for (let i = 0; i < children.length; i++) {
const item = children[i];
if (item.id === id) {
return item;
}
const foundChild = findItemById(item.children, id);
if (foundChild) {
return foundChild;
}
}
return null;
}
let treeItemKey = ref([]);
let expandedKeys = ref([]);
function openCreateDrawer() {
drawerTitle.value = '添加菜单';

View File

@@ -37,194 +37,261 @@
<n-input v-model:value="formValue.uploadFileType" placeholder="" />
</n-form-item>
<n-divider title-placement="left">本地存储</n-divider>
<n-form-item label="本地存储路径" path="uploadLocalPath">
<n-input v-model:value="formValue.uploadLocalPath" placeholder="" />
<template #feedback>填对外访问的相对路径</template>
</n-form-item>
<template v-if="formValue.uploadDrive == 'local'">
<n-divider title-placement="left">本地存储</n-divider>
<n-form-item label="本地存储路径" path="uploadLocalPath">
<n-input v-model:value="formValue.uploadLocalPath" placeholder="" />
<template #feedback>填对外访问的相对路径</template>
</n-form-item>
</template>
<n-divider title-placement="left">ucloud对象存储</n-divider>
<n-form-item label="公钥" path="uploadUCloudPublicKey">
<n-input
type="password"
v-model:value="formValue.uploadUCloudPublicKey"
show-password-on="click"
>
<template #password-visible-icon>
<n-icon :size="16" :component="GlassesOutline" />
</template>
<template #password-invisible-icon>
<n-icon :size="16" :component="Glasses" />
</template>
</n-input>
<template #feedback>获取地址https://console.ucloud.cn/ufile/token</template>
</n-form-item>
<template v-if="formValue.uploadDrive == 'ucloud'">
<n-divider title-placement="left">ucloud对象存储</n-divider>
<n-form-item label="公钥" path="uploadUCloudPublicKey">
<n-input
type="password"
v-model:value="formValue.uploadUCloudPublicKey"
show-password-on="click"
>
<template #password-visible-icon>
<n-icon :size="16" :component="GlassesOutline" />
</template>
<template #password-invisible-icon>
<n-icon :size="16" :component="Glasses" />
</template>
</n-input>
<template #feedback>获取地址https://console.ucloud.cn/ufile/token</template>
</n-form-item>
<n-form-item label="私钥" path="uploadUCloudPrivateKey">
<n-input
type="password"
v-model:value="formValue.uploadUCloudPrivateKey"
show-password-on="click"
>
<template #password-visible-icon>
<n-icon :size="16" :component="GlassesOutline" />
</template>
<template #password-invisible-icon>
<n-icon :size="16" :component="Glasses" />
</template>
</n-input>
</n-form-item>
<n-form-item label="存储路径" path="uploadUCloudPath">
<n-input v-model:value="formValue.uploadUCloudPath" placeholder="" />
<template #feedback>填对对象存储中的相对路径</template>
</n-form-item>
<n-form-item label="地域API" path="uploadUCloudBucketHost">
<n-input v-model:value="formValue.uploadUCloudBucketHost" placeholder="" />
</n-form-item>
<n-form-item label="存储桶名称" path="uploadUCloudBucketName">
<n-input v-model:value="formValue.uploadUCloudBucketName" placeholder="" />
<template #feedback>存储空间名称</template>
</n-form-item>
<n-form-item label="存储桶地域host" path="uploadUCloudFileHost">
<n-input v-model:value="formValue.uploadUCloudFileHost" placeholder="" />
<template #feedback>不需要包含桶名称</template>
</n-form-item>
<n-form-item label="访问域名" path="uploadUCloudEndpoint">
<n-input v-model:value="formValue.uploadUCloudEndpoint" placeholder="" />
<template #feedback>格式http://abc.com 或 https://abc.com不可为空</template>
</n-form-item>
<n-form-item label="私钥" path="uploadUCloudPrivateKey">
<n-input
type="password"
v-model:value="formValue.uploadUCloudPrivateKey"
show-password-on="click"
>
<template #password-visible-icon>
<n-icon :size="16" :component="GlassesOutline" />
</template>
<template #password-invisible-icon>
<n-icon :size="16" :component="Glasses" />
</template>
</n-input>
</n-form-item>
<n-form-item label="存储路径" path="uploadUCloudPath">
<n-input v-model:value="formValue.uploadUCloudPath" placeholder="" />
<template #feedback>填对对象存储中的相对路径</template>
</n-form-item>
<n-form-item label="地域API" path="uploadUCloudBucketHost">
<n-input v-model:value="formValue.uploadUCloudBucketHost" placeholder="" />
</n-form-item>
<n-form-item label="存储桶名称" path="uploadUCloudBucketName">
<n-input v-model:value="formValue.uploadUCloudBucketName" placeholder="" />
<template #feedback>存储空间名称</template>
</n-form-item>
<n-form-item label="存储桶地域host" path="uploadUCloudFileHost">
<n-input v-model:value="formValue.uploadUCloudFileHost" placeholder="" />
<template #feedback>不需要包含桶名称</template>
</n-form-item>
<n-form-item label="访问域名" path="uploadUCloudEndpoint">
<n-input v-model:value="formValue.uploadUCloudEndpoint" placeholder="" />
<template #feedback>格式http://abc.com 或 https://abc.com不可为空</template>
</n-form-item>
</template>
<n-divider title-placement="left">腾讯云COS存储</n-divider>
<n-form-item label="secretId" path="uploadCosSecretId">
<n-input
type="password"
v-model:value="formValue.uploadCosSecretId"
show-password-on="click"
>
<template #password-visible-icon>
<n-icon :size="16" :component="GlassesOutline" />
<template v-if="formValue.uploadDrive == 'cos'">
<n-divider title-placement="left">腾讯云COS存储</n-divider>
<n-form-item label="secretId" path="uploadCosSecretId">
<n-input
type="password"
v-model:value="formValue.uploadCosSecretId"
show-password-on="click"
>
<template #password-visible-icon>
<n-icon :size="16" :component="GlassesOutline" />
</template>
<template #password-invisible-icon>
<n-icon :size="16" :component="Glasses" />
</template>
</n-input>
<template #feedback
>子账号密钥获取地址https://cloud.tencent.com/document/product/598/37140
</template>
<template #password-invisible-icon>
<n-icon :size="16" :component="Glasses" />
</template>
</n-input>
<template #feedback
>子账号密钥获取地址https://cloud.tencent.com/document/product/598/37140</template
>
</n-form-item>
</n-form-item>
<n-form-item label="secretKey" path="uploadCosSecretKey">
<n-input
type="password"
v-model:value="formValue.uploadCosSecretKey"
show-password-on="click"
>
<template #password-visible-icon>
<n-icon :size="16" :component="GlassesOutline" />
<n-form-item label="secretKey" path="uploadCosSecretKey">
<n-input
type="password"
v-model:value="formValue.uploadCosSecretKey"
show-password-on="click"
>
<template #password-visible-icon>
<n-icon :size="16" :component="GlassesOutline" />
</template>
<template #password-invisible-icon>
<n-icon :size="16" :component="Glasses" />
</template>
</n-input>
</n-form-item>
<n-form-item label="存储路径" path="uploadCosBucketURL">
<n-input v-model:value="formValue.uploadCosBucketURL" placeholder="" />
<template #feedback>填对对象存储中的相对路径</template>
</n-form-item>
<n-form-item label="地域API" path="uploadCosPath">
<n-input v-model:value="formValue.uploadCosPath" placeholder="" />
<template #feedback
>控制台查看地址https://console.cloud.tencent.com/cos5/bucket
</template>
<template #password-invisible-icon>
<n-icon :size="16" :component="Glasses" />
</template>
</n-input>
</n-form-item>
<n-form-item label="存储路径" path="uploadCosBucketURL">
<n-input v-model:value="formValue.uploadCosBucketURL" placeholder="" />
<template #feedback>填对对象存储中的相对路径</template>
</n-form-item>
<n-form-item label="地域API" path="uploadCosPath">
<n-input v-model:value="formValue.uploadCosPath" placeholder="" />
<template #feedback
>控制台查看地址https://console.cloud.tencent.com/cos5/bucket</template
>
</n-form-item>
</n-form-item>
</template>
<n-divider title-placement="left">阿里云OSS存储</n-divider>
<n-form-item label="AccessKey ID" path="uploadOssSecretId">
<n-input
type="password"
v-model:value="formValue.uploadOssSecretId"
show-password-on="click"
>
<template #password-visible-icon>
<n-icon :size="16" :component="GlassesOutline" />
</template>
<template #password-invisible-icon>
<n-icon :size="16" :component="Glasses" />
</template>
</n-input>
<template #feedback>创建地址https://ram.console.aliyun.com/manage/ak</template>
</n-form-item>
<template v-if="formValue.uploadDrive == 'oss'">
<n-divider title-placement="left">阿里云OSS存储</n-divider>
<n-form-item label="AccessKey ID" path="uploadOssSecretId">
<n-input
type="password"
v-model:value="formValue.uploadOssSecretId"
show-password-on="click"
>
<template #password-visible-icon>
<n-icon :size="16" :component="GlassesOutline" />
</template>
<template #password-invisible-icon>
<n-icon :size="16" :component="Glasses" />
</template>
</n-input>
<template #feedback>创建地址https://ram.console.aliyun.com/manage/ak</template>
</n-form-item>
<n-form-item label="AccessKey Secret" path="uploadOssSecretKey">
<n-input
type="password"
v-model:value="formValue.uploadOssSecretKey"
show-password-on="click"
>
<template #password-visible-icon>
<n-icon :size="16" :component="GlassesOutline" />
</template>
<template #password-invisible-icon>
<n-icon :size="16" :component="Glasses" />
</template>
</n-input>
</n-form-item>
<n-form-item label="Endpoint" path="uploadOssEndpoint">
<n-input v-model:value="formValue.uploadOssEndpoint" placeholder="" />
<template #feedback> Endpoint地域节点</template>
</n-form-item>
<n-form-item label="存储路径" path="uploadOssPath">
<n-input v-model:value="formValue.uploadOssPath" placeholder="" />
<template #feedback>填对对象存储中的相对路径</template>
</n-form-item>
<n-form-item label="存储空间名称" path="uploadOssBucket">
<n-input v-model:value="formValue.uploadOssBucket" placeholder="" />
</n-form-item>
<n-form-item label="Bucket 域名" path="uploadOssBucketURL">
<n-input v-model:value="formValue.uploadOssBucketURL" placeholder="" />
</n-form-item>
<n-form-item label="AccessKey Secret" path="uploadOssSecretKey">
<n-input
type="password"
v-model:value="formValue.uploadOssSecretKey"
show-password-on="click"
>
<template #password-visible-icon>
<n-icon :size="16" :component="GlassesOutline" />
</template>
<template #password-invisible-icon>
<n-icon :size="16" :component="Glasses" />
</template>
</n-input>
</n-form-item>
<n-form-item label="Endpoint" path="uploadOssEndpoint">
<n-input v-model:value="formValue.uploadOssEndpoint" placeholder="" />
<template #feedback> Endpoint地域节点</template>
</n-form-item>
<n-form-item label="存储路径" path="uploadOssPath">
<n-input v-model:value="formValue.uploadOssPath" placeholder="" />
<template #feedback>填对对象存储中的相对路径</template>
</n-form-item>
<n-form-item label="存储空间名称" path="uploadOssBucket">
<n-input v-model:value="formValue.uploadOssBucket" placeholder="" />
</n-form-item>
<n-form-item label="Bucket 域名" path="uploadOssBucketURL">
<n-input v-model:value="formValue.uploadOssBucketURL" placeholder="" />
</n-form-item>
</template>
<n-divider title-placement="left">七牛云对象存储</n-divider>
<n-form-item label="AccessKey" path="uploadQiNiuAccessKey">
<n-input
type="password"
v-model:value="formValue.uploadQiNiuAccessKey"
show-password-on="click"
>
<template #password-visible-icon>
<n-icon :size="16" :component="GlassesOutline" />
</template>
<template #password-invisible-icon>
<n-icon :size="16" :component="Glasses" />
</template>
</n-input>
<template #feedback>创建地址https://portal.qiniu.com/user/key</template>
</n-form-item>
<template v-if="formValue.uploadDrive == 'qiniu'">
<n-divider title-placement="left">七牛云对象存储</n-divider>
<n-form-item label="AccessKey" path="uploadQiNiuAccessKey">
<n-input
type="password"
v-model:value="formValue.uploadQiNiuAccessKey"
show-password-on="click"
>
<template #password-visible-icon>
<n-icon :size="16" :component="GlassesOutline" />
</template>
<template #password-invisible-icon>
<n-icon :size="16" :component="Glasses" />
</template>
</n-input>
<template #feedback>创建地址https://portal.qiniu.com/user/key</template>
</n-form-item>
<n-form-item label="SecretKey" path="uploadQiNiuSecretKey">
<n-input
type="password"
v-model:value="formValue.uploadQiNiuSecretKey"
show-password-on="click"
>
<template #password-visible-icon>
<n-icon :size="16" :component="GlassesOutline" />
</template>
<template #password-invisible-icon>
<n-icon :size="16" :component="Glasses" />
</template>
</n-input>
</n-form-item>
<n-form-item label="储存路径" path="uploadQiNiuPath">
<n-input v-model:value="formValue.uploadQiNiuPath" placeholder="" />
<template #feedback>填对对象存储中的相对路径</template>
</n-form-item>
<n-form-item label="存储空间名称" path="uploadQiNiuBucket">
<n-input v-model:value="formValue.uploadQiNiuBucket" placeholder="" />
</n-form-item>
<n-form-item label="访问域名" path="uploadQiNiuDomain">
<n-input v-model:value="formValue.uploadQiNiuDomain" placeholder="" />
</n-form-item>
<n-form-item label="SecretKey" path="uploadQiNiuSecretKey">
<n-input
type="password"
v-model:value="formValue.uploadQiNiuSecretKey"
show-password-on="click"
>
<template #password-visible-icon>
<n-icon :size="16" :component="GlassesOutline" />
</template>
<template #password-invisible-icon>
<n-icon :size="16" :component="Glasses" />
</template>
</n-input>
</n-form-item>
<n-form-item label="储存路径" path="uploadQiNiuPath">
<n-input v-model:value="formValue.uploadQiNiuPath" placeholder="" />
<template #feedback>填对对象存储中的相对路径</template>
</n-form-item>
<n-form-item label="存储空间名称" path="uploadQiNiuBucket">
<n-input v-model:value="formValue.uploadQiNiuBucket" placeholder="" />
</n-form-item>
<n-form-item label="访问域名" path="uploadQiNiuDomain">
<n-input v-model:value="formValue.uploadQiNiuDomain" placeholder="" />
</n-form-item>
</template>
<template v-if="formValue.uploadDrive == 'minio'">
<n-divider title-placement="left">minio配置</n-divider>
<n-form-item label="AccessKey ID" path="uploadMinioAccessKey">
<n-input
type="password"
v-model:value="formValue.uploadMinioAccessKey"
show-password-on="click"
>
<template #password-visible-icon>
<n-icon :size="16" :component="GlassesOutline" />
</template>
<template #password-invisible-icon>
<n-icon :size="16" :component="Glasses" />
</template>
</n-input>
<template #feedback>相关文档https://min.io/</template>
</n-form-item>
<n-form-item label="AccessKey Secret" path="uploadMinioSecretKey">
<n-input
type="password"
v-model:value="formValue.uploadMinioSecretKey"
show-password-on="click"
>
<template #password-visible-icon>
<n-icon :size="16" :component="GlassesOutline" />
</template>
<template #password-invisible-icon>
<n-icon :size="16" :component="Glasses" />
</template>
</n-input>
</n-form-item>
<n-form-item label="Endpoint" path="uploadMinioEndpoint">
<n-input v-model:value="formValue.uploadMinioEndpoint" placeholder="" />
<template #feedback> Endpoint不带http://和路径)</template>
</n-form-item>
<n-form-item path="uploadMinioUseSSL">
<n-switch
v-model:value="formValue.uploadMinioUseSSL"
:checked-value="1"
:unchecked-value="2"
>
<template #checked> 启用SSL</template>
<template #unchecked> 禁用SSL</template>
</n-switch>
</n-form-item>
<n-form-item label="储存路径" path="uploadMinioPath">
<n-input v-model:value="formValue.uploadMinioPath" placeholder="" />
</n-form-item>
<n-form-item label="存储桶名称" path="uploadMinioBucket">
<n-input v-model:value="formValue.uploadMinioBucket" placeholder="" />
</n-form-item>
<n-form-item label="对外访问域名" path="uploadMinioDomain">
<n-input v-model:value="formValue.uploadMinioDomain" placeholder="" />
</n-form-item>
</template>
<div>
<n-space>
<n-button type="primary" @click="formSubmit">保存更新</n-button>
@@ -289,6 +356,13 @@
uploadQiNiuDomain: '',
uploadQiNiuPath: '',
uploadQiNiuBucket: '',
uploadMinioAccessKey: '',
uploadMinioSecretKey: '',
uploadMinioEndpoint: '',
uploadMinioUseSSL: 2,
uploadMinioPath: '',
uploadMinioBucket: '',
uploadMinioDomain: '',
});
function formSubmit() {

View File

@@ -13,21 +13,25 @@ export const columns = [
title: 'ID',
key: 'id',
},
{
title: '任务标题',
key: 'title',
},
{
title: '任务分组',
key: 'groupName',
},
{
title: '任务名称',
title: '执行方法',
key: 'name',
},
{
title: '执行参数',
key: 'params',
render(row) {
return row.params;
},
},
// {
// title: '执行参数',
// key: 'params',
// render(row) {
// return row.params;
// },
// },
{
title: '执行策略',
key: 'policy',

View File

@@ -76,9 +76,13 @@
/>
</n-form-item>
<n-form-item label="任务名称" path="name">
<n-input placeholder="请输入公告标题" v-model:value="formParams.name" />
<template #feedback> go函数名称</template>
<n-form-item label="任务标题" path="title">
<n-input placeholder="请输入任务标题" v-model:value="formParams.title" />
</n-form-item>
<n-form-item label="执行方法" path="name">
<n-input placeholder="请输入执行方法" v-model:value="formParams.name" />
<template #feedback>go方法名称</template>
</n-form-item>
<n-form-item label="执行参数" path="params">
@@ -104,8 +108,8 @@
<n-input placeholder="请输入执行次数" v-model:value="formParams.count" />
</n-form-item>
<n-form-item label="定时表达式" path="pattern">
<n-input placeholder="请输入表达式" v-model:value="formParams.pattern" />
<n-form-item label="表达式" path="pattern">
<n-input placeholder="请输入定时表达式" v-model:value="formParams.pattern" />
<template #feedback>
表达式语法参考:<a
target="_blank"
@@ -144,25 +148,53 @@
</n-modal>
</n-card>
<GroupModal ref="GroupModalRef" @reloadGroupOption="reloadGroupOption"/>
<GroupModal ref="GroupModalRef" @reloadGroupOption="reloadGroupOption" />
<n-modal
v-model:show="showStdout"
style="width: 72%"
:show-icon="false"
preset="dialog"
title="调度日志"
>
<n-form ref="formRef" label-placement="left" :label-width="80" class="py-4">
<n-form-item label="日志文件" path="fileName">
<n-input placeholder="" v-model:value="log.fileName" readonly />
</n-form-item>
<n-form-item label="文件大小" path="sizeFormat">
<n-input placeholder="" v-model:value="log.sizeFormat" readonly />
</n-form-item>
<n-form-item label="日志内容" path="log" class="n-code-container">
<n-code
class="n-code-contents"
id="n-code"
:word-wrap="true"
:code="log?.contents ?? ''"
language="html"
/>
</n-form-item>
</n-form>
</n-modal>
</div>
</template>
<script lang="ts" setup>
import { h, reactive, ref, onBeforeMount } from 'vue';
import { TreeSelectOption, useDialog, useMessage } from 'naive-ui';
import { useDialog, useMessage } from 'naive-ui';
import { BasicTable, TableAction } from '@/components/Table';
import { BasicForm, FormSchema, useForm } from '@/components/Form/index';
import { Delete, Edit, getSelect, List, Status, OnlineExec } from '@/api/sys/cron';
import { Delete, Edit, getSelect, List, Status, OnlineExec, DispatchLog } from '@/api/sys/cron';
import { columns } from './columns';
import { DeleteOutlined, GroupOutlined, PlusOutlined } from '@vicons/antd';
import { statusActions } from '@/enums/optionsiEnum';
import GroupModal from './modal/modal.vue';
const optionTreeData = ref<any>([]);
const defaultValueRef = () => ({
id: 0,
groupId: 0,
title: '',
name: '',
params: '',
pattern: '',
@@ -179,13 +211,7 @@
status: null,
});
const rules = {
name: {
// required: true,
trigger: ['blur', 'input'],
message: '请输入任务名称',
},
};
const rules = {};
const policyOptions = [
{
@@ -221,17 +247,34 @@
return s;
});
const groupOptions = ref<any>([]);
const statusActions = [
{
label: '设为运行中',
key: 1,
},
{
label: '设为已结束',
key: 2,
},
{
label: '删除任务',
key: 3,
},
];
const groupOptions = ref<any>([]);
const showStdout = ref(false);
const log = ref();
const schemas: FormSchema[] = [
{
field: 'groupId',
component: 'NSelect',
component: 'NTreeSelect',
label: '任务分组',
defaultValue: null,
componentProps: {
placeholder: '请选择分组',
options: groupOptions,
clearable: true,
onUpdateValue: (e: any) => {
console.log(e);
},
@@ -300,19 +343,28 @@
{
label: '在线执行',
onClick: handleExecute.bind(null, record),
type: 'success',
},
{
label: '调度日志',
onClick: handleDispatchLog.bind(null, record),
type: 'default',
},
{
label: '编辑',
onClick: handleEdit.bind(null, record),
},
{
label: '删除',
onClick: handleDelete.bind(null, record),
},
],
dropDownActions: statusActions,
select: (key) => {
updateStatus(record.id, key);
if (key < 3) {
updateStatus(record.id, key);
return;
}
if (key == 3) {
handleDelete(record);
return;
}
},
});
},
@@ -367,9 +419,21 @@
formParams.value = record;
}
function handleDispatchLog(record: Recordable) {
DispatchLog(record).then((res) => {
showStdout.value = true;
log.value = res;
setTimeout(() => {
const container = document.getElementById('n-code');
container.scrollTop = container.scrollHeight;
}, 100);
});
}
function handleExecute(record: Recordable) {
dialog.warning({
title: '警告',
dialog.info({
title: '提示',
content: '提交成功后将立即执行一次,你确定要执行吗?',
positiveText: '确定',
negativeText: '取消',
@@ -379,9 +443,6 @@
reloadTable();
});
},
onNegativeClick: () => {
// message.error('取消');
},
});
}
@@ -397,9 +458,6 @@
reloadTable();
});
},
onNegativeClick: () => {
// message.error('取消');
},
});
}
@@ -415,9 +473,6 @@
reloadTable();
});
},
onNegativeClick: () => {
// message.error('取消');
},
});
}
@@ -432,16 +487,12 @@
}
function updateStatus(id, status) {
Status({ id: id, status: status })
.then((_res) => {
message.success('操作成功');
setTimeout(() => {
reloadTable();
});
})
.catch((e: Error) => {
message.error(e.message ?? '操作失败');
Status({ id: id, status: status }).then((_res) => {
message.success('操作成功');
setTimeout(() => {
reloadTable();
});
});
}
const GroupModalRef = ref();
@@ -456,14 +507,18 @@
if (optionTreeData.value === undefined || optionTreeData.value === null) {
optionTreeData.value = [];
}
groupOptions.value = transformGroupData(optionTreeData.value);
}
groupOptions.value = [];
for (let i = 0; i < optionTreeData.value?.length; i++) {
groupOptions.value.push({
value: optionTreeData.value[i].key,
label: optionTreeData.value[i].label,
});
}
function transformGroupData(data: any[]) {
return data.map((item) => {
return {
key: item.key,
value: item.key,
label: item.label,
children: item.children !== null ? transformGroupData(item.children) : null,
};
});
}
onBeforeMount(async () => {
@@ -471,12 +526,23 @@
});
// 处理选项更新
function handleUpdateValue(
value: string | number | Array<string | number> | null,
_option: TreeSelectOption | null | Array<TreeSelectOption | null>
) {
function handleUpdateValue(value: string | number) {
formParams.value.groupId = value;
}
</script>
<style lang="less" scoped></style>
<style lang="less" scoped>
.n-code-container {
height: 450px;
width: 100%;
}
.n-code-contents {
height: 450px;
width: 100%;
overflow: auto;
background: #2f3129;
color: wheat;
padding: 10px;
}
</style>

View File

@@ -8,34 +8,33 @@ export const columns = [
key: 'id',
width: 100,
},
{
title: '上级ID',
dataIndex: 'pid',
key: 'pid',
width: 100,
},
{
title: '分组名称',
dataIndex: 'name',
key: 'name',
width: 200,
width: 150,
},
{
title: '是否默认',
title: '上级分组',
dataIndex: 'supName',
key: 'supName',
width: 150,
render(row) {
if (row.supName == ''){
return '顶级分组';
}
return row.supName;
},
},
{
title: '默认',
dataIndex: 'isDefault',
key: 'isDefault',
render(row) {
return row.is_default === 1 ? '是' : '否';
return row.isDefault === 1 ? '是' : '否';
},
width: 100,
width: 80,
},
{
title: '排序',
dataIndex: 'sort',
key: 'sort',
width: 100,
},
{
title: '状态',
dataIndex: 'status',
@@ -57,6 +56,12 @@ export const columns = [
},
width: 150,
},
// {
// title: '排序',
// dataIndex: 'sort',
// key: 'sort',
// width: 100,
// },
{
title: '备注',
dataIndex: 'remark',

View File

@@ -40,16 +40,11 @@
:default-value="formParams.pid"
@update:value="handleUpdateValue"
/>
<template #feedback>不选视为顶级分组</template>
</n-form-item>
<n-form-item label="分组名称" path="name">
<n-input placeholder="请输入分组名称" v-model:value="formParams.name" />
</n-form-item>
<n-form-item label="排序" path="sort">
<n-input-number v-model:value="formParams.sort" clearable />
</n-form-item>
<n-form-item label="状态" path="status">
<n-radio-group v-model:value="formParams.status" name="status">
<n-radio-button
@@ -61,6 +56,10 @@
</n-radio-group>
</n-form-item>
<!-- <n-form-item label="排序" path="sort">-->
<!-- <n-input-number v-model:value="formParams.sort" clearable />-->
<!-- </n-form-item>-->
<n-form-item label="备注" path="remark">
<n-input type="textarea" placeholder="请输入备注" v-model:value="formParams.remark" />
</n-form-item>
@@ -87,7 +86,7 @@
import { statusOptions } from '@/enums/optionsiEnum';
const emit = defineEmits(['reloadGroupOption']);
const optionTreeData = ref([]);
const optionTreeData = ref<any>([]);
const message = useMessage();
const statusValue = ref(1);
const defaultValueRef = () => ({
@@ -140,7 +139,7 @@
const formRef = ref<any>({});
const actionColumn = reactive({
width: 220,
width: 150,
title: '操作',
key: 'action',
// fixed: 'right',
@@ -213,10 +212,16 @@
async function setDictSelect() {
const tmp = await getSelect({});
optionTreeData.value = tmp.list;
if (optionTreeData.value === undefined || optionTreeData.value === null) {
optionTreeData.value = [];
}
optionTreeData.value = [
{
id: 0,
key: 0,
label: '顶级分组',
pid: 0,
name: '顶级分组',
},
];
optionTreeData.value = optionTreeData.value.concat(tmp.list);
}
onMounted(async () => {

View File

@@ -18,7 +18,7 @@
const emit = defineEmits(['reloadGroupOption']);
const showModal = ref(false);
const title = ref('管理分组');
const title = ref('任务分组');
function openDrawer() {
showModal.value = true;