@faasjs/ant-design 0.0.2-beta.449 → 0.0.2-beta.451

package/dist/index.js

@@ -157,12 +157,12 @@ function transferOptions(options) {
   });
 }
 function transferValue(type, value) {
-  if (typeof value === "undefined" || value === null || value === "" || value === "null" || value === "undefined" || Array.isArray(value) && !value.length)
+  if (typeof value === "undefined" || value === null || value === "" || value === "null" || value === "undefined")
     return null;
   if (!type)
     type = "string";
   if (type.endsWith("[]") && typeof value === "string")
-    value = value.split(",");
+    value = value.split(",").filter(Boolean);
   if (["date", "time"].includes(type)) {
     if (typeof value === "number" && value.toString().length === 10)
       value = value * 1e3;
@@ -237,7 +237,7 @@ function DescriptionItemContent(props) {
     return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_jsx_runtime3.Fragment, {
       children: computedProps.item.render(computedProps.value, computedProps.values)
     });
-  if (computedProps.value === null)
+  if (computedProps.value === null || Array.isArray(computedProps.value) && !computedProps.value.length)
     return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Blank, {});
   switch (computedProps.item.type) {
     case "string[]":
@@ -383,7 +383,6 @@ var TimePicker = (0, import_react6.forwardRef)((props, ref) => {
 TimePicker.displayName = "TimePicker";
 
 // src/FormItem.tsx
-var import_dayjs4 = __toESM(require("dayjs"));
 var import_jsx_runtime6 = require("react/jsx-runtime");
 function processProps(propsCopy, config) {
   if (!propsCopy.title)
@@ -431,26 +430,6 @@ function processProps(propsCopy, config) {
   }
   return propsCopy;
 }
-function DateItem(options) {
-  const [value, setValue] = (0, import_react7.useState)();
-  (0, import_react7.useEffect)(() => {
-    setValue(options.value && !(0, import_dayjs4.isDayjs)(options.value) ? (0, import_dayjs4.default)(options.value) : null);
-  }, [options.value]);
-  return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(DatePicker, {
-    ...options,
-    value
-  });
-}
-function TimeItem(options) {
-  const [value, setValue] = (0, import_react7.useState)();
-  (0, import_react7.useEffect)(() => {
-    setValue(options.value && !(0, import_dayjs4.isDayjs)(options.value) ? (0, import_dayjs4.default)(options.value) : null);
-  }, [options.value]);
-  return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(TimePicker, {
-    ...options,
-    value
-  });
-}
 function FormItem(props) {
   var _a;
   const [computedProps, setComputedProps] = (0, import_react7.useState)();
@@ -654,14 +633,14 @@ function FormItem(props) {
     case "date":
       return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_antd5.Form.Item, {
         ...computedProps,
-        children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(DateItem, {
+        children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(DatePicker, {
           ...computedProps.input
         })
       });
     case "time":
       return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_antd5.Form.Item, {
         ...computedProps,
-        children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(TimeItem, {
+        children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(TimePicker, {
           ...computedProps.input
         })
       });
@@ -983,7 +962,7 @@ function Routes(props) {
 // src/Table.tsx
 var import_react12 = require("react");
 var import_antd10 = require("antd");
-var import_dayjs5 = __toESM(require("dayjs"));
+var import_dayjs4 = __toESM(require("dayjs"));
 var import_icons3 = require("@ant-design/icons");
 var import_lodash6 = require("lodash");
 var import_react13 = require("@faasjs/react");
@@ -991,7 +970,7 @@ var import_jsx_runtime11 = require("react/jsx-runtime");
 function processValue(item, value) {
   var _a;
   const transferred = transferValue(item.type, value);
-  if (transferred === null)
+  if (transferred === null || Array.isArray(transferred) && transferred.length === 0)
     return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Blank, {});
   if (item.options) {
     if (item.type.endsWith("[]"))
@@ -1229,17 +1208,17 @@ function Table(props) {
           if (!item.render)
             item.render = (value) => processValue(item, value);
           if (!item.onFilter)
-            item.onFilter = (value, row) => (0, import_dayjs5.default)(row[item.id]).isSame((0, import_dayjs5.default)(value));
+            item.onFilter = (value, row) => (0, import_dayjs4.default)(row[item.id]).isSame((0, import_dayjs4.default)(value));
           if (!item.sorter)
-            item.sorter = (a, b) => (0, import_dayjs5.default)(a[item.id]).isBefore(b[item.id]) ? -1 : 1;
+            item.sorter = (a, b) => (0, import_dayjs4.default)(a[item.id]).isBefore(b[item.id]) ? -1 : 1;
           break;
         case "time":
           if (!item.render)
             item.render = (value) => processValue(item, value);
           if (!item.onFilter)
-            item.onFilter = (value, row) => (0, import_dayjs5.default)(row[item.id]).isSame((0, import_dayjs5.default)(value));
+            item.onFilter = (value, row) => (0, import_dayjs4.default)(row[item.id]).isSame((0, import_dayjs4.default)(value));
           if (!item.sorter)
-            item.sorter = (a, b) => (0, import_dayjs5.default)(a[item.id]).isBefore(b[item.id]) ? -1 : 1;
+            item.sorter = (a, b) => (0, import_dayjs4.default)(a[item.id]).isBefore(b[item.id]) ? -1 : 1;
           break;
         case "object":
           if (!item.render)

package/dist/index.mjs

@@ -110,12 +110,12 @@ function transferOptions(options) {
   });
 }
 function transferValue(type, value) {
-  if (typeof value === "undefined" || value === null || value === "" || value === "null" || value === "undefined" || Array.isArray(value) && !value.length)
+  if (typeof value === "undefined" || value === null || value === "" || value === "null" || value === "undefined")
     return null;
   if (!type)
     type = "string";
   if (type.endsWith("[]") && typeof value === "string")
-    value = value.split(",");
+    value = value.split(",").filter(Boolean);
   if (["date", "time"].includes(type)) {
     if (typeof value === "number" && value.toString().length === 10)
       value = value * 1e3;
@@ -198,7 +198,7 @@ function DescriptionItemContent(props) {
     return /* @__PURE__ */ jsx3(Fragment, {
       children: computedProps.item.render(computedProps.value, computedProps.values)
     });
-  if (computedProps.value === null)
+  if (computedProps.value === null || Array.isArray(computedProps.value) && !computedProps.value.length)
     return /* @__PURE__ */ jsx3(Blank, {});
   switch (computedProps.item.type) {
     case "string[]":
@@ -363,7 +363,6 @@ var TimePicker = forwardRef((props, ref) => {
 TimePicker.displayName = "TimePicker";
 
 // src/FormItem.tsx
-import dayjs2, { isDayjs } from "dayjs";
 import { Fragment as Fragment2, jsx as jsx6, jsxs } from "react/jsx-runtime";
 function processProps(propsCopy, config) {
   if (!propsCopy.title)
@@ -411,26 +410,6 @@ function processProps(propsCopy, config) {
   }
   return propsCopy;
 }
-function DateItem(options) {
-  const [value, setValue] = useState4();
-  useEffect3(() => {
-    setValue(options.value && !isDayjs(options.value) ? dayjs2(options.value) : null);
-  }, [options.value]);
-  return /* @__PURE__ */ jsx6(DatePicker, {
-    ...options,
-    value
-  });
-}
-function TimeItem(options) {
-  const [value, setValue] = useState4();
-  useEffect3(() => {
-    setValue(options.value && !isDayjs(options.value) ? dayjs2(options.value) : null);
-  }, [options.value]);
-  return /* @__PURE__ */ jsx6(TimePicker, {
-    ...options,
-    value
-  });
-}
 function FormItem(props) {
   var _a;
   const [computedProps, setComputedProps] = useState4();
@@ -634,14 +613,14 @@ function FormItem(props) {
     case "date":
       return /* @__PURE__ */ jsx6(AntdForm.Item, {
         ...computedProps,
-        children: /* @__PURE__ */ jsx6(DateItem, {
+        children: /* @__PURE__ */ jsx6(DatePicker, {
           ...computedProps.input
         })
       });
     case "time":
       return /* @__PURE__ */ jsx6(AntdForm.Item, {
         ...computedProps,
-        children: /* @__PURE__ */ jsx6(TimeItem, {
+        children: /* @__PURE__ */ jsx6(TimePicker, {
           ...computedProps.input
         })
       });
@@ -977,7 +956,7 @@ import {
   Skeleton as Skeleton3,
   Input as Input2
 } from "antd";
-import dayjs3 from "dayjs";
+import dayjs2 from "dayjs";
 import { CheckOutlined as CheckOutlined2, CloseOutlined as CloseOutlined2 } from "@ant-design/icons";
 import {
   isNil as isNil2,
@@ -989,7 +968,7 @@ import { jsx as jsx11, jsxs as jsxs4 } from "react/jsx-runtime";
 function processValue(item, value) {
   var _a;
   const transferred = transferValue(item.type, value);
-  if (transferred === null)
+  if (transferred === null || Array.isArray(transferred) && transferred.length === 0)
     return /* @__PURE__ */ jsx11(Blank, {});
   if (item.options) {
     if (item.type.endsWith("[]"))
@@ -1227,17 +1206,17 @@ function Table(props) {
           if (!item.render)
             item.render = (value) => processValue(item, value);
           if (!item.onFilter)
-            item.onFilter = (value, row) => dayjs3(row[item.id]).isSame(dayjs3(value));
+            item.onFilter = (value, row) => dayjs2(row[item.id]).isSame(dayjs2(value));
           if (!item.sorter)
-            item.sorter = (a, b) => dayjs3(a[item.id]).isBefore(b[item.id]) ? -1 : 1;
+            item.sorter = (a, b) => dayjs2(a[item.id]).isBefore(b[item.id]) ? -1 : 1;
           break;
         case "time":
           if (!item.render)
             item.render = (value) => processValue(item, value);
           if (!item.onFilter)
-            item.onFilter = (value, row) => dayjs3(row[item.id]).isSame(dayjs3(value));
+            item.onFilter = (value, row) => dayjs2(row[item.id]).isSame(dayjs2(value));
           if (!item.sorter)
-            item.sorter = (a, b) => dayjs3(a[item.id]).isBefore(b[item.id]) ? -1 : 1;
+            item.sorter = (a, b) => dayjs2(a[item.id]).isBefore(b[item.id]) ? -1 : 1;
           break;
         case "object":
           if (!item.render)

package/package.json

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