@zat-design/sisyphus-react 3.9.5 → 3.9.6

package/lib/ProForm/utils/useForm.d.ts

@@ -1,15 +1,16 @@
 import { FormInstance } from 'antd';
 import { NamePath } from 'antd/es/form/interface';
 import { ValuedNotifyInfo } from 'rc-field-form/es/interface';
-type ModifiedFormInstance<T> = FormInstance<T> & {
+export type ModifiedFormInstance<T> = FormInstance<T> & {
     isModified?: boolean;
     /** 默认清空设置值的报错状态 */
     setFieldValue: (name: NamePath, value: any, info?: ValuedNotifyInfo) => void;
+    formKey?: string;
     _init?: boolean;
 };
-interface FormInstanceOption {
+export interface FormInstanceOption {
     scrollToError?: boolean;
     optimize?: boolean;
+    formKey?: string;
 }
 export declare const useForm: <T>(originForm?: FormInstanceOption | ModifiedFormInstance<T>, options?: FormInstanceOption) => [ModifiedFormInstance<T>];
-export {};

package/lib/ProForm/utils/useForm.js

@@ -11,22 +11,31 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _antd = require("antd");
+var _react = require("react");
 var _index = require("./index");
 var _tools = require("../../ProEditTable/utils/tools");
+var _FormsProvider = require("../../FormsProvider");
 var useForm = exports.useForm = function useForm(originForm, options) {
   // 如果没有form实例可以直接把options放在第一个参数位置
   // @ts-ignore
   var _originForm = (originForm === null || originForm === void 0 ? void 0 : originForm._init) ? originForm : undefined;
   var _options =
   // @ts-ignore
-  options || originForm && !(originForm === null || originForm === void 0 ? void 0 : originForm._init) ? originForm : undefined;
+  options || (originForm && !(originForm === null || originForm === void 0 ? void 0 : originForm._init) ? originForm : undefined);
   var _ref = _options || {},
     _ref$scrollToError = _ref.scrollToError,
     scrollToError = _ref$scrollToError === void 0 ? true : _ref$scrollToError,
-    optimize = _ref.optimize;
-  var _Form$useForm = _antd.Form.useForm(_originForm),
+    optimize = _ref.optimize,
+    formKey = _ref.formKey;
+  // formKey全局共享逻辑
+  var forms = (0, _react.useContext)(_FormsProvider.FormsContext);
+  var _Form$useForm = _antd.Form.useForm(forms[formKey] || _originForm),
     _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
     form = _Form$useForm2[0];
+  if (formKey && forms[formKey] !== form) {
+    forms[formKey] = form;
+    form.formKey = formKey;
+  }
   var getFieldsValue = form.getFieldsValue,
     validateFields = form.validateFields,
     isModified = form.isModified,

package/lib/ProLayout/components/ProHeader/PropTypes.d.ts

@@ -26,6 +26,14 @@ export interface DescribeColumnsProps {
     show?: boolean;
     link?: string;
     tag?: string | React.ReactNode | (string | React.ReactNode)[];
+    width?: string | number;
+    /** 多值配置 */
+    items?: {
+        copyable?: boolean;
+        value: string | React.ReactNode;
+        link?: string;
+        tag?: string | React.ReactNode | (string | React.ReactNode)[];
+    }[];
 }
 export interface ProHeaderProps {
     title?: string | React.ReactNode;

package/lib/ProLayout/components/ProHeader/index.js

@@ -21,6 +21,7 @@ var _arrow = _interopRequireDefault(require("../../../assets/arrow.svg"));
 var _components = require("./components");
 var _getEnumLabel = _interopRequireDefault(require("../../../ProEnum/utils/getEnumLabel"));
 var _locale = _interopRequireDefault(require("../../../locale"));
+var _utils2 = require("./utils");
 /* eslint-disable react/no-array-index-key */
 
 var formatAmount = _utils.tools.formatAmount;
@@ -62,6 +63,8 @@ var ProHeader = function ProHeader(props) {
     _useToggle2 = (0, _slicedToArray2.default)(_useToggle, 2),
     fold = _useToggle2[0],
     toggle = _useToggle2[1].toggle;
+  var ref = (0, _react.useRef)(null);
+  var size = (0, _ahooks.useSize)(ref);
   var _title = title;
   // 面包屑配置数据源
   var _breadcrumbColumns = breadcrumbColumns || breadcrumbList;
@@ -92,7 +95,11 @@ var ProHeader = function ProHeader(props) {
       return null;
     }
     return (0, _jsxRuntime.jsx)("ul", {
-      className: "pro-header-describe",
+      className: (0, _classnames2.default)({
+        'pro-header-describe': true,
+        'pro-header-describe-open': fold,
+        'pro-header-describe-hidden': !fold
+      }),
       children: describeData.map(function (item, index) {
         var value = item.value,
           copyable = item.copyable,
@@ -100,20 +107,20 @@ var ProHeader = function ProHeader(props) {
           show = _item$show === void 0 ? true : _item$show,
           tag = item.tag,
           label = item.label,
-          link = item.link;
+          link = item.link,
+          _item$items = item.items,
+          items = _item$items === void 0 ? [] : _item$items,
+          width = item.width;
         // show为false直接隐藏¸
         if (show === false || !show) {
           return null;
         }
         var onlyTag = tag && !label && !value;
-        var tagCls = (0, _classnames2.default)({
-          'pro-header-only-tag': onlyTag
-        });
-        var tagRender = function tagRender() {
-          if (Array.isArray(tag) && tag.length) {
+        var tagRender = function tagRender(parmas) {
+          if (Array.isArray(parmas === null || parmas === void 0 ? void 0 : parmas.tag) && (parmas === null || parmas === void 0 ? void 0 : parmas.tag.length)) {
             return (0, _jsxRuntime.jsx)(_antd.Space, {
               size: 4,
-              children: tag.map(function (tagItem, index) {
+              children: parmas.tag.map(function (tagItem, index) {
                 return (0, _jsxRuntime.jsx)("div", {
                   className: "pro-header-tag",
                   children: tagItem
@@ -121,32 +128,91 @@ var ProHeader = function ProHeader(props) {
               })
             });
           }
-          return tag ? (0, _jsxRuntime.jsx)("div", {
+          return (parmas === null || parmas === void 0 ? void 0 : parmas.tag) ? (0, _jsxRuntime.jsx)("div", {
             className: "pro-header-tag",
-            children: tag
+            children: parmas === null || parmas === void 0 ? void 0 : parmas.tag
           }) : null;
         };
-        var valueRender = function valueRender() {
+        /** 单行渲染 */
+        var valueRender = function valueRender(parmas) {
           return (0, _jsxRuntime.jsxs)(_antd.Space, {
             size: 4,
-            align: tag ? 'baseline' : 'center',
-            children: [link ? (0, _jsxRuntime.jsx)("a", {
-              href: link,
+            align: (parmas === null || parmas === void 0 ? void 0 : parmas.tag) ? 'baseline' : 'center',
+            children: [(parmas === null || parmas === void 0 ? void 0 : parmas.link) ? (0, _jsxRuntime.jsx)("a", {
+              href: parmas.link,
               rel: "noopener noreferrer",
               target: "_blank",
-              children: value
-            }) : value, copyable && (0, _lodash.isString)(value) ? (0, _jsxRuntime.jsx)(_components.Copy, {
-              text: value
-            }) : null, tagRender()]
+              children: parmas === null || parmas === void 0 ? void 0 : parmas.value
+            }) : parmas === null || parmas === void 0 ? void 0 : parmas.value, (parmas === null || parmas === void 0 ? void 0 : parmas.copyable) && (0, _lodash.isString)(parmas === null || parmas === void 0 ? void 0 : parmas.value) ? (0, _jsxRuntime.jsx)(_components.Copy, {
+              text: parmas.value
+            }) : null, tagRender({
+              tag: parmas === null || parmas === void 0 ? void 0 : parmas.tag
+            })]
+          });
+        };
+        /** 多行渲染 */
+        var itemsRender = function itemsRender() {
+          // items配置是否超长，超长配置... + tip 提示
+          var itemsHidden = (0, _utils2.checkDescribeItemsHidden)(ref === null || ref === void 0 ? void 0 : ref.current);
+          var result = (0, _jsxRuntime.jsxs)("div", {
+            ref: ref,
+            className: (0, _classnames2.default)({
+              'pro-header-describe-items': true,
+              'pro-header-describe-items-more': items.length >= 2
+            }),
+            children: [(items === null || items === void 0 ? void 0 : items.length) > 3 ? "\u5171".concat(items === null || items === void 0 ? void 0 : items.length, "\u4E2A\uFF0C") : null, items.map(function (item, index) {
+              return (0, _jsxRuntime.jsxs)("span", {
+                children: [valueRender(item), (items === null || items === void 0 ? void 0 : items.length) !== index + 1 ? ' 、' : null]
+              }, index);
+            }), itemsHidden ? (0, _jsxRuntime.jsx)("span", {
+              className: "pro-header-describe-items-omit",
+              children: "..."
+            }) : null]
           });
+          if (itemsHidden) {
+            var tipResult = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+              children: items.map(function (item, index) {
+                return (0, _jsxRuntime.jsx)("p", {
+                  className: "pro-header-describe-items-tip-value",
+                  children: valueRender(item)
+                }, index);
+              })
+            });
+            return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+              placement: "bottomLeft",
+              overlayClassName: "pro-header-describe-items-tip",
+              title: tipResult,
+              children: result
+            });
+          }
+          return result;
         };
-        return (0, _jsxRuntime.jsxs)("li", {
+        var tagCls = (0, _classnames2.default)({
+          'pro-header-only-tag': onlyTag,
+          'pro-header-describe-items-calc': (0, _lodash.isString)(width) ? width.includes('calc') : false
+        });
+        return (0, _jsxRuntime.jsx)("li", {
           className: tagCls,
-          children: [label ? (0, _jsxRuntime.jsx)("span", {
-            children: label
-          }) : null, (0, _jsxRuntime.jsx)("span", {
-            children: valueRender()
-          })]
+          style: {
+            width: width
+          },
+          children: (0, _jsxRuntime.jsxs)(_antd.Space, {
+            size: 4,
+            children: [label ? (0, _jsxRuntime.jsx)("span", {
+              className: "pro-header-describe-label",
+              children: label
+            }) : null, (0, _jsxRuntime.jsx)("span", {
+              className: "pro-header-describe-value",
+              children: (items === null || items === void 0 ? void 0 : items.length) ? itemsRender() : (0, _jsxRuntime.jsx)("span", {
+                children: valueRender({
+                  value: value,
+                  copyable: copyable,
+                  tag: tag,
+                  link: link
+                })
+              })
+            })]
+          })
         }, index);
       })
     });

package/lib/ProLayout/components/ProHeader/style/index.less

@@ -3,7 +3,7 @@
 @import '../components/ProBackBtn/style/index';
 
 .pro-header {
-  padding: 16px 0 0 0 !important;
+  padding: 10px 0 0 0 !important;
   background-color: var(--zaui-base-bg, #ffffff);
   box-shadow: 2px 3px 8px 0px rgba(0, 55, 93, 0.1);
 
@@ -46,9 +46,48 @@
   }
 
   .pro-header-describe {
+    transition: height 0.2s ease-in-out;
     a {
       color: var(--zaui-link, #006aff);
     }
+    .pro-header-describe-items-calc{
+      position: relative;
+    }
+    &.pro-header-describe-hidden {
+      height: 0;
+      padding: 0;
+      overflow: hidden;
+      border: 0;
+    }
+    .@{ant-prefix}-space {
+      .pro-header-describe-label {
+        font-weight: normal;
+      }
+      .pro-header-describe-value{
+        font-weight: 600;
+        .@{ant-prefix}-space-item{
+          font-weight: 600;
+        }
+        .pro-header-describe-items{
+          span:first-child{
+            margin-right: 2px;
+          }
+          .pro-header-describe-items-omit{
+            position: absolute;
+            right: 0;
+            background: #fff;
+          }
+          &.pro-header-describe-items-more{
+            .pro-header-tag{
+              padding: 0;
+              background: #fff;
+              color: #333 ;
+            }
+
+          }
+        }
+      }
+    }
   }
 
   .pro-header-copy {
@@ -334,8 +373,10 @@
     font-size: var(--zaui-font-size, 14px);
 
     li {
-      margin-left: var(--zaui-space-card, 32px);
-
+      flex: 0 0 auto;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
       &.pro-header-only-tag {
         margin-left: var(--zaui-space-size-sm, 8px);
 
@@ -344,9 +385,6 @@
         }
       }
 
-      &:first-child {
-        margin-left: 0;
-      }
 
       span {
         color: #0a0a0a;
@@ -369,6 +407,13 @@
   }
 }
 
+.pro-header-describe-items-tip{
+  max-width: 600px;
+  .pro-header-describe-items-tip-value{
+    margin-bottom: var(--zaui-space-size-sm, 8px);
+  }
+}
+
 @media (max-width: 1366px) {
   .pro-header-describe {
     li span:last-child {

package/lib/ProLayout/components/ProHeader/utils/index.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 检查描述dom是否部分隐藏
+ * @param ele  dom节点
+ */
+export declare const checkDescribeItemsHidden: (ele?: any) => boolean;

package/lib/ProLayout/components/ProHeader/utils/index.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.checkDescribeItemsHidden = void 0;
+/**
+ * 检查描述dom是否部分隐藏
+ * @param ele  dom节点
+ */
+var checkDescribeItemsHidden = exports.checkDescribeItemsHidden = function checkDescribeItemsHidden(ele) {
+  var childElement = ele;
+  if (!childElement) {
+    return false;
+  }
+  var element = childElement.parentNode.parentNode.parentNode.parentNode;
+  var itemsScrollWidth = element.scrollWidth;
+  var itemsClientWidth = element.clientWidth;
+  return itemsScrollWidth > itemsClientWidth;
+};

package/lib/ProLayout/style/index.less

@@ -79,7 +79,7 @@
     // pro-header调整
     .pro-header{
       &.pro-header-no-describe{
-        padding: var(--zaui-space-size-md, 16px) !important;
+        padding: 10px var(--zaui-space-size-md, 16px) !important;
         .pro-header-top{
           padding-bottom: 0;
         }

package/lib/ProSelect/index.js

@@ -297,7 +297,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
       showArrow: true,
       loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
       onChange: handleChange,
-      optionLabelProp: (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isDiffChange) ? 'label' : 'children',
+      // optionLabelProp={otherProps?.isDiffChange ? 'label' : 'children'} // 解决warning报错，添加默认值
       // optionLabelProp="label" // 解决warning报错，添加默认值
       showSearch: true,
       filterOption: (0, _lodash.isFunction)(_onSearch) ? false : function (input, option) {

package/lib/index.d.ts

@@ -17,6 +17,7 @@ export { default as ProIcon } from './ProIcon';
 export { default as ProDownload } from './ProDownload';
 export { default as ProWaterMark } from './ProWaterMark';
 export { default as ProConfigProvider } from './ProConfigProvider';
+export { default as FormsProvider } from './FormsProvider';
 export { default as ProUpload } from './ProUpload';
 export { default as ProThemeTools } from './ProThemeTools';
 export { default as ProAction } from './ProAction';

package/lib/index.js

@@ -22,6 +22,7 @@ var _exportNames = {
   ProDownload: true,
   ProWaterMark: true,
   ProConfigProvider: true,
+  FormsProvider: true,
   ProUpload: true,
   ProThemeTools: true,
   ProAction: true,
@@ -29,6 +30,12 @@ var _exportNames = {
   ProEditableTable: true,
   ProCertValidity: true
 };
+Object.defineProperty(exports, "FormsProvider", {
+  enumerable: true,
+  get: function get() {
+    return _FormsProvider.default;
+  }
+});
 Object.defineProperty(exports, "ProAction", {
   enumerable: true,
   get: function get() {
@@ -211,6 +218,7 @@ Object.keys(_ProConfigProvider).forEach(function (key) {
     }
   });
 });
+var _FormsProvider = _interopRequireDefault(require("./FormsProvider"));
 var _ProUpload = _interopRequireDefault(require("./ProUpload"));
 var _ProThemeTools = _interopRequireDefault(require("./ProThemeTools"));
 var _ProAction = _interopRequireDefault(require("./ProAction"));

package/lib/utils/index.d.ts

@@ -1,3 +1,6 @@
-/** 判断一个值是否是空值 */
+/**
+ * 判断一个值是否是空值
+ * 空值 或者 仅包含空值的数组视为空
+ */
 export declare const isEmpty: (value: any, emptyValue?: string) => boolean;
 export declare const useFocus: (element: Element) => boolean;

package/lib/utils/index.js

@@ -8,7 +8,10 @@ exports.useFocus = exports.isEmpty = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var EMPTY_VALUE = [undefined, null, ''];
-/** 判断一个值是否是空值 */
+/**
+ * 判断一个值是否是空值
+ * 空值 或者 仅包含空值的数组视为空
+ */
 var isEmpty = exports.isEmpty = function isEmpty(value, emptyValue) {
   if (emptyValue) {
     EMPTY_VALUE.push(emptyValue);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.9.5",
+  "version": "3.9.6",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",