From 282f8b4e02277c1699323503cb8c33572cbfe97a Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot Date: Thu, 23 Nov 2023 19:24:19 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=B1:=20[client]=20sync=20upgrade=20wit?= =?UTF-8?q?h=205=20commits=20[trident-sync]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit chore: chore: chore: editRequest 判断form.id不为空 chore: --- packages/ui/certd-client/src/mock/base.ts | 7 +- .../src/router/source/modules/crud.ts | 8 +- .../src/views/crud/advanced/big-data/crud.tsx | 4 +- .../views/crud/advanced/from-backend/crud.tsx | 4 +- .../crud/advanced/in-dialog/crud/crud.tsx | 4 +- .../src/views/crud/advanced/linkage/crud.tsx | 4 +- .../crud/advanced/local-pagination/crud.tsx | 4 +- .../crud/advanced/nest/aside-table/crud.tsx | 4 +- .../src/views/crud/advanced/nest/crud.tsx | 4 +- .../crud/advanced/nest/sub-table/crud.tsx | 4 +- .../crud/basis/column-merge-plugin/crud.tsx | 4 +- .../src/views/crud/basis/columns-set/crud.tsx | 4 +- .../views/crud/basis/compute-more/crud.tsx | 4 +- .../src/views/crud/basis/compute/crud.tsx | 4 +- .../src/views/crud/basis/custom/crud.tsx | 4 +- .../src/views/crud/basis/first/crud.ts | 4 +- .../src/views/crud/basis/i18n/crud.tsx | 4 +- .../src/views/crud/basis/layout-card/crud.tsx | 4 +- .../views/crud/basis/layout-custom/crud.tsx | 4 +- .../src/views/crud/basis/reset/crud.tsx | 4 +- .../views/crud/basis/value-change/crud.tsx | 4 +- .../src/views/crud/component/button/crud.tsx | 4 +- .../views/crud/component/cascader/crud.tsx | 4 +- .../views/crud/component/checkbox/crud.tsx | 4 +- .../src/views/crud/component/date/crud.tsx | 4 +- .../src/views/crud/component/editor/crud.tsx | 4 +- .../src/views/crud/component/icon/crud.tsx | 4 +- .../src/views/crud/component/json/crud.tsx | 4 +- .../src/views/crud/component/number/crud.tsx | 4 +- .../src/views/crud/component/radio/crud.tsx | 4 +- .../src/views/crud/component/select/crud.tsx | 4 +- .../src/views/crud/component/switch/crud.tsx | 4 +- .../crud/component/table-select/crud.tsx | 4 +- .../src/views/crud/component/text/crud.tsx | 4 +- .../src/views/crud/component/tree/crud.tsx | 4 +- .../crud/component/uploader/alioss/crud.tsx | 4 +- .../crud/component/uploader/cos/crud.tsx | 4 +- .../crud/component/uploader/cropper/crud.tsx | 4 +- .../crud/component/uploader/form/crud.tsx | 4 +- .../crud/component/uploader/qiniu/crud.tsx | 4 +- .../views/crud/component/uploader/s3/crud.tsx | 4 +- .../src/views/crud/debug/crud.tsx | 4 +- .../src/views/crud/dict/cloneable/crud.tsx | 4 +- .../src/views/crud/dict/prototype/crud.tsx | 4 +- .../views/crud/dict/shared/manager/crud.tsx | 4 +- .../src/views/crud/dict/shared/use/crud.tsx | 4 +- .../src/views/crud/dict/single/crud.tsx | 4 +- .../src/views/crud/editable/cell/crud.tsx | 4 +- .../src/views/crud/editable/free/crud.tsx | 4 +- .../src/views/crud/editable/row/crud.tsx | 4 +- .../editable/{vmodel/free => sub-crud}/api.ts | 2 +- .../src/views/crud/editable/sub-crud/crud.tsx | 92 +++++++++++++ .../views/crud/editable/sub-crud/index.vue | 43 +++++++ .../{vmodel/free => sub-crud}/mock.ts | 4 +- .../views/crud/editable/sub-crud/row/api.ts | 50 ++++++++ .../views/crud/editable/sub-crud/row/crud.tsx | 121 ++++++++++++++++++ .../crud/editable/sub-crud/row/index.vue | 104 +++++++++++++++ .../views/crud/editable/sub-crud/row/mock.ts | 22 ++++ .../src/views/crud/editable/vmodel/crud.tsx | 4 +- .../views/crud/editable/vmodel/free/crud.tsx | 18 +-- .../views/crud/feature/column-resize/crud.tsx | 4 +- .../views/crud/feature/column-sort/crud.tsx | 4 +- .../views/crud/feature/columns-set/crud.tsx | 4 +- .../views/crud/feature/editable-row/crud.tsx | 4 +- .../src/views/crud/feature/editable/crud.tsx | 4 +- .../src/views/crud/feature/expand/crud.tsx | 4 +- .../src/views/crud/feature/export/crud.tsx | 4 +- .../src/views/crud/feature/filter/crud.tsx | 4 +- .../src/views/crud/feature/fixed/crud.tsx | 4 +- .../views/crud/feature/header-group/crud.tsx | 4 +- .../src/views/crud/feature/header/crud.tsx | 4 +- .../src/views/crud/feature/height/crud.tsx | 4 +- .../src/views/crud/feature/hide/crud.tsx | 4 +- .../src/views/crud/feature/index/crud.tsx | 4 +- .../src/views/crud/feature/merge/crud.tsx | 4 +- .../src/views/crud/feature/remove/crud.tsx | 4 +- .../views/crud/feature/search-multi/crud.tsx | 4 +- .../src/views/crud/feature/search/crud.tsx | 4 +- .../crud/feature/selection-radio/crud.tsx | 4 +- .../src/views/crud/feature/selection/crud.tsx | 4 +- .../src/views/crud/feature/sortable/crud.tsx | 4 +- .../src/views/crud/feature/tabs/crud.tsx | 4 +- .../src/views/crud/feature/tree/crud.tsx | 4 +- .../views/crud/feature/value-builder/crud.tsx | 4 +- .../src/views/crud/form/base/crud.tsx | 4 +- .../src/views/crud/form/custom-form/crud.tsx | 4 +- .../src/views/crud/form/drawer/crud.tsx | 4 +- .../src/views/crud/form/group-tabs/crud.tsx | 4 +- .../src/views/crud/form/group/crud.tsx | 4 +- .../src/views/crud/form/helper/crud.tsx | 4 +- .../src/views/crud/form/inner/area/crud.tsx | 4 +- .../src/views/crud/form/inner/crud.tsx | 4 +- .../src/views/crud/form/layout-flex/crud.tsx | 4 +- .../src/views/crud/form/layout-grid/crud.tsx | 4 +- .../src/views/crud/form/layout/crud.tsx | 4 +- .../src/views/crud/form/nest/crud.tsx | 4 +- .../src/views/crud/form/new-page/crud.tsx | 4 +- .../src/views/crud/form/render/crud.tsx | 4 +- .../src/views/crud/form/reset/crud.tsx | 4 +- .../views/crud/form/single-column/crud.tsx | 4 +- .../src/views/crud/form/validation/crud.tsx | 4 +- .../src/views/crud/form/view/crud.tsx | 4 +- .../views/crud/row-handle/dropdown/crud.tsx | 4 +- .../views/crud/row-handle/tooltip/crud.tsx | 4 +- .../src/views/crud/slots/cell/crud.tsx | 4 +- .../src/views/crud/slots/form-item/crud.tsx | 4 +- .../src/views/crud/slots/form/crud.tsx | 4 +- .../src/views/crud/slots/layout/crud.tsx | 4 +- .../src/views/crud/slots/search/crud.tsx | 4 +- 109 files changed, 743 insertions(+), 120 deletions(-) rename packages/ui/certd-client/src/views/crud/editable/{vmodel/free => sub-crud}/api.ts (95%) create mode 100644 packages/ui/certd-client/src/views/crud/editable/sub-crud/crud.tsx create mode 100644 packages/ui/certd-client/src/views/crud/editable/sub-crud/index.vue rename packages/ui/certd-client/src/views/crud/editable/{vmodel/free => sub-crud}/mock.ts (78%) create mode 100644 packages/ui/certd-client/src/views/crud/editable/sub-crud/row/api.ts create mode 100644 packages/ui/certd-client/src/views/crud/editable/sub-crud/row/crud.tsx create mode 100644 packages/ui/certd-client/src/views/crud/editable/sub-crud/row/index.vue create mode 100644 packages/ui/certd-client/src/views/crud/editable/sub-crud/row/mock.ts diff --git a/packages/ui/certd-client/src/mock/base.ts b/packages/ui/certd-client/src/mock/base.ts index 7a8cecfa..1ddabc6c 100644 --- a/packages/ui/certd-client/src/mock/base.ts +++ b/packages/ui/certd-client/src/mock/base.ts @@ -2,7 +2,10 @@ import _ from "lodash-es"; function copyList(originList: any, newList: any, options: any, parentId?: any) { for (const item of originList) { const newItem: any = _.cloneDeep(item); - newItem.parentId = parentId; + if(parentId!= null && newItem.parentId == null){ + newItem.parentId = parentId; + } + newItem.id = ++options.idGenerator; newList.push(newItem); if (item.children != null) { @@ -215,7 +218,7 @@ const mockUtil: any = { return { code: 0, msg: "success", - data: req.body.id + data: _.cloneDeep(req.body) }; } }, 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 19216858..950af05d 100644 --- a/packages/ui/certd-client/src/router/source/modules/crud.ts +++ b/packages/ui/certd-client/src/router/source/modules/crud.ts @@ -617,7 +617,7 @@ export const crudResources = [ path: "/crud/editable", redirect: "/crud/editable/free", meta: { - icon: "ion:extension-puzzle-outline" + icon: "ion:create-outline" }, children: [ { @@ -643,6 +643,12 @@ export const crudResources = [ name: "EditableVModel", path: "/crud/editable/vmodel", component: "/crud/editable/vmodel/index.vue" + }, + { + title: "子CRUD", + name: "EditableSubCrud", + path: "/crud/editable/sub-crud", + component: "/crud/editable/sub-crud/index.vue" } ] }, diff --git a/packages/ui/certd-client/src/views/crud/advanced/big-data/crud.tsx b/packages/ui/certd-client/src/views/crud/advanced/big-data/crud.tsx index ddf4ef9e..48ba09cd 100644 --- a/packages/ui/certd-client/src/views/crud/advanced/big-data/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/advanced/big-data/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/advanced/from-backend/crud.tsx b/packages/ui/certd-client/src/views/crud/advanced/from-backend/crud.tsx index 37613382..769ee3c5 100644 --- a/packages/ui/certd-client/src/views/crud/advanced/from-backend/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/advanced/from-backend/crud.tsx @@ -13,7 +13,9 @@ export default async function (props: CreateCrudOptionsProps): Promise { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/advanced/in-dialog/crud/crud.tsx b/packages/ui/certd-client/src/views/crud/advanced/in-dialog/crud/crud.tsx index 9788e26a..b08752a9 100644 --- a/packages/ui/certd-client/src/views/crud/advanced/in-dialog/crud/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/advanced/in-dialog/crud/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/advanced/linkage/crud.tsx b/packages/ui/certd-client/src/views/crud/advanced/linkage/crud.tsx index a18c8cdc..77e1da38 100644 --- a/packages/ui/certd-client/src/views/crud/advanced/linkage/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/advanced/linkage/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/advanced/local-pagination/crud.tsx b/packages/ui/certd-client/src/views/crud/advanced/local-pagination/crud.tsx index 9b9891c6..1ed87a10 100644 --- a/packages/ui/certd-client/src/views/crud/advanced/local-pagination/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/advanced/local-pagination/crud.tsx @@ -37,7 +37,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat }; }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } await api.UpdateObj(form); //更新本地数据 const tableData = localDataRef.value; diff --git a/packages/ui/certd-client/src/views/crud/advanced/nest/aside-table/crud.tsx b/packages/ui/certd-client/src/views/crud/advanced/nest/aside-table/crud.tsx index dc8978da..ddbccd59 100644 --- a/packages/ui/certd-client/src/views/crud/advanced/nest/aside-table/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/advanced/nest/aside-table/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/advanced/nest/crud.tsx b/packages/ui/certd-client/src/views/crud/advanced/nest/crud.tsx index a0fe05b6..efbcb487 100644 --- a/packages/ui/certd-client/src/views/crud/advanced/nest/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/advanced/nest/crud.tsx @@ -8,7 +8,9 @@ export default function ({ crudExpose, context: { asideTableRef } }: CreateCrudO return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/advanced/nest/sub-table/crud.tsx b/packages/ui/certd-client/src/views/crud/advanced/nest/sub-table/crud.tsx index e4fa119b..52a7169c 100644 --- a/packages/ui/certd-client/src/views/crud/advanced/nest/sub-table/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/advanced/nest/sub-table/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose, context: { props, ctx } }: CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/basis/column-merge-plugin/crud.tsx b/packages/ui/certd-client/src/views/crud/basis/column-merge-plugin/crud.tsx index 85019be6..ad9dc9be 100644 --- a/packages/ui/certd-client/src/views/crud/basis/column-merge-plugin/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/basis/column-merge-plugin/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/basis/columns-set/crud.tsx b/packages/ui/certd-client/src/views/crud/basis/columns-set/crud.tsx index f62a9da7..60f2241c 100644 --- a/packages/ui/certd-client/src/views/crud/basis/columns-set/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/basis/columns-set/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/basis/compute-more/crud.tsx b/packages/ui/certd-client/src/views/crud/basis/compute-more/crud.tsx index 73be370e..806bc87e 100644 --- a/packages/ui/certd-client/src/views/crud/basis/compute-more/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/basis/compute-more/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/basis/compute/crud.tsx b/packages/ui/certd-client/src/views/crud/basis/compute/crud.tsx index caf67e0f..ef3db7c1 100644 --- a/packages/ui/certd-client/src/views/crud/basis/compute/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/basis/compute/crud.tsx @@ -10,7 +10,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/basis/custom/crud.tsx b/packages/ui/certd-client/src/views/crud/basis/custom/crud.tsx index 318f5f97..1d3ee4a7 100644 --- a/packages/ui/certd-client/src/views/crud/basis/custom/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/basis/custom/crud.tsx @@ -9,7 +9,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/basis/first/crud.ts b/packages/ui/certd-client/src/views/crud/basis/first/crud.ts index c0ed096a..41e6acf5 100644 --- a/packages/ui/certd-client/src/views/crud/basis/first/crud.ts +++ b/packages/ui/certd-client/src/views/crud/basis/first/crud.ts @@ -5,7 +5,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/basis/i18n/crud.tsx b/packages/ui/certd-client/src/views/crud/basis/i18n/crud.tsx index 48d9c48b..1cc13c44 100644 --- a/packages/ui/certd-client/src/views/crud/basis/i18n/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/basis/i18n/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/basis/layout-card/crud.tsx b/packages/ui/certd-client/src/views/crud/basis/layout-card/crud.tsx index 0036ab86..d768ca8a 100644 --- a/packages/ui/certd-client/src/views/crud/basis/layout-card/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/basis/layout-card/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/basis/layout-custom/crud.tsx b/packages/ui/certd-client/src/views/crud/basis/layout-custom/crud.tsx index af9062dd..29fbe63f 100644 --- a/packages/ui/certd-client/src/views/crud/basis/layout-custom/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/basis/layout-custom/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/basis/reset/crud.tsx b/packages/ui/certd-client/src/views/crud/basis/reset/crud.tsx index 07f81503..1a83d2be 100644 --- a/packages/ui/certd-client/src/views/crud/basis/reset/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/basis/reset/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/basis/value-change/crud.tsx b/packages/ui/certd-client/src/views/crud/basis/value-change/crud.tsx index 975ea76d..65990784 100644 --- a/packages/ui/certd-client/src/views/crud/basis/value-change/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/basis/value-change/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/component/button/crud.tsx b/packages/ui/certd-client/src/views/crud/component/button/crud.tsx index 94385795..03ca4bb3 100644 --- a/packages/ui/certd-client/src/views/crud/component/button/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/button/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/component/cascader/crud.tsx b/packages/ui/certd-client/src/views/crud/component/cascader/crud.tsx index fa2aa0a2..c9f5a1be 100644 --- a/packages/ui/certd-client/src/views/crud/component/cascader/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/cascader/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/component/checkbox/crud.tsx b/packages/ui/certd-client/src/views/crud/component/checkbox/crud.tsx index a35838dd..7741e2e8 100644 --- a/packages/ui/certd-client/src/views/crud/component/checkbox/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/checkbox/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/component/date/crud.tsx b/packages/ui/certd-client/src/views/crud/component/date/crud.tsx index 3e241355..052caa7d 100644 --- a/packages/ui/certd-client/src/views/crud/component/date/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/date/crud.tsx @@ -8,7 +8,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/component/editor/crud.tsx b/packages/ui/certd-client/src/views/crud/component/editor/crud.tsx index 3fcd7e02..c88a7034 100644 --- a/packages/ui/certd-client/src/views/crud/component/editor/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/editor/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/component/icon/crud.tsx b/packages/ui/certd-client/src/views/crud/component/icon/crud.tsx index c8b55f0d..2ede7c46 100644 --- a/packages/ui/certd-client/src/views/crud/component/icon/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/icon/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/component/json/crud.tsx b/packages/ui/certd-client/src/views/crud/component/json/crud.tsx index b2753af4..b57abafb 100644 --- a/packages/ui/certd-client/src/views/crud/component/json/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/json/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/component/number/crud.tsx b/packages/ui/certd-client/src/views/crud/component/number/crud.tsx index 61c755bc..a72f88bc 100644 --- a/packages/ui/certd-client/src/views/crud/component/number/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/number/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/component/radio/crud.tsx b/packages/ui/certd-client/src/views/crud/component/radio/crud.tsx index a78acdbd..53eb38fe 100644 --- a/packages/ui/certd-client/src/views/crud/component/radio/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/radio/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/component/select/crud.tsx b/packages/ui/certd-client/src/views/crud/component/select/crud.tsx index 8dbed6ad..d34c21bd 100644 --- a/packages/ui/certd-client/src/views/crud/component/select/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/select/crud.tsx @@ -46,7 +46,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/component/switch/crud.tsx b/packages/ui/certd-client/src/views/crud/component/switch/crud.tsx index 278283fa..ea7d9285 100644 --- a/packages/ui/certd-client/src/views/crud/component/switch/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/switch/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/component/table-select/crud.tsx b/packages/ui/certd-client/src/views/crud/component/table-select/crud.tsx index acfaaa01..4b4e8067 100644 --- a/packages/ui/certd-client/src/views/crud/component/table-select/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/table-select/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/component/text/crud.tsx b/packages/ui/certd-client/src/views/crud/component/text/crud.tsx index 46be924d..7579faaf 100644 --- a/packages/ui/certd-client/src/views/crud/component/text/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/text/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/component/tree/crud.tsx b/packages/ui/certd-client/src/views/crud/component/tree/crud.tsx index 8a3300ec..b2e41d1d 100644 --- a/packages/ui/certd-client/src/views/crud/component/tree/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/tree/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/component/uploader/alioss/crud.tsx b/packages/ui/certd-client/src/views/crud/component/uploader/alioss/crud.tsx index 762f2156..0cfb0a57 100644 --- a/packages/ui/certd-client/src/views/crud/component/uploader/alioss/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/uploader/alioss/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/component/uploader/cos/crud.tsx b/packages/ui/certd-client/src/views/crud/component/uploader/cos/crud.tsx index bd20eb7d..a0f8b7e5 100644 --- a/packages/ui/certd-client/src/views/crud/component/uploader/cos/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/uploader/cos/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/component/uploader/cropper/crud.tsx b/packages/ui/certd-client/src/views/crud/component/uploader/cropper/crud.tsx index fe827fd4..d7cb5ca3 100644 --- a/packages/ui/certd-client/src/views/crud/component/uploader/cropper/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/uploader/cropper/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/component/uploader/form/crud.tsx b/packages/ui/certd-client/src/views/crud/component/uploader/form/crud.tsx index de50d636..87911332 100644 --- a/packages/ui/certd-client/src/views/crud/component/uploader/form/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/uploader/form/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/component/uploader/qiniu/crud.tsx b/packages/ui/certd-client/src/views/crud/component/uploader/qiniu/crud.tsx index 6e3d0f88..5f35c224 100644 --- a/packages/ui/certd-client/src/views/crud/component/uploader/qiniu/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/uploader/qiniu/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/component/uploader/s3/crud.tsx b/packages/ui/certd-client/src/views/crud/component/uploader/s3/crud.tsx index e0f7be51..936c99d2 100644 --- a/packages/ui/certd-client/src/views/crud/component/uploader/s3/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/uploader/s3/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/debug/crud.tsx b/packages/ui/certd-client/src/views/crud/debug/crud.tsx index a919fec8..bbb1f4c6 100644 --- a/packages/ui/certd-client/src/views/crud/debug/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/debug/crud.tsx @@ -8,7 +8,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/dict/cloneable/crud.tsx b/packages/ui/certd-client/src/views/crud/dict/cloneable/crud.tsx index 72442e3a..b60884f1 100644 --- a/packages/ui/certd-client/src/views/crud/dict/cloneable/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/dict/cloneable/crud.tsx @@ -5,7 +5,9 @@ export default function createCrudOptions({}: CreateCrudOptionsProps): CreateCru return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/dict/prototype/crud.tsx b/packages/ui/certd-client/src/views/crud/dict/prototype/crud.tsx index e31ad7ef..6a9f7c45 100644 --- a/packages/ui/certd-client/src/views/crud/dict/prototype/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/dict/prototype/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/dict/shared/manager/crud.tsx b/packages/ui/certd-client/src/views/crud/dict/shared/manager/crud.tsx index 5cceb4bb..d813167e 100644 --- a/packages/ui/certd-client/src/views/crud/dict/shared/manager/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/dict/shared/manager/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/dict/shared/use/crud.tsx b/packages/ui/certd-client/src/views/crud/dict/shared/use/crud.tsx index 33d0b214..9f46452e 100644 --- a/packages/ui/certd-client/src/views/crud/dict/shared/use/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/dict/shared/use/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/dict/single/crud.tsx b/packages/ui/certd-client/src/views/crud/dict/single/crud.tsx index a0257edf..6461d3e4 100644 --- a/packages/ui/certd-client/src/views/crud/dict/single/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/dict/single/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/editable/cell/crud.tsx b/packages/ui/certd-client/src/views/crud/editable/cell/crud.tsx index 658d1500..261f2a99 100644 --- a/packages/ui/certd-client/src/views/crud/editable/cell/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/editable/cell/crud.tsx @@ -9,7 +9,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/editable/free/crud.tsx b/packages/ui/certd-client/src/views/crud/editable/free/crud.tsx index 71b20de3..0880535c 100644 --- a/packages/ui/certd-client/src/views/crud/editable/free/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/editable/free/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/editable/row/crud.tsx b/packages/ui/certd-client/src/views/crud/editable/row/crud.tsx index ebdd18ce..ce4741db 100644 --- a/packages/ui/certd-client/src/views/crud/editable/row/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/editable/row/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/editable/vmodel/free/api.ts b/packages/ui/certd-client/src/views/crud/editable/sub-crud/api.ts similarity index 95% rename from packages/ui/certd-client/src/views/crud/editable/vmodel/free/api.ts rename to packages/ui/certd-client/src/views/crud/editable/sub-crud/api.ts index 4d602ee8..22d2a630 100644 --- a/packages/ui/certd-client/src/views/crud/editable/vmodel/free/api.ts +++ b/packages/ui/certd-client/src/views/crud/editable/sub-crud/api.ts @@ -1,6 +1,6 @@ import { requestForMock } from "/src/api/service"; const request = requestForMock; -const apiPrefix = "/mock/EditableFreeSub"; +const apiPrefix = "/mock/EditableSubCrud"; export function GetList(query: any) { return request({ url: apiPrefix + "/page", diff --git a/packages/ui/certd-client/src/views/crud/editable/sub-crud/crud.tsx b/packages/ui/certd-client/src/views/crud/editable/sub-crud/crud.tsx new file mode 100644 index 00000000..c49cadb9 --- /dev/null +++ b/packages/ui/certd-client/src/views/crud/editable/sub-crud/crud.tsx @@ -0,0 +1,92 @@ +import * as api from "./api"; +import { dict, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, UserPageQuery, UserPageRes, EditReq, DelReq, AddReq } from "@fast-crud/fast-crud"; +import EditableRowSub from "/@/views/crud/editable/sub-crud/row/index.vue"; +export default function (props: CreateCrudOptionsProps): CreateCrudOptionsRet { + const { crudBinding,crudRef } = props.crudExpose; + const { crudExpose } = props; + const pageRequest = async (query: UserPageQuery): Promise => { + return await api.GetList(query); + }; + const editRequest = async ({ form, row }: EditReq) => { + if (form.id == null) { + form.id = row.id; + } + return await api.UpdateObj(form); + }; + const delRequest = async ({ row }: DelReq) => { + return await api.DelObj(row.id); + }; + + const addRequest = async ({ form }: AddReq) => { + return await api.AddObj(form); + }; + + return { + crudOptions: { + request: { + pageRequest, + addRequest, + editRequest, + delRequest + }, + form: { + wrapper: { + width: "80%" + }, + }, + columns: { + id: { + title: "ID", + type: "number", + form: { + show: false + }, + column: { width: 80, align: "center" } + }, + radio: { + title: "状态", + search: { show: true }, + type: "dict-radio", + dict: dict({ + url: "/mock/dicts/OpenStatusEnum?single" + }), + form:{ + rules: [{ required: true, message: "请选择状态" }] + } + }, + subTable: { + title: "子表格", + type: "text", + form: { + component: { + name: EditableRowSub, + id:compute(({form})=>{ + return form.id + }), + on:{ + async saveMain({form}){ + //保存主表 + const formRef = crudExpose.getFormRef() + const ret = await formRef.submit() + //将form改为编辑模式 + let formWrapperRef = crudExpose.getFormWrapperRef(); + formWrapperRef.setFormData(ret.res) + crudRef.value.formWrapperRef.formOptions.mode = "edit" + crudRef.value.formWrapperRef.title="编辑" + } + } + }, + col: { + span: 24 + }, + }, + column: { + formatter: ({ row }) => { + return "点击编辑查看子表"; + } + } + } + } + } + }; +} diff --git a/packages/ui/certd-client/src/views/crud/editable/sub-crud/index.vue b/packages/ui/certd-client/src/views/crud/editable/sub-crud/index.vue new file mode 100644 index 00000000..ce78a208 --- /dev/null +++ b/packages/ui/certd-client/src/views/crud/editable/sub-crud/index.vue @@ -0,0 +1,43 @@ + + + diff --git a/packages/ui/certd-client/src/views/crud/editable/vmodel/free/mock.ts b/packages/ui/certd-client/src/views/crud/editable/sub-crud/mock.ts similarity index 78% rename from packages/ui/certd-client/src/views/crud/editable/vmodel/free/mock.ts rename to packages/ui/certd-client/src/views/crud/editable/sub-crud/mock.ts index faff20e7..432236bc 100644 --- a/packages/ui/certd-client/src/views/crud/editable/vmodel/free/mock.ts +++ b/packages/ui/certd-client/src/views/crud/editable/sub-crud/mock.ts @@ -1,12 +1,12 @@ import mockUtil from "/src/mock/base"; const options: any = { - name: "EditableFreeSub", + name: "EditableSubCrud", idGenerator: 0 }; const list = [ { radio: "1", - name: "王强" + subTable: [{ id: 0, name: "王小虎" }] }, { radio: "2" diff --git a/packages/ui/certd-client/src/views/crud/editable/sub-crud/row/api.ts b/packages/ui/certd-client/src/views/crud/editable/sub-crud/row/api.ts new file mode 100644 index 00000000..fd58e2c3 --- /dev/null +++ b/packages/ui/certd-client/src/views/crud/editable/sub-crud/row/api.ts @@ -0,0 +1,50 @@ +import { requestForMock } from "/src/api/service"; +const request = requestForMock; +const apiPrefix = "/mock/EditableSubCrudTarget"; +export function GetList(query: any) { + return request({ + url: apiPrefix + "/page", + method: "get", + data: query + }); +} + +export function AddObj(obj: any) { + return request({ + url: apiPrefix + "/add", + method: "post", + data: obj + }); +} + +export function UpdateObj(obj: any) { + return request({ + url: apiPrefix + "/update", + method: "post", + data: obj + }); +} + +export function DelObj(id: any) { + return request({ + url: apiPrefix + "/delete", + method: "post", + params: { id } + }); +} + +export function GetObj(id: any) { + return request({ + url: apiPrefix + "/get", + method: "get", + params: { id } + }); +} + +export function BatchDelete(ids: any) { + return request({ + url: apiPrefix + "/batchDelete", + method: "post", + data: { ids } + }); +} diff --git a/packages/ui/certd-client/src/views/crud/editable/sub-crud/row/crud.tsx b/packages/ui/certd-client/src/views/crud/editable/sub-crud/row/crud.tsx new file mode 100644 index 00000000..19bf120a --- /dev/null +++ b/packages/ui/certd-client/src/views/crud/editable/sub-crud/row/crud.tsx @@ -0,0 +1,121 @@ +import { + AddReq, + CreateCrudOptionsProps, + CreateCrudOptionsRet, DelReq, + dict, + EditReq, + UserPageQuery, + UserPageRes +} from "@fast-crud/fast-crud"; +import * as api from "./api"; +export default function ({ crudExpose,context }: CreateCrudOptionsProps): CreateCrudOptionsRet { + const { crudBinding } = crudExpose; + const {parentIdRef} = context + const pageRequest = async (query: UserPageQuery): Promise => { + return await api.GetList(query); + }; + const editRequest = async ({ form, row }: EditReq) => { + if (form.id == null) { + form.id = row.id; + } + return await api.UpdateObj(form); + }; + const delRequest = async ({ row }: DelReq) => { + return await api.DelObj(row.id); + }; + + const addRequest = async ({ form }: AddReq) => { + return await api.AddObj(form); + }; + + return { + crudOptions: { + request: { + pageRequest, + addRequest, + editRequest, + delRequest + }, + actionbar: { + buttons: { + add: { + show: false + }, + addRow: { + show: true + } + } + }, + search: { + show: false, + initialForm:{ + parentId:parentIdRef + } + }, + toolbar: { + buttons: { + refresh: { + show: false + } + } + }, + table: { + editable: { + enabled: true, + mode: "row", + activeDefault:false, + } + }, + // pagination: { show: false, pageSize: 9999999 }, + columns: { + id: { + title: "ID", + type: "number", + form: { + show: false + }, + column: { width: 80, align: "center" } + }, + radio: { + title: "状态", + search: { show: true }, + type: "dict-radio", + dict: dict({ + url: "/mock/dicts/OpenStatusEnum?single" + }), + form:{ + value:'1', + } + }, + name: { + title: "姓名", + type: "text", + form: { + rules: [ + { required: true, message: "请输入姓名" }, + { min: 2, max: 10, message: "长度在 2 到 10 个字符" } + ] + } + }, + parentId:{ + title: "父Id", + type: "number", + search:{ + show:true, + }, + form:{ + value:parentIdRef, + component:{ + disabled:true + } + } + }, + createdAt: { + column: { + show: false + } + } + } + } + }; +} diff --git a/packages/ui/certd-client/src/views/crud/editable/sub-crud/row/index.vue b/packages/ui/certd-client/src/views/crud/editable/sub-crud/row/index.vue new file mode 100644 index 00000000..df8b5b93 --- /dev/null +++ b/packages/ui/certd-client/src/views/crud/editable/sub-crud/row/index.vue @@ -0,0 +1,104 @@ + + + diff --git a/packages/ui/certd-client/src/views/crud/editable/sub-crud/row/mock.ts b/packages/ui/certd-client/src/views/crud/editable/sub-crud/row/mock.ts new file mode 100644 index 00000000..b35b22eb --- /dev/null +++ b/packages/ui/certd-client/src/views/crud/editable/sub-crud/row/mock.ts @@ -0,0 +1,22 @@ +import mockUtil from "/src/mock/base"; +const options: any = { + name: "EditableSubCrudTarget", + idGenerator: 0 +}; +const list = [ + { + radio: "1", + name: "张三", + parentId:1 + }, + { + radio: "2", + parentId:2 + }, + { + parentId:3 + }, +]; +options.list = list; +const mock = mockUtil.buildMock(options); +export default mock; diff --git a/packages/ui/certd-client/src/views/crud/editable/vmodel/crud.tsx b/packages/ui/certd-client/src/views/crud/editable/vmodel/crud.tsx index 9dac282f..b91e83e9 100644 --- a/packages/ui/certd-client/src/views/crud/editable/vmodel/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/editable/vmodel/crud.tsx @@ -8,7 +8,9 @@ export default function (props: CreateCrudOptionsProps): CreateCrudOptionsRet { return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/editable/vmodel/free/crud.tsx b/packages/ui/certd-client/src/views/crud/editable/vmodel/free/crud.tsx index 8bd58ca9..96b88d23 100644 --- a/packages/ui/certd-client/src/views/crud/editable/vmodel/free/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/editable/vmodel/free/crud.tsx @@ -1,21 +1,7 @@ -import * as api from "./api"; -import { dict, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, UserPageQuery, UserPageRes, EditReq, DelReq, AddReq } from "@fast-crud/fast-crud"; +import { CreateCrudOptionsProps, CreateCrudOptionsRet, dict } from "@fast-crud/fast-crud"; + export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet { const { crudBinding } = crudExpose; - // const pageRequest = async (query: UserPageQuery): Promise => { - // return await api.GetList(query); - // }; - // const editRequest = async ({ form, row }: EditReq) => { - // form.id = row.id; - // return await api.UpdateObj(form); - // }; - // const delRequest = async ({ row }: DelReq) => { - // return await api.DelObj(row.id); - // }; - // - // const addRequest = async ({ form }: AddReq) => { - // return await api.AddObj(form); - // }; return { crudOptions: { diff --git a/packages/ui/certd-client/src/views/crud/feature/column-resize/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/column-resize/crud.tsx index 788cd89f..6e4b4736 100644 --- a/packages/ui/certd-client/src/views/crud/feature/column-resize/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/column-resize/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/column-sort/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/column-sort/crud.tsx index 11794a54..df885b76 100644 --- a/packages/ui/certd-client/src/views/crud/feature/column-sort/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/column-sort/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/columns-set/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/columns-set/crud.tsx index de504d61..5a38700d 100644 --- a/packages/ui/certd-client/src/views/crud/feature/columns-set/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/columns-set/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/editable-row/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/editable-row/crud.tsx index b7849419..9804f887 100644 --- a/packages/ui/certd-client/src/views/crud/feature/editable-row/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/editable-row/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/editable/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/editable/crud.tsx index 7944f6f9..22105d59 100644 --- a/packages/ui/certd-client/src/views/crud/feature/editable/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/editable/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/expand/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/expand/crud.tsx index 9bb65768..a1a76e6c 100644 --- a/packages/ui/certd-client/src/views/crud/feature/expand/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/expand/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { 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 75b159cb..9c367423 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 @@ -7,7 +7,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/filter/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/filter/crud.tsx index c480e862..b1f76742 100644 --- a/packages/ui/certd-client/src/views/crud/feature/filter/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/filter/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/fixed/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/fixed/crud.tsx index 6cfa0c4f..777b1b6b 100644 --- a/packages/ui/certd-client/src/views/crud/feature/fixed/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/fixed/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/header-group/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/header-group/crud.tsx index 9ac49edf..709ffdf2 100644 --- a/packages/ui/certd-client/src/views/crud/feature/header-group/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/header-group/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/header/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/header/crud.tsx index aafd7fb0..ab293411 100644 --- a/packages/ui/certd-client/src/views/crud/feature/header/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/header/crud.tsx @@ -2,7 +2,9 @@ import * as api from "./api.js"; import { CreateCrudOptionsProps, dict, CreateCrudOptionsRet, EditReq, DelReq, AddReq } from "@fast-crud/fast-crud"; export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet { const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/height/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/height/crud.tsx index 4bf77358..b2d4c4c0 100644 --- a/packages/ui/certd-client/src/views/crud/feature/height/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/height/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/hide/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/hide/crud.tsx index f739203b..44eb9e19 100644 --- a/packages/ui/certd-client/src/views/crud/feature/hide/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/hide/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/index/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/index/crud.tsx index c2d9eb1a..23c180a6 100644 --- a/packages/ui/certd-client/src/views/crud/feature/index/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/index/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/merge/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/merge/crud.tsx index 1527eb49..e2182077 100644 --- a/packages/ui/certd-client/src/views/crud/feature/merge/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/merge/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/remove/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/remove/crud.tsx index df33f6af..26dd0d39 100644 --- a/packages/ui/certd-client/src/views/crud/feature/remove/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/remove/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/search-multi/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/search-multi/crud.tsx index dfef9462..f85fd9e0 100644 --- a/packages/ui/certd-client/src/views/crud/feature/search-multi/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/search-multi/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/search/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/search/crud.tsx index 6bac155c..92e77f5b 100644 --- a/packages/ui/certd-client/src/views/crud/feature/search/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/search/crud.tsx @@ -8,7 +8,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/selection-radio/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/selection-radio/crud.tsx index 4f698eac..35dc3922 100644 --- a/packages/ui/certd-client/src/views/crud/feature/selection-radio/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/selection-radio/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/selection/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/selection/crud.tsx index 44248f9e..6b8d1754 100644 --- a/packages/ui/certd-client/src/views/crud/feature/selection/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/selection/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/sortable/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/sortable/crud.tsx index a1236ece..5a0b0a11 100644 --- a/packages/ui/certd-client/src/views/crud/feature/sortable/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/sortable/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/tabs/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/tabs/crud.tsx index 764f3f8e..f85fd593 100644 --- a/packages/ui/certd-client/src/views/crud/feature/tabs/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/tabs/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/tree/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/tree/crud.tsx index c62be79f..3da1cb49 100644 --- a/packages/ui/certd-client/src/views/crud/feature/tree/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/tree/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/feature/value-builder/crud.tsx b/packages/ui/certd-client/src/views/crud/feature/value-builder/crud.tsx index 6bb5af69..6c739f94 100644 --- a/packages/ui/certd-client/src/views/crud/feature/value-builder/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/feature/value-builder/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { 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 2c39fb0f..9045f9f0 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 @@ -8,7 +8,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/form/custom-form/crud.tsx b/packages/ui/certd-client/src/views/crud/form/custom-form/crud.tsx index 90f91de0..73985ae5 100644 --- a/packages/ui/certd-client/src/views/crud/form/custom-form/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/form/custom-form/crud.tsx @@ -87,7 +87,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/form/drawer/crud.tsx b/packages/ui/certd-client/src/views/crud/form/drawer/crud.tsx index e3c28280..d501e185 100644 --- a/packages/ui/certd-client/src/views/crud/form/drawer/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/form/drawer/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/form/group-tabs/crud.tsx b/packages/ui/certd-client/src/views/crud/form/group-tabs/crud.tsx index 5a0d0fa5..5e41f415 100644 --- a/packages/ui/certd-client/src/views/crud/form/group-tabs/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/form/group-tabs/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/form/group/crud.tsx b/packages/ui/certd-client/src/views/crud/form/group/crud.tsx index d9fbda5d..8379a33b 100644 --- a/packages/ui/certd-client/src/views/crud/form/group/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/form/group/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/form/helper/crud.tsx b/packages/ui/certd-client/src/views/crud/form/helper/crud.tsx index bdfb2ef7..63eddf4f 100644 --- a/packages/ui/certd-client/src/views/crud/form/helper/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/form/helper/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/form/inner/area/crud.tsx b/packages/ui/certd-client/src/views/crud/form/inner/area/crud.tsx index 1f2627a3..12cca181 100644 --- a/packages/ui/certd-client/src/views/crud/form/inner/area/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/form/inner/area/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/form/inner/crud.tsx b/packages/ui/certd-client/src/views/crud/form/inner/crud.tsx index 6efdfbdd..a812370b 100644 --- a/packages/ui/certd-client/src/views/crud/form/inner/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/form/inner/crud.tsx @@ -9,7 +9,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/form/layout-flex/crud.tsx b/packages/ui/certd-client/src/views/crud/form/layout-flex/crud.tsx index ac85344c..1350554d 100644 --- a/packages/ui/certd-client/src/views/crud/form/layout-flex/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/form/layout-flex/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/form/layout-grid/crud.tsx b/packages/ui/certd-client/src/views/crud/form/layout-grid/crud.tsx index 1ed633e2..1903196f 100644 --- a/packages/ui/certd-client/src/views/crud/form/layout-grid/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/form/layout-grid/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/form/layout/crud.tsx b/packages/ui/certd-client/src/views/crud/form/layout/crud.tsx index 49f7e23b..04f75b32 100644 --- a/packages/ui/certd-client/src/views/crud/form/layout/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/form/layout/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/form/nest/crud.tsx b/packages/ui/certd-client/src/views/crud/form/nest/crud.tsx index ee46c772..a8d24c60 100644 --- a/packages/ui/certd-client/src/views/crud/form/nest/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/form/nest/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { 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 74a72057..32a97cdd 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 @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/form/render/crud.tsx b/packages/ui/certd-client/src/views/crud/form/render/crud.tsx index 6e704d54..1759d127 100644 --- a/packages/ui/certd-client/src/views/crud/form/render/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/form/render/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/form/reset/crud.tsx b/packages/ui/certd-client/src/views/crud/form/reset/crud.tsx index 6c9b8936..252935f3 100644 --- a/packages/ui/certd-client/src/views/crud/form/reset/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/form/reset/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/form/single-column/crud.tsx b/packages/ui/certd-client/src/views/crud/form/single-column/crud.tsx index 3126bc39..73c30ea6 100644 --- a/packages/ui/certd-client/src/views/crud/form/single-column/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/form/single-column/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/form/validation/crud.tsx b/packages/ui/certd-client/src/views/crud/form/validation/crud.tsx index 88144619..6396f5f8 100644 --- a/packages/ui/certd-client/src/views/crud/form/validation/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/form/validation/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/form/view/crud.tsx b/packages/ui/certd-client/src/views/crud/form/view/crud.tsx index da1f1c39..7c2108cd 100644 --- a/packages/ui/certd-client/src/views/crud/form/view/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/form/view/crud.tsx @@ -6,7 +6,9 @@ export default function ({}: CreateCrudOptionsProps): CreateCrudOptionsRet { return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/row-handle/dropdown/crud.tsx b/packages/ui/certd-client/src/views/crud/row-handle/dropdown/crud.tsx index 5f46713b..aba99e8d 100644 --- a/packages/ui/certd-client/src/views/crud/row-handle/dropdown/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/row-handle/dropdown/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/row-handle/tooltip/crud.tsx b/packages/ui/certd-client/src/views/crud/row-handle/tooltip/crud.tsx index b3b7e505..029d8548 100644 --- a/packages/ui/certd-client/src/views/crud/row-handle/tooltip/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/row-handle/tooltip/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/slots/cell/crud.tsx b/packages/ui/certd-client/src/views/crud/slots/cell/crud.tsx index b376a442..623a2ad8 100644 --- a/packages/ui/certd-client/src/views/crud/slots/cell/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/slots/cell/crud.tsx @@ -7,7 +7,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/slots/form-item/crud.tsx b/packages/ui/certd-client/src/views/crud/slots/form-item/crud.tsx index 7bb8e6b4..0064a216 100644 --- a/packages/ui/certd-client/src/views/crud/slots/form-item/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/slots/form-item/crud.tsx @@ -5,7 +5,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/slots/form/crud.tsx b/packages/ui/certd-client/src/views/crud/slots/form/crud.tsx index ef2c2757..c4665fd2 100644 --- a/packages/ui/certd-client/src/views/crud/slots/form/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/slots/form/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/slots/layout/crud.tsx b/packages/ui/certd-client/src/views/crud/slots/layout/crud.tsx index c34df26d..ee4a9585 100644 --- a/packages/ui/certd-client/src/views/crud/slots/layout/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/slots/layout/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => { diff --git a/packages/ui/certd-client/src/views/crud/slots/search/crud.tsx b/packages/ui/certd-client/src/views/crud/slots/search/crud.tsx index 08696d8c..3018e225 100644 --- a/packages/ui/certd-client/src/views/crud/slots/search/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/slots/search/crud.tsx @@ -6,7 +6,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti return await api.GetList(query); }; const editRequest = async ({ form, row }: EditReq) => { - form.id = row.id; + if (form.id == null) { + form.id = row.id; + } return await api.UpdateObj(form); }; const delRequest = async ({ row }: DelReq) => {