@power-xa/m-ui 0.0.6 → 0.0.8

package/dist/Drawer/index.js

@@ -5,8 +5,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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, { useEffect, useState } from "react";
-import { getMenuButtonBoundingClientRect } from "@tarojs/taro";
-import { View } from "@tarojs/components";
+import { getMenuButtonBoundingClientRect, getWindowInfo } from "@tarojs/taro";
+import { RootPortal, View } from "@tarojs/components";
 import "./index.less";
 var Drawer = function Drawer(_ref) {
   var open = _ref.open,
@@ -14,11 +14,13 @@ var Drawer = function Drawer(_ref) {
     rootClassName = _ref.rootClassName,
     header = _ref.header,
     content = _ref.content,
-    footer = _ref.footer;
+    footer = _ref.footer,
+    _ref$width = _ref.width,
+    width = _ref$width === void 0 ? 65 : _ref$width;
   var _getMenuButtonBoundin = getMenuButtonBoundingClientRect(),
     top = _getMenuButtonBoundin.top,
     height = _getMenuButtonBoundin.height;
-  var _useState = useState("translateX(-65vw)"),
+  var _useState = useState("translateX(-".concat(width, "vw)")),
     _useState2 = _slicedToArray(_useState, 2),
     transform = _useState2[0],
     setTransform = _useState2[1];
@@ -26,33 +28,46 @@ var Drawer = function Drawer(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     show = _useState4[0],
     setShow = _useState4[1];
+  var _getWindowInfo = getWindowInfo(),
+    safeArea = _getWindowInfo.safeArea;
+  var _ref2 = safeArea,
+    safeAreaHeight = _ref2.height,
+    bottom = _ref2.bottom;
   useEffect(function () {
-    setShow(open || false);
+    if (open && !show) setShow(true);
+    if (!open && show) setTransform("translateX(-".concat(width, "vw)"));
   }, [open]);
   useEffect(function () {
-    if (show !== open) {
-      var timer = setTimeout(function () {
-        onOpenChange === null || onOpenChange === void 0 || onOpenChange(show);
-        clearTimeout(timer);
-      }, 300);
-    }
+    if (show) setTransform("none");
   }, [show]);
   useEffect(function () {
-    setTransform(show ? "none" : "translateX(-65vw)");
-  }, [show]);
-  return /*#__PURE__*/React.createElement(View, {
+    if (transform === "translateX(-".concat(width, "vw)")) {
+      var time = setTimeout(function () {
+        setShow(false);
+        clearTimeout(time);
+        onOpenChange === null || onOpenChange === void 0 || onOpenChange(false);
+      }, 300);
+    }
+  }, [transform]);
+  return /*#__PURE__*/React.createElement(RootPortal, {
+    style: {
+      display: show ? "block" : "none",
+      position: "fixed"
+    }
+  }, /*#__PURE__*/React.createElement(View, {
     className: "p-drawer-mask ".concat(rootClassName),
     style: {
-      display: open ? "block" : "none"
+      display: show ? "block" : "none"
     },
     onTap: function onTap() {
-      return setShow(false);
+      setTransform("translateX(".concat(-width, "vw)"));
     }
   }, /*#__PURE__*/React.createElement(View, {
     className: "p-drawer-container",
     style: {
       paddingTop: top,
-      transform: transform
+      transform: transform,
+      width: width + "vw"
     },
     onClick: function onClick(e) {
       return e.stopPropagation();
@@ -64,8 +79,11 @@ var Drawer = function Drawer(_ref) {
     }
   }, header), /*#__PURE__*/React.createElement(View, {
     className: "p-drawer-content"
-  }, content), /*#__PURE__*/React.createElement(View, {
-    className: "p-drawer-footer"
-  }, footer)));
+  }, content), footer && /*#__PURE__*/React.createElement(View, {
+    className: "p-drawer-footer",
+    style: {
+      paddingBottom: "".concat(bottom - safeAreaHeight > 24 ? bottom - safeAreaHeight : 24, "rpx")
+    }
+  }, footer))));
 };
 export default Drawer;

package/dist/Drawer/index.less

@@ -5,9 +5,10 @@
     bottom: 0;
     left: 0;
     background: rgba(51, 52, 55, 0.70);
+    z-index: 99999;
+    transition: display .3s;
 
     .p-drawer-container {
-        width: 65vw;
         height: 100vh;
         background: #fff;
         transform: translateX(-65vw);

package/dist/Filter/index.d.ts

@@ -7,6 +7,9 @@ type FilterProps = {
     onFilter?: (form: {
         [key: string]: any;
     }) => void;
+    initialValues?: {
+        [key: string]: any;
+    };
     children?: ReactElement | ReactElement[];
 };
 declare const Filter: FC<FilterProps>;

package/dist/Filter/index.js

@@ -13,7 +13,8 @@ var Filter = function Filter(_ref) {
     extra = _ref.extra,
     onSearch = _ref.onSearch,
     onFilter = _ref.onFilter,
-    children = _ref.children;
+    children = _ref.children,
+    initialValues = _ref.initialValues;
   var formRef = useRef(null);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -54,19 +55,20 @@ var Filter = function Filter(_ref) {
     })), /*#__PURE__*/React.createElement(View, {
       className: "content"
     }, children && /*#__PURE__*/React.createElement(ProForm, {
-      ref: formRef
+      ref: formRef,
+      initialValues: initialValues
     }, /*#__PURE__*/React.createElement(ProForm.Group, null, children))), /*#__PURE__*/React.createElement(View, {
       className: "footer"
     }, /*#__PURE__*/React.createElement(Button, {
       onTap: function onTap() {
-        var _formRef$current;
-        (_formRef$current = formRef.current) === null || _formRef$current === void 0 || _formRef$current.setForm({});
+        var _formRef$current, _formRef$current$rese;
+        (_formRef$current = formRef.current) === null || _formRef$current === void 0 || (_formRef$current$rese = _formRef$current.resetFields) === null || _formRef$current$rese === void 0 || _formRef$current$rese.call(_formRef$current);
       },
       round: true
     }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
       onTap: function onTap() {
-        var _formRef$current2;
-        onFilter((_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.form);
+        var _formRef$current2, _formRef$current2$get;
+        onFilter((_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || (_formRef$current2$get = _formRef$current2.getFieldsValue) === null || _formRef$current2$get === void 0 ? void 0 : _formRef$current2$get.call(_formRef$current2, true));
         onOpenChange();
       },
       round: true,

package/dist/ProForm/Controls/Cascader/index.d.ts

@@ -0,0 +1,28 @@
+import { FC, ReactNode } from "react";
+import type { ProFormFieldProps } from "../../Field";
+import "./index.less";
+type ProFormCascaderProps = ProFormFieldProps & {
+    options?: {
+        [key: string]: any;
+    }[];
+    multiple?: boolean;
+    params?: {
+        [key: string]: any;
+    };
+    request?: (params?: {
+        [key: string]: any;
+    }) => Promise<{
+        [key: string]: any;
+    }[]>;
+    fieldNames?: {
+        label: string;
+        value: string;
+        children?: string;
+    };
+    popupExtra?: {
+        top?: ReactNode;
+        bottom?: ReactNode;
+    };
+};
+declare const Cascader: FC<ProFormCascaderProps>;
+export default Cascader;

package/dist/ProForm/Controls/Cascader/index.js

@@ -0,0 +1,159 @@
+var _excluded = ["multiple", "params", "request", "fieldNames", "children", "disabled", "placeholder", "onChange", "popupExtra"];
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+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; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import React, { Fragment, useCallback, useMemo, useState } from "react";
+import { ScrollView, Text, View } from "@tarojs/components";
+import { Empty, getListAssignField, Popup, SearchInput } from "../../..";
+import { isArray } from "lodash";
+import ProFormField from "../../Field";
+import "./index.less";
+var Cascader = function Cascader(_ref) {
+  var multiple = _ref.multiple,
+    params = _ref.params,
+    request = _ref.request,
+    _ref$fieldNames = _ref.fieldNames,
+    fieldNames = _ref$fieldNames === void 0 ? {
+      value: "value",
+      label: "label",
+      children: "children"
+    } : _ref$fieldNames,
+    children = _ref.children,
+    disabled = _ref.disabled,
+    _ref$placeholder = _ref.placeholder,
+    placeholder = _ref$placeholder === void 0 ? "请选择" : _ref$placeholder,
+    onChange = _ref.onChange,
+    popupExtra = _ref.popupExtra,
+    fieldProps = _objectWithoutProperties(_ref, _excluded);
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    open = _useState2[0],
+    setOpen = _useState2[1];
+  var _useState3 = useState(),
+    _useState4 = _slicedToArray(_useState3, 2),
+    value = _useState4[0],
+    setValue = _useState4[1];
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    options = _useState6[0],
+    setOptions = _useState6[1];
+  var _onTap = useCallback(function (e) {
+    e.stopPropagation();
+    if (disabled) return false;
+    setOpen(true);
+  }, [value]);
+
+  /* 渲染选择图标 */
+  var renderIcon = useCallback(function (v) {
+    if (value === v || value instanceof Array && value.includes(v)) return /*#__PURE__*/React.createElement(View, {
+      className: "iconfont ".concat(multiple ? 'icon-icon-checkbox' : 'icon-icon-radio')
+    });
+    return /*#__PURE__*/React.createElement(View, {
+      className: "iconfont icon-icon-circle"
+    });
+  }, [value]);
+
+  /* 渲染文字 */
+  var renderText = useCallback(function () {
+    if (["string", "boolean", "number"].includes(_typeof(value)) || value === null) return getListAssignField(value, options, fieldNames);
+    if (isArray(value)) return value.map(function (v) {
+      return ["string", "boolean", "number"].includes(_typeof(v)) || v === null ? getListAssignField(v, options, fieldNames) : v[fieldNames.label];
+    }).join("、");
+  }, [value, options]);
+  var renderContent = useCallback(function () {
+    return /*#__PURE__*/React.createElement(Fragment, null, children ? /*#__PURE__*/React.createElement(View, {
+      className: "p-select-container",
+      onTap: function onTap(e) {
+        return _onTap(e);
+      }
+    }, children) : /*#__PURE__*/React.createElement(ProFormField, _extends({
+      layout: "horizontal"
+    }, fieldProps), /*#__PURE__*/React.createElement(View, {
+      className: "p-pro-form-item-select",
+      onTap: function onTap(e) {
+        return _onTap(e);
+      }
+    }, disabled ? /*#__PURE__*/React.createElement(Text, {
+      className: "p-pro-form-item-control-disabled"
+    }, renderText() || "-") : value instanceof Array && value.length || !(value instanceof Array) && value ? /*#__PURE__*/React.createElement(Text, {
+      className: "p-pro-form-item-value"
+    }, renderText()) : /*#__PURE__*/React.createElement(Text, {
+      className: "p-pro-form-item-placeholder"
+    }, placeholder))), /*#__PURE__*/React.createElement(Popup, {
+      open: open,
+      onOpenChange: function onOpenChange(open) {
+        return setOpen(open);
+      },
+      rootClassName: "p-pro-form-item-select-popup-container",
+      header: {
+        title: fieldProps.label,
+        extra: {
+          right: multiple && /*#__PURE__*/React.createElement(Text, {
+            className: "text",
+            onClick: function onClick() {
+              return onChange === null || onChange === void 0 ? void 0 : onChange(value);
+            }
+          }, "\u786E\u5B9A")
+        }
+      }
+    }, function (_ref2) {
+      var onOpenChange = _ref2.onOpenChange;
+      return /*#__PURE__*/React.createElement(Fragment, null, popupExtra === null || popupExtra === void 0 ? void 0 : popupExtra.top, /*#__PURE__*/React.createElement(SearchInput, {
+        placeholder: "\u8BF7\u8F93\u5165\u5173\u952E\u8BCD\u641C\u7D22",
+        onSearch: function onSearch(v) {
+          return setOptions((options === null || options === void 0 ? void 0 : options.filter(function (o) {
+            return o[fieldNames.label].indexOf(v) >= 0;
+          })) || []);
+        }
+      }), options.length ? /*#__PURE__*/React.createElement(ScrollView, {
+        className: "p-pro-form-item-select-popup-content",
+        showScrollbar: false,
+        scrollY: true,
+        enableFlex: true,
+        enhanced: true
+      }, options.map(function (o) {
+        return /*#__PURE__*/React.createElement(View, {
+          className: "p-pro-form-item-select-option",
+          key: 'option-' + o[fieldNames.value],
+          onTap: function onTap() {
+            if (value instanceof Array) {
+              if (value.some(function (v) {
+                return v === o[fieldNames.value];
+              })) {
+                value.splice(value.findIndex(function (v) {
+                  return v === o[fieldNames.value];
+                }), 1);
+              } else {
+                value.push(o[fieldNames.value]);
+              }
+              setValue(_toConsumableArray(value));
+            } else {
+              onOpenChange();
+              setValue(o[fieldNames.value]);
+              onChange === null || onChange === void 0 || onChange(o[fieldNames.value]);
+            }
+          }
+        }, renderIcon(o[fieldNames.value]), /*#__PURE__*/React.createElement(Text, {
+          className: "p-pro-form-item-select-option-text"
+        }, o[fieldNames.label]));
+      })) : /*#__PURE__*/React.createElement(Empty, {
+        description: "\u6682\u65E0\u6570\u636E"
+      }), popupExtra === null || popupExtra === void 0 ? void 0 : popupExtra.bottom);
+    }));
+  }, [value, options, open]);
+  return useMemo(function () {
+    return renderContent();
+  }, [value, options, open]);
+};
+export default Cascader;

package/dist/ProForm/Controls/Cascader/index.less

@@ -0,0 +1,106 @@
+@import "@power-xa/m-ui/dist/assets/less/mixins.less";
+
+.p-pro-form-item {
+    .p-pro-form-item-select {
+        min-height: 40px;
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        gap: 28px;
+
+        .p-pro-form-item-select-option {
+            display: flex;
+            align-items: center;
+            gap: 12px;
+
+            .iconfont {
+                font-size: 28px;
+                line-height: 40px;
+                color: #999;
+            }
+
+            .icon-icon-checkbox,
+            .icon-icon-radio {
+                color: #333437;
+            }
+
+            .p-pro-form-item-select-option-text {
+                .font(28, #333437)
+            }
+        }
+    }
+
+    &.horizontal {
+        .p-pro-form-item-select {
+            width: 100%;
+            justify-content: flex-end;
+        }
+    }
+}
+
+.p-select-container {
+    display: flex;
+    align-items: center;
+}
+
+.p-pro-form-item-select-popup-container {
+    z-index: 99999;
+
+    .p-popup-container {
+        display: flex;
+        flex-direction: column;
+    }
+
+    .p-popup-header {
+        .p-popup-header-extra.right {
+            .text {
+                .font(28, #333437)
+            }
+        }
+    }
+
+    .p-search-input-container {
+        margin: 0 32px;
+        background: #F6F7F9;
+    }
+
+    .p-pro-form-item-select-popup-content {
+        flex: 1;
+        height: 0;
+        margin-top: 16px;
+
+        .p-pro-form-item-select-option {
+            display: flex;
+            align-items: center;
+            gap: 20px;
+            padding: 24px 32px;
+            box-sizing: border-box;
+
+            .iconfont {
+                font-size: 28px;
+                color: #999;
+            }
+
+            .icon-icon-checkbox,
+            .icon-icon-radio {
+                color: #333437;
+            }
+
+            .p-pro-form-item-select-option-text {
+                .font(28, #333437)
+            }
+        }
+
+        .error-view {
+            width: 100%;
+            height: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+
+            .text {
+                .font(24, #999)
+            }
+        }
+    }
+}

package/dist/ProForm/Controls/Date/index.d.ts

@@ -1,3 +1,8 @@
 import { FC } from "react";
-declare const ProFormDate: FC<ProFormAPI.ProFormItemProps>;
+import type { ProFormFieldProps } from "../../Field";
+import "./index.less";
+export type ProFormDateProps = ProFormFieldProps & {
+    format?: "YYYY" | "YYYY-MM" | "YYYY-MM-DD" | "YYYY-MM-DD HH:mm" | "HH:mm" | string;
+};
+declare const ProFormDate: FC<ProFormDateProps>;
 export default ProFormDate;

package/dist/ProForm/Controls/Date/index.js

@@ -1,3 +1,4 @@
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -12,6 +13,7 @@ import React, { useCallback, useEffect, useState } from "react";
 import { Picker, Text } from "@tarojs/components";
 import { dateFormat } from "../../..";
 import ProFormField from "../../Field";
+import "./index.less";
 var ProFormDate = function ProFormDate(props) {
   var _props$placeholder = props.placeholder,
     placeholder = _props$placeholder === void 0 ? "请选择" : _props$placeholder,
@@ -43,7 +45,7 @@ var ProFormDate = function ProFormDate(props) {
     setCurrent = _useState10[1];
   useEffect(function () {
     getFormatRange();
-  }, []);
+  }, [format]);
   useEffect(function () {
     if (range.length && value) {
       var list = value.split(/[\s:-]+/);
@@ -89,6 +91,10 @@ var ProFormDate = function ProFormDate(props) {
         range = [yearList, makeStringArray(12, "月"), makeStringArray(31, "日")];
         currentFormat = "YYYY年-MM月-DD日";
         break;
+      case "YYYY-MM-DD FF":
+        range = [yearList, makeStringArray(12, "月"), makeStringArray(31, "日"), ["上午", "下午"]];
+        currentFormat = "YYYY年-MM月-DD日";
+        break;
       case "YYYY-MM-DD HH:mm":
         range = [yearList, makeStringArray(12, "月"), makeStringArray(31, "日"), makeStringArray(24, "时", true), makeStringArray(60, "分", true)];
         currentFormat = "YYYY年-MM月-DD日-HH时-mm分";
@@ -100,12 +106,12 @@ var ProFormDate = function ProFormDate(props) {
     }
     var value = dateFormat(new Date(), currentFormat).split("-");
     range.forEach(function (r, i) {
-      current[i] = r.indexOf(value[i]);
+      current[i] = r.indexOf(value[i] || "上午");
     });
     setCurrent(_toConsumableArray(current));
     setDefaultValueList(_toConsumableArray(current));
     setRange(range);
-  }, []);
+  }, [format]);
   var updateRange = useCallback(function (_ref) {
     var column = _ref.column,
       value = _ref.value;
@@ -135,7 +141,9 @@ var ProFormDate = function ProFormDate(props) {
     setDate(value);
     onChange === null || onChange === void 0 || onChange(value);
   }, [range]);
-  return /*#__PURE__*/React.createElement(ProFormField, props, /*#__PURE__*/React.createElement(Picker, {
+  return /*#__PURE__*/React.createElement(ProFormField, _extends({}, props, {
+    className: "p-pro-form-item-date-container ".concat(props.className)
+  }), /*#__PURE__*/React.createElement(Picker, {
     mode: "multiSelector",
     range: range,
     value: current,

package/dist/ProForm/Controls/Date/index.less

@@ -0,0 +1,18 @@
+.p-pro-form-item-date-container {
+    .p-pro-form-item-control {
+        display: flex;
+        align-items: center;
+
+        .p-pro-form-item-control-picker {
+            flex: 2;
+            width: 0;
+        }
+
+        .p-pro-form-item {
+            padding: 0;
+            margin: 0;
+            flex: 1;
+            width: 0;
+        }
+    }
+}

package/dist/ProForm/Controls/List/index.d.ts

@@ -1,15 +1,9 @@
 import { FC, ReactElement } from "react";
 import { ProListProps } from "../../../ProList";
+import type { ProFormFieldProps } from "../../Field";
 import "./index.less";
-type OptionType = {
-    add?: () => void;
-    remove?: () => void;
-};
-type ProFormListProps = ProFormAPI.ProFormItemProps & {
+type ProFormListProps = ProFormFieldProps & {
     extra?: ReactElement;
-    children?: (record: {
-        [key: string]: any;
-    }, option: OptionType, index?: number) => ReactElement;
     record?: {
         [key: string]: any;
     };

package/dist/ProForm/Controls/List/index.js

@@ -1,4 +1,3 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var _excluded = ["extra", "children", "listProps", "record", "onAdd"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -6,11 +5,12 @@ 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 _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React, { cloneElement, Fragment, useCallback } from "react";
 import { Text, View } from "@tarojs/components";
-import { getUUID, ProList, getObjectPathValue, setObjectPathValue } from "../../..";
+import { getUUID, ProList } from "../../..";
 import ProFormField from "../../Field";
 import "./index.less";
 var ProFormList = function ProFormList(_ref) {
@@ -24,26 +24,34 @@ var ProFormList = function ProFormList(_ref) {
   var disabled = fieldProps.disabled,
     _fieldProps$value = fieldProps.value,
     value = _fieldProps$value === void 0 ? [] : _fieldProps$value,
-    onChange = fieldProps.onChange;
+    onChange = fieldProps.onChange,
+    name = fieldProps.name,
+    getFieldValue = fieldProps.getFieldValue,
+    setFieldValue = fieldProps.setFieldValue;
   var renderListContent = useCallback(function (element, index) {
     var _element$props, _element$props3;
     if (!element) return null;
     if (element !== null && element !== void 0 && (_element$props = element.props) !== null && _element$props !== void 0 && _element$props.name) {
+      var elName = ["string", "number"].includes(_typeof(element.props.name)) ? [name, index, element.props.name] : [name, index].concat(element.props.name);
       return /*#__PURE__*/cloneElement(element, _objectSpread(_objectSpread({}, element.props), {}, {
+        key: 'p-pro-form-list-field-' + elName.join("-") + index,
         disabled: fieldProps.disabled || element.props.disabled,
-        value: getObjectPathValue(element.props.name, value[index]),
+        name: elName,
+        value: getFieldValue === null || getFieldValue === void 0 ? void 0 : getFieldValue(elName),
         onChange: function onChange(result) {
-          var _element$props$onChan, _element$props2;
+          var _element$props$onChan, _element$props2, _fieldProps$onChange;
           (_element$props$onChan = (_element$props2 = element.props).onChange) === null || _element$props$onChan === void 0 || _element$props$onChan.call(_element$props2, result);
-          setObjectPathValue(element.props.name, result, value[index]);
+          setFieldValue === null || setFieldValue === void 0 || setFieldValue(elName, result);
+          (_fieldProps$onChange = fieldProps.onChange) === null || _fieldProps$onChange === void 0 || _fieldProps$onChange.call(fieldProps, value);
         }
       }));
     }
     if (element !== null && element !== void 0 && (_element$props3 = element.props) !== null && _element$props3 !== void 0 && _element$props3.children) {
       return /*#__PURE__*/cloneElement(element, _objectSpread(_objectSpread({}, element.props), {}, {
-        children: Array.from(element.props.children).map(function (item) {
+        key: 'p-pro-form-list-field-' + getUUID(),
+        children: element.props.children instanceof Array ? Array.from(element.props.children).map(function (item) {
           return renderListContent(item, index);
-        })
+        }) : element.props.children
       }));
     }
     return element;
@@ -59,7 +67,7 @@ var ProFormList = function ProFormList(_ref) {
   }, []);
   return /*#__PURE__*/React.createElement(ProFormField, _extends({}, fieldProps, {
     layout: "vertical",
-    className: "p-pro-form-item-list",
+    className: "p-pro-form-item-list ".concat(fieldProps.className || ""),
     extra: !disabled && /*#__PURE__*/React.createElement(View, {
       className: "p-pro-form-item-header-button",
       onTap: function onTap() {