🔱: [client] sync upgrade with 7 commits [trident-sync]

chore:
Merge branch 'vben'

# Conflicts:
#	package.json
perf: antdv示例改成使用vben框架
chore: vben
chore: vben
chore: vben
This commit is contained in:
GitHub Actions Bot
2025-03-03 19:24:51 +00:00
parent de26ee9383
commit 335d175d57
649 changed files with 36984 additions and 826 deletions
@@ -21,10 +21,9 @@ export default defineComponent({
const { crudRef, crudBinding, crudExpose, context } = useFsRef();
// 页面打开后获取列表数据
onMounted(async () => {
const { crudExpose } = await useFsAsync({ crudBinding, crudRef, createCrudOptions, context });
await useFsAsync({ crudBinding, crudRef, createCrudOptions, context });
await crudExpose.doRefresh();
});
return {
crudBinding,
crudRef
@@ -4,8 +4,8 @@ import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, EditReq,
import { message } from "ant-design-vue";
import { computed } from "vue";
const { asyncCompute, compute } = useCompute();
export default async function ({ crudExpose, context }: CreateCrudOptionsProps): Promise<CreateCrudOptionsRet> {
export default function ({ context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
const { asyncCompute, compute } = useCompute();
const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
return await api.GetList(query);
};
@@ -27,8 +27,11 @@
<script lang="ts">
import { computed, defineComponent, onMounted, ref } from "vue";
import { useFs, useFsAsync, useFsRef } from "@fast-crud/fast-crud";
import { useFs, useFsRef } from "@fast-crud/fast-crud";
import createCrudOptions from "./crud";
import { useTour } from "/@/views/crud/basis/first/use-tour";
import { FirstRow } from "/@/views/crud/basis/first/api";
import { FirstContext } from "/@/views/crud/basis/first/crud";
export default defineComponent({
name: "BasisCompute",
@@ -53,15 +56,14 @@ export default defineComponent({
columnComponentShowComputed
};
const { crudRef, crudBinding } = useFsRef();
const { crudRef, crudBinding, crudExpose } = useFsRef();
useFs({ crudRef, crudBinding, crudExpose, createCrudOptions, context });
function columnsMapSetShow() {
crudBinding.value.table.columnsMap["id"].show = !crudBinding.value.table.columnsMap["id"].show;
}
// 页面打开后获取列表数据
onMounted(async () => {
const { crudExpose } = await useFsAsync({ crudBinding, crudRef, createCrudOptions, context });
await crudExpose.doRefresh();
onMounted(() => {
crudExpose.doRefresh();
});
return {
@@ -26,7 +26,7 @@ export default defineComponent({
// 页面打开后获取列表数据
onMounted(async () => {
const { crudExpose } = useFsAsync({ crudBinding, crudRef, context, createCrudOptions });
const { crudExpose } = await useFsAsync({ crudBinding, crudRef, context, createCrudOptions });
await crudExpose.doRefresh();
});
@@ -0,0 +1,19 @@
<template>
<a-result status="403" title="403" sub-title="Sorry, 拒绝访问 .">
<template #extra>
<a-button type="primary" @click="toHome">返回首页 Back Home </a-button>
</template>
</a-result>
</template>
<script lang="ts">
export default {
// eslint-disable-next-line vue/multi-word-component-names
name: "Exception403",
methods: {
toHome() {
this.$router.push({ path: "/" });
}
}
};
</script>
@@ -1,6 +1,6 @@
<template>
<div class="main">
<a-form ref="formRef" class="user-layout-login" name="custom-validation" :model="formState" :rules="rules" v-bind="layout" @finish="handleFinish" @finishFailed="handleFinishFailed">
<a-form ref="formRef" class="user-layout-login" name="custom-validation" :model="formState" :rules="rules" v-bind="layout" @finish="handleFinish" @finish-failed="handleFinishFailed">
<!-- <div class="login-title">登录</div>-->
<a-tabs :active-key="formState.loginType" :tab-bar-style="{ textAlign: 'center', borderBottom: 'unset' }">
<a-tab-pane key="password" tab="用户名密码登录">
@@ -74,7 +74,11 @@
<script lang="ts">
import { defineComponent, reactive, ref, toRaw, computed } from "vue";
import { useUserStore } from "/src/store/modules/user";
import {utils} from "@fast-crud/fast-crud";
import { utils } from "@fast-crud/fast-crud";
import * as UserApi from "/@/api/modules/api.user";
import router from "/@/router";
import { mitter } from "/@/utils/util.mitt";
import { useAccessStore } from "/@/vben/stores";
export default defineComponent({
name: "LoginPage",
setup() {