@kingteza/crud-component 1.25.0 → 1.26.0

package/dist/crud/CrudComponent.d.ts

@@ -57,6 +57,7 @@ export interface InitialCrudField<T> {
     };
     hideLabel?: boolean;
     sorter?: ColumnType<T>["sorter"];
+    defaultSortOrder?: ColumnType<T>["defaultSortOrder"];
 }
 export type CrudFieldGrid = {
     xs?: number;

package/dist/crud/FileCrudDragNDropField.cjs.js

@@ -1 +1 @@
-"use strict";const s=require("react/jsx-runtime"),c=require("@ant-design/icons"),f=require("antd"),L=require("mime"),o=require("react"),Z=require("../util/ValidationUtil.cjs.js"),{Dragger:_}=f.Upload;function G({name:S,label:M,required:N,provider:a,onUploading:m,onRemoved:p,fieldClassName:W,accept:i,rules:k,maxCount:r=1,block:B,showInGrid:$=!1,gridConfig:q={draggerSpan:12,previewSpan:12},fieldHelper:R,formLayoutProps:C,...I}){const u=f.Form.useFormInstance(),n=o.useMemo(()=>S,[S]),y=f.Form.useWatch(n,u),[A,H]=o.useState(!1),[j,h]=o.useState([]),T=o.useCallback(async e=>{var x,w;const l=e.file,t=(l==null?void 0:l.name)??"",d=`${Date.now()}-${Math.random().toString(36).substring(2,9)}`;h(F=>[...F,{uid:d,name:t,status:"uploading",originFileObj:l}]);try{H(!0),m==null||m(!0);const F=t??"",V=F.split("."),O=V[V.length-1],Q=a.generateFileName(F),X=`${await a.getInitialPath()}/${Q}.${O}`,g=await a.upload({...l,originFileObj:l},X),D=await a.getRealUrl(g),Y=L.getType(g),P=u.getFieldValue(n);if(r>1){const b=[...Array.isArray(P)?P:P?[P]:[],g].filter(Boolean);u.setFieldValue(n,b)}else u.setFieldValue(n,g);h(E=>E.map(b=>b.uid===d?{uid:g,url:D,type:Y,name:F,status:"done",response:g,thumbUrl:D}:b)),(x=e.onSuccess)==null||x.call(e,g)}catch(F){(w=e.onError)==null||w.call(e,F),h(V=>V.filter(O=>O.uid!==d))}finally{m==null||m(!1)}},[u,r,m,a,n]);o.useEffect(()=>{!A&&y&&Promise.all((Array.isArray(y)?y:[y]).map(async e=>{const l=L.getType(e),t=e.split("/").pop(),d=await a.getRealUrl(e);return{uid:e,url:d,type:l,name:t,response:e,thumbUrl:d}})).then(e=>h(e))},[y,A,a]);const z=o.useCallback(async e=>{const l=e.response??e.uid;await a.delete(l),p==null||p();const t=u.getFieldValue(n);if(r>1){const x=(Array.isArray(t)?t:t?[t]:[]).filter(w=>w!==l);u.setFieldValue(n,x.length?x:void 0)}else u.setFieldValue(n,void 0);h(d=>d.filter(x=>x.uid!==e.uid))},[u,r,p,a,n]),U=o.useMemo(()=>{if(!i)return"all files";const e=i.split(",").map(l=>{const t=l.trim().toLowerCase();return t.startsWith("image/")?"images":t===".pdf"||t==="application/pdf"?"PDF files":t.includes("excel")||t.includes(".xls")?"Excel files":t.includes("word")||t.includes(".doc")?"Word files":t.includes("text")||t===".txt"?"text files":t.includes("presentation")||t.includes(".ppt")?"PowerPoint files":t.replace(".","").toUpperCase()});return[...new Set(e)].join(", ")},[i]),J=o.useMemo(()=>i?i.includes("image")?s.jsx(c.FileImageOutlined,{}):i.includes("pdf")?s.jsx(c.FilePdfOutlined,{}):i.includes("word")||i.includes(".doc")?s.jsx(c.FileWordOutlined,{}):i.includes("text")||i.includes(".txt")?s.jsx(c.FileTextOutlined,{}):i.includes("excel")||i.includes(".xls")?s.jsx(c.FileExcelOutlined,{}):i.includes("presentation")||i.includes(".ppt")?s.jsx(c.FilePptOutlined,{}):s.jsx(c.FileOutlined,{}):s.jsx(c.InboxOutlined,{}),[i]),K=((j==null?void 0:j.length)??0)>=r;return s.jsxs(f.Form.Item,{label:M,required:N,name:n,...C,className:W,rules:[...N?Z.required(M):[],...k??[]],help:R,children:[s.jsx("input",{hidden:!0}),s.jsxs(f.Row,{gutter:[8,8],align:"top",style:{width:"100%",margin:0},children:[s.jsx(f.Col,{span:$?q.draggerSpan:24,xs:24,sm:24,children:s.jsxs(_,{...I,accept:i,disabled:K,fileList:[],multiple:r>1,maxCount:r,customRequest:T,onRemove:z,onChange:({file:e})=>{e.status==="error"&&h(l=>l.filter(t=>t.uid!==e.uid))},style:B?{width:"100%"}:void 0,children:[s.jsx("p",{className:"ant-upload-drag-icon",children:J}),s.jsx("p",{className:"ant-upload-text",children:"Click or drag file to this area to upload"}),s.jsx("p",{className:"ant-upload-hint",children:`Maximum file size: 10 MB. Supported formats: ${U}. ${r>1?`Maximum number of files: ${r}`:""}`})]})}),j.length>0&&s.jsx(f.Col,{span:$?q.previewSpan:24,xs:24,sm:24,children:s.jsx(f.Upload,{...I,accept:i,fileList:j,maxCount:r,customRequest:T,onRemove:z,listType:"picture",onChange:({fileList:e})=>h(e),style:{width:"100%"}})})]})]})}module.exports=G;
+"use strict";const s=require("react/jsx-runtime"),c=require("@ant-design/icons"),f=require("antd"),L=require("mime"),o=require("react"),Z=require("../util/ValidationUtil.cjs.js"),{Dragger:_}=f.Upload;function G({name:S,label:M,required:N,provider:a,onUploading:m,onRemoved:p,fieldClassName:W,accept:i,rules:k,maxCount:r=1,block:B,showInGrid:$=!1,gridConfig:q={draggerSpan:12,previewSpan:12},fieldHelper:R,formLayoutProps:H,...I}){const u=f.Form.useFormInstance(),n=o.useMemo(()=>S,[S]),y=f.Form.useWatch(n,u),[A,U]=o.useState(!1),[j,h]=o.useState([]),T=o.useCallback(async e=>{var x,w;const l=e.file,t=(l==null?void 0:l.name)??"",d=`${Date.now()}-${Math.random().toString(36).substring(2,9)}`;h(F=>[...F,{uid:d,name:t,status:"uploading",originFileObj:l}]);try{U(!0),m==null||m(!0);const F=t??"",V=F.split("."),O=V[V.length-1],Q=a.generateFileName(F),X=`${await a.getInitialPath()}/${Q}.${O}`,g=await a.upload({...l,originFileObj:l},X),D=await a.getRealUrl(g),Y=L.getType(g),P=u.getFieldValue(n);if(r>1){const b=[...Array.isArray(P)?P:P?[P]:[],g].filter(Boolean);u.setFieldValue(n,b)}else u.setFieldValue(n,g);h(E=>E.map(b=>b.uid===d?{uid:g,url:D,type:Y,name:F,status:"done",response:g,thumbUrl:D}:b)),(x=e.onSuccess)==null||x.call(e,g)}catch(F){(w=e.onError)==null||w.call(e,F),h(V=>V.filter(O=>O.uid!==d))}finally{m==null||m(!1)}},[u,r,m,a,n]);o.useEffect(()=>{!A&&y&&Promise.all((Array.isArray(y)?y:[y]).map(async e=>{const l=L.getType(e),t=e.split("/").pop(),d=await a.getRealUrl(e);return{uid:e,url:d,type:l,name:t,response:e,thumbUrl:d}})).then(e=>h(e))},[y,A,a]);const z=o.useCallback(async e=>{const l=e.response??e.uid;await a.delete(l),p==null||p();const t=u.getFieldValue(n);if(r>1){const x=(Array.isArray(t)?t:t?[t]:[]).filter(w=>w!==l);u.setFieldValue(n,x.length?x:void 0)}else u.setFieldValue(n,void 0);h(d=>d.filter(x=>x.uid!==e.uid))},[u,r,p,a,n]),C=o.useMemo(()=>{if(!i)return"all files";const e=i.split(",").map(l=>{const t=l.trim().toLowerCase();return t.startsWith("image/")?"images":t===".pdf"||t==="application/pdf"?"PDF files":t.includes("excel")||t.includes(".xls")?"Excel files":t.includes("word")||t.includes(".doc")?"Word files":t.includes("text")||t===".txt"?"text files":t.includes("presentation")||t.includes(".ppt")?"PowerPoint files":t.replace(".","").toUpperCase()});return[...new Set(e)].join(", ")},[i]),J=o.useMemo(()=>i?i.includes("image")?s.jsx(c.FileImageOutlined,{}):i.includes("pdf")?s.jsx(c.FilePdfOutlined,{}):i.includes("word")||i.includes(".doc")?s.jsx(c.FileWordOutlined,{}):i.includes("text")||i.includes(".txt")?s.jsx(c.FileTextOutlined,{}):i.includes("excel")||i.includes(".xls")?s.jsx(c.FileExcelOutlined,{}):i.includes("presentation")||i.includes(".ppt")?s.jsx(c.FilePptOutlined,{}):s.jsx(c.FileOutlined,{}):s.jsx(c.InboxOutlined,{}),[i]),K=((j==null?void 0:j.length)??0)>=r;return s.jsxs(f.Form.Item,{label:M,required:N,name:n,...H,className:W,rules:[...N?Z.required(M):[],...k??[]],help:R,children:[s.jsx("input",{hidden:!0}),s.jsxs(f.Row,{gutter:[8,8],align:"top",style:{width:"100%",margin:0},children:[s.jsx(f.Col,{span:$?q.draggerSpan:24,xs:24,sm:24,children:s.jsxs(_,{...I,accept:i,disabled:K,fileList:[],multiple:r>1,maxCount:r,customRequest:T,onRemove:z,onChange:({file:e})=>{e.status==="error"&&h(l=>l.filter(t=>t.uid!==e.uid))},style:B?{width:"100%"}:void 0,children:[s.jsx("p",{className:"ant-upload-drag-icon",children:J}),s.jsx("p",{className:"ant-upload-text",children:"Click or drag file to this area to upload"}),s.jsx("p",{className:"ant-upload-hint",children:`Maximum file size: 10 MB. Supported formats: ${C}. ${r>1?`Maximum number of files: ${r}`:""}`})]})}),j.length>0&&s.jsx(f.Col,{span:$?q.previewSpan:24,xs:24,sm:24,children:s.jsx(f.Upload,{...I,accept:i,fileList:j,maxCount:r,customRequest:T,onRemove:z,listType:"picture",onChange:({fileList:e})=>h(e),style:{width:"100%"}})})]})]})}module.exports=G;

package/dist/crud/FileCrudDragNDropField.d.ts

@@ -2,7 +2,7 @@ import { UploadProps } from 'antd';
 import { ReactNode } from 'react';
 import { InitialCrudField } from './CrudComponent';
 import { FileUploadProvider } from './ImageCrudField';
-export interface FileCrudDragNDropField<T> extends _FileCrudDragNDropField<T> {
+export interface FileCrudDragNDropFieldProps<T> extends _FileCrudDragNDropField<T> {
     type: "file";
 }
 export interface _FileCrudDragNDropField<T> extends InitialCrudField<T> {
@@ -21,4 +21,4 @@ export interface _FileCrudDragNDropField<T> extends InitialCrudField<T> {
         previewSpan?: number;
     };
 }
-export default function FileCrudDragNDropFieldComponent<T>({ name, label, required, provider, onUploading, onRemoved, fieldClassName, accept, rules, maxCount, block, showInGrid, gridConfig, fieldHelper: help, formLayoutProps, ...props }: Readonly<_FileCrudDragNDropField<T>> & Omit<UploadProps, "customRequest">): import("react/jsx-runtime").JSX.Element;
+export default function FileCrudDragNDropField<T>({ name, label, required, provider, onUploading, onRemoved, fieldClassName, accept, rules, maxCount, block, showInGrid, gridConfig, fieldHelper: help, formLayoutProps, ...props }: Readonly<_FileCrudDragNDropField<T>> & Omit<UploadProps, "customRequest">): import("react/jsx-runtime").JSX.Element;

package/dist/crud/FileCrudDragNDropField.es.js

@@ -28,10 +28,10 @@ function Fe({
 }) {
   const u = b.useFormInstance(), n = S(() => N, [N]), p = b.useWatch(n, u), [j, X] = B(!1), [g, f] = B([]), z = q(
     async (e) => {
-      var o, F;
+      var m, F;
       const l = e.file, t = (l == null ? void 0 : l.name) ?? "", d = `${Date.now()}-${Math.random().toString(36).substring(2, 9)}`;
-      f((m) => [
-        ...m,
+      f((o) => [
+        ...o,
         {
           uid: d,
           name: t,
@@ -41,9 +41,9 @@ function Fe({
       ]);
       try {
         X(!0), c == null || c(!0);
-        const m = t ?? "", w = m.split("."), P = w[w.length - 1], C = a.generateFileName(m), G = `${await a.getInitialPath()}/${C}.${P}`, h = await a.upload(
+        const o = t ?? "", w = o.split("."), P = w[w.length - 1], G = a.generateFileName(o), C = `${await a.getInitialPath()}/${G}.${P}`, h = await a.upload(
           { ...l, originFileObj: l },
-          G
+          C
         ), E = await a.getRealUrl(h), v = k.getType(h), x = u.getFieldValue(n);
         if (r > 1) {
           const V = [...Array.isArray(x) ? x : x ? [x] : [], h].filter(Boolean);
@@ -56,15 +56,15 @@ function Fe({
               uid: h,
               url: E,
               type: v,
-              name: m,
+              name: o,
               status: "done",
               response: h,
               thumbUrl: E
             } : V
           )
-        ), (o = e.onSuccess) == null || o.call(e, h);
-      } catch (m) {
-        (F = e.onError) == null || F.call(e, m), f((w) => w.filter((P) => P.uid !== d));
+        ), (m = e.onSuccess) == null || m.call(e, h);
+      } catch (o) {
+        (F = e.onError) == null || F.call(e, o), f((w) => w.filter((P) => P.uid !== d));
       } finally {
         c == null || c(!1);
       }
@@ -85,11 +85,11 @@ function Fe({
       await a.delete(l), y == null || y();
       const t = u.getFieldValue(n);
       if (r > 1) {
-        const o = (Array.isArray(t) ? t : t ? [t] : []).filter((F) => F !== l);
-        u.setFieldValue(n, o.length ? o : void 0);
+        const m = (Array.isArray(t) ? t : t ? [t] : []).filter((F) => F !== l);
+        u.setFieldValue(n, m.length ? m : void 0);
       } else
         u.setFieldValue(n, void 0);
-      f((d) => d.filter((o) => o.uid !== e.uid));
+      f((d) => d.filter((m) => m.uid !== e.uid));
     },
     [u, r, y, a, n]
   ), Y = S(() => {

package/dist/crud/index.d.ts

@@ -13,8 +13,7 @@ export { default as ImageCrudField, FileDownloadProvider, FileUploadProvider, Im
 export type { ImageCrudField as ImageCrudFieldProps } from './ImageCrudField';
 export { default as FileCrudField, FileCellValue, FileCrudCellValue, } from './FileCrudField';
 export type { FileCrudField as FileCrudFieldProps } from './FileCrudField';
-export { default as FileCrudDragNDropField } from './FileCrudDragNDropField';
-export type { FileCrudDragNDropField as FileCrudDragNDropFieldProps, } from './FileCrudDragNDropField';
+export { default as FileCrudDragNDropField, type FileCrudDragNDropFieldProps, } from './FileCrudDragNDropField';
 export { default as CrudTextAreaComponent } from './CrudTextAreaComponent';
 export type { TextAreaBasedFieldProps } from './CrudTextAreaComponent';
 export { default as CrudImportComponent } from './import/CrudImportComponent';

package/dist/crud/view/CrudViewer.cjs.js

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

package/dist/crud/view/CrudViewer.es.js

@@ -1,9 +1,9 @@
 import { jsx as e, jsxs as L, Fragment as et } from "react/jsx-runtime";
-import { Modal as Rt } from "antd";
-import { DndContext as lt } from "@dnd-kit/core";
-import { restrictToVerticalAxis as Bt } from "@dnd-kit/modifiers";
-import { CSS as Dt } from "@dnd-kit/utilities";
-import { arrayMove as ct, SortableContext as Nt, verticalListSortingStrategy as Ot, useSortable as dt } from "@dnd-kit/sortable";
+import { Modal as lt } from "antd";
+import { DndContext as Rt } from "@dnd-kit/core";
+import { restrictToVerticalAxis as dt } from "@dnd-kit/modifiers";
+import { CSS as Ot } from "@dnd-kit/utilities";
+import { arrayMove as ct, SortableContext as Bt, verticalListSortingStrategy as Dt, useSortable as Nt } from "@dnd-kit/sortable";
 import jt from "../../common/button/Button.es.js";
 import { RefreshButton as Et } from "../../common/button/RefreshButton.es.js";
 import Lt from "../../common/button/ViewButtonTable.es.js";
@@ -22,16 +22,16 @@ function so({
   summary: h,
   idField: n = "id",
   loadingData: C,
-  fields: p,
-  isDeleting: l,
-  isHiding: D,
+  fields: y,
+  isDeleting: R,
+  isHiding: O,
   viewable: c = !1,
   paginateProps: u,
   onDelete: I,
-  onHide: N,
-  onUpdate: O,
-  data: S = [],
-  extraAction: d,
+  onHide: B,
+  onUpdate: D,
+  data: T = [],
+  extraAction: N,
   onClickUpdate: j,
   minusHeight: M,
   scroll: A,
@@ -42,7 +42,7 @@ function so({
   bordered: J,
   descListColumn: ht,
   extraView: V,
-  decListLayout: pt,
+  decListLayout: yt,
   scrollToTop: Kt,
   onClickRefresh: K,
   closeViewOnClickUpdate: Q,
@@ -53,61 +53,62 @@ function so({
   actionWidth: P = 190,
   draggable: t,
   rowSelection: H,
-  ...yt
+  ...pt
 }) {
   const { t: U } = zt(), w = x(
-    () => p.map(({ hideInTable: o, hidden: r, width: s, label: f, halign: T, ...R }) => {
-      const E = ut.getRealName(R.name);
+    () => y.map(({ hideInTable: o, hidden: r, width: s, label: f, halign: l, ...S }) => {
+      const E = ut.getRealName(S.name);
       return {
         title: f,
         width: s,
         key: E,
         dataIndex: E,
         hidden: o || r,
-        align: T ?? (R.type === "number" ? "right" : void 0),
-        render: mt(R),
-        sorter: R.sorter
+        align: l ?? (S.type === "number" ? "right" : void 0),
+        render: mt(S),
+        sorter: S.sorter,
+        defaultSortOrder: S.defaultSortOrder
       };
     }),
-    [p]
-  ), [m, B] = z(), [F, a] = z(), [y, b] = z([]), Ct = v((o) => {
-    B(o);
+    [y]
+  ), [m, d] = z(), [F, a] = z(), [p, b] = z([]), Ct = v((o) => {
+    d(o);
   }, []);
   st(() => {
-    S && b(S);
-  }, [S]), st(() => {
-    S && B((o) => {
+    T && b(T);
+  }, [T]), st(() => {
+    T && d((o) => {
       if (o)
-        return S.find((r) => r[n] === o[n]);
+        return T.find((r) => r[n] === o[n]);
     });
-  }, [S, n, m]);
+  }, [T, n, m]);
   const g = v(
     (o) => {
       var f;
       const { active: r, over: s } = o;
       if (t != null && t.onDragEnd && (t == null || t.onDragEnd(o)), r.id !== (s == null ? void 0 : s.id)) {
-        const T = y.findIndex(
+        const l = p.findIndex(
           (i) => i[n] === r.id
-        ), R = y.findIndex(
+        ), S = p.findIndex(
           (i) => i[n] === (s == null ? void 0 : s.id)
-        ), E = ct(y, T, R);
+        ), E = ct(p, l, S);
         b((i) => {
-          const St = i.findIndex(
+          const It = i.findIndex(
             (k) => k[n] === (r == null ? void 0 : r.id)
           ), Tt = i.findIndex(
             (k) => k[n] === (s == null ? void 0 : s.id)
           );
-          return ct(i, St, Tt);
+          return ct(i, It, Tt);
         }), (f = t == null ? void 0 : t.onDrag) == null || f.call(t, {
           newOrder: E.map((i) => i[n])
         });
       }
     },
-    [y, n, t]
-  ), xt = x(() => {
+    [p, n, t]
+  ), St = x(() => {
     let o = typeof c == "string" ? m == null ? void 0 : m[c] : void 0;
     if (typeof o == "object") {
-      const r = p.find((s) => ut.getRealName(s.name) === c);
+      const r = y.find((s) => ut.getRealName(s.name) === c);
       o = mt(r)(
         o,
         m,
@@ -115,7 +116,7 @@ function so({
       );
     }
     return o;
-  }, [c, m, p]), tt = x(
+  }, [c, m, y]), tt = x(
     () => ({
       rowSelection: H,
       rowClassName: W,
@@ -146,7 +147,7 @@ function so({
     } : void 0,
     [u]
   ), nt = x(() => {
-    const o = O || j || I || d || c, r = [];
+    const o = D || j || I || N || c, r = [];
     return t && r.push({
       key: "key",
       align: "center",
@@ -163,8 +164,8 @@ function so({
           {
             value: f,
             onClick: typeof c == "object" ? () => {
-              var T;
-              return (T = c.onClick) == null ? void 0 : T.call(c, f);
+              var l;
+              return (l = c.onClick) == null ? void 0 : l.call(c, f);
             } : Ct
           }
         ),
@@ -173,61 +174,61 @@ function so({
           {
             data: f,
             idField: n,
-            extraAction: d,
-            onUpdate: O,
+            extraAction: N,
+            onUpdate: D,
             onClickUpdate: j,
             onClickClone: _,
             onDelete: I,
-            onHide: N,
+            onHide: B,
             onExport: X,
-            isHiding: D,
-            isDeleting: l,
+            isHiding: O,
+            isDeleting: R,
             confirmHiding: Y,
             confirmDeleting: Z,
             closeViewOnClickUpdate: Q,
             recentUpdateOrDeleteId: F,
             setRecentUpdateOrDeleteId: a,
-            setOpenView: B
+            setOpenView: d
           }
         )
       ] })
     }), r;
   }, [
     w,
-    O,
+    D,
     j,
     I,
-    d,
+    N,
     c,
     U,
     P
   ]), rt = x(
-    () => y.map((o) => o[n]),
-    [y, n]
-  ), It = v(() => {
+    () => p.map((o) => o[n]),
+    [p, n]
+  ), xt = v(() => {
     const o = /* @__PURE__ */ e(
       qt,
       {
         ...tt,
         summary: h,
-        dataSource: y,
+        dataSource: p,
         loading: C,
         components: t ? { body: { row: Jt } } : void 0,
         pagination: ot,
         columns: nt
       }
     );
-    return t ? /* @__PURE__ */ e(lt, { modifiers: [Bt], onDragEnd: g, children: /* @__PURE__ */ e(
-      Nt,
+    return t ? /* @__PURE__ */ e(Rt, { modifiers: [dt], onDragEnd: g, children: /* @__PURE__ */ e(
+      Bt,
       {
         items: rt,
-        strategy: Ot,
+        strategy: Dt,
         children: o
       }
     ) }) : o;
   }, [
     tt,
-    y,
+    p,
     C,
     ot,
     nt,
@@ -238,48 +239,48 @@ function so({
   ]);
   return /* @__PURE__ */ L("div", { children: [
     (typeof c == "boolean" || typeof c == "string") && /* @__PURE__ */ e(
-      Rt,
+      lt,
       {
         width: "100%",
         open: !!m,
-        title: xt ?? /* @__PURE__ */ e("div", { children: " " }),
+        title: St ?? /* @__PURE__ */ e("div", { children: " " }),
         footer: /* @__PURE__ */ e(et, {}),
         closable: !0,
-        onCancel: () => B(void 0),
+        onCancel: () => d(void 0),
         children: !!m && /* @__PURE__ */ L("div", { children: [
           /* @__PURE__ */ e(
             At,
             {
-              layout: pt,
+              layout: yt,
               descListColumn: ht,
               data: m,
-              fields: p,
+              fields: y,
               idField: n,
-              extraAction: d,
-              onUpdate: O,
+              extraAction: N,
+              onUpdate: D,
               onClickUpdate: j,
               onClickClone: _,
               onDelete: I,
-              onHide: N,
+              onHide: B,
               onExport: X,
-              isHiding: D,
-              isDeleting: l,
+              isHiding: O,
+              isDeleting: R,
               confirmHiding: Y,
               confirmDeleting: Z,
               closeViewOnClickUpdate: Q,
               recentUpdateOrDeleteId: F,
               setRecentUpdateOrDeleteId: a,
-              setOpenView: B
+              setOpenView: d
             }
           ),
           V == null ? void 0 : V(m)
         ] }, m == null ? void 0 : m[n])
       }
     ),
-    /* @__PURE__ */ e(vt, { fields: p, ...yt }),
+    /* @__PURE__ */ e(vt, { fields: y, ...pt }),
     /* @__PURE__ */ L($t, { children: [
       !!K && /* @__PURE__ */ e(Et, { onClick: K }),
-      It()
+      xt()
     ] })
   ] });
 }
@@ -301,21 +302,21 @@ const it = ft.createContext({}), Gt = ({ tooltip: h }) => {
   const {
     attributes: n,
     listeners: C,
-    setNodeRef: p,
-    setActivatorNodeRef: l,
-    transform: D,
+    setNodeRef: y,
+    setActivatorNodeRef: R,
+    transform: O,
     transition: c,
     isDragging: u
-  } = dt({ id: h["data-row-key"] }), I = {
+  } = Nt({ id: h["data-row-key"] }), I = {
     ...h.style,
-    transform: Dt.Translate.toString(D),
+    transform: Ot.Translate.toString(O),
     transition: c,
     ...u ? { position: "relative", zIndex: 9999 } : {}
-  }, N = x(
-    () => ({ setActivatorNodeRef: l, listeners: C }),
-    [l, C]
+  }, B = x(
+    () => ({ setActivatorNodeRef: R, listeners: C }),
+    [R, C]
   );
-  return /* @__PURE__ */ e(it.Provider, { value: N, children: /* @__PURE__ */ e("tr", { ...h, ref: p, style: I, ...n }) });
+  return /* @__PURE__ */ e(it.Provider, { value: B, children: /* @__PURE__ */ e("tr", { ...h, ref: y, style: I, ...n }) });
 };
 export {
   so as default

package/package.json

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