@zat-design/sisyphus-react 3.2.1-beta.4 → 3.2.1-beta.6

package/dist/index.esm.css

@@ -905,6 +905,10 @@
 }
 .pro-header .ant-breadcrumb .ant-breadcrumb-link {
   font-size: var(--zaui-font-size-xl, 18px);
+  display: -webkit-inline-box;
+  display: -webkit-inline-flex;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
 }
 .pro-header .ant-breadcrumb .ant-breadcrumb-separator {
   font-weight: 500;
@@ -1618,6 +1622,10 @@
 .pro-table .custom-column-btn .anticon {
   height: 16px;
 }
+.pro-table .ant-table-tbody .ant-table-cell-fix-left,
+.pro-table .ant-table-tbody .ant-table-cell-fix-right {
+  background: unset !important;
+}
 .pro-table .ant-table-body .ant-table-cell .varied-cell {
   margin-left: -8px;
   background: var(--zaui-contract-bg, #fffaa1);
@@ -2517,6 +2525,11 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .ant-form-item.pro-form-item-changed .ant-picker .ant-select-selection-placeholder {
   z-index: 9;
 }
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > span {
+  background: var(--zaui-contract-bg, #fffaa1);
+  padding: 4px 8px;
+  border-radius: 4px;
+}
 .pro-form .ant-form-item .ant-row {
   width: 100%;
 }
@@ -5137,6 +5150,10 @@ input[type='button'] {
 .ant-tabs .ant-tabs-nav .ant-tabs-tab-btn {
   font-size: var(--zaui-font-size-lg, 16px);
 }
+.ant-tabs.ant-tabs-card .ant-tabs-tab {
+  padding: 8px calc(var(--zaui-space-size-md, 16px)*var(--zaui-size, 1)) !important;
+  margin-right: 10px !important;
+}
 .ant-tabs.ant-tabs-card .ant-tabs-nav .ant-tabs-tab-btn {
   font-size: var(--zaui-font-size, 14px);
 }

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

@@ -1,15 +1,22 @@
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
+import "antd/es/space/style";
+import _Space from "antd/es/space";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules"];
-import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className"];
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 import React, { useCallback, useEffect } from 'react';
+import classNames from 'classnames';
 import { cloneDeep, isEqual, debounce, omit, isFunction, isString } from 'lodash';
 import valueTypeMap from '../../../ProForm/utils/valueType';
 import transformMap from '../../utils/transform';
@@ -18,11 +25,12 @@ import * as componentMap from '../../../ProForm/components';
 import Container from '../../../ProForm/components/Container';
 import transformNames from '../../../ProForm/utils/transformNames';
 import { FieldProvider } from '../../../ProForm/utils/useFieldProps';
+import { useChanged } from '../../../ProForm/utils/useChanged';
 import useRules from '../../../ProForm/utils/useRules';
 import { isSelect } from '../../../ProForm/utils';
 import locale from '../../../locale';
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _formItemChildProps$p, _TargetComponent4;
+  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _formItemChildProps$p, _TargetComponent4, _classNames;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -47,6 +55,8 @@ var RenderField = function RenderField(_ref) {
     required = _column$required === void 0 ? false : _column$required,
     _column$rules = column.rules,
     rules = _column$rules === void 0 ? [] : _column$rules,
+    equalWith = column.equalWith,
+    className = column.className,
     resetProps = _objectWithoutProperties(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -61,7 +71,9 @@ var RenderField = function RenderField(_ref) {
     setState = config.setState,
     name = config.name,
     virtualKey = config.virtualKey,
-    viewEmpty = config.viewEmpty;
+    viewEmpty = config.viewEmpty,
+    originalValues = config.originalValues,
+    originalTip = config.originalTip;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
@@ -175,13 +187,23 @@ var RenderField = function RenderField(_ref) {
       return [].concat(_toConsumableArray(baseName), [index, key]);
     });
   }
+  var originalName = cellName;
+  var originalNames = names;
+  if (virtualKey) {
+    var _cellName$slice, _names2, _names2$map;
+    originalName = [].concat(_toConsumableArray(name), _toConsumableArray(cellName === null || cellName === void 0 ? void 0 : (_cellName$slice = cellName.slice) === null || _cellName$slice === void 0 ? void 0 : _cellName$slice.call(cellName, 1)));
+    originalNames = (_names2 = names) === null || _names2 === void 0 ? void 0 : (_names2$map = _names2.map) === null || _names2$map === void 0 ? void 0 : _names2$map.call(_names2, function (item) {
+      var _item$slice;
+      return [].concat(_toConsumableArray(name), _toConsumableArray(item === null || item === void 0 ? void 0 : (_item$slice = item.slice) === null || _item$slice === void 0 ? void 0 : _item$slice.call(item, 1)));
+    });
+  }
   /**
    * 配置names时，基于formItem的normalize与getValueProps进行值类型转换
    * @returns {}
    */
   var namesTransform = function namesTransform() {
-    var _names2;
-    if (!((_names2 = names) === null || _names2 === void 0 ? void 0 : _names2.length)) {
+    var _names3;
+    if (!((_names3 = names) === null || _names3 === void 0 ? void 0 : _names3.length)) {
       return {};
     }
     var namesStr = [baseName, index, dataIndex];
@@ -341,14 +363,6 @@ var RenderField = function RenderField(_ref) {
               d: Date.now()
             }
           });
-          // if (virtualKey) {
-          //   // 单行编辑时需要 强制更新视图
-          //   setState({
-          //     forceUpdate: {
-          //       d: Date.now(),
-          //     },
-          //   });
-          // }
         case 30:
         case "end":
           return _context.stop();
@@ -437,6 +451,20 @@ var RenderField = function RenderField(_ref) {
       return _ref3.apply(this, arguments);
     };
   }();
+  // 判断当前字段是否变更
+  var _useChanged = useChanged({
+      name: cellName,
+      names: names,
+      namesStr: [].concat(_toConsumableArray(baseName), [index, dataIndex]),
+      originalName: originalName,
+      originalNames: originalNames,
+      originalValues: originalValues,
+      form: form,
+      equalWith: equalWith
+    }),
+    _useChanged2 = _slicedToArray(_useChanged, 2),
+    changed = _useChanged2[0],
+    originalValue = _useChanged2[1];
   var componentProps = _objectSpread(_objectSpread(_objectSpread({
     form: form,
     name: cellName,
@@ -477,15 +505,32 @@ var RenderField = function RenderField(_ref) {
   if (!isEditing) {
     delete _formItemProps.rules;
   }
+  var _className = classNames((_classNames = {}, _defineProperty(_classNames, className, className), _defineProperty(_classNames, 'pro-form-item-changed', changed), _classNames));
+  var originalTitle = _jsxs(_Space, {
+    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
+      isView: true,
+      value: originalValue,
+      checked: type === 'Switch' ? originalValue : undefined
+    })) : _jsx(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
+      isView: true,
+      value: originalValue,
+      checked: type === 'Switch' ? originalValue : undefined
+    }))]
+  });
+  var FormItem = _jsx(_Form.Item, _objectSpread(_objectSpread({
+    validateFirst: true
+  }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+    className: _className,
+    name: cellName,
+    children: /*#__PURE__*/React.isValidElement(TargetComponent) ? /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange']))) : _jsx(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange'])))
+  }));
   return _jsx(FieldProvider, {
     value: componentProps === null || componentProps === void 0 ? void 0 : componentProps.otherProps,
-    children: _jsx(_Form.Item, _objectSpread(_objectSpread({
-      validateFirst: true,
-      noStyle: !isEditing
-    }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
-      name: cellName,
-      children: /*#__PURE__*/React.isValidElement(TargetComponent) ? /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange']))) : _jsx(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange'])))
-    }))
+    children: !originalTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : _jsx(_Tooltip, {
+      title: originalTitle,
+      open: changed ? undefined : false,
+      children: FormItem
+    })
   });
 };
 export default RenderField;

package/es/ProEditTable/index.js

@@ -10,7 +10,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination"];
+var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalTip"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { forwardRef, useCallback, useEffect, useImperativeHandle, useRef } from 'react';
 import { isArray } from 'lodash';
@@ -48,6 +48,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     max = _ref.max,
     headerRender = _ref.headerRender,
     pagination = _ref.pagination,
+    originalValues = _ref.originalValues,
+    originalTip = _ref.originalTip,
     resetProps = _objectWithoutProperties(_ref, _excluded);
   // 上下文form
   var contentForm = _Form.useFormInstance();
@@ -134,7 +136,9 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     tableRef: tableRef,
     max: max,
     tableLength: value === null || value === void 0 ? void 0 : value.length,
-    page: page
+    page: page,
+    originalValues: originalValues,
+    originalTip: originalTip
   };
   // 判断是否禁止添加、批量删除
   var isForbiddenBtn = useCallback(function (type) {

package/es/ProEditTable/propsType.d.ts

@@ -121,9 +121,19 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      * @default           -
      */
     form?: FormInstance;
+    /**
+     * @description       原始数据源，设置后可以对比更新后的数值
+     * @default           -
+     */
+    originalValues?: any;
+    /**
+     * @description       原始数据源，是否tooltip显示
+     * @default           -
+     */
+    originalTip?: boolean;
     /**
      * @description       可编辑表格的类型，单行、多行、单元格编辑
-     * @default           multiple
+     * @default           false
      */
     mode?: 'single' | 'multiple' | 'cell';
     /**

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

@@ -15,6 +15,7 @@ import Container from '../../Container';
 import * as componentMap from '../../index';
 import { isNullValue, weedOutProps } from '../../../utils';
 import { otherKeys } from '../../../propsType';
+import ProForm from '../../../../ProForm';
 import './style/index.less';
 var useControlled = function useControlled(props) {
   var value = props.value,

package/es/ProForm/style/index.less

@@ -137,6 +137,12 @@
           z-index: 9;
         }
       }
+
+      .ant-form-item-control-input-content > span {
+        background: @zaui-contract-bg;
+        padding: 4px 8px;
+        border-radius: 4px;
+      }
     }
 
     .ant-row {

package/es/ProLayout/components/ProHeader/style/index.less

@@ -106,6 +106,7 @@
 
     .ant-breadcrumb-link {
       font-size: var(--zaui-font-size-xl, 18px);
+      display  : inline-flex;
     }
 
     .ant-breadcrumb-separator {

package/es/ProTable/components/RenderColumn/index.js

@@ -86,6 +86,6 @@ var RenderColumn = function RenderColumn(props) {
       children: node
     }) : '-';
   }
-  return value ? node : '-';
+  return value || value === 0 ? node : '-';
 };
 export default RenderColumn;

package/es/ProTable/style/index.less

@@ -54,6 +54,12 @@
     }
   }
 
+  .ant-table-tbody {
+    .ant-table-cell-fix-left, .ant-table-cell-fix-right {
+      background: unset !important;
+    }
+  }
+
   .ant-table-body {
     .ant-table-cell .varied-cell {
       margin-left: -8px;

package/es/ProTree/components/Tree.js

@@ -125,7 +125,7 @@ function List(props) {
       _useState2 = _slicedToArray(_useState, 2),
       open = _useState2[0],
       setOpen = _useState2[1];
-    var operateButton = menu && menu(item === null || item === void 0 ? void 0 : item.value, item);
+    var operateButton = menu && menu(item === null || item === void 0 ? void 0 : item[fieldNameValue], item);
     operateButton === null || operateButton === void 0 ? void 0 : operateButton.map(function (item, i) {
       return _jsx(React.Fragment, {
         children: item

package/es/ProTreeSelect/index.js

@@ -145,9 +145,10 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
       _message.error(msg);
       return;
     }
+    var resultData = transferDataSource(data, showCodeName);
     setState({
-      selectList: data || [],
-      origDataSource: data || []
+      selectList: resultData || [],
+      origDataSource: resultData || []
     });
   };
   // 配置了异步数据源，拉取枚举数据逻辑 如果有code不掉接口从local里根据code取值

package/es/style/theme/antd.less

@@ -339,6 +339,11 @@
   }
 
   &.ant-tabs-card {
+    .ant-tabs-tab {
+      padding     : 8px calc(var(--zaui-space-size-md, 16px)*var(--zaui-size, 1)) !important;
+      margin-right: 10px !important;
+    }
+
     .ant-tabs-nav .ant-tabs-tab-btn {
       font-size: var(--zaui-font-size, 14px);
     }

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

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -14,6 +16,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
 var _valueType = _interopRequireDefault(require("../../../ProForm/utils/valueType"));
 var _transform = _interopRequireDefault(require("../../utils/transform"));
@@ -22,14 +25,15 @@ var componentMap = _interopRequireWildcard(require("../../../ProForm/components"
 var _Container = _interopRequireDefault(require("../../../ProForm/components/Container"));
 var _transformNames = _interopRequireDefault(require("../../../ProForm/utils/transformNames"));
 var _useFieldProps = require("../../../ProForm/utils/useFieldProps");
+var _useChanged3 = require("../../../ProForm/utils/useChanged");
 var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"));
 var _utils = require("../../../ProForm/utils");
 var _locale = _interopRequireDefault(require("../../../locale"));
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _formItemChildProps$p, _TargetComponent4;
+  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _formItemChildProps$p, _TargetComponent4, _classNames;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -54,6 +58,8 @@ var RenderField = function RenderField(_ref) {
     required = _column$required === void 0 ? false : _column$required,
     _column$rules = column.rules,
     rules = _column$rules === void 0 ? [] : _column$rules,
+    equalWith = column.equalWith,
+    className = column.className,
     resetProps = (0, _objectWithoutProperties2.default)(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -68,7 +74,9 @@ var RenderField = function RenderField(_ref) {
     setState = config.setState,
     name = config.name,
     virtualKey = config.virtualKey,
-    viewEmpty = config.viewEmpty;
+    viewEmpty = config.viewEmpty,
+    originalValues = config.originalValues,
+    originalTip = config.originalTip;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
@@ -182,13 +190,23 @@ var RenderField = function RenderField(_ref) {
       return [].concat((0, _toConsumableArray2.default)(baseName), [index, key]);
     });
   }
+  var originalName = cellName;
+  var originalNames = names;
+  if (virtualKey) {
+    var _cellName$slice, _names2, _names2$map;
+    originalName = [].concat((0, _toConsumableArray2.default)(name), (0, _toConsumableArray2.default)(cellName === null || cellName === void 0 ? void 0 : (_cellName$slice = cellName.slice) === null || _cellName$slice === void 0 ? void 0 : _cellName$slice.call(cellName, 1)));
+    originalNames = (_names2 = names) === null || _names2 === void 0 ? void 0 : (_names2$map = _names2.map) === null || _names2$map === void 0 ? void 0 : _names2$map.call(_names2, function (item) {
+      var _item$slice;
+      return [].concat((0, _toConsumableArray2.default)(name), (0, _toConsumableArray2.default)(item === null || item === void 0 ? void 0 : (_item$slice = item.slice) === null || _item$slice === void 0 ? void 0 : _item$slice.call(item, 1)));
+    });
+  }
   /**
    * 配置names时，基于formItem的normalize与getValueProps进行值类型转换
    * @returns {}
    */
   var namesTransform = function namesTransform() {
-    var _names2;
-    if (!((_names2 = names) === null || _names2 === void 0 ? void 0 : _names2.length)) {
+    var _names3;
+    if (!((_names3 = names) === null || _names3 === void 0 ? void 0 : _names3.length)) {
       return {};
     }
     var namesStr = [baseName, index, dataIndex];
@@ -348,14 +366,6 @@ var RenderField = function RenderField(_ref) {
               d: Date.now()
             }
           });
-          // if (virtualKey) {
-          //   // 单行编辑时需要 强制更新视图
-          //   setState({
-          //     forceUpdate: {
-          //       d: Date.now(),
-          //     },
-          //   });
-          // }
         case 30:
         case "end":
           return _context.stop();
@@ -444,6 +454,20 @@ var RenderField = function RenderField(_ref) {
       return _ref3.apply(this, arguments);
     };
   }();
+  // 判断当前字段是否变更
+  var _useChanged = (0, _useChanged3.useChanged)({
+      name: cellName,
+      names: names,
+      namesStr: [].concat((0, _toConsumableArray2.default)(baseName), [index, dataIndex]),
+      originalName: originalName,
+      originalNames: originalNames,
+      originalValues: originalValues,
+      form: form,
+      equalWith: equalWith
+    }),
+    _useChanged2 = (0, _slicedToArray2.default)(_useChanged, 2),
+    changed = _useChanged2[0],
+    originalValue = _useChanged2[1];
   var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     form: form,
     name: cellName,
@@ -484,15 +508,32 @@ var RenderField = function RenderField(_ref) {
   if (!isEditing) {
     delete _formItemProps.rules;
   }
+  var _className = (0, _classnames.default)((_classNames = {}, (0, _defineProperty2.default)(_classNames, className, className), (0, _defineProperty2.default)(_classNames, 'pro-form-item-changed', changed), _classNames));
+  var originalTitle = (0, _jsxRuntime.jsxs)(_antd.Space, {
+    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])), {}, {
+      isView: true,
+      value: originalValue,
+      checked: type === 'Switch' ? originalValue : undefined
+    })) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])), {}, {
+      isView: true,
+      value: originalValue,
+      checked: type === 'Switch' ? originalValue : undefined
+    }))]
+  });
+  var FormItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    validateFirst: true
+  }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+    className: _className,
+    name: cellName,
+    children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange']))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])))
+  }));
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
     value: componentProps === null || componentProps === void 0 ? void 0 : componentProps.otherProps,
-    children: (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      validateFirst: true,
-      noStyle: !isEditing
-    }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
-      name: cellName,
-      children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange']))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])))
-    }))
+    children: !originalTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+      title: originalTitle,
+      open: changed ? undefined : false,
+      children: FormItem
+    })
   });
 };
 var _default = exports.default = RenderField;

package/lib/ProEditTable/index.js

@@ -22,7 +22,7 @@ var _tools = require("./utils/tools");
 var _components = require("./components");
 var _empty = _interopRequireDefault(require("../assets/empty.png"));
 var _locale = _interopRequireDefault(require("../locale"));
-var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination"];
+var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalTip"];
 var ProEditTable = function ProEditTable(_ref, ref) {
   var _resetProps$id, _resetProps$id$split, _value$2;
   var value = _ref.value,
@@ -50,6 +50,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     max = _ref.max,
     headerRender = _ref.headerRender,
     pagination = _ref.pagination,
+    originalValues = _ref.originalValues,
+    originalTip = _ref.originalTip,
     resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   // 上下文form
   var contentForm = _antd.Form.useFormInstance();
@@ -136,7 +138,9 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     tableRef: tableRef,
     max: max,
     tableLength: value === null || value === void 0 ? void 0 : value.length,
-    page: page
+    page: page,
+    originalValues: originalValues,
+    originalTip: originalTip
   };
   // 判断是否禁止添加、批量删除
   var isForbiddenBtn = (0, _react.useCallback)(function (type) {

package/lib/ProEditTable/propsType.d.ts

@@ -121,9 +121,19 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      * @default           -
      */
     form?: FormInstance;
+    /**
+     * @description       原始数据源，设置后可以对比更新后的数值
+     * @default           -
+     */
+    originalValues?: any;
+    /**
+     * @description       原始数据源，是否tooltip显示
+     * @default           -
+     */
+    originalTip?: boolean;
     /**
      * @description       可编辑表格的类型，单行、多行、单元格编辑
-     * @default           multiple
+     * @default           false
      */
     mode?: 'single' | 'multiple' | 'cell';
     /**

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

@@ -17,6 +17,7 @@ var _Container = _interopRequireDefault(require("../../Container"));
 var componentMap = _interopRequireWildcard(require("../../index"));
 var _utils = require("../../../utils");
 var _propsType = require("../../../propsType");
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 require("./style/index.less");
 // @ts-nocheck
 
@@ -54,7 +55,7 @@ var ProCombination = exports.ProCombination = function ProCombination(props) {
       renderType: 'Input'
     }] : _props$childProps,
     separator = props.separator;
-  var _ref = ProForm.useFieldProps() || {},
+  var _ref = _ProForm.default.useFieldProps() || {},
     _ref$isView = _ref.isView,
     isView = _ref$isView === void 0 ? false : _ref$isView,
     viewEmpty = _ref.viewEmpty,

package/lib/ProForm/style/index.less

@@ -137,6 +137,12 @@
           z-index: 9;
         }
       }
+
+      .ant-form-item-control-input-content > span {
+        background: @zaui-contract-bg;
+        padding: 4px 8px;
+        border-radius: 4px;
+      }
     }
 
     .ant-row {

package/lib/ProLayout/components/ProHeader/style/index.less

@@ -106,6 +106,7 @@
 
     .ant-breadcrumb-link {
       font-size: var(--zaui-font-size-xl, 18px);
+      display  : inline-flex;
     }
 
     .ant-breadcrumb-separator {

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

@@ -90,6 +90,6 @@ var RenderColumn = function RenderColumn(props) {
       children: node
     }) : '-';
   }
-  return value ? node : '-';
+  return value || value === 0 ? node : '-';
 };
 var _default = exports.default = RenderColumn;

package/lib/ProTable/style/index.less

@@ -54,6 +54,12 @@
     }
   }
 
+  .ant-table-tbody {
+    .ant-table-cell-fix-left, .ant-table-cell-fix-right {
+      background: unset !important;
+    }
+  }
+
   .ant-table-body {
     .ant-table-cell .varied-cell {
       margin-left: -8px;

package/lib/ProTree/components/Tree.js

@@ -130,7 +130,7 @@ function List(props) {
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       open = _useState2[0],
       setOpen = _useState2[1];
-    var operateButton = menu && menu(item === null || item === void 0 ? void 0 : item.value, item);
+    var operateButton = menu && menu(item === null || item === void 0 ? void 0 : item[fieldNameValue], item);
     operateButton === null || operateButton === void 0 ? void 0 : operateButton.map(function (item, i) {
       return (0, _jsxRuntime.jsx)(_react.default.Fragment, {
         children: item

package/lib/ProTreeSelect/index.js

@@ -147,9 +147,10 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
       _antd.message.error(msg);
       return;
     }
+    var resultData = transferDataSource(data, showCodeName);
     setState({
-      selectList: data || [],
-      origDataSource: data || []
+      selectList: resultData || [],
+      origDataSource: resultData || []
     });
   };
   // 配置了异步数据源，拉取枚举数据逻辑 如果有code不掉接口从local里根据code取值

package/lib/style/theme/antd.less

@@ -339,6 +339,11 @@
   }
 
   &.ant-tabs-card {
+    .ant-tabs-tab {
+      padding     : 8px calc(var(--zaui-space-size-md, 16px)*var(--zaui-size, 1)) !important;
+      margin-right: 10px !important;
+    }
+
     .ant-tabs-nav .ant-tabs-tab-btn {
       font-size: var(--zaui-font-size, 14px);
     }

package/package.json

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