diff --git a/PC/InterFace.Dash/src/components/tablePagination/index.vue b/PC/InterFace.Dash/src/components/tablePagination/index.vue index a081346..455d233 100644 --- a/PC/InterFace.Dash/src/components/tablePagination/index.vue +++ b/PC/InterFace.Dash/src/components/tablePagination/index.vue @@ -308,7 +308,7 @@ export default { }else{ if(this.noUsePermissionBtn.indexOf(item.name) < 0){ let _scope = item.clientScope || localStorage.getItem('appClientScope') - item.permission = [_scope + '.' +this.$route.name+'.'+item.name] + item.permission = [_scope + '.' +this.$route.name+'.'+(item.permissionName || item.name)] }else{ item.permission = [] } diff --git a/PC/InterFace.Dash/src/utils/defaultButtons.js b/PC/InterFace.Dash/src/utils/defaultButtons.js index 8dcf1c8..85e47d7 100644 --- a/PC/InterFace.Dash/src/utils/defaultButtons.js +++ b/PC/InterFace.Dash/src/utils/defaultButtons.js @@ -15,7 +15,8 @@ export function defaultAddBtn(option) { label: i18n.t('btns.add'), name: "Create", size: "mini", - background:"#31bb99" + background:"#31bb99", + permissionName:"Create", }) } @@ -124,5 +125,6 @@ function __defaultBtnOption(option,specific){ isRedundance:option && option.isRedundance ? option.isRedundance : false, permission:option && option.permission ? option.permission : null, clientScope:option && option.clientScope ? option.clientScope : null, + permissionName:option && option.permissionName ? option.permissionName : specific.permissionName, } } \ No newline at end of file diff --git a/PC/InterFace.Dash/src/views/menuList/AsnMstr_child_add_demo.vue b/PC/InterFace.Dash/src/views/menuList/AsnMstr_child_add_demo.vue new file mode 100644 index 0000000..1032eae --- /dev/null +++ b/PC/InterFace.Dash/src/views/menuList/AsnMstr_child_add_demo.vue @@ -0,0 +1,113 @@ + + + \ No newline at end of file diff --git a/PC/UI.WinIn.FasterZ.Job/src/components/tablePagination/index.vue b/PC/UI.WinIn.FasterZ.Job/src/components/tablePagination/index.vue index a081346..455d233 100644 --- a/PC/UI.WinIn.FasterZ.Job/src/components/tablePagination/index.vue +++ b/PC/UI.WinIn.FasterZ.Job/src/components/tablePagination/index.vue @@ -308,7 +308,7 @@ export default { }else{ if(this.noUsePermissionBtn.indexOf(item.name) < 0){ let _scope = item.clientScope || localStorage.getItem('appClientScope') - item.permission = [_scope + '.' +this.$route.name+'.'+item.name] + item.permission = [_scope + '.' +this.$route.name+'.'+(item.permissionName || item.name)] }else{ item.permission = [] } diff --git a/PC/UI.WinIn.FasterZ.Job/src/utils/defaultButtons.js b/PC/UI.WinIn.FasterZ.Job/src/utils/defaultButtons.js index 8dcf1c8..85e47d7 100644 --- a/PC/UI.WinIn.FasterZ.Job/src/utils/defaultButtons.js +++ b/PC/UI.WinIn.FasterZ.Job/src/utils/defaultButtons.js @@ -15,7 +15,8 @@ export function defaultAddBtn(option) { label: i18n.t('btns.add'), name: "Create", size: "mini", - background:"#31bb99" + background:"#31bb99", + permissionName:"Create", }) } @@ -124,5 +125,6 @@ function __defaultBtnOption(option,specific){ isRedundance:option && option.isRedundance ? option.isRedundance : false, permission:option && option.permission ? option.permission : null, clientScope:option && option.clientScope ? option.clientScope : null, + permissionName:option && option.permissionName ? option.permissionName : specific.permissionName, } } \ No newline at end of file diff --git a/PC/UI.WinIn.FasterZ.Store/src/components/tablePagination/index.vue b/PC/UI.WinIn.FasterZ.Store/src/components/tablePagination/index.vue index a081346..455d233 100644 --- a/PC/UI.WinIn.FasterZ.Store/src/components/tablePagination/index.vue +++ b/PC/UI.WinIn.FasterZ.Store/src/components/tablePagination/index.vue @@ -308,7 +308,7 @@ export default { }else{ if(this.noUsePermissionBtn.indexOf(item.name) < 0){ let _scope = item.clientScope || localStorage.getItem('appClientScope') - item.permission = [_scope + '.' +this.$route.name+'.'+item.name] + item.permission = [_scope + '.' +this.$route.name+'.'+(item.permissionName || item.name)] }else{ item.permission = [] } diff --git a/PC/UI.WinIn.FasterZ.Store/src/utils/defaultButtons.js b/PC/UI.WinIn.FasterZ.Store/src/utils/defaultButtons.js index 8dcf1c8..85e47d7 100644 --- a/PC/UI.WinIn.FasterZ.Store/src/utils/defaultButtons.js +++ b/PC/UI.WinIn.FasterZ.Store/src/utils/defaultButtons.js @@ -15,7 +15,8 @@ export function defaultAddBtn(option) { label: i18n.t('btns.add'), name: "Create", size: "mini", - background:"#31bb99" + background:"#31bb99", + permissionName:"Create", }) } @@ -124,5 +125,6 @@ function __defaultBtnOption(option,specific){ isRedundance:option && option.isRedundance ? option.isRedundance : false, permission:option && option.permission ? option.permission : null, clientScope:option && option.clientScope ? option.clientScope : null, + permissionName:option && option.permissionName ? option.permissionName : specific.permissionName, } } \ No newline at end of file