@zat-design/sisyphus-react 3.9.0 → 3.9.1

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

@@ -29,7 +29,7 @@ var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames",
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 var ProModalSelect = function ProModalSelect(props, ref) {
-  var _formColumns$;
+  var _useRequest$options9, _formColumns$;
   var value = props.value,
     onChange = props.onChange,
     disabled = props.disabled,
@@ -142,13 +142,21 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     })),
     run = _useRequestList.run,
     selectLoading = _useRequestList.loading;
+  var initParams = (0, _react.useMemo)(function () {
+    var nextInitParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams;
+    if (typeof (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) === 'function') {
+      var _contentForm$getField;
+      nextInitParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm === null || contentForm === void 0 ? void 0 : (_contentForm$getField = contentForm.getFieldsValue) === null || _contentForm$getField === void 0 ? void 0 : _contentForm$getField.call(contentForm));
+    }
+    return nextInitParams;
+  }, [value]);
   var _useRequestList2 = (0, _useRequestList3.default)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, {
       withPagination: withPagination,
       transformParams: transformParams,
       transformResponse: transformResponse
     }, (0, _objectSpread3.default)({
       manual: true,
-      ready: ((useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || defaultOne) && !readOnly || visible
+      ready: (initParams || defaultOne) && !readOnly || visible
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options)),
     data = _useRequestList2.data,
     loading = _useRequestList2.loading,
@@ -453,18 +461,15 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref10 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
-      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
+      var _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            if (typeof (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) === 'function') {
-              useRequest.initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm === null || contentForm === void 0 ? void 0 : (_contentForm$getField = contentForm.getFieldsValue) === null || _contentForm$getField === void 0 ? void 0 : _contentForm$getField.call(contentForm));
-            }
-            if (!((useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || defaultOne)) {
-              _context4.next = 10;
+            if (!(initParams || defaultOne)) {
+              _context4.next = 9;
               break;
             }
-            queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams), (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || {});
+            queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams), initParams || {});
             page = (0, _objectSpread3.default)({
               pageNum: 1,
               pageSize: 10
@@ -473,9 +478,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
             params = transformParams ? transformParams(params) : params;
-            _context4.next = 8;
+            _context4.next = 7;
             return runAsync(params);
-          case 8:
+          case 7:
             res = _context4.sent;
             if (res === null || res === void 0 ? void 0 : res.data) {
               list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
@@ -503,7 +508,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
                 });
               }
             }
-          case 10:
+          case 9:
           case "end":
             return _context4.stop();
         }
@@ -594,7 +599,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       });
     }
   });
-  (0, _ahooks.useDeepCompareEffect)(function () {
+  (0, _ahooks.useDebounceEffect)(function () {
     if (onOff && !visible) {
       var _useRequest$options6;
       if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.manual) !== true) {
@@ -629,13 +634,13 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }
       setState(nextState);
     }
-  }, [onOff, visible, value]);
+  }, [onOff, visible, JSON.stringify(value)]);
   (0, _ahooks.useDeepCompareEffect)(function () {
     if (value && !visible && isInit && !readOnly) {
       getInitValues();
     }
-  }, [value, visible, isInit]);
-  (0, _ahooks.useDeepCompareEffect)(function () {
+  }, [JSON.stringify(value), visible, isInit]);
+  (0, _ahooks.useDebounceEffect)(function () {
     if (value && !visible && readOnly) {
       var _options$some;
       var isHasValue = options === null || options === void 0 ? void 0 : (_options$some = options.some) === null || _options$some === void 0 ? void 0 : _options$some.call(options, function (item) {
@@ -647,11 +652,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       // 加定时器 修复依赖数据同步更新未取到问题
       setTimeout(function () {
         var _useRequest$options7, _useRequest$options8;
-        var initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams;
-        if (typeof (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) === 'function') {
-          var _contentForm$getField2;
-          initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm === null || contentForm === void 0 ? void 0 : (_contentForm$getField2 = contentForm.getFieldsValue) === null || _contentForm$getField2 === void 0 ? void 0 : _contentForm$getField2.call(contentForm));
-        }
         var params = withPagination ? {
           pageNum: 1,
           pageSize: 50,
@@ -661,8 +661,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         run(nextParams);
       }, 300);
     }
-  }, [value, options, visible, useRequest]);
-  (0, _ahooks.useDeepCompareEffect)(function () {
+  }, [JSON.stringify(value), JSON.stringify(options), visible, JSON.stringify(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams), JSON.stringify(initParams)]);
+  (0, _ahooks.useDebounceEffect)(function () {
     if (!value) {
       if (defaultOne) {
         getDefaultOneValues();
@@ -713,8 +713,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }) : null,
       onFocus: function onFocus() {
         if (useRequest) {
-          var _useRequest$options9;
-          var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams) || {};
+          var _useRequest$options10;
+          var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams) || {};
           var params = withPagination ? {
             pageNum: 1,
             pageSize: 50,
@@ -728,8 +728,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         }
       },
       onSearch: (0, _lodash.debounce)(function (val) {
-        var _useRequest$options10;
-        var queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
+        var _useRequest$options11;
+        var queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options11 = useRequest.options) === null || _useRequest$options11 === void 0 ? void 0 : _useRequest$options11.defaultParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
         var params = withPagination ? {
           pageNum: 1,
           pageSize: 50,
@@ -840,7 +840,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       onOk: handleFinish,
       // @ts-ignore
       onCancel: handleClose,
-      visible: visible
+      visible: visible,
+      zIndex: 1071
     }, restModalProps), {}, {
       children: [(0, _jsxRuntime.jsx)(_index.ProForm, {
         submitOnEnter: true,

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

@@ -34,7 +34,6 @@ var ChangedWrapper = function ChangedWrapper(props) {
     getValueProps = props.getValueProps,
     viewRender = props.viewRender,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  // const contentRef = useRef(null);
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
   var originalValues = diffConfig.originalValues,
@@ -108,7 +107,9 @@ var ChangedWrapper = function ChangedWrapper(props) {
     getPopupContainer: function getPopupContainer(trigger) {
       return scrollFollowParent ? trigger.parentElement : document.body;
     },
-    overlayClassName: "original-value-tootip",
+    overlayClassName: "original-value-tooltip",
+    placement: "topLeft",
+    autoAdjustOverflow: false,
     title: (0, _jsxRuntime.jsxs)(_antd.Space, {
       direction: "vertical",
       className: "changed-tooltip",
@@ -124,7 +125,6 @@ var ChangedWrapper = function ChangedWrapper(props) {
         })) : undefined]
       })]
     }),
-    placement: "topLeft",
     children: (0, _jsxRuntime.jsx)("div", {
       className: diffClassName,
       style: style,

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

@@ -17,7 +17,7 @@ var componentMap = _interopRequireWildcard(require("../index"));
 var _utils = require("../../utils");
 var _useFieldProps = require("../../utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../../../locale"));
-var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "equalWith", "clearNotShow", "required", "confirm"];
+var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "equalWith", "onDiff", "clearNotShow", "required", "confirm"];
 var RenderFields = function RenderFields(props) {
   var isView = props.isView,
     _props$columns = props.columns,
@@ -77,6 +77,7 @@ var RenderFields = function RenderFields(props) {
       _column$fieldProps = column.fieldProps,
       fieldProps = _column$fieldProps === void 0 ? {} : _column$fieldProps,
       equalWith = column.equalWith,
+      onDiff = column.onDiff,
       _column$clearNotShow = column.clearNotShow,
       clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,
       columnRequired = column.required,
@@ -216,7 +217,7 @@ var RenderFields = function RenderFields(props) {
         fieldProps: (0, _lodash.isFunction)(fieldProps) ? fieldProps : null,
         isSelect: _isSelect,
         diffConfig: diffConfig,
-        equalWith: equalWith,
+        equalWith: onDiff || equalWith,
         requiredOnView: requiredOnView,
         globalControl: globalControl,
         viewRender: viewRender

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

@@ -207,6 +207,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     hiddenNames?: string[] | any[];
     rules?: ProRule[] | ReactiveFunction<Values, ProRule[]>;
     equalWith?: DiffOriginalParams['equalWith'];
+    onDiff?: DiffOriginalParams['equalWith'];
     required?: boolean | boolean[] | ReactiveFunction<Values, boolean | boolean[]>;
     labelRequired?: boolean;
     toISOString?: boolean;

package/lib/ProForm/style/index.less

@@ -385,7 +385,7 @@
     }
 
     // checkbox
-    .@{ant-prefix}-checkbox-group {
+    .@{ant-prefix}-checkbox-group,.pro-switch-checkbox {
       padding: 5px 0
     }
     // switch
@@ -412,7 +412,7 @@
     background: @zaui-contract-bg-add !important;
 
     .@{ant-prefix}-input {
-      background: @zaui-contract-bg !important;
+      background: @zaui-contract-bg-add !important;
     }
     
     .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
@@ -463,7 +463,7 @@
     }
 
     // checkbox
-    .@{ant-prefix}-checkbox-group {
+    .@{ant-prefix}-checkbox-group,.pro-switch-checkbox {
       padding: 5px 0
     }
     // switch
@@ -485,10 +485,8 @@
   }
 }
 
-.original-value-tootip{
-  max-width: 100%;
+.original-value-tooltip{
   width: max-content;
-  z-index: 99;
   .changed-tooltip {
     .original-value-container {
       .ant-space-item:nth-child(1) {
@@ -511,3 +509,9 @@
   }
 }
 
+.original-value-tooltip-fixed {
+  position: fixed;
+}
+
+
+

package/lib/ProForm/utils/diffOriginal.js

@@ -7,15 +7,17 @@ exports.diffOriginal = void 0;
 var _lodash = require("lodash");
 var _utils = require("../../utils");
 // 过滤对象中undefined字段
-// 防止{a: '1'} {a: '1', b: undefined}被认为不相等
-var filterUndefined = function filterUndefined(data) {
+// 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
+var filterObject = function filterObject(data) {
   if (!(0, _lodash.isObject)(data) || Array.isArray(data) || data === null) return data;
   var resData = {};
   Object.keys(data).forEach(function (key) {
-    if (data[key] !== undefined) {
+    if (!(0, _utils.isEmpty)(data[key])) {
       resData[key] = data[key];
     }
   });
+  // 空对象视为null 比较时 null undefined {} [] '' 视为相等
+  if (!Object.keys(resData).length) return null;
   return resData;
 };
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
@@ -26,18 +28,22 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
   // 支持传入自定义比较事件
   if ((0, _lodash.isFunction)(equalWith)) {
     var diffRes = equalWith(originalValue, value);
-    if (diffRes === undefined) return 'same';
-    if (typeof diffRes === 'boolean') {
-      return diffRes ? 'same' : 'changed';
+    // 如果返回undefined走内置比较逻辑
+    if (diffRes !== undefined) {
+      if (typeof diffRes === 'boolean') {
+        return diffRes ? 'same' : 'changed';
+      }
+      return diffRes;
     }
-    return diffRes;
   }
+  var _value = filterObject(value);
+  var _originalValue = filterObject(originalValue);
   // 如果原始值为空 且当前有值的话 认为变更类型是新增
-  if ((0, _utils.isEmpty)(originalValue) && !(0, _utils.isEmpty)(value)) {
+  if ((0, _utils.isEmpty)(_originalValue) && !(0, _utils.isEmpty)(_value)) {
     return 'add';
   }
-  if (Array.isArray(originalValue)) {
-    var isSame = originalValue.every(function (valueItem, index) {
+  if (Array.isArray(_originalValue)) {
+    var isSame = _originalValue.every(function (valueItem, index) {
       // 如果两个值有一个不是空值, 则进行深比较
       if (!(0, _utils.isEmpty)(value === null || value === void 0 ? void 0 : value[index]) || !(0, _utils.isEmpty)(valueItem)) {
         return (0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
@@ -46,8 +52,8 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
     });
     return isSame ? 'same' : 'changed';
   }
-  if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return (0, _lodash.isEqual)(filterUndefined(value), filterUndefined(originalValue)) ? 'same' : 'changed';
+  if (!(0, _utils.isEmpty)(_originalValue) || !(0, _utils.isEmpty)(_value)) {
+    return (0, _lodash.isEqual)(_value, _originalValue) ? 'same' : 'changed';
   }
   return 'same';
 };

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

@@ -1,15 +1,17 @@
+/**
+ * 调整点：
+ */
 import React from 'react';
 import { ProTableColumn } from '../../propsType';
-export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, }: {
+export declare const formatColumn: ({ column, originalObj, rowKey, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, diffConfig, }: {
     column: ProTableColumn;
     originalObj: any;
-    dataSourceObj: any;
     rowKey: any;
-    diffToolTip?: boolean;
     wrapToolTipProps?: any;
     scroll?: any;
     onUpdateMinWidth?: any;
     isInNewRow?: any;
+    diffConfig: any;
 }) => void;
 /**
  * 查找最近的父级className