@zat-design/sisyphus-react 3.6.9-beta.6 → 3.6.10-beta.1

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

@@ -11,6 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
@@ -23,10 +24,10 @@ var _index = require("../../utils/index");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _transformNames = _interopRequireDefault(require("../../utils/transformNames"));
 var _valueType = _interopRequireDefault(require("../../utils/valueType"));
+var _useChanged3 = require("../../utils/useChanged");
 var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
 var _useRules = _interopRequireDefault(require("../../utils/useRules"));
 var _ConfirmWrapper = _interopRequireDefault(require("./ConfirmWrapper"));
-var _Changed = _interopRequireDefault(require("./Changed"));
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
 /* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
@@ -98,6 +99,18 @@ var Render = function Render(props) {
       return Array.isArray(name) ? name.join('_') : name;
     }).join('-');
   }, [otherProps === null || otherProps === void 0 ? void 0 : otherProps.names]);
+  // 判断当前字段是否变更
+  var _useChanged = (0, _useChanged3.useChanged)({
+      name: formItemProps.name,
+      names: otherProps.names,
+      namesStr: namesStr,
+      originalValues: originalValues,
+      form: form,
+      equalWith: equalWith
+    }),
+    _useChanged2 = (0, _slicedToArray2.default)(_useChanged, 2),
+    changed = _useChanged2[0],
+    originalValue = _useChanged2[1];
   var internalRule = (0, _useRules.default)({
     names: otherProps.names,
     label: otherFormItemProps.label,
@@ -169,7 +182,7 @@ var Render = function Render(props) {
   var lastComponentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), _fieldProps), {}, {
     disabled: lastDisabled
   });
-  var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-width-auto', ['Switch'].includes(type)));
+  var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-changed', changed), 'pro-form-item-width-auto', ['Switch'].includes(type)));
   if (formItemProps.hidden === true || _show === false) {
     // 为了监听shouldUpdate  必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
     return (0, _jsxRuntime.jsx)(_antd.Form.Item, {
@@ -431,17 +444,7 @@ var Render = function Render(props) {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
-      children: (0, _jsxRuntime.jsx)(_Changed.default, {
-        name: formItemProps.name,
-        names: otherProps.names,
-        namesStr: namesStr,
-        originalValues: originalValues,
-        form: form,
-        equalWith: equalWith,
-        originalDiffTip: originalDiffTip,
-        type: type,
-        children: child
-      })
+      children: child
     }));
     var formItem = orgFormItem;
     // 当存在shouldUpdate时捕获所有form变更（防止表单onchange设置form值时无法更新的问题）
@@ -457,23 +460,32 @@ var Render = function Render(props) {
               // @ts-ignore
               _internalItemRender: internalItemRender,
               className: _className,
-              children: (0, _jsxRuntime.jsx)(_Changed.default, {
-                name: formItemProps.name,
-                names: otherProps.names,
-                namesStr: namesStr,
-                originalValues: originalValues,
-                form: form,
-                equalWith: equalWith,
-                originalDiffTip: originalDiffTip,
-                type: type,
-                children: child
-              })
+              children: child
             }));
           }
         })
       });
     }
-    return formItem;
+    // 不渲染tooltip
+    if (!originalDiffTip || ['FormList', 'ProEditTable'].includes(type)) {
+      return formItem;
+    }
+    var title = (0, _jsxRuntime.jsxs)(_antd.Space, {
+      children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.cloneElement(child, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, child), {}, {
+        isView: true,
+        value: originalValue,
+        checked: type === 'Switch' ? originalValue : undefined
+      }))]
+    });
+    return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+      title: title,
+      open: changed ? undefined : false,
+      // open={true}
+      getPopupContainer: function getPopupContainer(target) {
+        return target.parentElement;
+      },
+      children: formItem
+    });
   };
   var FormItem = (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {

package/lib/ProForm/style/index.less

@@ -116,6 +116,58 @@
       }
     }
 
+    // 比较原始值场景下  不同时的样式
+    &.pro-form-item-changed {
+      span.@{ant-prefix}-input-affix-wrapper,
+      .@{ant-prefix}-select .@{ant-prefix}-select-selector,
+      .@{ant-prefix}-picker,
+      .@{ant-prefix}-input-number {
+        background: @zaui-contract-bg !important;
+
+        input {
+          background: transparent;
+        }
+        .@{ant-prefix}-select-selection-placeholder {
+          z-index: 9;
+        }
+      }
+
+      .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-switch-handle),
+      .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-checkbox-wrapper-in-form-item) {
+        background: @zaui-contract-bg;
+        border-radius: 4px;
+      }
+
+      // 地址组件
+      .@{ant-prefix}-form-item-control-input-content {
+        // 查看模式
+        & > span {
+          border-radius: 4px;
+          padding: 5px 8px;
+          background: @zaui-contract-bg;
+        }
+
+        & > .pro-address {
+          .@{ant-prefix}-select-selector,
+          .@{ant-prefix}-input-affix-wrapper,
+          .@{ant-prefix}-input-disabled {
+            background: @zaui-contract-bg;
+          }
+        }
+        & > .@{ant-prefix}-input-group {
+          .forever-checkbox {
+            background: @zaui-contract-bg;
+          }
+        }
+      }
+
+      .pro-form-view-container {
+        padding: 4px 8px;
+        background: @zaui-contract-bg;
+        border-radius: 4px;
+      }
+    }
+
     .@{ant-prefix}-row {
       width: 100%;
     }
@@ -321,56 +373,4 @@
       }
     }
   }
-
-  // 比较原始值场景下  不同时的样式
-  .pro-form-item-changed {
-    span.@{ant-prefix}-input-affix-wrapper,
-    .@{ant-prefix}-select .@{ant-prefix}-select-selector,
-    .@{ant-prefix}-picker,
-    .@{ant-prefix}-input-number {
-      background: @zaui-contract-bg !important;
-
-      input {
-        background: transparent !important;
-      }
-      .@{ant-prefix}-select-selection-placeholder {
-        z-index: 9;
-      }
-    }
-
-    .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-switch-handle),
-    .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-checkbox-wrapper-in-form-item) {
-      background: @zaui-contract-bg;
-      border-radius: 4px;
-    }
-
-    // 地址组件
-    .@{ant-prefix}-form-item-control-input-content {
-      // 查看模式
-      & > span {
-        border-radius: 4px;
-        padding: 5px 8px;
-        background: @zaui-contract-bg;
-      }
-
-      & > .pro-address {
-        .@{ant-prefix}-select-selector,
-        .@{ant-prefix}-input-affix-wrapper,
-        .@{ant-prefix}-input-disabled {
-          background: @zaui-contract-bg;
-        }
-      }
-      & > .@{ant-prefix}-input-group {
-        .forever-checkbox {
-          background: @zaui-contract-bg;
-        }
-      }
-    }
-
-    .pro-form-view-container {
-      padding: 4px 8px;
-      background: @zaui-contract-bg;
-      border-radius: 4px;
-    }
-  }
 }

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

@@ -3,6 +3,7 @@ interface Params {
     originalValue: any;
     value: any;
     form: FormInstance;
+    name?: string | any[];
     equalWith?: (originalValue: any, currentValue: any) => boolean;
 }
 export declare const diffOriginal: (params: Params) => boolean;

package/lib/ProForm/utils/diffOriginal.js

@@ -1,15 +1,38 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.diffOriginal = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _lodash = require("lodash");
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
+/** 将解构后的name值，反向转回names,例如 formData {a:1, b:2} names ['a', 'b'] 返回 [1,2] */
+var extractValues = function extractValues(form, pathString) {
+  var _pathString;
+  var result = [];
+  var PrefixesName = (0, _lodash.isString)(pathString) ? [] : pathString.slice(0, -1);
+  if ((0, _lodash.isString)(pathString)) {
+    pathString.split('-').forEach(function (item) {
+      result.push(form.getFieldValue([].concat((0, _toConsumableArray2.default)(PrefixesName), [item])));
+    });
+    return result;
+  }
+  (_pathString = pathString[pathString.length - 1]) === null || _pathString === void 0 ? void 0 : _pathString.split('-').forEach(function (item) {
+    result.push(form.getFieldValue([].concat((0, _toConsumableArray2.default)(PrefixesName), [item])));
+  });
+  return result;
+};
 var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
+  var _name$join;
   var originalValue = params.originalValue,
-    value = params.value,
-    equalWith = params.equalWith;
+    _value = params.value,
+    equalWith = params.equalWith,
+    form = params.form,
+    name = params.name;
+  var isNames = Array.isArray(name) && ((_name$join = name.join(',')) === null || _name$join === void 0 ? void 0 : _name$join.includes('-')) || (name === null || name === void 0 ? void 0 : name.includes('-'));
+  var value = !isNames ? _value : extractValues(form, name);
   // 支持传入自定义比较事件
   if ((0, _lodash.isFunction)(equalWith)) {
     return !equalWith(originalValue, value);
@@ -24,7 +47,8 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
     });
   }
   if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return !(0, _lodash.isEqual)(value, originalValue);
+    var res = !(0, _lodash.isEqual)(value, originalValue);
+    return res;
   }
   return false;
 };

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

@@ -50,12 +50,6 @@ export declare const isNullArray: (arr: any) => boolean;
  */
 export declare const isEmptyArray: (arr: any) => boolean;
 export declare function toArray<T>(value?: T | T[] | null): T[];
-/**
- * names值合并
- * @param obj AnyObject
- * @returns AnyObject
- */
-export declare function processHyphenKeys(obj: AnyObject): AnyObject;
 /**
  * 初始化值names值合并
  * @param obj AnyObject

package/lib/ProForm/utils/index.js

@@ -11,14 +11,11 @@ exports.getAllNamePath = exports.findOptionByValue = void 0;
 exports.getArrayBeforeNumber = getArrayBeforeNumber;
 exports.hasRowKey = exports.getLayout = exports.getDecimalDigits = void 0;
 exports.initialValuesToNames = initialValuesToNames;
-exports.parseNamePath = exports.isUpperCase = exports.isTrim = exports.isSelect = exports.isNullValue = exports.isNullArray = exports.isNotFullArray = exports.isEmptyArray = void 0;
-exports.processHyphenKeys = processHyphenKeys;
-exports.splitNameStr = void 0;
+exports.splitNameStr = exports.parseNamePath = exports.isUpperCase = exports.isTrim = exports.isSelect = exports.isNullValue = exports.isNullArray = exports.isNotFullArray = exports.isEmptyArray = void 0;
 exports.toArray = toArray;
 exports.weedOutProps = exports.view = exports.useControlled = void 0;
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
@@ -265,54 +262,6 @@ function toArray(value) {
   }
   return Array.isArray(value) ? value : [value];
 }
-/**
- * names值合并
- * @param obj AnyObject
- * @returns AnyObject
- */
-function processHyphenKeys(obj) {
-  var newObj = (0, _objectSpread2.default)({}, obj);
-  var keys = Object.keys(obj);
-  for (var _i = 0, _keys = keys; _i < _keys.length; _i++) {
-    var key = _keys[_i];
-    if (key.includes('-')) {
-      var keyParts = key.split('-');
-      var shouldCombine = true;
-      var combinedArray = [];
-      var _iterator = (0, _createForOfIteratorHelper2.default)(keyParts),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var part = _step.value;
-          if (obj.hasOwnProperty(part)) {
-            combinedArray.push(obj[part]);
-          } else {
-            shouldCombine = false;
-            break;
-          }
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
-      if (shouldCombine) {
-        newObj[key] = combinedArray;
-      } else {
-        newObj[key] = undefined;
-      }
-    }
-    // 匹配数组的namePath,只匹配到1层
-    if (key.includes('_')) {
-      var _keyParts = key.split('_')[0];
-      // 校验值是否存在，解决names多传额外空值报错
-      newObj[key] = (0, _lodash.isObject)(newObj[_keyParts]) ? Object.values(newObj[_keyParts]).filter(function (val) {
-        return val !== null && val !== undefined && val !== '';
-      }) : [];
-    }
-  }
-  return (0, _lodash.cloneDeep)(newObj);
-}
 /**
  * 初始化值names值合并
  * @param obj AnyObject
@@ -478,11 +427,11 @@ var parseNamePath = exports.parseNamePath = function parseNamePath(input) {
 };
 /** 解析namePath */
 function findNamesKeyInArray(arr, key) {
-  var _iterator2 = (0, _createForOfIteratorHelper2.default)(arr),
-    _step2;
+  var _iterator = (0, _createForOfIteratorHelper2.default)(arr),
+    _step;
   try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var item = _step2.value;
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var item = _step.value;
       if (!item.includes('_')) {
         return null;
       }
@@ -491,9 +440,9 @@ function findNamesKeyInArray(arr, key) {
       }
     }
   } catch (err) {
-    _iterator2.e(err);
+    _iterator.e(err);
   } finally {
-    _iterator2.f();
+    _iterator.f();
   }
   return null;
 }

package/lib/ProForm/utils/useChanged.js

@@ -24,7 +24,8 @@ var useChanged = exports.useChanged = function useChanged(_ref) {
     originalValue: originalValue,
     value: value,
     form: form,
-    equalWith: equalWith
+    equalWith: equalWith,
+    name: namesStr || name
   });
   return [changed, originalValue];
 };

package/lib/ProForm/utils/useListChanged.js

@@ -91,8 +91,8 @@ var useListChanged = exports.useListChanged = function useListChanged(params) {
     value: value,
     originalValue: originalValue,
     form: form,
-    equalWith: equalWith
-    // name: isString(namesStr) ? namesStr : originalName || name,
+    equalWith: equalWith,
+    name: (0, _lodash.isString)(namesStr) ? namesStr : originalName || name
   });
   return [changed, originalValue];
 };

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

@@ -197,6 +197,22 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
       var renderValue = (0, _getEnumLabel.default)(realCode, value, valueType === 'enumCodeName');
       var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
       var originalRenderValue = (0, _getEnumLabel.default)(realCode, originalValue, valueType === 'enumCodeName');
+      if (Array.isArray(column === null || column === void 0 ? void 0 : column.codeValues) && !realCode) {
+        var _column$codeValues$fi;
+        var labelName = column === null || column === void 0 ? void 0 : (_column$codeValues$fi = column.codeValues.find(function (item) {
+          return item.value === value;
+        })) === null || _column$codeValues$fi === void 0 ? void 0 : _column$codeValues$fi.label;
+        if (valueType === 'enumName') {
+          renderValue = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+            children: labelName || '-'
+          });
+        }
+        if (valueType === 'enumCodeName') {
+          renderValue = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+            children: labelName ? "".concat(value, "-").concat(labelName) : labelName
+          });
+        }
+      }
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]

package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.d.ts

@@ -5,12 +5,17 @@ interface RowProps extends React.HTMLAttributes<HTMLTableRowElement> {
     disabled?: boolean;
 }
 export declare const Row: FC<RowProps>;
-declare const DndWrapper: ({ draggable, value, onChange, disabled, children, rowKey }: {
+declare const DndWrapper: ({ draggable, value, onChange, disabled, children, rowKey, onDragStartGuard, onDragMoveGuard, onDragOverGuard, onDragEndGuard, onDragCancelGuard, }: {
     draggable: any;
     value: any;
     onChange: any;
     disabled: any;
     children: any;
     rowKey: any;
+    onDragStartGuard: any;
+    onDragMoveGuard: any;
+    onDragOverGuard: any;
+    onDragEndGuard: any;
+    onDragCancelGuard: any;
 }) => any;
 export default DndWrapper;