Commit 12532280 authored by 郭志伟's avatar 郭志伟

fix(goodsTabs): 问题修复

parent 7ee84d96
...@@ -19,6 +19,7 @@ export default class GoodsTabsMixin extends Vue { ...@@ -19,6 +19,7 @@ export default class GoodsTabsMixin extends Vue {
handleGoodsTabs() { handleGoodsTabs() {
const goodsTabs = {}; const goodsTabs = {};
const pageData = cloneDeep(this.pageData); const pageData = cloneDeep(this.pageData);
const hasMoreGoodsTabs = pageData.elements.filter(element => element.name === 'cs-goods-tabs').length > 1;
pageData.elements.forEach((element, idx) => { pageData.elements.forEach((element, idx) => {
if (element.name === 'cs-goods-tabs' && element?.props?.list.length) { if (element.name === 'cs-goods-tabs' && element?.props?.list.length) {
const childs = []; const childs = [];
...@@ -39,6 +40,9 @@ export default class GoodsTabsMixin extends Vue { ...@@ -39,6 +40,9 @@ export default class GoodsTabsMixin extends Vue {
}); });
goodsTabs[element.id] = { idx, childs, childIndexs }; goodsTabs[element.id] = { idx, childs, childIndexs };
} }
if ((this.hasFloorNavCom || hasMoreGoodsTabs) && element.name === 'cs-goods-tabs') {
element.props.anchor = false;
}
}); });
let indexs = []; let indexs = [];
Object.keys(goodsTabs).forEach(key => { Object.keys(goodsTabs).forEach(key => {
...@@ -91,7 +95,6 @@ export default class GoodsTabsMixin extends Vue { ...@@ -91,7 +95,6 @@ export default class GoodsTabsMixin extends Vue {
} }
handleComAchorScrollEnable() { handleComAchorScrollEnable() {
const pageData = cloneDeep(this.pageData); const pageData = cloneDeep(this.pageData);
const hasMoreGoodsTabs = pageData.elements.filter(element => element.name === 'cs-goods-tabs').length > 1;
pageData.elements.forEach((element, idx) => { pageData.elements.forEach((element, idx) => {
if (element.name === 'cs-floor-nav') { if (element.name === 'cs-floor-nav') {
const idList = element.props.list.map(v => v.componentId); const idList = element.props.list.map(v => v.componentId);
...@@ -99,9 +102,6 @@ export default class GoodsTabsMixin extends Vue { ...@@ -99,9 +102,6 @@ export default class GoodsTabsMixin extends Vue {
throw new Error('楼层导航组件不可为空'); throw new Error('楼层导航组件不可为空');
} }
} }
if ((this.hasFloorNavCom || hasMoreGoodsTabs) && element.name === 'cs-goods-tabs') {
element.props.anchor = false;
}
}); });
return pageData; return pageData;
} }
......
...@@ -125,17 +125,11 @@ export default class DashBoard extends Mixins(ContextMenuMixin, GoodsTabsMixin, ...@@ -125,17 +125,11 @@ export default class DashBoard extends Mixins(ContextMenuMixin, GoodsTabsMixin,
this.setCurChildIndex(curChildIndex); this.setCurChildIndex(curChildIndex);
this.setRightTabName('组件设置'); this.setRightTabName('组件设置');
} }
handlePageSetClick() { handlePageSetClick() {
this.toggle(false); this.toggle(false);
this.setRightTabName('页面设置'); this.setRightTabName('页面设置');
} }
getPageElements(ids = []) {
return ids.length === 0 ? this.pageData.elements : ids.map(item => {
const targetEl =
this.pageData.elements.find(it => it.id === (item.componentId || item));
return targetEl;
});
}
toggle(val) { toggle(val) {
this.isCollapsed = val; this.isCollapsed = val;
......
...@@ -37,7 +37,7 @@ export default (appInfo: EggAppConfig) => { ...@@ -37,7 +37,7 @@ export default (appInfo: EggAppConfig) => {
}, },
client: { client: {
port: 32625, // Redis port port: 32625, // Redis port
host: '172.17.6.7', // Redis host host: '172.17.5.2', // Redis host
password: '', password: '',
db: 0 db: 0
} }
......
...@@ -1501,9 +1501,9 @@ ...@@ -1501,9 +1501,9 @@
} }
}, },
"@qg/citrus-ui": { "@qg/citrus-ui": {
"version": "0.3.5-bata3", "version": "0.3.5-beta5",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.5-bata3.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.5-beta5.tgz",
"integrity": "sha512-PsNMBo4YISZ8+htjZ4yu+UE4kQkI1OpryorNtTBehKluxfyc7wz1wnJ8240BZA5YYOkJuOU4Fz5SR1HolvBdxg==", "integrity": "sha512-AmC1Qa07cikivqxSU5nTibddd3cmfOlfZFxToPIWTd3tmys/ZCFlVU5tXuUYK/kufC4mtqluqY3VnjqZK4GVSg==",
"requires": { "requires": {
"@better-scroll/core": "^2.1.1", "@better-scroll/core": "^2.1.1",
"@qg/cherry-ui": "^2.23.9", "@qg/cherry-ui": "^2.23.9",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment