@power-xa/m-ui 0.0.2 → 0.0.4

package/README.md

@@ -18,4 +18,9 @@
   - ConfigProvider
   - CreatorEdit
   - Empty
-  - ActionSheet 
+  - ActionSheet 
+
+# 0.0.4
+1.Tabs修改（子组件内容更新后未重新渲染）
+2.PageContainer增加footer属性，可自定义底部内容
+3.Filter Children属性修改

package/dist/Filter/index.d.ts

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

package/dist/PageContainer/index.d.ts

@@ -12,6 +12,7 @@ type PageContainerProps = {
     children?: ReactNode;
     className?: string;
     disabledScroll?: boolean;
+    footer?: ReactNode;
 };
 declare const PageContainer: FC<PageContainerProps>;
 export default PageContainer;

package/dist/PageContainer/index.js

@@ -1,5 +1,5 @@
 import React, { Fragment } from "react";
-import { getMenuButtonBoundingClientRect, navigateBack } from "@tarojs/taro";
+import { getMenuButtonBoundingClientRect, navigateBack, getWindowInfo } from "@tarojs/taro";
 import { ScrollView, Text, View } from "@tarojs/components";
 import "./index.less";
 var PageContainer = function PageContainer(_ref) {
@@ -8,11 +8,17 @@ var PageContainer = function PageContainer(_ref) {
     header = _ref.header,
     children = _ref.children,
     className = _ref.className,
-    disabledScroll = _ref.disabledScroll;
+    disabledScroll = _ref.disabledScroll,
+    footer = _ref.footer;
   var _getMenuButtonBoundin = getMenuButtonBoundingClientRect(),
     top = _getMenuButtonBoundin.top,
     height = _getMenuButtonBoundin.height,
     left = _getMenuButtonBoundin.left;
+  var _getWindowInfo = getWindowInfo(),
+    safeArea = _getWindowInfo.safeArea;
+  var _ref2 = safeArea,
+    safeAreaHeight = _ref2.height,
+    bottom = _ref2.bottom;
   return /*#__PURE__*/React.createElement(View, {
     className: "p-page-container ".concat(className),
     style: !fixedHeader ? {
@@ -45,6 +51,11 @@ var PageContainer = function PageContainer(_ref) {
     enhanced: true,
     showScrollbar: false,
     className: "p-page-content"
-  }, children));
+  }, children), footer && /*#__PURE__*/React.createElement(View, {
+    className: "p-page-footer",
+    style: {
+      paddingBottom: "".concat(bottom - safeAreaHeight > 24 ? bottom - safeAreaHeight : 24, "rpx")
+    }
+  }, footer));
 };
 export default PageContainer;

package/dist/PageContainer/index.less

@@ -38,4 +38,12 @@
         height: 0;
         flex: 1;
     }
+
+    .p-page-footer {
+        padding: 24px 32px;
+        background: #fff;
+        box-sizing: border-box;
+        display: flex;
+        align-items: center;
+    }
 }

package/dist/ProForm/Form/index.js

@@ -11,7 +11,7 @@ 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, { cloneElement, forwardRef, Fragment, useCallback, useEffect, useImperativeHandle, useState } from "react";
-import { getWindowInfo, showToast, showLoading } from "@tarojs/taro";
+import { getWindowInfo, showToast } from "@tarojs/taro";
 import { ScrollView, Text, View } from "@tarojs/components";
 import { Button, ActionSheet, getObjectPathValue, setObjectPathValue } from "../..";
 import "./index.less";
@@ -90,61 +90,84 @@ var ProForm = function ProForm(_ref, ref) {
       }));
     }).flat();
   }, [form]);
-  var saveForm = useCallback(function () {
-    var controlList = getControlsList(children instanceof Array ? children : [children]);
+  var validFormRequired = useCallback(function (formList) {
     /* 必填校验 */
-    var requiredList = controlList.filter(function (item) {
-      var _item$props$rules;
-      return item.props.name && !item.props.hidden && (item.props.required || ((_item$props$rules = item.props.rules) === null || _item$props$rules === void 0 ? void 0 : _item$props$rules.some(function (r) {
-        return r.required;
-      })));
-    });
-    var condition = function condition(e) {
-      return [undefined, null, ""].includes(e.props.value) || e.props.value instanceof Array && !e.props.value.length;
-    };
-    if (requiredList.some(condition)) {
-      var _e$props$rules;
-      var e = requiredList.find(condition);
-      return showToast({
-        title: (e === null || e === void 0 || (_e$props$rules = e.props.rules) === null || _e$props$rules === void 0 || (_e$props$rules = _e$props$rules.find(function (r) {
+    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 || _e$props$rules === void 0 ? void 0 : _e$props$rules.message) || (e === null || e === void 0 ? void 0 : e.props.label) + "必填",
-        icon: "none"
+        })) || item.required) && !item.hidden && item.name;
       });
-    }
-    /* 正则校验 */
-    var patternControlList = controlList.filter(function (item) {
-      var _item$props$rules2;
-      return item.props.name && item.props.value && !item.props.hidden && ((_item$props$rules2 = item.props.rules) === null || _item$props$rules2 === void 0 ? void 0 : _item$props$rules2.some(function (r) {
-        return r.pattern;
-      }));
+      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 patternCondition = function patternCondition(e) {
-      var patternList = e.props.rules.filter(function (r) {
-        return r.pattern;
-      }).map(function (p) {
-        return p.pattern;
-      });
-      if (patternList.some(function (p) {
-        return !p.test(e.props.value);
-      })) return true;
-      return false;
-    };
-    if (patternControlList.some(patternCondition)) {
-      var _e$props$rules2;
-      var _e = patternControlList.find(patternCondition);
-      if (_e) return showToast({
-        title: (_e === null || _e === void 0 || (_e$props$rules2 = _e.props.rules) === null || _e$props$rules2 === void 0 || (_e$props$rules2 = _e$props$rules2.find(function (r) {
+  }, []);
+  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;
-        })) === null || _e$props$rules2 === void 0 ? void 0 : _e$props$rules2.message) || (_e === null || _e === void 0 ? void 0 : _e.props.label) + "格式有误",
-        icon: "none"
+        })) && item.name && !item.hidden && item.value;
       });
-    }
-    showLoading({
-      title: "保存中",
-      mask: true
+      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);
     });
-    onOk === null || onOk === void 0 || onOk(form);
   }, [form]);
   var renderContent = useCallback(function () {
     var elementList = children instanceof Array ? children : [children];

package/dist/ProForm/typings.d.ts

@@ -89,8 +89,6 @@ declare namespace ProFormAPI {
     }
 
     type ProFormItemProps = {
-        /* flex占比 */
-        flex?: number;
         /* 对齐方式 */
         layout?: "horizontal" | "vertical";
         /* 表单Key */
@@ -136,7 +134,7 @@ declare namespace ProFormAPI {
         /* 请求选项 */
         request?: (params?: { [key: string]: any }) => Promise<{ [key: string]: any }[]>;
         /* 选项字段名 */
-        fieldNames?: { label: string, value: string };
+        fieldNames?: { label: string, value: string, children?: string };
         /* 选项是否平铺 */
         optionType?: boolean;
         /* 项目ID */

package/dist/Tabs/index.d.ts

@@ -1,10 +1,10 @@
-import { FC, ReactNode, ReactElement } from "react";
+import { FC, ReactNode } from "react";
 import "./index.less";
 type TabItemProps = {
     label: string;
     icon?: string;
     key: string;
-    children?: ReactElement;
+    children?: ReactNode;
     init?: boolean;
 };
 type TabsProps = {

package/dist/Tabs/index.js

@@ -14,7 +14,7 @@ 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 } from "react";
+import React, { useCallback, useEffect, useState, cloneElement, isValidElement } from "react";
 import { ScrollView, Swiper, SwiperItem, Text, View } from "@tarojs/components";
 import { createSelectorQuery } from "@tarojs/taro";
 import "./index.less";
@@ -54,7 +54,7 @@ var Tabs = function Tabs(_ref) {
     height = _useState10[0],
     setHeight = _useState10[1];
   useEffect(function () {
-    if (items.length) {
+    if (items.length !== tabsList.length) {
       setSelectKey(activeKey || items[0].key);
       setTabsList(items.map(function (item, index) {
         return _objectSpread(_objectSpread({}, item), {}, {
@@ -66,7 +66,7 @@ var Tabs = function Tabs(_ref) {
         getSwiperHeight();
       }
     }
-  }, []);
+  }, [tabsList, items]);
   useEffect(function () {
     var _tabsList$find;
     if (selectKey !== activeKey) onChange === null || onChange === void 0 || onChange(selectKey);
@@ -113,6 +113,23 @@ var Tabs = function Tabs(_ref) {
       }).exec();
     }
   }, [tabsList, selectKey, parentLeft]);
+  var renderSwiperTabContent = useCallback(function (tab) {
+    var _items$find;
+    var children = (_items$find = items.find(function (item) {
+      return item.key == tab.key;
+    })) === null || _items$find === void 0 ? void 0 : _items$find.children;
+    if (tab.init && /*#__PURE__*/isValidElement(children)) return /*#__PURE__*/cloneElement(children, _objectSpread(_objectSpread({}, children.props), {}, {
+      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));
+      }
+    }));
+  }, [items]);
   return /*#__PURE__*/React.createElement(View, {
     className: "p-tabs-container ".concat(className, " ").concat(isCardList ? 'p-tabs-card-list-container' : '', " ").concat(centered ? 'p-tabs-centered-container' : '')
   }, /*#__PURE__*/React.createElement(View, {
@@ -168,17 +185,7 @@ var Tabs = function Tabs(_ref) {
     }, /*#__PURE__*/React.createElement(View, {
       id: "swiper-tab-content",
       className: "swiper-tab-content-view"
-    }, item.init && item.children && /*#__PURE__*/cloneElement(item.children, _objectSpread(_objectSpread({}, item.children.props), {}, {
-      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));
-      }
-    }))));
+    }, renderSwiperTabContent(item)));
   })) : (_tabsList$find2 = tabsList.find(function (item) {
     return item.key === selectKey;
   })) === null || _tabsList$find2 === void 0 ? void 0 : _tabsList$find2.children));

package/package.json

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