@power-xa/m-ui 0.0.3 → 0.0.5

package/README.md

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

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/Controls/Upload/index.d.ts

@@ -1,4 +1,10 @@
 import { FC } from "react";
 import "./index.less";
-declare const ProFormUpload: FC<ProFormAPI.ProFormItemProps>;
+type ProFormUploadProps = ProFormAPI.ProFormItemProps & {
+    module?: string;
+    userId?: string;
+    userName?: string;
+    readonly?: boolean;
+};
+declare const ProFormUpload: FC<ProFormUploadProps>;
 export default ProFormUpload;

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

@@ -16,7 +16,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, { Fragment, useCallback, useEffect, useRef, useState } from "react";
-import { chooseImage, chooseVideo, chooseMessageFile, uploadFile, previewImage } from "@tarojs/taro";
+import { chooseImage, chooseVideo, chooseMessageFile, uploadFile, previewImage, navigateTo } from "@tarojs/taro";
 import { Image, Text, View } from "@tarojs/components";
 import { clipFileUrl, getFileType, getUUID, Grid, Popup } from "../../..";
 import { useConfig } from "../../../ConfigProvider";
@@ -308,7 +308,35 @@ var ProFormUpload = function ProFormUpload(props) {
     return /*#__PURE__*/React.createElement(View, {
       className: "p-pro-form-item-file",
       key: "file-" + index,
-      onTap: function onTap() {}
+      onTap: function onTap() {
+        if (item.fileType === "Pic") {
+          previewImage({
+            urls: fileList.filter(function (item) {
+              return item.fileType === "Pic";
+            }).map(function (item) {
+              return item.fullUri;
+            }),
+            current: item.fullUri
+          });
+        } else {
+          navigateTo({
+            url: "/screens/common/preview/index",
+            success: function success(result) {
+              result.eventChannel.emit("getPreviewParams", {
+                fileId: item.id,
+                fileName: item.fileName,
+                fileType: item.fileType,
+                fileUri: item.uri,
+                fullUrl: item.fullUri,
+                module: props.module,
+                userId: props.userId,
+                userName: props.userName,
+                readonly: props.readonly
+              });
+            }
+          });
+        }
+      }
     }, item.fileType === "Pic" && item.fullUri ? /*#__PURE__*/React.createElement(Image, {
       src: item.fullUri,
       className: "image",

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/ProList/index.d.ts

@@ -45,6 +45,9 @@ export type ProListProps = {
         })[];
         fileList?: MetaProps & {
             type: "swiper" | "list";
+            module?: string;
+            userId?: string;
+            userName?: string;
         };
         footer?: {
             creator?: {

package/dist/ProList/index.js

@@ -11,6 +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, { forwardRef, Fragment, useCallback, useEffect, useImperativeHandle, useState } from "react";
+import { previewImage, navigateTo } from "@tarojs/taro";
 import { Image, ScrollView, Swiper, SwiperItem, Text, View } from "@tarojs/components";
 import { getListAssignField, getSimplifyDay, Skeleton } from "./..";
 import { useDebounceEffect } from "ahooks";
@@ -192,7 +193,7 @@ var ProList = function ProList(_ref, ref) {
   }, []);
   var renderListContent = useCallback(function () {
     return list.map(function (item, index) {
-      var _meta$tag3, _meta$tag4, _meta$tag5, _meta$fileList5, _meta$fileList$render, _meta$fileList6, _meta$fileList7, _item$meta$fileList$d, _meta$title3, _meta$fileList8, _meta$title4, _meta$fileList9, _meta$subTitle3, _meta$subTitle4, _meta$fileList10, _meta$fileList$render2, _meta$fileList11, _meta$fileList12, _meta$footer$creator, _meta$footer$creator2, _meta$footer$creator3, _meta$footer$extra$re, _meta$footer$extra, _meta$footer$extra2;
+      var _meta$tag3, _meta$tag4, _meta$tag5, _meta$fileList5, _meta$fileList$render, _meta$fileList6, _meta$fileList7, _item$meta$fileList$d, _meta$title3, _meta$fileList9, _meta$title4, _meta$fileList10, _meta$subTitle3, _meta$subTitle4, _meta$fileList11, _meta$fileList$render2, _meta$fileList12, _meta$fileList13, _meta$footer$creator, _meta$footer$creator2, _meta$footer$creator3, _meta$footer$extra$re, _meta$footer$extra, _meta$footer$extra2;
       var dom = /*#__PURE__*/React.createElement(View, {
         className: "p-pro-list-card-container ".concat(rowClassName),
         onTap: onItem === null || onItem === void 0 ? void 0 : onItem(item).onTap
@@ -228,12 +229,26 @@ var ProList = function ProList(_ref, ref) {
         }, /*#__PURE__*/React.createElement(Image, {
           src: file.fullUri,
           className: "p-pro-list-card-title-swiper-image",
-          mode: "aspectFill"
+          mode: "aspectFill",
+          onTap: function onTap(e) {
+            var _meta$fileList8;
+            e.stopPropagation();
+            if ((_meta$fileList8 = meta.fileList) !== null && _meta$fileList8 !== void 0 && _meta$fileList8.dataIndex) {
+              previewImage({
+                urls: item[meta.fileList.dataIndex].filter(function (item) {
+                  return item.fileType === "Pic";
+                }).map(function (item) {
+                  return item.fullUri;
+                }),
+                current: file.fullUri
+              });
+            }
+          }
         }));
       }))), meta !== null && meta !== void 0 && (_meta$title3 = meta.title) !== null && _meta$title3 !== void 0 && _meta$title3.render ? /*#__PURE__*/React.createElement(View, {
-        className: "p-pro-list-card-title-text ".concat(((_meta$fileList8 = meta.fileList) === null || _meta$fileList8 === void 0 ? void 0 : _meta$fileList8.type) === 'swiper' && item[meta.fileList.dataIndex] ? 'p-pro-list-card-title-swiper-text' : '')
-      }, meta.title.render(item[meta.title.dataIndex], item, index)) : (meta === null || meta === void 0 || (_meta$title4 = meta.title) === null || _meta$title4 === void 0 ? void 0 : _meta$title4.dataIndex) && /*#__PURE__*/React.createElement(Text, {
         className: "p-pro-list-card-title-text ".concat(((_meta$fileList9 = meta.fileList) === null || _meta$fileList9 === void 0 ? void 0 : _meta$fileList9.type) === 'swiper' && item[meta.fileList.dataIndex] ? 'p-pro-list-card-title-swiper-text' : '')
+      }, meta.title.render(item[meta.title.dataIndex], item, index)) : (meta === null || meta === void 0 || (_meta$title4 = meta.title) === null || _meta$title4 === void 0 ? void 0 : _meta$title4.dataIndex) && /*#__PURE__*/React.createElement(Text, {
+        className: "p-pro-list-card-title-text ".concat(((_meta$fileList10 = meta.fileList) === null || _meta$fileList10 === void 0 ? void 0 : _meta$fileList10.type) === 'swiper' && item[meta.fileList.dataIndex] ? 'p-pro-list-card-title-swiper-text' : '')
       }, item[meta.title.dataIndex])), meta !== null && meta !== void 0 && (_meta$subTitle3 = meta.subTitle) !== null && _meta$subTitle3 !== void 0 && _meta$subTitle3.render ? meta.subTitle.render(item[meta.subTitle.dataIndex], item, index) : (meta === null || meta === void 0 || (_meta$subTitle4 = meta.subTitle) === null || _meta$subTitle4 === void 0 ? void 0 : _meta$subTitle4.dataIndex) && /*#__PURE__*/React.createElement(Text, {
         className: "p-pro-list-card-sub-title"
       }, item[meta.subTitle.dataIndex]), (meta === null || meta === void 0 ? void 0 : meta.description) && /*#__PURE__*/React.createElement(View, {
@@ -256,7 +271,7 @@ var ProList = function ProList(_ref, ref) {
           key: d.dataIndex + '-value-' + i
         }, item[d.dataIndex] || "-");
       }))), /* 文件列表 */
-      (meta === null || meta === void 0 || (_meta$fileList10 = meta.fileList) === null || _meta$fileList10 === void 0 ? void 0 : _meta$fileList10.type) == "list" && (meta.fileList.render ? (_meta$fileList$render2 = (_meta$fileList11 = meta.fileList).render) === null || _meta$fileList$render2 === void 0 ? void 0 : _meta$fileList$render2.call(_meta$fileList11, item[meta.fileList.dataIndex], item, index) : (meta === null || meta === void 0 || (_meta$fileList12 = meta.fileList) === null || _meta$fileList12 === void 0 ? void 0 : _meta$fileList12.dataIndex) && item[meta.fileList.dataIndex] && /*#__PURE__*/React.createElement(Fragment, null, item[meta.fileList.dataIndex].filter(function (item) {
+      (meta === null || meta === void 0 || (_meta$fileList11 = meta.fileList) === null || _meta$fileList11 === void 0 ? void 0 : _meta$fileList11.type) == "list" && (meta.fileList.render ? (_meta$fileList$render2 = (_meta$fileList12 = meta.fileList).render) === null || _meta$fileList$render2 === void 0 ? void 0 : _meta$fileList$render2.call(_meta$fileList12, item[meta.fileList.dataIndex], item, index) : (meta === null || meta === void 0 || (_meta$fileList13 = meta.fileList) === null || _meta$fileList13 === void 0 ? void 0 : _meta$fileList13.dataIndex) && item[meta.fileList.dataIndex] && /*#__PURE__*/React.createElement(Fragment, null, item[meta.fileList.dataIndex].filter(function (item) {
         return item.fileType === "Pic";
       }).length ? /*#__PURE__*/React.createElement(View, {
         className: "p-pro-list-card-image-list"
@@ -267,7 +282,21 @@ var ProList = function ProList(_ref, ref) {
           key: file.id,
           src: file.fullUri,
           className: "p-pro-list-card-image",
-          mode: "aspectFill"
+          mode: "aspectFill",
+          onTap: function onTap(e) {
+            var _meta$fileList14;
+            e.stopPropagation();
+            if ((_meta$fileList14 = meta.fileList) !== null && _meta$fileList14 !== void 0 && _meta$fileList14.dataIndex) {
+              previewImage({
+                urls: item[meta.fileList.dataIndex].filter(function (item) {
+                  return item.fileType === "Pic";
+                }).map(function (item) {
+                  return item.fullUri;
+                }),
+                current: file.fullUri
+              });
+            }
+          }
         });
       })) : null, item[meta.fileList.dataIndex].filter(function (item) {
         return item.fileType !== "Pic";
@@ -278,7 +307,29 @@ var ProList = function ProList(_ref, ref) {
       }).map(function (file) {
         return /*#__PURE__*/React.createElement(View, {
           className: "p-pro-list-card-file",
-          key: file.id
+          key: file.id,
+          onTap: function onTap(e) {
+            var _meta$fileList15;
+            e.stopPropagation();
+            if ((_meta$fileList15 = meta.fileList) !== null && _meta$fileList15 !== void 0 && _meta$fileList15.dataIndex) {
+              navigateTo({
+                url: "/screens/common/preview/index",
+                success: function success(result) {
+                  var _meta$fileList16, _meta$fileList17, _meta$fileList18;
+                  result.eventChannel.emit("getPreviewParams", {
+                    fileId: file.id,
+                    fileName: file.fileName,
+                    fileType: file.fileType,
+                    fileUri: file.uri,
+                    module: (_meta$fileList16 = meta.fileList) === null || _meta$fileList16 === void 0 ? void 0 : _meta$fileList16.module,
+                    userId: (_meta$fileList17 = meta.fileList) === null || _meta$fileList17 === void 0 ? void 0 : _meta$fileList17.userId,
+                    userName: (_meta$fileList18 = meta.fileList) === null || _meta$fileList18 === void 0 ? void 0 : _meta$fileList18.userName,
+                    readonly: true
+                  });
+                }
+              });
+            }
+          }
         }, /*#__PURE__*/React.createElement(Image, {
           className: "p-pro-list-card-file-image",
           src: "https://dev.p3china.com:7700/psp.web.dev/resources/images/document/icon/".concat(file.fileType.toLowerCase(), ".svg"),

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.3",
+  "version": "0.0.5",
   "description": "power-mobile系列公共组件库",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",