@skyfox2000/webui 1.6.17 → 1.6.19

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@skyfox2000/webui",
-   "version": "1.6.17",
+   "version": "1.6.19",
    "description": "后台前端通用组件定义, 支持国际化",
    "type": "module",
    "keywords": [],

package/src/components/content/table/index.vue

@@ -17,6 +17,7 @@ import Switch from '../../form/switch/index.vue';
 import { AnyData } from '@skyfox2000/fapi';
 import { ProviderKeys } from '@/index';
 import { $t } from '@/locales/index';
+import { getPermission } from '@/config/permission';
 
 const props = withDefaults(defineProps<{
    /**
@@ -59,10 +60,13 @@ defineOptions({
 const attrs = useAttrs(); // 手动获取 $attrs
 
 const gridCtrl = props.gridCtrl;
-
-// 响应式获取当前路由路径
 const currentPath = computed(() => AppRouter.currentRoute.value.path);
 
+// 获取启用状态权限角色
+const enabledRole = computed(() => {
+   return gridCtrl.permission?.enabled ?? getPermission().enabled ?? ['Super', 'Admin'];
+});
+
 if (gridCtrl) {
    gridCtrl.pageNo.value = 1;
    gridCtrl.total.value = 0;
@@ -217,7 +221,7 @@ onMounted(async () => {
          <slot name="bodyCell" :column="bodyCell?.column" :record="bodyCell?.record"></slot>
          <template v-if="gridCtrl && bodyCell?.column?.dataIndex === 'enabled'">
             <Switch v-model:checked="bodyCell.record[gridCtrl.statusKey]"
-               v-auth:disable="{ url: currentPath, role: ['Super', 'Admin'], permit: ':enabled' }"
+               v-auth:disable="{ url: currentPath, role: enabledRole, permit: ':enabled' }"
                :disabled="statusDisabled ? statusDisabled(bodyCell.record) : false" :data="OPTIONS.EnableDisable"
                @click="gridStatusUpdate(gridCtrl, bodyCell.record)" :class="[
                   'w-[58px]',

package/src/components/content/table/tableOperate.vue

@@ -10,31 +10,28 @@ import { getToolGroup, getToolVisible, getToolStatus, onToolClicked } from '@/ut
 import { ConfigProvider, Button, Space, DropdownButton, Menu, MenuItem, Popconfirm } from 'ant-design-vue';
 import { computed } from 'vue';
 import { $t } from '@/locales/index';
+import { getPermission } from '@/config/permission';
 
 const props = defineProps<{
-   /**
-    * 数据行记录
-    */
    record: Record<string, any>;
-   /**
-    * 表格数据控制
-    */
    gridCtrl: GridControl<T>;
 }>();
 
 const gridCtrl = props.gridCtrl;
-
-// 响应式获取当前路由路径
 const currentPath = computed(() => AppRouter.currentRoute.value.path);
 
-/// 兼容其它按钮操作参数
-const defaultOperates: ButtonTool[] = [
+// 获取权限角色：gridCtrl.permission > 全局配置 > 默认值
+const getRole = (key: 'edit' | 'delete') => {
+   return gridCtrl.permission?.[key] ?? getPermission()[key] ?? ['Super', 'Admin'];
+};
+
+const defaultOperates = computed<ButtonTool[]>(() => [
    {
       key: 'Edit',
       label: $t('webui.common.edit'),
       type: 'primary',
       visible: true,
-      role: ['Super', 'Admin'],
+      role: getRole('edit'),
       permit: ':edit',
       click: () => onGridRowEdit<T>(gridCtrl, props.record as T),
    },
@@ -44,15 +41,15 @@ const defaultOperates: ButtonTool[] = [
       type: 'primary',
       visible: true,
       danger: true,
-      role: ['Super', 'Admin'],
+      role: getRole('delete'),
       permit: ':delete',
       confirm: true,
       confirmText: $t('webui.components.content.table.confirmDelete'),
       click: () => onGridRowDelete<T>(gridCtrl, props.record as T),
    },
-];
+]);
 
-const { buttons, menus } = getToolGroup(defaultOperates, 0, gridCtrl.operates);
+const { buttons, menus } = getToolGroup(defaultOperates.value, 0, gridCtrl.operates);
 
 const disabled = (item: ButtonTool): boolean => {
    if (typeof item.disabled == 'boolean') {
@@ -82,8 +79,7 @@ const disabled = (item: ButtonTool): boolean => {
          <template v-for="item in buttons" :key="item.key">
             <Popconfirm v-if="getToolVisible(item, props.record)" :disabled="disabled(item) || !item.confirm"
                :cancelText="$t('webui.common.no')" :okText="$t('webui.common.yes')" :title="item.confirmText"
-               :okButtonProps="{ size: 'small' }"
-               :cancelButtonProps="{ size: 'small' }"
+               :okButtonProps="{ size: 'small' }" :cancelButtonProps="{ size: 'small' }"
                @confirm="onToolClicked(item, gridCtrl.page, gridCtrl, props.record, true)">
                <Button :key="item.key" :type="item.type ?? 'text'" :danger="item.danger"
                   v-if="getToolVisible(item, props.record)" :disabled="disabled(item)"

package/src/components/content/toolbar/index.vue

@@ -12,15 +12,10 @@ import { Button } from '../../common';
 import IconTool from './icontool.vue';
 import { ref, watch, computed } from 'vue';
 import { $t } from '@/locales/index';
+import { getPermission } from '@/config/permission';
 
 const props = defineProps<{
-   /**
-    * 表格控制器
-    */
    gridCtrl: GridControl<T>;
-   /**
-    * 表单控制器
-    */
    editorCtrl: EditorControl<T>;
 }>();
 
@@ -28,23 +23,25 @@ const gridCtrl = props.gridCtrl;
 const pageCtrl = gridCtrl.page;
 const editorCtrl = props.editorCtrl;
 
-// 响应式获取当前路由路径
 const currentPath = computed(() => AppRouter.currentRoute.value.path);
 
-const defaultButtons: ButtonTool[] = [
+// 获取权限角色：gridCtrl.permission > 全局配置 > 默认值
+const newRole = computed(() => {
+   return gridCtrl.permission?.new ?? getPermission().new ?? ['Admin'];
+});
+
+const defaultButtons = computed<ButtonTool[]>(() => [
    {
       key: 'New',
       label: $t('webui.common.add'),
       type: 'primary',
       icon: 'icon-new',
       danger: true,
-      role: ['Super', 'Admin'],
-      permit: ':new', // 默认仅受权限码控制
-      click: () => {
-         return openNewForm(editorCtrl);
-      },
+      role: newRole.value,
+      permit: ':new',
+      click: () => openNewForm(editorCtrl),
    },
-];
+]);
 
 const MaxButtonCount = 3;
 
@@ -52,10 +49,10 @@ const ToolbarButtons = ref<ButtonTool[]>([]);
 const ToolbarMenus = ref<ButtonTool[]>([]);
 
 watch(
-   () => gridCtrl.buttons?.value,
+   [() => gridCtrl.buttons?.value, defaultButtons],
    () => {
       const { buttons, menus } = getToolGroup(
-         defaultButtons,
+         defaultButtons.value,
          gridCtrl.flat !== undefined ? gridCtrl.flat : MaxButtonCount,
          gridCtrl.buttons?.value,
       );
@@ -71,29 +68,19 @@ watch(
 <template>
    <div class="flex justify-between mb-[10px]">
       <Space>
-         <Button
-            v-for="item in ToolbarButtons"
-            :key="item.key"
-            :type="item.type"
-            :danger="item.danger"
-            :disabled="getToolStatus(item)"
-            :icon="item.icon"
+         <Button v-for="item in ToolbarButtons" :key="item.key" :type="item.type" :danger="item.danger"
+            :disabled="getToolStatus(item)" :icon="item.icon"
             v-auth="{ url: currentPath, role: item.role, permit: item.permit }"
-            @click="onToolClicked(item, pageCtrl, gridCtrl)"
-         >
+            @click="onToolClicked(item, pageCtrl, gridCtrl)">
             {{ item.label }}
          </Button>
          <Dropdown v-if="ToolbarMenus.length > 0">
             <template #overlay>
                <Menu>
-                  <MenuItem
-                     v-for="item in ToolbarMenus"
-                     :key="item.key"
-                     :disabled="getToolStatus(item)"
+                  <MenuItem v-for="item in ToolbarMenus" :key="item.key" :disabled="getToolStatus(item)"
                      v-auth="{ url: currentPath, role: item.role, permit: item.permit }"
-                     @click="onToolClicked(item, pageCtrl, gridCtrl)"
-                  >
-                     {{ item.label }}
+                     @click="onToolClicked(item, pageCtrl, gridCtrl)">
+                  {{ item.label }}
                   </MenuItem>
                </Menu>
             </template>

package/src/config/permission.ts

@@ -0,0 +1,41 @@
+/**
+ * 用户角色级别
+ */
+export type UserRole = 'Super' | 'Admin' | 'User';
+
+/**
+ * 操作权限配置
+ */
+export interface OperatePermission {
+   /** 编辑按钮角色 */
+   edit?: UserRole[];
+   /** 删除按钮角色 */
+   delete?: UserRole[];
+   /** 启用/禁用切换角色 */
+   enabled?: UserRole[];
+   /** 新增按钮角色 */
+   new?: UserRole[];
+}
+
+/**
+ * 全局默认权限配置
+ */
+export const defaultPermission: OperatePermission = {
+   edit: ['Super', 'Admin'],
+   delete: ['Super', 'Admin'],
+   enabled: ['Super', 'Admin'],
+   new: ['Admin'],
+};
+
+/**
+ * 设置全局默认权限
+ * @param config 权限配置
+ */
+export const setPermission = (config: Partial<OperatePermission>) => {
+   Object.assign(defaultPermission, config);
+};
+
+/**
+ * 获取全局默认权限
+ */
+export const getPermission = () => defaultPermission;

package/src/index.ts

@@ -312,4 +312,7 @@ export type {
 
 export { uploadTempOpener, uploadTempBtn } from './utils/upload-template';
 
-export { i18n, initLang, $t, getAvailableLanguages, getLang, setLang } from './locales/index';
+export { i18n, initLang, $t, getAvailableLanguages, getLang, setLang } from './locales/index';
+
+export { setPermission, getPermission } from './config/permission';
+export type { UserRole, OperatePermission } from './config/permission';

package/src/typings/table.d.ts

@@ -3,6 +3,7 @@ import { ButtonTools } from './tools';
 import { PageControl, PrimaryKey } from './page';
 import { EditorControl } from './form';
 import { AnyData, IUrlInfo, ReqParams, FindResult } from '@skyfox2000/fapi';
+import { OperatePermission } from '@/config/permission';
 
 /**
  * 表格控制默认设置
@@ -179,4 +180,9 @@ export type GridControl<T> = GridControlOption & {
     * 表格数据删除后回调
     */
    afterDelete?: (record: T) => void;
+   /**
+    * 操作权限配置
+    * - 优先级高于全局配置
+    */
+   permission?: OperatePermission;
 };