From 263b0fa455ba5ed51d188a2d70e02e42c8645b4d Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <xiaojunnuo@qq.com>
Date: Sun, 12 Mar 2023 19:23:59 +0000
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=B1:=20[client]=20sync=20upgrade=20wit?=
 =?UTF-8?q?h=206=20commits=20[trident-sync]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge remote-tracking branch 'origin/main'
refactor: fsRefValue初步
refactor: deploy
Merge remote-tracking branch 'origin/main'
refactor: 1.10.0
---
 packages/ui/certd-client/package.json         |  3 ++-
 .../crud/basis/compute/{api.js => api.ts}     | 10 ++++----
 .../crud/basis/compute/{crud.jsx => crud.tsx} | 14 +++++------
 .../src/views/crud/basis/compute/index.vue    | 23 +++++--------------
 .../crud/basis/compute/{mock.js => mock.ts}   |  0
 5 files changed, 20 insertions(+), 30 deletions(-)
 rename packages/ui/certd-client/src/views/crud/basis/compute/{api.js => api.ts} (76%)
 rename packages/ui/certd-client/src/views/crud/basis/compute/{crud.jsx => crud.tsx} (91%)
 rename packages/ui/certd-client/src/views/crud/basis/compute/{mock.js => mock.ts} (100%)

diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json
index 5dbec96ff..199b9cb45 100644
--- a/packages/ui/certd-client/package.json
+++ b/packages/ui/certd-client/package.json
@@ -22,6 +22,7 @@
   "dependencies": {
     "@ant-design/colors": "^7.0.0",
     "@ant-design/icons-vue": "^6.1.0",
+    "@aws-sdk/client-s3": "^3.288.0",
     "@aws-sdk/s3-request-presigner": "^3.288.0",
     "@fast-crud/fast-crud": "^1.10.0",
     "@fast-crud/fast-extends": "^1.10.0",
@@ -40,7 +41,7 @@
     "cos-js-sdk-v5": "^1.4.16",
     "cropperjs": "^1.5.13",
     "dayjs": "^1.11.7",
-    "deepdash-es": "5.3.9",
+    "deepdash-es": "5.3.5",
     "highlight.js": "^11.7.0",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
diff --git a/packages/ui/certd-client/src/views/crud/basis/compute/api.js b/packages/ui/certd-client/src/views/crud/basis/compute/api.ts
similarity index 76%
rename from packages/ui/certd-client/src/views/crud/basis/compute/api.js
rename to packages/ui/certd-client/src/views/crud/basis/compute/api.ts
index c8ec9fc8e..0404b55db 100644
--- a/packages/ui/certd-client/src/views/crud/basis/compute/api.js
+++ b/packages/ui/certd-client/src/views/crud/basis/compute/api.ts
@@ -1,7 +1,7 @@
 import { requestForMock } from "/src/api/service";
 const request = requestForMock;
 const apiPrefix = "/mock/FormCompute";
-export function GetList(query) {
+export function GetList(query: any) {
   return request({
     url: apiPrefix + "/page",
     method: "get",
@@ -9,7 +9,7 @@ export function GetList(query) {
   });
 }
 
-export function AddObj(obj) {
+export function AddObj(obj: any) {
   return request({
     url: apiPrefix + "/add",
     method: "post",
@@ -17,7 +17,7 @@ export function AddObj(obj) {
   });
 }
 
-export function UpdateObj(obj) {
+export function UpdateObj(obj: any) {
   return request({
     url: apiPrefix + "/update",
     method: "post",
@@ -25,7 +25,7 @@ export function UpdateObj(obj) {
   });
 }
 
-export function DelObj(id) {
+export function DelObj(id: any) {
   return request({
     url: apiPrefix + "/delete",
     method: "post",
@@ -33,7 +33,7 @@ export function DelObj(id) {
   });
 }
 
-export function GetObj(id) {
+export function GetObj(id: any) {
   return request({
     url: apiPrefix + "/info",
     method: "get",
diff --git a/packages/ui/certd-client/src/views/crud/basis/compute/crud.jsx b/packages/ui/certd-client/src/views/crud/basis/compute/crud.tsx
similarity index 91%
rename from packages/ui/certd-client/src/views/crud/basis/compute/crud.jsx
rename to packages/ui/certd-client/src/views/crud/basis/compute/crud.tsx
index 4a6eef3a6..9654609c0 100644
--- a/packages/ui/certd-client/src/views/crud/basis/compute/crud.jsx
+++ b/packages/ui/certd-client/src/views/crud/basis/compute/crud.tsx
@@ -1,22 +1,22 @@
 import * as api from "./api";
 import { requestForMock } from "/src/api/service";
-import { useCompute } from "@fast-crud/fast-crud";
+import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, EditReq, useCompute, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { message } from "ant-design-vue";
 import { ref, computed } from "vue";
 const { asyncCompute, compute } = useCompute();
-export default function ({ expose }) {
-  const pageRequest = async (query) => {
+export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+  const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
     return await api.GetList(query);
   };
-  const editRequest = async ({ form, row }) => {
+  const editRequest = async ({ form, row }: EditReq) => {
     form.id = row.id;
     return await api.UpdateObj(form);
   };
-  const delRequest = async ({ row }) => {
+  const delRequest = async ({ row }: DelReq) => {
     return await api.DelObj(row.id);
   };
 
-  const addRequest = async ({ form }) => {
+  const addRequest = async ({ form }: AddReq) => {
     return await api.AddObj(form);
   };
 
@@ -172,7 +172,7 @@ export default function ({ expose }) {
               vModel: "value",
               placeholder: "异步计算远程获取options",
               options: asyncCompute({
-                watch({ form }) {
+                watch({ form }: any) {
                   return form.compute;
                 },
                 async asyncFn(watchValue) {
diff --git a/packages/ui/certd-client/src/views/crud/basis/compute/index.vue b/packages/ui/certd-client/src/views/crud/basis/compute/index.vue
index 2e3780b44..79bcab150 100644
--- a/packages/ui/certd-client/src/views/crud/basis/compute/index.vue
+++ b/packages/ui/certd-client/src/views/crud/basis/compute/index.vue
@@ -24,30 +24,19 @@
   </fs-page>
 </template>
 
-<script>
-import { defineComponent, ref, onMounted } from "vue";
-import { useCrud, useExpose } from "@fast-crud/fast-crud";
+<script lang="ts">
+import {defineComponent, onMounted} from "vue";
+import {useFs} from "@fast-crud/fast-crud";
 import createCrudOptions from "./crud";
+
 export default defineComponent({
   name: "BasisCompute",
   setup() {
-    // crud组件的ref
-    const crudRef = ref();
-    // crud 配置的ref
-    const crudBinding = ref();
-    // 暴露的方法
-    const { expose } = useExpose({ crudRef, crudBinding });
-    // 你的crud配置
-    const { crudOptions, output } = createCrudOptions({ expose });
-    // 初始化crud配置
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars,no-unused-vars
-    const { resetCrudOptions } = useCrud({ expose, crudOptions });
-    // 你可以调用此方法，重新初始化crud配置
-    // resetCrudOptions(options)
+    const { crudBinding, crudRef, crudExpose, output } = useFs({ createCrudOptions });
 
     // 页面打开后获取列表数据
     onMounted(() => {
-      expose.doRefresh();
+      crudExpose.doRefresh();
     });
 
     return {
diff --git a/packages/ui/certd-client/src/views/crud/basis/compute/mock.js b/packages/ui/certd-client/src/views/crud/basis/compute/mock.ts
similarity index 100%
rename from packages/ui/certd-client/src/views/crud/basis/compute/mock.js
rename to packages/ui/certd-client/src/views/crud/basis/compute/mock.ts