From 4d9b3a903804e5a7514d273b2f994205fef878f7 Mon Sep 17 00:00:00 2001 From: baishun Date: Fri, 17 Feb 2023 09:47:11 +0800 Subject: [PATCH] update bg-ui with 'apaas-portal-ui' --- src/bg-ui/bg-btns.vue | 35 ++- src/bg-ui/bg-card.vue | 67 +++-- src/bg-ui/bg-detail-table.vue | 181 +++++++------- src/bg-ui/bg-detail-table2.vue | 135 ++++------ src/bg-ui/bg-detail.vue | 105 ++++---- src/bg-ui/bg-filter-date.vue | 50 ++-- src/bg-ui/bg-filter-group.vue | 96 ++++--- src/bg-ui/bg-filter.vue | 59 ++--- src/bg-ui/bg-filtrate.vue | 136 +++++----- src/bg-ui/bg-icon.vue | 18 +- src/bg-ui/bg-info.vue | 176 +++++++------ src/bg-ui/bg-layout-card.vue | 140 +++++------ src/bg-ui/bg-list.vue | 44 ++-- src/bg-ui/bg-nav-list.vue | 134 ++++++---- src/bg-ui/bg-nav.vue | 40 ++- src/bg-ui/bg-pagination.vue | 102 ++++---- src/bg-ui/bg-rich-text.vue | 249 ++++++++----------- src/bg-ui/bg-sort.vue | 75 +++--- src/bg-ui/bg-step.vue | 42 ---- src/bg-ui/bg-steps.vue | 106 -------- src/bg-ui/bg-switch.vue | 159 ++++++------ src/bg-ui/bg-tab.vue | 84 +++---- src/bg-ui/bg-table-btn.vue | 41 ++- src/bg-ui/bg-table-btns.vue | 6 +- src/bg-ui/bg-table-btns2.vue | 169 +++++++++++++ src/bg-ui/bg-table-pro.vue | 263 ++++++++++---------- src/bg-ui/bg-table.vue | 314 ++++++++++++----------- src/bg-ui/bg-tabs.vue | 74 +++--- src/bg-ui/bg-tags.vue | 84 +++---- src/bg-ui/bg-upload-image.vue | 387 ++++++++++++++--------------- src/bg-ui/bg-upload.vue | 287 ++++++++++----------- src/bg-ui/bg-user-upload-image.vue | 97 ++++---- src/bg-ui/index.js | 6 +- src/bg-ui/index.scss | 93 +++++-- 34 files changed, 2001 insertions(+), 2053 deletions(-) delete mode 100644 src/bg-ui/bg-step.vue delete mode 100644 src/bg-ui/bg-steps.vue create mode 100644 src/bg-ui/bg-table-btns2.vue diff --git a/src/bg-ui/bg-btns.vue b/src/bg-ui/bg-btns.vue index abe7773..1140505 100644 --- a/src/bg-ui/bg-btns.vue +++ b/src/bg-ui/bg-btns.vue @@ -15,24 +15,21 @@ - diff --git a/src/bg-ui/bg-card.vue b/src/bg-ui/bg-card.vue index a473955..c34605e 100644 --- a/src/bg-ui/bg-card.vue +++ b/src/bg-ui/bg-card.vue @@ -1,29 +1,58 @@ - + + \ No newline at end of file diff --git a/src/bg-ui/bg-detail-table.vue b/src/bg-ui/bg-detail-table.vue index da685d3..ab0af92 100644 --- a/src/bg-ui/bg-detail-table.vue +++ b/src/bg-ui/bg-detail-table.vue @@ -1,102 +1,105 @@ - diff --git a/src/bg-ui/bg-detail-table2.vue b/src/bg-ui/bg-detail-table2.vue index 19757d2..fe1fd13 100644 --- a/src/bg-ui/bg-detail-table2.vue +++ b/src/bg-ui/bg-detail-table2.vue @@ -1,94 +1,69 @@ - diff --git a/src/bg-ui/bg-detail.vue b/src/bg-ui/bg-detail.vue index 8ea63e1..2dd7202 100644 --- a/src/bg-ui/bg-detail.vue +++ b/src/bg-ui/bg-detail.vue @@ -1,5 +1,5 @@ - diff --git a/src/bg-ui/bg-filter-date.vue b/src/bg-ui/bg-filter-date.vue index 27421d7..c2f3d6e 100644 --- a/src/bg-ui/bg-filter-date.vue +++ b/src/bg-ui/bg-filter-date.vue @@ -3,7 +3,7 @@ {{ name }}:
- \ No newline at end of file +}); + diff --git a/src/bg-ui/bg-filter-group.vue b/src/bg-ui/bg-filter-group.vue index 2965825..d4358b0 100644 --- a/src/bg-ui/bg-filter-group.vue +++ b/src/bg-ui/bg-filter-group.vue @@ -1,66 +1,100 @@ \ No newline at end of file + state.modelValue = props.modelValue; +}); +const { modelValue, showFlag } = toRefs(state); + diff --git a/src/bg-ui/bg-filter.vue b/src/bg-ui/bg-filter.vue index 699265a..9554431 100644 --- a/src/bg-ui/bg-filter.vue +++ b/src/bg-ui/bg-filter.vue @@ -15,22 +15,17 @@
- diff --git a/src/bg-ui/bg-filtrate.vue b/src/bg-ui/bg-filtrate.vue index ac50c8d..0140afa 100644 --- a/src/bg-ui/bg-filtrate.vue +++ b/src/bg-ui/bg-filtrate.vue @@ -6,85 +6,83 @@ v-for="(item, index) in fullOptions" :class="{ current: selection.indexOf(item.value) > -1 }" :key="'li_' + index" - @click="selectAction(item)" - > + @click="selectAction(item)"> {{ item.name }} - \ No newline at end of file + diff --git a/src/bg-ui/bg-icon.vue b/src/bg-ui/bg-icon.vue index 6a96702..a66160d 100644 --- a/src/bg-ui/bg-icon.vue +++ b/src/bg-ui/bg-icon.vue @@ -4,15 +4,13 @@ - \ No newline at end of file +}) + diff --git a/src/bg-ui/bg-info.vue b/src/bg-ui/bg-info.vue index 1790258..613a36f 100644 --- a/src/bg-ui/bg-info.vue +++ b/src/bg-ui/bg-info.vue @@ -6,115 +6,109 @@ :key="'li_' + index" :style="{ width: item.full ? `100%` : `calc(100% / ${col})`, - }" - > - + }"> + {{ item.name }} - - + {{ item.value }} - + {{ + item.value + }} + {{ item.value }} + + 复制 + - 复制 - - - + + @click="changeView(item)"> - diff --git a/src/bg-ui/bg-layout-card.vue b/src/bg-ui/bg-layout-card.vue index 7e545d9..708e139 100644 --- a/src/bg-ui/bg-layout-card.vue +++ b/src/bg-ui/bg-layout-card.vue @@ -7,8 +7,7 @@ v-for="(item, index) in btns" :key="item" :class="{ current: index === btn }" - @click="$emit('update:btn', index)" - > + @click="$emit('update:btn', index)"> {{ item }} @@ -17,8 +16,7 @@ @click="downloadAction" v-loading="downloading" element-loading-spinner="el-icon-loading" - v-if="download" - > + v-if="download"> @@ -28,87 +26,81 @@ - diff --git a/src/bg-ui/bg-list.vue b/src/bg-ui/bg-list.vue index f896beb..6ce311d 100644 --- a/src/bg-ui/bg-list.vue +++ b/src/bg-ui/bg-list.vue @@ -30,10 +30,7 @@ -
+
@@ -41,12 +38,8 @@
- - 查询 - - - 重置 - + 查询 + 重置
@@ -73,22 +66,19 @@ - diff --git a/src/bg-ui/bg-nav-list.vue b/src/bg-ui/bg-nav-list.vue index 97ff048..bde6ff9 100644 --- a/src/bg-ui/bg-nav-list.vue +++ b/src/bg-ui/bg-nav-list.vue @@ -1,18 +1,23 @@ - \ No newline at end of file + diff --git a/src/bg-ui/bg-step.vue b/src/bg-ui/bg-step.vue deleted file mode 100644 index c757568..0000000 --- a/src/bg-ui/bg-step.vue +++ /dev/null @@ -1,42 +0,0 @@ - - - diff --git a/src/bg-ui/bg-steps.vue b/src/bg-ui/bg-steps.vue deleted file mode 100644 index a17dfa2..0000000 --- a/src/bg-ui/bg-steps.vue +++ /dev/null @@ -1,106 +0,0 @@ - - - diff --git a/src/bg-ui/bg-switch.vue b/src/bg-ui/bg-switch.vue index 62c03cd..282b67b 100644 --- a/src/bg-ui/bg-switch.vue +++ b/src/bg-ui/bg-switch.vue @@ -1,11 +1,5 @@ - diff --git a/src/bg-ui/bg-tab.vue b/src/bg-ui/bg-tab.vue index 36a6b54..618e9a1 100644 --- a/src/bg-ui/bg-tab.vue +++ b/src/bg-ui/bg-tab.vue @@ -9,51 +9,47 @@ - diff --git a/src/bg-ui/bg-table-btn.vue b/src/bg-ui/bg-table-btn.vue index e2e2181..7a80ba0 100644 --- a/src/bg-ui/bg-table-btn.vue +++ b/src/bg-ui/bg-table-btn.vue @@ -4,30 +4,27 @@ - diff --git a/src/bg-ui/bg-table-btns.vue b/src/bg-ui/bg-table-btns.vue index f2adb80..c0e2ec4 100644 --- a/src/bg-ui/bg-table-btns.vue +++ b/src/bg-ui/bg-table-btns.vue @@ -11,7 +11,7 @@ @@ -19,7 +19,7 @@ @@ -78,7 +78,7 @@ export default { return name; } }, - showMOreBtns() { + showMoreBtns() { if (this.timer) clearTimeout(this.timer); this.showMore = true; diff --git a/src/bg-ui/bg-table-btns2.vue b/src/bg-ui/bg-table-btns2.vue new file mode 100644 index 0000000..7b95478 --- /dev/null +++ b/src/bg-ui/bg-table-btns2.vue @@ -0,0 +1,169 @@ + + + + + diff --git a/src/bg-ui/bg-table-pro.vue b/src/bg-ui/bg-table-pro.vue index b46b7ff..958144f 100644 --- a/src/bg-ui/bg-table-pro.vue +++ b/src/bg-ui/bg-table-pro.vue @@ -3,14 +3,13 @@ ref="table" class="bg-table bg-table-pro" :class="{ 'bg-table-tree': !!rowKey }" - v-bind="$attrs" + v-bind="attrs" :data="data" :row-key="rowKey" :tree-props="treeProps" @selection-change="selectionChange" - :default-expand-all="defaultExpandAll" tooltip-effect="light" - > + :default-expand-all="defaultExpandAll"> - + + :fixed="header.fixed"> - diff --git a/src/bg-ui/bg-upload-image.vue b/src/bg-ui/bg-upload-image.vue index 346e20e..ca99f4f 100644 --- a/src/bg-ui/bg-upload-image.vue +++ b/src/bg-ui/bg-upload-image.vue @@ -1,13 +1,13 @@ - diff --git a/src/bg-ui/bg-upload.vue b/src/bg-ui/bg-upload.vue index 07d5b43..8e7ecea 100644 --- a/src/bg-ui/bg-upload.vue +++ b/src/bg-ui/bg-upload.vue @@ -1,8 +1,5 @@ - diff --git a/src/bg-ui/index.js b/src/bg-ui/index.js index 710a6f7..f4455e7 100644 --- a/src/bg-ui/index.js +++ b/src/bg-ui/index.js @@ -14,8 +14,6 @@ import BgLayoutCard from './bg-layout-card.vue' import BgCard from './bg-card.vue' import BgInfo from './bg-info.vue' - import BgSteps from './bg-steps.vue' - import BgStep from './bg-step.vue' import BgBtns from './bg-btns.vue' import BgUpload from './bg-upload.vue' import BgUploadImage from './bg-upload-image.vue' @@ -34,6 +32,7 @@ import BgInnerTabs from './bg-inner-tabs.vue' import BgFilterGroup from './bg-filter-group.vue' import BgTableBtns from './bg-table-btns.vue' + import BgTableBtns2 from './bg-table-btns2.vue' const components = { BgIcon,//字体图标 @@ -49,8 +48,6 @@ const components = { BgLayoutCard, // 带标题的卡片 BgCard, // 详情卡片 BgInfo, // 表格信息 - BgSteps, // 步骤条 - BgStep, // 步骤条 BgBtns, // 按钮组 BgUpload, // 上传附件 BgUploadImage, // 上传单张图片 @@ -69,6 +66,7 @@ const components = { BgInnerTabs,//内部tab BgFilterGroup,//列表按钮及筛选 BgTableBtns,// 表格按钮组 + BgTableBtns2, }; const install = (Vue) => { diff --git a/src/bg-ui/index.scss b/src/bg-ui/index.scss index a84eb25..7fa5a38 100644 --- a/src/bg-ui/index.scss +++ b/src/bg-ui/index.scss @@ -265,17 +265,17 @@ a { padding: 0 10px; > * { - height: 36px !important; + height: 32px !important; background-color: transparent !important; font-size: 14px; - line-height: 36px !important; + line-height: 32px !important; color: #404a62; } > .el-pager > li { - height: 36px !important; + height: 32px !important; background-color: transparent !important; - line-height: 36px !important; + line-height: 32px !important; color: #404a62 !important; &.active { @@ -522,7 +522,7 @@ a { } > .bg-nav-list { - height: calc(100% - 135px); + height: calc(100% - 10px); box-sizing: border-box; ul.nav-list { @@ -644,17 +644,20 @@ a { &::before { display: none; } - .empty_container { - height: 500px; - padding-top: 247px; - img { - width: 257px; - height: 145px; - } - .text { - font-size: 16px; - color: #616f94; - line-height: 1; + .el-table__empty-block { + height: 500px!important; + .empty_container { + height: 500px; + padding-top: 247px; + img { + width: 257px; + height: 145px; + } + .text { + font-size: 16px; + color: #616f94; + line-height: 1; + } } } th, @@ -746,7 +749,7 @@ a { max-width: 388px; padding: 15px 12px; color: #202531; - box-shadow: 0px 4px 12px 0px + box-shadow: 0px 4px 12px 0px rgba(18, 30, 63, 0.1); border: solid 1px #e6e9ef; font-size: 14px; @@ -760,12 +763,26 @@ a { > .cell { padding: 0 10px !important; overflow: unset; - display: flex; + display: flex!important; justify-content: flex-start; align-items: center; } } + .el-table-column--selection{ + border-left: 1px solid #e6e9ef; + > .cell { + justify-content: center + } + } + + th.el-table-column--selection{ + > .cell { + display: flex; + justify-content: center + } + } + &.el-table--border { @@ -804,7 +821,12 @@ a { display: inline; color: #3759be; cursor: pointer; - + &:hover { + color: #738bd2 + } + &:active { + color: #2c4798; + } &.disabled { cursor: not-allowed; color: #a9b1c7; @@ -1495,7 +1517,7 @@ a { border-left: 1px solid #e3e5ef; color: #404a62; position: relative; - + > .copy-btn { position: absolute; top: 50%; @@ -1512,6 +1534,16 @@ a { color: #2b4695; } } + > .copy-btn-dis { + color: #dce0e8; + cursor: not-allowed!important; + &:hover { + color: #dce0e8; + } + &:active { + color: #dce0e8; + } + } } } @@ -1819,7 +1851,7 @@ a { > .el-upload-list { margin: 0 0 0 16px; - + > .el-upload-list__item { margin: 0; @@ -2337,6 +2369,9 @@ a { height: 32px; margin-top: 16px; float: right; + .el-input { + --el-input-height: 32px; + } .el-pagination { text-align: center; margin: 0 auto; @@ -2356,7 +2391,7 @@ a { li:hover { color: #3759be; } - } + } .el-input__wrapper { background-color: #fff; } @@ -2373,14 +2408,20 @@ a { .bg-card { background-color: #ffffff; - box-shadow: 0px 1px 4px 0px + box-shadow: 0px 1px 4px 0px rgba(0, 7, 101, 0.15); border-radius: 6px; margin-bottom: 16px; + .card-header { + display: flex; + justify-content: space-between; + align-items: center; + border-bottom: 1px solid #ebedf2; + } + .card-title { padding: 16px 16px; - border-bottom: 1px solid #ebedf2; font-weight: bold; display: flex; justify-content: flex-start; @@ -2517,7 +2558,7 @@ a { background-color: #f2f3f7; color: #202531; } - + &.disabled { color: #a9b1c7; } @@ -2534,4 +2575,4 @@ a { height: 10px; width: 100%; } -} \ No newline at end of file +} -- 2.26.0