@zat-design/sisyphus-react 3.3.0 → 3.3.1-beta.10

package/dist/index.esm.css

@@ -1629,6 +1629,13 @@
 .pro-table .ant-table-tbody .ant-table-cell-fix-right {
   background: unset !important;
 }
+.pro-table .ant-table-body .ant-table-tbody .ant-table-row:nth-child(odd).new-cell {
+  background: #d2fff4 !important;
+}
+.pro-table .ant-table-body .ant-table-tbody .ant-table-row:nth-child(odd).new-cell td {
+  background: #d2fff4 !important;
+  border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
+}
 .pro-table .ant-table-body .ant-table-cell .varied-cell {
   margin-left: -8px;
   background: var(--zaui-contract-bg, #fffaa1);
@@ -1996,11 +2003,11 @@ div.pro-textarea-view::after {
 .pro-form-list-action .ant-btn-text:hover {
   background: transparent;
 }
-.ant-form-item-has-error .ant-picker-status-error ~ .forever-checkbox:not(.ant-input-disabled):not(.ant-input-borderless).ant-input {
+.ant-form-item-has-error .ant-picker-status-error ~ .forever-checkbox:not(.ant-input-disabled):not( .ant-input-borderless).ant-input {
   background: var(--zaui-base-bg, #ffffff);
   border-color: var(--ant-error-color);
 }
-.ant-form-item-has-error .forever-checkbox:not(.ant-input-disabled):not(.ant-input-borderless).ant-input:focus {
+.ant-form-item-has-error .forever-checkbox:not(.ant-input-disabled):not( .ant-input-borderless).ant-input:focus {
   border-color: var(--ant-error-color-hover);
   border-right-width: 1px;
   outline: 0;
@@ -2021,6 +2028,10 @@ span.ant-input-group-compact.pro-range-limit .ant-picker {
       -ms-flex: 1;
           flex: 1;
 }
+span.ant-input-group-compact.pro-time-limit .ant-picker-focused,
+span.ant-input-group-compact.pro-range-limit .ant-picker-focused {
+  z-index: 1;
+}
 span.ant-input-group-compact.pro-time-limit .forever-checkbox,
 span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   -webkit-box-flex: 0;
@@ -2238,14 +2249,14 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   display: none;
 }
 .pro-group .ant-space-compact {
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-      -ms-flex-align: center;
-          align-items: center;
   -webkit-box-flex: 1;
   -webkit-flex: auto;
       -ms-flex: auto;
           flex: auto;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
   width: 100%;
 }
 .pro-group .ant-space-compact .ant-form-item {
@@ -2259,6 +2270,13 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   border-start-start-radius: 0;
   border-end-start-radius: 0;
 }
+.pro-group .ant-space-compact .pro-modal-select {
+  margin-left: -1px;
+}
+.pro-group .ant-space-compact .pro-modal-select .ant-input {
+  border-start-start-radius: 0;
+  border-end-start-radius: 0;
+}
 .pro-group .ant-space-compact .ant-input-affix-wrapper,
 .pro-group .ant-space-compact .ant-select {
   border-start-end-radius: 0;
@@ -2266,8 +2284,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   border-start-start-radius: 0;
   border-end-start-radius: 0;
 }
-.pro-group .ant-space-compact .ant-input-affix-wrapper:nth-child(n+2),
-.pro-group .ant-space-compact .ant-select:nth-child(n+2) {
+.pro-group .ant-space-compact .ant-input-affix-wrapper:nth-child(n + 2),
+.pro-group .ant-space-compact .ant-select:nth-child(n + 2) {
   -webkit-margin-start: -1px;
           margin-inline-start: -1px;
 }
@@ -2296,8 +2314,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   border-end-end-radius: var(--zaui-border-radius, 4px);
 }
 .pro-group .ant-space-compact .ant-input-affix-wrapper-status-error ~ .group-separator {
-  border-color: var(--ant-error-color);
   color: var(--ant-error-color);
+  border-color: var(--ant-error-color);
 }
 .pro-container.pro-container-diy .pro-container-content {
   display: -webkit-box;
@@ -2551,9 +2569,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .ant-form-item.pro-form-item-changed .ant-picker .ant-select-selection-placeholder {
   z-index: 9;
 }
-.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > span {
-  background: var(--zaui-contract-bg, #fffaa1);
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > .pro-form-view-container {
   padding: 4px 8px;
+  background: var(--zaui-contract-bg, #fffaa1);
   border-radius: 4px;
 }
 .pro-form .ant-form-item .ant-row {
@@ -3324,6 +3342,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-tree-modal-checkbox-close {
   padding-left: var(--zaui-space-size-sm, 8px);
+  color: #c5c7cd;
   font-size: var(--zaui-font-size-sm, 12px);
 }
 .pro-tree-modal-tree-node {
@@ -4172,6 +4191,12 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-edit-table .ant-table-pagination .ant-pagination-options .ant-select.ant-select-in-form-item {
   width: auto;
 }
+.pro-edit-table .is-new-row td,
+.pro-edit-table .is-new-row.ant-table-row:hover td,
+.pro-edit-table .is-new-row .ant-table-cell-row-hover,
+.pro-edit-table .is-new-row.ant-table-row:hover .ant-table-cell-row-hover {
+  background: var(--ant-primary-2) !important;
+}
 .pro-edit-table-header {
   margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
 }

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

@@ -25,7 +25,7 @@ import * as componentMap from '../../../ProForm/components';
 import Container from '../../../ProForm/components/Container';
 import transformNames from '../../../ProForm/utils/transformNames';
 import { FieldProvider } from '../../../ProForm/utils/useFieldProps';
-import { useChanged } from '../../../ProForm/utils/useChanged';
+import { useListChanged } from '../../../ProForm/utils/useListChanged';
 import useRules from '../../../ProForm/utils/useRules';
 import { isSelect } from '../../../ProForm/utils';
 import locale from '../../../locale';
@@ -129,7 +129,7 @@ var RenderField = function RenderField(_ref) {
     names: names,
     label: label,
     labelRequired: labelRequired,
-    required: _required,
+    required: !isView && _required,
     rules: isEditing ? _rules : [],
     isSelect: isSelect({
       dataSource: (_fieldProps4 = _fieldProps) === null || _fieldProps4 === void 0 ? void 0 : _fieldProps4.dataSource,
@@ -452,19 +452,20 @@ var RenderField = function RenderField(_ref) {
     };
   }();
   // 判断当前字段是否变更
-  var _useChanged = useChanged({
+  var _useListChanged = useListChanged({
       name: cellName,
       names: names,
       namesStr: [].concat(_toConsumableArray(baseName), [index, dataIndex]),
+      rowKeyPath: [].concat(_toConsumableArray(baseName), [index, 'rowKey']),
       originalName: originalName,
       originalNames: originalNames,
       originalValues: originalValues,
       form: form,
       equalWith: equalWith
     }),
-    _useChanged2 = _slicedToArray(_useChanged, 2),
-    changed = _useChanged2[0],
-    originalValue = _useChanged2[1];
+    _useListChanged2 = _slicedToArray(_useListChanged, 2),
+    changed = _useListChanged2[0],
+    originalValue = _useListChanged2[1];
   var componentProps = _objectSpread(_objectSpread(_objectSpread({
     form: form,
     name: cellName,
@@ -506,7 +507,7 @@ var RenderField = function RenderField(_ref) {
     delete _formItemProps.rules;
   }
   var _className = classNames((_classNames = {}, _defineProperty(_classNames, className, className), _defineProperty(_classNames, 'pro-form-item-changed', changed), _classNames));
-  var originalTitle = _jsxs(_Space, {
+  var originalTitle = originalTip ? _jsxs(_Space, {
     children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
       isView: true,
       value: originalValue,
@@ -516,14 +517,16 @@ var RenderField = function RenderField(_ref) {
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
     }))]
-  });
-  var FormItem = _jsx(_Form.Item, _objectSpread(_objectSpread({
+  }) : null;
+  var FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
     validateFirst: true
   }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
     name: cellName,
     children: /*#__PURE__*/React.isValidElement(TargetComponent) ? /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange']))) : _jsx(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange'])))
-  }));
+  })) : _jsx(Container, {
+    viewEmpty: viewEmpty
+  });
   return _jsx(FieldProvider, {
     value: componentProps === null || componentProps === void 0 ? void 0 : componentProps.otherProps,
     children: !originalTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : _jsx(_Tooltip, {

package/es/ProEditTable/index.js

@@ -10,10 +10,10 @@ import _ConfigProvider from "antd/es/config-provider";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalTip"];
+var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalTip", "rowKey"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useRef } from 'react';
-import { isArray } from 'lodash';
+import { get, isArray } from 'lodash';
 import { useDebounceEffect, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import { transformColumns } from './utils';
@@ -50,6 +50,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     pagination = _ref.pagination,
     originalValues = _ref.originalValues,
     originalTip = _ref.originalTip,
+    rowKey = _ref.rowKey,
     resetProps = _objectWithoutProperties(_ref, _excluded);
   // 上下文form
   var contentForm = _Form.useFormInstance();
@@ -97,21 +98,23 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     'pro-table-no-stripe': !stripe,
     className: className
   });
-  // 编辑行设置下样式
-  var _rowClassName = function _rowClassName(record) {
-    return !virtualKey || editingKeys.includes(record.rowKey) ? 'is-editing' : '';
+  var getRowKey = function getRowKey(record) {
+    var key = record.rowKey || getRandom();
+    if (rowKey) {
+      var _ref2;
+      key = (_ref2 = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref2 !== void 0 ? _ref2 : key;
+    }
+    return key;
   };
-  // 复选框
-  var _rowSelection = _objectSpread({
-    fixed: true,
-    selectedRowKeys: selectedRowKeys,
-    onChange: function onChange(selectedRowKeys, selectedRows) {
-      setState({
-        selectedRowKeys: selectedRowKeys,
-        selectedRows: selectedRows
-      });
+  var IsNew = function IsNew(preArr, record) {
+    var _preArr$find;
+    if (!(preArr === null || preArr === void 0 ? void 0 : preArr.length)) {
+      return false;
     }
-  }, rowSelection);
+    return !(preArr === null || preArr === void 0 ? void 0 : (_preArr$find = preArr.find) === null || _preArr$find === void 0 ? void 0 : _preArr$find.call(preArr, function (item) {
+      return getRowKey(item) === getRowKey(record);
+    }));
+  };
   var config = {
     form: form,
     mode: mode,
@@ -144,6 +147,27 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     originalTip: originalTip,
     prefixCls: prefixCls
   };
+  // 编辑行设置下样式
+  var _rowClassName = function _rowClassName(record) {
+    var isEdit = !virtualKey || editingKeys.includes(record.rowKey);
+    var className = isEdit ? 'is-editing' : '';
+    var originalArr = get(originalValues, name);
+    if (!isEdit && IsNew(originalArr, record)) {
+      return "is-new-row ".concat(className);
+    }
+    return className;
+  };
+  // 复选框
+  var _rowSelection = _objectSpread({
+    fixed: true,
+    selectedRowKeys: selectedRowKeys,
+    onChange: function onChange(selectedRowKeys, selectedRows) {
+      setState({
+        selectedRowKeys: selectedRowKeys,
+        selectedRows: selectedRows
+      });
+    }
+  }, rowSelection);
   // 判断是否禁止添加、批量删除
   var isForbiddenBtn = useCallback(function (type) {
     // 当工具栏不渲染时，都不渲染
@@ -202,7 +226,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     return isForbiddenBtn('mulDelete') ? rowSelection : _rowSelection;
   };
   var setColumns = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var nextColumns;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -221,7 +245,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       }, _callee);
     }));
     return function setColumns() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   useDebounceEffect(function () {
@@ -235,11 +259,16 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     var _value$;
     // 初始化默认生成row-key
     if ((value === null || value === void 0 ? void 0 : value.length) && !(value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey)) {
+      var _originalArr$forEach;
       var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
         return _objectSpread(_objectSpread({}, item), {}, {
-          rowKey: getRandom()
+          rowKey: getRowKey(item)
         });
       });
+      var originalArr = get(originalValues, name);
+      originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$forEach = originalArr.forEach) === null || _originalArr$forEach === void 0 ? void 0 : _originalArr$forEach.call(originalArr, function (item) {
+        item.rowKey = getRowKey(item);
+      });
       onChange(nextValues);
       if (virtualKey) {
         form.setFieldValue(virtualRowName, nextValues);

package/es/ProEditTable/style/index.less

@@ -296,6 +296,11 @@
     }
   }
 
+  .is-new-row, .is-new-row.@{ant-prefix}-table-row:hover {
+    td, .@{ant-prefix}-table-cell-row-hover {
+      background: var(--ant-primary-2) !important;
+    }
+  }
 }
 
 .pro-edit-table-header {

package/es/ProEnum/hooks/useEnumRequest.js

@@ -72,6 +72,18 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
               case 9:
                 res.data = response;
               case 10:
+                if (!(_typeof(response) !== 'object' || response === null)) {
+                  _context.next = 12;
+                  break;
+                }
+                throw Error('response enum data must be object');
+              case 12:
+                if (!(Object.keys(response).length === 0)) {
+                  _context.next = 14;
+                  break;
+                }
+                throw Error('Please return valid enumeration data');
+              case 14:
                 // 只返回fieldNames对象的key
                 if (clear) {
                   // 忽略清洗的 codes
@@ -106,7 +118,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                   }, 10000);
                 }
                 return _context.abrupt("return", res);
-              case 17:
+              case 21:
               case "end":
                 return _context.stop();
             }

package/es/ProEnum/index.js

@@ -16,7 +16,7 @@ var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
 import React, { useState, useEffect, useMemo } from 'react';
-import { cloneDeep, isFunction, isString, isArray } from 'lodash';
+import { cloneDeep, isFunction, isString, isArray, omit } from 'lodash';
 import ProSelect from '../ProSelect';
 import { useProConfig } from '../ProConfigProvider';
 import ProEnumTag from './components/Tag';
@@ -79,7 +79,6 @@ var ProEnum = function ProEnum(props) {
   var _useProConfig = useProConfig('ProEnum'),
     _useProConfig$dics = _useProConfig.dics,
     dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
-  // const enumList = dics?.[code] || [];
   var _useRequestFunc = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread(_objectSpread({
       manual: true,
       cacheTime: -1
@@ -173,26 +172,16 @@ var ProEnum = function ProEnum(props) {
           onChange: onChange
         }));
       case 'Radio':
-        return _jsx(_Radio.Group, _objectSpread(_objectSpread({}, enumProps), {}, {
+        return _jsx(_Radio.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames'])), {}, {
+          options: list,
           value: value,
-          onChange: onChange,
-          children: list.map(function (item) {
-            return _jsx(_Radio, {
-              value: item[fieldValue],
-              children: item[label]
-            }, item[fieldValue]);
-          })
+          onChange: onChange
         }));
       case 'Checkbox':
-        return _jsx(_Checkbox.Group, _objectSpread(_objectSpread({}, enumProps), {}, {
+        return _jsx(_Checkbox.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames'])), {}, {
+          options: list,
           value: value,
-          onChange: onChange,
-          children: list.map(function (item) {
-            return _jsx(_Checkbox, {
-              value: item[fieldValue],
-              children: item[label]
-            }, item[fieldValue]);
-          })
+          onChange: onChange
         }));
       case 'Tag':
         return _jsx(ProEnumTag, {

package/es/ProEnum/propsType.d.ts

@@ -6,6 +6,7 @@ import { PropSelectProps } from '../ProSelect/propsType';
 export interface DataOption {
     label?: string;
     value?: string;
+    disabled?: boolean;
     [key: string]: any;
 }
 export interface ProEnumConfig {

package/es/ProForm/components/combination/FormList/components/ActionButton.js

@@ -145,13 +145,13 @@ var ActionButton = function ActionButton(props) {
     align: "start",
     className: "pro-form-list-action",
     children: actionProps === null || actionProps === void 0 ? void 0 : actionProps.map(function (item) {
-      if (item.show === false) return _jsx(_Fragment, {});
+      if (item.show === false) return _jsx("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
       if (isFunction(item.show) && !item.show(form.getFieldValue(namePath), {
         namePath: namePath,
         index: index,
         form: form
       })) {
-        return _jsx(_Fragment, {});
+        return _jsx("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
       }
       var label = item.label,
         onClick = item.onClick,

package/es/ProForm/components/combination/FormList/index.js

@@ -62,7 +62,7 @@ var FormList = function FormList(props, ref) {
   var handleDragEnd = function handleDragEnd(drag) {
     var active = drag.active,
       over = drag.over;
-    if (active.id !== over.id) {
+    if (_fields.length > 1 && active.id !== over.id) {
       var activeIndex = _fields.findIndex(function (item) {
         return item.key === active.id;
       });

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

@@ -9,7 +9,7 @@ import { useMemo } from 'react';
 import { omit } from 'lodash';
 import classnames from 'classnames';
 import RenderFields from '../../render/RenderFields';
-import { insertSeparator, parseName } from './utils';
+import { insertSeparator } from './utils';
 import ProForm from '../../../../ProForm';
 var Group = function Group(props) {
   var columns = props.children,
@@ -27,7 +27,6 @@ var Group = function Group(props) {
   if (!Array.isArray(names)) {
     console.error('Warning: Composite form components whose type is Group must be configured with names');
   }
-  var _parentNames = parseName(id);
   var data = useMemo(function () {
     var fieldList = [];
     var result = columns.map(function (item) {
@@ -35,7 +34,7 @@ var Group = function Group(props) {
         disabled: Boolean(props === null || props === void 0 ? void 0 : props.disabled)
       }, item), {}, {
         noStyle: (space === null || space === void 0 ? void 0 : space.compact) || (space === null || space === void 0 ? void 0 : space.separator),
-        parentNames: _parentNames
+        parentNames: id
       });
     });
     var node = _jsx(_Button, {
@@ -46,7 +45,7 @@ var Group = function Group(props) {
       columns: insertSeparator(result, space, node, otherProps),
       fieldList: fieldList
     };
-  }, [name, columns, space, props]);
+  }, [name, columns, space, props, names]);
   var _className = classnames(_defineProperty({
     'pro-group': true,
     'pro-group-diy-width': columns.some(function (item) {

package/es/ProForm/components/combination/Group/style/index.less

@@ -2,20 +2,20 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .border-radius(@start-end: 0, @end-end: 0, @start-start: 0, @end-start: 0) {
-  border-start-end-radius  : @start-end;
-  border-end-end-radius    : @end-end;
+  border-start-end-radius: @start-end;
+  border-end-end-radius: @end-end;
   border-start-start-radius: @start-start;
-  border-end-start-radius  : @end-start;
+  border-end-start-radius: @end-start;
 }
 
 .start-radius() {
   border-start-start-radius: var(--zaui-border-radius, 4px);
-  border-end-start-radius  : var(--zaui-border-radius, 4px);
+  border-end-start-radius: var(--zaui-border-radius, 4px);
 }
 
 .end-radius() {
   border-start-end-radius: var(--zaui-border-radius, 4px);
-  border-end-end-radius  : var(--zaui-border-radius, 4px);
+  border-end-end-radius: var(--zaui-border-radius, 4px);
 }
 
 .pro-group {
@@ -39,7 +39,6 @@
     }
 
     .@{ant-prefix}-form-item {
-
       margin-bottom: 0 !important;
     }
   }
@@ -49,19 +48,26 @@
   }
 
   .@{ant-prefix}-space-compact {
+    flex: auto;
     align-items: center;
-    flex       : auto;
-    width      : 100%;
+    width: 100%;
 
     .@{ant-prefix}-form-item {
       margin-bottom: 0 !important;
     }
 
     .group-separator {
-      margin-inline-end        : -2px;
-      margin-inline-start      : -1px;
+      margin-inline-end: -2px;
+      margin-inline-start: -1px;
       border-start-start-radius: 0;
-      border-end-start-radius  : 0;
+      border-end-start-radius: 0;
+    }
+    .pro-modal-select {
+      margin-left: -1px;
+      .@{ant-prefix}-input{
+        border-start-start-radius: 0;
+        border-end-start-radius: 0;
+      }
     }
 
     // 定制内敛合并样式
@@ -69,16 +75,16 @@
     .@{ant-prefix}-select {
       .border-radius(0, 0, 0, 0);
 
-      &:nth-child(n+2) {
-        margin-inline-start: -1px
+      &:nth-child(n + 2) {
+        margin-inline-start: -1px;
       }
 
       &:first-child {
-        .start-radius()
+        .start-radius();
       }
 
       &:last-child {
-        .end-radius()
+        .end-radius();
       }
     }
 
@@ -89,22 +95,21 @@
 
       &:first-child {
         .@{ant-prefix}-select-selector {
-          .start-radius()
+          .start-radius();
         }
       }
 
       &:last-child {
         .@{ant-prefix}-select-selector {
-          .end-radius()
+          .end-radius();
         }
       }
-
     }
 
     // 报错样式定制
-    .@{ant-prefix}-input-affix-wrapper-status-error~.group-separator {
+    .@{ant-prefix}-input-affix-wrapper-status-error ~ .group-separator {
+      color: var(--ant-error-color);
       border-color: var(--ant-error-color);
-      color       : var(--ant-error-color);
     }
   }
-}
+}

package/es/ProForm/components/combination/Group/utils.d.ts

@@ -6,5 +6,3 @@ import { SpaceType } from './propsType';
 * @returns
 */
 export declare const insertSeparator: (columns: any, space?: SpaceType, separatorNode?: ReactNode, otherProps?: any) => any;
-/** 解析name */
-export declare const parseName: (name: string) => any[];

package/es/ProForm/components/combination/Group/utils.js

@@ -33,17 +33,4 @@ export var insertSeparator = function insertSeparator(columns, space, separatorN
     }
     return result;
   }, []);
-};
-/** 解析name */
-export var parseName = function parseName(name) {
-  var result = [];
-  var parts = name.split('_');
-  parts.forEach(function (part) {
-    if (!Number.isNaN(Number(part))) {
-      result.push(Number(part));
-    } else {
-      result.push(part);
-    }
-  });
-  return result;
 };