@power-xa/m-ui 0.0.1 → 0.0.3

package/dist/ProForm/Form/index.js

@@ -10,72 +10,181 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { cloneElement, Fragment, useCallback, useEffect, useState } from "react";
+import React, { cloneElement, forwardRef, Fragment, useCallback, useEffect, useImperativeHandle, useState } from "react";
 import { getWindowInfo, showToast } from "@tarojs/taro";
 import { ScrollView, Text, View } from "@tarojs/components";
-import { Button, ActionSheet } from "../..";
+import { Button, ActionSheet, getObjectPathValue, setObjectPathValue } from "../..";
 import "./index.less";
-var ProForm = function ProForm(_ref) {
-  var children = _ref.children,
-    _ref$className = _ref.className,
-    className = _ref$className === void 0 ? "" : _ref$className,
+var ProForm = function ProForm(_ref, ref) {
+  var className = _ref.className,
+    children = _ref.children,
     _ref$initialValues = _ref.initialValues,
     initialValues = _ref$initialValues === void 0 ? {} : _ref$initialValues,
     onOk = _ref.onOk,
     onDelete = _ref.onDelete,
     onSave = _ref.onSave,
+    footer = _ref.footer,
     disabled = _ref.disabled;
   var _getWindowInfo = getWindowInfo(),
     safeArea = _getWindowInfo.safeArea;
   var _ref2 = safeArea,
     height = _ref2.height,
     bottom = _ref2.bottom;
-  var _useState = useState([]),
+  var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
-    elementList = _useState2[0],
-    setElementList = _useState2[1];
-  var _useState3 = useState({}),
-    _useState4 = _slicedToArray(_useState3, 2),
-    form = _useState4[0],
-    setForm = _useState4[1];
+    form = _useState2[0],
+    setForm = _useState2[1];
   useEffect(function () {
     if (initialValues && JSON.stringify(initialValues) !== "{}") {
       setForm(initialValues || {});
     }
   }, [initialValues]);
-  useEffect(function () {
-    if (children instanceof Array) {
-      setElementList(children);
-    } else {
-      setElementList([children]);
+  useImperativeHandle(ref, function () {
+    return {
+      form: form,
+      setForm: setForm
+    };
+  });
+  var getProFormListControlsList = useCallback(function (el, name, i, list) {
+    if (el.props) {
+      if (el.props.name) {
+        list.push( /*#__PURE__*/cloneElement(el, _objectSpread(_objectSpread({}, el.props), {}, {
+          value: getObjectPathValue(el.props.name, form[name][i])
+        })));
+      } else {
+        if (el.props.children instanceof Array) {
+          el.props.children.map(function (item) {
+            return getProFormListControlsList(item, name, i, list);
+          });
+        } else {
+          getProFormListControlsList(el.props.children, name, i, list);
+        }
+      }
     }
-  }, [children]);
-  var saveForm = useCallback(function () {
-    var controlList = elementList.map(function (e) {
-      return e.props.children instanceof Array ? e.props.children.map(function (c) {
-        return c.props;
-      }) : [e.props.children];
+  }, [form]);
+  var getControlsList = useCallback(function (list) {
+    return list.map(function (item) {
+      if (item.props.children) {
+        if (item.props.children instanceof Array) return getControlsList(item.props.children.map(function (e) {
+          return /*#__PURE__*/cloneElement(e, _objectSpread(_objectSpread({}, e.props), {}, {
+            value: getObjectPathValue(e.props.name, form)
+          }));
+        }));
+        if (item.props.children instanceof Function) {
+          var _form$item$props$name;
+          var _list = [];
+          (_form$item$props$name = form[item.props.name]) === null || _form$item$props$name === void 0 || _form$item$props$name.map(function (e, i) {
+            return getProFormListControlsList(item.props.children({}, {}), item.props.name, i, _list);
+          });
+          return getControlsList([/*#__PURE__*/cloneElement(item, _objectSpread(_objectSpread({}, item.props), {}, {
+            children: null,
+            value: getObjectPathValue(item.props.name, form)
+          }))].concat(_list));
+        }
+        return getControlsList([/*#__PURE__*/cloneElement(item.props.children, _objectSpread(_objectSpread({}, item.props.children.props), {}, {
+          value: getObjectPathValue(item.props.name, form)
+        }))]);
+      }
+      return /*#__PURE__*/cloneElement(item, _objectSpread(_objectSpread({}, item.props), {}, {
+        value: [undefined, null].includes(item.props.value) ? getObjectPathValue(item.props.name, form) : item.props.value
+      }));
     }).flat();
-    var requiredList = controlList.filter(function (item) {
-      var _item$rules;
-      return item.name && !item.hidden && (item.required || ((_item$rules = item.rules) === null || _item$rules === void 0 ? void 0 : _item$rules.some(function (r) {
-        return r.required;
-      })));
-    });
-    var condition = function condition(item) {
-      return form[item.name] === undefined || form[item.name] instanceof Array && !form[item.name].length;
-    };
-    if (requiredList.some(condition)) {
-      var _requiredList$find, _requiredList$find2;
-      return showToast({
-        title: ((_requiredList$find = requiredList.find(condition)) === null || _requiredList$find === void 0 || (_requiredList$find = _requiredList$find.rules) === null || _requiredList$find === void 0 || (_requiredList$find = _requiredList$find.find(function (r) {
+  }, [form]);
+  var validFormRequired = useCallback(function (formList) {
+    /* 必填校验 */
+    return new Promise(function (resolve, reject) {
+      var requiredList = formList.filter(function (item) {
+        var _item$rules;
+        return (((_item$rules = item.rules) === null || _item$rules === void 0 ? void 0 : _item$rules.some(function (r) {
           return r.required;
-        })) === null || _requiredList$find === void 0 ? void 0 : _requiredList$find.message) || ((_requiredList$find2 = requiredList.find(condition)) === null || _requiredList$find2 === void 0 ? void 0 : _requiredList$find2.label) + "必填",
-        icon: "error"
+        })) || item.required) && !item.hidden && item.name;
       });
-    }
-    onOk === null || onOk === void 0 || onOk(form);
-  }, [elementList, form]);
+      var condition = function condition(item) {
+        return [undefined, null, ""].includes(item.value) || item.value instanceof Array && !item.value.length;
+      };
+      if (requiredList.some(condition)) {
+        var _form = requiredList.find(condition);
+        if (_form) {
+          var _form$rules;
+          var message = ((_form$rules = _form.rules) === null || _form$rules === void 0 || (_form$rules = _form$rules.find(function (r) {
+            return r.required;
+          })) === null || _form$rules === void 0 ? void 0 : _form$rules.message) || _form.label + "必填";
+          showToast({
+            title: message,
+            icon: "none"
+          });
+          reject(message);
+        }
+      } else {
+        resolve();
+      }
+    });
+  }, []);
+  var validFormRegExp = useCallback(function (formList) {
+    /* 正则校验 */
+    return new Promise(function (resolve, reject) {
+      var patternList = formList.filter(function (item) {
+        var _item$rules2;
+        return ((_item$rules2 = item.rules) === null || _item$rules2 === void 0 ? void 0 : _item$rules2.some(function (r) {
+          return r.pattern;
+        })) && item.name && !item.hidden && item.value;
+      });
+      var condition = function condition(item) {
+        var _item$rules3;
+        var list = (_item$rules3 = item.rules) === null || _item$rules3 === void 0 ? void 0 : _item$rules3.filter(function (r) {
+          return r.pattern;
+        }).map(function (r) {
+          r.pattern.lastIndex = 0;
+          return r.pattern;
+        });
+        return list === null || list === void 0 ? void 0 : list.some(function (p) {
+          return !(p !== null && p !== void 0 && p.test(item.value));
+        });
+      };
+      if (patternList.some(condition)) {
+        var _form2 = patternList.find(condition);
+        if (_form2) {
+          var _form2$rules;
+          var message = (_form2 === null || _form2 === void 0 || (_form2$rules = _form2.rules) === null || _form2$rules === void 0 || (_form2$rules = _form2$rules.find(function (r) {
+            return r.pattern;
+          })) === null || _form2$rules === void 0 ? void 0 : _form2$rules.message) || _form2.label + "格式有误";
+          showToast({
+            title: message,
+            icon: "none"
+          });
+          reject(message);
+        }
+      } else {
+        resolve();
+      }
+    });
+  }, []);
+  var saveForm = useCallback(function () {
+    var formList = getControlsList(children instanceof Array ? children : [children]).map(function (item) {
+      return item.props;
+    });
+    validFormRequired(formList);
+    validFormRegExp(formList);
+    Promise.all([validFormRequired(formList), validFormRegExp(formList)]).then(function () {
+      return onOk === null || onOk === void 0 ? void 0 : onOk(form);
+    });
+  }, [form]);
+  var renderContent = useCallback(function () {
+    var elementList = children instanceof Array ? children : [children];
+    return elementList.map(function (e, i) {
+      return /*#__PURE__*/cloneElement(e, _objectSpread(_objectSpread({}, e.props), {}, {
+        key: 'p-pro-form-group-' + i,
+        disabled: disabled || e.props.disabled,
+        form: form,
+        onChange: function onChange(key, value) {
+          return setForm(function (form) {
+            setObjectPathValue(key, value, form);
+            return _objectSpread({}, form);
+          });
+        }
+      }));
+    });
+  }, [form, children, disabled]);
   return /*#__PURE__*/React.createElement(View, {
     className: "p-pro-form-container ".concat(className)
   }, /*#__PURE__*/React.createElement(ScrollView, {
@@ -86,24 +195,12 @@ var ProForm = function ProForm(_ref) {
     showScrollbar: false
   }, /*#__PURE__*/React.createElement(View, {
     className: "p-pro-form-scroll-view-content"
-  }, elementList.map(function (e, i) {
-    return /*#__PURE__*/cloneElement(e, {
-      key: 'p-pro-form-group-' + i,
-      disabled: disabled || e.props.disabled,
-      initialValues: form,
-      onChange: function onChange(key, value) {
-        return setForm(function (form) {
-          form[key] = value;
-          return _objectSpread({}, form);
-        });
-      }
-    });
-  }))), (onOk || onSave || onDelete) && /*#__PURE__*/React.createElement(View, {
+  }, renderContent())), (onOk || onSave || onDelete || footer) && /*#__PURE__*/React.createElement(View, {
     className: "p-pro-form-footer",
     style: {
       paddingBottom: "".concat(bottom - height > 24 ? bottom - height : 24, "rpx")
     }
-  }, onSave || onDelete ? /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(View, {
+  }, footer ? footer : onSave || onDelete ? /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(View, {
     className: "button-group"
   }, onDelete && /*#__PURE__*/React.createElement(ActionSheet, {
     options: [{
@@ -142,4 +239,4 @@ var ProForm = function ProForm(_ref) {
     onTap: saveForm
   }, "\u4FDD\u5B58")));
 };
-export default ProForm;
+export default /*#__PURE__*/forwardRef(ProForm);

package/dist/ProForm/Group/index.js

@@ -4,58 +4,44 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { cloneElement, useEffect, useState } from "react";
+import React, { cloneElement, useCallback } from "react";
 import { Text, View } from "@tarojs/components";
-import { getListAssignField } from "../..";
+import { getListAssignField, getObjectPathValue } from "../..";
 import "./index.less";
 var ProFormGroup = function ProFormGroup(_ref) {
-  var _ref$className = _ref.className,
-    className = _ref$className === void 0 ? "" : _ref$className,
+  var className = _ref.className,
+    hidden = _ref.hidden,
+    tag = _ref.tag,
+    form = _ref.form,
     children = _ref.children,
     disabled = _ref.disabled,
-    initialValues = _ref.initialValues,
-    _onChange = _ref.onChange,
-    hidden = _ref.hidden,
-    tag = _ref.tag;
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    elementList = _useState2[0],
-    setElementList = _useState2[1];
-  useEffect(function () {
-    if (children instanceof Array) {
-      setElementList(children);
-    } else {
-      setElementList([children]);
-    }
-  }, [children]);
+    _onChange = _ref.onChange;
+  var renderContent = useCallback(function () {
+    var elementList = children instanceof Array ? children : [children];
+    return elementList.map(function (e, i) {
+      return /*#__PURE__*/cloneElement(e, _objectSpread(_objectSpread({}, e.props), {}, {
+        key: e.props.name,
+        className: "".concat(e.props["className"], " ").concat(i === elementList.length - 1 ? 'p-pro-form-item-last' : ""),
+        disabled: disabled || e.props.disabled,
+        hidden: hidden || e.props.hidden,
+        value: form && getObjectPathValue(e.props.name, form),
+        onChange: function onChange(value) {
+          var _e$props$onChange, _e$props;
+          (_e$props$onChange = (_e$props = e.props).onChange) === null || _e$props$onChange === void 0 || _e$props$onChange.call(_e$props, value);
+          _onChange === null || _onChange === void 0 || _onChange(e.props.name, value);
+        },
+        getFormValue: function getFormValue(key) {
+          return form === null || form === void 0 ? void 0 : form[key];
+        }
+      }));
+    });
+  }, [form, children, disabled, hidden]);
   return /*#__PURE__*/React.createElement(View, {
     className: "p-pro-form-group-container ".concat(className, " ").concat(hidden ? 'hidden' : '')
-  }, elementList.map(function (e, i) {
-    return /*#__PURE__*/cloneElement(e, {
-      key: e.props.name,
-      className: "".concat(e.props["className"], " ").concat(i === elementList.length - 1 ? 'p-pro-form-item-last' : ""),
-      disabled: disabled || e.props.disabled,
-      hidden: hidden || e.props.hidden,
-      value: initialValues === null || initialValues === void 0 ? void 0 : initialValues[e.props.name],
-      onChange: function onChange(value) {
-        var _e$props$onChange, _e$props;
-        (_e$props$onChange = (_e$props = e.props).onChange) === null || _e$props$onChange === void 0 || _e$props$onChange.call(_e$props, value);
-        _onChange === null || _onChange === void 0 || _onChange(e.props.name, value);
-      },
-      getFormValue: function getFormValue(key) {
-        return initialValues === null || initialValues === void 0 ? void 0 : initialValues[key];
-      }
-    });
-  }), tag && (initialValues === null || initialValues === void 0 ? void 0 : initialValues[tag.dataIndex]) && /*#__PURE__*/React.createElement(View, {
+  }, renderContent(), tag && (form === null || form === void 0 ? void 0 : form[tag.dataIndex]) && /*#__PURE__*/React.createElement(View, {
     className: "p-pro-form-group-tag ".concat(tag.className || ""),
     style: _objectSpread(_objectSpread({}, tag.position), {}, {
-      backgroundColor: getListAssignField(initialValues[tag.dataIndex], tag.map, {
+      backgroundColor: getListAssignField(form[tag.dataIndex], tag.map, {
         value: "value",
         label: "background"
       })
@@ -63,11 +49,11 @@ var ProFormGroup = function ProFormGroup(_ref) {
   }, /*#__PURE__*/React.createElement(Text, {
     className: "p-pro-form-group-tag-text",
     style: {
-      color: getListAssignField(initialValues[tag.dataIndex], tag.map, {
+      color: getListAssignField(form[tag.dataIndex], tag.map, {
         value: "value",
         label: "color"
       })
     }
-  }, getListAssignField(initialValues[tag.dataIndex], tag.map))));
+  }, getListAssignField(form[tag.dataIndex], tag.map))));
 };
 export default ProFormGroup;

package/dist/ProForm/index.d.ts

@@ -1,9 +1,7 @@
 import OriginProForm from "./Form";
 import ProFormGroup from "./Group";
-import ProFormField from "./Field";
 type ProFormType = typeof OriginProForm & {
     Group: typeof ProFormGroup;
-    Field: typeof ProFormField;
 };
 declare const ProForm: ProFormType;
 export default ProForm;

package/dist/ProForm/typings.d.ts

@@ -10,10 +10,12 @@ declare namespace ProFormAPI {
         onOk?: (result: { [key: string]: any }) => void;
         onDelete?: false | ((result: { [key: string]: any }) => void);
         onSave?: false | ((result: { [key: string]: any }) => void);
+        onChange?: (form: { [key: string]: any }) => void;
+        onValueChange?: (field: string, value: { [key: string]: any }) => void;
     };
 
     type IOptionItem = {
-        value: string;
+        value: string | boolean | number | null;
         label: string;
         color?: string;
         background?: string;
@@ -23,7 +25,7 @@ declare namespace ProFormAPI {
         onChange?: (key: string, value: any) => void;
         className?: string;
         disabled?: boolean;
-        initialValues?: { [key: string]: any };
+        form?: { [key: string]: any };
         hidden?: boolean;
         tag?: {
             dataIndex: string;
@@ -77,13 +79,24 @@ declare namespace ProFormAPI {
         idcardpad
     }
 
+    type ProFormItemRule = {
+        /* 消息提示 */
+        message?: string;
+        /* 校验正则 */
+        pattern?: RegExp;
+        /* 是否必填 */
+        required?: boolean;
+    }
+
     type ProFormItemProps = {
+        /* flex占比 */
+        flex?: number;
         /* 对齐方式 */
         layout?: "horizontal" | "vertical";
         /* 表单Key */
-        name?: string;
+        name?: string | string[];
         /* 表单文字 */
-        label?: string;
+        label?: any;
         /* 依赖字段 */
         dependencies?: string;
         /* 是否隐藏字段 */
@@ -93,14 +106,7 @@ declare namespace ProFormAPI {
         /* 是否必填 */
         required?: boolean;
         /* 校验规则 */
-        rules?: {
-            /* 消息提示 */
-            message?: string;
-            /* 校验正则 */
-            pattern?: RegExp;
-            /* 是否必填 */
-            required?: boolean;
-        }[];
+        rules?: ProFormItemRule[];
         /* 自定义字段更新 */
         shouldUpdate?: boolean | ((prevValue: any, curValue: any) => boolean);
         /* 类名 */
@@ -157,8 +163,4 @@ declare namespace ProFormAPI {
         /* 推荐内容 */
         recommend?: string[];
     }
-
-    type ProFormListProps = {
-        
-    }
 }

package/dist/ProList/index.d.ts

@@ -58,7 +58,7 @@ export type ProListProps = {
         tag?: MetaProps & {
             map?: {
                 label: string;
-                value: string;
+                value: string | boolean | number | null;
                 color?: string;
                 background?: string;
             }[];

package/dist/ProList/index.js

@@ -13,6 +13,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { forwardRef, Fragment, useCallback, useEffect, useImperativeHandle, useState } from "react";
 import { Image, ScrollView, Swiper, SwiperItem, Text, View } from "@tarojs/components";
 import { getListAssignField, getSimplifyDay, Skeleton } from "./..";
+import { useDebounceEffect } from "ahooks";
 import { useConfig } from "../ConfigProvider";
 import { FileController } from "../services";
 import "./index.less";
@@ -48,36 +49,57 @@ var ProList = function ProList(_ref, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
-  /* 数据列表 */
-  var _useState5 = useState([]),
+  /* 过滤条件 */
+  var _useState5 = useState({}),
     _useState6 = _slicedToArray(_useState5, 2),
-    list = _useState6[0],
-    setList = _useState6[1];
-  /* 数据总量 */
-  var _useState7 = useState(0),
+    filterParams = _useState6[0],
+    _setFilterParams = _useState6[1];
+  /* 数据列表 */
+  var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    total = _useState8[0],
-    setTotal = _useState8[1];
+    list = _useState8[0],
+    setList = _useState8[1];
+  /* 数据总量 */
+  var _useState9 = useState(0),
+    _useState10 = _slicedToArray(_useState9, 2),
+    total = _useState10[0],
+    setTotal = _useState10[1];
   useEffect(function () {
     if (dataSources instanceof Array) {
       setList(dataSources);
       setLoading(false);
-    } else {
-      getList(1);
     }
   }, [dataSources]);
   useEffect(function () {
     if (refreshing) getList(1);
   }, [refreshing]);
+  useEffect(function () {
+    if (params) _setFilterParams(_objectSpread({}, params));
+  }, [params]);
+  useDebounceEffect(function () {
+    if (!(dataSources instanceof Array)) {
+      setLoading(true);
+      getList(1);
+    }
+  }, [filterParams], {
+    wait: 200
+  });
   useImperativeHandle(ref, function () {
     return {
       onRefresh: function onRefresh() {
         return setRefreshing(true);
+      },
+      setFilterParams: function setFilterParams(p) {
+        if ("{}" === JSON.stringify(p)) {
+          _setFilterParams(params || {});
+        } else {
+          _setFilterParams(_objectSpread(_objectSpread({}, filterParams), p));
+        }
       }
     };
   });
   var getList = useCallback(function (current) {
-    request === null || request === void 0 || request(_objectSpread(_objectSpread({}, params), {}, {
+    request === null || request === void 0 || request(_objectSpread(_objectSpread({}, filterParams), {}, {
       current: current,
       size: size
     })).then(function (result) {
@@ -100,18 +122,18 @@ var ProList = function ProList(_ref, ref) {
             });
             setList(current === 1 ? dataList : list.concat(dataList));
             setTotal(total);
-            if (loading) setLoading(false);
+            setLoading(false);
             if (refreshing) setRefreshing(false);
           }
         });
       } else {
         setList(current === 1 ? dataList : list.concat(dataList));
         setTotal(total);
-        if (loading) setLoading(false);
+        setLoading(false);
         if (refreshing) setRefreshing(false);
       }
     });
-  }, [refreshing]);
+  }, [refreshing, filterParams, loading, list]);
   var renderSkeleton = useCallback(function () {
     return Array(size).fill(null).map(function (item, index) {
       var _meta$tag, _meta$tag2, _meta$fileList, _meta$fileList2, _meta$title, _meta$title2, _meta$subTitle, _meta$subTitle2, _meta$fileList3, _meta$fileList4;

package/dist/SearchInput/index.d.ts

@@ -0,0 +1,9 @@
+import { FC } from "react";
+import "./index.less";
+type SearchInputProps = {
+    className?: string;
+    placeholder?: string;
+    onSearch: (value: string) => void;
+};
+declare const SearchInput: FC<SearchInputProps>;
+export default SearchInput;

package/dist/SearchInput/index.js

@@ -0,0 +1,22 @@
+import React from "react";
+import { Input, View } from "@tarojs/components";
+import "./index.less";
+var SearchInput = function SearchInput(_ref) {
+  var className = _ref.className,
+    placeholder = _ref.placeholder,
+    onSearch = _ref.onSearch;
+  return /*#__PURE__*/React.createElement(View, {
+    className: "p-search-input-container ".concat(className)
+  }, /*#__PURE__*/React.createElement(View, {
+    className: "iconfont icon-icon-psp-sousuo"
+  }), /*#__PURE__*/React.createElement(Input, {
+    placeholder: placeholder || "搜索",
+    confirmType: "search",
+    onConfirm: function onConfirm(e) {
+      return onSearch(e.detail.value);
+    },
+    placeholderClass: "p-search-input-placeholder",
+    className: "p-search-input"
+  }));
+};
+export default SearchInput;

package/dist/SearchInput/index.less

@@ -0,0 +1,29 @@
+@import "@power-xa/m-ui/dist/assets/less/mixins.less";
+
+.p-search-input-container {
+    padding: 18px 32px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    background: #fff;
+    border-radius: 100px;
+    gap: 12px;
+
+    .iconfont {
+        font-size: 24px;
+        color: #333437;
+    }
+
+    .p-search-input {
+        flex: 1;
+        width: 0;
+        height: 40px;
+        min-height: 40px;
+        .font(28, #333437);
+    }
+
+    .p-search-input-placeholder {
+        display: block;
+        .font(28, #999);
+    }
+}

package/dist/index.d.ts

@@ -15,11 +15,14 @@ export { default as ConfigProvider } from './ConfigProvider';
 export { default as CreatorEdit } from './CreatorEdit';
 export { default as Empty } from './Empty';
 export { default as ActionSheet } from './ActionSheet';
+export { default as DatePicker } from './DatePicker';
+export { default as Filter } from './Filter';
+export { default as SearchInput } from './SearchInput';
 export { default as ProForm } from './ProForm';
-export { default as ProFormText } from './ProForm/controls/Text';
-export { default as ProFormTextArea } from './ProForm/controls/TextArea';
-export { default as ProFormDate } from './ProForm/controls/Date';
-export { default as ProFormUpload } from './ProForm/controls/Upload';
-export { default as ProFormSelect } from './ProForm/controls/Select';
-export { default as ProFormList } from './ProForm/controls/List';
-export { getQueryParams, getListAssignField, dateFormat, getSimplifyDay, getUUID, getFileExt, getFileType, clipFileUrl } from "./utils/tools";
+export { default as ProFormText } from './ProForm/Controls/Text';
+export { default as ProFormTextArea } from './ProForm/Controls/TextArea';
+export { default as ProFormDate } from './ProForm/Controls/Date';
+export { default as ProFormUpload } from './ProForm/Controls/Upload';
+export { default as ProFormSelect } from './ProForm/Controls/Select';
+export { default as ProFormList } from './ProForm/Controls/List';
+export { getQueryParams, getListAssignField, dateFormat, getSimplifyDay, getUUID, getFileExt, getFileType, clipFileUrl, getObjectPathValue, setObjectPathValue } from "./utils/tools";