diff --git a/packages/ui/certd-client/.eslintrc.js b/packages/ui/certd-client/.eslintrc.js
index ccaf6a64c..1f4b3d0e9 100644
--- a/packages/ui/certd-client/.eslintrc.js
+++ b/packages/ui/certd-client/.eslintrc.js
@@ -19,6 +19,7 @@ module.exports = {
extends: ["plugin:vue/vue3-recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended", "prettier"],
rules: {
//"max-len": [0, 200, 2, { ignoreUrls: true }],
+ "@typescript-eslint/no-unused-vars": "off",
"@typescript-eslint/ban-ts-ignore": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/no-explicit-any": "off",
diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md
index d80e1df46..b73bcc27a 100644
--- a/packages/ui/certd-client/CHANGELOG.md
+++ b/packages/ui/certd-client/CHANGELOG.md
@@ -3,6 +3,24 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.16.11](https://github.com/fast-crud/fast-crud/compare/v1.16.10...v1.16.11) (2023-09-03)
+
+**Note:** Version bump only for package @fast-crud/fs-admin-antdv
+
+## [1.16.10](https://github.com/fast-crud/fast-crud/compare/v1.16.9...v1.16.10) (2023-09-03)
+
+**Note:** Version bump only for package @fast-crud/fs-admin-antdv
+
+## [1.16.9](https://github.com/fast-crud/fast-crud/compare/v1.16.8...v1.16.9) (2023-09-03)
+
+**Note:** Version bump only for package @fast-crud/fs-admin-antdv
+
+## [1.16.8](https://github.com/fast-crud/fast-crud/compare/v1.16.7...v1.16.8) (2023-09-03)
+
+### Performance Improvements
+
+* 翻页后自动滚动到顶部 ([a6e5f67](https://github.com/fast-crud/fast-crud/commit/a6e5f6740a59780995283c7d787864fdd65f0d4b))
+
## [1.16.7](https://github.com/fast-crud/fast-crud/compare/v1.16.6...v1.16.7) (2023-08-21)
**Note:** Version bump only for package @fast-crud/fs-admin-antdv
diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json
index 53ce24cf1..7122532be 100644
--- a/packages/ui/certd-client/package.json
+++ b/packages/ui/certd-client/package.json
@@ -1,6 +1,6 @@
{
"name": "@fast-crud/fs-admin-antdv",
- "version": "1.16.7",
+ "version": "1.16.11",
"private": true,
"scripts": {
"dev": "vite",
@@ -26,10 +26,10 @@
"@ant-design/icons-vue": "^6.1.0",
"@aws-sdk/client-s3": "^3.383.0",
"@aws-sdk/s3-request-presigner": "^3.383.0",
- "@fast-crud/fast-crud": "^1.16.7",
- "@fast-crud/fast-extends": "^1.16.7",
- "@fast-crud/ui-antdv": "^1.16.7",
- "@fast-crud/ui-interface": "^1.16.7",
+ "@fast-crud/fast-crud": "^1.16.11",
+ "@fast-crud/fast-extends": "^1.16.11",
+ "@fast-crud/ui-antdv": "^1.16.11",
+ "@fast-crud/ui-interface": "^1.16.11",
"@iconify/iconify": "^3.1.1",
"@iconify/json": "^2.2.98",
"@purge-icons/generated": "^0.9.0",
diff --git a/packages/ui/certd-client/src/plugin/fast-crud/index.tsx b/packages/ui/certd-client/src/plugin/fast-crud/index.tsx
index 6429aa392..981f3e8b1 100644
--- a/packages/ui/certd-client/src/plugin/fast-crud/index.tsx
+++ b/packages/ui/certd-client/src/plugin/fast-crud/index.tsx
@@ -1,7 +1,7 @@
import { request, requestForMock } from "/src/api/service";
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";
+import { FsExtendsCopyable, FsExtendsEditor, FsExtendsJson, FsExtendsTime, FsExtendsUploader, FsUploaderS3SignedUrlType } from "@fast-crud/fast-extends";
import "@fast-crud/fast-extends/dist/style.css";
import UiAntdv from "@fast-crud/ui-antdv";
import _ from "lodash-es";
@@ -209,8 +209,8 @@ function install(app: any, options: any = {}) {
}
},
//预签名配置,向后端获取上传的预签名连接
- async getSignedUrl(bucket: string, key: string, options: any) {
- return await GetSignedUrl(bucket, key, "put");
+ async getSignedUrl(bucket: string, key: string, options: any, type: FsUploaderS3SignedUrlType) {
+ return await GetSignedUrl(bucket, key, type);
},
successHandle(ret: any) {
// 上传完成后可以在此处处理结果,修改url什么的
diff --git a/packages/ui/certd-client/src/router/source/modules/crud.ts b/packages/ui/certd-client/src/router/source/modules/crud.ts
index 67bac1285..98fa69a48 100644
--- a/packages/ui/certd-client/src/router/source/modules/crud.ts
+++ b/packages/ui/certd-client/src/router/source/modules/crud.ts
@@ -293,6 +293,12 @@ export const crudResources = [
name: "ComponentJson",
path: "/crud/component/json",
component: "/crud/component/json/index.vue"
+ },
+ {
+ title: "组件独立使用",
+ name: "ComponentIndependent",
+ path: "/crud/component/independent",
+ component: "/crud/component/independent/index.vue"
}
]
},
diff --git a/packages/ui/certd-client/src/views/crud/component/independent/index.vue b/packages/ui/certd-client/src/views/crud/component/independent/index.vue
new file mode 100644
index 000000000..8db10b430
--- /dev/null
+++ b/packages/ui/certd-client/src/views/crud/component/independent/index.vue
@@ -0,0 +1,109 @@
+
+
+
+ 独立使用组件
+
+
+
+
+
+
+
diff --git a/packages/ui/certd-client/src/views/crud/feature/export/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/export/crud.tsx
index d14dedd4d..75b159cb7 100644
--- a/packages/ui/certd-client/src/views/crud/feature/export/crud.tsx
+++ b/packages/ui/certd-client/src/views/crud/feature/export/crud.tsx
@@ -1,7 +1,7 @@
import * as api from "./api";
import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
-import { Modal } from "ant-design-vue";
import dayjs from "dayjs";
+
export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
const pageRequest = async (query: UserPageQuery): Promise => {
return await api.GetList(query);
@@ -44,6 +44,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
},
fileType: context.fileType, //导出类型为excel
dataFrom: context.dataFrom, //search查询获取, local 当前页数据
+ //仅导出显示的列
+ onlyShow: true,
searchParams: {
//查询条件
page: {
diff --git a/packages/ui/certd-client/src/views/crud/form/base/crud.tsx b/packages/ui/certd-client/src/views/crud/form/base/crud.tsx
index ea9124650..2c39fb0fe 100644
--- a/packages/ui/certd-client/src/views/crud/form/base/crud.tsx
+++ b/packages/ui/certd-client/src/views/crud/form/base/crud.tsx
@@ -1,7 +1,9 @@
import * as api from "./api";
import { message } from "ant-design-vue";
import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, EditReq, FormWrapperContext, ScopeContext, UserPageQuery, UserPageRes, utils } from "@fast-crud/fast-crud";
-export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+import { computed } from "vue";
+
+export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
const pageRequest = async (query: UserPageQuery): Promise => {
return await api.GetList(query);
};
@@ -16,6 +18,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
const addRequest = async ({ form }: AddReq) => {
return await api.AddObj(form);
};
+
return {
crudOptions: {
request: {
@@ -25,6 +28,22 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
delRequest
},
form: {
+ labelCol: {
+ //固定label宽度
+ span: null,
+ style: {
+ width: computed(() => {
+ return context.labelWidthRef.value + "px";
+ })
+ }
+ },
+ afterSubmit(context) {
+ // context.res 是add或update请求返回结果
+ if (context.form.id === 1) {
+ message.error("模拟保存失败,阻止弹窗关闭");
+ throw new Error("模拟失败,阻止弹窗关闭");
+ }
+ },
wrapper: {
buttons: {
ok: {
@@ -34,9 +53,16 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
text: "自定义按钮",
click: async (context: FormWrapperContext) => {
utils.logger.info("btn context", context);
- message.info({ content: "通过自定义按钮,触发保存" });
+ message.info("通过自定义按钮,触发保存");
await context.submit();
- message.info({ content: "保存成功" });
+ message.info("保存成功");
+ }
+ },
+ customClose: {
+ text: "自定义关闭",
+ color: "red",
+ click: async (context: FormWrapperContext) => {
+ context.close();
}
}
}
diff --git a/packages/ui/certd-client/src/views/crud/form/base/index.vue b/packages/ui/certd-client/src/views/crud/form/base/index.vue
index 3b72c2a53..dcb96c89a 100644
--- a/packages/ui/certd-client/src/views/crud/form/base/index.vue
+++ b/packages/ui/certd-client/src/views/crud/form/base/index.vue
@@ -1,21 +1,32 @@
+
+ 基本表单
+
-
-
+
+