diff --git a/src/lang/en.js b/src/lang/en.js index 656b746b1f840039859fc17dece6f0c7e0334c38..2af355b1fc808cd0d25339abc2cf1380476c431f 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -87,7 +87,8 @@ export default { }, permission: { roles: 'Your roles', - switchRoles: 'Switch roles' + switchRoles: 'Switch roles', + tips: 'In some cases it is not suitable to use v-permission, such as element Tab component or el-table-column and other asynchronous rendering dom cases which can only be achieved by manually setting the v-if.' }, guide: { description: 'The guide page is useful for some people who entered the project for the first time. You can briefly introduce the features of the project. Demo is based on ', diff --git a/src/lang/es.js b/src/lang/es.js index 69218ad2106c6b8c8648942aca15a65c99a5c13a..1268f0835b58f49b2d8399d1d7d4a6ae29701aae 100755 --- a/src/lang/es.js +++ b/src/lang/es.js @@ -87,7 +87,8 @@ export default { }, permission: { roles: 'Tus permisos', - switchRoles: 'Cambiar permisos' + switchRoles: 'Cambiar permisos', + tips: 'In some cases it is not suitable to use v-permission, such as element Tab component or el-table-column and other asynchronous rendering dom cases which can only be achieved by manually setting the v-if.' }, guide: { description: 'The guide page is useful for some people who entered the project for the first time. You can briefly introduce the features of the project. Demo is based on ', diff --git a/src/lang/zh.js b/src/lang/zh.js index 021a5fa71ca27417e2b70deb0e1d95c4200cfa93..4371713fe4a7684418f4981e4c85c36889e33c76 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -87,7 +87,8 @@ export default { }, permission: { roles: 'ä½ çš„æƒé™', - switchRoles: '切æ¢æƒé™' + switchRoles: '切æ¢æƒé™', + tips: '在æŸäº›æƒ…况下,ä¸é€‚åˆä½¿ç”¨ v-permission。例如:Element-UI çš„ Tab 组件或 el-table-column 以åŠå…¶å®ƒåŠ¨æ€æ¸²æŸ“ dom çš„åœºæ™¯ã€‚ä½ åªèƒ½é€šè¿‡æ‰‹åŠ¨è®¾ç½® v-if æ¥å®žçŽ°ã€‚' }, guide: { description: 'å¼•å¯¼é¡µå¯¹äºŽä¸€äº›ç¬¬ä¸€æ¬¡è¿›å…¥é¡¹ç›®çš„äººå¾ˆæœ‰ç”¨ï¼Œä½ å¯ä»¥ç®€å•ä»‹ç»ä¸‹é¡¹ç›®çš„功能。本 Demo 是基于', diff --git a/src/views/permission/directive.vue b/src/views/permission/directive.vue index 2817f1c522066064b59e0557c5e9a454b2c849ed..df277ddcffdf23c8351e6a5fb73faecea246dd88 100644 --- a/src/views/permission/directive.vue +++ b/src/views/permission/directive.vue @@ -2,29 +2,53 @@ <div class="app-container"> <switch-roles @change="handleRolesChange" /> <div :key="key" style="margin-top:30px;"> - <span v-permission="['admin']" class="permission-alert"> - Only - <el-tag class="permission-tag" size="small">admin</el-tag> can see this - </span> - <span v-permission="['editor']" class="permission-alert"> - Only - <el-tag class="permission-tag" size="small">editor</el-tag> can see this - </span> - <span v-permission="['admin','editor']" class="permission-alert"> - Both - <el-tag class="permission-tag" size="small">admin</el-tag> and - <el-tag class="permission-tag" size="small">editor</el-tag> can see this - </span> + <div> + <span v-permission="['admin']" class="permission-alert"> + Only + <el-tag class="permission-tag" size="small">admin</el-tag> can see this + </span> + <el-tag v-permission="['admin']" class="permission-sourceCode" type="info">v-permission="['admin']"</el-tag> + </div> + + <div> + <span v-permission="['editor']" class="permission-alert"> + Only + <el-tag class="permission-tag" size="small">editor</el-tag> can see this + </span> + <el-tag v-permission="['editor']" class="permission-sourceCode" type="info">v-permission="['editor']"</el-tag> + </div> + + <div> + <span v-permission="['admin','editor']" class="permission-alert"> + Both + <el-tag class="permission-tag" size="small">admin</el-tag> and + <el-tag class="permission-tag" size="small">editor</el-tag> can see this + </span> + <el-tag v-permission="['admin','editor']" class="permission-sourceCode" type="info">v-permission="['admin','editor']"</el-tag> + </div> </div> - <div :key="'checkPermission'+key" style="margin-top:30px;"> - <code>In some cases it is not suitable to use v-permission, such as element Tab component which can only be achieved by manually setting the v-if. + <div :key="'checkPermission'+key" style="margin-top:60px;"> + <code> + {{ $t('permission.tips') }} <br> e.g. </code> - <el-tabs type="border-card" style="width:500px;"> - <el-tab-pane v-if="checkPermission(['admin'])" label="Admin">Admin can see this</el-tab-pane> - <el-tab-pane v-if="checkPermission(['editor'])" label="Editor">Editor can see this</el-tab-pane> - <el-tab-pane v-if="checkPermission(['admin','editor'])" label="Admin-OR-Editor">Both admin or editor can see this</el-tab-pane> + + <el-tabs type="border-card" style="width:550px;"> + <el-tab-pane v-if="checkPermission(['admin'])" label="Admin"> + Admin can see this + <el-tag class="permission-sourceCode" type="info">v-if="checkPermission(['admin'])"</el-tag> + </el-tab-pane> + + <el-tab-pane v-if="checkPermission(['editor'])" label="Editor"> + Editor can see this + <el-tag class="permission-sourceCode" type="info">v-if="checkPermission(['editor'])"</el-tag> + </el-tab-pane> + + <el-tab-pane v-if="checkPermission(['admin','editor'])" label="Admin-OR-Editor"> + Both admin or editor can see this + <el-tag class="permission-sourceCode" type="info">v-if="checkPermission(['admin','editor'])"</el-tag> + </el-tab-pane> </el-tabs> </div> </div> @@ -57,14 +81,17 @@ export default{ .app-container { /deep/ .permission-alert { width: 320px; - margin-top: 30px; + margin-top: 15px; background-color: #f0f9eb; color: #67c23a; padding: 8px 16px; border-radius: 4px; - display: block; + display: inline-block; + } + /deep/ .permission-sourceCode { + margin-left: 15px; } - /deep/ .permission-tag{ + /deep/ .permission-tag { background-color: #ecf5ff; } }