From 09610b3c827ddc707540fae56483132ff335d896 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Mon, 25 Sep 2023 14:36:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E6=80=81=E6=A1=86?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E7=B1=BB=E5=9E=8B.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/orion-vue-api.ts.vm | 2 +- ...on-vue-views-components-form-drawer.vue.vm | 20 +- ...ion-vue-views-components-form-modal.vue.vm | 20 +- .../orion-vue-views-components-table.vue.vm | 19 +- orion-ops-ui/pnpm-lock.yaml | 3765 ++++++----------- orion-ops-ui/src/api/asset/host-identity.ts | 2 +- orion-ops-ui/src/api/asset/host-key.ts | 2 +- orion-ops-ui/src/api/asset/host.ts | 2 +- orion-ops-ui/src/api/system/menu.ts | 2 +- orion-ops-ui/src/api/user/role.ts | 11 +- orion-ops-ui/src/api/user/user.ts | 2 +- .../global-setting/form-wrapper.vue | 1 + orion-ops-ui/src/utils/file.ts | 4 +- .../components/host-identity-form-modal.vue | 18 +- .../components/host-identity-table.vue | 13 +- .../components/host-key-form-drawer.vue | 24 +- .../host-key/components/host-key-table.vue | 13 +- .../host/components/host-config-ssh-form.vue | 20 +- .../asset/host/components/host-form-modal.vue | 16 +- .../asset/host/components/host-table.vue | 14 +- .../asset/host/types/host-config.types.ts | 8 + .../workplace/components/popular-content.vue | 2 +- .../menu/components/menu-form-modal.vue | 29 +- .../user/role/components/role-form-modal.vue | 16 +- .../role/components/role-menu-grant-modal.vue | 23 +- .../views/user/role/components/role-table.vue | 19 +- .../user/user/components/user-form-modal.vue | 16 +- .../user-grant-roles-form-modal.vue | 2 + .../views/user/user/components/user-table.vue | 23 +- 29 files changed, 1450 insertions(+), 2658 deletions(-) diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-api.ts.vm b/orion-ops-launch/src/main/resources/templates/orion-vue-api.ts.vm index 4c0c94e5..6a1556c4 100644 --- a/orion-ops-launch/src/main/resources/templates/orion-vue-api.ts.vm +++ b/orion-ops-launch/src/main/resources/templates/orion-vue-api.ts.vm @@ -26,7 +26,7 @@ export interface ${vue.featureEntity}CreateRequest { * ${table.comment}更新请求 */ export interface ${vue.featureEntity}UpdateRequest extends ${vue.featureEntity}CreateRequest { - id: number | undefined; + id?: number; } /** diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm b/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm index 675cd416..70f9f36e 100644 --- a/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm +++ b/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm @@ -21,7 +21,9 @@ #if("$field.propertyType" == "Integer" || "$field.propertyType" == "Long") - + #elseif("$field.propertyType" == "Date")