@nokecy/qc-ui 1.1.64 → 1.1.65

package/dist/cjs/generatedListPage/ConfigurableToolbar.d.ts

@@ -27,6 +27,8 @@ interface ConfigurableToolbarProps {
         import?: string;
         export?: string;
     };
+    /** 当前用户已授予的权限，见 GeneratedListPageConfig.access */
+    access?: Record<string, boolean>;
 }
 /**
  * 配置化工具栏组件

package/dist/cjs/generatedListPage/ConfigurableToolbar.js

@@ -40,9 +40,10 @@ var ConfigurableToolbar = function ConfigurableToolbar(_ref) {
     _ref$exportFileName = _ref.exportFileName,
     exportFileName = _ref$exportFileName === void 0 ? 'export.xlsx' : _ref$exportFileName,
     filter = _ref.filter,
-    permissions = _ref.permissions;
+    permissions = _ref.permissions,
+    access = _ref.access;
   // 使用统一的权限检查 Hook
-  var _usePermissionCheck = (0, _usePermissionCheck2.usePermissionCheck)(permissions || {}),
+  var _usePermissionCheck = (0, _usePermissionCheck2.usePermissionCheck)(permissions || {}, access),
     canCreate = _usePermissionCheck.canCreate,
     canImport = _usePermissionCheck.canImport,
     canExport = _usePermissionCheck.canExport,

package/dist/cjs/generatedListPage/GeneratedListPage.js

@@ -92,7 +92,11 @@ var GeneratedListPage = function GeneratedListPage(config) {
     } : _config$paginationCon,
     externalGridRef = config.gridRef,
     externalOnRefresh = config.onRefresh,
-    pagedApiAdapter = config.pagedApiAdapter;
+    pagedApiAdapter = config.pagedApiAdapter,
+    gridComponent = config.gridComponent,
+    access = config.access,
+    deleteConfirm = config.deleteConfirm;
+  var Grid = gridComponent || _agGridPlus.AgGridPlus;
 
   // 内部Grid引用
   var internalGridRef = (0, _react.useRef)();
@@ -165,11 +169,13 @@ var GeneratedListPage = function GeneratedListPage(config) {
         permissions: permissions,
         formDialog: formDialog,
         deleteApi: apiConfig.delete,
-        useErrorHandler: errorConfig.useErrorHandler
+        useErrorHandler: errorConfig.useErrorHandler,
+        access: access,
+        deleteConfirm: deleteConfirm
       }
     };
     return [].concat(_toConsumableArray(columnDefs), [operationColumn]);
-  }, [columnDefs, formDialog, apiConfig.delete, permissions, onRefresh, OptionsColumnComponent, errorConfig.useErrorHandler]);
+  }, [columnDefs, formDialog, apiConfig.delete, permissions, onRefresh, OptionsColumnComponent, errorConfig.useErrorHandler, access, deleteConfirm]);
 
   /**
    * 从扁平数据构建树形结构
@@ -413,9 +419,10 @@ var GeneratedListPage = function GeneratedListPage(config) {
       importConfig: importConfig,
       exportFileName: exportFileName,
       filter: filter,
-      permissions: permissions
+      permissions: permissions,
+      access: access
     }))];
-  }, [enableImportExport, toolbarActions, formDialog, apiConfig, onRefresh, importConfig, exportFileName, permissions]);
+  }, [enableImportExport, toolbarActions, formDialog, apiConfig, onRefresh, importConfig, exportFileName, permissions, access]);
 
   // AgGridPlus属性配置
   var agGridProps = _objectSpread({
@@ -476,7 +483,7 @@ var GeneratedListPage = function GeneratedListPage(config) {
       position: 'relative',
       height: '100%'
     }
-  }, /*#__PURE__*/_react.default.createElement(_agGridPlus.AgGridPlus, agGridProps), /*#__PURE__*/_react.default.createElement(_PerformanceMonitor.PerformanceDevTools, {
+  }, /*#__PURE__*/_react.default.createElement(Grid, agGridProps), /*#__PURE__*/_react.default.createElement(_PerformanceMonitor.PerformanceDevTools, {
     componentName: "GeneratedListPage-".concat(title),
     metrics: metrics,
     onGetReport: getPerformanceReport

package/dist/cjs/generatedListPage/OptionsColumn.js

@@ -32,10 +32,12 @@ var OptionsColumn = function OptionsColumn(props) {
     formDialog = props.formDialog,
     deleteApi = props.deleteApi,
     _props$useErrorHandle = props.useErrorHandler,
-    useErrorHandler = _props$useErrorHandle === void 0 ? true : _props$useErrorHandle;
+    useErrorHandler = _props$useErrorHandle === void 0 ? true : _props$useErrorHandle,
+    access = props.access,
+    deleteConfirm = props.deleteConfirm;
 
   // 使用权限检查 Hook
-  var _usePermissionCheck = (0, _usePermissionCheck2.usePermissionCheck)(permissions),
+  var _usePermissionCheck = (0, _usePermissionCheck2.usePermissionCheck)(permissions, access),
     canUpdate = _usePermissionCheck.canUpdate,
     canDelete = _usePermissionCheck.canDelete,
     hasPermission = _usePermissionCheck.hasPermission;
@@ -90,13 +92,24 @@ var OptionsColumn = function OptionsColumn(props) {
     return null;
   }
   var FormDialogComponent = formDialog === null || formDialog === void 0 ? void 0 : formDialog.component;
+
+  // 确认框要说清删的是哪一条：页面没给标题时取该行的名称或编码。@author nokecy
+  var record = data;
+  var recordLabel = (record === null || record === void 0 ? void 0 : record.name) || (record === null || record === void 0 ? void 0 : record.displayName) || (record === null || record === void 0 ? void 0 : record.code);
+  var resolveText = function resolveText(value, fallback) {
+    return typeof value === 'function' ? value(data) : value !== null && value !== void 0 ? value : fallback;
+  };
+  var deleteTitle = resolveText(deleteConfirm === null || deleteConfirm === void 0 ? void 0 : deleteConfirm.title, recordLabel ? "\u786E\u5B9A\u5220\u9664\u300C".concat(recordLabel, "\u300D\uFF1F") : '确定删除？');
+  var deleteContent = resolveText(deleteConfirm === null || deleteConfirm === void 0 ? void 0 : deleteConfirm.content, '删除后无法恢复。');
   return /*#__PURE__*/_react.default.createElement(_antd.Space, {
     onClick: function onClick(event) {
       event.stopPropagation();
     }
   }, showEditButton && FormDialogComponent && /*#__PURE__*/_react.default.createElement(Access, {
     accessible: canUpdate
-  }, /*#__PURE__*/_react.default.createElement(FormDialogComponent, {
+  }, /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
+    title: "\u7F16\u8F91"
+  }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(FormDialogComponent, {
     buttonProps: {
       size: "small",
       type: "link",
@@ -104,17 +117,19 @@ var OptionsColumn = function OptionsColumn(props) {
         style: {
           fontSize: 14
         }
-      })
+      }),
+      'aria-label': '编辑'
     },
     key: data.id,
     title: formDialog.editTitle || '编辑',
     entityId: data.id,
     onAfterSubmit: refresh
-  })), showDeleteButton && /*#__PURE__*/_react.default.createElement(Access, {
+  })))), showDeleteButton && /*#__PURE__*/_react.default.createElement(Access, {
     accessible: canDelete
   }, /*#__PURE__*/_react.default.createElement(_deleteConfirm.default, {
-    title: "\u786E\u5B9A\u5220\u9664?",
-    content: "\u6B64\u64CD\u4F5C\u5C06\u6C38\u4E45\u5220\u9664\u8BE5\u6570\u636E\uFF0C\u4E14\u65E0\u6CD5\u6062\u590D",
+    title: deleteTitle,
+    content: deleteContent,
+    okText: "\u5220\u9664",
     onConfirm: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -127,11 +142,13 @@ var OptionsColumn = function OptionsColumn(props) {
         }
       }, _callee2);
     }))
+  }, /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
+    title: "\u5220\u9664"
   }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
     size: "small",
     icon: /*#__PURE__*/_react.default.createElement(_icons.DeleteOutlined, null),
     type: "link",
-    title: "\u5220\u9664"
-  }))));
+    "aria-label": "\u5220\u9664"
+  })))));
 };
 var _default = exports.default = OptionsColumn;

package/dist/cjs/generatedListPage/index.d.ts

@@ -12,7 +12,7 @@ export { default } from './GeneratedListPage';
 export { default as GeneratedListPage } from './GeneratedListPage';
 export { default as ConfigurableToolbar } from './ConfigurableToolbar';
 export { default as OptionsColumn } from './OptionsColumn';
-export type { GeneratedListPageConfig, PermissionConfig, ApiConfig, ListParams, PagedResult, DeleteParams, ExportParams, ToolbarActionConfig, FormDialogConfig, TreeDataConfig, OptionsComponentProps } from './types';
+export type { GeneratedListPageConfig, PermissionConfig, ApiConfig, ListParams, PagedResult, DeleteParams, ExportParams, ToolbarActionConfig, FormDialogConfig, TreeDataConfig, OptionsComponentProps, DeleteConfirmConfig } from './types';
 export { usePermissionCheck, PermissionChecker } from './usePermissionCheck';
 export { usePerformanceMonitor, PerformanceDevTools } from './PerformanceMonitor';
 export { useRequestManager } from './useRequestManager';

package/dist/cjs/generatedListPage/types.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="react" />
 import { GridRef } from "../ag-grid-plus/interface";
 import { ColDef } from "ag-grid-community";
 import { ButtonProps } from "antd";
+import { ReactNode } from "react";
 import { PagedApiAdapter } from '../adapters';
 /**
  * 权限配置接口
@@ -203,6 +203,27 @@ export interface GeneratedListPageConfig<T = any> {
     onRefresh?: () => void;
     /** 分页 API 适配器(默认 ABP);非 ABP 后端可注入。@author nokecy */
     pagedApiAdapter?: PagedApiAdapter;
+    /**
+     * 表格组件，默认用包内 AgGridPlus。
+     * 宿主可注入自己的表格基座（属性与 AgGridPlus 相同），让序号、默认复选、编码列收起、
+     * 内部字段隐藏等列表规范在通用列表页上同样生效。@author nokecy
+     */
+    gridComponent?: React.ComponentType<any>;
+    /**
+     * 当前用户已授予的权限（权限名 → 是否授予），通常传 umi 的 useAccess()。
+     * 不传时工具栏与操作列不做权限过滤——没有权限的人也会看到新建、编辑、删除，点了才报 403。@author nokecy
+     */
+    access?: Record<string, boolean>;
+    /** 删除确认框；title、content 可按行生成 */
+    deleteConfirm?: DeleteConfirmConfig<T>;
+}
+/**
+ * 删除确认框配置。
+ * 不传 title 时标题带上该行的名称或编码，让用户看清删的是哪一条；不传 content 时说明删除后无法恢复。@author nokecy
+ */
+export interface DeleteConfirmConfig<T = any> {
+    title?: ReactNode | ((record: T) => ReactNode);
+    content?: ReactNode | ((record: T) => ReactNode);
 }
 /**
  * 操作列组件属性接口
@@ -221,4 +242,8 @@ export interface OptionsComponentProps<T = any> {
     deleteApi?: (params: DeleteParams) => Promise<void>;
     /** 是否使用统一错误处理 */
     useErrorHandler?: boolean;
+    /** 当前用户已授予的权限，见 GeneratedListPageConfig.access */
+    access?: Record<string, boolean>;
+    /** 删除确认框配置 */
+    deleteConfirm?: DeleteConfirmConfig<T>;
 }

package/dist/esm/generatedListPage/ConfigurableToolbar.d.ts

@@ -27,6 +27,8 @@ interface ConfigurableToolbarProps {
         import?: string;
         export?: string;
     };
+    /** 当前用户已授予的权限，见 GeneratedListPageConfig.access */
+    access?: Record<string, boolean>;
 }
 /**
  * 配置化工具栏组件

package/dist/esm/generatedListPage/ConfigurableToolbar.js

@@ -32,9 +32,10 @@ var ConfigurableToolbar = function ConfigurableToolbar(_ref) {
     _ref$exportFileName = _ref.exportFileName,
     exportFileName = _ref$exportFileName === void 0 ? 'export.xlsx' : _ref$exportFileName,
     filter = _ref.filter,
-    permissions = _ref.permissions;
+    permissions = _ref.permissions,
+    access = _ref.access;
   // 使用统一的权限检查 Hook
-  var _usePermissionCheck = usePermissionCheck(permissions || {}),
+  var _usePermissionCheck = usePermissionCheck(permissions || {}, access),
     canCreate = _usePermissionCheck.canCreate,
     canImport = _usePermissionCheck.canImport,
     canExport = _usePermissionCheck.canExport,

package/dist/esm/generatedListPage/GeneratedListPage.js

@@ -82,7 +82,11 @@ var GeneratedListPage = function GeneratedListPage(config) {
     } : _config$paginationCon,
     externalGridRef = config.gridRef,
     externalOnRefresh = config.onRefresh,
-    pagedApiAdapter = config.pagedApiAdapter;
+    pagedApiAdapter = config.pagedApiAdapter,
+    gridComponent = config.gridComponent,
+    access = config.access,
+    deleteConfirm = config.deleteConfirm;
+  var Grid = gridComponent || AgGridPlus;
 
   // 内部Grid引用
   var internalGridRef = useRef();
@@ -155,11 +159,13 @@ var GeneratedListPage = function GeneratedListPage(config) {
         permissions: permissions,
         formDialog: formDialog,
         deleteApi: apiConfig.delete,
-        useErrorHandler: errorConfig.useErrorHandler
+        useErrorHandler: errorConfig.useErrorHandler,
+        access: access,
+        deleteConfirm: deleteConfirm
       }
     };
     return [].concat(_toConsumableArray(columnDefs), [operationColumn]);
-  }, [columnDefs, formDialog, apiConfig.delete, permissions, onRefresh, OptionsColumnComponent, errorConfig.useErrorHandler]);
+  }, [columnDefs, formDialog, apiConfig.delete, permissions, onRefresh, OptionsColumnComponent, errorConfig.useErrorHandler, access, deleteConfirm]);
 
   /**
    * 从扁平数据构建树形结构
@@ -403,9 +409,10 @@ var GeneratedListPage = function GeneratedListPage(config) {
       importConfig: importConfig,
       exportFileName: exportFileName,
       filter: filter,
-      permissions: permissions
+      permissions: permissions,
+      access: access
     }))];
-  }, [enableImportExport, toolbarActions, formDialog, apiConfig, onRefresh, importConfig, exportFileName, permissions]);
+  }, [enableImportExport, toolbarActions, formDialog, apiConfig, onRefresh, importConfig, exportFileName, permissions, access]);
 
   // AgGridPlus属性配置
   var agGridProps = _objectSpread({
@@ -466,7 +473,7 @@ var GeneratedListPage = function GeneratedListPage(config) {
       position: 'relative',
       height: '100%'
     }
-  }, /*#__PURE__*/React.createElement(AgGridPlus, agGridProps), /*#__PURE__*/React.createElement(PerformanceDevTools, {
+  }, /*#__PURE__*/React.createElement(Grid, agGridProps), /*#__PURE__*/React.createElement(PerformanceDevTools, {
     componentName: "GeneratedListPage-".concat(title),
     metrics: metrics,
     onGetReport: getPerformanceReport

package/dist/esm/generatedListPage/OptionsColumn.js

@@ -3,7 +3,7 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import React, { useMemo } from 'react';
-import { Space, Button } from 'antd';
+import { Space, Button, Tooltip } from 'antd';
 import { EditOutlined, DeleteOutlined } from '@ant-design/icons';
 import AccessWrapper from "./_utils/AccessWrapper";
 import { defaultHandleDelete } from "./_utils/defaultHandlers";
@@ -24,10 +24,12 @@ var OptionsColumn = function OptionsColumn(props) {
     formDialog = props.formDialog,
     deleteApi = props.deleteApi,
     _props$useErrorHandle = props.useErrorHandler,
-    useErrorHandler = _props$useErrorHandle === void 0 ? true : _props$useErrorHandle;
+    useErrorHandler = _props$useErrorHandle === void 0 ? true : _props$useErrorHandle,
+    access = props.access,
+    deleteConfirm = props.deleteConfirm;
 
   // 使用权限检查 Hook
-  var _usePermissionCheck = usePermissionCheck(permissions),
+  var _usePermissionCheck = usePermissionCheck(permissions, access),
     canUpdate = _usePermissionCheck.canUpdate,
     canDelete = _usePermissionCheck.canDelete,
     hasPermission = _usePermissionCheck.hasPermission;
@@ -82,13 +84,24 @@ var OptionsColumn = function OptionsColumn(props) {
     return null;
   }
   var FormDialogComponent = formDialog === null || formDialog === void 0 ? void 0 : formDialog.component;
+
+  // 确认框要说清删的是哪一条：页面没给标题时取该行的名称或编码。@author nokecy
+  var record = data;
+  var recordLabel = (record === null || record === void 0 ? void 0 : record.name) || (record === null || record === void 0 ? void 0 : record.displayName) || (record === null || record === void 0 ? void 0 : record.code);
+  var resolveText = function resolveText(value, fallback) {
+    return typeof value === 'function' ? value(data) : value !== null && value !== void 0 ? value : fallback;
+  };
+  var deleteTitle = resolveText(deleteConfirm === null || deleteConfirm === void 0 ? void 0 : deleteConfirm.title, recordLabel ? "\u786E\u5B9A\u5220\u9664\u300C".concat(recordLabel, "\u300D\uFF1F") : '确定删除？');
+  var deleteContent = resolveText(deleteConfirm === null || deleteConfirm === void 0 ? void 0 : deleteConfirm.content, '删除后无法恢复。');
   return /*#__PURE__*/React.createElement(Space, {
     onClick: function onClick(event) {
       event.stopPropagation();
     }
   }, showEditButton && FormDialogComponent && /*#__PURE__*/React.createElement(Access, {
     accessible: canUpdate
-  }, /*#__PURE__*/React.createElement(FormDialogComponent, {
+  }, /*#__PURE__*/React.createElement(Tooltip, {
+    title: "\u7F16\u8F91"
+  }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(FormDialogComponent, {
     buttonProps: {
       size: "small",
       type: "link",
@@ -96,17 +109,19 @@ var OptionsColumn = function OptionsColumn(props) {
         style: {
           fontSize: 14
         }
-      })
+      }),
+      'aria-label': '编辑'
     },
     key: data.id,
     title: formDialog.editTitle || '编辑',
     entityId: data.id,
     onAfterSubmit: refresh
-  })), showDeleteButton && /*#__PURE__*/React.createElement(Access, {
+  })))), showDeleteButton && /*#__PURE__*/React.createElement(Access, {
     accessible: canDelete
   }, /*#__PURE__*/React.createElement(DeleteConfirm, {
-    title: "\u786E\u5B9A\u5220\u9664?",
-    content: "\u6B64\u64CD\u4F5C\u5C06\u6C38\u4E45\u5220\u9664\u8BE5\u6570\u636E\uFF0C\u4E14\u65E0\u6CD5\u6062\u590D",
+    title: deleteTitle,
+    content: deleteContent,
+    okText: "\u5220\u9664",
     onConfirm: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -119,11 +134,13 @@ var OptionsColumn = function OptionsColumn(props) {
         }
       }, _callee2);
     }))
+  }, /*#__PURE__*/React.createElement(Tooltip, {
+    title: "\u5220\u9664"
   }, /*#__PURE__*/React.createElement(Button, {
     size: "small",
     icon: /*#__PURE__*/React.createElement(DeleteOutlined, null),
     type: "link",
-    title: "\u5220\u9664"
-  }))));
+    "aria-label": "\u5220\u9664"
+  })))));
 };
 export default OptionsColumn;

package/dist/esm/generatedListPage/index.d.ts

@@ -12,7 +12,7 @@ export { default } from './GeneratedListPage';
 export { default as GeneratedListPage } from './GeneratedListPage';
 export { default as ConfigurableToolbar } from './ConfigurableToolbar';
 export { default as OptionsColumn } from './OptionsColumn';
-export type { GeneratedListPageConfig, PermissionConfig, ApiConfig, ListParams, PagedResult, DeleteParams, ExportParams, ToolbarActionConfig, FormDialogConfig, TreeDataConfig, OptionsComponentProps } from './types';
+export type { GeneratedListPageConfig, PermissionConfig, ApiConfig, ListParams, PagedResult, DeleteParams, ExportParams, ToolbarActionConfig, FormDialogConfig, TreeDataConfig, OptionsComponentProps, DeleteConfirmConfig } from './types';
 export { usePermissionCheck, PermissionChecker } from './usePermissionCheck';
 export { usePerformanceMonitor, PerformanceDevTools } from './PerformanceMonitor';
 export { useRequestManager } from './useRequestManager';

package/dist/esm/generatedListPage/types.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="react" />
 import { GridRef } from "../ag-grid-plus/interface";
 import { ColDef } from "ag-grid-community";
 import { ButtonProps } from "antd";
+import { ReactNode } from "react";
 import { PagedApiAdapter } from '../adapters';
 /**
  * 权限配置接口
@@ -203,6 +203,27 @@ export interface GeneratedListPageConfig<T = any> {
     onRefresh?: () => void;
     /** 分页 API 适配器(默认 ABP);非 ABP 后端可注入。@author nokecy */
     pagedApiAdapter?: PagedApiAdapter;
+    /**
+     * 表格组件，默认用包内 AgGridPlus。
+     * 宿主可注入自己的表格基座（属性与 AgGridPlus 相同），让序号、默认复选、编码列收起、
+     * 内部字段隐藏等列表规范在通用列表页上同样生效。@author nokecy
+     */
+    gridComponent?: React.ComponentType<any>;
+    /**
+     * 当前用户已授予的权限（权限名 → 是否授予），通常传 umi 的 useAccess()。
+     * 不传时工具栏与操作列不做权限过滤——没有权限的人也会看到新建、编辑、删除，点了才报 403。@author nokecy
+     */
+    access?: Record<string, boolean>;
+    /** 删除确认框；title、content 可按行生成 */
+    deleteConfirm?: DeleteConfirmConfig<T>;
+}
+/**
+ * 删除确认框配置。
+ * 不传 title 时标题带上该行的名称或编码，让用户看清删的是哪一条；不传 content 时说明删除后无法恢复。@author nokecy
+ */
+export interface DeleteConfirmConfig<T = any> {
+    title?: ReactNode | ((record: T) => ReactNode);
+    content?: ReactNode | ((record: T) => ReactNode);
 }
 /**
  * 操作列组件属性接口
@@ -221,4 +242,8 @@ export interface OptionsComponentProps<T = any> {
     deleteApi?: (params: DeleteParams) => Promise<void>;
     /** 是否使用统一错误处理 */
     useErrorHandler?: boolean;
+    /** 当前用户已授予的权限，见 GeneratedListPageConfig.access */
+    access?: Record<string, boolean>;
+    /** 删除确认框配置 */
+    deleteConfirm?: DeleteConfirmConfig<T>;
 }