From 4c10184311f32e94e9d5399ddb08f256cb2cabf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=BC=9F=E5=BA=9A?= Date: Tue, 27 Dec 2022 17:28:16 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9Abg-ui=E6=94=B9=E5=86=99=E4=B8=BA?= =?UTF-8?q?vue3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bg-ui/bg-btns.vue | 33 +-- src/bg-ui/bg-card.vue | 23 +- src/bg-ui/bg-code-editor.vue | 182 ++++++------ src/bg-ui/bg-detail-table.vue | 181 ++++++------ src/bg-ui/bg-detail-table2.vue | 135 ++++----- src/bg-ui/bg-detail.vue | 156 +++++----- src/bg-ui/bg-filter-date.vue | 46 ++- src/bg-ui/bg-filter-group.vue | 74 +++-- src/bg-ui/bg-filter.vue | 139 +++++---- src/bg-ui/bg-filtrate.vue | 128 ++++----- src/bg-ui/bg-icon.vue | 18 +- src/bg-ui/bg-info.vue | 271 +++++++++--------- src/bg-ui/bg-inner-tabs.vue | 89 +++--- src/bg-ui/bg-layout-card.vue | 141 +++++----- src/bg-ui/bg-list.vue | 44 ++- src/bg-ui/bg-nav-list.vue | 115 ++++---- src/bg-ui/bg-nav.vue | 38 ++- src/bg-ui/bg-pagination.vue | 31 +- src/bg-ui/bg-permission-option.vue | 123 ++++---- src/bg-ui/bg-permission.vue | 375 +++++++++++-------------- src/bg-ui/bg-rich-text.vue | 139 +++++---- src/bg-ui/bg-sort.vue | 73 +++-- src/bg-ui/bg-step.vue | 42 --- src/bg-ui/bg-steps.vue | 106 ------- src/bg-ui/bg-switch-ele.vue | 41 ++- src/bg-ui/bg-switch.vue | 160 +++++------ src/bg-ui/bg-tab.vue | 81 +++--- src/bg-ui/bg-table-btn.vue | 39 ++- src/bg-ui/bg-table-pro.vue | 259 ++++++++--------- src/bg-ui/bg-table.vue | 140 ++++----- src/bg-ui/bg-tabs.vue | 76 +++-- src/bg-ui/bg-tags.vue | 86 +++--- src/bg-ui/bg-upload-image.vue | 354 +++++++++++------------ src/bg-ui/bg-upload.vue | 288 +++++++++---------- src/bg-ui/bg-user-upload-image.vue | 97 ++++--- src/bg-ui/index.js | 4 - src/bg-ui/index.scss | 170 ----------- src/components/ability-card.vue | 113 ++++---- src/components/ability-list.vue | 42 +-- src/components/input-table.vue | 298 ++++++++++---------- src/components/table/MyTableColumn.vue | 29 +- 41 files changed, 2215 insertions(+), 2764 deletions(-) delete mode 100644 src/bg-ui/bg-step.vue delete mode 100644 src/bg-ui/bg-steps.vue diff --git a/src/bg-ui/bg-btns.vue b/src/bg-ui/bg-btns.vue index abe7773..a806416 100644 --- a/src/bg-ui/bg-btns.vue +++ b/src/bg-ui/bg-btns.vue @@ -7,32 +7,27 @@ 'is-active': modelValue === btn.value, }" :key="btn.value" - @click="selectBtn(btn)" - > + @click="selectBtn(btn)"> {{ btn.name }} - diff --git a/src/bg-ui/bg-card.vue b/src/bg-ui/bg-card.vue index 11f5baf..d5191ab 100644 --- a/src/bg-ui/bg-card.vue +++ b/src/bg-ui/bg-card.vue @@ -12,18 +12,15 @@ - diff --git a/src/bg-ui/bg-code-editor.vue b/src/bg-ui/bg-code-editor.vue index dbcfcfd..d239f2c 100644 --- a/src/bg-ui/bg-code-editor.vue +++ b/src/bg-ui/bg-code-editor.vue @@ -2,72 +2,69 @@ + wrap: true, + }" /> 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..7b45e8f 100644 --- a/src/bg-ui/bg-detail.vue +++ b/src/bg-ui/bg-detail.vue @@ -9,8 +9,7 @@ :class="{ current: activeName === item.name, }" - @click="changeActiveName(item, index)" - > + @click="changeActiveName(item, index)"> {{ item.label }}
  • @@ -44,8 +43,7 @@ :class="{ current: activeName === item.name, }" - @click="changeActiveName(item, index)" - > + @click="changeActiveName(item, index)"> {{ item.label }}
  • @@ -60,84 +58,76 @@ - diff --git a/src/bg-ui/bg-filter-date.vue b/src/bg-ui/bg-filter-date.vue index 27421d7..f73061a 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 bd1b994..70afbd6 100644 --- a/src/bg-ui/bg-filter-group.vue +++ b/src/bg-ui/bg-filter-group.vue @@ -1,70 +1,84 @@ \ 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..4e9fd4f 100644 --- a/src/bg-ui/bg-filter.vue +++ b/src/bg-ui/bg-filter.vue @@ -7,91 +7,82 @@ v-for="(item, index) in fullOptions" :class="{ current: selection.indexOf(item.value) > -1 }" :key="'li_' + index" - @click="selectAction(item)" - > + @click="selectAction(item)"> {{ item.name }}
  • - diff --git a/src/bg-ui/bg-filtrate.vue b/src/bg-ui/bg-filtrate.vue index ac50c8d..ae06e23 100644 --- a/src/bg-ui/bg-filtrate.vue +++ b/src/bg-ui/bg-filtrate.vue @@ -6,85 +6,75 @@ 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 2ff2984..0a2ca40 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 738d54b..98db35d 100644 --- a/src/bg-ui/bg-info.vue +++ b/src/bg-ui/bg-info.vue @@ -6,161 +6,162 @@ :key="'li_' + index" :style="{ width: item.full ? `100%` : `calc(100% / ${col})`, - }" - > - + }"> + {{ item.name }} - - + - {{item.value}} - {{secret(item.value)}} - {{idCardShow ? item.value : idcard(item.value)}} - {{item.value}} - {{ item.value }} + width: item.copy ? 'calc(100% - 36px)' : item.download || item.password ? 'calc(100% - 22px)' : '100%', + color: item.download ? '#3759be' : '#404a62', + }"> + + {{ item.value }} + {{ secret(item.value) }} + {{ idCardShow ? item.value : idcard(item.value) }} + {{ + item.value + }} + {{ item.value }} - 复制 + - 复制 - - - - + + - + + @click="changeView(item)"> - diff --git a/src/bg-ui/bg-inner-tabs.vue b/src/bg-ui/bg-inner-tabs.vue index 2726a63..c17e1dc 100644 --- a/src/bg-ui/bg-inner-tabs.vue +++ b/src/bg-ui/bg-inner-tabs.vue @@ -1,64 +1,71 @@ diff --git a/src/bg-ui/bg-layout-card.vue b/src/bg-ui/bg-layout-card.vue index 7e545d9..b2e4518 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,82 @@ - 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..e487a06 100644 --- a/src/bg-ui/bg-nav-list.vue +++ b/src/bg-ui/bg-nav-list.vue @@ -1,18 +1,23 @@ - diff --git a/src/bg-ui/bg-permission.vue b/src/bg-ui/bg-permission.vue index 7b20194..3a5283b 100644 --- a/src/bg-ui/bg-permission.vue +++ b/src/bg-ui/bg-permission.vue @@ -1,13 +1,7 @@ - diff --git a/src/bg-ui/bg-rich-text.vue b/src/bg-ui/bg-rich-text.vue index 693255e..d1bac2a 100644 --- a/src/bg-ui/bg-rich-text.vue +++ b/src/bg-ui/bg-rich-text.vue @@ -1,87 +1,118 @@ \ No newline at end of file + emit("update:modelValue", valueHtml.value); +}; +const handleBlur = () => { + formItem?.validate?.("blur").catch((err) => console.warn(err)); +}; + diff --git a/src/bg-ui/bg-sort.vue b/src/bg-ui/bg-sort.vue index c0b2eb1..caa9765 100644 --- a/src/bg-ui/bg-sort.vue +++ b/src/bg-ui/bg-sort.vue @@ -3,52 +3,43 @@ + :class="{ current: item.value === modelValue }" + @click="selectAction(item)"> {{ item.name }} - \ 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-ele.vue b/src/bg-ui/bg-switch-ele.vue index 1646344..a9ff623 100644 --- a/src/bg-ui/bg-switch-ele.vue +++ b/src/bg-ui/bg-switch-ele.vue @@ -7,17 +7,16 @@ inline-prompt :active-text="activeText" :inactive-text="inactiveText" - @change="changeState" - /> + @change="changeState" /> diff --git a/src/bg-ui/bg-switch.vue b/src/bg-ui/bg-switch.vue index 71463f8..97a81f7 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..3d7e3da 100644 --- a/src/bg-ui/bg-tab.vue +++ b/src/bg-ui/bg-tab.vue @@ -9,51 +9,44 @@ - diff --git a/src/bg-ui/bg-table-btn.vue b/src/bg-ui/bg-table-btn.vue index e2e2181..6154065 100644 --- a/src/bg-ui/bg-table-btn.vue +++ b/src/bg-ui/bg-table-btn.vue @@ -4,30 +4,25 @@ - diff --git a/src/bg-ui/bg-table-pro.vue b/src/bg-ui/bg-table-pro.vue index 40441c7..8e61ac8 100644 --- a/src/bg-ui/bg-table-pro.vue +++ b/src/bg-ui/bg-table-pro.vue @@ -3,13 +3,12 @@ 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" - > + :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 bf31b3e..be3d404 100644 --- a/src/bg-ui/bg-upload-image.vue +++ b/src/bg-ui/bg-upload-image.vue @@ -1,6 +1,6 @@ - diff --git a/src/bg-ui/bg-upload.vue b/src/bg-ui/bg-upload.vue index 5bbf77d..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 f3c02e3..cdd7163 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' @@ -52,8 +50,6 @@ const components = { BgLayoutCard, // 带标题的卡片 BgCard, // 详情卡片 BgInfo, // 表格信息 - BgSteps, // 步骤条 - BgStep, // 步骤条 BgBtns, // 按钮组 BgUpload, // 上传附件 BgUploadImage, // 上传单张图片 diff --git a/src/bg-ui/index.scss b/src/bg-ui/index.scss index f71ab04..459fe85 100644 --- a/src/bg-ui/index.scss +++ b/src/bg-ui/index.scss @@ -1529,176 +1529,6 @@ a { } } -.bg-steps { - background-color: #ffffff; - box-shadow: 0px 1px 4px 0px rgba(0, 7, 101, 0.1); - border-radius: 6px; - padding: 14px; - - > .bg-steps-container { - .steps-nav { - padding: 18px 16px 31px; - border-bottom: 1px solid #f4f7fc; - - > ul { - display: flex; - justify-content: space-between; - align-items: center; - - > .step-item { - display: flex; - justify-content: flex-start; - align-items: center; - margin: 0 16px; - - > .step-icon { - position: relative; - width: 30px; - height: 30px; - border-radius: 50%; - background-color: #e3e5ef; - - &::before { - content: ""; - width: 16px; - height: 16px; - border-radius: 50%; - background-color: #bcc1d0; - position: absolute; - top: 7px; - left: 7px; - } - } - - > .step-hightlight-icon { - position: relative; - width: 70px; - height: 70px; - border-radius: 50%; - background-color: #2d96c9; - display: flex; - justify-content: center; - align-items: center; - display: none; - - &::before { - content: ""; - width: 60px; - height: 60px; - border: solid 3px #84bfdc; - box-sizing: border-box; - border-radius: 50%; - position: absolute; - top: 5px; - left: 5px; - } - } - - > .step-title { - margin-left: 15px; - - > p { - line-height: 1; - color: #bcc1d0; - - &:nth-child(1) { - font-weight: bolder; - font-size: 18px; - } - - &:nth-child(2) { - font-size: 14px; - margin-top: 12px; - } - } - } - - &.done, - &.current { - > .step-icon { - display: none; - } - - > .step-hightlight-icon { - display: flex; - } - } - - > .step-title { - margin-left: 15px; - - > p { - &:nth-child(1) { - color: #242c43; - } - - &:nth-child(2) { - color: #8890a7; - } - } - } - } - - > .step-line { - width: 100px; - flex: 1 1 auto; - height: 4px; - background-color: #e3e5ef; - border-radius: 2px 0px 0px 2px; - - &.done, - &.current { - background-color: #2d96c9; - } - } - } - } - - .steps-content { - margin-top: 20px; - } - } -} - -.bg-step { - .step-done { - display: flex; - justify-self: center; - align-items: center; - - > .done-icon { - margin-right: 15px; - } - - > .done-info { - > p { - line-height: 1.5; - - &:nth-child(1) { - font-weight: bolder; - font-size: 18px; - color: #242c43; - } - - &:nth-child(2) { - font-size: 14px; - color: #8890a7; - margin-top: 5px; - } - } - } - } - - > .step-action { - overflow: hidden; - margin-top: 20px; - - > .fr { - float: right; - } - } -} - .bg-btns { display: inline-block; diff --git a/src/components/ability-card.vue b/src/components/ability-card.vue index 924c656..3d2c77e 100644 --- a/src/components/ability-card.vue +++ b/src/components/ability-card.vue @@ -1,68 +1,64 @@ \ No newline at end of file + diff --git a/src/components/ability-list.vue b/src/components/ability-list.vue index 89a7ebc..c771a84 100644 --- a/src/components/ability-list.vue +++ b/src/components/ability-list.vue @@ -1,7 +1,13 @@ \ No newline at end of file + diff --git a/src/components/input-table.vue b/src/components/input-table.vue index b301f32..d3ca6a7 100644 --- a/src/components/input-table.vue +++ b/src/components/input-table.vue @@ -1,47 +1,40 @@