diff --git a/src/components/GiEditTable/GiEditTable.vue b/src/components/GiEditTable/GiEditTable.vue index 5e0a91b..ba47481 100644 --- a/src/components/GiEditTable/GiEditTable.vue +++ b/src/components/GiEditTable/GiEditTable.vue @@ -145,4 +145,12 @@ const isDisabled: Props['cellDisabled'] = (p) => { defineExpose({ formRef }) - + diff --git a/src/components/GiFlexibleBox/index.vue b/src/components/GiFlexibleBox/index.vue deleted file mode 100644 index 7e1f9a1..0000000 --- a/src/components/GiFlexibleBox/index.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - - - diff --git a/src/components/GiIconBox/index.vue b/src/components/GiIconBox/index.vue new file mode 100644 index 0000000..684b09b --- /dev/null +++ b/src/components/GiIconBox/index.vue @@ -0,0 +1,120 @@ + + + + + + diff --git a/src/components/GiLeftRightPane/index.vue b/src/components/GiLeftRightPane/index.vue deleted file mode 100644 index 20ae6cd..0000000 --- a/src/components/GiLeftRightPane/index.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - - - diff --git a/src/components/GiOverFlowTags/index.vue b/src/components/GiOverFlowTags/index.vue deleted file mode 100644 index 7fea7db..0000000 --- a/src/components/GiOverFlowTags/index.vue +++ /dev/null @@ -1,32 +0,0 @@ - - - - - diff --git a/src/components/GiPageLayout/index.vue b/src/components/GiPageLayout/index.vue new file mode 100644 index 0000000..c7831c5 --- /dev/null +++ b/src/components/GiPageLayout/index.vue @@ -0,0 +1,134 @@ + + + + + diff --git a/src/styles/arco-ui/a-space.less b/src/styles/arco-ui/a-space.less new file mode 100644 index 0000000..3af128c --- /dev/null +++ b/src/styles/arco-ui/a-space.less @@ -0,0 +1,4 @@ +// 修复arco-space-item为空时,仍然显示的问题 +.arco-space-item:empty { + display: none; +} diff --git a/src/styles/arco-ui/a-tabs.less b/src/styles/arco-ui/a-tabs.less new file mode 100644 index 0000000..1f5195a --- /dev/null +++ b/src/styles/arco-ui/a-tabs.less @@ -0,0 +1,3 @@ +.arco-tabs-nav-extra:not(:empty) { + margin-right: var(--padding); +} diff --git a/src/styles/arco-ui/index.less b/src/styles/arco-ui/index.less index 3cf612a..206c183 100644 --- a/src/styles/arco-ui/index.less +++ b/src/styles/arco-ui/index.less @@ -15,6 +15,8 @@ @import './a-typography.less'; @import './a-button.less'; @import './a-divider.less'; +@import './a-space.less'; +@import './a-tabs.less'; @color-menu-dark-bg: var(--color-bg-1); @card-color-bg: var(--color-bg-1); @@ -71,4 +73,4 @@ body { .danger { color: rgb(var(--danger-6)); margin-right: 4px; -} \ No newline at end of file +} diff --git a/src/styles/base.scss b/src/styles/base.scss index 69cbf57..c80b245 100644 --- a/src/styles/base.scss +++ b/src/styles/base.scss @@ -1,4 +1,4 @@ -@use './var.scss' as *; +@import './var.scss'; body { --margin: 14px; // 通用外边距 diff --git a/src/styles/global.scss b/src/styles/global.scss index 2d3062e..e306f79 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -1,5 +1,5 @@ /* 全局样式 */ -@use './var.scss' as *; +@import './var.scss'; .w-full { width: 100%; @@ -162,6 +162,26 @@ border-radius: 100px; } +.gi_bg_1 { + background-color: var(--color-bg-1); +} + +.gi_bg_2 { + background-color: var(--color-bg-2); +} + +.gi_bg_3 { + background-color: var(--color-bg-3); +} + +.gi_bg_4 { + background-color: var(--color-bg-4); +} + +.gi_bg_5 { + background-color: var(--color-bg-5); +} + // hover按钮 .gi_hover_btn { border: 0 !important; @@ -211,6 +231,24 @@ } } +// 页面卡片,右侧有返回按钮 +.gi_page_card { + flex: 1; + margin: var(--margin); + box-sizing: border-box; + overflow: hidden; + display: flex; + flex-direction: column; + + .arco-card-body { + flex: 1; + box-sizing: border-box; + display: flex; + flex-direction: column; + overflow: hidden; + } +} + // 卡片标题,标题左侧的伪类样式 .gi_card_title { > .arco-card-header { @@ -310,6 +348,26 @@ } } +.gi_full_tabs { + flex: 1; + display: flex; + flex-direction: column; + + .arco-tabs-content { + flex: 1; + padding-top: 0; + + .arco-tabs-content-list { + height: 100%; + } + + .arco-tabs-pane { + height: 100%; + overflow-y: auto; + } + } +} + // 编辑表格,表头的必填红色星号 .gi_column_require { .arco-table-th-title { @@ -321,6 +379,14 @@ } } +.gi_full_column { + flex: 1; + display: flex; + flex-direction: column; + overflow: hidden; + box-sizing: border-box; +} + .gi_tabs { display: flex; flex-direction: column; diff --git a/src/styles/index.scss b/src/styles/index.scss index ba05922..0971ac3 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -1,17 +1,17 @@ // 基础样式 -@use './base.scss' as *; +@import './base.scss'; // 全局类名样式 -@use './global.scss' as *; +@import './global.scss'; // 自定义原生滚动条样式 -@use './scrollbar-reset.scss' as *; +@import './scrollbar-reset.scss'; // 自定义 nprogress 插件进度条颜色 -@use './nprogress.scss' as *; +@import './nprogress.scss'; // 富文本的css主题颜色变量 -@use './editor.scss' as *; +@import './editor.scss'; // 动画类名 -@use './animated.scss' as *; +@import './animated.scss'; diff --git a/src/types/components.d.ts b/src/types/components.d.ts index 161d6eb..7ea3f11 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -25,15 +25,14 @@ declare module 'vue' { GiCodeView: typeof import('./../components/GiCodeView/index.vue')['default'] GiDot: typeof import('./../components/GiDot/index.tsx')['default'] GiEditTable: typeof import('./../components/GiEditTable/GiEditTable.vue')['default'] - GiFlexibleBox: typeof import('./../components/GiFlexibleBox/index.vue')['default'] GiFooter: typeof import('./../components/GiFooter/index.vue')['default'] GiForm: typeof import('./../components/GiForm/src/GiForm.vue')['default'] + GiIconBox: typeof import('./../components/GiIconBox/index.vue')['default'] GiIconSelector: typeof import('./../components/GiIconSelector/index.vue')['default'] GiIframe: typeof import('./../components/GiIframe/index.vue')['default'] - GiLeftRightPane: typeof import('./../components/GiLeftRightPane/index.vue')['default'] GiOption: typeof import('./../components/GiOption/index.vue')['default'] GiOptionItem: typeof import('./../components/GiOptionItem/index.vue')['default'] - GiOverFlowTags: typeof import('./../components/GiOverFlowTags/index.vue')['default'] + GiPageLayout: typeof import('./../components/GiPageLayout/index.vue')['default'] GiSpace: typeof import('./../components/GiSpace/index.vue')['default'] GiSplitButton: typeof import('./../components/GiSplitButton/index.vue')['default'] GiSplitPane: typeof import('./../components/GiSplitPane/index.vue')['default'] diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue index d478650..1122d20 100644 --- a/src/views/system/config/index.vue +++ b/src/views/system/config/index.vue @@ -1,22 +1,31 @@