@faasjs/ant-design 6.3.1 → 6.4.0

package/dist/index.cjs

@@ -562,7 +562,7 @@ function FormItem(props) {
   }, [props]);
   if (!computedProps) return null;
   if (hidden)
-    return /* @__PURE__ */ jsxRuntime.jsx(antd.Form.Item, { ...computedProps, noStyle: true, rules: [], children: /* @__PURE__ */ jsxRuntime.jsx(antd.Input, { hidden: true }) });
+    return /* @__PURE__ */ jsxRuntime.jsx(antd.Form.Item, { ...computedProps, noStyle: true, rules: [], children: /* @__PURE__ */ jsxRuntime.jsx(antd.Input, { type: "hidden", hidden: true }) });
   if (extendTypes?.[computedProps.type])
     return /* @__PURE__ */ jsxRuntime.jsx(antd.Form.Item, { ...computedProps, children: extendTypes[computedProps.type].children });
   if (computedProps.formChildren === null) return null;
@@ -793,7 +793,7 @@ function Form(props) {
     if (propsCopy.items?.length)
       for (const item of propsCopy.items) {
         if (isFormItemProps(item) && item.if)
-          item.hidden = !item.if(propsCopy.initialValues || /* @__PURE__ */ Object.create(null));
+          item.hidden = !item.if(initialValues || /* @__PURE__ */ Object.create(null));
       }
     if (propsCopy.onFinish) {
       propsCopy.onFinish = async (values) => {
@@ -1501,15 +1501,15 @@ function FaasDataTable({
       rowKey: props.rowKey || "id",
       columns: currentColumns,
       dataSource: data.rows,
-      pagination: {
-        ...props.pagination,
-        ...data.pagination
+      pagination: props.pagination === false ? false : {
+        ...props.pagination || /* @__PURE__ */ Object.create(null),
+        ...data.pagination || /* @__PURE__ */ Object.create(null)
       },
       onChange: (pagination, filters, sorter, extra) => {
         if (props.onChange) {
           const processed = props.onChange(pagination, filters, sorter, extra);
           reload({
-            ...params,
+            ...params || /* @__PURE__ */ Object.create(null),
             pagination: processed.pagination,
             filters: processed.filters,
             sorter: processed.sorter,
@@ -1518,7 +1518,7 @@ function FaasDataTable({
           return;
         }
         reload({
-          ...params,
+          ...params || /* @__PURE__ */ Object.create(null),
           pagination,
           filters,
           sorter

package/dist/index.d.ts

@@ -13,7 +13,7 @@ import * as antd_es_modal_PurePanel from 'antd/es/modal/PurePanel';
 import * as antd_es_modal_useModal from 'antd/es/modal/useModal';
 import * as antd_es_modal_confirm from 'antd/es/modal/confirm';
 import { Dayjs } from 'dayjs';
-import { FaasAction } from '@faasjs/types';
+import { FaasActionUnionType, FaasAction } from '@faasjs/types';
 import * as antd_es_form_FormItem from 'antd/es/form/FormItem';
 import { RuleObject } from 'rc-field-form/lib/interface';
 import { FilterValue, SorterResult, TableCurrentDataSource } from 'antd/es/table/interface';
@@ -294,7 +294,7 @@ declare namespace FaasDataWrapper {
  * const MyComponent = withFaasData(({ data }) => <div>{data.name}</div>, { action: 'test', params: { a: 1 } })
  * ```
  */
-declare function withFaasData<PathOrData extends FaasAction, TComponentProps extends Required<FaasDataInjection<PathOrData>> = Required<FaasDataInjection<PathOrData>>>(Component: React.FC<TComponentProps & Record<string, any>>, faasProps: FaasDataWrapperProps<PathOrData>): React.FC<Omit<TComponentProps, keyof FaasDataInjection<PathOrData>> & Record<string, any>>;
+declare function withFaasData<PathOrData extends FaasActionUnionType, TComponentProps extends Required<FaasDataInjection<PathOrData>> = Required<FaasDataInjection<PathOrData>>>(Component: React.FC<TComponentProps & Record<string, any>>, faasProps: FaasDataWrapperProps<PathOrData>): React.FC<Omit<TComponentProps, keyof FaasDataInjection<PathOrData>>>;
 
 interface ExtendDescriptionTypeProps<T = any> {
     children?: UnionFaasItemElement<T>;

package/dist/index.mjs

@@ -558,7 +558,7 @@ function FormItem(props) {
   }, [props]);
   if (!computedProps) return null;
   if (hidden)
-    return /* @__PURE__ */ jsx(Form$1.Item, { ...computedProps, noStyle: true, rules: [], children: /* @__PURE__ */ jsx(Input, { hidden: true }) });
+    return /* @__PURE__ */ jsx(Form$1.Item, { ...computedProps, noStyle: true, rules: [], children: /* @__PURE__ */ jsx(Input, { type: "hidden", hidden: true }) });
   if (extendTypes?.[computedProps.type])
     return /* @__PURE__ */ jsx(Form$1.Item, { ...computedProps, children: extendTypes[computedProps.type].children });
   if (computedProps.formChildren === null) return null;
@@ -789,7 +789,7 @@ function Form(props) {
     if (propsCopy.items?.length)
       for (const item of propsCopy.items) {
         if (isFormItemProps(item) && item.if)
-          item.hidden = !item.if(propsCopy.initialValues || /* @__PURE__ */ Object.create(null));
+          item.hidden = !item.if(initialValues || /* @__PURE__ */ Object.create(null));
       }
     if (propsCopy.onFinish) {
       propsCopy.onFinish = async (values) => {
@@ -1497,15 +1497,15 @@ function FaasDataTable({
       rowKey: props.rowKey || "id",
       columns: currentColumns,
       dataSource: data.rows,
-      pagination: {
-        ...props.pagination,
-        ...data.pagination
+      pagination: props.pagination === false ? false : {
+        ...props.pagination || /* @__PURE__ */ Object.create(null),
+        ...data.pagination || /* @__PURE__ */ Object.create(null)
       },
       onChange: (pagination, filters, sorter, extra) => {
         if (props.onChange) {
           const processed = props.onChange(pagination, filters, sorter, extra);
           reload({
-            ...params,
+            ...params || /* @__PURE__ */ Object.create(null),
             pagination: processed.pagination,
             filters: processed.filters,
             sorter: processed.sorter,
@@ -1514,7 +1514,7 @@ function FaasDataTable({
           return;
         }
         reload({
-          ...params,
+          ...params || /* @__PURE__ */ Object.create(null),
           pagination,
           filters,
           sorter

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/ant-design",
-  "version": "6.3.1",
+  "version": "6.4.0",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.cjs",
@@ -30,7 +30,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "@faasjs/react": "6.3.1",
+    "@faasjs/react": "6.4.0",
     "antd": "*",
     "@ant-design/icons": "*",
     "lodash-es": "*",
@@ -40,7 +40,7 @@
   },
   "devDependencies": {
     "@types/lodash-es": "*",
-    "@faasjs/react": "6.3.1",
+    "@faasjs/react": "6.4.0",
     "antd": "*",
     "@ant-design/icons": "*",
     "lodash-es": "*",