Compare commits

...

7 Commits

Author SHA1 Message Date
胡镇
4acdb0b48a feat: refactor all pages with @sa/alova 2024-10-10 01:57:15 +00:00
胡镇
5cf80a457b feat: refactor user page, fix alova response issue 2024-10-10 01:57:15 +00:00
子殊
77b8bf354e feat(projects): use @sa/alova & add demo.vue 2024-10-10 01:55:21 +00:00
allenli178
91d26392b4 feat(packages): add @sa/alova 2024-10-10 01:53:20 +00:00
Soybean
a726a18f48 chore(deps): update deps 2024-10-10 01:53:20 +00:00
青菜白玉汤
2e64098d94 feat(projects): login supports accessible operation. (#637) 2024-10-10 01:51:25 +00:00
zxin
313efe21fe chore(types): remove type declaration for document.startViewTransition (TypeScript 5.6 includes it) (#633) 2024-10-10 01:51:25 +00:00
11 changed files with 1329 additions and 1400 deletions

View File

@@ -64,56 +64,45 @@
"echarts": "5.5.1",
"jsbarcode": "3.11.6",
"json5": "2.2.3",
"naive-ui": "2.39.0",
"naive-ui": "2.40.1",
"nprogress": "0.2.0",
"pinia": "2.2.2",
"pinyin-pro": "3.24.2",
"print-js": "1.6.0",
"swiper": "11.1.12",
"tailwind-merge": "2.5.2",
"typeit": "8.8.4",
"vditor": "3.10.5",
"vue": "3.5.7",
"pinia": "2.2.4",
"tailwind-merge": "2.5.3",
"vue": "3.5.11",
"vue-draggable-plus": "0.5.3",
"vue-i18n": "10.0.1",
"vue-pdf-embed": "2.1.0",
"vue-router": "4.4.5",
"wangeditor": "4.7.15",
"xgplayer": "3.0.20",
"xlsx": "0.18.5"
"vue-i18n": "10.0.4",
"vue-router": "4.4.5"
},
"devDependencies": {
"@amap/amap-jsapi-types": "0.0.15",
"@elegant-router/vue": "0.3.8",
"@iconify/json": "2.2.251",
"@iconify/json": "2.2.258",
"@sa/scripts": "workspace:*",
"@sa/uno-preset": "workspace:*",
"@soybeanjs/eslint-config": "1.4.1",
"@types/bmapgl": "0.0.7",
"@types/dompurify": "3.0.5",
"@types/node": "22.5.5",
"@types/node": "22.7.5",
"@types/nprogress": "0.2.3",
"@unocss/eslint-config": "0.62.4",
"@unocss/preset-icons": "0.62.4",
"@unocss/preset-uno": "0.62.4",
"@unocss/transformer-directives": "0.62.4",
"@unocss/transformer-variant-group": "0.62.4",
"@unocss/vite": "0.62.4",
"@unocss/eslint-config": "0.63.4",
"@unocss/preset-icons": "0.63.4",
"@unocss/preset-uno": "0.63.4",
"@unocss/transformer-directives": "0.63.4",
"@unocss/transformer-variant-group": "0.63.4",
"@unocss/vite": "0.63.4",
"@vitejs/plugin-vue": "5.1.4",
"@vitejs/plugin-vue-jsx": "4.0.1",
"eslint": "9.11.0",
"eslint": "9.12.0",
"eslint-plugin-vue": "9.28.0",
"lint-staged": "15.2.10",
"sass": "1.79.3",
"sass": "1.79.4",
"simple-git-hooks": "2.11.1",
"tsx": "4.19.1",
"typescript": "5.6.2",
"typescript": "5.6.3",
"unplugin-icons": "0.19.3",
"unplugin-vue-components": "0.27.4",
"vite": "5.4.6",
"vite": "5.4.8",
"vite-plugin-progress": "0.0.7",
"vite-plugin-svg-icons": "2.0.1",
"vite-plugin-vue-devtools": "7.4.5",
"vite-plugin-vue-devtools": "7.4.6",
"vue-eslint-parser": "9.4.3",
"vue-tsc": "2.1.6"
},

View File

@@ -12,6 +12,6 @@
},
"dependencies": {
"@sa/utils": "workspace:*",
"alova": "^3.0.19"
"alova": "3.0.20"
}
}

View File

@@ -10,6 +10,6 @@
}
},
"dependencies": {
"ofetch": "1.4.0"
"ofetch": "1.4.1"
}
}

View File

@@ -14,14 +14,14 @@
},
"devDependencies": {
"@soybeanjs/changelog": "0.3.24",
"bumpp": "9.5.2",
"c12": "1.11.2",
"bumpp": "9.7.1",
"c12": "2.0.1",
"cac": "6.7.14",
"consola": "3.2.3",
"enquirer": "2.4.1",
"execa": "9.4.0",
"kolorist": "1.8.0",
"npm-check-updates": "17.1.2",
"npm-check-updates": "17.1.3",
"rimraf": "6.0.1"
}
}

2443
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -14,14 +14,6 @@ declare global {
$notification?: import('naive-ui').NotificationProviderInst;
}
interface ViewTransition {
ready: Promise<void>;
}
export interface Document {
startViewTransition?: (callback: () => Promise<void> | void) => ViewTransition;
}
/** Build time of the project */
export const BUILD_TIME: string;
}

View File

@@ -40,7 +40,7 @@ async function handleSubmit() {
</script>
<template>
<NForm ref="formRef" :model="model" :rules="rules" size="large" :show-label="false">
<NForm ref="formRef" :model="model" :rules="rules" size="large" :show-label="false" @keyup.enter="handleSubmit">
<NFormItem path="phone">
<NInput v-model:value="model.phone" :placeholder="$t('page.login.common.phonePlaceholder')" />
</NFormItem>

View File

@@ -75,7 +75,7 @@ async function handleAccountLogin(account: Account) {
</script>
<template>
<NForm ref="formRef" :model="model" :rules="rules" size="large" :show-label="false">
<NForm ref="formRef" :model="model" :rules="rules" size="large" :show-label="false" @keyup.enter="handleSubmit">
<NFormItem path="userName">
<NInput v-model:value="model.userName" :placeholder="$t('page.login.common.userNamePlaceholder')" />
</NFormItem>

View File

@@ -46,7 +46,7 @@ async function handleSubmit() {
</script>
<template>
<NForm ref="formRef" :model="model" :rules="rules" size="large" :show-label="false">
<NForm ref="formRef" :model="model" :rules="rules" size="large" :show-label="false" @keyup.enter="handleSubmit">
<NFormItem path="phone">
<NInput v-model:value="model.phone" :placeholder="$t('page.login.common.phonePlaceholder')" />
</NFormItem>

View File

@@ -45,7 +45,7 @@ async function handleSubmit() {
</script>
<template>
<NForm ref="formRef" :model="model" :rules="rules" size="large" :show-label="false">
<NForm ref="formRef" :model="model" :rules="rules" size="large" :show-label="false" @keyup.enter="handleSubmit">
<NFormItem path="phone">
<NInput v-model:value="model.phone" :placeholder="$t('page.login.common.phonePlaceholder')" />
</NFormItem>

View File

@@ -0,0 +1,211 @@
<!-- <script setup lang="tsx">
import { NButton, NPopconfirm, NTag } from 'naive-ui';
import { usePagination } from 'alova/client';
import { reactive } from 'vue';
import { fetchGetUserList } from '@/service/api';
import { $t } from '@/locales';
import { useAppStore } from '@/store/modules/app';
import { enableStatusRecord, userGenderRecord } from '@/constants/business';
import { useTableOperate } from '@/hooks/common/table';
import UserOperateDrawer from './modules/user-operate-drawer.vue';
import UserSearch from './modules/user-search.vue';
const appStore = useAppStore();
const searchParams = reactive<Api.SystemManage.UserSearchParams>({
status: null,
userName: null,
userGender: null,
nickName: null,
userPhone: null,
userEmail: null
});
const { loading, data, page, pageSize, pageCount, total, refresh, reload } = usePagination(
(page, pageSize) => fetchGetUserList({ current: page, size: pageSize }),
{
initialData: {
total: 0,
data: []
},
initialPage: 1,
initialPageSize: 10,
watchingStates: [searchParams],
data: res => res.data,
total: res => res.total
}
);
const columns = [
{
type: 'selection',
align: 'center',
width: 48
},
{
key: 'index',
title: $t('common.index'),
align: 'center',
width: 64
},
{
key: 'userName',
title: $t('page.manage.user.userName'),
align: 'center',
minWidth: 100
},
{
key: 'userGender',
title: $t('page.manage.user.userGender'),
align: 'center',
width: 100,
render: row => {
if (row.userGender === null) {
return null;
}
const tagMap: Record<Api.SystemManage.UserGender, NaiveUI.ThemeColor> = {
1: 'primary',
2: 'error'
};
const label = $t(userGenderRecord[row.userGender]);
return <NTag type={tagMap[row.userGender]}>{label}</NTag>;
}
},
{
key: 'nickName',
title: $t('page.manage.user.nickName'),
align: 'center',
minWidth: 100
},
{
key: 'userPhone',
title: $t('page.manage.user.userPhone'),
align: 'center',
width: 120
},
{
key: 'userEmail',
title: $t('page.manage.user.userEmail'),
align: 'center',
minWidth: 200
},
{
key: 'status',
title: $t('page.manage.user.userStatus'),
align: 'center',
width: 100,
render: row => {
if (row.status === null) {
return null;
}
const tagMap: Record<Api.Common.EnableStatus, NaiveUI.ThemeColor> = {
1: 'success',
2: 'warning'
};
const label = $t(enableStatusRecord[row.status]);
return <NTag type={tagMap[row.status]}>{label}</NTag>;
}
},
{
key: 'operate',
title: $t('common.operate'),
align: 'center',
width: 130,
render: row => (
<div class="flex-center gap-8px">
<NButton type="primary" ghost size="small" onClick={() => edit(row.id)}>
{$t('common.edit')}
</NButton>
<NPopconfirm onPositiveClick={() => handleDelete(row.id)}>
{{
default: () => $t('common.confirmDelete'),
trigger: () => (
<NButton type="error" ghost size="small">
{$t('common.delete')}
</NButton>
)
}}
</NPopconfirm>
</div>
)
}
];
const getData = async () => {
reload();
};
const {
drawerVisible,
operateType,
editingData,
handleAdd,
handleEdit,
checkedRowKeys,
onBatchDeleted,
onDeleted
// closeDrawer
} = useTableOperate(data, getData);
async function handleBatchDelete() {
// request
console.log(checkedRowKeys.value);
onBatchDeleted();
}
function handleDelete(id: number) {
// request
console.log(id);
onDeleted();
}
function edit(id: number) {
handleEdit(id);
}
</script>
<template>
<div class="min-h-500px flex-col-stretch gap-16px overflow-hidden lt-sm:overflow-auto">
<UserSearch v-model:model="searchParams" @reset="resetSearchParams" @search="refresh" />
<NCard :title="$t('page.manage.user.title')" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
<template #header-extra>
<TableHeaderOperation
v-model:columns="columnChecks"
:disabled-delete="checkedRowKeys.length === 0"
:loading="loading"
@add="handleAdd"
@delete="handleBatchDelete"
@refresh="refresh"
/>
</template>
<NDataTable
v-model:checked-row-keys="checkedRowKeys"
:columns="columns"
:data="data"
size="small"
:flex-height="!appStore.isMobile"
:scroll-x="962"
:loading="loading"
remote
:row-key="row => row.id"
:pagination="mobilePagination"
class="sm:h-full"
/>
<UserOperateDrawer
v-model:visible="drawerVisible"
:operate-type="operateType"
:row-data="editingData"
@submitted="refresh"
/>
</NCard>
</div>
</template>
<style scoped></style> -->