@zat-design/sisyphus-react 3.9.1-beta.9 → 3.9.2

package/dist/index.esm.css

@@ -1246,6 +1246,9 @@
   border-radius: var(--zaui-border-radius, 8px) !important;
   background: #E4F2FE;
 }
+.pro-layout.pro-layout-light .pro-collapse .pro-collapse-panel .pro-collapse-level2-collapse .ant-collapse-header {
+  border-radius: 0 !important;
+}
 .pro-layout.pro-layout-light .pro-header {
   border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
 }
@@ -2654,6 +2657,17 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   border-start-end-radius: 4px;
   border-end-end-radius: 4px;
 }
+.pro-group .ant-space-compact .pro-select .ant-select .ant-select-selector {
+  border-radius: 0 !important;
+}
+.pro-group .ant-space-compact .pro-select:first-child .ant-select .ant-select-selector {
+  border-start-start-radius: 4px !important;
+  border-end-start-radius: 4px !important;
+}
+.pro-group .ant-space-compact .pro-select:last-child .ant-select .ant-select-selector {
+  border-start-end-radius: 4px  !important;
+  border-end-end-radius: 4px!important;
+}
 .pro-group .ant-space-compact .ant-select .ant-select-selector {
   border-start-end-radius: 0;
   border-end-end-radius: 0;

package/dist/less.esm.css

@@ -1246,6 +1246,9 @@
   border-radius: var(--zaui-border-radius, 8px) !important;
   background: #E4F2FE;
 }
+.pro-layout.pro-layout-light .pro-collapse .pro-collapse-panel .pro-collapse-level2-collapse .ant-collapse-header {
+  border-radius: 0 !important;
+}
 .pro-layout.pro-layout-light .pro-header {
   border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
 }
@@ -2654,6 +2657,17 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   border-start-end-radius: 4px;
   border-end-end-radius: 4px;
 }
+.pro-group .ant-space-compact .pro-select .ant-select .ant-select-selector {
+  border-radius: 0 !important;
+}
+.pro-group .ant-space-compact .pro-select:first-child .ant-select .ant-select-selector {
+  border-start-start-radius: 4px !important;
+  border-end-start-radius: 4px !important;
+}
+.pro-group .ant-space-compact .pro-select:last-child .ant-select .ant-select-selector {
+  border-start-end-radius: 4px  !important;
+  border-end-end-radius: 4px!important;
+}
 .pro-group .ant-space-compact .ant-select .ant-select-selector {
   border-start-end-radius: 0;
   border-end-end-radius: 0;

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

@@ -118,7 +118,8 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   var noChange = !equalWith && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
   var diffType = useMemo(function () {
     if (!isWatch || noChange) return 'same';
-    var _value = normalize ? normalize(props[valuePropName]) : props[valuePropName];
+    var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
+    : props[valuePropName];
     return diffOriginal({
       value: _value,
       originalValue: originalValue,

package/es/ProEditTable/propsType.d.ts

@@ -8,6 +8,7 @@ import type { ColumnType, TableProps } from 'antd/es/table';
 import type { FormInstance, FormItemProps } from 'antd/es/form';
 import type { FunctionArgs, ProRule } from '../ProForm/propsType';
 import { ProFormValueType, ColumnPropsMap } from '../ProForm/components/render/propsType';
+import { DiffOriginalParams } from '../ProForm/utils/diffOriginal';
 export type ActionType = 'edit' | 'delete' | 'save' | 'cancel' | 'add' | 'mulDelete' | 'custom';
 export type ShowFunction<T> = (record?: T, options?: {
     index?: number;
@@ -105,6 +106,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     hiddenNames?: NamePath[] | NamePath[][];
     rules?: ProRule[] | RulesFn<T>;
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
+    onDiff?: DiffOriginalParams['equalWith'];
     [key: string]: any;
 }
 export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;

package/es/ProEnum/index.js

@@ -231,7 +231,6 @@ var ProEnum = function ProEnum(props) {
   if (!code && !dataSource && !useRequest) {
     var _locale$ProEnum4;
     _message.error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType);
-    // return;
   }
   var transToLabel = function transToLabel(value) {
     var list = dataList && dataList.length ? dataList : enumLists;

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

@@ -70,23 +70,30 @@ var Group = function Group(props) {
     id: id,
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {
       children: columns.map(function (column, index) {
-        return _jsx(ComRender, _objectSpread(_objectSpread({
+        column.otherProps = otherProps;
+        // 自定义间隔移除对于参数
+        if (column === null || column === void 0 ? void 0 : column.separator) {
+          delete column.separator;
+          delete column.otherProps;
+        }
+        return _jsx(ComRender, _objectSpread({
           contextProps: contextProps,
           isView: isParentView || isView
-        }, column), {}, {
-          otherProps: otherProps
-        }), column.name);
+        }, column), column.name || index);
       })
     }) : _jsx(_Space, _objectSpread(_objectSpread({
       align: "start"
     }, omit(space, ['separator', 'compact'])), {}, {
       children: columns.map(function (column, index) {
-        return _jsx(ComRender, _objectSpread(_objectSpread({
+        column.otherProps = otherProps;
+        if (column === null || column === void 0 ? void 0 : column.separator) {
+          delete column.separator;
+          delete column.otherProps;
+        }
+        return _jsx(ComRender, _objectSpread({
           contextProps: contextProps,
           isView: isParentView || isView
-        }, column), {}, {
-          otherProps: otherProps
-        }), column.name);
+        }, column), column.name || index);
       })
     }))
   });

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

@@ -12,6 +12,8 @@ export interface SpaceType extends SpaceProps {
      * 分隔符
      */
     separator?: string | React.ReactNode;
+    /** 分隔符插入位置 */
+    separatorIndex?: number | number[];
     /** 间隔距离 */
     size?: number;
 }

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

@@ -104,6 +104,21 @@
       }
     }
 
+    .pro-select {
+      .@{ant-prefix}-select .@{ant-prefix}-select-selector{
+        border-radius: 0 !important;
+      }
+      &:first-child   .@{ant-prefix}-select .@{ant-prefix}-select-selector {
+        border-start-start-radius: 4px !important;
+        border-end-start-radius: 4px !important;
+      }
+
+      &:last-child   .@{ant-prefix}-select .@{ant-prefix}-select-selector {
+        border-start-end-radius: 4px  !important;
+        border-end-end-radius: 4px!important;
+      }
+    }
+
     .@{ant-prefix}-select {
       .@{ant-prefix}-select-selector {
         .border-radius(0, 0, 0, 0);

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

@@ -4,8 +4,10 @@ import _typeof from "@babel/runtime/helpers/esm/typeof";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import { jsx as _jsx } from "react/jsx-runtime";
+/* eslint-disable no-lonely-if */
 import { useRef } from 'react';
 import { cloneDeep, isEqual, isFunction } from 'lodash';
+import { validate } from '@zat-design/utils';
 import valueTypeMap from '../../../utils/valueType';
 import { useDeepCompareMemo } from '../../../utils/useDeepCompareMemo';
 import { difference } from '../../../../ProEditTable/utils/tools';
@@ -18,20 +20,52 @@ export var insertSeparator = function insertSeparator(columns, space) {
   if (!(space === null || space === void 0 ? void 0 : space.separator)) {
     return columns;
   }
+  var separatorIndexs = function () {
+    var reuslt = [];
+    if (validate.isEmpty(space === null || space === void 0 ? void 0 : space.separatorIndex)) {
+      return reuslt;
+    }
+    // 如果 index 是数字，将其转换为数组
+    if (typeof (space === null || space === void 0 ? void 0 : space.separatorIndex) === 'number') {
+      reuslt.push(space.separatorIndex);
+    }
+    if (Array.isArray(space.separatorIndex)) {
+      reuslt = reuslt.concat(space.separatorIndex);
+    }
+    return reuslt;
+  }();
   return columns.reduce(function (result, current, index, array) {
     // 将当前元素添加到结果数组中
     result.push(current);
-    // 如果当前元素不是最后一个元素，则添加间隔符
-    if (index < array.length - 1) {
-      result.push({
-        component: _jsx(_Button, {
-          className: "group-separator",
-          children: space.separator
-        }),
-        fieldProps: {
-          disabled: true
+    if (separatorIndexs === null || separatorIndexs === void 0 ? void 0 : separatorIndexs.length) {
+      separatorIndexs.forEach(function (separatorIndex) {
+        if (index === separatorIndex) {
+          result.push({
+            separator: true,
+            component: _jsx(_Button, {
+              className: "group-separator",
+              children: space.separator
+            }),
+            fieldProps: {
+              disabled: true
+            }
+          });
         }
       });
+    } else {
+      // 如果当前元素不是最后一个元素，则添加间隔符
+      if (index < array.length - 1) {
+        result.push({
+          separator: true,
+          component: _jsx(_Button, {
+            className: "group-separator",
+            children: space.separator
+          }),
+          fieldProps: {
+            disabled: true
+          }
+        });
+      }
     }
     return result;
   }, []);

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

@@ -35,11 +35,17 @@ var _filterDataSource = function filterDataSource(dataSource, level, fieldNames)
   });
 };
 var getViewLabel = function getViewLabel(_ref) {
+  var _value2;
   var dataSource = _ref.dataSource,
     value = _ref.value;
+  var _value = value;
   var viewLabel = [];
+  // fix: value是string类型，需要转为数组
+  if (_value && !Array.isArray(_value)) {
+    _value = [value];
+  }
   // 根据dataSource得到label数组，查看模式展示需要
-  value === null || value === void 0 ? void 0 : value.forEach(function (value, index) {
+  (_value2 = _value) === null || _value2 === void 0 ? void 0 : _value2.forEach(function (value, index) {
     var _dataSource;
     var temp = (_dataSource = dataSource) === null || _dataSource === void 0 ? void 0 : _dataSource.find(function (item) {
       return (item === null || item === void 0 ? void 0 : item.value) === value;

package/es/ProForm/components/render/ChangedWrapper.js

@@ -44,7 +44,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var noChange = !equalWith && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
   var diffType = useMemo(function () {
     if (!isWatch || noChange) return 'same';
-    var _value = normalize ? normalize(props[valuePropName]) : props[valuePropName];
+    var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
+    : props[valuePropName];
     return diffOriginal({
       originalValue: originalValue,
       value: _value,

package/es/ProLayout/style/index.less

@@ -67,6 +67,11 @@
           border-radius: var(--zaui-border-radius, 8px) !important;
           background: #E4F2FE;
         }
+        .pro-collapse-level2-collapse{
+          .@{ant-prefix}-collapse-header{
+            border-radius: 0 !important;
+          }
+        }
      
       }
     }

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

@@ -123,7 +123,8 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   var noChange = !equalWith && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
   var diffType = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return 'same';
-    var _value = normalize ? normalize(props[valuePropName]) : props[valuePropName];
+    var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
+    : props[valuePropName];
     return (0, _diffOriginal.diffOriginal)({
       value: _value,
       originalValue: originalValue,

package/lib/ProEditTable/propsType.d.ts

@@ -8,6 +8,7 @@ import type { ColumnType, TableProps } from 'antd/es/table';
 import type { FormInstance, FormItemProps } from 'antd/es/form';
 import type { FunctionArgs, ProRule } from '../ProForm/propsType';
 import { ProFormValueType, ColumnPropsMap } from '../ProForm/components/render/propsType';
+import { DiffOriginalParams } from '../ProForm/utils/diffOriginal';
 export type ActionType = 'edit' | 'delete' | 'save' | 'cancel' | 'add' | 'mulDelete' | 'custom';
 export type ShowFunction<T> = (record?: T, options?: {
     index?: number;
@@ -105,6 +106,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     hiddenNames?: NamePath[] | NamePath[][];
     rules?: ProRule[] | RulesFn<T>;
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
+    onDiff?: DiffOriginalParams['equalWith'];
     [key: string]: any;
 }
 export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;

package/lib/ProEnum/index.js

@@ -232,7 +232,6 @@ var ProEnum = function ProEnum(props) {
   if (!code && !dataSource && !useRequest) {
     var _locale$ProEnum4;
     _antd.message.error(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum4 = _locale.default.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType);
-    // return;
   }
   var transToLabel = function transToLabel(value) {
     var list = dataList && dataList.length ? dataList : enumLists;

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

@@ -76,23 +76,30 @@ var Group = function Group(props) {
     id: id,
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? (0, _jsxRuntime.jsx)(_antd.Space.Compact, {
       children: columns.map(function (column, index) {
-        return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        column.otherProps = otherProps;
+        // 自定义间隔移除对于参数
+        if (column === null || column === void 0 ? void 0 : column.separator) {
+          delete column.separator;
+          delete column.otherProps;
+        }
+        return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)({
           contextProps: contextProps,
           isView: isParentView || isView
-        }, column), {}, {
-          otherProps: otherProps
-        }), column.name);
+        }, column), column.name || index);
       })
     }) : (0, _jsxRuntime.jsx)(_antd.Space, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       align: "start"
     }, (0, _lodash.omit)(space, ['separator', 'compact'])), {}, {
       children: columns.map(function (column, index) {
-        return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        column.otherProps = otherProps;
+        if (column === null || column === void 0 ? void 0 : column.separator) {
+          delete column.separator;
+          delete column.otherProps;
+        }
+        return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)({
           contextProps: contextProps,
           isView: isParentView || isView
-        }, column), {}, {
-          otherProps: otherProps
-        }), column.name);
+        }, column), column.name || index);
       })
     }))
   });

package/lib/ProForm/components/combination/Group/propsType.d.ts

@@ -12,6 +12,8 @@ export interface SpaceType extends SpaceProps {
      * 分隔符
      */
     separator?: string | React.ReactNode;
+    /** 分隔符插入位置 */
+    separatorIndex?: number | number[];
     /** 间隔距离 */
     size?: number;
 }

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

@@ -104,6 +104,21 @@
       }
     }
 
+    .pro-select {
+      .@{ant-prefix}-select .@{ant-prefix}-select-selector{
+        border-radius: 0 !important;
+      }
+      &:first-child   .@{ant-prefix}-select .@{ant-prefix}-select-selector {
+        border-start-start-radius: 4px !important;
+        border-end-start-radius: 4px !important;
+      }
+
+      &:last-child   .@{ant-prefix}-select .@{ant-prefix}-select-selector {
+        border-start-end-radius: 4px  !important;
+        border-end-end-radius: 4px!important;
+      }
+    }
+
     .@{ant-prefix}-select {
       .@{ant-prefix}-select-selector {
         .border-radius(0, 0, 0, 0);

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

@@ -12,10 +12,13 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _lodash = require("lodash");
+var _utils = require("@zat-design/utils");
 var _antd = require("antd");
 var _valueType = _interopRequireDefault(require("../../../utils/valueType"));
 var _useDeepCompareMemo = require("../../../utils/useDeepCompareMemo");
 var _tools = require("../../../../ProEditTable/utils/tools");
+/* eslint-disable no-lonely-if */
+
 /**
  * 插入间隔符
  * @param columns 表单配置数组
@@ -25,20 +28,52 @@ var insertSeparator = exports.insertSeparator = function insertSeparator(columns
   if (!(space === null || space === void 0 ? void 0 : space.separator)) {
     return columns;
   }
+  var separatorIndexs = function () {
+    var reuslt = [];
+    if (_utils.validate.isEmpty(space === null || space === void 0 ? void 0 : space.separatorIndex)) {
+      return reuslt;
+    }
+    // 如果 index 是数字，将其转换为数组
+    if (typeof (space === null || space === void 0 ? void 0 : space.separatorIndex) === 'number') {
+      reuslt.push(space.separatorIndex);
+    }
+    if (Array.isArray(space.separatorIndex)) {
+      reuslt = reuslt.concat(space.separatorIndex);
+    }
+    return reuslt;
+  }();
   return columns.reduce(function (result, current, index, array) {
     // 将当前元素添加到结果数组中
     result.push(current);
-    // 如果当前元素不是最后一个元素，则添加间隔符
-    if (index < array.length - 1) {
-      result.push({
-        component: (0, _jsxRuntime.jsx)(_antd.Button, {
-          className: "group-separator",
-          children: space.separator
-        }),
-        fieldProps: {
-          disabled: true
+    if (separatorIndexs === null || separatorIndexs === void 0 ? void 0 : separatorIndexs.length) {
+      separatorIndexs.forEach(function (separatorIndex) {
+        if (index === separatorIndex) {
+          result.push({
+            separator: true,
+            component: (0, _jsxRuntime.jsx)(_antd.Button, {
+              className: "group-separator",
+              children: space.separator
+            }),
+            fieldProps: {
+              disabled: true
+            }
+          });
         }
       });
+    } else {
+      // 如果当前元素不是最后一个元素，则添加间隔符
+      if (index < array.length - 1) {
+        result.push({
+          separator: true,
+          component: (0, _jsxRuntime.jsx)(_antd.Button, {
+            className: "group-separator",
+            children: space.separator
+          }),
+          fieldProps: {
+            disabled: true
+          }
+        });
+      }
     }
     return result;
   }, []);

package/lib/ProForm/components/combination/ProCascader/index.js

@@ -35,11 +35,17 @@ var _filterDataSource = function filterDataSource(dataSource, level, fieldNames)
   });
 };
 var getViewLabel = function getViewLabel(_ref) {
+  var _value2;
   var dataSource = _ref.dataSource,
     value = _ref.value;
+  var _value = value;
   var viewLabel = [];
+  // fix: value是string类型，需要转为数组
+  if (_value && !Array.isArray(_value)) {
+    _value = [value];
+  }
   // 根据dataSource得到label数组，查看模式展示需要
-  value === null || value === void 0 ? void 0 : value.forEach(function (value, index) {
+  (_value2 = _value) === null || _value2 === void 0 ? void 0 : _value2.forEach(function (value, index) {
     var _dataSource;
     var temp = (_dataSource = dataSource) === null || _dataSource === void 0 ? void 0 : _dataSource.find(function (item) {
       return (item === null || item === void 0 ? void 0 : item.value) === value;

package/lib/ProForm/components/render/ChangedWrapper.js

@@ -49,7 +49,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var noChange = !equalWith && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
   var diffType = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return 'same';
-    var _value = normalize ? normalize(props[valuePropName]) : props[valuePropName];
+    var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
+    : props[valuePropName];
     return (0, _diffOriginal.diffOriginal)({
       originalValue: originalValue,
       value: _value,

package/lib/ProLayout/style/index.less

@@ -67,6 +67,11 @@
           border-radius: var(--zaui-border-radius, 8px) !important;
           background: #E4F2FE;
         }
+        .pro-collapse-level2-collapse{
+          .@{ant-prefix}-collapse-header{
+            border-radius: 0 !important;
+          }
+        }
      
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.9.1-beta.9",
+  "version": "3.9.2",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -59,7 +59,7 @@
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
     "@pansy/react-watermark": "^3.1.13",
-    "@zat-design/utils": "1.1.36",
+    "@zat-design/utils": "1.1.37",
     "ahooks": "3.7.4",
     "antd": "4.24.8",
     "big.js": "^6.2.1",

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "kisstkondoros.vscode-codemetrics"
-    ]
-}