@faasjs/ant-design 0.0.3-beta.20 → 0.0.3-beta.21

package/dist/index.js

@@ -1000,7 +1000,10 @@ function Table(props) {
         item.filters = item.options.map((o) => ({
           text: o.label,
           value: o.value
-        }));
+        })).concat({
+          text: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Blank, {}),
+          value: null
+        });
       }
       if (item.children)
         item.render = (value, values) => (0, import_react11.cloneElement)(
@@ -1293,55 +1296,95 @@ function Table(props) {
     fallback: props.faasData.fallback || /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd9.Skeleton, {
       active: true
     }),
-    render: ({
-      data,
-      params,
-      reload
-    }) => {
-      if (!data)
-        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd9.Table, {
-          ...props,
-          rowKey: props.rowKey || "id",
-          columns,
-          dataSource: []
-        });
-      if (Array.isArray(data))
-        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd9.Table, {
-          ...props,
-          rowKey: props.rowKey || "id",
-          columns,
-          dataSource: data
-        });
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd9.Table, {
-        ...props,
-        rowKey: props.rowKey || "id",
-        columns,
-        dataSource: data.rows,
-        pagination: {
-          ...props.pagination,
-          ...data.pagination
-        },
-        onChange: (pagination, filters, sorter, extra) => {
-          if (props.onChange) {
-            const processed = props.onChange(pagination, filters, sorter, extra);
-            reload({
-              ...params,
-              pagination: processed.pagination,
-              filters: processed.filters,
-              sorter: processed.sorter
-            });
-            return;
-          }
-          reload({
-            ...params,
-            pagination,
-            filters,
-            sorter
+    ...props.faasData,
+    children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FaasDataTable, {
+      props,
+      columns
+    })
+  });
+}
+function FaasDataTable({
+  props,
+  columns,
+  data,
+  params,
+  reload
+}) {
+  const [currentColumns, setCurrentColumns] = (0, import_react11.useState)(columns);
+  (0, import_react11.useEffect)(() => {
+    if (!data || Array.isArray(data))
+      return;
+    setCurrentColumns((prev) => {
+      const newColumns = [...prev];
+      for (const column of newColumns) {
+        if (data["options"][column.id]) {
+          column.options = data["options"][column.id];
+          column.filters = data["options"][column.id].map((v) => ({
+            text: v.label,
+            value: v.value
+          })).concat({
+            text: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Blank, {}),
+            value: null
           });
+          column.render = (value) => processValue(column, value);
+          if (column.filterDropdown)
+            delete column.filterDropdown;
+          continue;
         }
-      });
+        if (column.optionsType === "auto" && !column.options && !column.filters) {
+          column.filters = (0, import_lodash_es6.uniqBy)(props.dataSource, column.id).map((v) => ({
+            text: v[column.id],
+            value: v[column.id]
+          })).concat({
+            text: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Blank, {}),
+            value: null
+          });
+        }
+      }
+      return newColumns;
+    });
+  }, [columns, data]);
+  if (!data)
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd9.Table, {
+      ...props,
+      rowKey: props.rowKey || "id",
+      columns: currentColumns,
+      dataSource: []
+    });
+  if (Array.isArray(data))
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd9.Table, {
+      ...props,
+      rowKey: props.rowKey || "id",
+      columns: currentColumns,
+      dataSource: data
+    });
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd9.Table, {
+    ...props,
+    rowKey: props.rowKey || "id",
+    columns: currentColumns,
+    dataSource: data.rows,
+    pagination: {
+      ...props.pagination,
+      ...data.pagination
     },
-    ...props.faasData
+    onChange: (pagination, filters, sorter, extra) => {
+      if (props.onChange) {
+        const processed = props.onChange(pagination, filters, sorter, extra);
+        reload({
+          ...params,
+          pagination: processed.pagination,
+          filters: processed.filters,
+          sorter: processed.sorter
+        });
+        return;
+      }
+      reload({
+        ...params,
+        pagination,
+        filters,
+        sorter
+      });
+    }
   });
 }
 

package/dist/index.mjs

@@ -959,7 +959,9 @@ import {
   uniqBy,
   upperFirst as upperFirst4
 } from "lodash-es";
-import { FaasDataWrapper as FaasDataWrapper2 } from "@faasjs/react";
+import {
+  FaasDataWrapper as FaasDataWrapper2
+} from "@faasjs/react";
 import { jsx as jsx10, jsxs as jsxs4 } from "react/jsx-runtime";
 function processValue(item, value) {
   var _a;
@@ -1004,7 +1006,10 @@ function Table(props) {
         item.filters = item.options.map((o) => ({
           text: o.label,
           value: o.value
-        }));
+        })).concat({
+          text: /* @__PURE__ */ jsx10(Blank, {}),
+          value: null
+        });
       }
       if (item.children)
         item.render = (value, values) => cloneElement2(
@@ -1297,55 +1302,95 @@ function Table(props) {
     fallback: props.faasData.fallback || /* @__PURE__ */ jsx10(Skeleton3, {
       active: true
     }),
-    render: ({
-      data,
-      params,
-      reload
-    }) => {
-      if (!data)
-        return /* @__PURE__ */ jsx10(AntdTable, {
-          ...props,
-          rowKey: props.rowKey || "id",
-          columns,
-          dataSource: []
-        });
-      if (Array.isArray(data))
-        return /* @__PURE__ */ jsx10(AntdTable, {
-          ...props,
-          rowKey: props.rowKey || "id",
-          columns,
-          dataSource: data
-        });
-      return /* @__PURE__ */ jsx10(AntdTable, {
-        ...props,
-        rowKey: props.rowKey || "id",
-        columns,
-        dataSource: data.rows,
-        pagination: {
-          ...props.pagination,
-          ...data.pagination
-        },
-        onChange: (pagination, filters, sorter, extra) => {
-          if (props.onChange) {
-            const processed = props.onChange(pagination, filters, sorter, extra);
-            reload({
-              ...params,
-              pagination: processed.pagination,
-              filters: processed.filters,
-              sorter: processed.sorter
-            });
-            return;
-          }
-          reload({
-            ...params,
-            pagination,
-            filters,
-            sorter
+    ...props.faasData,
+    children: /* @__PURE__ */ jsx10(FaasDataTable, {
+      props,
+      columns
+    })
+  });
+}
+function FaasDataTable({
+  props,
+  columns,
+  data,
+  params,
+  reload
+}) {
+  const [currentColumns, setCurrentColumns] = useState7(columns);
+  useEffect5(() => {
+    if (!data || Array.isArray(data))
+      return;
+    setCurrentColumns((prev) => {
+      const newColumns = [...prev];
+      for (const column of newColumns) {
+        if (data["options"][column.id]) {
+          column.options = data["options"][column.id];
+          column.filters = data["options"][column.id].map((v) => ({
+            text: v.label,
+            value: v.value
+          })).concat({
+            text: /* @__PURE__ */ jsx10(Blank, {}),
+            value: null
           });
+          column.render = (value) => processValue(column, value);
+          if (column.filterDropdown)
+            delete column.filterDropdown;
+          continue;
         }
-      });
+        if (column.optionsType === "auto" && !column.options && !column.filters) {
+          column.filters = uniqBy(props.dataSource, column.id).map((v) => ({
+            text: v[column.id],
+            value: v[column.id]
+          })).concat({
+            text: /* @__PURE__ */ jsx10(Blank, {}),
+            value: null
+          });
+        }
+      }
+      return newColumns;
+    });
+  }, [columns, data]);
+  if (!data)
+    return /* @__PURE__ */ jsx10(AntdTable, {
+      ...props,
+      rowKey: props.rowKey || "id",
+      columns: currentColumns,
+      dataSource: []
+    });
+  if (Array.isArray(data))
+    return /* @__PURE__ */ jsx10(AntdTable, {
+      ...props,
+      rowKey: props.rowKey || "id",
+      columns: currentColumns,
+      dataSource: data
+    });
+  return /* @__PURE__ */ jsx10(AntdTable, {
+    ...props,
+    rowKey: props.rowKey || "id",
+    columns: currentColumns,
+    dataSource: data.rows,
+    pagination: {
+      ...props.pagination,
+      ...data.pagination
     },
-    ...props.faasData
+    onChange: (pagination, filters, sorter, extra) => {
+      if (props.onChange) {
+        const processed = props.onChange(pagination, filters, sorter, extra);
+        reload({
+          ...params,
+          pagination: processed.pagination,
+          filters: processed.filters,
+          sorter: processed.sorter
+        });
+        return;
+      }
+      reload({
+        ...params,
+        pagination,
+        filters,
+        sorter
+      });
+    }
   });
 }
 

package/package.json

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