diff --git a/src/bg-ui/hook/mixin-select-table.js b/src/bg-ui/hook/mixin-select-table.js
index 22f850dbd713ba0417d1c47dd916c979c77386e5..2704912484e593284b3654b439972d87afd32ff9 100644
--- a/src/bg-ui/hook/mixin-select-table.js
+++ b/src/bg-ui/hook/mixin-select-table.js
@@ -1,68 +1,71 @@
-import { reactive, toRefs,useAttrs } from 'vue'
-export function selectTableMixin(){
+import { reactive, toRefs, useAttrs } from "vue";
+export function selectTableMixin() {
const state = reactive({
- nowSelectData:[],
- allSelectData:{}
- })
-
- const attrs = useAttrs()
-// const nowSelectData = reactive([])
-// const allSelectData = reactive({})
+ nowSelectData: [],
+ allSelectData: {},
+ });
-const selectData = (val)=>{
- console.log(val);
- state.nowSelectData = val
- console.log('allSelectData');
- console.log(state.allSelectData);
- console.log(Object.keys(state.allSelectData).length);
-}
+ const attrs = useAttrs();
+ // const nowSelectData = reactive([])
+ // const allSelectData = reactive({})
-const initSelectTableData = (data)=>{
- return new Promise((reslove,reject)=>{
- data.forEach(e => {
- if(state.allSelectData[e[attrs.rowKey||'id']]){
- delete state.allSelectData[e[attrs.rowKey||'id']]
- state.nowSelectData.push(e)
- }
+ const selectData = (val) => {
+ state.nowSelectData = val;
+ };
+ //当某些表格有原始的选中数据时，初始化allSelectData
+ const initAllSelectData = (list) => {
+ list.forEach((e) => {
+ state.allSelectData[e[attrs.rowKey || "id"]] = e;
});
-
- console.log(state.nowSelectData);
- reslove(state.nowSelectData)
- })
-}
-
-const runPage=()=>{//翻页数据推进
- state.nowSelectData.forEach(e => {
- state.allSelectData[e[attrs.rowKey||'id']] = e
- });
- state.nowSelectData = []
-}
+ };
+ const initSelectTableData = (data) => {
+ return new Promise((reslove, reject) => {
+ data.forEach((e) => {
+ if (state.allSelectData[e[attrs.rowKey || "id"]]) {
+ delete state.allSelectData[e[attrs.rowKey || "id"]];
+ state.nowSelectData.push(e);
+ }
+ });
+ reslove(state.nowSelectData);
+ });
+ };
-const clearTable=()=>{//清除选中数据,在页面状态更新时使用
- state.allSelectData={}
- state.nowSelectData=[]
- clearSelection();
-}
+ const runPage = () => {
+ //翻页数据推进
+ state.nowSelectData.forEach((e) => {
+ state.allSelectData[e[attrs.rowKey || "id"]] = e;
+ });
+ state.nowSelectData = [];
+ };
-const dealSelectData=()=>{//最后提交处理数据
- state.nowSelectData.forEach(e => {
- state.allSelectData[e[attrs.rowKey||'id']] = e
- });
- return state.allSelectData
-}
+ // const clearTable = () => {
+ // //清除选中数据,在页面状态更新时使用
+ // state.allSelectData = {};
+ // state.nowSelectData = [];
+ // clearSelection();
+ // };
-const { nowSelectData, allSelectData } = toRefs(state)
+ const dealSelectData = () => {
+ //最后提交处理数据
+ const submitData = { ...state.allSelectData };
+ state.nowSelectData.forEach((e) => {
+ submitData[e[attrs.rowKey || "id"]] = e;
+ });
+ return submitData;
+ };
-return{
- nowSelectData,
- allSelectData,
- selectData,
- initSelectTableData,
- runPage,
- clearTable,
- dealSelectData
-}
+ const { nowSelectData, allSelectData } = toRefs(state);
+ return {
+ nowSelectData,
+ allSelectData,
+ initAllSelectData,
+ selectData,
+ initSelectTableData,
+ runPage,
+ // clearTable,
+ dealSelectData,
+ };
}
// export const selectTableMixin = {
@@ -88,7 +91,7 @@ return{
// this.nowSelectData.push(e)
// }
// });
-
+
// console.log(this.nowSelectData);
// if(this.nowSelectData.length){
// setTimeout(()=>{
@@ -115,4 +118,4 @@ return{
// return this.allSelectData
// }
// },
-// }
\ No newline at end of file
+// }
diff --git a/src/bg-ui/index.js b/src/bg-ui/index.js
index cdd71637986a1a20aeca3318c09acc9ed4de3dc9..1374c3573eacf8a4e885219b22011ca3ee9c8723 100644
--- a/src/bg-ui/index.js
+++ b/src/bg-ui/index.js
@@ -1,43 +1,44 @@
/**
* 全局组件
*/
- import BgIcon from './bg-icon.vue'
- import BgNav from './bg-nav.vue'
- import BgList from './bg-list.vue'
- import BgDetail from './bg-detail.vue'
- import BgFiltrate from './bg-filtrate.vue'
- import BgTable from './bg-table.vue'
- import BgTablePro from './bg-table-pro.vue'
- import BgTableBtn from './bg-table-btn.vue'
- import BgTabs from './bg-tabs.vue'
- import BgTab from './bg-tab.vue'
- import BgLayoutCard from './bg-layout-card.vue'
- import BgCard from './bg-card.vue'
- import BgInfo from './bg-info.vue'
- import BgBtns from './bg-btns.vue'
- import BgUpload from './bg-upload.vue'
- import BgUploadImage from './bg-upload-image.vue'
- import BgTags from './bg-tags.vue'
- import BgSwitch from './bg-switch.vue'
- import BgRichText from './bg-rich-text.vue'
- import BgCodeEditor from './bg-code-editor.vue'
- import BgFilter from './bg-filter.vue'
- import BgSort from './bg-sort.vue'
- import BgFilterDate from './bg-filter-date.vue'
- import bgUserUploadImage from './bg-user-upload-image.vue'
- import bgDetailTable from './bg-detail-table.vue'
- import bgDetailTable2 from './bg-detail-table2.vue'
- import debounce from './debounce'
- import BgPagination from './bg-pagination.vue'
- import BgInnerTabs from './bg-inner-tabs.vue'
- import BgFilterGroup from './bg-filter-group.vue'
- import BgSwitchEle from './bg-switch-ele.vue'
- import BgTableBtns from './bg-table-btns.vue'
- import BgTableBtns2 from './bg-table-btns2.vue'
- import BgPermission from './bg-permission.vue'
-
+import BgIcon from "./bg-icon.vue";
+import BgNav from "./bg-nav.vue";
+import BgList from "./bg-list.vue";
+import BgDetail from "./bg-detail.vue";
+import BgFiltrate from "./bg-filtrate.vue";
+import BgTable from "./bg-table.vue";
+import BgTablePro from "./bg-table-pro.vue";
+import BgTableBtn from "./bg-table-btn.vue";
+import BgTabs from "./bg-tabs.vue";
+import BgTab from "./bg-tab.vue";
+import BgLayoutCard from "./bg-layout-card.vue";
+import BgCard from "./bg-card.vue";
+import BgInfo from "./bg-info.vue";
+import BgBtns from "./bg-btns.vue";
+import BgUpload from "./bg-upload.vue";
+import BgUploadImage from "./bg-upload-image.vue";
+import BgTags from "./bg-tags.vue";
+import BgSwitch from "./bg-switch.vue";
+import BgRichText from "./bg-rich-text.vue";
+import BgCodeEditor from "./bg-code-editor.vue";
+import BgFilter from "./bg-filter.vue";
+import BgSort from "./bg-sort.vue";
+import BgFilterDate from "./bg-filter-date.vue";
+import bgUserUploadImage from "./bg-user-upload-image.vue";
+import bgDetailTable from "./bg-detail-table.vue";
+import bgDetailTable2 from "./bg-detail-table2.vue";
+import debounce from "./debounce";
+import BgPagination from "./bg-pagination.vue";
+import BgInnerTabs from "./bg-inner-tabs.vue";
+import BgFilterGroup from "./bg-filter-group.vue";
+import BgSwitchEle from "./bg-switch-ele.vue";
+import BgTableBtns from "./bg-table-btns.vue";
+import BgTableBtns2 from "./bg-table-btns2.vue";
+import BgPermission from "./bg-permission.vue";
+import BgFormGap from "./bg-form-gap.vue";
+
const components = {
- BgIcon,//字体图标
+ BgIcon, //字体图标
BgNav, // 左侧导航
BgList, // 列表页布局
BgDetail, // 详情页布局
@@ -56,21 +57,22 @@ const components = {
BgTags, // 标签
BgSwitch, // 开关
BgRichText, // 富文本
- BgCodeEditor,//代码输入
+ BgCodeEditor, //代码输入
BgFilter, // 首页筛选
BgSort, // 首页排序
BgFilterDate,
bgUserUploadImage,
- bgDetailTable,//详情展示组件1
- bgDetailTable2,//详情展示组件2
- debounce,//防抖组件
- BgPagination,// 分页组件
- BgInnerTabs,//内部tab
- BgFilterGroup,//高级搜索
- BgSwitchEle,// 基于element-plus封装的switch
- BgTableBtns,// 表格按钮组
- BgPermission,// 菜单选择
+ bgDetailTable, //详情展示组件1
+ bgDetailTable2, //详情展示组件2
+ debounce, //防抖组件
+ BgPagination, // 分页组件
+ BgInnerTabs, //内部tab
+ BgFilterGroup, //高级搜索
+ BgSwitchEle, // 基于element-plus封装的switch
+ BgTableBtns, // 表格按钮组
+ BgPermission, // 菜单选择
BgTableBtns2, // 表格按钮组-新
+ BgFormGap,
};
const install = (Vue) => {
diff --git a/src/bg-ui/index.scss b/src/bg-ui/index.scss
index ae8866a5b41f6074d4a85d769bf312ef360c03a9..b8f42b171c1e3455da3574f3b7c44b87f59935a5 100644
--- a/src/bg-ui/index.scss
+++ b/src/bg-ui/index.scss
@@ -840,7 +840,7 @@ a {
.bg-tabs {
background-color: #ffffff;
- box-shadow: 0px 6px 12px 0px rgba(0, 20, 53, 0.3);
+ box-shadow: 0px 4px 16px 0px rgba(18, 30, 0.03, 0.08);
border-radius: 12px;
overflow: hidden;
@@ -865,9 +865,10 @@ a {
align-items: center;
padding: 8px;
border-bottom: 1px solid #e6e9ef;
- font-size: 16px;
+ font-size: 20px;
line-height: 25px;
- color: #404a62;
+ color: #616f94;
+ background: #f7f7f9;
cursor: pointer;
&.current {
@@ -877,18 +878,19 @@ a {
border-right: 1px solid #e6e9ef;
border-bottom: 1px solid #fff;
border-left: 1px solid #e6e9ef;
- color: #e56600;
+ color: #3759be;
+ background-color: #fff;
overflow: hidden;
- &::before {
- content: "";
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 4px;
- background-color: #e56600;
- }
+ // &::before {
+ // content: "";
+ // position: absolute;
+ // top: 0;
+ // left: 0;
+ // width: 100%;
+ // height: 4px;
+ // background-color: #e56600;
+ // }
}
&:first-child {
diff --git a/src/components/bg-menu.vue b/src/components/bg-menu.vue
index ff0e0a4708bf693cc525e033fb99e59b8f7fcd74..33ddadaa87d0e5197ed1df87b0b0ae2a2854aa70 100644
--- a/src/components/bg-menu.vue
+++ b/src/components/bg-menu.vue
@@ -4,34 +4,36 @@
:class="{
transparent: transparentBg,
'is-front': isFront,
- }"
- >
-
+ }">
-
+
![]()
-
+ 
- 
+ 
+