@jswork/antd-components 1.0.108 → 1.0.110

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jswork/antd-components",
-  "version": "1.0.108",
+  "version": "1.0.110",
   "main": "dist/main.cjs.js",
   "module": "dist/main.esm.js",
   "types": "dist/main.d.ts",
@@ -18,11 +18,11 @@
   },
   "devDependencies": {
     "@jswork/harmony-events": "^1.2.11",
-    "@jswork/next": "^1.2.11",
+    "@jswork/next": "^1.4.2",
     "@swc/core": "^1.3.93",
     "@types/react": "^18.2.28",
     "@types/react-dom": "^18.2.13",
-    "antd": "^5.27.4",
+    "antd": "^5.27.5",
     "autoprefixer": "^10.4.16",
     "classnames": "^2.5.1",
     "cssnano": "^6.0.1",

package/src/lib/alert.tsx

@@ -1,14 +1,25 @@
 import React from 'react';
-import { Input, InputProps, Modal } from 'antd';
+import { Input, InputProps, message, Modal } from 'antd';
 
 declare global {
   interface NxStatic {
+    err: (inMessage: string) => any;
+    msg: (inMessage: string) => any;
     alert: (inMessage: string, inTitle?: String) => any;
     confirm: (inMessage: string, inTitle?: String) => any;
     prompt: (inMessage: string, inOptions?: InputProps) => any;
   }
 }
 
+export const msg = (inMessage: string) => {
+  return message.success(inMessage);
+};
+
+export const err = (inMessage: string) => {
+  return message.error(inMessage);
+};
+
+
 export const alert = (inMessage: string, inTitle?: String) => {
   return Modal.info({
     title: inTitle || 'Tips',
@@ -47,6 +58,8 @@ export const prompt = (inMessage: string, inOptions?: InputProps) => {
   });
 };
 
+nx.msg = msg;
+nx.err = err;
 nx.alert = alert;
 nx.confirm = confirm;
 nx.prompt = prompt;

package/src/lib/breadcrumb.tsx

@@ -32,9 +32,13 @@ export class AcBreadcrumb extends React.Component<AcBreadcrumbProps> {
   render() {
     const { className, value, items, template, onChange, ...props } = this.props;
     return (
-      <Breadcrumb className={cx(className, CLASS_NAME)} {...props}>
-        <ReactList items={items || []} template={template} />
-      </Breadcrumb>
+      <ReactList
+        items={items || []}
+        template={template}
+        as={Breadcrumb}
+        className={cx(className, CLASS_NAME)}
+        {...props}
+      />
     );
   }
 }

package/src/lib/button.tsx

@@ -0,0 +1,122 @@
+/**
+ * @Author: aric 1290657123@qq.com
+ * @Date: 2025-10-18 07:09:31
+ * @LastEditors: aric 1290657123@qq.com
+ * @LastEditTime: 2025-10-18 07:29:35
+ */
+import React, { FC } from 'react';
+import { Button, ButtonProps } from 'antd';
+
+const locals = {
+  'zh-CN': {
+    create: '添加',
+    edit: '编辑',
+    del: '删除',
+    view: '查看',
+    save: '保存',
+    export: '导出',
+    imp: '导入',
+    refresh: '刷新',
+    back: '返回',
+    submit: '提交',
+    cancel: '取消',
+  },
+  'en-US': {
+    create: 'Create',
+    edit: 'Edit',
+    del: 'Delete',
+    view: 'View',
+    save: 'Save',
+    export: 'Export',
+    imp: 'Import',
+    refresh: 'Refresh',
+    back: 'Back',
+    submit: 'Submit',
+    cancel: 'Cancel',
+  },
+};
+
+const t = (locale: string, key: string) => {
+  return locals[locale][key] || key;
+};
+
+type AcButtonProps = ButtonProps & {
+  lang: 'zh-CN' | 'en-US';
+}
+
+export const BtnCreate: FC<AcButtonProps> = ({ lang = 'zh-CN', ...props }) => {
+  return <Button size="small" {...props}>
+    ➕
+    <span>{t(lang, 'create')}</span>
+  </Button>;
+};
+
+export const BtnEdit: FC<AcButtonProps> = ({ lang = 'zh-CN', ...props }) => {
+  return <Button size="small" {...props}>
+    ✏️
+    <span>{t(lang, 'edit')}</span>
+  </Button>;
+};
+
+export const BtnDelete: FC<AcButtonProps> = ({ lang = 'zh-CN', ...props }) => {
+  return <Button size="small" {...props}>
+    🗑️
+    <span>{t(lang, 'del')}</span>
+  </Button>;
+};
+
+export const BtnView: FC<AcButtonProps> = ({ lang = 'zh-CN', ...props }) => {
+  return <Button size="small" {...props}>
+    👁️
+    <span>{t(lang, 'view')}</span>
+  </Button>;
+};
+
+export const BtnSave: FC<AcButtonProps> = ({ lang = 'zh-CN', ...props }) => {
+  return <Button size="small" {...props}>
+    💾
+    <span>{t(lang, 'save')}</span>
+  </Button>;
+};
+
+export const BtnExport: FC<AcButtonProps> = ({ lang = 'zh-CN', ...props }) => {
+  return <Button size="small" {...props}>
+    📤
+    <span>{t(lang, 'export')}</span>
+  </Button>;
+};
+
+export const BtnImport: FC<AcButtonProps> = ({ lang = 'zh-CN', ...props }) => {
+  return <Button size="small" {...props}>
+    📥
+    <span>{t(lang, 'imp')}</span>
+  </Button>;
+};
+
+export const BtnRefresh: FC<AcButtonProps> = ({ lang = 'zh-CN', ...props }) => {
+  return <Button size="small" {...props}>
+    ⚡️
+    <span>{t(lang, 'refresh')}</span>
+  </Button>;
+};
+
+export const BtnBack: FC<AcButtonProps> = ({ lang = 'zh-CN', ...props }) => {
+  return <Button size="small" {...props}>
+    🔙
+    <span>{t(lang, 'back')}</span>
+  </Button>;
+};
+
+export const BtnSubmit: FC<AcButtonProps> = ({ lang = 'zh-CN', ...props }) => {
+  return <Button size="small" {...props}>
+    📨
+    <span>{t(lang, 'submit')}</span>
+  </Button>;
+};
+
+export const BtnCancel: FC<AcButtonProps> = ({ lang = 'zh-CN', ...props }) => {
+  return <Button size="small" {...props}>
+    ❌
+    <span>{t(lang, 'cancel')}</span>
+  </Button>;
+};

package/src/lib/table.tsx

@@ -1,15 +1,15 @@
 /**
  * @Author: aric 1290657123@qq.com
  * @Date: 2025-10-03 07:11:26
- * @LastEditors: aric.zheng 1290657123@qq.com
- * @LastEditTime: 2025-10-16 08:20:55
+ * @LastEditors: aric 1290657123@qq.com
+ * @LastEditTime: 2025-10-18 17:16:07
  */
-import React, { FC } from 'react';
-import { Table, TableProps, message } from 'antd';
-import cx from 'classnames';
 import type { EventMittNamespace } from '@jswork/event-mitt';
 import { ReactHarmonyEvents } from '@jswork/harmony-events';
 import '@jswork/next-create-fetcher';
+import { Table, TableProps, message } from 'antd';
+import cx from 'classnames';
+import React, { FC } from 'react';
 
 const CLASS_NAME = 'ac-table';
 
@@ -19,14 +19,22 @@ export type AcTableProps = TableProps & {
    * @default '@'
    */
   name?: string;
+  params?: Record<string, any>;
   /**
    * 自定义数据获取函数
    * @param params { current: number; pageSize: number }
    * @returns Promise<{ data: any[]; total: number }>
    */
-  fetcher: (params: { current: number; pageSize: number }) => Promise<{ data: any[]; total: number }>;
-  onPageChange?: (current: number, size: number) => void;
-  rowKey?: string;
+  fetcher: (params: {
+    current: number;
+    pageSize: number;
+    params?: Record<string, any>;
+  }) => Promise<{ data: any[]; total: number }>;
+  /**
+   * @param page
+   * @param size
+   */
+  onPageChange?: (page: number, size: number) => void;
   defaultCurrent?: number;
   defaultPageSize?: number;
   total?: number; // 如果 fetcher 不返回 total，可在此固定（不推荐）
@@ -37,10 +45,7 @@ export class AcTable extends React.Component<AcTableProps, any> {
   static formSchema = CLASS_NAME;
   private harmonyEvents: ReactHarmonyEvents | null = null;
   static event: EventMittNamespace.EventMitt;
-  static events = [
-    'refetch',
-    'reset',
-  ];
+  static events = ['refetch', 'reset'];
 
   static defaultProps = {
     name: '@',
@@ -76,10 +81,10 @@ export class AcTable extends React.Component<AcTableProps, any> {
 
   fetchData = async (page: number, size: number) => {
     const abortController = new AbortController();
-    const { fetcher } = this.props;
+    const { fetcher, params } = this.props;
     this.setState({ isLoading: true });
     try {
-      const result = await fetcher({ current: page, pageSize: size });
+      const result = await fetcher({ current: page, pageSize: size, params });
       if (!abortController.signal.aborted) {
         this.setState({
           dataSource: result.data || [],
@@ -109,22 +114,26 @@ export class AcTable extends React.Component<AcTableProps, any> {
 
   reset = async () => {
     const { defaultCurrent, defaultPageSize } = this.props;
-    this.setState({
-      current: defaultCurrent,
-      pageSize: defaultPageSize,
-    }, () => {
-      void this.fetchData(defaultCurrent!, defaultPageSize!);
-    });
+    this.setState(
+      {
+        current: defaultCurrent,
+        pageSize: defaultPageSize,
+      },
+      () => {
+        void this.fetchData(defaultCurrent!, defaultPageSize!);
+      }
+    );
   };
 
   /* ----- public eventBus methods end  ----- */
 
   render() {
-    const { className, pagination, onPageChange, ...rest } = this.props;
+    const { className, pagination, onPageChange, params, ...rest } = this.props;
     const { dataSource, isLoading, current, pageSize, total } = this.state;
     return (
       <Table
-        className={cx(className, CLASS_NAME)} loading={isLoading}
+        className={cx(className, CLASS_NAME)}
+        loading={isLoading}
         dataSource={dataSource}
         pagination={{
           total,
@@ -146,12 +155,16 @@ export class AcTable extends React.Component<AcTableProps, any> {
 
 export type AcTableMainProps = Omit<AcTableProps, 'fetcher'> & {
   name: string;
-  dataPath?: string
+  dataPath?: string;
   totalPath?: string;
 };
 
 export const AcTableMain: FC<AcTableMainProps> = (props) => {
-  const { name, dataPath, totalPath, ...rest } = { dataPath: 'rows', totalPath: 'total', ...props };
+  const { name, dataPath, totalPath, params, ...rest } = {
+    dataPath: 'rows',
+    totalPath: 'total',
+    ...props,
+  };
   const resourceId = `${name}_index`;
   const fetcher = nx.createFetcher(resourceId, { dataPath, totalPath });
 
@@ -167,4 +180,3 @@ export const AcTableMain: FC<AcTableMainProps> = (props) => {
     />
   );
 };
-

package/src/main.ts

@@ -43,6 +43,7 @@ import './lib/alert';
 // commands
 import useTableCommand from './lib/use-table-command';
 
+export * from './lib/button';
 
 // export all templates
 export {

package/src/tpls/breadcrumb/index.tsx

@@ -3,6 +3,7 @@ import React from 'react';
 
 export const breadcrumbDefault = ({ item, index, items }) => {
   const last = items?.length - 1 === index;
-  const child = last ? <span>{item.label}</span> : <a href={item.value}>{item.label}</a>;
+  const { label, ...rest } = item;
+  const child = last ? <span {...rest}>{label}</span> : <a {...rest}>{label}</a>;
   return <Breadcrumb.Item key={index}>{child}</Breadcrumb.Item>;
 };

package/src/tpls/kv/index.tsx

@@ -22,12 +22,12 @@ const defaults = {
  */
 export const kv = ({ item, index }, options: Options) => {
   const opts = { ...defaults, ...options };
-  const { component: Component, value, label, ...otherProps } = opts;
+  const { component: Component, value, label, ...rest } = opts;
   const val = item[value];
   const children = item[label];
 
   return (
-    <Component key={index} value={val} {...otherProps}>
+    <Component key={index} value={val} {...rest}>
       {children}
     </Component>
   );
@@ -60,9 +60,9 @@ export const radioKv = (args, opts) => {
 };
 
 export const treeKv = ({ item }, cb) => {
-  const { value, label, ...itemProps } = item;
+  const { value, label, ...rest } = item;
   return (
-    <Tree.TreeNode key={value} title={label} {...itemProps}>
+    <Tree.TreeNode key={value} title={label} {...rest}>
       {cb()}
     </Tree.TreeNode>
   );