@cfmm/umi-plugins-ui-v2 0.0.5 → 0.0.7

package/dist/cjs/types/DataPermissionSelectTypes.js

@@ -0,0 +1,7 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DataPermissionSelectTypes = void 0;
+var DataPermissionSelectTypes = exports.DataPermissionSelectTypes = "\n  /** \u6570\u636E\u6743\u9650\u8303\u56F4\u679A\u4E3E */\n  export enum DataScopeEnum {\n    /** \u5168\u90E8\u6570\u636E\u6743\u9650 */\n    ALL = '1',\n    /** \u81EA\u5B9A\u4E49\u6570\u636E\u6743\u9650 */\n    CUSTOM = '2',\n    /** \u672C\u90E8\u95E8\u6570\u636E\u6743\u9650 */\n    DEPT = '3',\n    /** \u672C\u90E8\u95E8\u53CA\u4EE5\u4E0B\u6570\u636E\u6743\u9650 */\n    DEPT_AND_SUB = '4',\n    /** \u4EC5\u672C\u4EBA\u6570\u636E\u6743\u9650 */\n    ONLY_SELF = '5',\n  }\n\n  /** \u662F\u5426\u7236\u5B50\u8054\u52A8\u679A\u4E3E */\n  export enum DeptCheckStrictlyEnum {\n    /** \u6298\u53E0/\u5C55\u5F00 */\n    FOLD = '1',\n    /** \u5168\u9009/\u5168\u4E0D\u9009 */\n    SELECT_ALL = '2',\n    /** \u7236\u5B50\u8054\u52A8 */\n    PARENT_CHILD = '3',\n  }\n\n  /** \u6570\u636E\u6743\u9650\u9009\u62E9\u8868\u5355\u6570\u636E */\n  export interface DataPermissionValues {\n    /** \u7EC4\u7EC7ID\u5217\u8868 */\n    deptIds?: React.Key[];\n    /** \u6570\u636E\u6743\u9650\u8303\u56F4 */\n    dataScope?: DataScopeEnum;\n    /** \u662F\u5426\u7236\u5B50\u8054\u52A8 */\n    deptCheckStrictly?: boolean;\n  }\n\n  /** \u6570\u636E\u6743\u9650\u9009\u62E9\u7EC4\u4EF6Props */\n  export interface DataPermissionSelectProps extends ModalFormProps<DataPermissionValues> {\n    authorizeName?: string;\n    rootParentKey?: number | string;\n    values?: DataPermissionValues | null;\n    treeList?: any[];\n  }\n";

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

@@ -1 +1 @@
-export declare const PermissionSelectTypes = "\n  export interface UserListItem {\n    deptEntity: any;\n    userId: string;\n    userCode: string;\n    userName: string;\n    password: string;\n    nickName: string;\n    userType?: string;\n    email?: string;\n    phone?: string;\n    sex: string;\n    status: string;\n    avatar?: string;\n    remark?: string;\n    roles: RoleListItem[];\n    permissions: any[];\n  }\n\n  export interface RoleListItem {\n    userIds: any;\n    roleId: string;\n    roleCode: string;\n    roleName: string;\n    status: string;\n    remark?: string;\n\n    users: UserListItem[];\n    permissions: any[];\n  }\n\n  export interface MenuItem {\n    menuId: string;\n    menuCode: string;\n    menuName: string;\n    icon: string;\n    parentId: string;\n    seqNo: number;\n    path: string;\n    menuType: string;\n    status: string;\n    remark?: string;\n  }\n\n  export interface PermissionItem {\n    permissionId: string;\n    permissionCode: string;\n    permissionName: string;\n    menuId: string;\n    status: string;\n    remark?: string;\n  }\n\n  /**\n   * \u9ED8\u8BA4\u4F20\u5165\u7684\u6570\u636E\uFF0C\u9700\u8981\u4F20\u5165\u6743\u9650\u5217\u8868\n   * \u4E5F\u53EF\u4EE5\u4F20\u5165\u89D2\u8272ID\u6216\u662F\u7528\u6237ID\n   */\n  export interface PermissionSelectItem {\n    permissionIds: string[];\n  }\n\n  /**\n   * \u9009\u62E9\u6743\u9650\u7EC4\u4EF6\u7684props\n   */\n  export interface PermissionSelectFormProps {\n    rootParentKey?: number | string;\n    modalFormVisible: boolean;\n    setModalFormVisible: (visible: boolean) => void;\n    onSubmit: (values: FormValueType) => Promise<void>;\n    values?: PermissionSelectItem | any;\n    onCancel: any;\n  }\n\n  export interface CurrentUser {\n    userId: string;\n    userCode: string;\n    userName?: string;\n    avatar?: string;\n    status?: string;\n    nickName: string;\n\n    menus?: MenuItem[];\n    permissions?: PermissionItem[];\n\n    [prop: string]: any;\n  }\n";
+export declare const PermissionSelectTypes = "\n  export interface UserListItem {\n    deptEntity: any;\n    userId: string;\n    userCode: string;\n    userName: string;\n    password: string;\n    nickName: string;\n    userType?: string;\n    email?: string;\n    phone?: string;\n    sex: string;\n    status: string;\n    avatar?: string;\n    remark?: string;\n    roles: RoleListItem[];\n    permissions: any[];\n  }\n\n  export interface RoleListItem {\n    userIds: any;\n    roleId: string;\n    roleCode: string;\n    roleName: string;\n    status: string;\n    remark?: string;\n\n    users: UserListItem[];\n    permissions: any[];\n  }\n\n  export interface MenuItem {\n    menuId: string;\n    menuCode: string;\n    menuName: string;\n    icon: string;\n    parentId: string;\n    seqNo: number;\n    path: string;\n    menuType: string;\n    status: string;\n    remark?: string;\n  }\n\n  export interface PermissionItem {\n    permissionId: string;\n    permissionCode: string;\n    permissionName: string;\n    menuId: string;\n    status: string;\n    remark?: string;\n  }\n\n  /**\n   * \u9ED8\u8BA4\u4F20\u5165\u7684\u6570\u636E\uFF0C\u9700\u8981\u4F20\u5165\u6743\u9650\u5217\u8868\n   * \u4E5F\u53EF\u4EE5\u4F20\u5165\u89D2\u8272ID\u6216\u662F\u7528\u6237ID\n   */\n  export interface PermissionSelectItem {\n    permissionIds: string[];\n  }\n\n  /**\n   * \u9009\u62E9\u6743\u9650\u7EC4\u4EF6\u7684props\n   */\n  export interface PermissionSelectFormProps {\n    authorizeName?: string;\n    rootParentKey?: number | string;\n    modalFormVisible: boolean;\n    setModalFormVisible: (visible: boolean) => void;\n    onSubmit: (values: FormValueType) => Promise<void>;\n    values?: PermissionSelectItem | any;\n    onCancel: any;\n  }\n\n  export interface CurrentUser {\n    userId: string;\n    userCode: string;\n    userName?: string;\n    avatar?: string;\n    status?: string;\n    nickName: string;\n\n    menus?: MenuItem[];\n    permissions?: PermissionItem[];\n\n    [prop: string]: any;\n  }\n";

package/dist/cjs/types/PermissionSelectTypes.js

@@ -4,4 +4,4 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PermissionSelectTypes = void 0;
-var PermissionSelectTypes = exports.PermissionSelectTypes = "\n  export interface UserListItem {\n    deptEntity: any;\n    userId: string;\n    userCode: string;\n    userName: string;\n    password: string;\n    nickName: string;\n    userType?: string;\n    email?: string;\n    phone?: string;\n    sex: string;\n    status: string;\n    avatar?: string;\n    remark?: string;\n    roles: RoleListItem[];\n    permissions: any[];\n  }\n\n  export interface RoleListItem {\n    userIds: any;\n    roleId: string;\n    roleCode: string;\n    roleName: string;\n    status: string;\n    remark?: string;\n\n    users: UserListItem[];\n    permissions: any[];\n  }\n\n  export interface MenuItem {\n    menuId: string;\n    menuCode: string;\n    menuName: string;\n    icon: string;\n    parentId: string;\n    seqNo: number;\n    path: string;\n    menuType: string;\n    status: string;\n    remark?: string;\n  }\n\n  export interface PermissionItem {\n    permissionId: string;\n    permissionCode: string;\n    permissionName: string;\n    menuId: string;\n    status: string;\n    remark?: string;\n  }\n\n  /**\n   * \u9ED8\u8BA4\u4F20\u5165\u7684\u6570\u636E\uFF0C\u9700\u8981\u4F20\u5165\u6743\u9650\u5217\u8868\n   * \u4E5F\u53EF\u4EE5\u4F20\u5165\u89D2\u8272ID\u6216\u662F\u7528\u6237ID\n   */\n  export interface PermissionSelectItem {\n    permissionIds: string[];\n  }\n\n  /**\n   * \u9009\u62E9\u6743\u9650\u7EC4\u4EF6\u7684props\n   */\n  export interface PermissionSelectFormProps {\n    rootParentKey?: number | string;\n    modalFormVisible: boolean;\n    setModalFormVisible: (visible: boolean) => void;\n    onSubmit: (values: FormValueType) => Promise<void>;\n    values?: PermissionSelectItem | any;\n    onCancel: any;\n  }\n\n  export interface CurrentUser {\n    userId: string;\n    userCode: string;\n    userName?: string;\n    avatar?: string;\n    status?: string;\n    nickName: string;\n\n    menus?: MenuItem[];\n    permissions?: PermissionItem[];\n\n    [prop: string]: any;\n  }\n";
+var PermissionSelectTypes = exports.PermissionSelectTypes = "\n  export interface UserListItem {\n    deptEntity: any;\n    userId: string;\n    userCode: string;\n    userName: string;\n    password: string;\n    nickName: string;\n    userType?: string;\n    email?: string;\n    phone?: string;\n    sex: string;\n    status: string;\n    avatar?: string;\n    remark?: string;\n    roles: RoleListItem[];\n    permissions: any[];\n  }\n\n  export interface RoleListItem {\n    userIds: any;\n    roleId: string;\n    roleCode: string;\n    roleName: string;\n    status: string;\n    remark?: string;\n\n    users: UserListItem[];\n    permissions: any[];\n  }\n\n  export interface MenuItem {\n    menuId: string;\n    menuCode: string;\n    menuName: string;\n    icon: string;\n    parentId: string;\n    seqNo: number;\n    path: string;\n    menuType: string;\n    status: string;\n    remark?: string;\n  }\n\n  export interface PermissionItem {\n    permissionId: string;\n    permissionCode: string;\n    permissionName: string;\n    menuId: string;\n    status: string;\n    remark?: string;\n  }\n\n  /**\n   * \u9ED8\u8BA4\u4F20\u5165\u7684\u6570\u636E\uFF0C\u9700\u8981\u4F20\u5165\u6743\u9650\u5217\u8868\n   * \u4E5F\u53EF\u4EE5\u4F20\u5165\u89D2\u8272ID\u6216\u662F\u7528\u6237ID\n   */\n  export interface PermissionSelectItem {\n    permissionIds: string[];\n  }\n\n  /**\n   * \u9009\u62E9\u6743\u9650\u7EC4\u4EF6\u7684props\n   */\n  export interface PermissionSelectFormProps {\n    authorizeName?: string;\n    rootParentKey?: number | string;\n    modalFormVisible: boolean;\n    setModalFormVisible: (visible: boolean) => void;\n    onSubmit: (values: FormValueType) => Promise<void>;\n    values?: PermissionSelectItem | any;\n    onCancel: any;\n  }\n\n  export interface CurrentUser {\n    userId: string;\n    userCode: string;\n    userName?: string;\n    avatar?: string;\n    status?: string;\n    nickName: string;\n\n    menus?: MenuItem[];\n    permissions?: PermissionItem[];\n\n    [prop: string]: any;\n  }\n";

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

@@ -8,6 +8,7 @@ export { EditMultiLangFormTypes } from "./EditMultiLangFormTypes";
 export { MySelectTypes } from "./MySelectTypes";
 export { MySelectLangTypes } from "./MySelectLangTypes";
 export { PermissionSelectTypes } from "./PermissionSelectTypes";
+export { DataPermissionSelectTypes } from "./DataPermissionSelectTypes";
 export { DatePickerTypes } from "./DatePickerTypes";
 export { RandomAvatarTypes } from "./RandomAvatarTypes";
 export { RefDrawerFormTypes } from "./RefDrawerFormTypes";

package/dist/cjs/types/index.js

@@ -21,6 +21,12 @@ Object.defineProperty(exports, "CrudTableTypes", {
     return _CrudTableTypes.CrudTableTypes;
   }
 });
+Object.defineProperty(exports, "DataPermissionSelectTypes", {
+  enumerable: true,
+  get: function get() {
+    return _DataPermissionSelectTypes.DataPermissionSelectTypes;
+  }
+});
 Object.defineProperty(exports, "DatePickerTypes", {
   enumerable: true,
   get: function get() {
@@ -223,6 +229,7 @@ var _EditMultiLangFormTypes = require("./EditMultiLangFormTypes");
 var _MySelectTypes = require("./MySelectTypes");
 var _MySelectLangTypes = require("./MySelectLangTypes");
 var _PermissionSelectTypes = require("./PermissionSelectTypes");
+var _DataPermissionSelectTypes = require("./DataPermissionSelectTypes");
 var _DatePickerTypes = require("./DatePickerTypes");
 var _RandomAvatarTypes = require("./RandomAvatarTypes");
 var _RefDrawerFormTypes = require("./RefDrawerFormTypes");

package/dist/cjs/utils/utils.tpl

@@ -1,5 +1,4 @@
 import { parse } from 'querystring';
-import { getIntl, MenuItem } from '@umijs/max';
 
 /**
  * 获取url参数，即浏览器地址栏问号后面的参数
@@ -24,3 +23,96 @@ export const getQueryToken = () => getPageQuery()?.token;
  * @returns {boolean}
  */
 export const isFullPage = () => getPageQuery()?.s?.slice(0, 1) === 'f' || isSharePage();
+
+
+type ArrayToTreeOptions<T = unknown, R = T> = {
+  id?: string;
+  parentId?: string;
+  rootId?: string | number;
+  /**
+   * 将每个节点映射为自定义结构（如 Ant Design Tree 的 { title, key, children }）。
+   * 先递归处理子节点再调用本函数；叶子节点 mappedChildren 为 undefined。
+   */
+  mapNode?: (item: T, mappedChildren: R[] | undefined) => R;
+};
+
+/**
+ * 深度优先遍历节点列表，并映射为自定义结构
+ * @param nodes 节点列表
+ * @param mapNode 映射函数
+ * @returns 映射后的节点列表
+ */
+function mapTreeDepthFirst<T, R>(nodes: Array<T & { children?: T[] }>, mapNode: (item: T, mappedChildren: R[] | undefined) => R): R[] {
+  return nodes.map((n) => {
+    const rawChildren = n.children;
+    const hasChildren = Array.isArray(rawChildren) && rawChildren.length > 0;
+    const mappedChildren = hasChildren
+      ? mapTreeDepthFirst(rawChildren as Array<T & { children?: T[] }>, mapNode)
+      : undefined;
+
+    // 移除 children 属性，保留item其他属性
+    const { children: _omit, ...rest } = n as T & { children?: T[] };
+    return mapNode(rest as T, mappedChildren?.length ? mappedChildren : undefined);
+  });
+}
+
+const defaultArrayToTreeOptions = {
+  id: 'id',
+  parentId: 'parentId',
+  rootId: 0,
+} as const;
+
+/**
+ * 列表转树节点
+ * @param items
+ * @param options id / parentId / rootId；可选 mapNode 映射为业务结构（如 DataNode）
+ * @returns 未传 mapNode 时为带 children 的 T[]；传入 mapNode 时为 R[]
+ */
+export function arrayToTree<T, R = T>(
+  items: T[],
+  options: ArrayToTreeOptions<T, R> = defaultArrayToTreeOptions as ArrayToTreeOptions<T, R>,
+): R[] {
+  const { mapNode, rootId: optRootId, id: idKey = 'id', parentId: parentKey = 'parentId' } = options;
+  const rootId = (optRootId ?? 0).toString();
+
+  const result: T[] = []; // 存放结果集
+  const itemMap: any = {};
+  items.forEach((item: any) => {
+    const id = item[idKey as string]?.toString();
+    const pid = item[parentKey as string]?.toString();
+
+    if (!itemMap[id]) {
+      itemMap[id] = {
+        children: [],
+      };
+    }
+
+    itemMap[id] = {
+      ...item,
+      children: itemMap[id]['children'],
+    };
+
+    const treeItem = itemMap[id];
+    
+    if (pid === rootId || !pid) {
+      //根节点
+      result.push(treeItem);
+    } else {
+      //非节点
+      if (!itemMap[pid]) {
+        itemMap[pid] = {
+          children: [],
+        };
+      }
+      //由于itemMap是引用值，有映射关系，因此此处push进去后result也有
+      itemMap[pid].children.push(treeItem);
+
+    }
+  });
+
+  if (mapNode) {
+    return mapTreeDepthFirst(result as Array<T & { children?: T[] }>, mapNode);
+  }
+
+  return result as unknown as R[];
+}

package/dist/cjs/writeTmpFile/writeIndex.js

@@ -6,5 +6,5 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _default = exports.default = {
   path: "index.tsx",
-  content: "\n    // \u5BFC\u5165\u7EC4\u4EF6\n    import QrCodeModal from \"./components/QrCodeModal\";\n    import CreateForm from \"./components/AddDrawerForm\";\n    import MyFooterToolbar from \"./components/MyFooterToolbar\";\n    import DropdownButton from \"./components/DropdownButton\";\n    import DynamicIcon, { getAntdIconList } from \"./components/DynamicIcon\";\n    import DynamicIconModal from \"./components/DynamicIconModal\";\n    import HighlightStr from \"./components/HighlightStr\";\n    import EditMultiLangForm from \"./components/EditMultiLangForm\";\n    import MyColorPicker from \"./components/MyColorPicker\";\n    import MySelect from \"./components/MySelect\";\n    import MySelectLang from \"./components/MySelectLang\";\n    import PermissionSelect from \"./components/PermissionSelect\";\n    import UTCDatePicker from \"./components/UTCDatePicker\";\n    import ProFormUTCDatePicker from \"./components/ProFormUTCDatePicker\";\n    import UTCRangePicker from \"./components/UTCRangePicker\";\n    import ProFormUTCRangePicker from \"./components/ProFormUTCRangePicker\";\n    import RandomAvatar from \"./components/RandomAvatar\";\n    import RefDrawerForm from \"./components/RefDrawerForm\";\n    import UpdateForm from \"./components/UpdateForm\";\n    import ViewTableItemDrawer from \"./components/ViewTableItemDrawer\";\n    import WangEditor from \"./components/WangEditor\";\n    import WangEditorView from \"./components/WangEditorView\";\n    import MyUpload from \"./components/MyUpload\";\n    import CopyButton from \"./components/CopyButton\";\n    import ImportExecl from \"./components/ImportExecl\";\n    import MyPageContainer from \"./components/MyPageContainer\";\n    import MyReactEcharts from \"./components/MyReactEcharts\";\n    import MyTagList from \"./components/MyTagList\";\n    import VolumeFormItem from \"./components/VolumeFormItem\";\n    import ReportTable from \"./components/ReportTable\";\n    import DicDropDownList from \"./components/DicDropDownList\";\n    import ActionLogDrawer from \"./components/ActionLogDrawer\";\n    import DndTabs from \"./components/DndTabs\";\n    import DndTag from \"./components/DndTag\";\n    import TimeTypeSelect from \"./components/TimeTypeSelect\";\n    import ImportDataUpload from \"./components/ImportDataUpload\";\n    import PDFWrapper from \"./components/PDFWrapper\";\n    import ExportPageWrapper from \"./components/ExportPageWrapper\";\n    import { PageExporter } from \"./utils/exportPage\";\n    import MySetps from \"./components/MySetps\";\n    import CrudTable from \"./components/CrudTable\";\n\n    import MenuFooter from \"./components/MenuFooter\";\n    import GlobalHeader from \"./components/GlobalHeader\";\n    import GlobalFooter from \"./components/GlobalFooter\";\n    import AvatarDropdown from \"./components/AvatarDropdown\";\n    import HeaderSearch from \"./components/HeaderSearch\";\n    import ThemeSwitch from \"./components/ThemeSwitch\";\n    import KeepAliveTabs from \"./components/KeepAliveTabs\";\n    import KeepAliveDndTabs from \"./components/KeepAliveDndTabs\";\n\n    import Authorized from \"./components/Authorized\";\n    import AuthorizedRoute from \"./components/AuthorizedRoute\";\n    import AuthorizeRender from \"./components/AuthorizeRender\";\n    import CheckPermissions from \"./components/CheckPermissions\";\n    import PromiseRender from \"./components/PromiseRender\";\n    import Secured from \"./components/Secured\";\n    import renderAuthorize from \"./components/renderAuthorize\";\n    import { getAuthorityFunction } from \"./utils/authorityFunction\";\n\n    import LoadingSvg from \"./components/LoadingSvg\";\n    import PageLoading from \"./components/PageLoading\";\n    import NoFoundPage from \"./components/NoFoundPage\";\n    import UserDisable from \"./components/UserDisable\";\n    import UserNoPermission from \"./components/UserNoPermission\";\n    import UserNoPagePermission from \"./components/UserNoPagePermission\";\n\n    import useAction from \"./hooks/useAction\";\n    import useFormatLocale from \"./hooks/useFormatLocale\";\n    import useActionLocales from \"./hooks/useActionLocales\";\n    import useQueryTableList from \"./hooks/useQueryTableList\";\n    import useAuthority from \"./hooks/useAuthority\";\n    import useColumnTitle, { useBatchColumnTitles } from \"./hooks/useColumnTitle\";\n    import useMemoizedFn from \"./hooks/useMemoizedFn\";\n    import { useKeepAliveTabs } from \"./hooks/useKeepAliveTabs\";\n    import { usePageExport } from \"./hooks/usePageExport\";\n    import { useRouteAuth } from \"./hooks/useRouteAuth\";\n\n    // \u5BFC\u51FAhooks\n    export {\n      useAction,\n      useFormatLocale,\n      useActionLocales,\n      useQueryTableList,\n      useAuthority,\n      useColumnTitle,\n      useBatchColumnTitles,\n      useMemoizedFn,\n      useKeepAliveTabs,\n      usePageExport,\n      useRouteAuth,\n    }\n\n    // \u5BFC\u51FA\u7EC4\u4EF6\n    export { \n      QrCodeModal, \n      CreateForm, \n      MyFooterToolbar,\n      DropdownButton,\n      DynamicIcon,\n      DynamicIconModal,\n      HighlightStr,\n      getAntdIconList,\n      EditMultiLangForm,\n      MyColorPicker,\n      MySelect,\n      MySelectLang,\n      PermissionSelect,\n      UTCDatePicker,\n      ProFormUTCDatePicker,\n      UTCRangePicker,\n      ProFormUTCRangePicker,\n      RandomAvatar,\n      RefDrawerForm,\n      UpdateForm,\n      ViewTableItemDrawer,\n      WangEditor,\n      WangEditorView,\n      MyUpload,\n      CopyButton,\n      ImportExecl,\n      MyPageContainer,\n      MyReactEcharts,\n      MyTagList,\n      VolumeFormItem,\n      ReportTable,\n      DicDropDownList,\n      ActionLogDrawer,\n      DndTabs,\n      DndTag,\n      TimeTypeSelect,\n      ImportDataUpload,\n      PDFWrapper,\n      ExportPageWrapper,\n      PageExporter,\n      MySetps,\n      CrudTable,\n\n      MenuFooter,\n      GlobalHeader,\n      GlobalFooter,\n      AvatarDropdown,\n      HeaderSearch,\n      ThemeSwitch,\n      KeepAliveTabs,\n      KeepAliveDndTabs,\n      \n      Authorized,\n      AuthorizedRoute,\n      AuthorizeRender,\n      CheckPermissions,\n      PromiseRender,\n      Secured,\n      renderAuthorize,\n      getAuthorityFunction,\n\n      PageLoading,\n      LoadingSvg,\n      NoFoundPage,\n      UserDisable,\n      UserNoPermission,\n      UserNoPagePermission,\n    };\n  "
+  content: "\n    // \u5BFC\u5165\u7EC4\u4EF6\n    import QrCodeModal from \"./components/QrCodeModal\";\n    import CreateForm from \"./components/AddDrawerForm\";\n    import MyFooterToolbar from \"./components/MyFooterToolbar\";\n    import DropdownButton from \"./components/DropdownButton\";\n    import DynamicIcon, { getAntdIconList } from \"./components/DynamicIcon\";\n    import DynamicIconModal from \"./components/DynamicIconModal\";\n    import HighlightStr from \"./components/HighlightStr\";\n    import EditMultiLangForm from \"./components/EditMultiLangForm\";\n    import MyColorPicker from \"./components/MyColorPicker\";\n    import MySelect from \"./components/MySelect\";\n    import MySelectLang from \"./components/MySelectLang\";\n    import PermissionSelect from \"./components/PermissionSelect\";\n    import DataPermissionSelect from \"./components/DataPermissionSelect\";\n    import UTCDatePicker from \"./components/UTCDatePicker\";\n    import ProFormUTCDatePicker from \"./components/ProFormUTCDatePicker\";\n    import UTCRangePicker from \"./components/UTCRangePicker\";\n    import ProFormUTCRangePicker from \"./components/ProFormUTCRangePicker\";\n    import RandomAvatar from \"./components/RandomAvatar\";\n    import RefDrawerForm from \"./components/RefDrawerForm\";\n    import UpdateForm from \"./components/UpdateForm\";\n    import ViewTableItemDrawer from \"./components/ViewTableItemDrawer\";\n    import WangEditor from \"./components/WangEditor\";\n    import WangEditorView from \"./components/WangEditorView\";\n    import MyUpload from \"./components/MyUpload\";\n    import CopyButton from \"./components/CopyButton\";\n    import ImportExecl from \"./components/ImportExecl\";\n    import MyPageContainer from \"./components/MyPageContainer\";\n    import MyReactEcharts from \"./components/MyReactEcharts\";\n    import MyTagList from \"./components/MyTagList\";\n    import VolumeFormItem from \"./components/VolumeFormItem\";\n    import ReportTable from \"./components/ReportTable\";\n    import DicDropDownList from \"./components/DicDropDownList\";\n    import ActionLogDrawer from \"./components/ActionLogDrawer\";\n    import DndTabs from \"./components/DndTabs\";\n    import DndTag from \"./components/DndTag\";\n    import TimeTypeSelect from \"./components/TimeTypeSelect\";\n    import ImportDataUpload from \"./components/ImportDataUpload\";\n    import PDFWrapper from \"./components/PDFWrapper\";\n    import ExportPageWrapper from \"./components/ExportPageWrapper\";\n    import { PageExporter } from \"./utils/exportPage\";\n    import MySetps from \"./components/MySetps\";\n    import CrudTable from \"./components/CrudTable\";\n\n    import MenuFooter from \"./components/MenuFooter\";\n    import GlobalHeader from \"./components/GlobalHeader\";\n    import GlobalFooter from \"./components/GlobalFooter\";\n    import AvatarDropdown from \"./components/AvatarDropdown\";\n    import HeaderSearch from \"./components/HeaderSearch\";\n    import ThemeSwitch from \"./components/ThemeSwitch\";\n    import KeepAliveTabs from \"./components/KeepAliveTabs\";\n    import KeepAliveDndTabs from \"./components/KeepAliveDndTabs\";\n\n    import Authorized from \"./components/Authorized\";\n    import AuthorizedRoute from \"./components/AuthorizedRoute\";\n    import AuthorizeRender from \"./components/AuthorizeRender\";\n    import CheckPermissions from \"./components/CheckPermissions\";\n    import PromiseRender from \"./components/PromiseRender\";\n    import Secured from \"./components/Secured\";\n    import renderAuthorize from \"./components/renderAuthorize\";\n    import { getAuthorityFunction } from \"./utils/authorityFunction\";\n\n    import LoadingSvg from \"./components/LoadingSvg\";\n    import PageLoading from \"./components/PageLoading\";\n    import NoFoundPage from \"./components/NoFoundPage\";\n    import UserDisable from \"./components/UserDisable\";\n    import UserNoPermission from \"./components/UserNoPermission\";\n    import UserNoPagePermission from \"./components/UserNoPagePermission\";\n\n    import useAction from \"./hooks/useAction\";\n    import useFormatLocale from \"./hooks/useFormatLocale\";\n    import useActionLocales from \"./hooks/useActionLocales\";\n    import useQueryTableList from \"./hooks/useQueryTableList\";\n    import useAuthority from \"./hooks/useAuthority\";\n    import useColumnTitle, { useBatchColumnTitles } from \"./hooks/useColumnTitle\";\n    import useMemoizedFn from \"./hooks/useMemoizedFn\";\n    import { useKeepAliveTabs } from \"./hooks/useKeepAliveTabs\";\n    import { usePageExport } from \"./hooks/usePageExport\";\n    import { useRouteAuth } from \"./hooks/useRouteAuth\";\n\n    // \u5BFC\u51FAhooks\n    export {\n      useAction,\n      useFormatLocale,\n      useActionLocales,\n      useQueryTableList,\n      useAuthority,\n      useColumnTitle,\n      useBatchColumnTitles,\n      useMemoizedFn,\n      useKeepAliveTabs,\n      usePageExport,\n      useRouteAuth,\n    }\n\n    // \u5BFC\u51FA\u7EC4\u4EF6\n    export { \n      QrCodeModal, \n      CreateForm, \n      MyFooterToolbar,\n      DropdownButton,\n      DynamicIcon,\n      DynamicIconModal,\n      HighlightStr,\n      getAntdIconList,\n      EditMultiLangForm,\n      MyColorPicker,\n      MySelect,\n      MySelectLang,\n      PermissionSelect,\n      DataPermissionSelect,\n      UTCDatePicker,\n      ProFormUTCDatePicker,\n      UTCRangePicker,\n      ProFormUTCRangePicker,\n      RandomAvatar,\n      RefDrawerForm,\n      UpdateForm,\n      ViewTableItemDrawer,\n      WangEditor,\n      WangEditorView,\n      MyUpload,\n      CopyButton,\n      ImportExecl,\n      MyPageContainer,\n      MyReactEcharts,\n      MyTagList,\n      VolumeFormItem,\n      ReportTable,\n      DicDropDownList,\n      ActionLogDrawer,\n      DndTabs,\n      DndTag,\n      TimeTypeSelect,\n      ImportDataUpload,\n      PDFWrapper,\n      ExportPageWrapper,\n      PageExporter,\n      MySetps,\n      CrudTable,\n\n      MenuFooter,\n      GlobalHeader,\n      GlobalFooter,\n      AvatarDropdown,\n      HeaderSearch,\n      ThemeSwitch,\n      KeepAliveTabs,\n      KeepAliveDndTabs,\n      \n      Authorized,\n      AuthorizedRoute,\n      AuthorizeRender,\n      CheckPermissions,\n      PromiseRender,\n      Secured,\n      renderAuthorize,\n      getAuthorityFunction,\n\n      PageLoading,\n      LoadingSvg,\n      NoFoundPage,\n      UserDisable,\n      UserNoPermission,\n      UserNoPagePermission,\n    };\n  "
 };

package/dist/cjs/writeTmpFile/writeTypes.js

@@ -8,5 +8,5 @@ var _types = require("../types");
 // 修改方法，不再尝试读取外部文件
 var _default = exports.default = {
   path: 'types.d.ts',
-  content: "\n    import React from 'react';\n    import { ModalProps, DrawerProps, SelectProps, DatePickerProps, UploadProps, UploadFile, TooltipProps, ButtonProps, TabsProps, SwitchProps, FloatButtonProps, StepsProps, FlexProps, TagProps } from 'antd';\n    import { PresetColorType, PresetStatusColorType } from \"antd/lib/_util/colors\";\n    import { AutoCompleteProps } from 'antd/es/auto-complete';\n    import { RangePickerProps } from 'antd/lib/date-picker';\n    import { LiteralUnion } from \"antd/lib/_util/type\";\n    import { IconComponentProps } from '@ant-design/icons/lib/components/Icon';\n    import { ActionType, ProFormItemProps, ProColumns, ProTableProps, DrawerFormProps, PageContainerProps } from '@ant-design/pro-components';\n    import dayjs, { OpUnitType } from 'dayjs';\n    import { IEditorConfig, IToolbarConfig } from '@wangeditor/editor';\n    import type { DragEndEvent } from '@dnd-kit/core';\n    import { fileTypeMap } from './components'; \n\n\n    ".concat(_types.servicesTypes, "\n\n    ").concat(_types.HighlightStrTypes, "\n\n    ").concat(_types.DropdownButtonTypes, "\n\n    ").concat(_types.DynamicIconTypes, "\n\n    ").concat(_types.MyFooterToolbarTypes, "\n\n    ").concat(_types.QrCodeModalTypes, "\n\n    ").concat(_types.MenuFooterTypes, "\n\n    ").concat(_types.EditMultiLangFormTypes, "\n\n    ").concat(_types.MySelectTypes, "\n\n    ").concat(_types.MySelectLangTypes, "\n\n    ").concat(_types.PermissionSelectTypes, "\n\n    ").concat(_types.DatePickerTypes, "\n\n    ").concat(_types.RandomAvatarTypes, "\n\n    ").concat(_types.RefDrawerFormTypes, "\n\n    ").concat(_types.ViewTableItemDrawerTypes, "\n\n    ").concat(_types.WangEditorTypes, "\n\n    ").concat(_types.MyPageContainerTypes, "\n\n    ").concat(_types.MyTagListTypes, "\n\n    ").concat(_types.VolumeFormItemTypes, "\n\n    ").concat(_types.ImportExeclTypes, "\n\n    ").concat(_types.MyUploadTypes, "\n\n    ").concat(_types.ReportTableTypes, "\n\n    ").concat(_types.DicDropDownListTypes, "\n\n    ").concat(_types.ActionLogDrawerTypes, "\n\n    ").concat(_types.DndTabsTypes, "\n\n    ").concat(_types.ImportDataUploadTypes, "\n\n    ").concat(_types.AvatarDropdownTypes, "\n\n    ").concat(_types.HeaderSearchTypes, "\n\n    ").concat(_types.ThemeSwitchTypes, "\n\n    ").concat(_types.GlobalHeaderTypes, "\n\n    ").concat(_types.KeepAliveTabsTypes, "\n\n    ").concat(_types.ExportPageWrapperTypes, "\n\n    ").concat(_types.MySetpsTypes, "\n\n    ").concat(_types.CrudTableTypes, "\n\n    ").concat(_types.DndTagTypes, "\n  ")
+  content: "\n    import React from 'react';\n    import { ModalProps, DrawerProps, SelectProps, DatePickerProps, UploadProps, UploadFile, TooltipProps, ButtonProps, TabsProps, SwitchProps, FloatButtonProps, StepsProps, FlexProps, TagProps } from 'antd';\n    import { PresetColorType, PresetStatusColorType } from \"antd/lib/_util/colors\";\n    import { AutoCompleteProps } from 'antd/es/auto-complete';\n    import { RangePickerProps } from 'antd/lib/date-picker';\n    import { LiteralUnion } from \"antd/lib/_util/type\";\n    import { IconComponentProps } from '@ant-design/icons/lib/components/Icon';\n    import { ActionType, ProFormItemProps, ProColumns, ProTableProps, DrawerFormProps, ModalFormProps, PageContainerProps } from '@ant-design/pro-components';\n    import dayjs, { OpUnitType } from 'dayjs';\n    import { IEditorConfig, IToolbarConfig } from '@wangeditor/editor';\n    import type { DragEndEvent } from '@dnd-kit/core';\n    import { fileTypeMap } from './components'; \n\n\n    ".concat(_types.servicesTypes, "\n\n    ").concat(_types.HighlightStrTypes, "\n\n    ").concat(_types.DropdownButtonTypes, "\n\n    ").concat(_types.DynamicIconTypes, "\n\n    ").concat(_types.MyFooterToolbarTypes, "\n\n    ").concat(_types.QrCodeModalTypes, "\n\n    ").concat(_types.MenuFooterTypes, "\n\n    ").concat(_types.EditMultiLangFormTypes, "\n\n    ").concat(_types.MySelectTypes, "\n\n    ").concat(_types.MySelectLangTypes, "\n\n    ").concat(_types.PermissionSelectTypes, "\n\n    ").concat(_types.DataPermissionSelectTypes, "\n\n    ").concat(_types.DatePickerTypes, "\n\n    ").concat(_types.RandomAvatarTypes, "\n\n    ").concat(_types.RefDrawerFormTypes, "\n\n    ").concat(_types.ViewTableItemDrawerTypes, "\n\n    ").concat(_types.WangEditorTypes, "\n\n    ").concat(_types.MyPageContainerTypes, "\n\n    ").concat(_types.MyTagListTypes, "\n\n    ").concat(_types.VolumeFormItemTypes, "\n\n    ").concat(_types.ImportExeclTypes, "\n\n    ").concat(_types.MyUploadTypes, "\n\n    ").concat(_types.ReportTableTypes, "\n\n    ").concat(_types.DicDropDownListTypes, "\n\n    ").concat(_types.ActionLogDrawerTypes, "\n\n    ").concat(_types.DndTabsTypes, "\n\n    ").concat(_types.ImportDataUploadTypes, "\n\n    ").concat(_types.AvatarDropdownTypes, "\n\n    ").concat(_types.HeaderSearchTypes, "\n\n    ").concat(_types.ThemeSwitchTypes, "\n\n    ").concat(_types.GlobalHeaderTypes, "\n\n    ").concat(_types.KeepAliveTabsTypes, "\n\n    ").concat(_types.ExportPageWrapperTypes, "\n\n    ").concat(_types.MySetpsTypes, "\n\n    ").concat(_types.CrudTableTypes, "\n\n    ").concat(_types.DndTagTypes, "\n  ")
 };

package/dist/esm/components/CrudTable.tpl

@@ -699,7 +699,7 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
         label: (
           <a onClick={handleDownloadTemplate} key="templateDownload">
             <DownloadOutlined style={{ marginRight: 6 }} />
-            {formatMessage({ id: 'cfmmUI.common.button.importData', defaultMessage: '下载模板' })}
+            {formatMessage({ id: 'cfmmUI.common.button.templateDownload', defaultMessage: '下载模板' })}
           </a>
         ),
       },

package/dist/esm/components/DataPermissionSelect.tpl

@@ -0,0 +1,223 @@
+import { ModalForm, ProFormCheckbox, ProFormSelect } from '@ant-design/pro-components';
+import { useIntl } from '@umijs/max';
+import { Form, Tree } from 'antd';
+import React, { useEffect, useMemo, useState } from 'react';
+import { arrayToTree } from '../utils/utils';
+import { DataPermissionSelectProps, DataScopeEnum, DeptCheckStrictlyEnum } from "../types.d";
+
+/**
+ * 数据权限选择组件
+ * @param {DataPermissionSelectProps} props 
+ * @param {string} props.authorizeName 授权名称
+ * @param {number | string} props.rootParentKey 根节点ID
+ * @param {any[]} props.treeList 组织树列表
+ * @param {Function} props.onFinish 提交回调
+ * @param {ModalFormProps} restProps ModalForm其他属性
+ */
+const DataPermissionSelect = (props: DataPermissionSelectProps) => {
+  const [form] = Form.useForm();
+  const { formatMessage } = useIntl();
+  const { values, authorizeName, rootParentKey, treeList, onFinish, ...restProps } = props;
+  const [selectPermissionList, setSelectPermissionList] = useState<React.Key[]>([]);
+  const [expandedKeys, setExpandedKeys] = useState<React.Key[]>([]);
+  // 父子联动
+  const [deptCheckStrictly, setDeptCheckStrictly] = useState<boolean>(false);
+  // 是否显示树
+  const [showTree, setShowTree] = useState<boolean>(true);
+  const [submitting, setSubmitting] = useState<boolean>(false);
+
+  const menuTreeDate = useMemo(() => {
+    if (!treeList) return [];
+
+    return arrayToTree(treeList, {
+      id: 'deptId',
+      rootId: rootParentKey,
+      mapNode: (item, children) => ({
+        title: item.deptName,
+        key: item.deptId,
+        children: children?.length ? children : undefined,
+      }),
+    });
+  }, [treeList]);
+
+  const allKeys = useMemo(() => treeList?.map((item) => item.deptId) ?? [], [treeList]);
+
+  useEffect(() => {
+    if (values) {
+      setSelectPermissionList(values.deptIds ?? []);
+
+      const deptCheckStrictlyValues = values.deptCheckStrictly ?
+        [DeptCheckStrictlyEnum.FOLD, DeptCheckStrictlyEnum.SELECT_ALL] :
+        [DeptCheckStrictlyEnum.FOLD];
+
+      setDeptCheckStrictly(deptCheckStrictlyValues.includes(DeptCheckStrictlyEnum.SELECT_ALL));
+      setShowTree(values.dataScope === DataScopeEnum.CUSTOM);
+
+      form.setFieldsValue({
+        dataScope: values.dataScope ?? DataScopeEnum.CUSTOM,
+        deptCheckStrictly: deptCheckStrictlyValues,
+      })
+    }
+  }, [values]);
+
+  // 数据加载后默认展开全部
+  useEffect(() => {
+    setExpandedKeys(allKeys);
+  }, [allKeys]);
+
+  /**
+   * 提交方法
+   */
+  const handleSubmit = async () => {
+    if (submitting) {
+      return; //如果在提交 就直接返回
+    }
+
+    setSubmitting(true);
+
+    const values = form.getFieldsValue();
+
+    const submitParams = {
+      ...values,
+      deptCheckStrictly,
+      deptIds: selectPermissionList
+    }
+
+    //调用父级的方法
+    const success = await onFinish?.(submitParams);
+
+    setSubmitting(false);
+
+    if (success) {
+      //弹出框关闭后，清除选择的数据
+      setSelectPermissionList([]);
+    }
+    return success;
+  };
+
+  return (
+    <ModalForm form={form}
+      width={700}
+      title={authorizeName ? `${formatMessage({
+        id: 'cfmmUI.DataPermissionSelect.title',
+        defaultMessage: '选择数据权限范围',
+      })} - ${authorizeName}` : `${formatMessage({
+        id: 'cfmmUI.DataPermissionSelect.title',
+        defaultMessage: '选择数据权限范围',
+      })}`}
+      //关闭弹窗清除数据
+      modalProps={{
+        destroyOnHidden: true,
+      }}
+      layout="horizontal"
+      labelCol={{ span: 5 }}
+      wrapperCol={{ span: 16 }}
+      onFinish={handleSubmit}
+      {...restProps}
+    >
+      <ProFormSelect
+        name="dataScope"
+        label={formatMessage({
+          id: 'cfmmUI.DataPermissionSelect.dataScope',
+          defaultMessage: '权限范围',
+        })}
+        initialValue={DataScopeEnum.CUSTOM}
+        allowClear={false}
+        fieldProps={{
+          options: [
+            { label: formatMessage({
+              id: 'cfmmUI.DataPermissionSelect.dataScope.all',
+              defaultMessage: '全部数据权限',
+            }), value: DataScopeEnum.ALL },
+            { label: formatMessage({
+              id: 'cfmmUI.DataPermissionSelect.dataScope.custom',
+              defaultMessage: '自定义数据权限',
+            }), value: DataScopeEnum.CUSTOM },
+            { label: formatMessage({
+              id: 'cfmmUI.DataPermissionSelect.dataScope.dept',
+              defaultMessage: '本部门数据权限',
+            }), value: DataScopeEnum.DEPT },
+            { label: formatMessage({
+              id: 'cfmmUI.DataPermissionSelect.dataScope.deptAndSub',
+              defaultMessage: '本部门及以下数据权限',
+            }), value: DataScopeEnum.DEPT_AND_SUB },
+            { label: formatMessage({
+              id: 'cfmmUI.DataPermissionSelect.dataScope.onlySelf',
+              defaultMessage: '仅本人数据权限',
+            }), value: DataScopeEnum.ONLY_SELF },
+          ],
+          onChange: (value) => {
+            if (value === DataScopeEnum.CUSTOM) {
+              setShowTree(true);
+            } else {
+              setShowTree(false);
+              setSelectPermissionList([]);
+            }
+          },
+        }} />
+
+      {
+        showTree && (
+          <>
+            <ProFormCheckbox.Group
+              name="deptCheckStrictly"
+              label={formatMessage({
+                id: 'cfmmUI.DataPermissionSelect.dataPermission',
+                defaultMessage: '数据权限',
+              })}
+              initialValue={[DeptCheckStrictlyEnum.FOLD]}
+              fieldProps={{
+                // defaultValue: [DeptCheckStrictlyEnum.FOLD],
+                options: [
+                  { label: formatMessage({
+                    id: 'cfmmUI.DataPermissionSelect.dataPermission.fold',
+                    defaultMessage: '折叠/展开',
+                  }), value: DeptCheckStrictlyEnum.FOLD },
+                  { label: formatMessage({
+                    id: 'cfmmUI.DataPermissionSelect.dataPermission.selectAll',
+                    defaultMessage: '全选/全不选',
+                  }), value: DeptCheckStrictlyEnum.SELECT_ALL },
+                  { label: formatMessage({
+                    id: 'cfmmUI.DataPermissionSelect.dataPermission.parentChild',
+                    defaultMessage: '父子联动',
+                  }), value: DeptCheckStrictlyEnum.PARENT_CHILD },
+                ],
+                onChange: (checkedValues) => {
+                  setExpandedKeys(checkedValues.includes(DeptCheckStrictlyEnum.FOLD) ? allKeys : []);
+                  setSelectPermissionList(checkedValues.includes(DeptCheckStrictlyEnum.SELECT_ALL) ? allKeys : []);
+                  setDeptCheckStrictly(checkedValues.includes(DeptCheckStrictlyEnum.PARENT_CHILD));
+                },
+              }}
+            />
+            <Form.Item
+              // name="deptIds"
+              wrapperCol={{ offset: 5, span: 16 }}
+            >
+              <Tree
+                style={{
+                  border: '1px solid #d9d9d9',
+                  borderRadius: 8,
+                  maxHeight: "calc(100vh - 450px)",
+                  overflow: 'auto',
+                }}
+                checkable
+                expandedKeys={expandedKeys}
+                onExpand={setExpandedKeys}
+                checkedKeys={selectPermissionList}
+                treeData={menuTreeDate}
+                checkStrictly={true}
+                // @ts-ignore
+                onCheck={(checkedKeys) => {
+                  const keys = Array.isArray(checkedKeys) ? checkedKeys : checkedKeys.checked;
+                  setSelectPermissionList(keys)
+                }}
+              />
+            </Form.Item>
+          </>
+        )
+      }
+    </ModalForm>
+  );
+};
+
+export default React.memo(DataPermissionSelect) as typeof DataPermissionSelect;

package/dist/esm/components/EditMultiLangForm.tpl

@@ -244,7 +244,7 @@ const EditMultiLangForm: React.FC<EditMultiLangFormProps> = (props) => {
 
         <ProFormText
           width="sm"
-          name="recordId"
+          name="dataId"
           disabled
           tooltip={formatMessage({
             id: 'cfmmUI.multilang.column.recordId.tooltip',

package/dist/esm/components/PermissionSelect.tpl

@@ -18,13 +18,17 @@ export async function queryAllPermissions() {
   });
 }
 
+const checkStatus = (status: string): boolean => {
+  return status.toUpperCase() === 'Y';
+}
+
 /**
  * 选择权限组件
  * @param props
  * @returns
  */
 const PermissionSelect: React.FC<PermissionSelectFormProps> = (props) => {
-  const { values, modalFormVisible, rootParentKey = '0', onSubmit, setModalFormVisible } = props;
+  const { values, authorizeName, modalFormVisible, rootParentKey = '0', onSubmit, setModalFormVisible } = props;
   const { formatMessage } = useIntl();
   const [form] = Form.useForm();
 
@@ -58,7 +62,7 @@ const PermissionSelect: React.FC<PermissionSelectFormProps> = (props) => {
       /**
        * 找出父级菜单下的所有菜单
        */
-      let filterSonMenuList = allMenuData.filter((item) => item.parentId === parentKey);
+      let filterSonMenuList = allMenuData.filter((item) => item.parentId.toString() === parentKey.toString());
       const findSonMenuSortList = filterSonMenuList.sort((a, b) => Number(a.seqNo) - Number(b.seqNo));
 
       /**
@@ -66,18 +70,23 @@ const PermissionSelect: React.FC<PermissionSelectFormProps> = (props) => {
        */
       findSonMenuSortList.forEach((menuItem) => {
         let sunItem = GetMenuTree(menuItem.menuId, allMenuData, allPermissionData);
+        const menuEnabled = checkStatus(menuItem.status);
 
         /**
          * 找出菜单对应的权限
          * 如果菜单无效或者菜单权限无效，则节点不可用
          */
         const filterPermissions = allPermissionData.filter((item) => item.menuId === menuItem.menuId);
-        let PermissionNodes = filterPermissions.map((item) => ({
-          title: item.permissionName,
-          key: item.permissionId,
-          disableCheckbox: item.status.toUpperCase() === 'Y' && menuItem.status.toUpperCase() === 'Y' ? false : true,
-          disabled: item.status.toUpperCase() === 'Y' && menuItem.status.toUpperCase() === 'Y' ? false : true,
-        }));
+        let PermissionNodes = filterPermissions.map((item) => {
+          const permissionEnabled = checkStatus(item.status);
+
+          return ({
+            title: item.permissionName,
+            key: item.permissionId,
+            disableCheckbox: !menuEnabled && !permissionEnabled,
+            disabled: !menuEnabled && !permissionEnabled,
+          })
+        });
 
         if (sunItem && sunItem.length > 0) {
           /**
@@ -89,7 +98,7 @@ const PermissionSelect: React.FC<PermissionSelectFormProps> = (props) => {
             title: (
               <span
                 style={{
-                  color: menuItem.status.toUpperCase() === 'Y' ? '#1890ff' : '#cccccc',
+                  color: menuEnabled ? '#1890ff' : '#cccccc',
                   fontWeight: 'bold',
                 }}
               >
@@ -98,8 +107,8 @@ const PermissionSelect: React.FC<PermissionSelectFormProps> = (props) => {
               </span>
             ),
             //菜单不可用，则将颜色设置为灰色，且菜单不可用
-            disableCheckbox: menuItem.status.toUpperCase() === 'Y' ? false : true,
-            disabled: menuItem.status.toUpperCase() === 'Y' ? false : true,
+            disableCheckbox: !menuEnabled,
+            disabled: !menuEnabled,
             key: `Menu-${menuItem.menuId.toString()}`,
             children: sunItem,
           });
@@ -108,7 +117,7 @@ const PermissionSelect: React.FC<PermissionSelectFormProps> = (props) => {
             title: (
               <span
                 style={{
-                  color: menuItem.status.toUpperCase() === 'Y' ? '#1890ff' : '#cccccc',
+                  color: menuEnabled ? '#1890ff' : '#cccccc',
                   fontWeight: 'bold',
                 }}
               >
@@ -116,8 +125,8 @@ const PermissionSelect: React.FC<PermissionSelectFormProps> = (props) => {
               </span>
             ),
             //菜单不可用，则将颜色设置为灰色，且菜单不可用
-            disableCheckbox: menuItem.status.toUpperCase() === 'Y' ? false : true,
-            disabled: menuItem.status.toUpperCase() === 'Y' ? false : true,
+            disableCheckbox: !menuEnabled,
+            disabled: !menuEnabled,
             key: `Menu-${menuItem.menuId.toString()}`,
             children: PermissionNodes,
           });
@@ -139,7 +148,7 @@ const PermissionSelect: React.FC<PermissionSelectFormProps> = (props) => {
    */
   const handleSearchAllMenu = async () => {
     const getAllMenus = await queryAllMenus();
-    
+
     const getAllPermissions = await queryAllPermissions();
 
     /**
@@ -204,10 +213,13 @@ const PermissionSelect: React.FC<PermissionSelectFormProps> = (props) => {
     <ModalForm
       form={form}
       width={500}
-      title={formatMessage({
+      title={authorizeName ? `${formatMessage({
+        id: 'cfmmUI.PermissionSelect.title',
+        defaultMessage: '选择权限',
+      })} - ${authorizeName}` : `${formatMessage({
         id: 'cfmmUI.PermissionSelect.title',
         defaultMessage: '选择权限',
-      })}
+      })}`}
       open={modalFormVisible}
       onOpenChange={setModalFormVisible}
       onFinish={handleSubmit}

package/dist/esm/locales/en-US.d.ts

@@ -1,4 +1,15 @@
 declare const _default: {
+    "cfmmUI.DataPermissionSelect.title": string;
+    "cfmmUI.DataPermissionSelect.dataScope": string;
+    "cfmmUI.DataPermissionSelect.dataScope.all": string;
+    "cfmmUI.DataPermissionSelect.dataScope.custom": string;
+    "cfmmUI.DataPermissionSelect.dataScope.dept": string;
+    "cfmmUI.DataPermissionSelect.dataScope.deptAndSub": string;
+    "cfmmUI.DataPermissionSelect.dataScope.onlySelf": string;
+    "cfmmUI.DataPermissionSelect.dataPermission": string;
+    "cfmmUI.DataPermissionSelect.dataPermission.fold": string;
+    "cfmmUI.DataPermissionSelect.dataPermission.selectAll": string;
+    "cfmmUI.DataPermissionSelect.dataPermission.parentChild": string;
     "cfmmUI.TimeTypeSelect.time.hour": string;
     "cfmmUI.TimeTypeSelect.time.minute": string;
     "cfmmUI.TimeTypeSelect.time.second": string;

package/dist/esm/locales/enUS/DataPermissionSelect.d.ts

@@ -0,0 +1,14 @@
+declare const _default: {
+    "cfmmUI.DataPermissionSelect.title": string;
+    "cfmmUI.DataPermissionSelect.dataScope": string;
+    "cfmmUI.DataPermissionSelect.dataScope.all": string;
+    "cfmmUI.DataPermissionSelect.dataScope.custom": string;
+    "cfmmUI.DataPermissionSelect.dataScope.dept": string;
+    "cfmmUI.DataPermissionSelect.dataScope.deptAndSub": string;
+    "cfmmUI.DataPermissionSelect.dataScope.onlySelf": string;
+    "cfmmUI.DataPermissionSelect.dataPermission": string;
+    "cfmmUI.DataPermissionSelect.dataPermission.fold": string;
+    "cfmmUI.DataPermissionSelect.dataPermission.selectAll": string;
+    "cfmmUI.DataPermissionSelect.dataPermission.parentChild": string;
+};
+export default _default;

package/dist/esm/locales/enUS/DataPermissionSelect.js

@@ -0,0 +1,13 @@
+export default {
+  "cfmmUI.DataPermissionSelect.title": "Select Data Permission Range",
+  "cfmmUI.DataPermissionSelect.dataScope": "Permission Range",
+  "cfmmUI.DataPermissionSelect.dataScope.all": "All Data Permission",
+  "cfmmUI.DataPermissionSelect.dataScope.custom": "Custom Data Permission",
+  "cfmmUI.DataPermissionSelect.dataScope.dept": "Department Data Permission",
+  "cfmmUI.DataPermissionSelect.dataScope.deptAndSub": "Department and Subordinate Data Permission",
+  "cfmmUI.DataPermissionSelect.dataScope.onlySelf": "Only Self Data Permission",
+  "cfmmUI.DataPermissionSelect.dataPermission": "Data Permission",
+  "cfmmUI.DataPermissionSelect.dataPermission.fold": "Fold/Expand",
+  "cfmmUI.DataPermissionSelect.dataPermission.selectAll": "Select All/Select None",
+  "cfmmUI.DataPermissionSelect.dataPermission.parentChild": "Parent-Child"
+};