diff --git a/src/assets/css/common/table-common.scss b/src/assets/css/common/table-common.scss index d496d34f..d97655ed 100644 --- a/src/assets/css/common/table-common.scss +++ b/src/assets/css/common/table-common.scss @@ -46,19 +46,40 @@ } .top-tool-search { - .top-tool-btn { - border-left: none; - } - .top-tool-btn--search:hover { - border-left: none !important; - } - .top-tool-btn--search:focus { - border-left: none !important; - } + .top-tool-btn { + border-left: none; + } + .top-tool-btn--search { + width: 28px !important; + height:28px !important; + padding:unset !important; + display: flex; + align-items: center; + justify-content: center; + i { + font-size: 14px; + color: $--text-color-2; + margin-right:unset !important; + } + } + .top-tool-btn--search:hover { + border-left: none !important; + } + .top-tool-btn--search:focus { + border-left: none !important; + } .el-input--small .el-input__wrapper { height: 28px !important; border-radius: 2px 0 0 2px !important; } + .el-input--small{ + width: 214px !important; + line-height: 27px; + } + .el-input--small .el-input__inner { + height: 28px; + border-radius: 2px 0 0 2px; + } } .top-tool-right { @@ -92,7 +113,6 @@ transition: background-color linear .1s; font-size:12px; font-weight: 500; - font-family: NotoSansHans-Medium !important; i { font-size: 14px; color: #575757; @@ -167,10 +187,10 @@ } .btn-customize { - color:$blue; + color: #2E88A6; font-size: 12px; .icon-gear{ - color:#2C72C6; + color: #2E88A6; width:12px; height:12px; margin-right:2px; @@ -188,7 +208,31 @@ min-width: 36px; } } + .cn-table { + padding: 0 20px; + height: calc(100% - 48px); + + .el-table:not(.chart-table) { + height: calc(100% - 58px); + width: calc(100% - 2px); // 防止出现横向滚动条 + border: 1px solid var(--el-table-border-color); + border-bottom: none; + + thead { + color: #333; + } + .el-switch { + height: auto; + --el-switch-on-color: #38ACD2; + --el-switch-off-color: #C0CEDB; + } + .el-checkbox__input { + --el-checkbox-checked-bg-color: #38ACD2; + } + } + } + /*.cn-table { position: relative; padding: 0 20px; width: 100%; @@ -306,7 +350,7 @@ } } } - /* start--覆盖el-table边框、gutter等样式 */ + !* start--覆盖el-table边框、gutter等样式 *! .el-table__body-wrapper, .el-table__fixed-body-wrapper { box-shadow: 1px 0 $--right-box-border-color; @@ -321,8 +365,8 @@ .el-table--border td { border-right: none !important; } - /* 最后一列用box-shadow模拟边框 */ - /*.el-table:not(.no-operation):not(.chart-table).el-table--border .el-table__body-wrapper td:nth-last-child(2) { + !* 最后一列用box-shadow模拟边框 *! + !*.el-table:not(.no-operation):not(.chart-table).el-table--border .el-table__body-wrapper td:nth-last-child(2) { box-shadow: 1px 0 $--right-box-border-color; } .el-table:not(.no-operation):not(.chart-table).el-table--border .el-table__header-wrapper th:nth-last-child(3) { @@ -341,7 +385,7 @@ th:last-of-type { border-right: none !important; } - }*/ + }*! .el-table--border:not(.chart-table)::after, .el-table--group:not(.chart-table)::after { // width: 0; } @@ -355,7 +399,7 @@ height: 0; } } - } + }*/ /* end--覆盖el-table边框、gutter等样式 */ .cn-pagination{ position: absolute; diff --git a/src/assets/css/components/components/advancedSearch/advanced-search.scss b/src/assets/css/components/components/advancedSearch/advanced-search.scss deleted file mode 100644 index 60c3eeec..00000000 --- a/src/assets/css/components/components/advancedSearch/advanced-search.scss +++ /dev/null @@ -1,82 +0,0 @@ -.advanced-search { - width: 100%; - height: 100%; - max-height: 66px; - - .el-input__suffix { - right: 0; - } - &.advanced-search--show-list { - max-height: 40px; - - .el-input__inner { - padding-right: 0; - border: none; - } - } - .el-input__inner { - display: flex; - width: 100%; - height: 100%; - border: 1px solid #CECECE; - border-radius: 2px; - padding-right: 10px; - } - .search__suffixes, .search__suffixes--show-list { - display: flex; - height: 100%; - - .search__suffix { - cursor: pointer; - } - } - .search__suffixes { - justify-content: space-evenly; - width: 100px; - - .search__suffix { - display: flex; - align-items: center; - - .cn-icon-search-advance { - color: #A6AAAE; - font-size: 20px; - } - .cn-icon-filter { - color: #A6AAAE; - font-size: 20px; - } - .el-icon-search { - color: #3976CB; - font-size: 32px; - } - - &:hover { - cursor: pointer; - } - } - } - .search__suffixes--show-list { - .search__suffix { - padding: 0 12px; - - &:last-of-type { - background-color: $--color-primary; - border-radius: 0 2px 2px 0; - } - .cn-icon-search-advance { - color: #A6AAAE; - font-size: 14px; - } - .cn-icon-filter { - color: #A6AAAE; - font-size: 14px; - } - .el-icon-search { - color: white; - font-size: 16px; - } - } - } - -} diff --git a/src/assets/css/components/components/advancedSearch/advanced-search2.scss b/src/assets/css/components/components/advancedSearch/advanced-search2.scss index 567076e2..53e04b02 100644 --- a/src/assets/css/components/components/advancedSearch/advanced-search2.scss +++ b/src/assets/css/components/components/advancedSearch/advanced-search2.scss @@ -73,6 +73,34 @@ background: #fff; } } + .HintInfo { + height: 280px; + overflow: auto; + background: #fff; + + ul { + min-width: 300px; + height:auto; + width: fit-content; + box-sizing: border-box; + padding-bottom: 10px; + } + .relative-item { + text-indent: 1em; + font-size: 14px !important; + color: #575757; + height: 24px; + line-height: 24px !important; + + &:hover { + background-color: #f0f5fa; + color: #046ECA; + } + } + .hint-clear { + text-indent: 1em; + } + } } .detections { .tag-search, .CodeMirror { diff --git a/src/assets/css/components/components/table/common.scss b/src/assets/css/components/components/table/common.scss index 02484861..eaa1673b 100644 --- a/src/assets/css/components/components/table/common.scss +++ b/src/assets/css/components/components/table/common.scss @@ -66,48 +66,9 @@ } } } -.unshow { - display: none; -} -.list-page .top-tools .top-tool-btn { - height: 33px; - width: 36px; - border: 1px solid #DEDEDE; - outline: none; - border-radius: 2px; - background-color: #F9F9F9; - transition: background-color linear .1s; - padding-left:10px; -} - - -.list-page .top-tools .top-tool-btn--search{ - width:28px !important; - height:28px !important; - padding:unset !important; - display: flex; - align-items: center; - justify-content: center; - i { - font-size: 14px; - color: $--text-color-2; - margin-right:unset !important; - } -} - -.list-page { - .el-input--small{ - width: 214px !important; - line-height: 27px; - } - .el-input--small .el-input__inner { - height: 28px; - border-radius: 2px 0px 0px 2px; - } -} - -.list { +// 自定义列 +.drag-list { list-style: none; padding-inline-start: 0 !important; max-height: 358px !important; diff --git a/src/assets/css/components/views/administration/AdministrationTabs.scss b/src/assets/css/components/views/administration/AdministrationTabs.scss index 1304ae19..2435b86b 100644 --- a/src/assets/css/components/views/administration/AdministrationTabs.scss +++ b/src/assets/css/components/views/administration/AdministrationTabs.scss @@ -3,11 +3,13 @@ height: 18px; } .administration-container { - height: calc(100% - 26px); + height: calc(100% - 86px); flex-direction: column; + overflow: hidden; + .list-page { .main-container { - padding: 0px; + padding: 0; .cn-pagination { height: 34px; } diff --git a/src/assets/css/components/views/charts2/networkOverviewTabs.scss b/src/assets/css/components/views/charts2/networkOverviewTabs.scss index 241cdbfe..68a9942f 100644 --- a/src/assets/css/components/views/charts2/networkOverviewTabs.scss +++ b/src/assets/css/components/views/charts2/networkOverviewTabs.scss @@ -80,9 +80,13 @@ border: 1px solid #E2E5EC; border-radius: 4px 4px 0 0; padding: 1px; + .data-click:hover{ cursor: pointer; } + .el-table__inner-wrapper { + width: calc(100% + 2px); + } .el-table__header { width:100% !important; } @@ -129,6 +133,9 @@ .data-click:hover{ cursor: pointer; } + .el-table__inner-wrapper { + width: calc(100% + 2px); + } .el-table__header { width:100% !important; } @@ -380,10 +387,10 @@ margin-bottom: 0px !important; } .el-tabs__item{ - width:50%; - text-align:center; - padding:0px; - height:30px; + width: 50%; + text-align: center; + padding: 0; + height: 30px; line-height: 30px; font-size: 12px; color: #353636; @@ -400,68 +407,13 @@ border-left: 1px #E2E5EC solid !important; } .el-tabs--card > .el-tabs__header .el-tabs__item{ - border-bottom: 0px ; + border-bottom: 0; border-top: 3px solid white; color: #353636; } .el-tabs--card > .el-tabs__header .el-tabs__nav { - border:0px ; + border: 0; } - - .list { - list-style: none; - padding-inline-start: 0px !important; - /*height:375px;*/ - max-height: 358px !important; - overflow:auto; - margin:0 0; - .drag-move { - transition: transform 0.3s; - } - - .list-item:last-child { - margin-bottom: 6px; - } - .list-item { - width:100%; - color: #575757; - margin-bottom: 0px; - height: 24px; - line-height: 24px; - text-align: left; - font-weight:400; - font-size:12px; - - .icon-drag{ - cursor: move; - margin-left:6px; - margin-right:3px; - } - - .el-checkbox__input.is-checked .el-checkbox__inner { - width: 14px; - height: 14px; - background-color: #38ACD2; - border-color: #38ACD2; - border-radius: 2px; - } - .el-checkbox__input .el-checkbox__inner { - width: 14px; - height: 14px; - background-color: #F2F7F9; - border: 1px solid rgba(0,0,0,0.15); - border-radius: 2px; - } - .el-checkbox__input.is-checked + .el-checkbox__label,.el-checkbox__input + .el-checkbox__label { - font-size: 12px; - color: #575757; - font-weight: 400; - } - } - } - /*top:0px !important; - right:200px !important; - transform: translateY(126px) !important;*/ } .fixed-row { display:flex; diff --git a/src/assets/css/components/views/setting/knowledgeBase.scss b/src/assets/css/components/views/setting/knowledgeBase.scss index f6510071..980c82c6 100644 --- a/src/assets/css/components/views/setting/knowledgeBase.scss +++ b/src/assets/css/components/views/setting/knowledgeBase.scss @@ -677,57 +677,43 @@ } .list-mode__row { width: 100%; - height:calc(100% - 102px); - margin-bottom:0px; - padding-bottom:30px; - .el-checkbox .el-checkbox__input.is-checked .el-checkbox__inner { - border-color: #38ACD2; - background: #38ACD2; - border-radius: 2px; - } - .el-checkbox__input.is-indeterminate .el-checkbox__inner { - background-color: #38ACD2; - border-color: #38ACD2; - } - .el-table--border { - border: 1px solid rgba(226,229,236,1); - border-radius: 4px; - border-bottom:none; - } - .el-table--border th ,.el-table--border td { - border-right: none; - } + height: calc(100% - 80px); + margin-bottom: 0; + .el-table { - &::after { - width: 0; - } + height: 100%; + width: calc(100% - 2px); // 防止出现横向滚动条 + border: 1px solid var(--el-table-border-color); + border-bottom: none; + th { - padding-top:6px; - padding-bottom:6px; - font-size:12px; - line-height:12px; - color: #353636; + padding-top: 6px; + padding-bottom: 6px; + font-size: 12px; + line-height: 12px; + color: #333; font-weight: 500; } td { - padding-top:8px; - padding-bottom:8px; - font-size:12px; - line-height:12px; + padding-top: 8px; + padding-bottom: 8px; + font-size: 12px; + line-height: 12px; color: #353636; font-weight: 400; } .cell { height: fit-content; - /*max-height:64px; - min-height:32px;*/ line-height: 20px; + .reference-tag__show { display: flex; flex-direction: row; + .reference-tag__group { display: flex; flex-direction: column; + .reference-tag { display: inline-block; padding: 0 10px; @@ -737,19 +723,27 @@ border-radius: 12px; margin-bottom: 8px; width: fit-content; - min-width:fit-content; + min-width: fit-content; } .reference-tag:last-of-type { - margin-bottom:0px !important; - margin-right:6px; + margin-bottom: 0 !important; + margin-right: 6px; } } .reference-more { - display:flex; - flex-direction:column-reverse; + display: flex; + flex-direction: column-reverse; } } } + .el-switch { + height: auto; + --el-switch-on-color: #38ACD2; + --el-switch-off-color: #C0CEDB; + } + .el-checkbox__input { + --el-checkbox-checked-bg-color: #38ACD2; + } } } .list-mode__card { @@ -958,10 +952,15 @@ } } .knowledge-pagination { - height:56px; - width:100%; + position: relative; + height: 56px; + width: 100%; background: #FFFFFF; - box-shadow: 0 -1px 4px 0 rgba(0,0,0,0.07); + + .el-pagination { + position: absolute; + bottom: 4px; + } } } } diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index 6c80af3a..e942faa1 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -1,12 +1,12 @@ -@font-face { // 由于主题嵌套原因,原ele的icon图标字体加载会出错,需重写 +/*@font-face { // 由于主题嵌套原因,原ele的icon图标字体加载会出错,需重写 font-family: 'element-icons'; - src: url('~@/assets/css/themes/src/fonts/element-icons.woff') format('woff'), /* chrome, firefox */ - url('~@/assets/css/themes/src/fonts/element-icons.ttf') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + src: url('~@/assets/css/themes/src/fonts/element-icons.woff') format('woff'), !* chrome, firefox *! + url('~@/assets/css/themes/src/fonts/element-icons.ttf') format('truetype'); !* chrome, firefox, opera, Safari, Android, iOS 4.2+*! font-weight: normal; font-display: auto; font-style: normal; } -$--font-path: '~@/assets/css/themes/src/fonts'; // 避免ele原字体加载语句出错 +$--font-path: '~@/assets/css/themes/src/fonts'; // 避免ele原字体加载语句出错*/ @font-face { font-family: 'NotoSansSChineseRegular'; diff --git a/src/components/advancedSearch/showhint/Hint/HintInfo.vue b/src/components/advancedSearch/showhint/Hint/HintInfo.vue index 2618230b..c5154706 100644 --- a/src/components/advancedSearch/showhint/Hint/HintInfo.vue +++ b/src/components/advancedSearch/showhint/Hint/HintInfo.vue @@ -100,28 +100,3 @@ export default { } } - - diff --git a/src/components/table/ColumnCustomize.vue b/src/components/table/ColumnCustomize.vue index a96f4e43..6188ee15 100644 --- a/src/components/table/ColumnCustomize.vue +++ b/src/components/table/ColumnCustomize.vue @@ -1,6 +1,6 @@ - - diff --git a/src/components/table/administration/GalaxyProxyTable.vue b/src/components/table/administration/GalaxyProxyTable.vue deleted file mode 100644 index 97f94ff2..00000000 --- a/src/components/table/administration/GalaxyProxyTable.vue +++ /dev/null @@ -1,198 +0,0 @@ - - - diff --git a/src/components/table/administration/I18nTable.vue b/src/components/table/administration/I18nTable.vue index 506395eb..5ba08983 100644 --- a/src/components/table/administration/I18nTable.vue +++ b/src/components/table/administration/I18nTable.vue @@ -3,7 +3,7 @@ id="i18nTable" ref="dataTable" :data="tableData" - border + tooltip-effect="light" empty-text=" " @header-dragend="dragend" @sort-change="tableDataSort" diff --git a/src/components/table/administration/OperationLogTable.vue b/src/components/table/administration/OperationLogTable.vue index 88960083..fd98207f 100644 --- a/src/components/table/administration/OperationLogTable.vue +++ b/src/components/table/administration/OperationLogTable.vue @@ -4,10 +4,7 @@ ref="dataTable" :data="tableData" tooltip-effect="light" - :height="height" - border empty-text=" " - class="no-operation" @header-dragend="dragend" @sort-change="tableDataSort" @selection-change="selectionChange" diff --git a/src/components/table/administration/RoleTable.vue b/src/components/table/administration/RoleTable.vue index 984591f3..73d94bd3 100644 --- a/src/components/table/administration/RoleTable.vue +++ b/src/components/table/administration/RoleTable.vue @@ -3,8 +3,7 @@ id="roleTable" ref="dataTable" :data="tableData" - :height="height" - border + tooltip-effect="light" empty-text=" " @header-dragend="dragend" @sort-change="tableDataSort" diff --git a/src/components/table/administration/UserTable.vue b/src/components/table/administration/UserTable.vue index 5cc02b4a..7539bedc 100644 --- a/src/components/table/administration/UserTable.vue +++ b/src/components/table/administration/UserTable.vue @@ -3,9 +3,8 @@ id="userTable" ref="dataTable" :data="tableData" - :height="height" + tooltip-effect="light" empty-text=" " - border @header-dragend="dragend" @sort-change="tableDataSort" @selection-change="selectionChange" diff --git a/src/components/table/setting/KnowledgeBaseTableForRow.vue b/src/components/table/setting/KnowledgeBaseTableForRow.vue index 8d492ca2..7e46d05b 100644 --- a/src/components/table/setting/KnowledgeBaseTableForRow.vue +++ b/src/components/table/setting/KnowledgeBaseTableForRow.vue @@ -3,8 +3,6 @@ id="knowledgeBaseTable" ref="dataTable" :data="tableData" - :height="height" - border empty-text=" " @header-dragend="dragend" @sort-change="tableDataSort" diff --git a/src/components/table/system/PluginTable.vue b/src/components/table/system/PluginTable.vue index ad6d7fc7..265283f6 100644 --- a/src/components/table/system/PluginTable.vue +++ b/src/components/table/system/PluginTable.vue @@ -3,9 +3,7 @@ id="pluginTable" ref="dataTable" :data="tableData" - :height="height" empty-text=" " - border class="plugin" @header-dragend="dragend" @sort-change="tableDataSort" diff --git a/src/utils/constants.js b/src/utils/constants.js index 1f36f640..f645e8f0 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -92,7 +92,7 @@ export const operationLogStateMapping = { export const position = { tableHeight: { - normal: 'calc(100% - 48px)' // 常规高度,特例在下方定义 + normal: 'calc(100% - 58px)' // 常规高度,特例在下方定义 } } diff --git a/src/views/administration/OperationLog.vue b/src/views/administration/OperationLog.vue index 8f4f90e0..3c18db94 100644 --- a/src/views/administration/OperationLog.vue +++ b/src/views/administration/OperationLog.vue @@ -22,8 +22,8 @@ @orderBy="tableDataSort" @reload="getTableData" @selectionChange="selectionChange" - @showBottomBox="(targetTab, object) => { $refs.dataList.showBottomBox(targetTab, object) }"> @search="search" + @showBottomBox="(targetTab, object) => { $refs.dataList.showBottomBox(targetTab, object) }">