diff --git a/frontend/components.d.ts b/frontend/components.d.ts index 704d0f03b2..7df8b9877d 100644 --- a/frontend/components.d.ts +++ b/frontend/components.d.ts @@ -5,11 +5,13 @@ // Read more: https://github.com/vuejs/core/pull/3399 import '@vue/runtime-core' -export {}; +export {} declare module '@vue/runtime-core' { export interface GlobalComponents { - RouterLink: typeof import('vue-router')['RouterLink']; - RouterView: typeof import('vue-router')['RouterView']; + AFomrItem: typeof import('@arco-design/web-vue')['FomrItem'] + ASelectOption: typeof import('@arco-design/web-vue')['SelectOption'] + RouterLink: typeof import('vue-router')['RouterLink'] + RouterView: typeof import('vue-router')['RouterView'] } } diff --git a/frontend/package.json b/frontend/package.json index 62cad5de09..c95ab02981 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -37,7 +37,7 @@ "@7polo/kity": "2.0.8", "@7polo/kityminder-core": "1.4.53", "@arco-design/web-vue": "^2.47.0", - "@arco-themes/vue-ms-theme-default": "^0.0.12", + "@arco-themes/vue-ms-theme-default": "^0.0.14", "@form-create/arco-design": "^3.1.21", "@vueuse/core": "^9.13.0", "ace-builds": "^1.22.0", diff --git a/frontend/src/assets/style/arco-reset.less b/frontend/src/assets/style/arco-reset.less index 571b45488c..89608fd07f 100644 --- a/frontend/src/assets/style/arco-reset.less +++ b/frontend/src/assets/style/arco-reset.less @@ -122,3 +122,8 @@ } } } + +/** 全局容器 **/ +.ms-contentiner { + height: calc(100vh - 84px); +} diff --git a/frontend/src/components/bussiness/usergroup/addUserGroupModal.vue b/frontend/src/components/bussiness/usergroup/addUserGroupModal.vue new file mode 100644 index 0000000000..899ac52a63 --- /dev/null +++ b/frontend/src/components/bussiness/usergroup/addUserGroupModal.vue @@ -0,0 +1,106 @@ + + + diff --git a/frontend/src/components/bussiness/usergroup/addUserModal.vue b/frontend/src/components/bussiness/usergroup/addUserModal.vue new file mode 100644 index 0000000000..ee497afffd --- /dev/null +++ b/frontend/src/components/bussiness/usergroup/addUserModal.vue @@ -0,0 +1,116 @@ + + + + + diff --git a/frontend/src/components/bussiness/usergroup/authTable.vue b/frontend/src/components/bussiness/usergroup/authTable.vue new file mode 100644 index 0000000000..b406d6af8a --- /dev/null +++ b/frontend/src/components/bussiness/usergroup/authTable.vue @@ -0,0 +1,98 @@ + + + diff --git a/frontend/src/components/bussiness/usergroup/index.vue b/frontend/src/components/bussiness/usergroup/index.vue index 12d8675bca..c008e55606 100644 --- a/frontend/src/components/bussiness/usergroup/index.vue +++ b/frontend/src/components/bussiness/usergroup/index.vue @@ -1,5 +1,5 @@ diff --git a/frontend/src/components/bussiness/usergroup/popconfirm.vue b/frontend/src/components/bussiness/usergroup/popconfirm.vue new file mode 100644 index 0000000000..898f71b77f --- /dev/null +++ b/frontend/src/components/bussiness/usergroup/popconfirm.vue @@ -0,0 +1,98 @@ + + + + + diff --git a/frontend/src/components/bussiness/usergroup/type.ts b/frontend/src/components/bussiness/usergroup/type.ts index 5fdbacb6bb..89a346fbd7 100644 --- a/frontend/src/components/bussiness/usergroup/type.ts +++ b/frontend/src/components/bussiness/usergroup/type.ts @@ -2,4 +2,19 @@ export interface UserGroupListItem { name: string; id: number; title?: string; + authScope: string; } +export interface UserOption { + id: number; + name: string; + email: string; +} +export interface CustomMoreActionItem { + eventKey: string; + name: string; +} +export interface PopVisibleItem { + [key: number]: boolean; +} + +export type RenameType = 'rename' | 'auth'; diff --git a/frontend/src/components/bussiness/usergroup/userTable.vue b/frontend/src/components/bussiness/usergroup/userTable.vue new file mode 100644 index 0000000000..2b9b49ba25 --- /dev/null +++ b/frontend/src/components/bussiness/usergroup/userTable.vue @@ -0,0 +1,102 @@ + + + diff --git a/frontend/src/components/pure/menu/index.vue b/frontend/src/components/pure/menu/index.vue index 1c9c13d2c2..1ec9dfb9ad 100644 --- a/frontend/src/components/pure/menu/index.vue +++ b/frontend/src/components/pure/menu/index.vue @@ -148,6 +148,7 @@ +