Merge branch 'cheney' into dev

src/views/sku-manage/product-category/component/AttributeManage.vue

@@ -195,12 +195,12 @@ const gridEvents = {
                   v-on="gridEvents">
           <template #toolbar_buttons>
             <div class="flex gap-2">
-              <div>
-                <PermissionButton :icon="Plus" v-if="hasPermission('SkuKindAttrCreate')" plain round type="primary" @click="handleCreate">
+              <div v-if="hasPermission('SkuKindAttrCreate')">
+                <PermissionButton :icon="Plus" plain round type="primary" @click="handleCreate">
                   新 增
                 </PermissionButton>
               </div>
-              <div v-if="hasPermission('SkuKindPublish')">
+              <div v-else-if="hasPermission('SkuKindPublish')">
                 <el-popconfirm :icon="InfoFilled" icon-color="#626AEF" title="发布后将无法更改, 是否继续?"
                                width="230" @confirm="handleRelease">
                   <template #reference>
@@ -214,6 +214,9 @@ const gridEvents = {
                   </template>
                 </el-popconfirm>
               </div>
+              <div v-else class="italic">
+                <el-tag type="warning">暂无权限</el-tag>
+              </div>
             </div>
           </template>
           <template #toolbar_tools>

src/views/sku-manage/product-category/component/DataTableSlot.vue

@@ -43,7 +43,7 @@ function onConfirm() {
             </el-icon>
           </PermissionButton>
         </div>
-        <div v-if="hasPermission('SkuKindDelete')">
+        <div v-else-if="hasPermission('SkuKindDelete')">
           <el-popconfirm
               :icon="InfoFilled"
               icon-color="#626AEF"