xinyin025/hotgo
1
0
Fork 0
mirror of https://github.com/bufanyun/hotgo.git synced 2025-11-13 04:33:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

版本预发布

Browse Source
This commit is contained in:
孟帅
2023-02-08 20:29:34 +08:00
parent f11c7c5bf2
commit 2068d05c93
269 changed files with 16122 additions and 12075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/views/about/index.vue
View File

@@ -14,7 +14,7 @@
:segmented="{ content: true }"
>
<n-descriptions bordered label-placement="left" class="py-2">
<n-descriptions-item label="版本">
<n-descriptions-item label="HotGo版本">
<n-tag type="info"> {{ config?.version }}</n-tag>
</n-descriptions-item>
<n-descriptions-item label="最后编译时间">

37
web/src/views/apply/attachment/columns.ts
View File

@@ -12,6 +12,19 @@ export const options = ref<Options>({
});
export const schemas = ref<FormSchema[]>([
{
field: 'drive',
component: 'NSelect',
label: '上传驱动',
defaultValue: null,
componentProps: {
placeholder: '请选择上传驱动',
options: [],
onUpdateValue: (e: any) => {
console.log(e);
},
},
},
{
field: 'member_id',
component: 'NInput',
@@ -24,19 +37,6 @@ export const schemas = ref<FormSchema[]>([
},
rules: [{ message: '请输入用户ID', trigger: ['blur'] }],
},
{
field: 'drive',
component: 'NSelect',
label: '选择驱动',
defaultValue: null,
componentProps: {
placeholder: '请选择驱动',
options: [],
onUpdateValue: (e: any) => {
console.log(e);
},
},
},
{
field: 'status',
component: 'NSelect',
@@ -54,16 +54,19 @@ export const schemas = ref<FormSchema[]>([
export const columns = [
{
title: 'ID',
title: '附件ID',
key: 'id',
width: 80,
},
{
title: '应用',
key: 'appId',
width: 100,
},
{
title: '用户ID',
key: 'memberId',
width: 100,
},
{
title: '驱动',
@@ -71,6 +74,7 @@ export const columns = [
render(row) {
return row.drive;
},
width: 100,
},
{
title: '上传类型',
@@ -90,6 +94,7 @@ export const columns = [
}
);
},
width: 120,
},
{
title: '文件',
@@ -134,10 +139,12 @@ export const columns = [
{
title: '扩展名',
key: 'ext',
width: 80,
},
{
title: '文件大小',
key: 'sizeFormat',
width: 100,
},
{
title: '状态',
@@ -160,10 +167,12 @@ export const columns = [
}
);
},
width: 100,
},
{
title: '上传时间',
key: 'createdAt',
width: 180,
},
];

1
web/src/views/apply/attachment/index.vue
View File

@@ -168,6 +168,7 @@
{
label: '下载',
onClick: handleDown.bind(null, record),
type: 'default',
},
{
label: '删除',

107
web/src/views/apply/notice/columns.ts
View File

@@ -1,20 +1,28 @@
import { h } from 'vue';
import { NTag } from 'naive-ui';
import { NAvatar, NAvatarGroup, NTag, NTooltip } from 'naive-ui';
import { noticeTagOptions, noticeTypeOptions } from '@/enums/systemMessageEnum';
import { getOptionLabel, getOptionTag } from '@/utils/hotgo';
export const columns = [
{
title: 'ID',
key: 'id',
width: 80,
},
{
title: '公告标题',
title: '消息标题',
key: 'title',
render(row) {
return row.title;
return h('p', { id: 'app' }, [
h('div', {
innerHTML: '<div style="white-space: pre-wrap">' + row.title + '</div>',
}),
]);
},
width: 280,
},
{
title: '公告类型',
title: '消息类型',
key: 'type',
render(row) {
return h(
@@ -23,30 +31,19 @@ export const columns = [
style: {
marginRight: '6px',
},
type: row.type == 1 ? 'success' : 'warning',
type: getOptionTag(noticeTypeOptions, row.type),
bordered: false,
},
{
default: () => (row.type == 1 ? '通知' : '公告'),
default: () => getOptionLabel(noticeTypeOptions, row.type),
}
);
},
width: 100,
},
{
title: '公告内容',
key: 'content',
},
{
title: '备注',
key: 'remark',
},
{
title: '排序',
key: 'sort',
},
{
title: '公告状态',
key: 'status',
title: '标签',
key: 'tag',
render(row) {
return h(
NTag,
@@ -54,21 +51,81 @@ export const columns = [
style: {
marginRight: '6px',
},
type: row.status == 1 ? 'success' : 'warning',
type: getOptionTag(noticeTagOptions, row.tag),
bordered: false,
},
{
default: () => (row.status == 1 ? '正常' : '隐藏'),
default: () => getOptionLabel(noticeTagOptions, row.tag),
}
);
},
width: 100,
},
{
title: '已读人数',
key: 'receiveNum',
title: '接收人',
key: 'receiver',
render(row) {
if (row.type === 1 || row.type === 2) {
return '所有人';
}
return h(
NAvatarGroup,
{
max: 4,
size: 40,
options: row.receiverGroup,
},
{
avatar: (column) =>
h(NTooltip, null, {
trigger: () =>
column.option.src !== ''
? h(NAvatar, {
src: column.option.src,
round: true,
size: 32,
style: {
marginRight: '4px',
},
})
: h(
NAvatar,
{
round: true,
size: 32,
style: {
marginRight: '4px',
},
},
{
default: () => column.option.name?.substring(0, 1) as string,
}
),
default: () => column.option.name,
}),
}
);
},
width: 180,
},
{
title: '发布时间',
title: '阅读量',
key: 'readCount',
width: 80,
},
{
title: '排序',
key: 'sort',
width: 80,
},
{
title: '备注',
key: 'remark',
width: 150,
},
{
title: '发送时间',
key: 'createdAt',
width: 180,
},
];

337
web/src/views/apply/notice/index.vue
View File

@@ -1,6 +1,11 @@
<template>
<div>
<n-card :bordered="false" class="proCard" title="公告管理">
<div class="n-layout-page-header">
<n-card :bordered="false" title="通知公告">
在这里你可以发送通知、公告、私信到平台中的用户
</n-card>
</div>
<n-card :bordered="false" class="proCard">
<BasicForm
@register="register"
@submit="handleSubmit"
@@ -25,16 +30,55 @@
:resizeHeightOffset="-10000"
>
<template #tableTitle>
<n-button type="primary" @click="addTable">
<n-button
type="warning"
@click="addTable(1)"
class="min-left-space"
v-if="hasPermission(['/notice/editNotify'])"
>
<template #icon>
<n-icon>
<PlusOutlined />
<NotificationOutlined />
</n-icon>
</template>
添加
发通知
</n-button>
&nbsp;
<n-button type="error" @click="batchDelete" :disabled="batchDeleteDisabled">
<n-button
type="error"
@click="addTable(2)"
class="min-left-space"
v-if="hasPermission(['/notice/editNotice'])"
>
<template #icon>
<n-icon>
<BellOutlined />
</n-icon>
</template>
发公告
</n-button>
<n-button
type="info"
@click="addTable(3)"
class="min-left-space"
v-if="hasPermission(['/notice/editLetter'])"
>
<template #icon>
<n-icon>
<SendOutlined />
</n-icon>
</template>
发私信
</n-button>
<n-button
type="error"
@click="batchDelete"
:disabled="batchDeleteDisabled"
class="min-left-space"
v-if="hasPermission(['/notice/delete'])"
>
<template #icon>
<n-icon>
<DeleteOutlined />
@@ -45,7 +89,24 @@
</template>
</BasicTable>
<n-modal v-model:show="showModal" :show-icon="false" preset="dialog" title="添加">
<n-modal
v-model:show="showModal"
:show-icon="false"
:block-scroll="false"
:mask-closable="false"
preset="dialog"
:title="
formParams.id > 0
? '编辑' + getOptionLabel(noticeTypeOptions, formParams.type) + ' #' + formParams.id
: '发送' + getOptionLabel(noticeTypeOptions, formParams.type)
"
:style="{
width: dialogWidth,
}"
>
<n-alert :show-icon="false" type="info">
消息发送成功后如果接收人在线会立即收到一条消息通知，编辑已发送的消息不会再次通知
</n-alert>
<n-form
:model="formParams"
:rules="rules"
@@ -54,37 +115,53 @@
:label-width="80"
class="py-4"
>
<n-form-item label="公告标题" path="title">
<n-input placeholder="请输入公告标题" v-model:value="formParams.title" />
<n-form-item label="消息标题" path="title">
<n-input placeholder="请输入消息标题" v-model:value="formParams.title" />
</n-form-item>
<n-form-item label="公告类型" path="type">
<n-radio-group v-model:value="formParams.type" name="type">
<n-radio-button
v-for="type in typeOptions"
:key="type.value"
:value="type.value"
:label="type.label"
/>
</n-radio-group>
</n-form-item>
<n-form-item label="公告内容" path="content">
<n-input type="textarea" placeholder="请输入内容" v-model:value="formParams.content" />
</n-form-item>
<n-form-item label="接收人" path="receiver">
<n-input
type="textarea"
placeholder="多个用户ID用,隔开 、不填则全部接收"
<n-form-item label="接收人" path="receiver" v-if="formParams.type === 3">
<n-select
multiple
:options="options"
:render-label="renderLabel"
:render-tag="renderMultipleSelectTag"
v-model:value="formParams.receiver"
filterable
/>
</n-form-item>
<n-form-item label="排序" path="sort">
<n-input-number v-model:value="formParams.sort" clearable />
<n-form-item label="消息内容" path="content">
<template v-if="formParams.type === 1">
<n-input
type="textarea"
placeholder="请输入通知内容"
v-model:value="formParams.content"
/>
</template>
<template v-else>
<Editor style="height: 450px" v-model:value="formParams.content" />
</template>
</n-form-item>
<n-grid x-gap="24" :cols="2">
<n-gi>
<n-form-item label="标签" path="tag">
<n-select
clearable
placeholder="可以不填"
:render-tag="renderTag"
v-model:value="formParams.tag"
:options="noticeTagOptions"
/>
</n-form-item>
</n-gi>
<n-gi>
<n-form-item label="排序" path="sort">
<n-input-number style="width: 100%" v-model:value="formParams.sort" clearable />
</n-form-item>
</n-gi>
</n-grid>
<n-form-item label="状态" path="status">
<n-radio-group v-model:value="formParams.status" name="status">
<n-radio-button
@@ -97,14 +174,18 @@
</n-form-item>
<n-form-item label="备注" path="remark">
<n-input type="textarea" placeholder="请输入备注" v-model:value="formParams.remark" />
<n-input
type="textarea"
placeholder="请输入备注，没有可以不填"
v-model:value="formParams.remark"
/>
</n-form-item>
</n-form>
<template #action>
<n-space>
<n-button @click="() => (showModal = false)">取消</n-button>
<n-button type="info" :loading="formBtnLoading" @click="confirmForm">确定</n-button>
<n-button type="info" :loading="formBtnLoading" @click="confirmForm">立即发送</n-button>
</n-space>
</template>
</n-modal>
@@ -113,61 +194,76 @@
</template>
<script lang="ts" setup>
import { h, reactive, ref } from 'vue';
import { h, onMounted, reactive, ref } from 'vue';
import { useDialog, useMessage } from 'naive-ui';
import { BasicTable, TableAction } from '@/components/Table';
import { BasicForm, FormSchema, useForm } from '@/components/Form/index';
import { Delete, Edit, List, Status } from '@/api/apply/notice';
import {
Delete,
EditNotify,
EditLetter,
EditNotice,
List,
MaxSort,
Status,
} from '@/api/apply/notice';
import { columns } from './columns';
import { DeleteOutlined, PlusOutlined } from '@vicons/antd';
import { statusActions, statusOptions } from '@/enums/optionsiEnum';
const typeOptions = [
{
value: 1,
label: '通知',
},
{
value: 2,
label: '公告',
},
].map((s) => {
return s;
});
const params = ref<any>({
pageSize: 10,
title: '',
content: '',
status: null,
});
import { BellOutlined, DeleteOutlined, NotificationOutlined, SendOutlined } from '@vicons/antd';
import { statusOptions } from '@/enums/optionsiEnum';
import {
noticeTagOptions,
noticeTypeOptions,
personOption,
renderLabel,
renderMultipleSelectTag,
} from '@/enums/systemMessageEnum';
import { adaModalWidth, getOptionLabel, renderTag } from '@/utils/hotgo';
import Editor from '@/components/Editor/editor.vue';
import { cloneDeep } from 'lodash-es';
import { GetMemberOption } from '@/api/org/user';
import { usePermission } from '@/hooks/web/usePermission';
const { hasPermission } = usePermission();
const rules = {
title: {
// required: true,
required: true,
trigger: ['blur', 'input'],
message: '请输入标题',
message: '请输入消息标题',
},
};
const schemas: FormSchema[] = [
{
field: 'title',
component: 'NInput',
label: '公告标题',
field: 'type',
component: 'NSelect',
label: '消息类型',
defaultValue: null,
componentProps: {
placeholder: '请输入公告标题',
placeholder: '请选择消息类型',
options: noticeTypeOptions,
onUpdateValue: (e: any) => {
console.log(e);
},
},
rules: [{ message: '请输入公告标题', trigger: ['blur'] }],
},
{
field: 'title',
component: 'NInput',
label: '消息标题',
componentProps: {
placeholder: '请输入消息标题',
onUpdateValue: (e: any) => {
console.log(e);
},
},
rules: [{ message: '请输入消息标题', trigger: ['blur'] }],
},
{
field: 'content',
component: 'NInput',
label: '内容',
label: '消息内容',
componentProps: {
placeholder: '请输入内容关键词',
placeholder: '请输入消息内容关键词',
showButton: false,
onUpdateValue: (e: any) => {
console.log(e);
@@ -198,43 +294,59 @@
const formRef = ref<any>({});
const batchDeleteDisabled = ref(true);
const checkedIds = ref([]);
const dialogWidth = ref('75%');
const options = ref<personOption[]>();
const resetFormParams = {
id: 0,
title: '',
name: '',
type: 1,
receiver: '',
tag: 0,
content: '',
receiver: null,
remark: '',
sort: 0,
status: 1,
created_at: '',
updated_at: '',
};
let formParams = ref<any>(resetFormParams);
let formParams = ref<any>(cloneDeep(resetFormParams));
const actionColumn = reactive({
width: 220,
title: '操作',
key: 'action',
fixed: 'right',
// fixed: 'right',
render(record) {
return h(TableAction as any, {
style: 'button',
actions: [
{
label: '已启用',
onClick: handleStatus.bind(null, record, 2),
ifShow: () => {
return record.status === 1;
},
auth: ['/notice/status'],
},
{
label: '已禁用',
onClick: handleStatus.bind(null, record, 1),
ifShow: () => {
return record.status === 2;
},
auth: ['/notice/status'],
},
{
label: '编辑',
onClick: handleEdit.bind(null, record),
auth: ['/notice/edit'],
type: 'primary',
},
{
label: '删除',
onClick: handleDelete.bind(null, record),
auth: ['/notice/delete'],
},
],
dropDownActions: statusActions,
select: (key) => {
updateStatus(record.id, key);
},
});
},
});
@@ -245,22 +357,21 @@
schemas,
});
function addTable() {
function addTable(type) {
showModal.value = true;
formParams.value = resetFormParams;
formParams.value = cloneDeep(resetFormParams);
formParams.value.type = type;
MaxSort().then((res) => {
formParams.value.sort = res.sort;
});
}
const loadDataTable = async (res) => {
return await List({ ...params.value, ...res, ...searchFormRef.value?.formModel });
return await List({ ...res, ...searchFormRef.value?.formModel });
};
function onCheckedRow(rowKeys) {
if (rowKeys.length > 0) {
batchDeleteDisabled.value = false;
} else {
batchDeleteDisabled.value = true;
}
batchDeleteDisabled.value = rowKeys.length <= 0;
checkedIds.value = rowKeys;
}
@@ -273,14 +384,37 @@
formBtnLoading.value = true;
formRef.value.validate((errors) => {
if (!errors) {
Edit(formParams.value).then((_res) => {
message.success('操作成功');
setTimeout(() => {
showModal.value = false;
reloadTable();
formParams.value = ref(resetFormParams);
});
});
switch (formParams.value.type) {
case 1:
EditNotify(formParams.value).then((_res) => {
message.success('操作成功');
setTimeout(() => {
showModal.value = false;
reloadTable();
});
});
break;
case 2:
EditNotice(formParams.value).then((_res) => {
message.success('操作成功');
setTimeout(() => {
showModal.value = false;
reloadTable();
});
});
break;
case 3:
EditLetter(formParams.value).then((_res) => {
message.success('操作成功');
setTimeout(() => {
showModal.value = false;
reloadTable();
});
});
break;
default:
message.error('公告类型不支持');
}
} else {
message.error('请填写完整信息');
}
@@ -290,7 +424,7 @@
function handleEdit(record: Recordable) {
showModal.value = true;
formParams.value = record;
formParams.value = cloneDeep(record);
}
function handleDelete(record: Recordable) {
@@ -329,24 +463,31 @@
});
}
function handleSubmit(values: Recordable) {
params.value = values;
function handleSubmit(_values: Recordable) {
reloadTable();
}
function handleReset(values: Recordable) {
params.value = values;
function handleReset(_values: Recordable) {
reloadTable();
}
function updateStatus(id, status) {
Status({ id: id, status: status }).then((_res) => {
function handleStatus(record: Recordable, status: number) {
Status({ id: record.id, status: status }).then((_res) => {
message.success('操作成功');
setTimeout(() => {
reloadTable();
});
});
}
async function getMemberOption() {
options.value = await GetMemberOption();
}
onMounted(async () => {
adaModalWidth(dialogWidth);
await getMemberOption();
});
</script>
<style lang="less" scoped></style>

154
web/src/views/curdDemo/edit.vue
View File

@@ -1,74 +1,84 @@
<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-spin :show="loading" description="请稍候...">
<n-modal
v-model:show="isShowModal"
:show-icon="false"
preset="dialog"
:title="params?.id > 0 ? '编辑 #' + params?.id : '添加'"
:style="{
width: dialogWidth,
}"
>
<n-form-item label="分类ID" path="categoryId">
<n-input-number placeholder="请输入分类ID" v-model:value="params.categoryId" />
</n-form-item>
<n-form
:model="params"
:rules="rules"
ref="formRef"
label-placement="left"
:label-width="80"
class="py-4"
>
<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="title">
<n-form-item label="标题" path="title">
<n-input placeholder="请输入标题" v-model:value="params.title" />
</n-form-item>
</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="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="content">
<Editor style="height: 450px" v-model:value="params.content" />
</n-form-item>
<n-form-item label="单图" path="image">
<UploadImage :maxNumber="1" v-model:value="params.image" />
</n-form-item>
<n-form-item label="单图" path="image">
<UploadImage :maxNumber="1" v-model:value="params.image" />
</n-form-item>
<n-form-item label="附件" path="attachfile">
<UploadFile :maxNumber="1" v-model:value="params.attachfile" />
</n-form-item>
<n-form-item label="附件" path="attachfile">
<UploadFile :maxNumber="1" v-model:value="params.attachfile" />
</n-form-item>
<n-form-item label="显示开关" path="switch">
<n-switch v-model:value="params.switch" />
</n-form-item>
<n-form-item label="所在城市" path="cityId">
<CitySelector v-model:value="params.cityId" />
</n-form-item>
<n-form-item label="排序" path="sort">
<n-input-number placeholder="请输入排序" v-model:value="params.sort" />
</n-form-item>
<n-form-item label="显示开关" path="switch">
<n-switch :unchecked-value="2" :checked-value="1" v-model:value="params.switch"
/>
</n-form-item>
<n-form-item label="状态" path="status">
<n-select v-model:value="params.status" :options="options.sys_normal_disable" />
</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>
<n-form-item label="排序" path="sort">
<n-input-number placeholder="请输入排序" v-model:value="params.sort" />
</n-form-item>
<n-form-item label="状态" path="status">
<n-select v-model:value="params.status" :options="options.sys_normal_disable" />
</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>
</n-spin>
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref, computed, watch } from 'vue';
import { Edit, MaxSort } from '@/api/curdDemo';
import { Edit, MaxSort, View } from '@/api/curdDemo';
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 { rules, options, State, newState } from './model';
import { useMessage } from 'naive-ui';
import { adaModalWidth } from '@/utils/hotgo';
@@ -96,10 +106,8 @@
},
});
const params = computed(() => {
return props.formParams;
});
const loading = ref(false);
const params = ref<State>(props.formParams);
const message = useMessage();
const formRef = ref<any>({});
const dialogWidth = ref('75%');
@@ -132,16 +140,38 @@
isShowModal.value = false;
}
watch(
() => params.value,
(value) => {
if (value.id === 0) {
MaxSort().then((res) => {
function loadForm(value) {
loading.value = true;
// 新增
if (value.id < 1) {
params.value = newState(value);
MaxSort()
.then((res) => {
params.value.sort = res.sort;
})
.finally(() => {
loading.value = false;
});
}
return;
}
// 编辑
View({ id: value.id })
.then((res) => {
params.value = res;
})
.finally(() => {
loading.value = false;
});
}
watch(
() => props.formParams,
(value) => {
loadForm(value);
}
);
</script>
<style lang="less"></style>
<style lang="less"></style>

12
web/src/views/curdDemo/index.vue
View File

@@ -2,8 +2,8 @@
<div>
<n-card :bordered="false" class="proCard">
<div class="n-layout-page-header">
<n-card :bordered="false" title="生成演示列表">
<!-- 这里有系统自动生成的CURD表格 -->
<n-card :bordered="false" title="生成演示">
<!-- 这是系统自动生成的CURD表格，你可以将此行注释改为表格的描述 -->
</n-card>
</div>
<BasicForm
@@ -62,7 +62,7 @@
type="primary"
@click="handleExport"
class="min-left-space"
v-if="hasPermission(['/demoVar/export'])"
v-if="hasPermission(['/curdDemo/delete'])"
>
<template #icon>
<n-icon>
@@ -89,9 +89,9 @@
import { BasicTable, TableAction } from '@/components/Table';
import { BasicForm, useForm } from '@/components/Form/index';
import { usePermission } from '@/hooks/web/usePermission';
import { Delete, List, Status, Export } from '@/api/curdDemo';
import { List, Export, Delete, Status } from '@/api/curdDemo';
import { State, columns, schemas, options, newState } from './model';
import { DeleteOutlined, PlusOutlined, ExportOutlined } from '@vicons/antd';
import { PlusOutlined, ExportOutlined, DeleteOutlined } from '@vicons/antd';
import { useRouter } from 'vue-router';
import { getOptionLabel } from '@/utils/hotgo';
import Edit from './edit.vue';
@@ -246,4 +246,4 @@
}
</script>
<style lang="less" scoped></style>
<style lang="less" scoped></style>

22
web/src/views/curdDemo/model.ts
View File

@@ -8,12 +8,13 @@ import { isArray, isNullObject } from '@/utils/is';
import { getFileExt } from '@/utils/urlUtils';
import { defRangeShortcuts, defShortcuts, formatToDate } from '@/utils/dateUtil';
import { validate } from '@/utils/validateUtil';
import { getOptionLabel, getOptionTag, Options } from '@/utils/hotgo';
import { errorImg } from '@/utils/hotgo';
import { getOptionLabel, getOptionTag, Options, errorImg } from '@/utils/hotgo';
import { usePermission } from '@/hooks/web/usePermission';
const { hasPermission } = usePermission();
const $message = window['$message'];
export interface State {
id: number;
categoryId: number;
@@ -22,6 +23,7 @@ export interface State {
content: string;
image: string;
attachfile: string;
cityId: number;
switch: number;
sort: number;
status: number;
@@ -40,6 +42,7 @@ export const defaultState = {
content: '',
image: '',
attachfile: '',
cityId: 0,
switch: 1,
sort: 0,
status: 1,
@@ -61,7 +64,8 @@ export const options = ref<Options>({
sys_normal_disable: [],
});
export const rules = {};
export const rules = {
};
export const schemas = ref<FormSchema[]>([
{
@@ -217,6 +221,10 @@ export const columns = [
title: '创建时间',
key: 'createdAt',
},
{
title: '修改时间',
key: 'updatedAt',
},
{
title: '分类名称',
key: 'testCategoryName',
@@ -225,15 +233,17 @@ export const columns = [
async function loadOptions() {
options.value = await Dicts({
types: ['sys_normal_disable'],
types: [
'sys_normal_disable',
],
});
for (const item of schemas.value) {
switch (item.field) {
case 'status':
item.componentProps.options = options.value.sys_normal_disable;
break;
}
}
}
}
await loadOptions();
await loadOptions();

5
web/src/views/curdDemo/view.vue
View File

@@ -45,6 +45,11 @@
</div>
</n-descriptions-item>
<n-descriptions-item>
<template #label>所在城市</template>
{{ formValue.cityId }}
</n-descriptions-item>
<n-descriptions-item label="显示开关">
<n-switch v-model:value="formValue.switch" :unchecked-value="2" :checked-value="1" :disabled="true"
/></n-descriptions-item>

42
web/src/views/develop/code/components/EditMasterCell.vue
View File

@@ -17,7 +17,23 @@
:pagination="false"
:scroll-x="1090"
:scrollbar-props="{ trigger: 'none' }"
/>
>
<template #tableTitle>
<n-tooltip placement="top-start" trigger="hover">
<template #trigger>
<n-button type="primary" @click="reloadFields(true)" class="min-left-space">
<template #icon>
<n-icon>
<Reload />
</n-icon>
</template>
重置字段
</n-button>
</template>
主要用于重置字段设置或数据库表字段发生变化时重新载入
</n-tooltip>
</template>
</BasicTable>
</n-card>
</n-spin>
</template>
@@ -28,7 +44,7 @@
import { genInfoObj, selectListObj } from '@/views/develop/code/components/model';
import { ColumnList } from '@/api/develop/code';
import { NButton, NCheckbox, NInput, NSelect, NTooltip, NTreeSelect } from 'naive-ui';
import { HelpCircleOutline } from '@vicons/ionicons5';
import { HelpCircleOutline, Reload } from '@vicons/ionicons5';
import { renderIcon } from '@/utils';
import { cloneDeep } from 'lodash-es';
@@ -64,14 +80,26 @@
const columns = ref<any>([]);
const show = ref(false);
const dataSource = ref(formValue.value.masterColumns);
async function reloadFields(loading = false) {
if (loading) {
show.value = true;
}
formValue.value.masterColumns = await ColumnList({
name: formValue.value.dbName,
table: formValue.value.tableName,
});
dataSource.value = formValue.value.masterColumns;
if (loading) {
show.value = false;
}
}
onMounted(async () => {
show.value = true;
if (formValue.value.masterColumns.length === 0) {
formValue.value.masterColumns = await ColumnList({
name: formValue.value.dbName,
table: formValue.value.tableName,
});
dataSource.value = formValue.value.masterColumns;
await reloadFields();
}
columns.value = [

1
web/src/views/develop/code/components/model.ts
View File

@@ -20,6 +20,7 @@ export interface joinAttr {
export const genInfoObj = {
id: 0,
genType: 10,
genTemplate: null,
varName: '',
options: {
headOps: ['add', 'batchDel', 'export'],

21
web/src/views/develop/code/deploy.vue
View File

@@ -44,9 +44,7 @@
<n-button type="success" :loading="formBtnLoading" @click="submitBuild"
>提交生成</n-button
>
<n-button type="info" dashed :loading="formBtnLoading" @click="submitSave"
>仅保存配置</n-button
>
<n-button type="info" dashed @click="submitSave">仅保存配置</n-button>
</n-space>
</template>
</n-tabs>
@@ -217,12 +215,17 @@
positiveText: '确定',
negativeText: '取消',
onPositiveClick: () => {
Build(genInfo.value).then((_res) => {
setTimeout(function () {
location.reload();
}, 1500);
message.success('生成提交成功，即将刷新页面..');
});
formBtnLoading.value = true;
Build(genInfo.value)
.then((_res) => {
setTimeout(function () {
location.reload();
}, 1500);
message.success('生成提交成功，即将刷新页面..');
})
.finally(() => {
formBtnLoading.value = false;
});
},
onNegativeClick: () => {
// message.error('取消');

25
web/src/views/develop/code/index.vue
View File

@@ -62,6 +62,16 @@
placeholder="请选择"
:options="selectList.genType"
v-model:value="formParams.genType"
:on-update:value="onUpdateValueGenType"
/>
</n-form-item>
<n-form-item label="生成模板" path="genTemplate">
<n-select
placeholder="请选择"
:options="genTemplateOptions"
v-model:value="formParams.genTemplate"
:onFocus="onFocusGenTemplate"
/>
</n-form-item>
@@ -447,6 +457,21 @@
formParams.value.daoName = option?.daoName as string;
formParams.value.tableComment = option?.defTableComment as string;
}
const genTemplateOptions = ref([]);
function onFocusGenTemplate() {
for (let i = 0; i < selectList.value.genType?.length; i++) {
if (selectList.value.genType[i].value === formParams.value.genType) {
genTemplateOptions.value = selectList.value.genType[i].templates;
formParams.value.genTemplate = null;
}
}
}
function onUpdateValueGenType(value) {
formParams.value.genType = value;
onFocusGenTemplate();
}
</script>
<style lang="less" scoped></style>

206
web/src/views/home/account/BasicSetting.vue Normal file
View File

@@ -0,0 +1,206 @@
<template>
<div>
<n-spin :show="show" description="请稍候...">
<n-card
v-show="showInfo"
title="😋 个人信息"
embedded
:bordered="false"
closable
hoverable
@close="handleClose"
>
<n-row>
<n-thing content-indented>
<template #header>
{{ timeFix() }}，{{ formValue.realName }}，今天又是充满活力的一天！
</template>
<template #header-extra> </template>
<template #description>
<n-descriptions
label-placement="left"
style="margin-top: 15px"
column="2"
content-style="padding-right: 20px;"
>
<n-descriptions-item label="用户ID">{{ formValue.id }}</n-descriptions-item>
<n-descriptions-item label="用户名"> {{ formValue.username }} </n-descriptions-item>
<n-descriptions-item label="登录IP">{{
formValue.lastLoginIp
}}</n-descriptions-item>
<n-descriptions-item label="登录时间"
>{{ formValue.lastLoginAt }}
</n-descriptions-item>
<n-descriptions-item label="累计登录">
{{ formValue.loginCount }} 次</n-descriptions-item
>
<n-descriptions-item label="注册时间">
{{ formValue.createdAt }}
</n-descriptions-item>
<n-descriptions-item label="所属部门">
<n-tag size="small" type="success" strong round :bordered="false">
{{ formValue.deptName }}
<template #icon>
<n-icon :component="CheckmarkCircle" />
</template>
</n-tag>
</n-descriptions-item>
<n-descriptions-item label="所属角色">
<n-tag size="small" type="success" strong round :bordered="false">
{{ formValue.roleName }}
<template #icon>
<n-icon :component="CheckmarkCircle" />
</template>
</n-tag>
</n-descriptions-item>
</n-descriptions>
</template>
</n-thing>
</n-row>
</n-card>
<n-form
:label-width="80"
:model="formValue"
:rules="rules"
ref="formRef"
style="margin-top: 15px"
>
<n-form-item label="头像" path="avatar">
<UploadImage :maxNumber="1" v-model:value="formValue.avatar" />
</n-form-item>
<n-form-item label="姓名" path="realName">
<n-input v-model:value="formValue.realName" />
</n-form-item>
<n-form-item label="QQ号码" path="qq">
<n-input v-model:value="formValue.qq" placeholder="请输入QQ号码" />
</n-form-item>
<n-form-item label="生日" path="birthday">
<DatePicker v-model:formValue="formValue.birthday" type="date" />
</n-form-item>
<n-form-item label="性别" path="sex">
<n-radio-group v-model:value="formValue.sex" name="sex">
<n-space>
<n-radio :value="1">男</n-radio>
<n-radio :value="2">女</n-radio>
<n-radio :value="3">保密</n-radio>
</n-space>
</n-radio-group>
</n-form-item>
<n-form-item label="所在省市区" path="cityId">
<CitySelector v-model:value="formValue.cityId" />
</n-form-item>
<n-form-item label="联系地址" path="address">
<n-input type="textarea" v-model:value="formValue.address" placeholder="联系地址" />
</n-form-item>
<div>
<n-space>
<n-button type="primary" :loading="formBtnLoading" @click="formSubmit"
>保存更新</n-button
>
<n-button :loading="formBtnLoading" @click="resetForm">重置</n-button>
</n-space>
</div>
</n-form>
</n-spin>
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref } from 'vue';
import { useMessage } from 'naive-ui';
import UploadImage from '@/components/Upload/uploadImage.vue';
import CitySelector from '@/components/CitySelector/citySelector.vue';
import DatePicker from '@/components/DatePicker/datePicker.vue';
import { getUserInfo, updateMemberProfile } from '@/api/system/user';
import { CheckmarkCircle } from '@vicons/ionicons5';
import { timeFix } from '@/utils/hotgo';
import { UserInfoState, useUserStore } from '@/store/modules/user';
const userStore = useUserStore();
const show = ref(false);
const formRef: any = ref(null);
const message = useMessage();
const formBtnLoading = ref(false);
const rules = {
basicName: {
required: true,
message: '请输入网站名称',
trigger: 'blur',
},
};
const formValue = ref<UserInfoState>({
id: 0,
deptName: '',
roleName: '',
cityLabel: '',
permissions: [],
username: '',
realName: '',
avatar: '',
balance: 0,
sex: 1,
qq: '',
email: '',
mobile: '',
birthday: '',
cityId: 0,
address: '',
cash: {
name: '',
account: '',
payeeCode: '',
},
createdAt: '',
loginCount: 0,
lastLoginAt: '',
lastLoginIp: '',
});
function formSubmit() {
formBtnLoading.value = true;
formRef.value.validate((errors) => {
if (!errors) {
updateMemberProfile(formValue.value)
.then((_res) => {
message.success('更新成功');
load();
userStore.GetInfo();
})
.finally(() => {
formBtnLoading.value = false;
});
} else {
message.error('验证失败，请填写完整信息');
}
});
}
function resetForm() {
load();
}
onMounted(() => {
load();
});
async function load() {
show.value = true;
formValue.value = await getUserInfo();
show.value = false;
}
const showInfo = ref(true);
function handleClose() {
showInfo.value = false;
}
</script>

121
web/src/views/home/account/CashSetting.vue Normal file
View File

@@ -0,0 +1,121 @@
<template>
<div>
<n-spin :show="show" description="请稍候...">
<n-grid cols="2 s:2 m:2 l:2 xl:2 2xl:2" responsive="screen">
<n-grid-item>
<n-form :label-width="80" :model="formValue" :rules="rules" ref="formRef">
<n-form-item label="支付宝姓名" path="name">
<n-input v-model:value="formValue.name" />
</n-form-item>
<n-form-item label="支付宝账号" path="account ">
<n-input v-model:value="formValue.account" />
</n-form-item>
<n-form-item label="支付宝收款码" path="payeeCode">
<UploadImage
:maxNumber="1"
:helpText="'请上传清晰有效的收款码，图片大小不超过2M'"
v-model:value="formValue.payeeCode"
/>
</n-form-item>
<n-form-item label="登录密码" path="password">
<n-input
type="password"
v-model:value="formValue.password"
placeholder="请输入登录密码验证身份"
/>
</n-form-item>
<div>
<n-space>
<n-button type="primary" @click="formSubmit">保存更新</n-button>
</n-space>
</div>
</n-form>
</n-grid-item>
</n-grid>
</n-spin>
</div>
</template>
<script lang="ts" setup>
import { onMounted, reactive, ref, unref } from 'vue';
import { useMessage } from 'naive-ui';
import UploadImage from '@/components/Upload/uploadImage.vue';
import { BasicUpload } from '@/components/Upload';
import { useGlobSetting } from '@/hooks/setting';
import { useUserStoreWidthOut } from '@/store/modules/user';
import { getUserInfo, updateMemberCash } from '@/api/system/user';
const show = ref(false);
const useUserStore = useUserStoreWidthOut();
const globSetting = useGlobSetting();
const { uploadUrl } = globSetting;
const uploadHeaders = reactive({
Authorization: useUserStore.token,
});
const rules = {
password: {
required: true,
message: '请输入登录密码',
trigger: 'blur',
},
};
const formRef: any = ref(null);
const message = useMessage();
const formValue = ref({
password: '',
payeeCode: '',
account: '',
name: '',
});
function formSubmit() {
formRef.value.validate((errors) => {
if (!errors) {
updateMemberCash({
name: formValue.value.name,
account: formValue.value.account,
payeeCode: formValue.value.payeeCode,
password: formValue.value.password,
})
.then((_res) => {
message.success('更新成功');
load();
})
.finally(() => {});
} else {
message.error('验证失败，请填写完整信息');
}
});
}
function uploadChange(list: string[]) {
// 单图模式，只需要第一个索引
if (list.length > 0) {
formValue.value.payeeCode = unref(list[0]);
} else {
formValue.value.payeeCode = unref('');
}
}
onMounted(() => {
load();
});
function load() {
show.value = true;
getUserInfo()
.then((res) => {
formValue.value = res.cash;
formValue.value.password = '';
})
.finally(() => {
show.value = false;
});
}
</script>

317
web/src/views/home/account/SafetySetting.vue Normal file
View File

@@ -0,0 +1,317 @@
<template>
<n-grid cols="1" responsive="screen" class="-mt-5">
<n-grid-item>
<n-list>
<n-list-item>
<template #suffix>
<n-button type="primary" text @click="openUpdatePassForm">修改</n-button>
</template>
<n-thing title="账户密码">
<template #description
><span class="text-gray-400">绑定手机和邮箱，并设置密码，帐号更安全</span></template
>
</n-thing>
</n-list-item>
<n-list-item>
<template #suffix>
<n-button type="primary" text @click="openUpdateMobileForm">修改</n-button>
</template>
<n-thing title="绑定手机">
<template #description
><span class="text-gray-400"
>已绑定手机号：+86{{ userStore.info?.mobile }}</span
></template
>
</n-thing>
</n-list-item>
<n-list-item>
<template #suffix>
<n-button type="primary" text @click="openUpdateEmailForm">修改</n-button>
</template>
<n-thing title="绑定邮箱">
<template #description
><span class="text-gray-400">已绑定邮箱：{{ userStore.info?.email }}</span></template
>
</n-thing>
</n-list-item>
</n-list>
</n-grid-item>
</n-grid>
<n-modal
v-model:show="showModal"
:show-icon="false"
preset="dialog"
title="修改登录密码"
:style="{
width: dialogWidth,
}"
>
<n-form :label-width="80" :model="formValue" :rules="rules" ref="formRef">
<n-form-item label="当前密码" path="oldPassword">
<n-input
type="password"
v-model:value="formValue.oldPassword"
placeholder="请输入当前密码"
/>
</n-form-item>
<n-form-item label="新密码" path="newPassword">
<n-input type="password" v-model:value="formValue.newPassword" placeholder="请输入新密码" />
</n-form-item>
<div>
<n-space justify="end">
<n-button @click="showModal = false">取消</n-button>
<n-button type="primary" @click="formSubmit">修改并重新登录</n-button>
</n-space>
</div>
</n-form>
</n-modal>
<n-modal
:block-scroll="false"
:mask-closable="false"
v-model:show="showMobileModal"
:show-icon="false"
preset="dialog"
title="修改手机号"
:style="{
width: dialogWidth,
}"
>
<n-form :label-width="80" :model="formMobileValue" ref="formMobileRef">
<n-form-item label="短信验证码" path="code" v-if="userStore.info?.mobile !== ''">
<n-input-group>
<n-input v-model:value="formMobileValue.code" placeholder="请输入验证码" />
<n-button
type="primary"
ghost
@click="sendMobileCode"
:disabled="isCounting"
:loading="sendLoading"
>
{{ sendLabel }}
</n-button>
</n-input-group>
<template #feedback> 接收号码：+86{{ userStore.info?.mobile }} </template>
</n-form-item>
<n-form-item label="换绑手机号" path="mobile">
<n-input v-model:value="formMobileValue.mobile" placeholder="请输入换绑手机号" />
</n-form-item>
<div>
<n-space justify="end">
<n-button @click="showMobileModal = false">取消</n-button>
<n-button type="primary" :loading="formMobileBtnLoading" @click="formMobileSubmit"
>保存更新</n-button
>
</n-space>
</div>
</n-form>
</n-modal>
<n-modal
:block-scroll="false"
:mask-closable="false"
v-model:show="showEmailModal"
:show-icon="false"
preset="dialog"
title="修改邮箱"
:style="{
width: dialogWidth,
}"
>
<n-form :label-width="80" :model="formEmailValue" ref="formEmailRef">
<n-form-item label="邮箱验证码" path="code" v-if="userStore.info?.email !== ''">
<n-input-group>
<n-input v-model:value="formEmailValue.code" placeholder="请输入验证码" />
<n-button
type="primary"
ghost
@click="sendEmailCode"
:disabled="isCounting"
:loading="sendLoading"
>
{{ sendLabel }}
</n-button>
</n-input-group>
<template #feedback> 接收邮箱：{{ userStore.info?.email }} </template>
</n-form-item>
<n-form-item label="换绑邮箱" path="email">
<n-input v-model:value="formEmailValue.email" placeholder="请输入换绑邮箱" />
</n-form-item>
<div>
<n-space justify="end">
<n-button @click="showEmailModal = false">取消</n-button>
<n-button type="primary" :loading="formEmailBtnLoading" @click="formEmailSubmit"
>保存更新</n-button
>
</n-space>
</div>
</n-form>
</n-modal>
</template>
<script lang="ts" setup>
import { onMounted, ref } from 'vue';
import { useMessage } from 'naive-ui';
import { useRouter, useRoute } from 'vue-router';
import { useSendCode } from '@/hooks/common';
import { adaModalWidth } from '@/utils/hotgo';
import {
updateMemberPwd,
updateMemberMobile,
updateMemberEmail,
SendBindEmail,
SendBindSms,
} from '@/api/system/user';
import { TABS_ROUTES } from '@/store/mutation-types';
import { useUserStore } from '@/store/modules/user';
const { sendLabel, isCounting, loading: sendLoading, activateSend } = useSendCode();
const userStore = useUserStore();
const dialogWidth = ref('75%');
const rules = {
basicName: {
required: true,
message: '请输入网站名称',
trigger: 'blur',
},
};
const formRef: any = ref(null);
const message = useMessage();
const router = useRouter();
const route = useRoute();
const showModal = ref(false);
const formValue = ref({
oldPassword: '',
newPassword: '',
});
function formSubmit() {
formRef.value.validate((errors) => {
if (!errors) {
updateMemberPwd({
oldPassword: formValue.value.oldPassword,
newPassword: formValue.value.newPassword,
})
.then((_res) => {
message.success('更新成功');
userStore.logout().then(() => {
message.success('成功退出登录');
// 移除标签页
localStorage.removeItem(TABS_ROUTES);
router
.replace({
name: 'Login',
query: {
redirect: route.fullPath,
},
})
.finally(() => location.reload());
});
})
.finally(() => {
showModal.value = false;
});
} else {
message.error('验证失败，请填写完整信息');
}
});
}
function openUpdatePassForm() {
showModal.value = true;
formValue.value.newPassword = '';
formValue.value.oldPassword = '';
}
const formMobileBtnLoading = ref(false);
const formMobileRef: any = ref(null);
const showMobileModal = ref(false);
const formMobileValue = ref({
mobile: '',
code: '',
});
function formMobileSubmit() {
formMobileRef.value.validate((errors) => {
if (!errors) {
formMobileBtnLoading.value = true;
updateMemberMobile({
mobile: formMobileValue.value.mobile,
code: formMobileValue.value.code,
})
.then((_res) => {
message.success('更新成功');
showMobileModal.value = false;
userStore.GetInfo();
})
.finally(() => {
formMobileBtnLoading.value = false;
});
} else {
message.error('验证失败，请填写完整信息');
}
});
}
function openUpdateMobileForm() {
showMobileModal.value = true;
formMobileValue.value.mobile = '';
formMobileValue.value.code = '';
}
const formEmailBtnLoading = ref(false);
const formEmailRef: any = ref(null);
const showEmailModal = ref(false);
const formEmailValue = ref({
email: '',
code: '',
});
function formEmailSubmit() {
formEmailRef.value.validate((errors) => {
if (!errors) {
formEmailBtnLoading.value = true;
updateMemberEmail({
email: formEmailValue.value.email,
code: formEmailValue.value.code,
})
.then((_res) => {
message.success('更新成功');
showEmailModal.value = false;
userStore.GetInfo();
})
.finally(() => {
formEmailBtnLoading.value = false;
});
} else {
message.error('验证失败，请填写完整信息');
}
});
}
function openUpdateEmailForm() {
showEmailModal.value = true;
formEmailValue.value.email = '';
formEmailValue.value.code = '';
}
function sendMobileCode() {
activateSend(SendBindSms());
}
function sendEmailCode() {
activateSend(SendBindEmail());
}
onMounted(async () => {
adaModalWidth(dialogWidth, 580);
});
</script>

13
web/src/views/setting/account/account.vue → web/src/views/home/account/account.vue
View File

@@ -1,8 +1,8 @@
<template>
<div>
<n-grid :x-gap="24">
<n-grid cols="24 300:1 600:24" :x-gap="24">
<n-grid-item span="6">
<n-card :bordered="false" size="small" class="proCard">
<n-card :bordered="false" class="proCard">
<n-thing
class="thing-cell"
v-for="item in typeTabList"
@@ -19,6 +19,7 @@
<n-card :bordered="false" size="small" :title="typeTitle" class="proCard">
<BasicSetting v-if="type === 1" />
<SafetySetting v-if="type === 2" />
<CashSetting v-if="type === 3" />
</n-card>
</n-grid-item>
</n-grid>
@@ -28,6 +29,7 @@
import { ref } from 'vue';
import BasicSetting from './BasicSetting.vue';
import SafetySetting from './SafetySetting.vue';
import CashSetting from './CashSetting.vue';
const typeTabList = [
{
@@ -37,9 +39,14 @@
},
{
name: '安全设置',
desc: '密码，邮箱等设置',
desc: '密码、手机号、邮箱等设置',
key: 2,
},
{
name: '提现设置',
desc: '提现收款账号支付宝设置',
key: 3,
},
];
const type = ref(1);

153
web/src/views/home/message/list.vue Normal file
View File

@@ -0,0 +1,153 @@
<template>
<n-spin :show="loading">
<n-empty v-show="dataSource.list?.length === 0" description="无数据" />
<n-list hoverable clickable class="list-item">
<n-list-item v-for="item in dataSource.list" :key="item.id" @click="UnRead(item)">
<n-thing
content-indented
:title="item.title"
:description="item.createdAt"
:content-style="{ padding: '10px' }"
>
<template #avatar>
<n-badge v-bind="getBadgePops(item)">
<n-avatar v-if="item.senderAvatar !== ''" round :size="28" :src="item.senderAvatar" />
<n-icon-wrapper v-else :size="28" :border-radius="10">
<n-icon :size="20" :component="getIcon(item)" />
</n-icon-wrapper>
</n-badge>
</template>
<template #header-extra>
<n-tag
v-if="item.tagTitle !== '' && item.tagTitle !== undefined"
v-bind="item.tagProps"
size="large"
strong
>
{{ item.tagTitle }}
</n-tag>
</template>
<template #footer>
<span v-html="item.content"></span>
</template>
</n-thing>
</n-list-item>
</n-list>
</n-spin>
<n-space justify="end" style="margin-top: 30px">
<n-pagination
v-model:page="dataSource.page"
:page-count="dataSource.pageCount"
:page-slot="5"
:page-sizes="[5, 10, 50, 100]"
size="medium"
show-quick-jumper
show-size-picker
:on-update:page="onUpdatePage"
:on-update:page-size="onUpdatePageSize"
/>
</n-space>
</template>
<script lang="ts" setup>
import { onMounted, ref } from 'vue';
import { MessageRow, parseMessage } from '@/enums/systemMessageEnum';
import { getIcon } from '@/enums/systemMessageEnum';
import { MessageList, UpRead } from '@/api/apply/notice';
import { debounce } from 'throttle-debounce';
import { notificationStoreWidthOut } from '@/store/modules/notification';
interface Props {
type?: string;
}
const props = withDefaults(defineProps<Props>(), {
type: '1',
});
interface dataList {
page: number;
pageSize: number;
pageCount: number;
list: null | MessageRow[];
}
const dataSource = ref<dataList>({
page: 1,
pageSize: 5,
pageCount: 1,
list: [],
});
const loading = ref(false);
const notificationStore = notificationStoreWidthOut();
function loadDataSource() {
loading.value = true;
MessageList({
type: props.type,
page: dataSource.value.page,
pageSize: dataSource.value.pageSize,
})
.then((res) => {
if (res.list?.length > 0) {
for (let i = 0; i < res.list.length; i++) {
res.list[i] = parseMessage(res.list[i]);
}
}
dataSource.value = res as dataList;
})
.finally(() => {
loading.value = false;
});
}
function UnRead(item: MessageRow) {
UpRead({ id: item.id })
.then(() => {
item.isRead = true;
debounceCallback();
})
.finally(() => {
loading.value = false;
});
}
const debounceCallback = debounce(1000, function () {
notificationStore.pullMessages();
});
function getBadgePops(item: MessageRow) {
if (item.isRead) {
return {};
}
return { dot: true, processing: true, offset: [-2, 2] };
}
function onUpdatePage(page: number) {
dataSource.value.page = page;
loadDataSource();
}
function onUpdatePageSize(pageSize: number) {
dataSource.value.pageSize = pageSize;
loadDataSource();
}
onMounted(() => {
loadDataSource();
});
</script>
<style lang="less" scoped>
::v-deep(.list-item) {
margin-left: calc(1vw);
margin-right: calc(1vw);
}
:deep(img, video, audio) {
width: 100%;
}
</style>

42
web/src/views/home/message/message.vue Normal file
View File

@@ -0,0 +1,42 @@
<template>
<div>
<div class="n-layout-page-header">
<n-card :bordered="false" title="我的消息">
在这里你可以查看平台中通知、公告和与你相关的私信
</n-card>
</div>
<n-card :bordered="false" class="proCard">
<n-tabs
type="card"
class="card-tabs"
:value="defaultTab"
size="large"
animated
@before-leave="handleBeforeLeave"
>
<n-tab-pane name="1" tab="通知"> <List :type="defaultTab" /></n-tab-pane>
<n-tab-pane name="2" tab="公告"> <List :type="defaultTab" /> </n-tab-pane>
<n-tab-pane name="3" tab="私信"> <List :type="defaultTab" /> </n-tab-pane>
</n-tabs>
</n-card>
</div>
</template>
<script lang="ts" setup>
import { ref, onMounted } from 'vue';
import List from './list.vue';
import { useRouter } from 'vue-router';
const router = useRouter();
const defaultTab = ref('1');
onMounted(() => {
if (router.currentRoute.value.query?.type) {
defaultTab.value = router.currentRoute.value.query.type as string;
}
});
function handleBeforeLeave(tabName: string) {
defaultTab.value = tabName;
}
</script>

80
web/src/views/log/cron-log/columns.ts
View File

@@ -1,80 +0,0 @@
import { h } from 'vue';
import { NTag } from 'naive-ui';
export const columns = [
{
title: '模块',
key: 'module',
render(row) {
return h(
NTag,
{
style: {
marginRight: '6px',
},
type: row.module == 'admin' ? 'info' : 'success',
bordered: false,
},
{
default: () => row.module,
}
);
},
},
{
title: '操作人',
key: 'member_name',
render(row) {
if (row.memberId === 0) {
return row.member_name;
}
return row.member_name + '(' + row.memberId + ')';
},
},
{
title: '请求方式',
key: 'method',
},
{
title: '请求路径',
key: 'url',
},
{
title: '访问IP',
key: 'ip',
},
// {
// title: 'IP地区',
// key: 'region',
// },
{
title: '状态码',
key: 'errorCode',
render(row) {
return h(
NTag,
{
style: {
marginRight: '6px',
},
type: row.errorCode == 0 ? 'success' : 'warning',
bordered: false,
},
{
default: () => row.errorMsg + '(' + row.errorCode + ')',
}
);
},
},
{
title: 'Goroutine耗时',
key: 'takeUpTime',
render(row) {
return row.takeUpTime + ' ms';
},
},
{
title: '访问时间',
key: 'createdAt',
},
];

290
web/src/views/log/cron-log/index.vue
View File

@@ -1,290 +0,0 @@
<template>
<n-card :bordered="false" class="proCard" title="任务日志">
<BasicForm @register="register" @submit="handleSubmit" @reset="handleReset">
<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"
@update:checked-row-keys="onCheckedRow"
:scroll-x="1090"
>
<template #tableTitle>
<n-button type="error" @click="batchDelete" :disabled="batchDeleteDisabled">
<template #icon>
<n-icon>
<DeleteOutlined />
</n-icon>
</template>
批量删除
</n-button>
</template>
</BasicTable>
</n-card>
</template>
<script lang="ts" setup>
import { h, reactive, ref } from 'vue';
import { useDialog, useMessage } from 'naive-ui';
import { BasicTable, TableAction } from '@/components/Table';
import { BasicForm, FormSchema, useForm } from '@/components/Form/index';
import { getLogList, Delete } from '@/api/log/log';
import { columns } from './columns';
import { useRouter } from 'vue-router';
import { DeleteOutlined } from '@vicons/antd';
const dialog = useDialog();
const batchDeleteDisabled = ref(true);
const checkedIds = ref([]);
const schemas: FormSchema[] = [
{
field: 'member_id',
component: 'NInput',
label: '操作人员',
componentProps: {
placeholder: '请输入操作人员ID',
onInput: (e: any) => {
console.log(e);
},
},
rules: [{ trigger: ['blur'] }],
},
{
field: 'url',
component: 'NInput',
label: '访问路径',
componentProps: {
placeholder: '请输入手机访问路径',
onInput: (e: any) => {
console.log(e);
},
},
},
{
field: 'ip',
component: 'NInput',
label: '访问IP',
componentProps: {
placeholder: '请输入IP地址',
onInput: (e: any) => {
console.log(e);
},
},
},
{
field: 'method',
component: 'NSelect',
label: '请求方式',
componentProps: {
placeholder: '请选择请求方式',
options: [
{
label: 'GET',
value: 'GET',
},
{
label: 'POST',
value: 'POST',
},
],
onUpdateValue: (e: any) => {
console.log(e);
},
},
},
{
field: 'created_at',
component: 'NDatePicker',
label: '访问时间',
componentProps: {
type: 'datetimerange',
clearable: true,
// defaultValue: [new Date() - 86400000 * 30, new Date()],
onUpdateValue: (e: any) => {
console.log(e);
},
},
},
{
field: 'take_up_time',
component: 'NSelect',
label: '请求耗时',
componentProps: {
placeholder: '请选择请求耗时',
options: [
{
label: '50ms内',
value: '50',
},
{
label: '100ms内',
value: '100',
},
{
label: '200ms内',
value: '200',
},
{
label: '500ms内',
value: '500',
},
],
onUpdateValue: (e: any) => {
console.log(e);
},
},
},
{
field: 'error_code',
component: 'NSelect',
label: '状态码',
componentProps: {
placeholder: '请选择状态码',
options: [
{
label: '0 成功',
value: '0',
},
{
label: '-1 失败',
value: '-1',
},
],
onUpdateValue: (e: any) => {
console.log(e);
},
},
},
];
const router = useRouter();
const formRef: any = ref(null);
const message = useMessage();
const actionRef = ref();
const formParams = ref({});
const params = ref({
pageSize: 10,
});
const actionColumn = reactive({
width: 220,
title: '操作',
key: 'action',
fixed: 'right',
render(record) {
return h(TableAction as any, {
style: 'button',
actions: [
{
label: '查看详情',
onClick: handleEdit.bind(null, record),
},
{
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,
});
function onCheckedRow(rowKeys) {
console.log(rowKeys);
if (rowKeys.length > 0) {
batchDeleteDisabled.value = false;
} else {
batchDeleteDisabled.value = true;
}
checkedIds.value = rowKeys;
}
function handleDelete(record: Recordable) {
console.log('点击了删除', record);
dialog.warning({
title: '警告',
content: '你确定要删除？',
positiveText: '确定',
negativeText: '取消',
onPositiveClick: () => {
Delete(record)
.then((_res) => {
console.log('_res:' + JSON.stringify(_res));
message.success('操作成功');
reloadTable();
})
.catch((e: Error) => {
// message.error(e.message ?? '操作失败');
});
},
onNegativeClick: () => {
// message.error('取消');
},
});
}
function batchDelete() {
dialog.warning({
title: '警告',
content: '你确定要删除？',
positiveText: '确定',
negativeText: '取消',
onPositiveClick: () => {
Delete({ id: checkedIds.value })
.then((_res) => {
console.log('_res:' + JSON.stringify(_res));
message.success('操作成功');
reloadTable();
})
.catch((e: Error) => {
message.error(e.message ?? '操作失败');
});
},
onNegativeClick: () => {
// message.error('取消');
},
});
}
const loadDataTable = async (res) => {
return await getLogList({ ...formParams.value, ...params.value, ...res });
};
function reloadTable() {
actionRef.value.reload();
}
function handleEdit(record: Recordable) {
console.log('点击了编辑', record);
router.push({ name: 'cron_log_view', params: { id: record.id } });
}
function handleSubmit(values: Recordable) {
console.log(values);
formParams.value = values;
reloadTable();
}
function handleReset(values: Recordable) {
console.log(values);
formParams.value = {};
reloadTable();
}
</script>
<style lang="less" scoped></style>

136
web/src/views/log/cron-log/view.vue
View File

@@ -1,136 +0,0 @@
<template>
<div>
<n-card
:bordered="false"
class="proCard mt-4"
size="small"
:segmented="{ content: true }"
:title="data.id ? '日志详情 ID：' + data.id : '日志详情'"
>
<n-descriptions label-placement="left" class="py-2">
<n-descriptions-item label="请求方式">{{ data.method }}</n-descriptions-item>
<n-descriptions-item>
<template #label>请求地址</template>
{{ data.url }}
</n-descriptions-item>
<n-descriptions-item label="请求耗时">{{ data.takeUpTime }} ms</n-descriptions-item>
<n-descriptions-item label="访问IP">{{ data.ip }}</n-descriptions-item>
<n-descriptions-item label="IP归属地">河南 郑州</n-descriptions-item>
<n-descriptions-item label="链路ID">{{ data.reqId }}</n-descriptions-item>
<n-descriptions-item label="响应时间">{{
timestampToTime(data.timestamp)
}}</n-descriptions-item>
<n-descriptions-item label="创建时间">{{ data.createdAt }}</n-descriptions-item>
</n-descriptions>
</n-card>
<n-card
:bordered="false"
class="proCard mt-4"
size="small"
:segmented="{ content: true }"
title="访问代理"
>
{{ data.userAgent }}
</n-card>
<n-card
:bordered="false"
class="proCard mt-4"
size="small"
:segmented="{ content: true }"
title="报错信息"
>
<n-descriptions label-placement="left" class="py-2">
<n-descriptions-item label="报错状态码"> {{ data.errorCode }} </n-descriptions-item>
<n-descriptions-item label="报错消息">
<n-tag type="success"> {{ data.errorMsg }} </n-tag>
</n-descriptions-item>
<n-descriptions-item label="报错日志">
<n-tag type="success"> {{ data.errorData }} </n-tag>
</n-descriptions-item>
</n-descriptions>
</n-card>
<n-card
:bordered="false"
class="proCard mt-4"
size="small"
:segmented="{ content: true }"
title="Header请求头"
>
<JsonViewer
:value="JSON.parse(data.headerData ?? '{}')"
:expand-depth="5"
copyable
boxed
sort
style="width: 100%; min-width: 3.125rem"
/>
</n-card>
<n-card
:bordered="false"
class="proCard mt-4"
size="small"
:segmented="{ content: true }"
title="GET参数"
>
<JsonViewer
:value="JSON.parse(data.getData ?? '{}')"
:expand-depth="5"
copyable
boxed
sort
style="width: 100%; min-width: 3.125rem"
/>
</n-card>
<n-card
:bordered="false"
class="proCard mt-4"
size="small"
:segmented="{ content: true }"
title="POST参数"
>
<JsonViewer
:value="JSON.parse(data.postData ?? '{}')"
:expand-depth="5"
copyable
boxed
sort
style="width: 100%; min-width: 3.125rem"
/>
</n-card>
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref } from 'vue';
import { JsonViewer } from 'vue3-json-viewer';
import 'vue3-json-viewer/dist/index.css';
import { useRouter } from 'vue-router';
import { useMessage } from 'naive-ui';
import { View } from '@/api/log/log';
import { timestampToTime } from '@/utils/dateUtil';
const message = useMessage();
const router = useRouter();
const logId = Number(router.currentRoute.value.params.id);
onMounted(async () => {
if (logId === undefined || logId < 1) {
message.error('ID不正确，请检查！');
return;
}
await getInfo();
});
const data = ref({});
const getInfo = async () => {
data.value = await View({ id: logId });
};
</script>
<style lang="less" scoped></style>

6
web/src/views/log/ems-log/columns.ts
View File

@@ -23,12 +23,12 @@ export const columns = [
},
{
title: '操作人',
key: 'member_name',
key: 'memberName',
render(row) {
if (row.memberId === 0) {
return row.member_name;
return row.memberName;
}
return row.member_name + '(' + row.memberId + ')';
return row.memberName + '(' + row.memberId + ')';
},
},
{

6
web/src/views/log/log/columns.ts
View File

@@ -24,12 +24,12 @@ export const columns = [
},
{
title: '操作人',
key: 'member_name',
key: 'memberName',
render(row) {
if (row.memberId === 0) {
return row.member_name;
return row.memberName;
}
return row.member_name + '(' + row.memberId + ')';
return row.memberName + '(' + row.memberId + ')';
},
width: 150,
},

62
web/src/views/log/log/index.vue
View File

@@ -1,39 +1,41 @@
<template>
<n-card :bordered="false" class="proCard">
<div>
<div class="n-layout-page-header">
<n-card :bordered="false" title="访问日志">
全局的访问日志，记录了管理后台中人员的操作记录和服务响应情况
全局访问日志，记录了系统中后台人员和客户端的操作记录，以及服务响应情况
</n-card>
</div>
<BasicForm @register="register" @submit="handleSubmit" @reset="handleReset">
<template #statusSlot="{ model, field }">
<n-input v-model:value="model[field]" />
</template>
</BasicForm>
<n-card :bordered="false" class="proCard">
<BasicForm @register="register" @submit="handleSubmit" @reset="handleReset">
<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"
@update:checked-row-keys="onCheckedRow"
:scroll-x="1090"
:resizeHeightOffset="-20000"
>
<template #tableTitle>
<n-button type="error" @click="batchDelete" :disabled="batchDeleteDisabled">
<template #icon>
<n-icon>
<DeleteOutlined />
</n-icon>
</template>
批量删除
</n-button>
</template>
</BasicTable>
</n-card>
<BasicTable
:openChecked="true"
:columns="columns"
:request="loadDataTable"
:row-key="(row) => row.id"
ref="actionRef"
:actionColumn="actionColumn"
@update:checked-row-keys="onCheckedRow"
:scroll-x="1090"
:resizeHeightOffset="-20000"
>
<template #tableTitle>
<n-button type="error" @click="batchDelete" :disabled="batchDeleteDisabled">
<template #icon>
<n-icon>
<DeleteOutlined />
</n-icon>
</template>
批量删除
</n-button>
</template>
</BasicTable>
</n-card>
</div>
</template>
<script lang="ts" setup>

31
web/src/views/log/log/view.vue
View File

@@ -15,7 +15,7 @@
</n-descriptions-item>
<n-descriptions-item label="请求耗时">{{ data.takeUpTime }} ms</n-descriptions-item>
<n-descriptions-item label="访问IP">{{ data.ip }}</n-descriptions-item>
<n-descriptions-item label="IP归属地">河南 郑州</n-descriptions-item>
<n-descriptions-item label="IP归属地">{{ data.cityLabel }}</n-descriptions-item>
<n-descriptions-item label="链路ID">{{ data.reqId }}</n-descriptions-item>
<n-descriptions-item label="响应时间">{{
timestampToTime(data.timestamp)
@@ -61,7 +61,7 @@
copyable
boxed
sort
style="width: 100%; min-width: 3.125rem"
class="json-width"
/>
</n-card>
@@ -78,7 +78,7 @@
copyable
boxed
sort
style="width: 100%; min-width: 3.125rem"
class="json-width"
/>
</n-card>
@@ -89,14 +89,7 @@
:segmented="{ content: true }"
title="GET参数"
>
<JsonViewer
:value="data.getData"
:expand-depth="5"
copyable
boxed
sort
style="width: 100%; min-width: 3.125rem"
/>
<JsonViewer :value="data.getData" :expand-depth="5" copyable boxed sort class="json-width" />
</n-card>
<n-card
@@ -106,14 +99,7 @@
:segmented="{ content: true }"
title="POST参数"
>
<JsonViewer
:value="data.postData"
:expand-depth="5"
copyable
boxed
sort
style="width: 100%; min-width: 3.125rem"
/>
<JsonViewer :value="data.postData" :expand-depth="5" copyable boxed sort class="json-width" />
</n-card>
</div>
</template>
@@ -147,4 +133,9 @@
};
</script>
<style lang="less" scoped></style>
<style lang="less" scoped>
::v-deep(.json-width) {
width: 100%;
min-width: 3.125rem;
}
</style>

6
web/src/views/log/login-log/index.vue
View File

@@ -1,9 +1,9 @@
<template>
<div>
<div class="n-layout-page-header">
<n-card :bordered="false" title="登录日志"> 在这里会记录管理后台所有的来访登录情况 </n-card>
</div>
<n-card :bordered="false" class="proCard">
<div class="n-layout-page-header">
<n-card :bordered="false" title="登录日志"> 在这里会记录管理后台所有的来访登录情况 </n-card>
</div>
<BasicForm
@register="register"
@submit="reloadTable"

4
web/src/views/log/login-log/model.ts
View File

@@ -130,8 +130,8 @@ export const columns = [
},
{
title: 'IP归属地',
key: 'region',
width: 180,
key: 'cityLabel',
width: 200,
},
{
title: '浏览器',

67
web/src/views/log/sms-log/index.vue
View File

@@ -1,34 +1,43 @@
<template>
<n-card :bordered="false" class="proCard">
<n-card :bordered="false" title="短信记录"> 你可以在这里查看到平台所有的短信发送记录 </n-card>
<BasicForm @register="register" @submit="handleSubmit" @reset="handleReset" ref="searchFormRef">
<template #statusSlot="{ model, field }">
<n-input v-model:value="model[field]" />
</template>
</BasicForm>
<div>
<div class="n-layout-page-header">
<n-card :bordered="false" title="短信记录"> 你可以在这里查看到平台所有的短信发送记录 </n-card>
</div>
<n-card :bordered="false" class="proCard">
<BasicForm
@register="register"
@submit="handleSubmit"
@reset="handleReset"
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"
@update:checked-row-keys="onCheckedRow"
:scroll-x="1090"
>
<template #tableTitle>
<n-button type="error" @click="batchDelete" :disabled="batchDeleteDisabled">
<template #icon>
<n-icon>
<DeleteOutlined />
</n-icon>
</template>
批量删除
</n-button>
</template>
</BasicTable>
</n-card>
<BasicTable
:openChecked="true"
:columns="columns"
:request="loadDataTable"
:row-key="(row) => row.id"
ref="actionRef"
:actionColumn="actionColumn"
@update:checked-row-keys="onCheckedRow"
:scroll-x="1090"
>
<template #tableTitle>
<n-button type="error" @click="batchDelete" :disabled="batchDeleteDisabled">
<template #icon>
<n-icon>
<DeleteOutlined />
</n-icon>
</template>
批量删除
</n-button>
</template>
</BasicTable>
</n-card>
</div>
</template>
<script lang="ts" setup>

2
web/src/views/login/index.vue
View File

@@ -33,7 +33,7 @@
<n-input
@keyup.enter="handleSubmit"
v-model:value="formInline.pass"
type="pass"
type="password"
showpassOn="click"
placeholder="请输入密码"
>

1
web/src/views/monitor/online/index.vue
View File

@@ -69,6 +69,7 @@
{
label: '强制退出',
onClick: handleDelete.bind(null, record),
type: 'error',
},
],
});

20
web/src/views/monitor/serve-log/index.vue
View File

@@ -1,11 +1,11 @@
<template>
<div>
<div class="n-layout-page-header">
<n-card :bordered="false" title="服务日志">
在这里开发者可以快速定位服务端在运行时产生的重要日志，方便排查系统异常和日常运维工作
</n-card>
</div>
<n-card :bordered="false" class="proCard">
<div class="n-layout-page-header">
<n-card :bordered="false" title="服务日志">
在这里开发者可以快速定位服务端在运行时产生的重要日志，方便排查系统异常和日常运维
</n-card>
</div>
<BasicForm
@register="register"
@submit="reloadTable"
@@ -131,14 +131,16 @@
return h(TableAction as any, {
style: 'button',
actions: [
{
label: '详细报错',
onClick: handleStack.bind(null, record),
},
{
label: '访问日志',
onClick: handleView.bind(null, record),
ifShow: record.sysLogId > 0,
type: 'default',
},
{
label: '堆栈',
onClick: handleStack.bind(null, record),
type: 'primary',
},
{
label: '删除',

11
web/src/views/org/user/columns.ts
View File

@@ -1,5 +1,6 @@
import { h } from 'vue';
import { NAvatar, NTag } from 'naive-ui';
import { formatBefore } from '@/utils/dateUtil';
export const columns = [
{
@@ -104,9 +105,15 @@ export const columns = [
},
},
{
title: '访问次数',
key: 'visitCount',
title: '最近活跃',
key: 'lastActiveAt',
width: 100,
render(row) {
if (row.lastActiveAt === null) {
return '从未登录';
}
return formatBefore(new Date(row.lastActiveAt));
},
},
{
title: '创建时间',

14
web/src/views/org/user/user.vue
View File

@@ -81,10 +81,11 @@
<n-grid x-gap="24" :cols="2">
<n-gi>
<n-form-item label="绑定角色" path="roleId">
<n-select
<n-tree-select
:default-value="formParams.roleId"
:options="roleList"
@update:value="handleUpdateRoleValue"
:default-expand-all="true"
/>
</n-form-item>
</n-gi>
@@ -385,16 +386,9 @@
roleList.value = [];
let roleLists = await getRoleList({ pageSize: 100 });
if (roleLists.list === undefined || roleLists.list === null) {
roleLists = [];
roleList.value = [];
} else {
roleLists = roleLists.list;
}
if (roleLists.length > 0) {
for (let i = 0; i < roleLists.length; i++) {
roleList.value[i] = {};
roleList.value[i].label = roleLists[i].name;
roleList.value[i].value = roleLists[i].id;
}
roleList.value = roleLists.list;
}
postList.value = [];

10
web/src/views/permission/menu/CreateDrawer.vue
View File

@@ -22,7 +22,7 @@
<n-form-item label="上级目录" path="pid">
<n-tree-select
:options="optionTreeData"
default-value="0"
:default-value="formParams.pid"
@update:value="handleUpdateValue"
/>
</n-form-item>
@@ -284,7 +284,7 @@
},
},
emits: ['loadData'],
setup(_props, context) {
setup(props, context) {
const message = useMessage();
const formRef: any = ref(null);
const state = reactive<any>({
@@ -317,12 +317,16 @@
},
};
function openDrawer() {
function openDrawer(pid: number) {
if (document.body.clientWidth < 700) {
state.width = document.body.clientWidth;
}
state.isDrawer = true;
state.formParams = newState(null);
state.formParams.pid = pid;
if (pid > 0) {
state.formParams.type = 2;
}
}
function closeDrawer() {

66
web/src/views/permission/menu/menu.vue
View File

@@ -2,8 +2,8 @@
<div>
<div class="n-layout-page-header">
<n-card :bordered="false" title="菜单管理">
在这里可以管理编辑系统下的所有菜单导航和分配相应的菜单权限</n-card
>
在这里可以管理编辑系统下的所有菜单导航和分配相应的菜单权限
</n-card>
</div>
<n-grid class="mt-4" cols="1 s:1 m:1 l:3 xl:3 2xl:3" responsive="screen" :x-gap="12">
<n-gi span="1">
@@ -20,6 +20,21 @@
</template>
添加菜单
</n-button>
<n-button
type="info"
icon-placement="left"
@click="openChildCreateDrawer"
:disabled="!isEditMenu"
>
<template #icon>
<div class="flex items-center">
<n-icon size="14">
<PlusOutlined />
</n-icon>
</div>
</template>
添加子菜单
</n-button>
<n-button type="primary" icon-placement="left" @click="packHandle">
全部{{ expandedKeys.length ? '收起' : '展开' }}
<template #icon>
@@ -72,11 +87,16 @@
<FormOutlined />
</n-icon>
<span>编辑菜单{{ treeItemTitle ? `：${treeItemTitle}` : '' }}</span>
<span style="font-size: 14px">{{
treeItemTitle ? '' : '从菜单列表选择一项后，进行编辑'
}}</span>
<span style="font-size: 14px">{{ treeItemTitle }}</span>
</n-space>
</template>
<n-result
v-show="!isEditMenu"
status="info"
title="提示"
description="从菜单列表中选择一项进行编辑"
/>
<n-form
:model="formParams"
:rules="rules"
@@ -137,8 +157,8 @@
</template>
请填写图标编码，可以参考图标库，也可以不填使用默认图标
</n-tooltip>
菜单图标</template
>
菜单图标
</template>
</n-form-item>
</n-gi>
</n-grid>
@@ -154,8 +174,8 @@
</template>
请路由地址，如：user
</n-tooltip>
路由地址</template
>
路由地址
</template>
</n-form-item>
</n-gi>
<n-gi>
@@ -169,8 +189,8 @@
对应路由配置文件中 `name` 只能是唯一性，配置 `http(s)://` 开头地址
则会新窗口打开
</n-tooltip>
路由别名</template
>
路由别名
</template>
</n-form-item>
</n-gi>
</n-grid>
@@ -181,16 +201,16 @@
<n-input placeholder="组件路径" v-model:value="formParams.component" />
<template #feedback>
主目录填 `LAYOUT`;多级父目录填
`ParentLayout`;页面填具体的组件路径，如：`/system/menu/menu`</template
>
`ParentLayout`;页面填具体的组件路径，如：`/system/menu/menu`
</template>
</n-form-item>
</n-gi>
<n-gi v-if="formParams.type === 1">
<n-form-item label="默认跳转" path="redirect">
<n-input placeholder="默认路由跳转地址" v-model:value="formParams.redirect" />
<template #feedback
>默认跳转路由地址，如：`/system/menu/menu` 多级路由情况下适用</template
>
>默认跳转路由地址，如：`/system/menu/menu` 多级路由情况下适用
</template>
</n-form-item>
</n-gi>
</n-grid>
@@ -211,8 +231,8 @@
</template>
请填写API路由地址，可同时作用于服务端和web端。多个权限用,分割
</n-tooltip>
分配权限</template
>
分配权限
</template>
</n-form-item>
</n-gi>
<!-- <n-gi>-->
@@ -354,7 +374,7 @@
import { getTreeItem } from '@/utils';
import CreateDrawer from './CreateDrawer.vue';
import IconSelector from '@/components/IconSelector/index.vue';
import { State, newState } from '@/views/permission/menu/model';
import { newState, State } from '@/views/permission/menu/model';
const menuTypes = [
{
@@ -455,14 +475,20 @@
function openCreateDrawer() {
drawerTitle.value = '添加菜单';
const { openDrawer } = createDrawerRef.value;
openDrawer();
openDrawer(0);
}
function openChildCreateDrawer() {
drawerTitle.value = '添加菜单';
const { openDrawer } = createDrawerRef.value;
openDrawer(formParams.id);
}
function selectedTree(keys) {
if (keys.length) {
const treeItem = getTreeItem(unref(treeData), keys[0]);
treeItemKey.value = keys;
treeItemTitle.value = treeItem.label;
treeItemTitle.value = treeItem.label + ' #' + treeItem.id;
Object.assign(formParams, treeItem);
isEditMenu.value = true;
} else {

10
web/src/views/permission/role/role.vue
View File

@@ -230,28 +230,30 @@
label: '菜单权限',
onClick: handleMenuAuth.bind(null, record),
ifShow: () => {
return record.key !== 'super';
return record.id !== 1;
},
type: 'default',
},
{
label: '数据权限',
onClick: handleDataAuth.bind(null, record),
ifShow: () => {
return record.key !== 'super';
return record.id !== 1;
},
type: 'default',
},
{
label: '编辑',
onClick: handleEdit.bind(null, record),
ifShow: () => {
return record.key !== 'super';
return record.id !== 1;
},
},
{
label: '删除',
onClick: handleDelete.bind(null, record),
ifShow: () => {
return record.key !== 'super';
return record.id !== 1;
},
},
],

71
web/src/views/setting/account/BasicSetting.vue
View File

@@ -1,71 +0,0 @@
<template>
<n-grid cols="2 s:2 m:2 l:3 xl:3 2xl:3" responsive="screen">
<n-grid-item>
<n-form :label-width="80" :model="formValue" :rules="rules" ref="formRef">
<n-form-item label="昵称" path="name">
<n-input v-model:value="formValue.name" placeholder="请输入昵称" />
</n-form-item>
<n-form-item label="邮箱" path="email">
<n-input placeholder="请输入邮箱" v-model:value="formValue.email" />
</n-form-item>
<n-form-item label="联系电话" path="mobile">
<n-input placeholder="请输入联系电话" v-model:value="formValue.mobile" />
</n-form-item>
<n-form-item label="联系地址" path="address">
<n-input v-model:value="formValue.address" type="textarea" placeholder="请输入联系地址" />
</n-form-item>
<div>
<n-space>
<n-button type="primary" @click="formSubmit">更新基本信息</n-button>
</n-space>
</div>
</n-form>
</n-grid-item>
</n-grid>
</template>
<script lang="ts" setup>
import { reactive, ref } from 'vue';
import { useMessage } from 'naive-ui';
const rules = {
name: {
required: true,
message: '请输入昵称',
trigger: 'blur',
},
email: {
required: true,
message: '请输入邮箱',
trigger: 'blur',
},
mobile: {
required: true,
message: '请输入联系电话',
trigger: 'input',
},
};
const formRef: any = ref(null);
const message = useMessage();
const formValue = reactive({
name: '',
mobile: '',
email: '',
address: '',
});
function formSubmit() {
formRef.value.validate((errors) => {
if (!errors) {
message.success('验证成功');
} else {
message.error('验证失败，请填写完整信息');
}
});
}
</script>

52
web/src/views/setting/account/SafetySetting.vue
View File

@@ -1,52 +0,0 @@
<template>
<n-grid cols="1" responsive="screen" class="-mt-5">
<n-grid-item>
<n-list>
<n-list-item>
<template #suffix>
<n-button type="primary" text>修改</n-button>
</template>
<n-thing title="账户密码">
<template #description
><span class="text-gray-400">绑定手机和邮箱，并设置密码，帐号更安全</span></template
>
</n-thing>
</n-list-item>
<n-list-item>
<template #suffix>
<n-button type="primary" text>修改</n-button>
</template>
<n-thing title="绑定手机">
<template #description
><span class="text-gray-400">已绑定手机号：+86189****4877</span></template
>
</n-thing>
</n-list-item>
<n-list-item>
<template #suffix>
<n-button type="primary" text>设置</n-button>
</template>
<n-thing title="密保问题">
<template #description
><span class="text-gray-400"
>未设置密保问题，密保问题可有效保护账户安全</span
></template
>
</n-thing>
</n-list-item>
<n-list-item>
<template #suffix>
<n-button type="primary" text>修改</n-button>
</template>
<n-thing title="个性域名">
<template #description
><span class="text-gray-400">已绑定域名：https://hotgo.facms.cn</span></template
>
</n-thing>
</n-list-item>
</n-list>
</n-grid-item>
</n-grid>
</template>
<script lang="ts" setup></script>

71
web/src/views/system/account/BasicSetting.vue
View File

@@ -1,71 +0,0 @@
<template>
<n-grid cols="2 s:2 m:2 l:3 xl:3 2xl:3" responsive="screen">
<n-grid-item>
<n-form :label-width="80" :model="formValue" :rules="rules" ref="formRef">
<n-form-item label="昵称" path="name">
<n-input v-model:value="formValue.name" placeholder="请输入昵称" />
</n-form-item>
<n-form-item label="邮箱" path="email">
<n-input placeholder="请输入邮箱" v-model:value="formValue.email" />
</n-form-item>
<n-form-item label="联系电话" path="mobile">
<n-input placeholder="请输入联系电话" v-model:value="formValue.mobile" />
</n-form-item>
<n-form-item label="联系地址" path="address">
<n-input v-model:value="formValue.address" type="textarea" placeholder="请输入联系地址" />
</n-form-item>
<div>
<n-space>
<n-button type="primary" @click="formSubmit">更新基本信息</n-button>
</n-space>
</div>
</n-form>
</n-grid-item>
</n-grid>
</template>
<script lang="ts" setup>
import { reactive, ref } from 'vue';
import { useMessage } from 'naive-ui';
const rules = {
name: {
required: true,
message: '请输入昵称',
trigger: 'blur',
},
email: {
required: true,
message: '请输入邮箱',
trigger: 'blur',
},
mobile: {
required: true,
message: '请输入联系电话',
trigger: 'input',
},
};
const formRef: any = ref(null);
const message = useMessage();
const formValue = reactive({
name: '',
mobile: '',
email: '',
address: '',
});
function formSubmit() {
formRef.value.validate((errors) => {
if (!errors) {
message.success('验证成功');
} else {
message.error('验证失败，请填写完整信息');
}
});
}
</script>

52
web/src/views/system/account/SafetySetting.vue
View File

@@ -1,52 +0,0 @@
<template>
<n-grid cols="1" responsive="screen" class="-mt-5">
<n-grid-item>
<n-list>
<n-list-item>
<template #suffix>
<n-button type="primary" text>修改</n-button>
</template>
<n-thing title="账户密码">
<template #description
><span class="text-gray-400">绑定手机和邮箱，并设置密码，帐号更安全</span></template
>
</n-thing>
</n-list-item>
<n-list-item>
<template #suffix>
<n-button type="primary" text>修改</n-button>
</template>
<n-thing title="绑定手机">
<template #description
><span class="text-gray-400">已绑定手机号：+86189****4877</span></template
>
</n-thing>
</n-list-item>
<n-list-item>
<template #suffix>
<n-button type="primary" text>设置</n-button>
</template>
<n-thing title="密保问题">
<template #description
><span class="text-gray-400"
>未设置密保问题，密保问题可有效保护账户安全</span
></template
>
</n-thing>
</n-list-item>
<n-list-item>
<template #suffix>
<n-button type="primary" text>修改</n-button>
</template>
<n-thing title="个性域名">
<template #description
><span class="text-gray-400">已绑定域名：https://hotgo.facms.cn</span></template
>
</n-thing>
</n-list-item>
</n-list>
</n-grid-item>
</n-grid>
</template>
<script lang="ts" setup></script>

76
web/src/views/system/account/account.vue
View File

@@ -1,76 +0,0 @@
<template>
<div>
<n-grid :x-gap="24">
<n-grid-item span="6">
<n-card :bordered="false" size="small" class="proCard">
<n-thing
class="thing-cell"
v-for="item in typeTabList"
:key="item.key"
:class="{ 'thing-cell-on': type === item.key }"
@click="switchType(item)"
>
<template #header>{{ item.name }}</template>
<template #description>{{ item.desc }}</template>
</n-thing>
</n-card>
</n-grid-item>
<n-grid-item span="18">
<n-card :bordered="false" size="small" :title="typeTitle" class="proCard">
<BasicSetting v-if="type === 1" />
<SafetySetting v-if="type === 2" />
</n-card>
</n-grid-item>
</n-grid>
</div>
</template>
<script lang="ts" setup>
import { ref } from 'vue';
import BasicSetting from './BasicSetting.vue';
import SafetySetting from './SafetySetting.vue';
const typeTabList = [
{
name: '基本设置',
desc: '个人账户信息设置',
key: 1,
},
{
name: '安全设置',
desc: '密码，邮箱等设置',
key: 2,
},
];
const type = ref(1);
const typeTitle = ref('基本设置');
function switchType(e) {
type.value = e.key;
typeTitle.value = e.name;
}
</script>
<style lang="less" scoped>
.thing-cell {
margin: 0 -16px 10px;
padding: 5px 16px;
&:hover {
background: #f3f3f3;
cursor: pointer;
}
}
.thing-cell-on {
background: #f0faff;
color: #2d8cf0;
::v-deep(.n-thing-main .n-thing-header .n-thing-header__title) {
color: #2d8cf0;
}
&:hover {
background: #f0faff;
}
}
</style>

5
web/src/views/system/config/BasicSetting.vue
View File

@@ -27,6 +27,10 @@
/>
</n-form-item>
<n-form-item label="网站域名" path="basicDomain">
<n-input v-model:value="formValue.basicDomain" placeholder="请输入网站域名" />
</n-form-item>
<n-form-item label="用户是否可注册开关" path="basicRegisterSwitch">
<n-radio-group
v-model:value="formValue.basicRegisterSwitch"
@@ -122,6 +126,7 @@
const formValue = ref({
basicName: 'HotGo',
basicLogo: '',
basicDomain: 'https://hotgo.facms.cn',
basicIcpCode: '',
basicLoginCode: 0,
basicRegisterSwitch: 1,

66
web/src/views/system/config/EmailSetting.vue
View File

@@ -35,6 +35,40 @@
<n-input v-model:value="formValue.smtpAdminMailbox" placeholder="" />
</n-form-item>
<n-divider title-placement="left">发信限制</n-divider>
<n-form-item label="最小发送间隔" path="smtpMinInterval">
<n-input-number
:show-button="false"
placeholder="请输入"
v-model:value="formValue.smtpMinInterval"
>
<template #suffix> 秒 </template>
</n-input-number>
<template #feedback> 同地址</template>
</n-form-item>
<n-form-item label="IP最大发送次数" path="smtpMaxIpLimit">
<n-input-number v-model:value="formValue.smtpMaxIpLimit" placeholder="" />
<template #feedback> 同IP每天最大允许发送次数 </template>
</n-form-item>
<n-form-item label="验证码有效期" path="smtpCodeExpire">
<n-input-number
:show-button="false"
placeholder="请输入"
v-model:value="formValue.smtpCodeExpire"
>
<template #suffix> 秒 </template>
</n-input-number>
</n-form-item>
<n-form-item label="邮件模板" path="smtpTemplate">
<n-dynamic-input
v-model:value="formValue.smtpTemplate"
preset="pair"
key-placeholder="事件KEY"
value-placeholder="模板路径"
/>
</n-form-item>
<div>
<n-space>
<n-button type="primary" @click="formSubmit">保存更新</n-button>
@@ -63,7 +97,12 @@
class="py-4"
>
<n-form-item label="接收邮箱" path="to">
<n-input placeholder="多个用;隔开" v-model:value="formParams.to" :required="true" />
<n-input
type="textarea"
placeholder="多个用;隔开"
v-model:value="formParams.to"
:required="true"
/>
</n-form-item>
</n-form>
@@ -84,10 +123,8 @@
const group = ref('smtp');
const show = ref(false);
const showModal = ref(false);
const formBtnLoading = ref(false);
const formParams = ref({ to: '' });
const rules = {
@@ -108,6 +145,10 @@
smtpPass: '',
smtpSendName: 'HotGo',
smtpAdminMailbox: '',
smtpMinInterval: 60,
smtpMaxIpLimit: 10,
smtpCodeExpire: 600,
smtpTemplate: null,
});
function confirmForm(e) {
@@ -134,15 +175,10 @@
function formSubmit() {
formRef.value.validate((errors) => {
if (!errors) {
updateConfig({ group: group.value, list: formValue.value })
.then((res) => {
console.log('res:' + JSON.stringify(res));
message.success('更新成功');
load();
})
.catch((error) => {
message.error(error.toString());
});
updateConfig({ group: group.value, list: formValue.value }).then((res) => {
message.success('更新成功');
load();
});
} else {
message.error('验证失败，请填写完整信息');
}
@@ -159,13 +195,11 @@
getConfig({ group: group.value })
.then((res) => {
show.value = false;
// state.formValue.watermarkClarity = res;
res.list.smtpTemplate = JSON.parse(res.list.smtpTemplate);
formValue.value = res.list;
console.log('res:' + JSON.stringify(res));
})
.catch((error) => {
.finally(() => {
show.value = false;
message.error(error.toString());
});
});
}

4
web/src/views/system/config/SmsSetting.vue
View File

@@ -3,7 +3,6 @@
<n-spin :show="show" description="正在获取配置...">
<n-grid cols="2 s:2 m:2 l:2 xl:2 2xl:2" responsive="screen">
<n-grid-item>
<n-divider title-placement="left">通用配置</n-divider>
<n-form :label-width="100" :model="formValue" :rules="rules" ref="formRef">
<n-form-item label="默认驱动" path="smsDrive">
<n-select
@@ -13,6 +12,7 @@
/>
</n-form-item>
<n-divider title-placement="left">发信限制</n-divider>
<n-form-item label="最小发送间隔" path="smsMinInterval">
<n-input-number
:show-button="false"
@@ -184,8 +184,6 @@
function formSubmit() {
formRef.value.validate((errors) => {
if (!errors) {
console.log('formValue.value:' + JSON.stringify(formValue.value));
updateConfig({ group: group.value, list: formValue.value })
.then((res) => {
console.log('res:' + JSON.stringify(res));

2
web/src/views/system/config/UploadSetting.vue
View File

@@ -3,7 +3,6 @@
<n-spin :show="show" description="正在获取配置...">
<n-grid cols="2 s:2 m:2 l:2 xl:2 2xl:2" responsive="screen">
<n-grid-item>
<n-divider title-placement="left">通用配置</n-divider>
<n-form :label-width="100" :model="formValue" :rules="rules" ref="formRef">
<n-form-item label="默认驱动" path="uploadDrive">
<n-select
@@ -13,6 +12,7 @@
/>
</n-form-item>
<n-divider title-placement="left">上传限制</n-divider>
<n-form-item label="图片大小限制" path="uploadImageSize">
<n-input-number
:show-button="false"

17
web/src/views/system/config/system.vue
View File

@@ -21,9 +21,9 @@
<ThemeSetting v-if="type === 2" />
<RevealSetting v-if="type === 3" />
<EmailSetting v-if="type === 4" />
<SmsSetting v-if="type === 5" />
<UploadSetting v-if="type === 8" />
<GeoSetting v-if="type === 9" />
<SmsSetting v-if="type === 10" />
</n-card>
</n-grid-item>
</n-grid>
@@ -59,11 +59,11 @@
desc: '系统邮件设置',
key: 4,
},
// {
// name: '客服设置',
// desc: '系统客服设置',
// key: 5,
// },
{
name: '短信配置',
desc: '短信验证码平台',
key: 5,
},
// {
// name: '下游配置',
// desc: '默认设置和权限屏蔽',
@@ -84,11 +84,6 @@
desc: '配置地理位置工具',
key: 9,
},
{
name: '短信配置',
desc: '短信验证码平台',
key: 10,
},
];
export default defineComponent({
components: {

5
web/src/views/test/edit.vue
View File

@@ -99,6 +99,10 @@
<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>
@@ -155,6 +159,7 @@
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';
const emit = defineEmits(['reloadTable', 'updateShowModal']);
interface Props {

11
web/src/views/test/index.vue
View File

@@ -1,11 +1,11 @@
<template>
<div>
<div class="n-layout-page-header">
<n-card :bordered="false" title="普通表格演示">
这里提供了一些常用的普通表格组件的用法和表单组件的例子，你可能会需要
</n-card>
</div>
<n-card :bordered="false" class="proCard">
<div class="n-layout-page-header">
<n-card :bordered="false" title="普通表格演示">
这里提供了一些常用的普通表格组件的用法和表单组件的例子
</n-card>
</div>
<BasicForm
@register="register"
@submit="reloadTable"
@@ -106,7 +106,6 @@
{
label: '编辑',
onClick: handleEdit.bind(null, record),
// auth: ['basic_list'],
},
{
label: '禁用',

2
web/src/views/test/model.ts
View File

@@ -37,6 +37,7 @@ export interface State {
email: string;
mobile: string;
channel: number;
cityId: number;
hobby: string[] | null;
pid: number;
level: number;
@@ -75,6 +76,7 @@ export const defaultState = {
email: '',
mobile: '',
channel: 0,
cityId: 0,
hobby: null,
pid: 0,
level: 1,