Merge branch 'client_sync' into v2

# Conflicts:
#	packages/ui/certd-client/CHANGELOG.md
#	packages/ui/certd-client/package.json
#	packages/ui/certd-client/src/api/tools.ts
#	packages/ui/certd-client/src/components/index.ts
#	packages/ui/certd-client/src/main.ts
#	packages/ui/certd-client/src/plugin/fast-crud/index.tsx
#	packages/ui/certd-client/src/plugin/index.ts
#	packages/ui/certd-client/src/router/source/framework.ts
#	packages/ui/certd-client/src/store/modules/page.ts
#	packages/ui/certd-client/src/style/common.less
#	packages/ui/certd-client/src/utils/util.env.ts
#	packages/ui/certd-client/src/views/crud/form/independent/index.vue
#	packages/ui/certd-client/src/views/framework/register/index.vue
#	packages/ui/certd-client/vite.config.ts
This commit is contained in:
xiaojunnuo
2023-10-27 11:54:38 +08:00
483 changed files with 7737 additions and 5075 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 PageContent from "./content/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
};
}
});
@@ -71,7 +71,7 @@
</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({
@@ -128,7 +128,7 @@ export default defineComponent({
}
};
const handleFinish = async (values) => {
const handleFinish = async (values: any) => {
console.log(values, formState);
loading.value = true;
try {
@@ -138,7 +138,7 @@ export default defineComponent({
}
};
const handleFinishFailed = (errors) => {
const handleFinishFailed = (errors: any) => {
console.log(errors);
};
@@ -36,7 +36,7 @@
</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({
@@ -44,7 +44,7 @@ export default defineComponent({
setup() {
const userStore = useUserStore();
const formRef = ref();
const formState = reactive({
const formState: any = reactive({
username: "",
password: "",
confirmPassword: ""
@@ -82,7 +82,7 @@ export default defineComponent({
}
};
const handleFinish = async (values) => {
const handleFinish = async (values: any) => {
await userStore.register(
toRaw({
password: formState.password,
@@ -91,7 +91,7 @@ export default defineComponent({
);
};
const handleFinishFailed = (errors) => {
const handleFinishFailed = (errors: any) => {
console.log(errors);
};