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

chore:
feat: antdv4 支持
perf: 升级依赖版本
Merge remote-tracking branch 'origin/main'
chore: antdv4 start
This commit is contained in:
GitHub Actions Bot
2023-08-04 19:23:57 +00:00
parent b8eb27441c
commit d5eb4a1900
6 changed files with 57 additions and 59 deletions
@@ -1,5 +1,4 @@
import { request, requestForMock } from "/src/api/service";
// import "/src/mock";
import { ColumnCompositionProps, CrudOptions, FastCrud, PageQuery, PageRes, setLogger, TransformResProps, useColumns, UseCrudProps, UserPageQuery, useTypes, useUi } from "@fast-crud/fast-crud";
import "@fast-crud/fast-crud/dist/style.css";
import { FsExtendsCopyable, FsExtendsEditor, FsExtendsJson, FsExtendsTime, FsExtendsUploader } from "@fast-crud/fast-extends";
@@ -9,7 +8,6 @@ import _ from "lodash-es";
import { useCrudPermission } from "../permission";
import { GetSignedUrl } from "/@/views/crud/component/uploader/s3/api";
import { notification } from "ant-design-vue";
import { useI18n } from "vue-i18n";
function install(app: any, options: any = {}) {
app.use(UiAntdv);
@@ -30,8 +28,6 @@ function install(app: any, options: any = {}) {
*/
commonOptions(props: UseCrudProps): CrudOptions {
const crudBinding = props.crudExpose?.crudBinding;
const { ui } = useUi();
const { t } = useI18n();
const opts: CrudOptions = {
table: {
size: "small",
@@ -1,6 +1,6 @@
import { requestForMock } from "/src/api/service";
const request = requestForMock;
const apiPrefix = "/mock/BasisValueChange";
const apiPrefix = "/mock/BasisReset";
export function GetList(query: any) {
return request({
url: apiPrefix + "/page",
@@ -15,13 +15,14 @@
<script lang="ts">
import { defineComponent, onMounted } from "vue";
import { CrudOptions, DynamicType, useFs, UseFsProps } from "@fast-crud/fast-crud";
import { CrudOptions, DynamicType, useFs } from "@fast-crud/fast-crud";
import createCrudOptions from "./crud.js";
import _ from "lodash-es";
export default defineComponent({
name: "BasisReset",
setup() {
const { crudBinding, crudRef, crudExpose, context, crudOptions, resetCrudOptions, appendBindingOptions } = useFs({ createCrudOptions, context: {} });
const { crudBinding, crudRef, crudExpose, crudOptions, resetCrudOptions, appendBindingOptions } = useFs({ createCrudOptions, context: {} });
setTimeout(() => {
//合并新的crudOptions
@@ -1,7 +1,7 @@
// @ts-ignore
import mockUtil from "/src/mock/base";
const options: any = {
name: "BasisValueChange",
name: "BasisReset",
idGenerator: 0
};
const list = [
@@ -260,6 +260,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
title: "多选自动染色",
sortable: true,
type: "dict-select",
search: { show: true },
form: {
title: "多选本地",
component: {