@zat-design/sisyphus-react 3.4.9-beta.11 → 3.4.9-beta.13

package/es/ProEditTable/components/RenderField/index.js

@@ -526,7 +526,8 @@ var RenderField = function RenderField(_ref) {
     delete _formItemProps.rules;
   }
   var _className = classNames(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-changed', changed));
-  var FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
+  var FormItem = null;
+  FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
     validateFirst: true
   }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
@@ -535,6 +536,20 @@ var RenderField = function RenderField(_ref) {
   })) : _jsx(Container, {
     viewEmpty: viewEmpty
   });
+  if (type === 'FormList') {
+    FormItem = _jsx(_Form.List, _objectSpread(_objectSpread({
+      name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
+    }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+      children: function children(fields, operation, meta) {
+        return _jsx(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
+          otherProps: otherProps,
+          fields: fields,
+          operation: operation,
+          meta: meta
+        }));
+      }
+    }));
+  }
   var originalTitle = originalDiffTip && originalValues ? _jsxs(_Space, {
     children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
       isView: true,

package/es/ProEnum/index.js

@@ -239,6 +239,9 @@ var ProEnum = function ProEnum(props) {
         }
         return item[fieldValue] === v;
       }) || {};
+      if (!option) {
+        return '';
+      }
       return enumProps.showCodeName ? "".concat(option === null || option === void 0 ? void 0 : option[fieldValue], "-").concat(option === null || option === void 0 ? void 0 : option[label]) : option === null || option === void 0 ? void 0 : option[label];
     });
     var record = value.map(function (v) {

package/es/ProForm/components/combination/Group/component/AddonWrapper/index.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import './index.less';
+interface Props {
+    before?: React.ReactNode;
+    after?: React.ReactNode;
+}
+declare const AddonWrapper: React.FC<Props>;
+export default AddonWrapper;

package/es/ProForm/components/combination/Group/component/AddonWrapper/index.js

@@ -0,0 +1,18 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import './index.less';
+var AddonWrapper = function AddonWrapper(props) {
+  var before = props.before,
+    after = props.after,
+    children = props.children;
+  return _jsxs("div", {
+    className: "addon-wrapper",
+    children: [before && _jsx("div", {
+      className: "before",
+      children: before
+    }), children, after && _jsx("div", {
+      className: "after",
+      children: after
+    })]
+  });
+};
+export default AddonWrapper;

package/es/ProForm/components/combination/Group/component/AddonWrapper/index.less

@@ -0,0 +1,10 @@
+.addon-wrapper {
+  display: flex;
+  gap: 16px;
+  align-items: center;
+
+  .before,
+  .after {
+    white-space: nowrap;
+  }
+}

package/es/ProForm/components/combination/Group/component/ComRender.d.ts

@@ -8,6 +8,8 @@ interface Props {
     confirm: any;
     fieldProps: any;
     contextProps: any;
+    before?: React.ReactNode;
+    after?: React.ReactNode;
 }
 /** 渲染组件 */
 declare const ComRender: React.FC<Props>;

package/es/ProForm/components/combination/Group/component/ComRender.js

@@ -1,11 +1,33 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps"];
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import ConfirmWrapper from '../../../../components/render/ConfirmWrapper';
 import { FieldProvider } from '../../../../utils/useFieldProps';
 import * as componentMap from '../../../../../index';
+import AddonWrapper from './AddonWrapper';
+// 这里的key与组件内参数一致, 决定使用哪个包裹组件
+var wrapperMap = {
+  confirm: ConfirmWrapper,
+  before: AddonWrapper,
+  after: AddonWrapper
+};
+// 增加middleware根据配置增加多层包裹
+var getComRender = function getComRender(component, props, componentProps) {
+  var wrappers = Object.keys(wrapperMap);
+  var Com = component;
+  wrappers.forEach(function (item) {
+    if (item in props) {
+      var Wrapper = wrapperMap[item];
+      Com = _jsx(Wrapper, _objectSpread(_objectSpread(_objectSpread({}, componentProps), _defineProperty({}, item, props[item])), {}, {
+        children: Com
+      }));
+    }
+  });
+  return Com;
+};
 /** 渲染组件 */
 var ComRender = function ComRender(props) {
   var type = props.type,
@@ -13,24 +35,18 @@ var ComRender = function ComRender(props) {
     component = props.component,
     fieldProps = props.fieldProps,
     contextProps = props.contextProps,
+    before = props.before,
+    after = props.after,
     rest = _objectWithoutProperties(props, _excluded);
   var TypeComponent = componentMap[type];
   var componentProps = _objectSpread(_objectSpread({}, fieldProps), rest);
-  var Component;
-  if (confirm) {
-    Component = _jsx(ConfirmWrapper, _objectSpread(_objectSpread({
-      confirm: confirm
-    }, componentProps), {}, {
-      children: component || _jsx(TypeComponent, _objectSpread({}, componentProps))
-    }));
-  } else {
-    Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
-  }
+  var Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
+  var Com = getComRender(Component, props, componentProps);
   return _jsx(FieldProvider, {
     value: _objectSpread(_objectSpread({}, contextProps), {}, {
       type: type
     }),
-    children: Component
+    children: Com
   });
 };
 export default ComRender;

package/es/ProSelect/utils/index.js

@@ -47,9 +47,9 @@ export var getSelectList = function getSelectList(_ref2) {
   }
   var listName = otherProps.listName,
     form = otherProps.form;
-  var firstNumberIndex = listName.findIndex(function (item) {
+  var firstNumberIndex = listName.lastIndexOf(listName.findLast(function (item) {
     return typeof item === 'number';
-  });
+  }));
   var fatherName = listName.slice(0, firstNumberIndex);
   var selectName = listName.slice(firstNumberIndex + 1);
   return findSelectNameValues({

package/lib/ProEditTable/components/RenderField/index.js

@@ -529,7 +529,8 @@ var RenderField = function RenderField(_ref) {
     delete _formItemProps.rules;
   }
   var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-changed', changed));
-  var FormItem = TargetComponent ? (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  var FormItem = null;
+  FormItem = TargetComponent ? (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     validateFirst: true
   }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
@@ -538,6 +539,20 @@ var RenderField = function RenderField(_ref) {
   })) : (0, _jsxRuntime.jsx)(_Container.default, {
     viewEmpty: viewEmpty
   });
+  if (type === 'FormList') {
+    FormItem = (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
+    }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+      children: function children(fields, operation, meta) {
+        return (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
+          otherProps: otherProps,
+          fields: fields,
+          operation: operation,
+          meta: meta
+        }));
+      }
+    }));
+  }
   var originalTitle = originalDiffTip && originalValues ? (0, _jsxRuntime.jsxs)(_antd.Space, {
     children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
       isView: true,

package/lib/ProEnum/index.js

@@ -240,6 +240,9 @@ var ProEnum = function ProEnum(props) {
         }
         return item[fieldValue] === v;
       }) || {};
+      if (!option) {
+        return '';
+      }
       return enumProps.showCodeName ? "".concat(option === null || option === void 0 ? void 0 : option[fieldValue], "-").concat(option === null || option === void 0 ? void 0 : option[label]) : option === null || option === void 0 ? void 0 : option[label];
     });
     var record = value.map(function (v) {

package/lib/ProForm/components/combination/Group/component/AddonWrapper/index.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import './index.less';
+interface Props {
+    before?: React.ReactNode;
+    after?: React.ReactNode;
+}
+declare const AddonWrapper: React.FC<Props>;
+export default AddonWrapper;

package/lib/ProForm/components/combination/Group/component/AddonWrapper/index.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _jsxRuntime = require("react/jsx-runtime");
+require("./index.less");
+var AddonWrapper = function AddonWrapper(props) {
+  var before = props.before,
+    after = props.after,
+    children = props.children;
+  return (0, _jsxRuntime.jsxs)("div", {
+    className: "addon-wrapper",
+    children: [before && (0, _jsxRuntime.jsx)("div", {
+      className: "before",
+      children: before
+    }), children, after && (0, _jsxRuntime.jsx)("div", {
+      className: "after",
+      children: after
+    })]
+  });
+};
+var _default = exports.default = AddonWrapper;

package/lib/ProForm/components/combination/Group/component/AddonWrapper/index.less

@@ -0,0 +1,10 @@
+.addon-wrapper {
+  display: flex;
+  gap: 16px;
+  align-items: center;
+
+  .before,
+  .after {
+    white-space: nowrap;
+  }
+}

package/lib/ProForm/components/combination/Group/component/ComRender.d.ts

@@ -8,6 +8,8 @@ interface Props {
     confirm: any;
     fieldProps: any;
     contextProps: any;
+    before?: React.ReactNode;
+    after?: React.ReactNode;
 }
 /** 渲染组件 */
 declare const ComRender: React.FC<Props>;

package/lib/ProForm/components/combination/Group/component/ComRender.js

@@ -6,14 +6,36 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireDefault(require("react"));
 var _ConfirmWrapper = _interopRequireDefault(require("../../../../components/render/ConfirmWrapper"));
 var _useFieldProps = require("../../../../utils/useFieldProps");
 var componentMap = _interopRequireWildcard(require("../../../../../index"));
-var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps"];
+var _AddonWrapper = _interopRequireDefault(require("./AddonWrapper"));
+var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after"];
+// 这里的key与组件内参数一致, 决定使用哪个包裹组件
+var wrapperMap = {
+  confirm: _ConfirmWrapper.default,
+  before: _AddonWrapper.default,
+  after: _AddonWrapper.default
+};
+// 增加middleware根据配置增加多层包裹
+var getComRender = function getComRender(component, props, componentProps) {
+  var wrappers = Object.keys(wrapperMap);
+  var Com = component;
+  wrappers.forEach(function (item) {
+    if (item in props) {
+      var Wrapper = wrapperMap[item];
+      Com = (0, _jsxRuntime.jsx)(Wrapper, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, componentProps), (0, _defineProperty2.default)({}, item, props[item])), {}, {
+        children: Com
+      }));
+    }
+  });
+  return Com;
+};
 /** 渲染组件 */
 var ComRender = function ComRender(props) {
   var type = props.type,
@@ -21,24 +43,18 @@ var ComRender = function ComRender(props) {
     component = props.component,
     fieldProps = props.fieldProps,
     contextProps = props.contextProps,
+    before = props.before,
+    after = props.after,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var TypeComponent = componentMap[type];
-  var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, fieldProps), rest);
-  var Component;
-  if (confirm) {
-    Component = (0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      confirm: confirm
-    }, componentProps), {}, {
-      children: component || (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread2.default)({}, componentProps))
-    }));
-  } else {
-    Component = component ? ( /*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread2.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread2.default)({}, componentProps));
-  }
+  var componentProps = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldProps), rest);
+  var Component = component ? ( /*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread3.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread3.default)({}, componentProps));
+  var Com = getComRender(Component, props, componentProps);
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
-    value: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, contextProps), {}, {
+    value: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, contextProps), {}, {
       type: type
     }),
-    children: Component
+    children: Com
   });
 };
 var _default = exports.default = ComRender;

package/lib/ProSelect/utils/index.js

@@ -55,9 +55,9 @@ var getSelectList = exports.getSelectList = function getSelectList(_ref2) {
   }
   var listName = otherProps.listName,
     form = otherProps.form;
-  var firstNumberIndex = listName.findIndex(function (item) {
+  var firstNumberIndex = listName.lastIndexOf(listName.findLast(function (item) {
     return typeof item === 'number';
-  });
+  }));
   var fatherName = listName.slice(0, firstNumberIndex);
   var selectName = listName.slice(firstNumberIndex + 1);
   return findSelectNameValues({

package/package.json

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