@faasjs/ant-design 0.0.2-beta.345 → 0.0.2-beta.346

package/dist/index.d.ts

@@ -1,7 +1,6 @@
 import { DescriptionsProps, FormItemProps as FormItemProps$1, InputProps, InputNumberProps, SwitchProps, SelectProps, FormProps as FormProps$1, TableColumnProps, TableProps as TableProps$1 } from 'antd';
 import * as antd_lib_form_Form from 'antd/lib/form/Form';
 import { RuleObject } from 'rc-field-form/lib/interface';
-import { ReactNode } from 'react';
 
 declare function Blank(options?: {
     value?: any;
@@ -16,28 +15,33 @@ declare type FaasItemTypeValue = {
     'number[]': number[];
     boolean: boolean;
 };
-declare type BaseItemType = {
+declare type BaseOption = string | number | {
+    label: string;
+    value?: string | number;
+};
+declare type BaseItemProps = {
     id: string;
     title?: string;
+    options?: BaseOption[];
 };
-declare type FaasItemProps = BaseItemType & {
+declare type FaasItemProps = BaseItemProps & {
     /**
      * Support string, string[], number, number[], boolean
      * @default 'string'
      */
     type?: FaasItemType;
 };
+declare function transferOptions(options: BaseOption[]): {
+    label: string;
+    value?: string | number;
+}[];
 
 declare type ExtendDescriptionTypeProps = {
     children?: JSX.Element | null;
     render?: (value: any, values: any) => JSX.Element | string | number | boolean | null;
 };
-declare type ExtendDescriptionItemProps = BaseItemType;
+declare type ExtendDescriptionItemProps = BaseItemProps;
 declare type DescriptionItemProps<T = any> = {
-    options?: {
-        label: string;
-        value?: T;
-    }[];
     children?: JSX.Element;
     render?: (value: T, values: any) => JSX.Element | string | number | boolean | null;
 } & FaasItemProps;
@@ -76,22 +80,16 @@ declare type BooleanProps = {
     type: 'boolean';
     input?: SwitchProps;
 };
-declare type OptionType<T = any> = {
-    label: ReactNode;
-    value?: T;
-    disabled?: boolean;
-    children?: Omit<OptionType<T>, 'children'>[];
-};
-declare type OptionsProps<T = any> = {
-    options?: OptionType<T>[] | string[] | number[];
+declare type OptionsProps = {
+    options: BaseOption[];
     type?: 'string' | 'string[]' | 'number' | 'number[]';
     input?: SelectProps<any>;
 };
-declare type FormItemInputProps<T = any> = StringProps | StringListProps | NumberProps | NumberListProps | BooleanProps | OptionsProps<T>;
+declare type FormItemInputProps<T = any> = StringProps | StringListProps | NumberProps | NumberListProps | BooleanProps | OptionsProps;
 declare type ExtendFormTypeProps = {
     children?: JSX.Element | null;
 };
-declare type ExtendFormItemProps = BaseItemType & FormItemProps$1;
+declare type ExtendFormItemProps = BaseItemProps & FormItemProps$1;
 declare type FormItemProps<T = any> = {
     children?: JSX.Element;
     rules?: RuleObject[];
@@ -119,17 +117,12 @@ declare namespace Form {
     var Item: typeof FormItem;
 }
 
-declare type TableItemProps<T = any> = {
-    options?: {
-        label: string;
-        value?: T;
-    }[];
-} & FaasItemProps & TableColumnProps<T>;
+declare type TableItemProps<T = any> = FaasItemProps & TableColumnProps<T>;
 declare type ExtendTableTypeProps = {
     children?: JSX.Element | null;
     render?: (value: any, values: any) => JSX.Element | string | number | boolean | null;
 };
-declare type ExtendTableItemProps<T = any> = BaseItemType & TableColumnProps<T>;
+declare type ExtendTableItemProps<T = any> = BaseItemProps & TableColumnProps<T>;
 declare type TableProps<T = any, ExtendTypes = any> = {
     items: (TableItemProps | (ExtendTypes & ExtendTableItemProps))[];
     extendTypes?: {
@@ -142,4 +135,4 @@ declare type TableProps<T = any, ExtendTypes = any> = {
 } & TableProps$1<T>;
 declare function Table<T = any, ExtendTypes = any>(props: TableProps<T, ExtendTypes>): JSX.Element;
 
-export { BaseItemType, Blank, Description, DescriptionItemProps, DescriptionProps, ExtendDescriptionItemProps, ExtendDescriptionTypeProps, ExtendFormItemProps, ExtendFormTypeProps, ExtendTableItemProps, ExtendTableTypeProps, FaasItemProps, FaasItemType, FaasItemTypeValue, Form, FormItem, FormItemProps, FormProps, Table, TableItemProps, TableProps };
+export { BaseItemProps, BaseOption, Blank, Description, DescriptionItemProps, DescriptionProps, ExtendDescriptionItemProps, ExtendDescriptionTypeProps, ExtendFormItemProps, ExtendFormTypeProps, ExtendTableItemProps, ExtendTableTypeProps, FaasItemProps, FaasItemType, FaasItemTypeValue, Form, FormItem, FormItemProps, FormProps, Table, TableItemProps, TableProps, transferOptions };

package/dist/index.js

@@ -50,7 +50,8 @@ __export(src_exports, {
   Description: () => Description,
   Form: () => Form,
   FormItem: () => FormItem,
-  Table: () => Table
+  Table: () => Table,
+  transferOptions: () => transferOptions
 });
 
 // react-shim.js
@@ -67,10 +68,21 @@ function Blank(options) {
   }, (options == null ? void 0 : options.text) || text) : options.value;
 }
 
+// src/data.ts
+var import_lodash2 = require("lodash");
+function transferOptions(options) {
+  if (!options)
+    return [];
+  return options.map((item) => typeof item === "object" ? item : {
+    label: (0, import_lodash2.upperFirst)(item.toString()),
+    value: item
+  });
+}
+
 // src/Description.tsx
 var import_icons = require("@ant-design/icons");
 var import_antd2 = require("antd");
-var import_lodash2 = require("lodash");
+var import_lodash3 = require("lodash");
 var import_react4 = require("react");
 
 // src/FaasWrapper.tsx
@@ -99,20 +111,23 @@ function FaasDataWrapper({
 function DescriptionItemContent(props) {
   const [computedProps, setComputedProps] = (0, import_react4.useState)();
   (0, import_react4.useEffect)(() => {
-    var _a2;
+    var _a2, _b;
     const propsCopy = __spreadValues({}, props);
     if (!propsCopy.item.title)
-      propsCopy.item.title = (0, import_lodash2.upperFirst)(propsCopy.item.id);
+      propsCopy.item.title = (0, import_lodash3.upperFirst)(propsCopy.item.id);
     if (!propsCopy.item.type)
       propsCopy.item.type = "string";
-    if (props.item.options && typeof props.value !== "undefined" && props.value !== null) {
-      if (props.item.type.endsWith("[]"))
-        propsCopy.value = props.value.map((v) => {
+    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 _a3;
-          return ((_a3 = props.item.options.find((option) => option.value === v)) == null ? void 0 : _a3.label) || v;
+          return ((_a3 = propsCopy.item.options.find((option) => option.value === v)) == null ? void 0 : _a3.label) || v;
         });
       else
-        propsCopy.value = ((_a2 = props.item.options.find((option) => option.value === props.value)) == null ? void 0 : _a2.label) || props.value;
+        propsCopy.value = ((_b = props.item.options.find((option) => option.value === props.value)) == null ? void 0 : _b.label) || props.value;
     }
     setComputedProps(propsCopy);
   }, [props]);
@@ -163,7 +178,7 @@ function Description(props) {
     faasData: props.faasData,
     render: ({ data }) => /* @__PURE__ */ import_react.default.createElement(import_antd2.Descriptions, __spreadValues({}, props), props.items.map((item) => /* @__PURE__ */ import_react.default.createElement(import_antd2.Descriptions.Item, {
       key: item.id,
-      label: item.title || (0, import_lodash2.upperFirst)(item.id)
+      label: item.title || (0, import_lodash3.upperFirst)(item.id)
     }, /* @__PURE__ */ import_react.default.createElement(DescriptionItemContent, {
       item,
       value: data[item.id],
@@ -180,13 +195,13 @@ var import_antd4 = require("antd");
 var import_antd3 = require("antd");
 var import_icons2 = require("@ant-design/icons");
 var import_react5 = require("react");
-var import_lodash3 = require("lodash");
+var import_lodash4 = require("lodash");
 function FormItem(props) {
   const [computedProps, setComputedProps] = (0, import_react5.useState)();
   (0, import_react5.useEffect)(() => {
     const propsCopy = __spreadValues({}, props);
     if (!propsCopy.title)
-      propsCopy.title = (0, import_lodash3.upperFirst)(propsCopy.id);
+      propsCopy.title = (0, import_lodash4.upperFirst)(propsCopy.id);
     if (!propsCopy.label && props.label !== false)
       propsCopy.label = propsCopy.title;
     if (!propsCopy.name)
@@ -212,20 +227,8 @@ function FormItem(props) {
     }
     if (!propsCopy.input)
       propsCopy.input = {};
-    if (propsCopy.options) {
-      const options = [];
-      if (propsCopy.options.length > 0)
-        for (const option of propsCopy.options) {
-          if (typeof option === "object")
-            options.push(option);
-          else
-            options.push({
-              label: (0, import_lodash3.upperFirst)(option.toString()),
-              value: option
-            });
-        }
-      propsCopy.input.options = options;
-    }
+    if (propsCopy.options)
+      propsCopy.input.options = transferOptions(propsCopy.options);
     switch (propsCopy.type) {
       case "boolean":
         propsCopy.valuePropName = "checked";
@@ -349,7 +352,7 @@ Form.Item = FormItem;
 var import_react6 = require("react");
 var import_antd5 = require("antd");
 var import_icons3 = require("@ant-design/icons");
-var import_lodash4 = require("lodash");
+var import_lodash5 = require("lodash");
 function processValue(item, value) {
   var _a2;
   if (item.options && typeof value !== "undefined" && value !== null) {
@@ -366,15 +369,23 @@ function processValue(item, value) {
 function Table(props) {
   const [columns, setColumns] = (0, import_react6.useState)();
   (0, import_react6.useEffect)(() => {
+    var _a2;
     for (const item of props.items) {
       if (!item.key)
         item.key = item.id;
       if (!item.dataIndex)
         item.dataIndex = item.id;
       if (!item.title)
-        item.title = (0, import_lodash4.upperFirst)(item.id);
+        item.title = (0, import_lodash5.upperFirst)(item.id);
       if (!item.type)
         item.type = "string";
+      if ((_a2 = item.options) == null ? void 0 : _a2.length) {
+        item.options = transferOptions(item.options);
+        item.filters = item.options.map((o) => ({
+          text: o.label,
+          value: o.value
+        }));
+      }
       if (item.render)
         continue;
       if (props.extendTypes && props.extendTypes[item.type]) {
@@ -419,7 +430,7 @@ function Table(props) {
               selectedKeys,
               confirm
             }) => {
-              var _a2, _b;
+              var _a3, _b;
               return /* @__PURE__ */ import_react.default.createElement(import_antd5.Radio.Group, {
                 style: { padding: 8 },
                 buttonStyle: "solid",
@@ -428,7 +439,7 @@ function Table(props) {
                   setSelectedKeys(e.target.value ? [e.target.value] : []);
                   confirm();
                 }
-              }, /* @__PURE__ */ import_react.default.createElement(import_antd5.Radio.Button, null, ((_a2 = navigator.language) == null ? void 0 : _a2.includes("CN")) ? "\u5168\u90E8" : "All"), /* @__PURE__ */ import_react.default.createElement(import_antd5.Radio.Button, {
+              }, /* @__PURE__ */ import_react.default.createElement(import_antd5.Radio.Button, null, ((_a3 = navigator.language) == null ? void 0 : _a3.includes("CN")) ? "\u5168\u90E8" : "All"), /* @__PURE__ */ import_react.default.createElement(import_antd5.Radio.Button, {
                 value: "true"
               }, /* @__PURE__ */ import_react.default.createElement(import_icons3.CheckOutlined, {
                 style: {
@@ -450,11 +461,11 @@ function Table(props) {
             item.onFilter = (value, row) => {
               switch (value) {
                 case "true":
-                  return !(0, import_lodash4.isNil)(row[item.id]) && !!row[item.id];
+                  return !(0, import_lodash5.isNil)(row[item.id]) && !!row[item.id];
                 case "false":
-                  return !(0, import_lodash4.isNil)(row[item.id]) && !row[item.id];
+                  return !(0, import_lodash5.isNil)(row[item.id]) && !row[item.id];
                 case "empty":
-                  return (0, import_lodash4.isNil)(row[item.id]);
+                  return (0, import_lodash5.isNil)(row[item.id]);
                 default:
                   return true;
               }
@@ -486,5 +497,6 @@ module.exports = __toCommonJS(src_exports);
   Description,
   Form,
   FormItem,
-  Table
+  Table,
+  transferOptions
 });

package/dist/index.mjs

@@ -32,10 +32,21 @@ function Blank(options) {
   }, (options == null ? void 0 : options.text) || text) : options.value;
 }
 
+// src/data.ts
+import { upperFirst } from "lodash";
+function transferOptions(options) {
+  if (!options)
+    return [];
+  return options.map((item) => typeof item === "object" ? item : {
+    label: upperFirst(item.toString()),
+    value: item
+  });
+}
+
 // src/Description.tsx
 import { CheckOutlined, CloseOutlined } from "@ant-design/icons";
 import { Descriptions } from "antd";
-import { upperFirst } from "lodash";
+import { upperFirst as upperFirst2 } from "lodash";
 import {
   cloneElement,
   useEffect as useEffect2,
@@ -68,20 +79,23 @@ function FaasDataWrapper({
 function DescriptionItemContent(props) {
   const [computedProps, setComputedProps] = useState2();
   useEffect2(() => {
-    var _a2;
+    var _a2, _b;
     const propsCopy = __spreadValues({}, props);
     if (!propsCopy.item.title)
-      propsCopy.item.title = upperFirst(propsCopy.item.id);
+      propsCopy.item.title = upperFirst2(propsCopy.item.id);
     if (!propsCopy.item.type)
       propsCopy.item.type = "string";
-    if (props.item.options && typeof props.value !== "undefined" && props.value !== null) {
-      if (props.item.type.endsWith("[]"))
-        propsCopy.value = props.value.map((v) => {
+    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 _a3;
-          return ((_a3 = props.item.options.find((option) => option.value === v)) == null ? void 0 : _a3.label) || v;
+          return ((_a3 = propsCopy.item.options.find((option) => option.value === v)) == null ? void 0 : _a3.label) || v;
         });
       else
-        propsCopy.value = ((_a2 = props.item.options.find((option) => option.value === props.value)) == null ? void 0 : _a2.label) || props.value;
+        propsCopy.value = ((_b = props.item.options.find((option) => option.value === props.value)) == null ? void 0 : _b.label) || props.value;
     }
     setComputedProps(propsCopy);
   }, [props]);
@@ -132,7 +146,7 @@ function Description(props) {
     faasData: props.faasData,
     render: ({ data }) => /* @__PURE__ */ React.createElement(Descriptions, __spreadValues({}, props), props.items.map((item) => /* @__PURE__ */ React.createElement(Descriptions.Item, {
       key: item.id,
-      label: item.title || upperFirst(item.id)
+      label: item.title || upperFirst2(item.id)
     }, /* @__PURE__ */ React.createElement(DescriptionItemContent, {
       item,
       value: data[item.id],
@@ -164,13 +178,13 @@ import {
   useEffect as useEffect3,
   useState as useState3
 } from "react";
-import { upperFirst as upperFirst2 } from "lodash";
+import { upperFirst as upperFirst3 } from "lodash";
 function FormItem(props) {
   const [computedProps, setComputedProps] = useState3();
   useEffect3(() => {
     const propsCopy = __spreadValues({}, props);
     if (!propsCopy.title)
-      propsCopy.title = upperFirst2(propsCopy.id);
+      propsCopy.title = upperFirst3(propsCopy.id);
     if (!propsCopy.label && props.label !== false)
       propsCopy.label = propsCopy.title;
     if (!propsCopy.name)
@@ -196,20 +210,8 @@ function FormItem(props) {
     }
     if (!propsCopy.input)
       propsCopy.input = {};
-    if (propsCopy.options) {
-      const options = [];
-      if (propsCopy.options.length > 0)
-        for (const option of propsCopy.options) {
-          if (typeof option === "object")
-            options.push(option);
-          else
-            options.push({
-              label: upperFirst2(option.toString()),
-              value: option
-            });
-        }
-      propsCopy.input.options = options;
-    }
+    if (propsCopy.options)
+      propsCopy.input.options = transferOptions(propsCopy.options);
     switch (propsCopy.type) {
       case "boolean":
         propsCopy.valuePropName = "checked";
@@ -340,7 +342,7 @@ import {
   Radio
 } from "antd";
 import { CheckOutlined as CheckOutlined2, CloseOutlined as CloseOutlined2 } from "@ant-design/icons";
-import { isNil as isNil2, upperFirst as upperFirst3 } from "lodash";
+import { isNil as isNil2, upperFirst as upperFirst4 } from "lodash";
 function processValue(item, value) {
   var _a2;
   if (item.options && typeof value !== "undefined" && value !== null) {
@@ -357,15 +359,23 @@ function processValue(item, value) {
 function Table(props) {
   const [columns, setColumns] = useState4();
   useEffect4(() => {
+    var _a2;
     for (const item of props.items) {
       if (!item.key)
         item.key = item.id;
       if (!item.dataIndex)
         item.dataIndex = item.id;
       if (!item.title)
-        item.title = upperFirst3(item.id);
+        item.title = upperFirst4(item.id);
       if (!item.type)
         item.type = "string";
+      if ((_a2 = item.options) == null ? void 0 : _a2.length) {
+        item.options = transferOptions(item.options);
+        item.filters = item.options.map((o) => ({
+          text: o.label,
+          value: o.value
+        }));
+      }
       if (item.render)
         continue;
       if (props.extendTypes && props.extendTypes[item.type]) {
@@ -410,7 +420,7 @@ function Table(props) {
               selectedKeys,
               confirm
             }) => {
-              var _a2, _b;
+              var _a3, _b;
               return /* @__PURE__ */ React.createElement(Radio.Group, {
                 style: { padding: 8 },
                 buttonStyle: "solid",
@@ -419,7 +429,7 @@ function Table(props) {
                   setSelectedKeys(e.target.value ? [e.target.value] : []);
                   confirm();
                 }
-              }, /* @__PURE__ */ React.createElement(Radio.Button, null, ((_a2 = navigator.language) == null ? void 0 : _a2.includes("CN")) ? "\u5168\u90E8" : "All"), /* @__PURE__ */ React.createElement(Radio.Button, {
+              }, /* @__PURE__ */ React.createElement(Radio.Button, null, ((_a3 = navigator.language) == null ? void 0 : _a3.includes("CN")) ? "\u5168\u90E8" : "All"), /* @__PURE__ */ React.createElement(Radio.Button, {
                 value: "true"
               }, /* @__PURE__ */ React.createElement(CheckOutlined2, {
                 style: {
@@ -475,5 +485,6 @@ export {
   Description,
   Form,
   FormItem,
-  Table
+  Table,
+  transferOptions
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/ant-design",
-  "version": "0.0.2-beta.345",
+  "version": "0.0.2-beta.346",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,7 +27,7 @@
     "lodash": "*",
     "react": "*",
     "react-dom": "*",
-    "@faasjs/react": "^0.0.2-beta.345"
+    "@faasjs/react": "^0.0.2-beta.346"
   },
   "devDependencies": {
     "@types/lodash": "*",