@zat-design/sisyphus-react 3.8.0-beta.15 → 3.8.0-beta.16

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

@@ -6,83 +6,82 @@
     width: 32px !important;
     text-align: center !important;
 
-    border-right: 0px;
-    border-left: 0px;
     pointer-events: none;
     &.@{ant-prefix}-input[disabled] {
       background: #fff !important;
     }
   }
+  // 数字输入框error状态
   .@{ant-prefix}-input-number-status-error:not(.@{ant-prefix}-input-number-disabled):not(
       .@{ant-prefix}-input-number-borderless
     ).@{ant-prefix}-input-number {
     border-color: @zaui-danger !important;
   }
-  .@{ant-prefix}-input-status-error {
-    &.range-split {
-      color: @zaui-danger !important;
+
+  // 分隔符输入框error状态
+  &:has(.@{ant-prefix}-input-status-error):not(.pro-number-range-disabled) {
+    .range-split,
+    .range-addon-before,
+    .range-addon-after {
+      // color: @zaui-danger !important;
       border-color: @zaui-danger;
     }
   }
 
-  & .@{ant-prefix}-input-rtl.range-right {
-    border-right-width: 0;
-  }
-
-  & .@{ant-prefix}-input-rtl.range-right:hover,
-  & .@{ant-prefix}-input-rtl.range-right:focus {
-    border-right-width: 1px;
-  }
-
   .@{ant-prefix}-form-item {
     margin-bottom: 0;
   }
 
-  .range-left,
-  .range-right {
-    width: calc(50% - 20px);
-    text-align: center;
-  }
+  // .range-left,
+  // .range-right {
+  //   text-align: center;
+  // }
 
-  .range-left {
-    .@{ant-prefix}-input-number {
-      border-right: none;
-    }
-  }
+  // .range-left {
+  //   .@{ant-prefix}-input-number {
+  //     border-right: none;
+  //   }
+  // }
 
-  .range-right {
-    .@{ant-prefix}-input-number {
-      border-left: none;
-    }
+  // .range-right {
+  //   .@{ant-prefix}-input-number {
+  //     border-left: none;
+  //   }
 
-    .range-right {
-      width: 100%;
-      border-top-left-radius: 0;
-      border-bottom-left-radius: 0;
-    }
-  }
+  //   .range-right {
+  //     width: 100%;
+  //     border-top-left-radius: 0;
+  //     border-bottom-left-radius: 0;
+  //   }
+  // }
 
-  &.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact > *:not(:last-child) {
-    margin-right: 0;
+  .range-addon-before,
+  .range-addon-after {
+    color: var(--zaui-disabled-text);
+    pointer-events: none;
   }
 
-  > *:first-child {
-    border-top-right-radius: 0 !important;
-    border-bottom-right-radius: 0 !important;
+  // &.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact > *:not(:last-child) {
+  //   margin-right: 0;
+  // }
 
-    > .@{ant-prefix}-select-selector {
-      border-top-right-radius: 0 !important;
-      border-bottom-right-radius: 0 !important;
-    }
-  }
+  // > *:first-child {
+  //   border-top-right-radius: 0 !important;
+  //   border-bottom-right-radius: 0 !important;
 
-  > *:last-child {
-    border-top-left-radius: 0 !important;
-    border-bottom-left-radius: 0 !important;
+  //   > .@{ant-prefix}-select-selector {
+  //     border-top-right-radius: 0 !important;
+  //     border-bottom-right-radius: 0 !important;
+  //   }
+  // }
 
-    > .@{ant-prefix}-select-selector {
-      border-top-left-radius: 0 !important;
-      border-bottom-left-radius: 0 !important;
-    }
-  }
+  // > *:last-child {
+  //   border-top-left-radius: 0 !important;
+  //   border-bottom-left-radius: 0 !important;
+
+  //   > .@{ant-prefix}-select-selector {
+  //     border-top-left-radius: 0 !important;
+  //     border-bottom-left-radius: 0 !important;
+  //   }
+  // }
 }

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

@@ -17,7 +17,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _diffOriginal = require("../../utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
-var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName"];
+var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize"];
 var ChangedWrapper = function ChangedWrapper(props) {
   var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
   var name = props.name,
@@ -30,6 +30,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
     diffConfig = props.diffConfig,
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
+    normalize = props.normalize,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
@@ -44,9 +45,10 @@ 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];
     return (0, _diffOriginal.diffOriginal)({
       originalValue: originalValue,
-      value: props[valuePropName],
+      value: _value,
       form: form,
       equalWith: equalWith
       // name: namesStr || name,
@@ -84,7 +86,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var _showEllipse = ((_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.showEllipse) || ((_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : _children$props2.tooltip);
   return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
     open: tipOpenCalc(),
-    mouseEnterDelay: 1,
+    // mouseEnterDelay={1}
     getPopupContainer: function getPopupContainer(target) {
       return target.parentElement;
     },

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

@@ -437,6 +437,7 @@ var Render = function Render(props) {
         type: type,
         onChange: handleChange,
         valuePropName: _otherFormItemProps.valuePropName,
+        normalize: _otherFormItemProps.normalize,
         children: child
       });
     }

package/lib/ProForm/components/render/propsType.d.ts

@@ -197,7 +197,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
      * @default           -
      */
     labelWidth?: string | number;
-    disabled?: boolean | ReactiveFunction<Values, boolean>;
+    disabled?: boolean | boolean[] | ReactiveFunction<Values, boolean | boolean[]>;
     trim?: boolean;
     upperCase?: boolean;
     hiddenNames?: string[] | any[];

package/lib/ProForm/style/index.less

@@ -218,7 +218,7 @@
 
     .site-input-left,
     .site-input-right {
-      width: calc(50% - 20px);
+      width: calc(50% - 16px);
     }
 
     .site-input-left {

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

@@ -3,7 +3,7 @@ import { ProColumnProps, ProRule } from '../components/render/propsType';
 interface Result<Values> {
     shouldUpdate?: FormItemProps<Values>['shouldUpdate'];
     show?: boolean;
-    disabled?: boolean;
+    disabled?: boolean | boolean[];
     rules?: ProRule[];
     required?: boolean;
     [key: string]: any;
@@ -15,7 +15,7 @@ interface UseShouldUpdateProps<Values> {
         names?: any[];
     };
     form?: FormInstance<Values>;
-    disabled?: ProColumnProps['disabled'];
+    disabled?: boolean;
     rules?: ProRule[];
     required?: boolean;
     type: string;

package/lib/ProForm/utils/useShouldUpdate.js

@@ -70,7 +70,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
   }
   if ((0, _lodash.isFunction)(disabled)) {
     // RangePicker返回数组时，特殊处理
-    if (type === 'RangePicker' && Array.isArray(disabled(values, {
+    if (['Group', 'RangePicker'].includes(type) && Array.isArray(disabled(values, {
       form: form,
       index: index,
       namePath: namePath

package/lib/ProSelect/index.js

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

package/lib/ProSelect/utils/index.js

@@ -38,7 +38,7 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
       _iterator.f();
     }
     if (mode === 'multiple') {
-      selectValues = [].concat((0, _toConsumableArray2.default)(selectValues), (0, _toConsumableArray2.default)(result));
+      selectValues = [].concat((0, _toConsumableArray2.default)(selectValues), (0, _toConsumableArray2.default)(result || []));
     } else {
       selectValues.push(result);
     }
@@ -61,13 +61,14 @@ var getSelectList = exports.getSelectList = function getSelectList(_ref2) {
   if (!otherProps) {
     return null;
   }
-  var listName = otherProps.listName,
+  var name = otherProps.name,
+    listName = otherProps.listName,
     form = otherProps.form;
   var firstNumberIndex = listName.lastIndexOf(listName.findLast(function (item) {
     return typeof item === 'number';
   }));
-  var fatherName = listName.slice(0, firstNumberIndex);
-  var selectName = listName.slice(firstNumberIndex + 1);
+  var fatherName = (name || listName).slice(0, firstNumberIndex);
+  var selectName = (name || listName).slice(firstNumberIndex + 1);
   return findSelectNameValues({
     list: form.getFieldValue(fatherName) || [],
     selectName: selectName,

package/lib/ProTable/components/FormatColumn/index.d.ts

@@ -1,11 +1,12 @@
 import React from 'react';
 import { ProTableColumn } from '../../propsType';
-export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, }: {
+export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, wrapToolTipProps, }: {
     column: ProTableColumn;
     originalObj: any;
     dataSourceObj: any;
     rowKey: any;
     diffToolTip?: boolean;
+    wrapToolTipProps?: any;
 }) => void;
 /**
  * 查找最近的父级className

package/lib/ProTable/components/FormatColumn/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getParentElement = exports.formatColumn = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _moment15 = _interopRequireDefault(require("moment"));
@@ -22,7 +23,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
     originalObj = _ref.originalObj,
     dataSourceObj = _ref.dataSourceObj,
     rowKey = _ref.rowKey,
-    diffToolTip = _ref.diffToolTip;
+    diffToolTip = _ref.diffToolTip,
+    wrapToolTipProps = _ref.wrapToolTipProps;
   var title = column.title,
     valueType = column.valueType,
     _column$format = column.format,
@@ -42,6 +44,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
     originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT,
     _column$toolTipProps = column.toolTipProps,
     toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps;
+  var _toolTipProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, toolTipProps), wrapToolTipProps);
   var _originalDiffTip = diffToolTip !== null && diffToolTip !== void 0 ? diffToolTip : originalDiffTip;
   // 前缀处理
   var prefixNode = function prefixNode(value, record, index) {
@@ -111,7 +114,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: toolTipProps
+        toolTipProps: _toolTipProps
       });
     };
     // 千分位, 千分位带CNY前缀
@@ -141,7 +144,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: toolTipProps
+        toolTipProps: _toolTipProps
       });
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
@@ -194,7 +197,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: toolTipProps
+        toolTipProps: _toolTipProps
       });
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -232,7 +235,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: toolTipProps
+        toolTipProps: _toolTipProps
       });
     };
   } else if (precision || prefix || suffix) {
@@ -259,7 +262,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: toolTipProps
+        toolTipProps: _toolTipProps
       });
     };
   } else if (valueType === 'address') {
@@ -315,7 +318,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
           node: value,
           value: value,
           currentValue: value,
-          toolTipProps: toolTipProps
+          toolTipProps: _toolTipProps
         }), suffixNode(value, record, index)]
       });
     };
@@ -336,7 +339,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
           value: value,
           currentValue: value || '-',
           originalDiffTip: _originalDiffTip,
-          toolTipProps: toolTipProps
+          toolTipProps: _toolTipProps
         }), suffixNode(value, record, index)]
       });
     };
@@ -359,7 +362,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: value || '-',
         originalDiffTip: _originalDiffTip,
-        toolTipProps: toolTipProps
+        toolTipProps: _toolTipProps
       });
     };
   }

package/lib/ProTable/index.js

@@ -63,6 +63,15 @@ function ProTable(props) {
     onDragStartGuard = props.onDragStart,
     onDragEndGuard = props.onDragEnd,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var _props$scrollFollowPa = props.scrollFollowParent,
+    scrollFollowParent = _props$scrollFollowPa === void 0 ? true : _props$scrollFollowPa;
+  var wrapToolTipProps = {
+    getPopupContainer: scrollFollowParent ? function (triggerNode) {
+      return triggerNode.parentNode;
+    } : function () {
+      return document.body;
+    }
+  };
   var _ref3 = diffConfig || {},
     originalDataSource = _ref3.originalDataSource,
     changeTipColor = _ref3.changeTipColor,
@@ -205,7 +214,8 @@ function ProTable(props) {
         originalObj: originalObj,
         dataSourceObj: dataSourceObj,
         rowKey: 'rowKey',
-        diffToolTip: toolTip
+        diffToolTip: toolTip,
+        wrapToolTipProps: wrapToolTipProps
       });
     });
     return newColumns;

package/lib/ProTable/propsType.d.ts

@@ -103,6 +103,10 @@ export interface ProTableProps<T = any> extends Omit<TableProps<any>, 'summary'
      */
     onDragStart?: DragStartGuardProps;
     onDragEnd?: DragEndGuardProps;
+    /**
+     * 滚动额外配置
+     */
+    scrollFollowParent?: boolean;
 }
 export type ProTableValueType = 'percentage' | 'permillage' | 'thousandth' | 'datePicker' | 'enumName' | 'enumCodeName' | 'address' | 'thousandthCNY' | 'date' | 'dateTime' | 'dateStartTime' | 'dateEndTime' | 'dateStartEndTime';
 export interface Response<T = any> {

package/lib/ProTree/components/ProTreeSelect/index.js

@@ -297,6 +297,16 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     var labelText = node[label];
     var value = node[code];
     var key = node[uuidKey];
+    // 三无走默认
+    if (['undefined-undefined', 'undefined'].includes(labelText) && !value && !key) {
+      if (showCodeName) {
+        labelText = "".concat(node === null || node === void 0 ? void 0 : node.value, "-").concat(node === null || node === void 0 ? void 0 : node.label);
+      } else {
+        labelText = node === null || node === void 0 ? void 0 : node.label;
+      }
+      value = node === null || node === void 0 ? void 0 : node.value;
+      key = node === null || node === void 0 ? void 0 : node.value;
+    }
     var titleHtml = (0, _jsxRuntime.jsx)("span", {
       dangerouslySetInnerHTML: {
         __html: labelText

package/package.json

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