@kingteza/crud-component 1.0.63 → 1.0.64

package/crud/CrudComponent.d.ts

@@ -7,7 +7,7 @@ import { CrudSearchComponentProps } from './CrudSearchComponent';
 import { FileCrudField } from './FileCrudField';
 import { ImageCrudField } from './ImageCrudField';
 import { CrudImportProps } from './import/CrudImportComponent';
-import { CrudDragableProps } from './view/CrudViewer';
+import { CrudDragableProps, CrudViewableProps } from './view/CrudViewer';
 import { SelectTagRenderProps } from '../common/select/SelectComponent';
 import { default as IdProps } from '../types/Id';
 import { TextAreaBasedFieldProps } from './CrudTextAreaComponent';
@@ -226,7 +226,7 @@ export type CrudComponentProps<T, FormType = T> = {
     isHiding?: boolean;
     isDeleting?: boolean;
     isUpdating?: boolean;
-    viewable?: boolean | keyof T;
+    viewable?: CrudViewableProps<T>;
     extraAction?: (t: T) => ReactElement;
     paginateProps?: CrudPaginateProps;
     formBuilder?: FormBuilderFunc<T>;

package/crud/view/CrudViewer.cjs.js

@@ -1 +1 @@
-"use strict";const n=require("react/jsx-runtime"),xt=require("antd"),jt=require("@dnd-kit/core"),lt=require("@dnd-kit/modifiers"),ht=require("@dnd-kit/utilities"),M=require("@dnd-kit/sortable"),qt=require("../../common/button/Button.cjs.js"),yt=require("../../common/button/CloneButtonTable.cjs.js"),vt=require("../../common/button/DeleteButtonTable.cjs.js"),St=require("../../common/button/ExportButton.cjs.js"),Bt=require("../../common/button/HideButtonTable.cjs.js"),Ct=require("../../common/button/RefreshButton.cjs.js"),It=require("../../common/button/UpdateButtonTable.cjs.js"),Tt=require("../../common/button/ViewButtonTable.cjs.js"),Rt=require("../../common/table/table.cjs.js"),u=require("react"),Mt=require("../../locale/index.cjs.js"),Vt=require("../CrudSearchComponent.cjs.js"),Et=require("./CrudDecListView.cjs.js"),et=require("./CrudViewerUtil.cjs.js"),Nt=require("@ant-design/icons"),nt=require("../../util/CrudUtil.cjs.js"),wt=require("../../common/layout/VerticalSpace.cjs.js"),Dt=u.memo(Rt);function Lt({idField:e="id",loadingData:v,fields:m,isDeleting:I,isHiding:S,viewable:f=!1,paginateProps:j,onDelete:l,onHide:T,onUpdate:y,data:B=[],extraAction:C,onClickUpdate:h,minusHeight:w,scroll:G,onClickClone:V,className:J,expandable:K,size:Q,bordered:X,descListColumn:ot,extraView:D,decListLayout:rt,scrollToTop:_t,onClickRefresh:Y,closeViewOnClickUpdate:Z,onExport:L,confirmHiding:A,confirmDeleting:P,rowClassName:W,actionWidth:a=190,draggable:o,...ut}){const{t:H}=Mt.useTranslationLib(),p=u.useMemo(()=>m.map(({hideInTable:t,hidden:s,width:c,label:r,halign:$,...R})=>{const N=nt.getRealName(R.name);return{title:r,width:c,key:N,dataIndex:N,hidden:t||s,align:$??(R.type==="number"?"right":void 0),render:et.getRendererValueCrudViewer(R)}}),[m]),[i,E]=u.useState(),[O,z]=u.useState(),[q,U]=u.useState([]);u.useEffect(()=>{B&&U(B)},[B]),u.useEffect(()=>{B&&E(t=>{if(t)return B.find(s=>s[e]===t[e])})},[B,e,i]);const _=u.useCallback(t=>{var c;const s=C==null?void 0:C(t);return(Array.isArray(s)?(c=s==null?void 0:s.filter(Boolean))!=null&&c.length:s)||y||h||V||l?n.jsxs(n.Fragment,{children:[s,(y||h)&&n.jsx(It,{value:t,onClick:r=>{z(r[e]),h==null||h(t),Z&&E(void 0)}}),V&&n.jsx(yt,{value:t,onClick:r=>V(r)}),L&&n.jsx(St.ExportButton,{value:t,onClick:async r=>await L(r)}),T&&n.jsx(Bt,{value:t,disabled:S,shouldConfirm:A,loading:S&&t[e]===O,onClick:async r=>{z(r[e]),await T({[e]:r[e]})}}),l&&n.jsx(vt,{value:t,disabled:I,shouldConfirm:P,loading:I&&t[e]===O,onClick:async r=>{z(r[e]),await l({[e]:r[e]})}})]}):void 0},[Z,P,A,C,e,I,S,V,h,l,L,T,y,O]),d=u.useCallback(t=>{var r;const{active:s,over:c}=t;if(o!=null&&o.onDragEnd&&(o==null||o.onDragEnd(t)),s.id!==(c==null?void 0:c.id)){const $=q.findIndex(x=>x[e]===s.id),R=q.findIndex(x=>x[e]===(c==null?void 0:c.id)),N=M.arrayMove(q,$,R);U(x=>{const mt=x.findIndex(k=>k[e]===(s==null?void 0:s.id)),ft=x.findIndex(k=>k[e]===(c==null?void 0:c.id));return M.arrayMove(x,mt,ft)}),(r=o==null?void 0:o.onDrag)==null||r.call(o,{newOrder:N.map(x=>x[e])})}},[q,e,o]),ct=u.useMemo(()=>{let t=typeof f=="string"?i==null?void 0:i[f]:void 0;if(typeof t=="object"){const s=m.find(c=>nt.getRealName(c.name)===f);t=et.getRendererValueCrudViewer(s)(t,i,0)}return t},[f,i,m]),b=u.useMemo(()=>({rowClassName:W,className:J,scroll:G??(w?{y:`calc(100vh - ${w})`}:void 0),id:"crud-table",bordered:X,size:Q,expandable:K}),[W,J,G,w,X,Q,K]),F=u.useMemo(()=>j?{total:j.count,onChange:j.setPage,current:j.page,pageSize:j.pageSize}:void 0,[j]),g=u.useMemo(()=>{const t=y||h||l||C||f,s=[];return o&&s.push({key:"key",align:"center",width:5,title:o==null?void 0:o.columnLabel,render:()=>n.jsx(Ot,{tooltip:o==null?void 0:o.tooltip})}),s.push(...p),t&&t&&s.push({title:H("str.action"),fixed:"right",width:a,render:(c,r)=>n.jsxs(n.Fragment,{children:[f&&n.jsx(Tt,{value:r,onClick:E}),_(r)]})}),s},[p,y,h,l,C,f,H,a,_]),tt=u.useMemo(()=>q.map(t=>t[e]),[q,e]),it=u.useCallback(()=>{const t=n.jsx(Dt,{...b,dataSource:q,loading:v,components:o?{body:{row:zt}}:void 0,pagination:F,columns:g});return o?n.jsx(jt.DndContext,{modifiers:[lt.restrictToVerticalAxis],onDragEnd:d,children:n.jsx(M.SortableContext,{items:tt,strategy:M.verticalListSortingStrategy,children:t})}):t},[b,q,v,F,g,o,tt,d]);return n.jsxs("div",{children:[f&&n.jsx(xt.Modal,{width:"100%",open:!!i,title:ct??n.jsx("div",{children:" "}),footer:n.jsx(n.Fragment,{}),closable:!0,onCancel:()=>E(void 0),children:!!i&&n.jsxs("div",{children:[n.jsx(Et.CrudDecListView,{layout:rt,descListColumn:ot,data:i,fields:m,action:_(i)}),D==null?void 0:D(i)]},i==null?void 0:i[e])}),n.jsx(Vt,{fields:m,...ut}),n.jsxs(wt,{children:[!!Y&&n.jsx(Ct.RefreshButton,{onClick:Y}),it()]})]})}const st=u.createContext({}),Ot=({tooltip:e})=>{const{setActivatorNodeRef:v,listeners:m}=u.useContext(st);return n.jsx(qt,{type:"text",size:"small",tooltip:e,icon:n.jsx(Nt.HolderOutlined,{}),style:{cursor:"move",border:"none"},ref:v,...m})},zt=e=>{const{attributes:v,listeners:m,setNodeRef:I,setActivatorNodeRef:S,transform:f,transition:j,isDragging:l}=M.useSortable({id:e["data-row-key"]}),T={...e.style,transform:ht.CSS.Translate.toString(f),transition:j,...l?{position:"relative",zIndex:9999}:{}},y=u.useMemo(()=>({setActivatorNodeRef:S,listeners:m}),[S,m]);return n.jsx(st.Provider,{value:y,children:n.jsx("tr",{...e,ref:I,style:T,...v})})};module.exports=Lt;
+"use strict";const n=require("react/jsx-runtime"),xt=require("antd"),jt=require("@dnd-kit/core"),yt=require("@dnd-kit/modifiers"),ht=require("@dnd-kit/utilities"),V=require("@dnd-kit/sortable"),qt=require("../../common/button/Button.cjs.js"),lt=require("../../common/button/CloneButtonTable.cjs.js"),Ct=require("../../common/button/DeleteButtonTable.cjs.js"),St=require("../../common/button/ExportButton.cjs.js"),Bt=require("../../common/button/HideButtonTable.cjs.js"),It=require("../../common/button/RefreshButton.cjs.js"),Tt=require("../../common/button/UpdateButtonTable.cjs.js"),Rt=require("../../common/button/ViewButtonTable.cjs.js"),Mt=require("../../common/table/table.cjs.js"),u=require("react"),vt=require("../../locale/index.cjs.js"),Vt=require("../CrudSearchComponent.cjs.js"),Et=require("./CrudDecListView.cjs.js"),et=require("./CrudViewerUtil.cjs.js"),Nt=require("@ant-design/icons"),nt=require("../../util/CrudUtil.cjs.js"),Dt=require("../../common/layout/VerticalSpace.cjs.js"),Lt=u.memo(Mt);function Ot({idField:e="id",loadingData:C,fields:f,isDeleting:R,isHiding:S,viewable:i=!1,paginateProps:j,onDelete:y,onHide:M,onUpdate:l,data:B=[],extraAction:I,onClickUpdate:h,minusHeight:L,scroll:J,onClickClone:E,className:K,expandable:Q,size:X,bordered:Y,descListColumn:ot,extraView:O,decListLayout:rt,scrollToTop:_t,onClickRefresh:Z,closeViewOnClickUpdate:A,onExport:z,confirmHiding:P,confirmDeleting:W,rowClassName:w,actionWidth:p=190,draggable:o,...ut}){const{t:H}=vt.useTranslationLib(),U=u.useMemo(()=>f.map(({hideInTable:t,hidden:s,width:c,label:r,halign:T,...v})=>{const D=nt.getRealName(v.name);return{title:r,width:c,key:D,dataIndex:D,hidden:t||s,align:T??(v.type==="number"?"right":void 0),render:et.getRendererValueCrudViewer(v)}}),[f]),[m,N]=u.useState(),[k,_]=u.useState(),[q,a]=u.useState([]);u.useEffect(()=>{B&&a(B)},[B]),u.useEffect(()=>{B&&N(t=>{if(t)return B.find(s=>s[e]===t[e])})},[B,e,m]);const $=u.useCallback(t=>{var c;const s=I==null?void 0:I(t);return(Array.isArray(s)?(c=s==null?void 0:s.filter(Boolean))!=null&&c.length:s)||l||h||E||y?n.jsxs(n.Fragment,{children:[s,(l||h)&&n.jsx(Tt,{value:t,onClick:r=>{_(r[e]),h==null||h(t),A&&N(void 0)}}),E&&n.jsx(lt,{value:t,onClick:r=>E(r)}),z&&n.jsx(St.ExportButton,{value:t,onClick:async r=>await z(r)}),M&&n.jsx(Bt,{value:t,disabled:S,shouldConfirm:P,loading:S&&t[e]===k,onClick:async r=>{_(r[e]),await M({[e]:r[e]})}}),y&&n.jsx(Ct,{value:t,disabled:R,shouldConfirm:W,loading:R&&t[e]===k,onClick:async r=>{_(r[e]),await y({[e]:r[e]})}})]}):void 0},[A,W,P,I,e,R,S,E,h,y,z,M,l,k]),d=u.useCallback(t=>{var r;const{active:s,over:c}=t;if(o!=null&&o.onDragEnd&&(o==null||o.onDragEnd(t)),s.id!==(c==null?void 0:c.id)){const T=q.findIndex(x=>x[e]===s.id),v=q.findIndex(x=>x[e]===(c==null?void 0:c.id)),D=V.arrayMove(q,T,v);a(x=>{const mt=x.findIndex(G=>G[e]===(s==null?void 0:s.id)),ft=x.findIndex(G=>G[e]===(c==null?void 0:c.id));return V.arrayMove(x,mt,ft)}),(r=o==null?void 0:o.onDrag)==null||r.call(o,{newOrder:D.map(x=>x[e])})}},[q,e,o]),ct=u.useMemo(()=>{let t=typeof i=="string"?m==null?void 0:m[i]:void 0;if(typeof t=="object"){const s=f.find(c=>nt.getRealName(c.name)===i);t=et.getRendererValueCrudViewer(s)(t,m,0)}return t},[i,m,f]),b=u.useMemo(()=>({rowClassName:w,className:K,scroll:J??(L?{y:`calc(100vh - ${L})`}:void 0),id:"crud-table",bordered:Y,size:X,expandable:Q}),[w,K,J,L,Y,X,Q]),F=u.useMemo(()=>j?{total:j.count,onChange:j.setPage,current:j.page,pageSize:j.pageSize}:void 0,[j]),g=u.useMemo(()=>{const t=l||h||y||I||i,s=[];return o&&s.push({key:"key",align:"center",width:5,title:o==null?void 0:o.columnLabel,render:()=>n.jsx(zt,{tooltip:o==null?void 0:o.tooltip})}),s.push(...U),t&&t&&s.push({title:H("str.action"),fixed:"right",width:p,render:(c,r)=>n.jsxs(n.Fragment,{children:[i&&n.jsx(Rt,{value:r,onClick:typeof i=="object"?()=>{var T;return(T=i.onClick)==null?void 0:T.call(i,r)}:N}),$(r)]})}),s},[U,l,h,y,I,i,H,p,$]),tt=u.useMemo(()=>q.map(t=>t[e]),[q,e]),it=u.useCallback(()=>{const t=n.jsx(Lt,{...b,dataSource:q,loading:C,components:o?{body:{row:kt}}:void 0,pagination:F,columns:g});return o?n.jsx(jt.DndContext,{modifiers:[yt.restrictToVerticalAxis],onDragEnd:d,children:n.jsx(V.SortableContext,{items:tt,strategy:V.verticalListSortingStrategy,children:t})}):t},[b,q,C,F,g,o,tt,d]);return n.jsxs("div",{children:[typeof i=="boolean"||typeof i=="string"&&n.jsx(xt.Modal,{width:"100%",open:!!m,title:ct??n.jsx("div",{children:" "}),footer:n.jsx(n.Fragment,{}),closable:!0,onCancel:()=>N(void 0),children:!!m&&n.jsxs("div",{children:[n.jsx(Et.CrudDecListView,{layout:rt,descListColumn:ot,data:m,fields:f,action:$(m)}),O==null?void 0:O(m)]},m==null?void 0:m[e])}),n.jsx(Vt,{fields:f,...ut}),n.jsxs(Dt,{children:[!!Z&&n.jsx(It.RefreshButton,{onClick:Z}),it()]})]})}const st=u.createContext({}),zt=({tooltip:e})=>{const{setActivatorNodeRef:C,listeners:f}=u.useContext(st);return n.jsx(qt,{type:"text",size:"small",tooltip:e,icon:n.jsx(Nt.HolderOutlined,{}),style:{cursor:"move",border:"none"},ref:C,...f})},kt=e=>{const{attributes:C,listeners:f,setNodeRef:R,setActivatorNodeRef:S,transform:i,transition:j,isDragging:y}=V.useSortable({id:e["data-row-key"]}),M={...e.style,transform:ht.CSS.Translate.toString(i),transition:j,...y?{position:"relative",zIndex:9999}:{}},l=u.useMemo(()=>({setActivatorNodeRef:S,listeners:f}),[S,f]);return n.jsx(st.Provider,{value:l,children:n.jsx("tr",{...e,ref:R,style:M,...C})})};module.exports=Ot;

package/crud/view/CrudViewer.d.ts

@@ -15,10 +15,13 @@ export type CrudDragableProps<T> = {
     columnLabel?: string;
     tooltip?: string;
 };
+export type CrudViewableProps<T> = boolean | keyof T | {
+    onClick: (t: T) => void;
+};
 export type CrudViewerProps<T, FormType> = {
     fields: CrudFieldProps<T>[];
     decListLayout?: "horizontal" | "vertical";
-    viewable?: boolean | keyof T;
+    viewable?: CrudViewableProps<T>;
     paginateProps?: CrudPaginateProps;
     onDelete?: (id: any) => Promise<any>;
     confirmDeleting?: boolean;

package/crud/view/CrudViewer.es.js

@@ -1,131 +1,129 @@
-import { jsxs as D, Fragment as G, jsx as s } from "react/jsx-runtime";
-import { Modal as It } from "antd";
-import { DndContext as St } from "@dnd-kit/core";
-import { restrictToVerticalAxis as Bt } from "@dnd-kit/modifiers";
-import { CSS as Ct } from "@dnd-kit/utilities";
-import { arrayMove as et, SortableContext as Rt, verticalListSortingStrategy as xt, useSortable as Nt } from "@dnd-kit/sortable";
-import Dt from "../../common/button/Button.es.js";
-import Et from "../../common/button/CloneButtonTable.es.js";
-import Lt from "../../common/button/DeleteButtonTable.es.js";
-import { ExportButton as Mt } from "../../common/button/ExportButton.es.js";
-import Ot from "../../common/button/HideButtonTable.es.js";
-import { RefreshButton as jt } from "../../common/button/RefreshButton.es.js";
+import { jsxs as D, Fragment as J, jsx as m } from "react/jsx-runtime";
+import { Modal as St } from "antd";
+import { DndContext as Bt } from "@dnd-kit/core";
+import { restrictToVerticalAxis as Ct } from "@dnd-kit/modifiers";
+import { CSS as Rt } from "@dnd-kit/utilities";
+import { arrayMove as st, SortableContext as vt, verticalListSortingStrategy as xt, useSortable as Nt } from "@dnd-kit/sortable";
+import jt from "../../common/button/Button.es.js";
+import Dt from "../../common/button/CloneButtonTable.es.js";
+import Et from "../../common/button/DeleteButtonTable.es.js";
+import { ExportButton as Lt } from "../../common/button/ExportButton.es.js";
+import Mt from "../../common/button/HideButtonTable.es.js";
+import { RefreshButton as Ot } from "../../common/button/RefreshButton.es.js";
 import zt from "../../common/button/UpdateButtonTable.es.js";
 import Vt from "../../common/button/ViewButtonTable.es.js";
-import wt from "../../common/table/table.es.js";
-import ut, { useMemo as T, useState as J, useEffect as st, useCallback as K, useContext as _t } from "react";
-import { useTranslationLib as $t } from "../../locale/index.es.js";
-import qt from "../CrudSearchComponent.es.js";
-import { CrudDecListView as Gt } from "./CrudDecListView.es.js";
-import { getRendererValueCrudViewer as mt } from "./CrudViewerUtil.es.js";
-import { HolderOutlined as Jt } from "@ant-design/icons";
+import _t from "../../common/table/table.es.js";
+import ut, { useMemo as I, useState as K, useEffect as mt, useCallback as Q, useContext as $t } from "react";
+import { useTranslationLib as qt } from "../../locale/index.es.js";
+import Gt from "../CrudSearchComponent.es.js";
+import { CrudDecListView as Jt } from "./CrudDecListView.es.js";
+import { getRendererValueCrudViewer as et } from "./CrudViewerUtil.es.js";
+import { HolderOutlined as Kt } from "@ant-design/icons";
 import ct from "../../util/CrudUtil.es.js";
-import Kt from "../../common/layout/VerticalSpace.es.js";
-const Qt = ut.memo(wt);
-function yo({
+import Qt from "../../common/layout/VerticalSpace.es.js";
+const Xt = ut.memo(_t);
+function ho({
   idField: o = "id",
-  loadingData: I,
-  fields: u,
-  isDeleting: R,
-  isHiding: S,
-  viewable: f = !1,
-  paginateProps: h,
-  onDelete: y,
-  onHide: x,
-  onUpdate: v,
-  data: B = [],
-  extraAction: C,
-  onClickUpdate: l,
+  loadingData: S,
+  fields: f,
+  isDeleting: x,
+  isHiding: B,
+  viewable: c = !1,
+  paginateProps: y,
+  onDelete: h,
+  onHide: N,
+  onUpdate: l,
+  data: C = [],
+  extraAction: R,
+  onClickUpdate: p,
   minusHeight: O,
-  scroll: Q,
+  scroll: X,
   onClickClone: E,
-  className: X,
-  expandable: Y,
-  size: Z,
+  className: Y,
+  expandable: Z,
+  size: k,
   bordered: A,
   descListColumn: it,
-  extraView: j,
-  decListLayout: ht,
-  scrollToTop: Zt,
+  extraView: z,
+  decListLayout: yt,
+  scrollToTop: kt,
   onClickRefresh: P,
   closeViewOnClickUpdate: W,
-  onExport: z,
-  confirmHiding: k,
-  confirmDeleting: H,
+  onExport: V,
+  confirmHiding: H,
+  confirmDeleting: w,
   rowClassName: U,
-  actionWidth: a = 190,
+  actionWidth: d = 190,
   draggable: r,
-  ...yt
+  ...ht
 }) {
-  const { t: b } = $t(), d = T(
-    () => u.map(
-      ({ hideInTable: t, hidden: n, width: m, label: e, halign: $, ...N }) => {
-        const M = ct.getRealName(N.name);
-        return {
-          title: e,
-          width: m,
-          key: M,
-          dataIndex: M,
-          hidden: t || n,
-          align: $ ?? (N.type === "number" ? "right" : void 0),
-          render: mt(N)
-        };
-      }
-    ),
-    [u]
-  ), [c, L] = J(), [V, w] = J(), [p, F] = J([]);
-  st(() => {
-    B && F(B);
-  }, [B]), st(() => {
-    B && L((t) => {
+  const { t: F } = qt(), a = I(
+    () => f.map(({ hideInTable: t, hidden: n, width: e, label: s, halign: v, ...j }) => {
+      const M = ct.getRealName(j.name);
+      return {
+        title: s,
+        width: e,
+        key: M,
+        dataIndex: M,
+        hidden: t || n,
+        align: v ?? (j.type === "number" ? "right" : void 0),
+        render: et(j)
+      };
+    }),
+    [f]
+  ), [u, L] = K(), [_, $] = K(), [T, b] = K([]);
+  mt(() => {
+    C && b(C);
+  }, [C]), mt(() => {
+    C && L((t) => {
       if (t)
-        return B.find((n) => n[o] === t[o]);
+        return C.find((n) => n[o] === t[o]);
     });
-  }, [B, o, c]);
-  const _ = K(
+  }, [C, o, u]);
+  const q = Q(
     (t) => {
-      var m;
-      const n = C == null ? void 0 : C(t);
-      return (Array.isArray(n) ? (m = n == null ? void 0 : n.filter(Boolean)) != null && m.length : n) || v || l || E || y ? /* @__PURE__ */ D(G, { children: [
+      var e;
+      const n = R == null ? void 0 : R(t);
+      return (Array.isArray(n) ? (e = n == null ? void 0 : n.filter(Boolean)) != null && e.length : n) || l || p || E || h ? /* @__PURE__ */ D(J, { children: [
         n,
-        (v || l) && /* @__PURE__ */ s(
+        (l || p) && /* @__PURE__ */ m(
           zt,
           {
             value: t,
-            onClick: (e) => {
-              w(e[o]), l == null || l(t), W && L(void 0);
+            onClick: (s) => {
+              $(s[o]), p == null || p(t), W && L(void 0);
             }
           }
         ),
-        E && /* @__PURE__ */ s(Et, { value: t, onClick: (e) => E(e) }),
-        z && /* @__PURE__ */ s(
-          Mt,
+        E && /* @__PURE__ */ m(Dt, { value: t, onClick: (s) => E(s) }),
+        V && /* @__PURE__ */ m(
+          Lt,
           {
             value: t,
-            onClick: async (e) => await z(e)
+            onClick: async (s) => await V(s)
           }
         ),
-        x && /* @__PURE__ */ s(
-          Ot,
+        N && /* @__PURE__ */ m(
+          Mt,
           {
             value: t,
-            disabled: S,
-            shouldConfirm: k,
-            loading: S && t[o] === V,
-            onClick: async (e) => {
-              w(e[o]), await x({ [o]: e[o] });
+            disabled: B,
+            shouldConfirm: H,
+            loading: B && t[o] === _,
+            onClick: async (s) => {
+              $(s[o]), await N({ [o]: s[o] });
             }
           }
         ),
-        y && /* @__PURE__ */ s(
-          Lt,
+        h && /* @__PURE__ */ m(
+          Et,
           {
             value: t,
-            disabled: R,
-            shouldConfirm: H,
-            loading: R && t[o] === V,
-            onClick: async (e) => {
-              w(e[o]), await y({ [o]: e[o] });
+            disabled: x,
+            shouldConfirm: w,
+            loading: x && t[o] === _,
+            onClick: async (s) => {
+              $(s[o]), await h({ [o]: s[o] });
             }
           }
         )
@@ -133,117 +131,126 @@ function yo({
     },
     [
       W,
+      w,
       H,
-      k,
-      C,
-      o,
       R,
-      S,
+      o,
+      x,
+      B,
       E,
+      p,
+      h,
+      V,
+      N,
       l,
-      y,
-      z,
-      x,
-      v,
-      V
+      _
     ]
-  ), g = K(
+  ), g = Q(
     (t) => {
-      var e;
-      const { active: n, over: m } = t;
-      if (r != null && r.onDragEnd && (r == null || r.onDragEnd(t)), n.id !== (m == null ? void 0 : m.id)) {
-        const $ = p.findIndex(
+      var s;
+      const { active: n, over: e } = t;
+      if (r != null && r.onDragEnd && (r == null || r.onDragEnd(t)), n.id !== (e == null ? void 0 : e.id)) {
+        const v = T.findIndex(
           (i) => i[o] === n.id
-        ), N = p.findIndex(
-          (i) => i[o] === (m == null ? void 0 : m.id)
-        ), M = et(p, $, N);
-        F((i) => {
-          const vt = i.findIndex(
-            (q) => q[o] === (n == null ? void 0 : n.id)
-          ), Tt = i.findIndex(
-            (q) => q[o] === (m == null ? void 0 : m.id)
+        ), j = T.findIndex(
+          (i) => i[o] === (e == null ? void 0 : e.id)
+        ), M = st(T, v, j);
+        b((i) => {
+          const lt = i.findIndex(
+            (G) => G[o] === (n == null ? void 0 : n.id)
+          ), It = i.findIndex(
+            (G) => G[o] === (e == null ? void 0 : e.id)
           );
-          return et(i, vt, Tt);
-        }), (e = r == null ? void 0 : r.onDrag) == null || e.call(r, {
+          return st(i, lt, It);
+        }), (s = r == null ? void 0 : r.onDrag) == null || s.call(r, {
           newOrder: M.map((i) => i[o])
         });
       }
     },
-    [p, o, r]
-  ), lt = T(() => {
-    let t = typeof f == "string" ? c == null ? void 0 : c[f] : void 0;
+    [T, o, r]
+  ), pt = I(() => {
+    let t = typeof c == "string" ? u == null ? void 0 : u[c] : void 0;
     if (typeof t == "object") {
-      const n = u.find((m) => ct.getRealName(m.name) === f);
-      t = mt(n)(
+      const n = f.find((e) => ct.getRealName(e.name) === c);
+      t = et(n)(
         t,
-        c,
+        u,
         0
       );
     }
     return t;
-  }, [f, c, u]), tt = T(
+  }, [c, u, f]), tt = I(
     () => ({
       rowClassName: U,
-      className: X,
-      scroll: Q ?? (O ? { y: `calc(100vh - ${O})` } : void 0),
+      className: Y,
+      scroll: X ?? (O ? { y: `calc(100vh - ${O})` } : void 0),
       id: "crud-table",
       bordered: A,
-      size: Z,
-      expandable: Y
+      size: k,
+      expandable: Z
     }),
-    [U, X, Q, O, A, Z, Y]
-  ), ot = T(
-    () => h ? {
-      total: h.count,
-      onChange: h.setPage,
-      current: h.page,
-      pageSize: h.pageSize
+    [U, Y, X, O, A, k, Z]
+  ), ot = I(
+    () => y ? {
+      total: y.count,
+      onChange: y.setPage,
+      current: y.page,
+      pageSize: y.pageSize
     } : void 0,
-    [h]
-  ), nt = T(() => {
-    const t = v || l || y || C || f, n = [];
+    [y]
+  ), nt = I(() => {
+    const t = l || p || h || R || c, n = [];
     return r && n.push({
       key: "key",
       align: "center",
       width: 5,
       title: r == null ? void 0 : r.columnLabel,
-      render: () => /* @__PURE__ */ s(Xt, { tooltip: r == null ? void 0 : r.tooltip })
-    }), n.push(...d), t && t && n.push({
-      title: b("str.action"),
+      render: () => /* @__PURE__ */ m(Yt, { tooltip: r == null ? void 0 : r.tooltip })
+    }), n.push(...a), t && t && n.push({
+      title: F("str.action"),
       fixed: "right",
-      width: a,
-      render: (m, e) => /* @__PURE__ */ D(G, { children: [
-        f && /* @__PURE__ */ s(Vt, { value: e, onClick: L }),
-        _(e)
+      width: d,
+      render: (e, s) => /* @__PURE__ */ D(J, { children: [
+        c && /* @__PURE__ */ m(
+          Vt,
+          {
+            value: s,
+            onClick: typeof c == "object" ? () => {
+              var v;
+              return (v = c.onClick) == null ? void 0 : v.call(c, s);
+            } : L
+          }
+        ),
+        q(s)
       ] })
     }), n;
   }, [
-    d,
-    v,
-    l,
-    y,
-    C,
-    f,
-    b,
     a,
-    _
-  ]), rt = T(
-    () => p.map((t) => t[o]),
-    [p, o]
-  ), pt = K(() => {
-    const t = /* @__PURE__ */ s(
-      Qt,
+    l,
+    p,
+    h,
+    R,
+    c,
+    F,
+    d,
+    q
+  ]), rt = I(
+    () => T.map((t) => t[o]),
+    [T, o]
+  ), Tt = Q(() => {
+    const t = /* @__PURE__ */ m(
+      Xt,
       {
         ...tt,
-        dataSource: p,
-        loading: I,
-        components: r ? { body: { row: Yt } } : void 0,
+        dataSource: T,
+        loading: S,
+        components: r ? { body: { row: Zt } } : void 0,
         pagination: ot,
         columns: nt
       }
     );
-    return r ? /* @__PURE__ */ s(St, { modifiers: [Bt], onDragEnd: g, children: /* @__PURE__ */ s(
-      Rt,
+    return r ? /* @__PURE__ */ m(Bt, { modifiers: [Ct], onDragEnd: g, children: /* @__PURE__ */ m(
+      vt,
       {
         items: rt,
         strategy: xt,
@@ -252,8 +259,8 @@ function yo({
     ) }) : t;
   }, [
     tt,
-    p,
-    I,
+    T,
+    S,
     ot,
     nt,
     r,
@@ -261,71 +268,71 @@ function yo({
     g
   ]);
   return /* @__PURE__ */ D("div", { children: [
-    f && /* @__PURE__ */ s(
-      It,
+    typeof c == "boolean" || typeof c == "string" && /* @__PURE__ */ m(
+      St,
       {
         width: "100%",
-        open: !!c,
-        title: lt ?? /* @__PURE__ */ s("div", { children: " " }),
-        footer: /* @__PURE__ */ s(G, {}),
+        open: !!u,
+        title: pt ?? /* @__PURE__ */ m("div", { children: " " }),
+        footer: /* @__PURE__ */ m(J, {}),
         closable: !0,
         onCancel: () => L(void 0),
-        children: !!c && /* @__PURE__ */ D("div", { children: [
-          /* @__PURE__ */ s(
-            Gt,
+        children: !!u && /* @__PURE__ */ D("div", { children: [
+          /* @__PURE__ */ m(
+            Jt,
             {
-              layout: ht,
+              layout: yt,
               descListColumn: it,
-              data: c,
-              fields: u,
-              action: _(c)
+              data: u,
+              fields: f,
+              action: q(u)
             }
           ),
-          j == null ? void 0 : j(c)
-        ] }, c == null ? void 0 : c[o])
+          z == null ? void 0 : z(u)
+        ] }, u == null ? void 0 : u[o])
       }
     ),
-    /* @__PURE__ */ s(qt, { fields: u, ...yt }),
-    /* @__PURE__ */ D(Kt, { children: [
-      !!P && /* @__PURE__ */ s(jt, { onClick: P }),
-      pt()
+    /* @__PURE__ */ m(Gt, { fields: f, ...ht }),
+    /* @__PURE__ */ D(Qt, { children: [
+      !!P && /* @__PURE__ */ m(Ot, { onClick: P }),
+      Tt()
     ] })
   ] });
 }
-const ft = ut.createContext({}), Xt = ({ tooltip: o }) => {
-  const { setActivatorNodeRef: I, listeners: u } = _t(ft);
-  return /* @__PURE__ */ s(
-    Dt,
+const ft = ut.createContext({}), Yt = ({ tooltip: o }) => {
+  const { setActivatorNodeRef: S, listeners: f } = $t(ft);
+  return /* @__PURE__ */ m(
+    jt,
     {
       type: "text",
       size: "small",
       tooltip: o,
-      icon: /* @__PURE__ */ s(Jt, {}),
+      icon: /* @__PURE__ */ m(Kt, {}),
       style: { cursor: "move", border: "none" },
-      ref: I,
-      ...u
+      ref: S,
+      ...f
     }
   );
-}, Yt = (o) => {
+}, Zt = (o) => {
   const {
-    attributes: I,
-    listeners: u,
-    setNodeRef: R,
-    setActivatorNodeRef: S,
-    transform: f,
-    transition: h,
-    isDragging: y
-  } = Nt({ id: o["data-row-key"] }), x = {
+    attributes: S,
+    listeners: f,
+    setNodeRef: x,
+    setActivatorNodeRef: B,
+    transform: c,
+    transition: y,
+    isDragging: h
+  } = Nt({ id: o["data-row-key"] }), N = {
     ...o.style,
-    transform: Ct.Translate.toString(f),
-    transition: h,
-    ...y ? { position: "relative", zIndex: 9999 } : {}
-  }, v = T(
-    () => ({ setActivatorNodeRef: S, listeners: u }),
-    [S, u]
+    transform: Rt.Translate.toString(c),
+    transition: y,
+    ...h ? { position: "relative", zIndex: 9999 } : {}
+  }, l = I(
+    () => ({ setActivatorNodeRef: B, listeners: f }),
+    [B, f]
   );
-  return /* @__PURE__ */ s(ft.Provider, { value: v, children: /* @__PURE__ */ s("tr", { ...o, ref: R, style: x, ...I }) });
+  return /* @__PURE__ */ m(ft.Provider, { value: l, children: /* @__PURE__ */ m("tr", { ...o, ref: x, style: N, ...S }) });
 };
 export {
-  yo as default
+  ho as default
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kingteza/crud-component",
   "private": false,
-  "version": "1.0.63",
+  "version": "1.0.64",
   "description": "React CRUD component library with Ant Design",
   "keywords": [
     "react",