@faasjs/ant-design 0.0.2-beta.436 → 0.0.2-beta.438

package/README.md

@@ -18,7 +18,9 @@ In `@faasjs/ant-design`, we use `FaasItemProps` to provide data structures for c
 type FaasItemType =
   'string' | 'string[]' |
   'number' | 'number[]' |
-  'boolean'
+  'boolean' |
+  'date' | 'time' |
+  'object' | 'object[]'
 
 type FaasItemProps = {
   type: FaasItemTypes
@@ -181,7 +183,7 @@ ___
 
 ### DescriptionItemProps
 
-Ƭ **DescriptionItemProps**<`T`\>: { `children?`: `JSX.Element` ; `render?`: (`value`: `T`, `values`: `any`) => `JSX.Element` \| `string` \| `number` \| `boolean` \| ``null``  } & [`FaasItemProps`](#faasitemprops)
+Ƭ **DescriptionItemProps**<`T`\>: { `children?`: `JSX.Element` ; `render?`: (`value`: `T`, `values`: `any`) => `ReactNode` \| `JSX.Element`  } & [`FaasItemProps`](#faasitemprops) & { `object?`: [`DescriptionItemProps`](#descriptionitemprops)[]  }
 
 #### Type parameters
 
@@ -193,7 +195,7 @@ ___
 
 ### DescriptionProps
 
-Ƭ **DescriptionProps**<`T`, `ExtendItemProps`\>: { `dataSource?`: `T` ; `extendTypes?`: { `[key: string]`: [`ExtendDescriptionTypeProps`](#extenddescriptiontypeprops);  } ; `faasData?`: `FaasDataWrapperProps`<`T`\> ; `items`: ([`DescriptionItemProps`](#descriptionitemprops) \| `ExtendItemProps`)[] ; `renderTitle?`: (`values`: `T`) => `ReactNode`  } & `DescriptionsProps`
+Ƭ **DescriptionProps**<`T`, `ExtendItemProps`\>: { `dataSource?`: `T` ; `extendTypes?`: { `[key: string]`: [`ExtendDescriptionTypeProps`](#extenddescriptiontypeprops);  } ; `faasData?`: `FaasDataWrapperProps`<`T`\> ; `items`: ([`DescriptionItemProps`](#descriptionitemprops) \| `ExtendItemProps`)[] ; `renderTitle?`: (`values`: `T`) => `ReactNode` \| `JSX.Element`  } & `DescriptionsProps`
 
 #### Type parameters
 
@@ -225,7 +227,7 @@ ___
 | Name | Type |
 | :------ | :------ |
 | `children?` | `JSX.Element` \| ``null`` |
-| `render?` | (`value`: `any`, `values`: `any`) => `JSX.Element` \| `string` \| `number` \| `boolean` \| ``null`` |
+| `render?` | (`value`: `any`, `values`: `any`) => `ReactNode` \| `JSX.Element` |
 
 ___
 
@@ -243,7 +245,7 @@ ___
 
 | Name | Type |
 | :------ | :------ |
-| `children?` | `JSX.Element` \| ``null`` |
+| `children?` | `ReactNode` |
 
 ___
 
@@ -298,6 +300,8 @@ ___
 
 Ƭ **FaasItemTypeValue**: `Object`
 
+FaasItemType's value type
+
 #### Type declaration
 
 | Name | Type |
@@ -316,7 +320,7 @@ ___
 
 ### FormItemProps
 
-Ƭ **FormItemProps**<`T`\>: { `children?`: `JSX.Element` \| ``null`` ; `extendTypes?`: [`ExtendTypes`](#extendtypes) ; `label?`: `string` \| ``false`` ; `render?`: () => `JSX.Element` \| ``null`` ; `rules?`: `RuleObject`[]  } & `FormItemInputProps` & [`FaasItemProps`](#faasitemprops) & `Omit`<`AntdFormItemProps`<`T`\>, ``"children"``\>
+Ƭ **FormItemProps**<`T`\>: { `children?`: `ReactNode` ; `extendTypes?`: [`ExtendTypes`](#extendtypes) ; `label?`: `string` \| ``false`` ; `render?`: (`value?`: `any`) => `ReactNode` \| `JSX.Element` ; `rules?`: `RuleObject`[]  } & `FormItemInputProps` & [`FaasItemProps`](#faasitemprops) & `Omit`<`AntdFormItemProps`<`T`\>, ``"children"``\>
 
 #### Type parameters
 
@@ -479,7 +483,7 @@ ___
 
 ### Blank
 
-▸ **Blank**(`options?`): `any`
+▸ **Blank**(`options?`): `JSX.Element`
 
 If value is undefined or null, return text, otherwise return value.
 
@@ -491,7 +495,7 @@ If value is undefined or null, return text, otherwise return value.
 
 #### Returns
 
-`any`
+`JSX.Element`
 
 ```ts
 <Blank value={undefined} text="Empty" />
@@ -571,6 +575,12 @@ ___
 
 ▸ **Form**<`Values`\>(`props`): `Element`
 
+Form component with Ant Design & FaasJS
+
+**`Ref`**
+
+https://ant.design/components/form/
+
 #### Type parameters
 
 | Name | Type |
@@ -695,6 +705,12 @@ ___
 
 ▸ **Table**<`T`, `ExtendTypes`\>(`props`): `Element`
 
+Table component with Ant Design & FaasJS
+
+**`Ref`**
+
+https://ant.design/components/table/
+
 #### Type parameters
 
 | Name | Type |

package/dist/index.d.ts

@@ -89,6 +89,7 @@ declare function ConfigProvider({ config, children }: {
 declare function useConfigContext(): ConfigProviderProps;
 
 declare type FaasItemType = 'string' | 'string[]' | 'number' | 'number[]' | 'boolean' | 'date' | 'time' | 'object' | 'object[]';
+/** FaasItemType's value type */
 declare type FaasItemTypeValue = {
     string: string;
     'string[]': string[];
@@ -187,45 +188,36 @@ declare function useDrawer(init?: DrawerProps): {
 declare type StringProps = {
     type?: 'string';
     input?: InputProps;
-    required?: boolean;
 };
 declare type StringListProps = {
     type: 'string[]';
     input?: InputProps;
     maxCount?: number;
-    required?: boolean;
 };
 declare type NumberProps = {
     type: 'number';
     input?: InputNumberProps;
-    required?: boolean;
 };
 declare type NumberListProps = {
     type: 'number[]';
     input?: InputNumberProps;
     maxCount?: number;
-    required?: boolean;
 };
 declare type BooleanProps = {
     type: 'boolean';
     input?: SwitchProps;
-    required?: boolean;
 };
 declare type DateProps = {
     type: 'date';
     input?: DatePickerProps$1;
-    required?: boolean;
 };
 declare type TimeProps = {
     type: 'time';
     input?: TimePickerProps$1;
-    required?: boolean;
 };
 declare type ObjectProps = {
     type: 'object';
     object: FormItemProps[];
-    disabled?: boolean;
-    required?: boolean;
 };
 declare type ObjectListProps = {
     type: 'object[]';
@@ -234,15 +226,16 @@ declare type ObjectListProps = {
         col?: number;
     })[];
     maxCount?: number;
-    disabled?: boolean;
-    required?: boolean;
 };
 declare type OptionsProps = {
     options?: BaseOption[];
     type?: 'string' | 'string[]' | 'number' | 'number[]';
     input?: SelectProps<any>;
 };
-declare type FormItemInputProps = StringProps | StringListProps | NumberProps | NumberListProps | BooleanProps | OptionsProps | DateProps | TimeProps | ObjectProps | ObjectListProps;
+declare type FormItemInputProps = (StringProps | StringListProps | NumberProps | NumberListProps | BooleanProps | OptionsProps | DateProps | TimeProps | ObjectProps | ObjectListProps) & {
+    disabled?: boolean;
+    required?: boolean;
+};
 declare type ExtendFormTypeProps = {
     children?: ReactNode;
 };
@@ -315,6 +308,11 @@ declare type FormProps<Values = any, ExtendItemProps = any> = {
     extendTypes?: ExtendTypes;
     children?: ReactNode;
 } & Omit<FormProps$1<Values>, 'onFinish' | 'children'>;
+/**
+ * Form component with Ant Design & FaasJS
+ *
+ * @ref https://ant.design/components/form/
+ */
 declare function Form<Values = any>(props: FormProps<Values>): JSX.Element;
 declare namespace Form {
     var useForm: typeof antd_lib_form_Form.useForm;
@@ -416,6 +414,11 @@ declare type TableProps<T = any, ExtendTypes = any> = {
         extra: TableCurrentDataSource<T>;
     };
 } & TableProps$1<T>;
+/**
+ * Table component with Ant Design & FaasJS
+ *
+ * @ref https://ant.design/components/table/
+ */
 declare function Table<T = any, ExtendTypes = any>(props: TableProps<T, ExtendTypes>): JSX.Element;
 
 declare type TimePickerProps = Omit<PickerTimeProps<Dayjs>, 'picker'>;

package/dist/index.js

@@ -923,21 +923,25 @@ var import_react13 = require("@faasjs/react");
 var import_jsx_runtime11 = require("react/jsx-runtime");
 function processValue(item, value) {
   var _a;
-  if (typeof value === "undefined" || value === null || value === "")
+  if (typeof value === "undefined" || value === null || value === "" || Array.isArray(value) && !value.length)
     return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Blank, {});
+  if (item.type.endsWith("[]") && typeof value === "string")
+    value = value.split(",");
   if (item.options) {
     if (item.type.endsWith("[]"))
       return value.map((v) => {
         var _a2;
         return ((_a2 = item.options.find((option) => option.value === v)) == null ? void 0 : _a2.label) || v;
-      });
-    else if ([
+      }).join(", ");
+    if ([
       "string",
       "number",
       "boolean"
     ].includes(item.type))
       return ((_a = item.options.find((option) => option.value === value)) == null ? void 0 : _a.label) || value;
   }
+  if (item.type.endsWith("[]"))
+    return value.join(", ");
   if (["date", "time"].includes(item.type)) {
     if (typeof value === "number" && value.toString().length === 10)
       value = value * 1e3;
@@ -969,7 +973,7 @@ function Table(props) {
       if (item.children)
         delete item.children;
       if (props.extendTypes && props.extendTypes[item.type]) {
-        if (props.extendTypes[item.type].children) {
+        if (props.extendTypes[item.type].children)
           item.render = (value, values) => (0, import_react12.cloneElement)(
             props.extendTypes[item.type].children,
             {
@@ -977,7 +981,7 @@ function Table(props) {
               values
             }
           );
-        } else if (props.extendTypes[item.type].render)
+        else if (props.extendTypes[item.type].render)
           item.render = props.extendTypes[item.type].render;
         else
           throw Error(item.type + " requires children or render");
@@ -987,13 +991,12 @@ function Table(props) {
         case "string":
           if (!item.render)
             item.render = (value) => processValue(item, value);
-          if (!item.onFilter) {
+          if (!item.onFilter)
             item.onFilter = (value, row) => {
               if (!row[item.id])
                 return false;
               return row[item.id].includes(value);
             };
-          }
           if (!item.filters && item.filterDropdown !== false && item.optionsType !== "auto")
             item.filterDropdown = ({
               setSelectedKeys,
@@ -1017,7 +1020,7 @@ function Table(props) {
           break;
         case "string[]":
           if (!item.render)
-            item.render = (value) => processValue(item, value).join(", ");
+            item.render = (value) => processValue(item, value);
           if (!item.onFilter)
             item.onFilter = (value, row) => {
               if (!row[item.id] || !row[item.id].length)

package/dist/index.mjs

@@ -921,21 +921,25 @@ import { FaasDataWrapper as FaasDataWrapper2 } from "@faasjs/react";
 import { jsx as jsx11, jsxs as jsxs4 } from "react/jsx-runtime";
 function processValue(item, value) {
   var _a;
-  if (typeof value === "undefined" || value === null || value === "")
+  if (typeof value === "undefined" || value === null || value === "" || Array.isArray(value) && !value.length)
     return /* @__PURE__ */ jsx11(Blank, {});
+  if (item.type.endsWith("[]") && typeof value === "string")
+    value = value.split(",");
   if (item.options) {
     if (item.type.endsWith("[]"))
       return value.map((v) => {
         var _a2;
         return ((_a2 = item.options.find((option) => option.value === v)) == null ? void 0 : _a2.label) || v;
-      });
-    else if ([
+      }).join(", ");
+    if ([
       "string",
       "number",
       "boolean"
     ].includes(item.type))
       return ((_a = item.options.find((option) => option.value === value)) == null ? void 0 : _a.label) || value;
   }
+  if (item.type.endsWith("[]"))
+    return value.join(", ");
   if (["date", "time"].includes(item.type)) {
     if (typeof value === "number" && value.toString().length === 10)
       value = value * 1e3;
@@ -967,7 +971,7 @@ function Table(props) {
       if (item.children)
         delete item.children;
       if (props.extendTypes && props.extendTypes[item.type]) {
-        if (props.extendTypes[item.type].children) {
+        if (props.extendTypes[item.type].children)
           item.render = (value, values) => cloneElement2(
             props.extendTypes[item.type].children,
             {
@@ -975,7 +979,7 @@ function Table(props) {
               values
             }
           );
-        } else if (props.extendTypes[item.type].render)
+        else if (props.extendTypes[item.type].render)
           item.render = props.extendTypes[item.type].render;
         else
           throw Error(item.type + " requires children or render");
@@ -985,13 +989,12 @@ function Table(props) {
         case "string":
           if (!item.render)
             item.render = (value) => processValue(item, value);
-          if (!item.onFilter) {
+          if (!item.onFilter)
             item.onFilter = (value, row) => {
               if (!row[item.id])
                 return false;
               return row[item.id].includes(value);
             };
-          }
           if (!item.filters && item.filterDropdown !== false && item.optionsType !== "auto")
             item.filterDropdown = ({
               setSelectedKeys,
@@ -1015,7 +1018,7 @@ function Table(props) {
           break;
         case "string[]":
           if (!item.render)
-            item.render = (value) => processValue(item, value).join(", ");
+            item.render = (value) => processValue(item, value);
           if (!item.onFilter)
             item.onFilter = (value, row) => {
               if (!row[item.id] || !row[item.id].length)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/ant-design",
-  "version": "0.0.2-beta.436",
+  "version": "0.0.2-beta.438",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -28,7 +28,7 @@
     "lodash": "*",
     "react": "*",
     "react-dom": "*",
-    "@faasjs/react": "^0.0.2-beta.436",
+    "@faasjs/react": "^0.0.2-beta.438",
     "react-router-dom": "*",
     "dayjs": "*"
   },