@faasjs/ant-design 0.0.3-beta.65 → 0.0.3-beta.66

package/dist/index.d.ts

@@ -360,7 +360,7 @@ type UnionFaasItemInjection<Value = any, Values = any> = {
     values?: Values;
     index?: number;
 };
-type UnionFaasItemRender<Value = any, Values = any> = (value: Value, values: Values, index: number, scene: UnionScene) => JSX.Element | null;
+type UnionFaasItemRender<Value = any, Values = any> = (value: Value, values: Values, index: number, scene: UnionScene) => React.ReactNode;
 type UnionFaasItemElement<Value = any, Values = any> = ReactElement<UnionFaasItemInjection<Value, Values>> | null;
 interface UnionFaasItemProps<Value = any, Values = any> extends FormItemProps, DescriptionItemProps, TableItemProps {
     children?: UnionFaasItemElement<UnionFaasItemProps<Value, Values>> | null;

package/dist/index.js

@@ -402,9 +402,13 @@ function DescriptionItemContent(props) {
       values: computedProps.values
     });
   if (computedProps.item.descriptionRender)
-    return computedProps.item.descriptionRender(computedProps.value, computedProps.values, 0, "description");
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
+      children: computedProps.item.descriptionRender(computedProps.value, computedProps.values, 0, "description")
+    });
   if (computedProps.item.render)
-    return computedProps.item.render(computedProps.value, computedProps.values, 0, "description");
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
+      children: computedProps.item.render(computedProps.value, computedProps.values, 0, "description")
+    });
   if (computedProps.value === null || Array.isArray(computedProps.value) && !computedProps.value.length)
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Blank, {});
   switch (computedProps.item.type) {
@@ -1194,6 +1198,49 @@ function processValue(item, value) {
 function Table(props) {
   const [columns, setColumns] = (0, import_react14.useState)();
   const { common: common2 } = useConfigContext();
+  const generateFilterDropdown = (item) => {
+    if (typeof item.filterDropdown !== "undefined")
+      return;
+    if (item.options.length < 11) {
+      if (!item.filters)
+        item.filters = item.options.map((o) => ({
+          text: o.label,
+          value: o.value
+        }));
+      return;
+    }
+    item.filterDropdown = ({
+      setSelectedKeys,
+      selectedKeys,
+      confirm
+    }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+      style: {
+        padding: 8,
+        width: "200px"
+      },
+      onKeyDown: (e) => e.stopPropagation(),
+      children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd12.Select, {
+        options: item.options,
+        allowClear: true,
+        showSearch: true,
+        style: { width: "100%" },
+        placeholder: `${common2.search} ${item.title}`,
+        value: selectedKeys,
+        onChange: (v) => {
+          setSelectedKeys((v == null ? void 0 : v.length) ? v : []);
+          confirm();
+        },
+        mode: "multiple",
+        filterOption: (input, option) => {
+          if (!input || !option || !option.label)
+            return true;
+          input = input.trim();
+          return option.value === input || option.label.toString().toLowerCase().includes(input.toLowerCase());
+        }
+      })
+    });
+    return item;
+  };
   (0, import_react14.useEffect)(() => {
     var _a;
     for (const item of props.items) {
@@ -1214,6 +1261,7 @@ function Table(props) {
           text: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Blank, {}),
           value: null
         });
+        generateFilterDropdown(item);
       }
       if (item.tableChildren === null)
         item.render = () => null;
@@ -1552,53 +1600,16 @@ function Table(props) {
       return;
     for (const column of columns) {
       if (column.optionsType === "auto" && !column.options && !column.filters) {
-        const filters = (0, import_lodash_es6.uniqBy)(props.dataSource, column.id).map((v) => ({
-          text: v[column.id],
+        const options = (0, import_lodash_es6.uniqBy)(props.dataSource, column.id).map((v) => ({
+          label: v[column.id],
           value: v[column.id]
         }));
-        if (filters.length)
+        if (options.length)
           setColumns((prev) => {
             const newColumns = [...prev];
             const index = newColumns.findIndex((item) => item.id === column.id);
-            if (filters.length < 11)
-              newColumns[index].filters = filters.concat({
-                text: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Blank, {}),
-                value: null
-              });
-            else
-              newColumns[index].filterDropdown = ({
-                setSelectedKeys,
-                selectedKeys,
-                confirm
-              }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-                style: {
-                  padding: 8,
-                  width: "200px"
-                },
-                onKeyDown: (e) => e.stopPropagation(),
-                children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd12.Select, {
-                  options: filters.map((f) => ({
-                    label: f.text,
-                    value: f.value
-                  })),
-                  allowClear: true,
-                  showSearch: true,
-                  style: { width: "100%" },
-                  placeholder: `${common2.search} ${newColumns[index].title}`,
-                  value: selectedKeys,
-                  onChange: (v) => {
-                    setSelectedKeys((v == null ? void 0 : v.length) ? v : []);
-                    confirm();
-                  },
-                  mode: "multiple",
-                  filterOption: (input, option) => {
-                    if (!input || !option || !option.label)
-                      return true;
-                    input = input.trim();
-                    return option.value === input || option.label.toString().toLowerCase().includes(input.toLowerCase());
-                  }
-                })
-              });
+            newColumns[index].options = options;
+            generateFilterDropdown(newColumns[index]);
             return newColumns;
           });
       }

package/dist/index.mjs

@@ -368,9 +368,13 @@ function DescriptionItemContent(props) {
       values: computedProps.values
     });
   if (computedProps.item.descriptionRender)
-    return computedProps.item.descriptionRender(computedProps.value, computedProps.values, 0, "description");
+    return /* @__PURE__ */ jsx8(Fragment3, {
+      children: computedProps.item.descriptionRender(computedProps.value, computedProps.values, 0, "description")
+    });
   if (computedProps.item.render)
-    return computedProps.item.render(computedProps.value, computedProps.values, 0, "description");
+    return /* @__PURE__ */ jsx8(Fragment3, {
+      children: computedProps.item.render(computedProps.value, computedProps.values, 0, "description")
+    });
   if (computedProps.value === null || Array.isArray(computedProps.value) && !computedProps.value.length)
     return /* @__PURE__ */ jsx8(Blank, {});
   switch (computedProps.item.type) {
@@ -1202,6 +1206,49 @@ function processValue(item, value) {
 function Table(props) {
   const [columns, setColumns] = useState7();
   const { common: common2 } = useConfigContext();
+  const generateFilterDropdown = (item) => {
+    if (typeof item.filterDropdown !== "undefined")
+      return;
+    if (item.options.length < 11) {
+      if (!item.filters)
+        item.filters = item.options.map((o) => ({
+          text: o.label,
+          value: o.value
+        }));
+      return;
+    }
+    item.filterDropdown = ({
+      setSelectedKeys,
+      selectedKeys,
+      confirm
+    }) => /* @__PURE__ */ jsx14("div", {
+      style: {
+        padding: 8,
+        width: "200px"
+      },
+      onKeyDown: (e) => e.stopPropagation(),
+      children: /* @__PURE__ */ jsx14(Select2, {
+        options: item.options,
+        allowClear: true,
+        showSearch: true,
+        style: { width: "100%" },
+        placeholder: `${common2.search} ${item.title}`,
+        value: selectedKeys,
+        onChange: (v) => {
+          setSelectedKeys((v == null ? void 0 : v.length) ? v : []);
+          confirm();
+        },
+        mode: "multiple",
+        filterOption: (input, option) => {
+          if (!input || !option || !option.label)
+            return true;
+          input = input.trim();
+          return option.value === input || option.label.toString().toLowerCase().includes(input.toLowerCase());
+        }
+      })
+    });
+    return item;
+  };
   useEffect6(() => {
     var _a;
     for (const item of props.items) {
@@ -1222,6 +1269,7 @@ function Table(props) {
           text: /* @__PURE__ */ jsx14(Blank, {}),
           value: null
         });
+        generateFilterDropdown(item);
       }
       if (item.tableChildren === null)
         item.render = () => null;
@@ -1560,53 +1608,16 @@ function Table(props) {
       return;
     for (const column of columns) {
       if (column.optionsType === "auto" && !column.options && !column.filters) {
-        const filters = uniqBy(props.dataSource, column.id).map((v) => ({
-          text: v[column.id],
+        const options = uniqBy(props.dataSource, column.id).map((v) => ({
+          label: v[column.id],
           value: v[column.id]
         }));
-        if (filters.length)
+        if (options.length)
           setColumns((prev) => {
             const newColumns = [...prev];
             const index = newColumns.findIndex((item) => item.id === column.id);
-            if (filters.length < 11)
-              newColumns[index].filters = filters.concat({
-                text: /* @__PURE__ */ jsx14(Blank, {}),
-                value: null
-              });
-            else
-              newColumns[index].filterDropdown = ({
-                setSelectedKeys,
-                selectedKeys,
-                confirm
-              }) => /* @__PURE__ */ jsx14("div", {
-                style: {
-                  padding: 8,
-                  width: "200px"
-                },
-                onKeyDown: (e) => e.stopPropagation(),
-                children: /* @__PURE__ */ jsx14(Select2, {
-                  options: filters.map((f) => ({
-                    label: f.text,
-                    value: f.value
-                  })),
-                  allowClear: true,
-                  showSearch: true,
-                  style: { width: "100%" },
-                  placeholder: `${common2.search} ${newColumns[index].title}`,
-                  value: selectedKeys,
-                  onChange: (v) => {
-                    setSelectedKeys((v == null ? void 0 : v.length) ? v : []);
-                    confirm();
-                  },
-                  mode: "multiple",
-                  filterOption: (input, option) => {
-                    if (!input || !option || !option.label)
-                      return true;
-                    input = input.trim();
-                    return option.value === input || option.label.toString().toLowerCase().includes(input.toLowerCase());
-                  }
-                })
-              });
+            newColumns[index].options = options;
+            generateFilterDropdown(newColumns[index]);
             return newColumns;
           });
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/ant-design",
-  "version": "0.0.3-beta.65",
+  "version": "0.0.3-beta.66",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",