diff --git a/src/api/link/accessConfig.ts b/src/api/link/accessConfig.ts index 0aaa1986..869dab76 100644 --- a/src/api/link/accessConfig.ts +++ b/src/api/link/accessConfig.ts @@ -36,7 +36,7 @@ export const undeploy = (id: string) => export const deploy = (id: string) => server.post(`/gateway/device/${id}/_startup`); -export const del = (id: string) => server.remove(`/gateway/device/${id}`); +export const remove = (id: string) => server.remove(`/gateway/device/${id}`); export const getResourcesCurrent = () => server.get(`/network/resources/alive/_current`); diff --git a/src/components/Table/index.module.less b/src/components/Table/index.module.less index a0e94e07..98a53a92 100644 --- a/src/components/Table/index.module.less +++ b/src/components/Table/index.module.less @@ -10,17 +10,23 @@ .jtable-body-header-right { display: flex; gap: 8px; - .jtable-setting-item { - color: rgba(0, 0, 0, 0.75); - font-size: 16px; - cursor: pointer; + align-items: center; + .jtable-body-header-right-button { + display: flex; + margin-left: 10px; + gap: 8px; + .jtable-setting-item { + color: rgba(0, 0, 0, 0.75); + font-size: 16px; + cursor: pointer; - &:hover { - color: @primary-color-hover; - } + &:hover { + color: @primary-color-hover; + } - &.active { - color: @primary-color-active; + &.active { + color: @primary-color-active; + } } } } diff --git a/src/components/Table/index.tsx b/src/components/Table/index.tsx index fb778495..774b95b8 100644 --- a/src/components/Table/index.tsx +++ b/src/components/Table/index.tsx @@ -73,6 +73,7 @@ const JTable = defineComponent({ slots: [ 'headerTitle', // 顶部左边插槽 'card', // 卡片内容 + 'rightExtraRender' ], emits: [ 'modelChange', // 切换卡片和表格 @@ -254,16 +255,22 @@ const JTable = defineComponent({ {slots.headerTitle && slots.headerTitle()}
-
{ - _model.value = ModelEnum.CARD - }}> - -
-
{ - _model.value = ModelEnum.TABLE - }}> - -
+ {/* 顶部右边插槽 */} + {slots.rightExtraRender && slots.rightExtraRender()} + { + !props.model &&
+
{ + _model.value = ModelEnum.CARD + }}> + +
+
{ + _model.value = ModelEnum.TABLE + }}> + +
+
+ }
{/* content */} diff --git a/src/views/device/Instance/index.vue b/src/views/device/Instance/index.vue index 11656160..4792f526 100644 --- a/src/views/device/Instance/index.vue +++ b/src/views/device/Instance/index.vue @@ -1,222 +1,234 @@