@zat-design/sisyphus-react 4.0.0-beta.7 → 4.0.0-beta.8

package/lib/ProEditTable/utils/useShouldUpdateForTable.d.ts

@@ -0,0 +1,15 @@
+interface UseShouldUpdateForTableProps {
+    rowParams: any[];
+    column: any;
+    shouldUpdateDebounce: number;
+}
+interface Result {
+    isEditable: any;
+    required: any;
+    rules: any;
+    fieldProps: any;
+    desensitization: any;
+    valueType: any;
+}
+declare const useShouldUpdateForTable: (props: UseShouldUpdateForTableProps) => Result;
+export default useShouldUpdateForTable;

package/lib/ProEditTable/utils/useShouldUpdateForTable.js

@@ -0,0 +1,139 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var _lodash = require("lodash");
+var _utils = require("../../utils");
+var useShouldUpdateForTable = props => {
+  var _isEditableRef$curren, _requiredRef$current, _rulesRef$current, _fieldPropsRef$curren, _desensitizationRef$c, _valueTypeRef$current;
+  var rowParams = props.rowParams,
+    column = props.column,
+    shouldUpdateDebounce = props.shouldUpdateDebounce;
+
+  // refs 存储当前值
+  var isEditableRef = (0, _react.useRef)();
+  var requiredRef = (0, _react.useRef)();
+  var rulesRef = (0, _react.useRef)();
+  var fieldPropsRef = (0, _react.useRef)();
+  var desensitizationRef = (0, _react.useRef)();
+  var valueTypeRef = (0, _react.useRef)();
+  var _useState = (0, _react.useState)({}),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    reRender = _useState2[1];
+  var debouncedUpdateRef = (0, _react.useRef)(null);
+  var pendingParamsRef = (0, _react.useRef)(null);
+
+  // 统一处理所有动态属性的更新
+  var processUpdate = params => {
+    var hasChange = false;
+
+    // isEditable 处理
+    if ((0, _lodash.isFunction)(column.isEditable)) {
+      var newIsEditable = column.isEditable(...params);
+      if (isEditableRef.current !== newIsEditable) {
+        isEditableRef.current = newIsEditable;
+        hasChange = true;
+      }
+    } else {
+      isEditableRef.current = column.isEditable;
+    }
+
+    // required 处理
+    if ((0, _lodash.isFunction)(column.required)) {
+      var newRequired = column.required(...params);
+      if (requiredRef.current !== newRequired) {
+        requiredRef.current = newRequired;
+        hasChange = true;
+      }
+    } else {
+      requiredRef.current = column.required;
+    }
+
+    // rules 处理
+    if ((0, _lodash.isFunction)(column.rules)) {
+      var newRules = column.rules(...params);
+      if (!(0, _lodash.isEqualWith)(rulesRef.current, newRules, _utils.customEqualForFunction)) {
+        rulesRef.current = newRules;
+        hasChange = true;
+      }
+    } else {
+      rulesRef.current = column.rules;
+    }
+
+    // fieldProps 处理
+    if ((0, _lodash.isFunction)(column.fieldProps)) {
+      var newFieldProps = column.fieldProps(...params);
+      if (!(0, _lodash.isEqualWith)(fieldPropsRef.current, newFieldProps, _utils.customEqualForFunction)) {
+        fieldPropsRef.current = newFieldProps;
+        hasChange = true;
+      }
+    } else {
+      fieldPropsRef.current = column.fieldProps;
+    }
+
+    // desensitization 处理
+    if ((0, _lodash.isFunction)(column.desensitization)) {
+      var newDesensitization = column.desensitization(...params);
+      if (!(0, _lodash.isEqualWith)(desensitizationRef.current, newDesensitization)) {
+        desensitizationRef.current = newDesensitization;
+        hasChange = true;
+      }
+    } else {
+      desensitizationRef.current = column.desensitization;
+    }
+
+    // valueType 处理
+    if ((0, _lodash.isFunction)(column.valueType)) {
+      var newValueType = column.valueType(...params);
+      if (valueTypeRef.current !== newValueType) {
+        valueTypeRef.current = newValueType;
+        hasChange = true;
+      }
+    } else {
+      valueTypeRef.current = column.valueType;
+    }
+    if (hasChange) {
+      reRender({});
+    }
+  };
+
+  // 创建防抖函数（统一处理所有动态属性）
+  (0, _react.useEffect)(() => {
+    if (shouldUpdateDebounce > 0 && ((0, _lodash.isFunction)(column.isEditable) || (0, _lodash.isFunction)(column.required) || (0, _lodash.isFunction)(column.rules) || (0, _lodash.isFunction)(column.fieldProps) || (0, _lodash.isFunction)(column.desensitization) || (0, _lodash.isFunction)(column.valueType))) {
+      debouncedUpdateRef.current = (0, _lodash.debounce)(() => {
+        if (pendingParamsRef.current) {
+          processUpdate(pendingParamsRef.current);
+          pendingParamsRef.current = null;
+        }
+      }, shouldUpdateDebounce);
+    }
+    return () => {
+      var _debouncedUpdateRef$c;
+      (_debouncedUpdateRef$c = debouncedUpdateRef.current) === null || _debouncedUpdateRef$c === void 0 || _debouncedUpdateRef$c.cancel();
+    };
+  }, [shouldUpdateDebounce, column]);
+
+  // 统一的属性处理逻辑
+  if (shouldUpdateDebounce > 0 && debouncedUpdateRef.current) {
+    // 使用防抖延迟更新
+    pendingParamsRef.current = rowParams;
+    debouncedUpdateRef.current();
+  } else {
+    // 立即更新（shouldUpdateDebounce = 0 或无防抖函数）
+    processUpdate(rowParams);
+  }
+  return {
+    isEditable: (_isEditableRef$curren = isEditableRef.current) !== null && _isEditableRef$curren !== void 0 ? _isEditableRef$curren : column.isEditable,
+    required: (_requiredRef$current = requiredRef.current) !== null && _requiredRef$current !== void 0 ? _requiredRef$current : column.required,
+    rules: (_rulesRef$current = rulesRef.current) !== null && _rulesRef$current !== void 0 ? _rulesRef$current : column.rules,
+    fieldProps: (_fieldPropsRef$curren = fieldPropsRef.current) !== null && _fieldPropsRef$curren !== void 0 ? _fieldPropsRef$curren : column.fieldProps,
+    desensitization: (_desensitizationRef$c = desensitizationRef.current) !== null && _desensitizationRef$c !== void 0 ? _desensitizationRef$c : column.desensitization,
+    valueType: (_valueTypeRef$current = valueTypeRef.current) !== null && _valueTypeRef$current !== void 0 ? _valueTypeRef$current : column.valueType
+  };
+};
+var _default = exports.default = useShouldUpdateForTable;

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

@@ -216,7 +216,8 @@ var RenderFields = props => {
       listName: column.listName,
       globalControl,
       formDisabled,
-      diffConfig
+      diffConfig,
+      shouldUpdateDebounce
     };
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
       value: otherProps,

package/lib/ProForm/index.js

@@ -73,7 +73,7 @@ var ProForm = (props, ref) => {
     _props$stopOnFirstErr = props.stopOnFirstError,
     stopOnFirstError = _props$stopOnFirstErr === void 0 ? false : _props$stopOnFirstErr,
     _props$shouldUpdateDe = props.shouldUpdateDebounce,
-    shouldUpdateDebounce = _props$shouldUpdateDe === void 0 ? 500 : _props$shouldUpdateDe,
+    shouldUpdateDebounce = _props$shouldUpdateDe === void 0 ? 200 : _props$shouldUpdateDe,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var config = (0, _ProConfigProvider.useProConfig)('ProForm');
   // source: 用于区分是哪个组件调用，用于错误提示

package/lib/ProForm/propsType.d.ts

@@ -46,6 +46,7 @@ export interface ProFormOtherType {
     formDisabled?: boolean;
     isDiffChange?: boolean;
     diffConfig?: DiffConfigType;
+    shouldUpdateDebounce?: number;
 }
 export interface DiffConfigType<Values = any> {
     /** 比对原始数据源 */

package/lib/ProForm/utils/useShouldUpdate.js

@@ -31,8 +31,7 @@ var useShouldUpdate = props => {
     originComponent = props.originComponent,
     type = props.type,
     desensitization = props.desensitization,
-    _props$shouldUpdateDe = props.shouldUpdateDebounce,
-    shouldUpdateDebounce = _props$shouldUpdateDe === void 0 ? 500 : _props$shouldUpdateDe;
+    shouldUpdateDebounce = props.shouldUpdateDebounce;
   var _shouldUpdate = formItemProps.shouldUpdate,
     name = formItemProps.name,
     clearNotShow = formItemProps.clearNotShow,

package/lib/ProTabs/style/index.less

@@ -6,6 +6,9 @@
         .pro-tabs-card-left {
           width: 84px !important;
         }
+        .pro-tabs-card-right {
+          width: 24px !important;
+        }
         .pro-tabs-card-right img {
           width: 24px !important;
         }
@@ -94,7 +97,7 @@
 
     .pro-tabs-card-right {
       display: flex;
-
+      width: 48px;
       img {
         width: 48px;
       }
@@ -123,6 +126,7 @@
     width: 200px;
     padding: calc(9px * var(--zaui-size; 1)) 16px calc(9px * var(--zaui-size; 1)) 24px;
     border: 1px solid var(--zaui-line, #dddddd);
+    border-radius: var(--zaui-border-radius, 8px);
 
     .pro-tabs-card-left {
       width: 104px;

package/lib/utils/index.js

@@ -13,10 +13,22 @@ var _lodash = require("lodash");
 var EMPTY_VALUE = [undefined, null, ''];
 
 // 自定义深比对 如果两边都是函数类型则认为相等
+// 对于 React 元素，不直接认为相等，而是让 lodash 继续进行深度比较
 var customEqualForFunction = (value, other) => {
-  if ((0, _lodash.isFunction)(value) && (0, _lodash.isFunction)(other) || /*#__PURE__*/_react.default.isValidElement(value) && /*#__PURE__*/_react.default.isValidElement(other)) {
+  // 只有当两边都是函数时才认为相等
+  if ((0, _lodash.isFunction)(value) && (0, _lodash.isFunction)(other)) {
     return true;
   }
+  // 对于 React 元素，返回 undefined 让 isEqualWith 继续使用默认比较逻辑
+  // 这样会比较 React 元素的 type、props 等属性
+  if ( /*#__PURE__*/_react.default.isValidElement(value) && /*#__PURE__*/_react.default.isValidElement(other)) {
+    // 比较 React 元素的类型和关键 props
+    if (value.type !== other.type) {
+      return false;
+    }
+    // 对于相同类型的 React 元素，返回 undefined 让 isEqualWith 继续深度比较 props
+    return undefined;
+  }
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.0.0-beta.7",
+  "version": "4.0.0-beta.8",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -135,7 +135,6 @@
     "lint-staged": "^10.0.0",
     "mini-css-extract-plugin": "^2.9.4",
     "mockjs": "^1.0.0",
-    "moment": "^2.30.1",
     "prettier": "^2.5.0",
     "pretty-quick": "^3.1.3",
     "react": "^18.2.0",