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

refactor: 1.11.0
refactor: 1.11.0
refactor: 1.11.0
refactor: 1.11.0
refactor: ts化
refactor: ts化
feat: 全面TS化
perf: 全面ts化
refactor: 继续优化ts
perf: ts定义优化
fix: 修复wangeditor无法上传视频的bug
This commit is contained in:
GitHub Actions Bot
2023-03-16 19:24:01 +00:00
parent f344c58f26
commit 6ec697b010
375 changed files with 2210 additions and 3618 deletions
@@ -6,7 +6,7 @@
</a-result>
</template>
<script>
<script lang="ts">
export default {
name: "Exception404",
methods: {
@@ -4,7 +4,7 @@
</fs-page>
</template>
<script>
<script lang="ts">
import { defineComponent } from "vue";
import PageCover from "./page-cover/index.vue";
export default defineComponent({
@@ -1,6 +1,6 @@
<template>
<div class="d2-page-cover">
<div class="d2-page-cover__title" @click="$open('https://github.com/fast-crud/fast-crud')">
<div class="d2-page-cover__title">
<div class="title-line">
<img width="50" src="./image/logo.svg" />
FsAdmin v{{ version }}
@@ -9,10 +9,10 @@
<p class="d2-page-cover__sub-title">面向配置的crud编程快速开发crud功能</p>
<div class="exampleBox">
<div class="left">
<fs-highlight :code="helper.crud" lang="javascript" />
<fs-highlight :code="helperRef.crud" lang="javascript" />
</div>
<div class="icon">
<fs-icon :icon="$fsui.icons.arrowRight" />
<fs-icon :icon="ui.icons.arrowRight" />
</div>
<div class="right">
<img style="border: 1px solid #eee" src="./image/crud.png" />
@@ -22,32 +22,26 @@
<div class="left"></div>
<div class="right">
<div>如果觉得好用请不要吝啬你的star哟</div>
<a href="https://gitee.com/fast-crud/fast-crud" target="_blank"
><img src="https://gitee.com/fast-crud/fast-crud/badge/star.svg?theme=dark" alt="star"
/></a>
<a href="https://github.com/fast-crud/fast-crud" target="_blank"
><img alt="GitHub stars" src="https://img.shields.io/github/stars/fast-crud/fast-crud?logo=github"
/></a>
<a href="https://gitee.com/fast-crud/fast-crud" target="_blank"><img src="https://gitee.com/fast-crud/fast-crud/badge/star.svg?theme=dark" alt="star" /></a>
<a href="https://github.com/fast-crud/fast-crud" target="_blank"><img alt="GitHub stars" src="https://img.shields.io/github/stars/fast-crud/fast-crud?logo=github" /></a>
</div>
</div>
</div>
</template>
<script>
import helper from "./helper";
<script lang="ts">
import { defineComponent, ref } from "vue";
import { useUi } from "@fast-crud/fast-crud";
import helper from "./helper";
export default defineComponent({
name: "PageCover",
setup() {
const version = ref(import.meta.env.VITE_APP_VERSION);
const helperRef = ref(helper);
const { ui } = useUi();
return {
version
};
},
data() {
return {
helper: helper
ui,
version,
helperRef
};
}
});
@@ -1,15 +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" @finishFailed="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="用户名密码登录">
@@ -24,12 +15,7 @@
</a-input>
</a-form-item>
<a-form-item has-feedback name="password">
<a-input-password
v-model:value="formState.password"
placeholder="请输入密码"
size="large"
autocomplete="off"
>
<a-input-password v-model:value="formState.password" placeholder="请输入密码" size="large" autocomplete="off">
<template #prefix>
<span class="iconify" data-icon="ion:lock-closed-outline" data-inline="false"></span>
</template>
@@ -47,12 +33,7 @@
<a-form-item has-feedback name="imgCode">
<a-row :gutter="16">
<a-col class="gutter-row" :span="16">
<a-input
v-model:value="formState.imgCode"
placeholder="请输入图片验证码"
size="large"
autocomplete="off"
>
<a-input v-model:value="formState.imgCode" placeholder="请输入图片验证码" size="large" autocomplete="off">
<template #prefix>
<span class="iconify" data-icon="ion:image-outline" data-inline="false"></span>
</template>
@@ -74,13 +55,7 @@
</a-input>
</a-col>
<a-col class="gutter-row" :span="8">
<a-button
class="getCaptcha"
tabindex="-1"
:disabled="smsSendBtnDisabled"
@click="sendSmsCode"
v-text="smsTime <= 0 ? '发送' : smsTime + ' s'"
></a-button>
<a-button class="getCaptcha" tabindex="-1" :disabled="smsSendBtnDisabled" @click="sendSmsCode" v-text="smsTime <= 0 ? '发送' : smsTime + ' s'"></a-button>
</a-col>
</a-row>
</a-form-item>
@@ -96,11 +71,11 @@
</a-form>
</div>
</template>
<script>
<script lang="ts">
import { defineComponent, reactive, ref, toRaw, computed } from "vue";
import { useUserStore } from "/src/store/modules/user";
export default defineComponent({
name: "Login",
name: "LoginPage",
setup() {
const loading = ref(false);
const userStore = useUserStore();
@@ -153,7 +128,7 @@ export default defineComponent({
}
};
const handleFinish = async (values) => {
const handleFinish = async (values: any) => {
console.log(values, formState);
loading.value = true;
try {
@@ -163,7 +138,7 @@ export default defineComponent({
}
};
const handleFinishFailed = (errors) => {
const handleFinishFailed = (errors: any) => {
console.log(errors);
};
@@ -1,15 +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" @finishFailed="handleFinishFailed">
<a-form-item required has-feedback name="username">
<a-input v-model:value="formState.username" size="large" autocomplete="off">
<template #prefix>
@@ -42,15 +33,15 @@
</a-form>
</div>
</template>
<script>
<script lang="ts">
import { defineComponent, reactive, ref, toRaw } from "vue";
import { useUserStore } from "/src/store/modules/user";
export default defineComponent({
name: "Register",
name: "RegisterPage",
setup() {
const userStore = useUserStore();
const formRef = ref();
const formState = reactive({
const formState: any = reactive({
username: "",
password: ""
});
@@ -87,7 +78,7 @@ export default defineComponent({
}
};
const handleFinish = async (values) => {
const handleFinish = async (values: any) => {
console.log(values, formState);
const userInfo = await userStore.login(
toRaw({
@@ -97,7 +88,7 @@ export default defineComponent({
);
};
const handleFinishFailed = (errors) => {
const handleFinishFailed = (errors: any) => {
console.log(errors);
};