jinql
/
vue-element-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix error with share link action (#269)

pull/3759/head
Leonel Matos 2020-01-28 12:26:47 -04:00 committed by Yamel Senih
parent 6e89373f51
commit 1b550dea89
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/ADempiere/ContextMenu/contextMenuMixin.js
View File

@ -567,7 +567,7 @@ export const contextMixin = {
if (String(this.valuesPanelToShare).length) { if (String(this.valuesPanelToShare).length) {
shareLink += this.valuesPanelToShare shareLink += this.valuesPanelToShare
} }
if (this.$route.query.action && this.$route.query.action !== 'create-new' && this.$route.query.action !== 'reference' && this.$route.query.action !== 'advancedQuery') { if (this.$route.query.action && this.$route.query.action !== 'create-new' && this.$route.query.action !== 'reference' && this.$route.query.action !== 'advancedQuery' && this.$route.query.action !== 'criteria') {
shareLink = window.location.href shareLink = window.location.href
} }
} }

9
src/components/ADempiere/Panel/index.vue
View File

@ -376,17 +376,20 @@ export default {
fieldItem.isShowedFromUser = true fieldItem.isShowedFromUser = true
fieldItem.value = parsedValueComponent({ fieldItem.value = parsedValueComponent({
fieldType: fieldItem.componentPath, fieldType: fieldItem.componentPath,
value: route.query[fieldItem.columnName] value: route.query[fieldItem.columnName],
referenceType: fieldItem.referenceType
}) })
if (String(route.query.isAdvancedQuery) === String(fieldItem.isAdvancedQuery)) { if (String(route.query.isAdvancedQuery) === String(fieldItem.isAdvancedQuery)) {
fieldItem.value = parsedValueComponent({ fieldItem.value = parsedValueComponent({
fieldType: fieldItem.componentPath, fieldType: fieldItem.componentPath,
value: route.query[fieldItem.columnName] value: route.query[fieldItem.columnName],
referenceType: fieldItem.referenceType
}) })
if (fieldItem.isRange && this.$route.query[`${fieldItem.columnName}_To`]) { if (fieldItem.isRange && this.$route.query[`${fieldItem.columnName}_To`]) {
fieldItem.valueTo = parsedValueComponent({ fieldItem.valueTo = parsedValueComponent({
fieldType: fieldItem.componentPath, fieldType: fieldItem.componentPath,
value: route.query[`${fieldItem.columnName}_To`] value: route.query[`${fieldItem.columnName}_To`],
referenceType: fieldItem.referenceType
}) })
} }
} }