@power-xa/m-ui 0.0.5 → 0.0.7

package/README.md

@@ -26,4 +26,20 @@
 3.Filter Children属性修改
 
 # 0.0.5
-ProFormUpload/ProList 增加文件预览
+ProFormUpload/ProList 增加文件预览
+
+# 0.0.6
+1.CreatorEdit 增加 companyUserId 参数
+2.Popup 组件增加默认头部，可自定义头部内容
+3.ProFormField 组件暴露
+4.ProFormList组件优化
+5.ProFormSelect 内部Popup增加扩展内容
+6.Tabs组件增加ref属性，可通过ref刷新指定Tab
+
+# 0.0.7
+1.ConfigProvider 增加 env 参数，用于判断当前环境
+2.Popup/Drawer 组件Bug修改
+3.Filter默认值场景增加
+4.ProFormList组件优化
+5.ProFormGroup子组件赋值操作修改
+6.Tabs修改非swiperable下children无法更新

package/dist/ConfigProvider/index.d.ts

@@ -10,6 +10,7 @@ export interface ConfigProviderType {
         resource?: string;
         oss?: string;
     };
+    env?: "WEAPP" | "SWAN" | "ALIPAY" | "TT" | "QQ" | "JD" | "WEB" | "RN" | "HARMONY" | "QUICKAPP" | "HARMONYHYBRID" | "QYWX" | "DD";
     basename?: string;
     token?: string;
     extra?: ExtraType;

package/dist/CreatorEdit/index.d.ts

@@ -2,6 +2,7 @@ import { FC } from "react";
 import "./index.less";
 type CreatorEditProps = {
     id?: string;
+    companyUserId?: string;
     memberId?: string;
     name?: string;
     avatar?: string;

package/dist/CreatorEdit/index.js

@@ -12,6 +12,7 @@ import { FileController } from "../services";
 import "./index.less";
 var CreatorEdit = function CreatorEdit(_ref) {
   var id = _ref.id,
+    companyUserId = _ref.companyUserId,
     memberId = _ref.memberId,
     name = _ref.name,
     avatar = _ref.avatar,
@@ -33,6 +34,11 @@ var CreatorEdit = function CreatorEdit(_ref) {
       getUserAvatar();
     }
   }, [avatar, id]);
+  useEffect(function () {
+    if (!avatar && companyUserId) {
+      getCompanyUserAvatar();
+    }
+  }, [avatar, companyUserId]);
   var getUserAvatar = useCallback(function () {
     FileController.getUserAvatar({
       ids: [id]
@@ -42,6 +48,15 @@ var CreatorEdit = function CreatorEdit(_ref) {
       }
     });
   }, [id]);
+  var getCompanyUserAvatar = useCallback(function () {
+    FileController.getCompanyUserAvatar({
+      ids: [companyUserId]
+    }).then(function (result) {
+      if (result.code === 200) {
+        setImageUrl(result.data[0] || (src === null || src === void 0 ? void 0 : src.resource) + "/images/default/avatar.svg");
+      }
+    });
+  }, [companyUserId]);
   var getProjectMemberAvatar = useCallback(function () {
     FileController.getProjectMemberAvatar({
       ids: [memberId]
@@ -53,7 +68,7 @@ var CreatorEdit = function CreatorEdit(_ref) {
   }, [memberId]);
   return /*#__PURE__*/React.createElement(View, {
     className: "p-creator-edit-container",
-    key: id || memberId
+    key: id || memberId || companyUserId
   }, /*#__PURE__*/React.createElement(Image, {
     src: imageUrl,
     className: "avatar"

package/dist/Drawer/index.d.ts

@@ -7,6 +7,7 @@ type DrawerProps = {
     header?: ReactNode;
     content?: ReactNode;
     footer?: ReactNode;
+    width?: number;
 };
 declare const Drawer: FC<DrawerProps>;
 export default Drawer;

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,7 +55,8 @@ 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, {

package/dist/Popup/index.d.ts

@@ -1,4 +1,4 @@
-import { FC, ReactElement } from "react";
+import { FC, ReactElement, ReactNode } from "react";
 import "./index.less";
 type PopupProps = {
     open?: boolean;
@@ -8,6 +8,13 @@ type PopupProps = {
         onOpenChange: () => void;
     }) => ReactElement) | ReactElement;
     height?: number;
+    header?: {
+        title?: string;
+        extra?: {
+            left?: ReactNode;
+            right?: ReactNode;
+        };
+    } | false;
 };
 declare const Popup: FC<PopupProps>;
 export default Popup;

package/dist/Popup/index.js

@@ -6,15 +6,17 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState } from "react";
 import { getWindowInfo } from "@tarojs/taro";
-import { RootPortal, View } from "@tarojs/components";
+import { RootPortal, Text, View } from "@tarojs/components";
 import "./index.less";
 var Popup = function Popup(_ref) {
+  var _header$extra, _header$extra2;
   var open = _ref.open,
     onOpenChange = _ref.onOpenChange,
     rootClassName = _ref.rootClassName,
     children = _ref.children,
     _ref$height = _ref.height,
-    height = _ref$height === void 0 ? 85 : _ref$height;
+    height = _ref$height === void 0 ? 85 : _ref$height,
+    header = _ref.header;
   var _getWindowInfo = getWindowInfo(),
     safeArea = _getWindowInfo.safeArea;
   var _ref2 = safeArea,
@@ -45,7 +47,12 @@ var Popup = function Popup(_ref) {
   useEffect(function () {
     setTransform(show ? "translateY(".concat(100 - height, "vh)") : "translateY(100vh)");
   }, [show]);
-  return /*#__PURE__*/React.createElement(RootPortal, null, /*#__PURE__*/React.createElement(View, {
+  return /*#__PURE__*/React.createElement(RootPortal, {
+    style: {
+      display: open ? "block" : "none",
+      position: "fixed"
+    }
+  }, /*#__PURE__*/React.createElement(View, {
     className: "p-popup-mask ".concat(rootClassName),
     style: {
       display: open ? "block" : "none"
@@ -63,7 +70,25 @@ var Popup = function Popup(_ref) {
     onClick: function onClick(e) {
       return e.stopPropagation();
     }
-  }, typeof children === "function" ? children === null || children === void 0 ? void 0 : children({
+  }, header && /*#__PURE__*/React.createElement(View, {
+    className: "p-popup-header"
+  }, /*#__PURE__*/React.createElement(View, {
+    className: "p-popup-header-extra left",
+    onTap: function onTap() {
+      return setShow(false);
+    }
+  }, ((_header$extra = header.extra) === null || _header$extra === void 0 ? void 0 : _header$extra.left) || /*#__PURE__*/React.createElement(View, {
+    className: "iconfont icon-icon-psp-guanbi"
+  })), header.title && /*#__PURE__*/React.createElement(Text, {
+    className: "p-popup-header-title"
+  }, header.title), /*#__PURE__*/React.createElement(View, {
+    className: "p-popup-header-extra right",
+    onTap: function onTap() {
+      return setShow(false);
+    }
+  }, ((_header$extra2 = header.extra) === null || _header$extra2 === void 0 ? void 0 : _header$extra2.right) || /*#__PURE__*/React.createElement(View, {
+    className: "iconfont "
+  }))), typeof children === "function" ? children === null || children === void 0 ? void 0 : children({
     onOpenChange: function onOpenChange() {
       return setShow(false);
     }

package/dist/Popup/index.less

@@ -1,3 +1,5 @@
+@import "@power-xa/m-ui/dist/assets/less/mixins.less";
+
 .p-popup-mask {
     position: fixed;
     top: 0;
@@ -19,5 +21,35 @@
         flex-direction: column;
         box-sizing: border-box;
         border-radius: 32px 32px 0 0;
+
+        .p-popup-header {
+            display: flex;
+            align-items: center;
+            padding: 34px 32px;
+            box-sizing: border-box;
+
+            .p-popup-header-extra {
+                flex: 1;
+                display: flex;
+                align-items: center;
+
+                .iconfont {
+                    font-size: 24px;
+                    color: #333437;
+                    padding: 8px 12px;
+                    width: max-content;
+                }
+
+                &.right {
+                    justify-content: flex-end;
+                }
+            }
+
+            .p-popup-header-title {
+                flex: 5;
+                text-align: center;
+                .font(32, #333437, Regular, 500)
+            }
+        }
     }
 }

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

@@ -9,10 +9,13 @@ type ProFormListProps = ProFormAPI.ProFormItemProps & {
     extra?: ReactElement;
     children?: (record: {
         [key: string]: any;
-    }, option: OptionType) => ReactElement;
+    }, option: OptionType, index?: number) => ReactElement;
     record?: {
         [key: string]: any;
     };
+    onAdd?: (value: {
+        [key: string]: any;
+    }[], add: () => void) => void;
     listProps?: ProListProps & {
         onAdd?: (onChange: (value: {
             [key: string]: any;

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

@@ -1,5 +1,5 @@
 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"];
+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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -19,31 +19,35 @@ var ProFormList = function ProFormList(_ref) {
     children = _ref.children,
     listProps = _ref.listProps,
     record = _ref.record,
+    onAdd = _ref.onAdd,
     fieldProps = _objectWithoutProperties(_ref, _excluded);
   var disabled = fieldProps.disabled,
     _fieldProps$value = fieldProps.value,
     value = _fieldProps$value === void 0 ? [] : _fieldProps$value,
     onChange = fieldProps.onChange;
   var renderListContent = useCallback(function (element, index) {
-    var _element$props, _element$props2;
-    if ((_element$props = element.props) !== null && _element$props !== void 0 && _element$props.name) {
+    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) {
       return /*#__PURE__*/cloneElement(element, _objectSpread(_objectSpread({}, element.props), {}, {
         disabled: fieldProps.disabled || element.props.disabled,
         value: getObjectPathValue(element.props.name, value[index]),
         onChange: function onChange(result) {
-          return setObjectPathValue(element.props.name, result, value[index]);
+          var _element$props$onChan, _element$props2;
+          (_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]);
         }
       }));
     }
-    if ((_element$props2 = element.props) !== null && _element$props2 !== void 0 && _element$props2.children) {
-      return /*#__PURE__*/cloneElement(element, _objectSpread(_objectSpread({}, element), {}, {
+    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) {
           return renderListContent(item, index);
         })
       }));
     }
     return element;
-  }, [value]);
+  }, [value, disabled]);
   var getShowEdit = useCallback(function (value) {
     var _listProps$meta;
     if (typeof (listProps === null || listProps === void 0 || (_listProps$meta = listProps.meta) === null || _listProps$meta === void 0 ? void 0 : _listProps$meta.footer) !== "boolean") {
@@ -63,8 +67,15 @@ var ProFormList = function ProFormList(_ref) {
         if (listProps !== null && listProps !== void 0 && listProps.onAdd) return listProps === null || listProps === void 0 || (_listProps$onAdd = listProps.onAdd) === null || _listProps$onAdd === void 0 ? void 0 : _listProps$onAdd.call(listProps, function (data) {
           return onChange === null || onChange === void 0 ? void 0 : onChange(data instanceof Array ? data : value.concat([data]));
         }, value);
-        value.push(_objectSpread({}, record));
-        onChange === null || onChange === void 0 || onChange(value);
+        if (onAdd) {
+          onAdd === null || onAdd === void 0 || onAdd(value, function () {
+            value.push(_objectSpread({}, record));
+            onChange === null || onChange === void 0 || onChange(value);
+          });
+        } else {
+          value.push(_objectSpread({}, record));
+          onChange === null || onChange === void 0 || onChange(value);
+        }
       }
     }, extra || /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(View, {
       className: "iconfont icon-icon-psp-xinjian"
@@ -73,8 +84,8 @@ var ProFormList = function ProFormList(_ref) {
     }, "\u6DFB\u52A0")))
   }), children ? /*#__PURE__*/React.createElement(View, {
     className: "p-pro-form-item-list-container"
-  }, value.map(function (_, i) {
-    var element = children(value, {
+  }, value && value.length ? value.map(function (_, i) {
+    var element = children(_, {
       add: function add() {
         value.push(_objectSpread({}, record));
         onChange === null || onChange === void 0 || onChange(value);
@@ -83,12 +94,12 @@ var ProFormList = function ProFormList(_ref) {
         value.splice(i, 1);
         onChange === null || onChange === void 0 || onChange(value);
       }
-    });
+    }, i);
     return /*#__PURE__*/React.createElement(View, {
       key: getUUID(),
       className: "p-pro-form-item-list-content"
     }, renderListContent(element, i));
-  })) : listProps ? /*#__PURE__*/React.createElement(ProList, _extends({}, listProps, {
+  }) : null) : listProps ? /*#__PURE__*/React.createElement(ProList, _extends({}, listProps, {
     dataSources: value || [],
     scrollable: false,
     className: "p-pro-list-view-container",

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

@@ -1,4 +1,10 @@
-import { FC } from "react";
+import { FC, ReactNode } from "react";
 import "./index.less";
-declare const ProFormSelect: FC<ProFormAPI.ProFormItemProps>;
+type ProFormSelectProps = ProFormAPI.ProFormItemProps & {
+    popupExtra?: {
+        top?: ReactNode;
+        bottom?: ReactNode;
+    };
+};
+declare const ProFormSelect: FC<ProFormSelectProps>;
 export default ProFormSelect;

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

@@ -42,7 +42,8 @@ var ProFormSelect = function ProFormSelect(props) {
     projectId = props.projectId,
     companyId = props.companyId,
     source = props.source,
-    disabled = props.disabled;
+    disabled = props.disabled,
+    popupExtra = props.popupExtra;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     options = _useState2[0],
@@ -204,27 +205,21 @@ var ProFormSelect = function ProFormSelect(props) {
     onOpenChange: function onOpenChange(open) {
       return setOpen(open);
     },
-    rootClassName: "p-pro-form-item-select-popup-container"
+    rootClassName: "p-pro-form-item-select-popup-container",
+    header: {
+      title: 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 (_ref) {
     var onOpenChange = _ref.onOpenChange;
-    return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(View, {
-      className: "p-pro-form-item-select-popup-header"
-    }, /*#__PURE__*/React.createElement(View, {
-      className: "extra-content left"
-    }, /*#__PURE__*/React.createElement(View, {
-      className: "iconfont icon-icon-psp-guanbi",
-      onTap: onOpenChange
-    })), /*#__PURE__*/React.createElement(Text, {
-      className: "title"
-    }, label), /*#__PURE__*/React.createElement(View, {
-      className: "extra-content right"
-    }, multiple && /*#__PURE__*/React.createElement(Text, {
-      className: "text",
-      onClick: function onClick() {
-        onOpenChange();
-        _onChange === null || _onChange === void 0 || _onChange(value);
-      }
-    }, "\u786E\u5B9A"))), /*#__PURE__*/React.createElement(SearchInput, {
+    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(value) {
         var _props$options2;
@@ -267,7 +262,7 @@ var ProFormSelect = function ProFormSelect(props) {
       className: "error-view"
     }, /*#__PURE__*/React.createElement(Text, {
       className: "text"
-    }, "\u6682\u65E0\u6570\u636E"))));
+    }, "\u6682\u65E0\u6570\u636E"))), popupExtra === null || popupExtra === void 0 ? void 0 : popupExtra.bottom);
   }));
 };
 export default ProFormSelect;

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

@@ -44,38 +44,11 @@
         flex-direction: column;
     }
 
-    .p-pro-form-item-select-popup-header {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 34px 32px;
-        box-sizing: border-box;
-
-        .extra-content {
-            flex: 1;
-            display: flex;
-            align-items: center;
-
-            .iconfont {
-                font-size: 24px;
-                color: #333437;
-                padding: 8px 12px;
-                width: max-content;
-            }
-
+    .p-popup-header {
+        .p-popup-header-extra.right {
             .text {
                 .font(28, #333437)
             }
-
-            &.right {
-                justify-content: flex-end;
-            }
-        }
-
-        .title {
-            flex: 5;
-            text-align: center;
-            .font(32, #333437, Regular, 500)
         }
     }
 

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

@@ -29,7 +29,8 @@ var ProFormUpload = function ProFormUpload(props) {
     disabled = props.disabled,
     _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
-    onChange = props.onChange;
+    onChange = props.onChange,
+    maxLength = props.maxLength;
   var _useConfig = useConfig(),
     src = _useConfig.src;
   var _useState = useState(false),
@@ -63,9 +64,9 @@ var ProFormUpload = function ProFormUpload(props) {
       fileList.filter(function (item) {
         return item.percent === 0;
       }).forEach(function (item) {
-        upload(item.fullUri, item.fileName);
+        return upload(item.fullUri, item.fileName);
       });
-    } else {
+    } else if (fileList.length) {
       onChange === null || onChange === void 0 || onChange(fileList);
     }
   }, [fileList]);
@@ -114,7 +115,7 @@ var ProFormUpload = function ProFormUpload(props) {
       sourceType: ["camera"],
       success: function success(result) {
         if (result.tempFiles.length) {
-          fileRef.current = fileList.concat(result.tempFiles.map(function (item) {
+          setFileRefList(result.tempFiles.map(function (item) {
             return {
               percent: 0,
               fullUri: item.path,
@@ -123,19 +124,18 @@ var ProFormUpload = function ProFormUpload(props) {
               })
             };
           }));
-          setFileList(fileRef.current);
         }
       }
     });
   }, [url, fileList]);
   var chooseImageAlbum = useCallback(function () {
     chooseImage({
-      count: 9,
+      count: maxLength || 9,
       sourceType: ["album"],
       sizeType: ['original', 'compressed'],
       success: function success(result) {
         if (result.tempFiles.length) {
-          fileRef.current = fileList.concat(result.tempFiles.map(function (item) {
+          setFileRefList(result.tempFiles.map(function (item) {
             return {
               percent: 0,
               fullUri: item.path,
@@ -144,24 +144,22 @@ var ProFormUpload = function ProFormUpload(props) {
               })
             };
           }));
-          setFileList(fileRef.current);
         }
       }
     });
-  }, [url, fileList]);
+  }, [url, fileList, maxLength]);
   var takeVideo = useCallback(function () {
     chooseVideo({
       sourceType: ["camera"],
       success: function success(result) {
         if (result.tempFilePath) {
-          fileRef.current = fileList.concat([{
+          setFileRefList([{
             fullUri: result.tempFilePath,
             percent: 0,
             fileType: getFileType({
               name: result.tempFilePath
             })
           }]);
-          setFileList(fileRef.current);
         }
       }
     });
@@ -171,24 +169,23 @@ var ProFormUpload = function ProFormUpload(props) {
       sourceType: ["album"],
       success: function success(result) {
         if (result.tempFilePath) {
-          fileRef.current = fileList.concat([{
+          setFileRefList([{
             fullUri: result.tempFilePath,
             percent: 0,
             fileType: getFileType({
               name: result.tempFilePath
             })
           }]);
-          setFileList(fileRef.current);
         }
       }
     });
   }, [url, fileList]);
   var chooseFile = useCallback(function () {
     chooseMessageFile({
-      count: 9,
+      count: maxLength || 9,
       success: function success(result) {
         if (result.tempFiles.length) {
-          fileRef.current = fileList.concat(result.tempFiles.map(function (item) {
+          setFileRefList(result.tempFiles.map(function (item) {
             return {
               fileName: item.name,
               fullUri: item.path,
@@ -199,11 +196,16 @@ var ProFormUpload = function ProFormUpload(props) {
               })
             };
           }));
-          setFileList(fileRef.current);
         }
       }
     });
-  }, [url, fileList]);
+  }, [url, fileList, maxLength]);
+  var setFileRefList = useCallback(function (result) {
+    var list = _toConsumableArray(fileList).concat(result);
+    if (maxLength && list.length > maxLength) list = list.splice(list.length - maxLength);
+    fileRef.current = list;
+    setFileList(fileRef.current);
+  }, [fileList, maxLength]);
   var upload = useCallback(function (fileUrl, fileName) {
     var ext = fileUrl.substring(fileUrl.lastIndexOf("."));
     FileController.getOSSConfig(src === null || src === void 0 ? void 0 : src.oss, ext).then(function (result) {
@@ -331,7 +333,7 @@ var ProFormUpload = function ProFormUpload(props) {
                 module: props.module,
                 userId: props.userId,
                 userName: props.userName,
-                readonly: props.readonly
+                readonly: props.readonly || true
               });
             }
           });

package/dist/ProForm/Form/index.js

@@ -46,47 +46,56 @@ var ProForm = function ProForm(_ref, ref) {
     };
   });
   var getProFormListControlsList = useCallback(function (el, name, i, list) {
-    if (el.props) {
-      if (el.props.name) {
+    if (el !== null && el !== void 0 && el.props) {
+      var _el$props;
+      if ((_el$props = el.props) !== null && _el$props !== void 0 && _el$props.name) {
+        var _el$props2;
         list.push( /*#__PURE__*/cloneElement(el, _objectSpread(_objectSpread({}, el.props), {}, {
-          value: getObjectPathValue(el.props.name, form[name][i])
+          value: getObjectPathValue((_el$props2 = el.props) === null || _el$props2 === void 0 ? void 0 : _el$props2.name, form[name][i])
         })));
       } else {
-        if (el.props.children instanceof Array) {
-          el.props.children.map(function (item) {
+        var _el$props3;
+        if (((_el$props3 = el.props) === null || _el$props3 === void 0 ? void 0 : _el$props3.children) instanceof Array) {
+          var _el$props4;
+          (_el$props4 = el.props) === null || _el$props4 === void 0 || _el$props4.children.map(function (item) {
             return getProFormListControlsList(item, name, i, list);
           });
         } else {
-          getProFormListControlsList(el.props.children, name, i, list);
+          var _el$props5;
+          getProFormListControlsList((_el$props5 = el.props) === null || _el$props5 === void 0 ? void 0 : _el$props5.children, name, i, list);
         }
       }
     }
   }, [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) {
+      var _item$props, _item$props12, _item$props13, _item$props14;
+      if ((_item$props = item.props) !== null && _item$props !== void 0 && _item$props.children) {
+        var _item$props2, _item$props3, _item$props4, _item$props9, _item$props10, _item$props11;
+        if (((_item$props2 = item.props) === null || _item$props2 === void 0 ? void 0 : _item$props2.children) instanceof Array) return getControlsList((_item$props3 = item.props) === null || _item$props3 === void 0 ? void 0 : _item$props3.children.map(function (e) {
+          var _e$props;
           return /*#__PURE__*/cloneElement(e, _objectSpread(_objectSpread({}, e.props), {}, {
-            value: getObjectPathValue(e.props.name, form)
+            value: getObjectPathValue((_e$props = e.props) === null || _e$props === void 0 ? void 0 : _e$props.name, form)
           }));
         }));
-        if (item.props.children instanceof Function) {
-          var _form$item$props$name;
+        if (((_item$props4 = item.props) === null || _item$props4 === void 0 ? void 0 : _item$props4.children) instanceof Function) {
+          var _form$item$props$name, _item$props5, _item$props8;
           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);
+          (_form$item$props$name = form[(_item$props5 = item.props) === null || _item$props5 === void 0 ? void 0 : _item$props5.name]) === null || _form$item$props$name === void 0 || _form$item$props$name.map(function (e, i) {
+            var _item$props6, _item$props7;
+            return getProFormListControlsList((_item$props6 = item.props) === null || _item$props6 === void 0 ? void 0 : _item$props6.children({}, {}, i), (_item$props7 = item.props) === null || _item$props7 === void 0 ? void 0 : _item$props7.name, i, _list);
           });
           return getControlsList([/*#__PURE__*/cloneElement(item, _objectSpread(_objectSpread({}, item.props), {}, {
             children: null,
-            value: getObjectPathValue(item.props.name, form)
+            value: getObjectPathValue((_item$props8 = item.props) === null || _item$props8 === void 0 ? void 0 : _item$props8.name, form)
           }))].concat(_list));
         }
-        return getControlsList([/*#__PURE__*/cloneElement(item.props.children, _objectSpread(_objectSpread({}, item.props.children.props), {}, {
-          value: getObjectPathValue(item.props.name, form)
+        return getControlsList([/*#__PURE__*/cloneElement((_item$props9 = item.props) === null || _item$props9 === void 0 ? void 0 : _item$props9.children, _objectSpread(_objectSpread({}, (_item$props10 = item.props) === null || _item$props10 === void 0 ? void 0 : _item$props10.children.props), {}, {
+          value: getObjectPathValue((_item$props11 = item.props) === null || _item$props11 === void 0 ? void 0 : _item$props11.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
+        value: [undefined, null].includes((_item$props12 = item.props) === null || _item$props12 === void 0 ? void 0 : _item$props12.value) ? getObjectPathValue((_item$props13 = item.props) === null || _item$props13 === void 0 ? void 0 : _item$props13.name, form) : (_item$props14 = item.props) === null || _item$props14 === void 0 ? void 0 : _item$props14.value
       }));
     }).flat();
   }, [form]);
@@ -168,13 +177,14 @@ var ProForm = function ProForm(_ref, ref) {
     Promise.all([validFormRequired(formList), validFormRegExp(formList)]).then(function () {
       return onOk === null || onOk === void 0 ? void 0 : onOk(form);
     });
-  }, [form]);
+  }, [form, children]);
   var renderContent = useCallback(function () {
     var elementList = children instanceof Array ? children : [children];
     return elementList.map(function (e, i) {
+      var _e$props2;
       return /*#__PURE__*/cloneElement(e, _objectSpread(_objectSpread({}, e.props), {}, {
         key: 'p-pro-form-group-' + i,
-        disabled: disabled || e.props.disabled,
+        disabled: disabled || ((_e$props2 = e.props) === null || _e$props2 === void 0 ? void 0 : _e$props2.disabled),
         form: form,
         onChange: function onChange(key, value) {
           return setForm(function (form) {

package/dist/ProForm/Group/index.js

@@ -6,7 +6,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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); }
 import React, { cloneElement, useCallback } from "react";
 import { Text, View } from "@tarojs/components";
-import { getListAssignField, getObjectPathValue } from "../..";
+import { getListAssignField, getObjectPathValue, getUUID } from "../..";
 import "./index.less";
 var ProFormGroup = function ProFormGroup(_ref) {
   var className = _ref.className,
@@ -20,11 +20,11 @@ var ProFormGroup = function ProFormGroup(_ref) {
     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,
+        key: e.props.name || getUUID(),
         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),
+        value: e.props.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);
@@ -38,10 +38,10 @@ var ProFormGroup = function ProFormGroup(_ref) {
   }, [form, children, disabled, hidden]);
   return /*#__PURE__*/React.createElement(View, {
     className: "p-pro-form-group-container ".concat(className, " ").concat(hidden ? 'hidden' : '')
-  }, renderContent(), tag && (form === null || form === void 0 ? void 0 : form[tag.dataIndex]) && /*#__PURE__*/React.createElement(View, {
+  }, renderContent(), tag && ![undefined, null].includes(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(form[tag.dataIndex], tag.map, {
+      backgroundColor: getListAssignField(form === null || form === void 0 ? void 0 : form[tag.dataIndex], tag.map, {
         value: "value",
         label: "background"
       })
@@ -49,11 +49,11 @@ var ProFormGroup = function ProFormGroup(_ref) {
   }, /*#__PURE__*/React.createElement(Text, {
     className: "p-pro-form-group-tag-text",
     style: {
-      color: getListAssignField(form[tag.dataIndex], tag.map, {
+      color: getListAssignField(form === null || form === void 0 ? void 0 : form[tag.dataIndex], tag.map, {
         value: "value",
         label: "color"
       })
     }
-  }, getListAssignField(form[tag.dataIndex], tag.map))));
+  }, getListAssignField(form === null || form === void 0 ? void 0 : form[tag.dataIndex], tag.map))));
 };
 export default ProFormGroup;

package/dist/ProForm/index.d.ts

@@ -1,7 +1,9 @@
 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/index.js

@@ -1,5 +1,7 @@
 import OriginProForm from "./Form";
 import ProFormGroup from "./Group";
+import ProFormField from "./Field";
 var ProForm = OriginProForm;
 ProForm.Group = ProFormGroup;
+ProForm.Field = ProFormField;
 export default ProForm;

package/dist/Tabs/index.d.ts

@@ -1,4 +1,4 @@
-import { FC, ReactNode } from "react";
+import React, { ReactNode } from "react";
 import "./index.less";
 type TabItemProps = {
     label: string;
@@ -22,5 +22,5 @@ type TabsProps = {
     isCardList?: boolean;
     centered?: boolean;
 };
-declare const Tabs: FC<TabsProps>;
-export default Tabs;
+declare const _default: React.ForwardRefExoticComponent<TabsProps & React.RefAttributes<unknown>>;
+export default _default;

package/dist/Tabs/index.js

@@ -14,12 +14,12 @@ 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, { useCallback, useEffect, useState, cloneElement, isValidElement } from "react";
+import React, { useCallback, useEffect, useState, cloneElement, isValidElement, useImperativeHandle, forwardRef } from "react";
 import { ScrollView, Swiper, SwiperItem, Text, View } from "@tarojs/components";
 import { createSelectorQuery } from "@tarojs/taro";
 import "./index.less";
-var Tabs = function Tabs(_ref) {
-  var _items$, _tabsList$find2;
+var Tabs = function Tabs(_ref, ref) {
+  var _items$, _items$find2;
   var items = _ref.items,
     onChange = _ref.onChange,
     activeKey = _ref.activeKey,
@@ -83,6 +83,19 @@ var Tabs = function Tabs(_ref) {
       getIndicatorPosition();
     }
   }, [selectKey, parentLeft]);
+  useImperativeHandle(ref, function () {
+    return {
+      onRefresh: function onRefresh(keys) {
+        keys.forEach(function (item) {
+          var tab = tabsList.find(function (tab) {
+            return tab.key === item;
+          });
+          if (tab !== null && tab !== void 0 && tab.init) tab.init = false;
+        });
+        setTabsList(_toConsumableArray(tabsList));
+      }
+    };
+  });
   var getParentPosition = useCallback(function () {
     var query = createSelectorQuery();
     query.select("#p-tabs-nav-list-scroll").boundingClientRect(function (rect) {
@@ -186,8 +199,8 @@ var Tabs = function Tabs(_ref) {
       id: "swiper-tab-content",
       className: "swiper-tab-content-view"
     }, renderSwiperTabContent(item)));
-  })) : (_tabsList$find2 = tabsList.find(function (item) {
+  })) : (_items$find2 = items.find(function (item) {
     return item.key === selectKey;
-  })) === null || _tabsList$find2 === void 0 ? void 0 : _tabsList$find2.children));
+  })) === null || _items$find2 === void 0 ? void 0 : _items$find2.children));
 };
-export default Tabs;
+export default /*#__PURE__*/forwardRef(Tabs);

package/dist/services/FileController/index.d.ts

@@ -3,6 +3,11 @@ export declare const getUserAvatar: (params: {
 }, options?: {
     [key: string]: any;
 } | undefined) => Promise<ServiceAPI.Response<string[]>>;
+export declare const getCompanyUserAvatar: (params: {
+    ids: string[];
+}, options?: {
+    [key: string]: any;
+} | undefined) => Promise<ServiceAPI.Response<string[]>>;
 export declare const getProjectMemberAvatar: (params: {
     ids: string[];
 }, options?: {

package/dist/services/FileController/index.js

@@ -17,6 +17,12 @@ export var getUserAvatar = function getUserAvatar(params, options) {
     data: _toConsumableArray(params.ids)
   }, options || {}));
 };
+export var getCompanyUserAvatar = function getCompanyUserAvatar(params, options) {
+  return request("/service-company/org/user/batch/avatar", _objectSpread({
+    method: "POST",
+    data: _toConsumableArray(params.ids)
+  }, options || {}));
+};
 export var getProjectMemberAvatar = function getProjectMemberAvatar(params, options) {
   return request("/service-project/org/member/batch/avatar", _objectSpread({
     method: "POST",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@power-xa/m-ui",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "power-mobile系列公共组件库",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",