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

fix(switch): 问题修复

parent 76d8d552
...@@ -11,10 +11,16 @@ ...@@ -11,10 +11,16 @@
}, },
data() { data() {
return { return {
switchVal: this.value, switchVal: false,
} }
}, },
watch: { watch: {
value: {
immediate: true,
handler(val) {
this.switchVal = val;
}
},
switchVal(val) { switchVal(val) {
this.$emit('input', val); this.$emit('input', val);
} }
......
...@@ -51,7 +51,7 @@ export default class ContextMenuMixin extends Vue { ...@@ -51,7 +51,7 @@ export default class ContextMenuMixin extends Vue {
if (!this.curEleIndex && this.curEleIndex !== 0) { return; } if (!this.curEleIndex && this.curEleIndex !== 0) { return; }
const elements = this.pageData.elements[this.curEleIndex]; const elements = this.pageData.elements[this.curEleIndex];
const component = document.getElementById(elements.id); const component = document.getElementById(elements.id);
if (!component || (component && component.commonStyle.position === 'absolute')) { return; } if (!component || (component && component.commonStyle && component.commonStyle.position === 'absolute')) { return; }
const height = component ? getStyle(component, 'height') : 0; const height = component ? getStyle(component, 'height') : 0;
const paddingTop = elements.commonStyle.paddingTop || 0; const paddingTop = elements.commonStyle.paddingTop || 0;
const paddingBottom = elements.commonStyle.paddingBottom || 0; const paddingBottom = elements.commonStyle.paddingBottom || 0;
......
...@@ -97,7 +97,7 @@ instance.interceptors.request.use( ...@@ -97,7 +97,7 @@ instance.interceptors.request.use(
if (config.accessToken) { config.headers['Access-Token'] = token; } if (config.accessToken) { config.headers['Access-Token'] = token; }
} }
const tenantId = localStorage.get('tenantId') || basicConfig.yxmTenantId || ''; const tenantId = localStorage.get('tenantId') || basicConfig.yxmTenantId || '';
config.headers['qg-tenant-id'] = tenantId || ''; config.headers['qg-tenant-id'] = tenantId;
return config; return config;
}, },
error => { error => {
......
...@@ -2176,9 +2176,9 @@ ...@@ -2176,9 +2176,9 @@
} }
}, },
"@qg/citrus-ui": { "@qg/citrus-ui": {
"version": "0.3.23-beta0", "version": "0.3.23-beta1",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.23-beta0.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.23-beta1.tgz",
"integrity": "sha512-Zk8w5QWA5LqwYdYjirFG5PwoMMLYUHOI4ym6po8CNFqO00BXYyahoeG3qXHlwL88yWl9DJ+378S5uk1nEfrKkQ==", "integrity": "sha512-FZ/Udd865iJY6Qtzcl2paKjB6rMZgytiOrVYDaUj0h/IjD08Z2hrDC3iGBwTPzMqwkBb3Fxjaw0ZDJNIFSPzpg==",
"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