@faasjs/ant-design 0.0.2-beta.433 → 0.0.2-beta.435

package/dist/index.d.ts

@@ -137,15 +137,17 @@ declare const DatePicker: antd_es_date_picker_generatePicker_interface.PickerCom
 
 declare type ExtendDescriptionTypeProps = {
     children?: JSX.Element | null;
-    render?: (value: any, values: any) => ReactNode;
+    render?: (value: any, values: any) => ReactNode | JSX.Element;
 };
 declare type ExtendDescriptionItemProps = BaseItemProps;
 declare type DescriptionItemProps<T = any> = {
     children?: JSX.Element;
-    render?: (value: T, values: any) => ReactNode;
-} & FaasItemProps;
+    render?: (value: T, values: any) => ReactNode | JSX.Element;
+} & FaasItemProps & {
+    object?: DescriptionItemProps[];
+};
 declare type DescriptionProps<T = any, ExtendItemProps = any> = {
-    renderTitle?: ((values: T) => ReactNode);
+    renderTitle?: ((values: T) => ReactNode | JSX.Element);
     items: (DescriptionItemProps | ExtendItemProps)[];
     extendTypes?: {
         [key: string]: ExtendDescriptionTypeProps;
@@ -250,7 +252,7 @@ declare type ExtendTypes = {
 declare type ExtendFormItemProps = BaseItemProps & FormItemProps$1;
 declare type FormItemProps<T = any> = {
     children?: ReactNode;
-    render?: () => ReactNode;
+    render?: (value?: any) => ReactNode | JSX.Element;
     rules?: RuleObject[];
     label?: string | false;
     extendTypes?: ExtendTypes;

package/dist/index.js

@@ -170,22 +170,23 @@ var import_dayjs3 = __toESM(require("dayjs"));
 var import_react4 = require("@faasjs/react");
 var import_jsx_runtime3 = require("react/jsx-runtime");
 function DescriptionItemContent(props) {
+  var _a;
   const [computedProps, setComputedProps] = (0, import_react3.useState)();
   (0, import_react3.useEffect)(() => {
-    var _a, _b;
+    var _a2, _b;
     const propsCopy = { ...props };
     if (!propsCopy.item.title)
       propsCopy.item.title = (0, import_lodash4.upperFirst)(propsCopy.item.id);
     if (!propsCopy.item.type)
       propsCopy.item.type = "string";
-    if ((_a = propsCopy.item.options) == null ? void 0 : _a.length) {
+    if ((_a2 = propsCopy.item.options) == null ? void 0 : _a2.length) {
       propsCopy.item.options = transferOptions(propsCopy.item.options);
     }
     if (propsCopy.item.options && typeof propsCopy.value !== "undefined" && propsCopy.value !== null) {
       if (propsCopy.item.type.endsWith("[]"))
         propsCopy.value = propsCopy.value.map((v) => {
-          var _a2;
-          return ((_a2 = propsCopy.item.options.find((option) => option.value === v)) == null ? void 0 : _a2.label) || v;
+          var _a3;
+          return ((_a3 = propsCopy.item.options.find((option) => option.value === v)) == null ? void 0 : _a3.label) || v;
         });
       else if ([
         "string",
@@ -252,6 +253,21 @@ function DescriptionItemContent(props) {
       return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_jsx_runtime3.Fragment, {
         children: typeof computedProps.value === "number" && computedProps.value.toString().length === 10 ? import_dayjs3.default.unix(computedProps.value).format("YYYY-MM-DD") : (0, import_dayjs3.default)(computedProps.value).format("YYYY-MM-DD")
       });
+    case "object":
+      return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Description, {
+        items: computedProps.item.object,
+        dataSource: computedProps.value
+      });
+    case "object[]":
+      if (!((_a = computedProps.value) == null ? void 0 : _a.length))
+        return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Blank, {});
+      return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_antd3.Space, {
+        direction: "vertical",
+        children: computedProps.value.map((value, index) => /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Description, {
+          items: computedProps.item.object,
+          dataSource: value
+        }, index))
+      });
     default:
       return computedProps.value || null;
   }

package/dist/index.mjs

@@ -119,7 +119,8 @@ var DatePicker = generatePicker(dayjsGenerateConfig2);
 import { CheckOutlined, CloseOutlined } from "@ant-design/icons";
 import {
   Descriptions,
-  Skeleton
+  Skeleton,
+  Space
 } from "antd";
 import { isFunction, upperFirst as upperFirst2 } from "lodash";
 import {
@@ -131,22 +132,23 @@ import dayjs from "dayjs";
 import { FaasDataWrapper } from "@faasjs/react";
 import { Fragment, jsx as jsx3 } from "react/jsx-runtime";
 function DescriptionItemContent(props) {
+  var _a;
   const [computedProps, setComputedProps] = useState2();
   useEffect2(() => {
-    var _a, _b;
+    var _a2, _b;
     const propsCopy = { ...props };
     if (!propsCopy.item.title)
       propsCopy.item.title = upperFirst2(propsCopy.item.id);
     if (!propsCopy.item.type)
       propsCopy.item.type = "string";
-    if ((_a = propsCopy.item.options) == null ? void 0 : _a.length) {
+    if ((_a2 = propsCopy.item.options) == null ? void 0 : _a2.length) {
       propsCopy.item.options = transferOptions(propsCopy.item.options);
     }
     if (propsCopy.item.options && typeof propsCopy.value !== "undefined" && propsCopy.value !== null) {
       if (propsCopy.item.type.endsWith("[]"))
         propsCopy.value = propsCopy.value.map((v) => {
-          var _a2;
-          return ((_a2 = propsCopy.item.options.find((option) => option.value === v)) == null ? void 0 : _a2.label) || v;
+          var _a3;
+          return ((_a3 = propsCopy.item.options.find((option) => option.value === v)) == null ? void 0 : _a3.label) || v;
         });
       else if ([
         "string",
@@ -213,6 +215,21 @@ function DescriptionItemContent(props) {
       return /* @__PURE__ */ jsx3(Fragment, {
         children: typeof computedProps.value === "number" && computedProps.value.toString().length === 10 ? dayjs.unix(computedProps.value).format("YYYY-MM-DD") : dayjs(computedProps.value).format("YYYY-MM-DD")
       });
+    case "object":
+      return /* @__PURE__ */ jsx3(Description, {
+        items: computedProps.item.object,
+        dataSource: computedProps.value
+      });
+    case "object[]":
+      if (!((_a = computedProps.value) == null ? void 0 : _a.length))
+        return /* @__PURE__ */ jsx3(Blank, {});
+      return /* @__PURE__ */ jsx3(Space, {
+        direction: "vertical",
+        children: computedProps.value.map((value, index) => /* @__PURE__ */ jsx3(Description, {
+          items: computedProps.item.object,
+          dataSource: value
+        }, index))
+      });
     default:
       return computedProps.value || null;
   }

package/package.json

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