From 56a1f8158a9aba82fcf1c6849ad23fd019e06778 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <xiaojunnuo@qq.com>
Date: Thu, 21 Mar 2024 19:24:00 +0000
Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=94=B1:=20[client]=20sync=20upgrade?=
 =?UTF-8?q?=20with=203=20commits=20[trident-sync]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

build: publish success
chore:
---
 packages/ui/certd-client/CHANGELOG.md                  |  4 ++++
 packages/ui/certd-client/package.json                  | 10 +++++-----
 .../ui/certd-client/src/views/framework/error/404.vue  |  2 ++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md
index b23a01db..1f19258f 100644
--- a/packages/ui/certd-client/CHANGELOG.md
+++ b/packages/ui/certd-client/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.20.2](https://github.com/fast-crud/fast-crud/compare/v1.20.1...v1.20.2) (2024-03-21)
+
+**Note:** Version bump only for package @fast-crud/fs-admin-antdv
+
 ## [1.20.1](https://github.com/fast-crud/fast-crud/compare/v1.20.0...v1.20.1) (2024-02-27)
 
 **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 51ad88d8..723bc0f0 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.20.1",
+  "version": "1.20.2",
   "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.20.1",
-    "@fast-crud/fast-extends": "^1.20.1",
-    "@fast-crud/ui-antdv": "^1.20.1",
-    "@fast-crud/ui-interface": "^1.20.1",
+    "@fast-crud/fast-crud": "^1.20.2",
+    "@fast-crud/fast-extends": "^1.20.2",
+    "@fast-crud/ui-antdv": "^1.20.2",
+    "@fast-crud/ui-interface": "^1.20.2",
     "@iconify/iconify": "^3.1.1",
     "@iconify/json": "^2.2.98",
     "@iconify/vue": "^4.1.1",
diff --git a/packages/ui/certd-client/src/views/framework/error/404.vue b/packages/ui/certd-client/src/views/framework/error/404.vue
index 7191e656..395bfd0c 100644
--- a/packages/ui/certd-client/src/views/framework/error/404.vue
+++ b/packages/ui/certd-client/src/views/framework/error/404.vue
@@ -8,9 +8,11 @@
 
 <script lang="ts">
 export default {
+  // eslint-disable-next-line vue/multi-word-component-names
   name: "Exception404",
   methods: {
     toHome() {
+      //@ts-ignore
       this.$router.push({ path: "/" });
     }
   }

From 33fb1a6bf336c5d498ddafbe9eff66bd709365a8 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <xiaojunnuo@qq.com>
Date: Fri, 10 May 2024 19:23:53 +0000
Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=94=B1:=20[client]=20sync=20upgrade?=
 =?UTF-8?q?=20with=202=20commits=20[trident-sync]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

docs: 修改依赖增加workspace:
---
 packages/ui/certd-client/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json
index 723bc0f0..97f0338b 100644
--- a/packages/ui/certd-client/package.json
+++ b/packages/ui/certd-client/package.json
@@ -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.20.2",
-    "@fast-crud/fast-extends": "^1.20.2",
-    "@fast-crud/ui-antdv": "^1.20.2",
-    "@fast-crud/ui-interface": "^1.20.2",
+    "@fast-crud/fast-crud": "workspace:^1.20.2",
+    "@fast-crud/fast-extends": "workspace:^1.20.2",
+    "@fast-crud/ui-antdv": "workspace:^1.20.2",
+    "@fast-crud/ui-interface": "workspace:^1.20.2",
     "@iconify/iconify": "^3.1.1",
     "@iconify/json": "^2.2.98",
     "@iconify/vue": "^4.1.1",

From f932e553b072b76c2954dd92da4a807c46d005ec Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <xiaojunnuo@qq.com>
Date: Thu, 30 May 2024 19:23:48 +0000
Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=94=B1:=20[client]=20sync=20upgrade?=
 =?UTF-8?q?=20with=202=20commits=20[trident-sync]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

chore: pnpm workspace问题优化
---
 packages/ui/certd-client/.npmrc       | 2 ++
 packages/ui/certd-client/package.json | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 packages/ui/certd-client/.npmrc

diff --git a/packages/ui/certd-client/.npmrc b/packages/ui/certd-client/.npmrc
new file mode 100644
index 00000000..beae5694
--- /dev/null
+++ b/packages/ui/certd-client/.npmrc
@@ -0,0 +1,2 @@
+link-workspace-packages=deep
+prefer-workspace-packages=true
diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json
index 97f0338b..723bc0f0 100644
--- a/packages/ui/certd-client/package.json
+++ b/packages/ui/certd-client/package.json
@@ -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": "workspace:^1.20.2",
-    "@fast-crud/fast-extends": "workspace:^1.20.2",
-    "@fast-crud/ui-antdv": "workspace:^1.20.2",
-    "@fast-crud/ui-interface": "workspace:^1.20.2",
+    "@fast-crud/fast-crud": "^1.20.2",
+    "@fast-crud/fast-extends": "^1.20.2",
+    "@fast-crud/ui-antdv": "^1.20.2",
+    "@fast-crud/ui-interface": "^1.20.2",
     "@iconify/iconify": "^3.1.1",
     "@iconify/json": "^2.2.98",
     "@iconify/vue": "^4.1.1",

From 91fd80d44ffb971987741271a71c06530a442ec6 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <xiaojunnuo@qq.com>
Date: Sat, 8 Jun 2024 19:24:01 +0000
Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=94=B1:=20[client]=20sync=20upgrade?=
 =?UTF-8?q?=20with=203=20commits=20[trident-sync]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

perf: alioss getAuthorization接口支持后台返回key

https://github.com/fast-crud/fast-crud/issues/405
fix: edit-wang 改成edit-wang5

https://github.com/fast-crud/fast-crud/issues/409
---
 packages/ui/certd-client/src/plugin/fast-crud/index.tsx      | 5 +++--
 .../ui/certd-client/src/views/crud/form/new-page/crud.tsx    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

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 cb17f405..3bf4753f 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, FsUploaderS3SignedUrlType } from "@fast-crud/fast-extends";
+import { FsExtendsCopyable, FsExtendsEditor, FsExtendsJson, FsExtendsTime, FsExtendsUploader, FsUploaderAliossSTS, FsUploaderGetAuthContext, 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";
@@ -131,7 +131,7 @@ function install(app: any, options: any = {}) {
       region: "ap-guangzhou",
       secretId: "", //
       secretKey: "", // 传了secretKey 和secretId 代表使用本地签名模式（不安全，生产环境不推荐）
-      async getAuthorization(custom: any) {
+      async getAuthorization(context: FsUploaderGetAuthContext): Promise<FsUploaderAliossSTS> {
         // 不传secretKey代表使用临时签名模式,此时此参数必传（安全，生产环境推荐）
         const ret = request({
           url: "http://www.docmirror.cn:7070/api/upload/cos/getAuthorization",
@@ -143,6 +143,7 @@ function install(app: any, options: any = {}) {
         //   TmpSecretKey,
         //   XCosSecurityToken,
         //   ExpiredTime, // SDK 在 ExpiredTime 时间前，不会再次调用 getAuthorization
+        //   key //【可选】后台生成的文件key，如果不传则用前端自己生成的key
         // }
         return ret;
       },
diff --git a/packages/ui/certd-client/src/views/crud/form/new-page/crud.tsx b/packages/ui/certd-client/src/views/crud/form/new-page/crud.tsx
index 32a97cdd..ab1058b7 100644
--- a/packages/ui/certd-client/src/views/crud/form/new-page/crud.tsx
+++ b/packages/ui/certd-client/src/views/crud/form/new-page/crud.tsx
@@ -78,7 +78,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
         },
         content: {
           title: "详情",
-          type: ["editor-wang", "colspan"],
+          type: ["editor-wang5", "colspan"],
           form: {
             itemProps: { labelWidth: "0px" }
           }

From 9caa4cd1d4eda6ca90c5e54cd8b442fe0d4729af Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <xiaojunnuo@qq.com>
Date: Sun, 9 Jun 2024 19:23:54 +0000
Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=94=B1:=20[client]=20sync=20upgrade?=
 =?UTF-8?q?=20with=203=20commits=20[trident-sync]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

build: publish success
fix: 修复三级以上路由页面无法缓存的问题

https://github.com/fast-crud/fast-crud/issues/394
---
 packages/ui/certd-client/CHANGELOG.md        | 10 ++++++++++
 packages/ui/certd-client/package.json        | 10 +++++-----
 packages/ui/certd-client/src/router/index.ts |  5 ++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md
index 1f19258f..12b9f2bf 100644
--- a/packages/ui/certd-client/CHANGELOG.md
+++ b/packages/ui/certd-client/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.21.0](https://github.com/fast-crud/fast-crud/compare/v1.20.2...v1.21.0) (2024-06-08)
+
+### Bug Fixes
+
+* 修复图片裁剪按钮上下和左右相反的bug ([c62b8d4](https://github.com/fast-crud/fast-crud/commit/c62b8d42371364b4e50d7289055ba2adfdff05aa))
+
+### Performance Improvements
+
+* fs-dict-tree支持插槽 ([fca02f9](https://github.com/fast-crud/fast-crud/commit/fca02f9f6bb3b027ef39b7366c205ffbf3620dd8))
+
 ## [1.20.2](https://github.com/fast-crud/fast-crud/compare/v1.20.1...v1.20.2) (2024-03-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 723bc0f0..929dc5bc 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.20.2",
+  "version": "1.21.0",
   "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.20.2",
-    "@fast-crud/fast-extends": "^1.20.2",
-    "@fast-crud/ui-antdv": "^1.20.2",
-    "@fast-crud/ui-interface": "^1.20.2",
+    "@fast-crud/fast-crud": "^1.21.0",
+    "@fast-crud/fast-extends": "^1.21.0",
+    "@fast-crud/ui-antdv": "^1.21.0",
+    "@fast-crud/ui-interface": "^1.21.0",
     "@iconify/iconify": "^3.1.1",
     "@iconify/json": "^2.2.98",
     "@iconify/vue": "^4.1.1",
diff --git a/packages/ui/certd-client/src/router/index.ts b/packages/ui/certd-client/src/router/index.ts
index c57cf102..ed537241 100644
--- a/packages/ui/certd-client/src/router/index.ts
+++ b/packages/ui/certd-client/src/router/index.ts
@@ -18,7 +18,10 @@ const router = createRouter({
 router.beforeEach(async (to, from, next) => {
   // 进度条
   NProgress.start();
-
+  // 修复三级以上路由页面无法缓存的问题
+  if (to.matched && to.matched.length > 2) {
+    to.matched.splice(1, to.matched.length - 2);
+  }
   // 验证当前路由所有的匹配中是否需要有登录验证的
   if (
     to.matched.some((r) => {