@zat-design/sisyphus-react 3.2.1 → 3.2.2-beta.2

package/lib/ProDrawerForm/style/index.less

@@ -1,82 +1,83 @@
 .pro-drawer {
   .pro-drawer-close {
-    position       : absolute;
-    top            : 6px;
-    left           : -34px;
-    display        : flex;
-    align-items    : center;
+    position: absolute;
+    top: 6px;
+    left: -34px;
+    display: flex;
+    align-items: center;
     justify-content: center;
-    width          : 32px;
-    height         : 38px;
-    color          : var(--zaui-global-bg, #fff);
-    cursor         : pointer;
+    width: 32px;
+    height: 38px;
+    color: var(--zaui-global-bg, #fff);
+    cursor: pointer;
 
     .close-icon {
-      position : relative;
-      left     : 2px;
-      z-index  : 1;
+      position: relative;
+      left: 2px;
+      z-index: 1;
       font-size: var(--zaui-font-size-lg, 16px);
       transform: translateZ(100px);
-      fill     : var(--zaui-aide-text, #909090);
+      fill: var(--zaui-aide-text, #909090);
 
       &:hover {
-        fill: var(--zaui-brand-active, #005AD9);
+        fill: var(--zaui-brand-active, #005ad9);
       }
 
-      >div {
+      > div {
         height: 20px;
       }
     }
   }
 
   .pro-drawer-close::after {
-    position        : absolute;
-    top             : 0;
-    right           : 0;
-    bottom          : 0;
-    left            : 0;
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
     background-color: var(--zaui-global-bg, #fff);
-    border-radius   : 4px 0px 0px 4px;
-    transform       : perspective(0.15em) rotateY(-2deg);
-    content         : '';
+    border-radius: 4px 0px 0px 4px;
+    transform: perspective(0.15em) rotateY(-2deg);
+    content: '';
   }
 
   .pro-drawer-title {
-    position        : absolute;
-    top             : 0;
-    left            : 0;
-    width           : 100%;
-    height          : 64px;
-    padding         : var(--zaui-space-size-md, 16px) var(--zaui-space-size-lg, 32px);
-    color           : var(--zaui-text, #343434);
-    font-weight     : 600;
-    font-size       : var(--zaui-font-size-xxl, 20px);
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 64px;
+    padding: var(--zaui-space-size-md, 16px) var(--zaui-space-size-lg, 32px);
+    color: var(--zaui-text, #343434);
+    font-weight: 600;
+    font-size: var(--zaui-font-size-xxl, 20px);
     background-color: var(--zaui-global-bg, #fff);
   }
 
   .pro-drawer-scrolling {
-    z-index   : 1;
+    z-index: 1;
     box-shadow: -12px 14px 14px -18px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
   }
 
   .pro-drawer-content {
-    flex       : 1;
-    width      : 100%;
-    padding    : var(--zaui-space-size-md, 16px) var(--zaui-space-size-lg, 32px);
+    flex: 1;
+    width: 100%;
+    padding: var(--zaui-space-size-md, 16px) var(--zaui-space-size-lg, 32px);
     padding-top: 0;
-    overflow-x : hidden;
-    overflow-y : auto;
+    overflow-x: hidden;
+    overflow-y: auto;
   }
 
   .pro-drawer-footer {
-    position        : absolute;
-    bottom          : 0;
-    left            : 0;
-    z-index         : 101;
-    width           : 100%;
-    padding         : var(--zaui-space-size-md, 16px) var(--zaui-space-size-lg, 32px);
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    z-index: 101;
+    width: 100%;
+    padding: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1))
+      var(--zaui-space-size-lg, 32px);
     background-color: var(--zaui-global-bg, #fff);
-    box-shadow      : 8px 2px 8px 0 var(--zaui-shadow, rgba(56, 56, 56, 0.15));
+    box-shadow: 8px 2px 8px 0 var(--zaui-shadow, rgba(56, 56, 56, 0.15));
 
     button {
       margin-right: var(--zaui-space-size-sm, 8px);
@@ -88,8 +89,8 @@
   }
 
   .ant-drawer-body {
-    height    : 100vh;
-    padding   : 0;
+    height: 100vh;
+    padding: 0;
     overflow-y: hidden;
   }
 
@@ -116,7 +117,7 @@
   }
 
   .ant-modal-header {
-    padding      : var(--zaui-space-size-md, 16px);
+    padding: var(--zaui-space-size-md, 16px);
     border-bottom: none;
 
     .ant-modal-title {
@@ -125,30 +126,29 @@
   }
 
   .ant-modal-footer {
-    padding   : var(--zaui-space-size-md, 16px);
+    padding: var(--zaui-space-size-md, 16px);
     border-top: none;
 
     .pro-modal-footer {
-      display        : flex;
+      display: flex;
       justify-content: space-between;
     }
   }
 
   .ant-modal-content {
     .ant-modal-body {
-      max-height : 450px;
-      padding    : 0 var(--zaui-space-size-md, 16px);
+      max-height: 450px;
+      padding: 0 var(--zaui-space-size-md, 16px);
       padding-top: 0;
-      overflow   : auto;
+      overflow: auto;
     }
   }
-
 }
 
 .pro-modal-no-footer {
   .ant-modal-content {
     .ant-modal-body {
-      padding-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1))
+      padding-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
     }
   }
 }
@@ -157,16 +157,16 @@
   z-index: 1;
 
   .ant-modal-header {
+    position: relative;
+    z-index: 1;
     box-shadow: -12px 14px 14px -18px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
-    position  : relative;
-    z-index   : 1;
   }
 }
 
 .pro-modal-footer-shadow {
   .ant-modal-footer {
-    position  : relative;
-    z-index   : 1;
+    position: relative;
+    z-index: 1;
     box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
   }
 }

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,13 @@ 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"];
-/* eslint-disable prefer-destructuring */
-/* eslint-disable prefer-const */
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className"];
 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 +56,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 +72,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 +188,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 +364,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 +452,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 +506,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

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -21,8 +22,8 @@ var _utils = require("./utils");
 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 _locale = _interopRequireWildcard(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", "originalValues", "originalTip"];
 var ProEditTable = function ProEditTable(_ref, ref) {
   var _resetProps$id, _resetProps$id$split, _value$2;
   var value = _ref.value,
@@ -50,6 +51,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 +139,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) {
@@ -292,8 +297,11 @@ var ProEditTable = function ProEditTable(_ref, ref) {
             showQuickJumper: true,
             total: value.length,
             showTotal: function showTotal(total) {
+              var _locale$ProEditTable;
               if (!total) return;
-              return "\u5171".concat(total, "\u6761");
+              return (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEditTable = _locale.default.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
+                total: total
+              });
             },
             onChange: handlePageChange
           }, pagination) : false,

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/base/Checkbox/index.d.ts

@@ -8,6 +8,7 @@ export interface Props extends Omit<CheckboxGroupProps, 'options'> {
         value: string;
     };
     otherProps?: ProFormOtherProps;
+    isView?: boolean;
 }
 declare const Checkbox: React.FC<Props>;
 export default Checkbox;

package/lib/ProForm/components/base/Checkbox/index.js

@@ -12,16 +12,18 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
+var _index = _interopRequireDefault(require("../../../index"));
 var _excluded = ["dataSource", "otherProps", "fieldNames"];
 var Checkbox = function Checkbox(props) {
   var dataSource = props.dataSource,
     otherProps = props.otherProps,
     fieldNames = props.fieldNames,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
-    viewEmpty = _ref.viewEmpty;
   var initialConfig = (0, _ProConfigProvider.useProConfig)('Checkbox') || {};
+  var _ref = _index.default.useFieldProps() || {},
+    isViewCon = _ref.isView,
+    viewEmpty = _ref.viewEmpty;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var _fieldNames = fieldNames || initialConfig.fieldNames || {
     label: 'label',
     value: 'value'

package/lib/ProForm/components/base/DatePicker/index.js

@@ -23,14 +23,15 @@ var DatePicker = function DatePicker(props) {
     format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = _ProForm.default.useFieldProps() || {},
-    isView = _ref.isView,
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var initialConfig = (0, _ProConfigProvider.useProConfig)('DatePicker');
   var _className = (0, _classnames.default)((0, _defineProperty2.default)({
     'full-form-item': true
   }, className, !!className));
-  if (isView || (props === null || props === void 0 ? void 0 : props.isView)) {
+  if (isView) {
     var value = rest.value;
     var viewChildren = null;
     if (!value) {

package/lib/ProForm/components/base/Input/index.js

@@ -13,6 +13,7 @@ var _lodash = require("lodash");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
+var _index = _interopRequireDefault(require("../../../index"));
 var _excluded = ["label", "form", "placeholder", "fieldName", "otherProps"];
 // 参数优先级
 // 组件内默认值 < config默认值 < props
@@ -23,9 +24,10 @@ var Input = function Input(props) {
     fieldName = props.fieldName,
     otherProps = props.otherProps,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var _ref = _index.default.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var initialConfig = (0, _ProConfigProvider.useProConfig)('Input');
   if (isView) {
     return (0, _jsxRuntime.jsx)(_Container.default, {

package/lib/ProForm/components/base/Input/propsType.d.ts

@@ -11,4 +11,5 @@ export interface ProFieldProps<T = any> {
 }
 export interface IProps extends InputProps, ProFieldProps {
     otherProps?: ProFormOtherProps;
+    isView?: boolean;
 }

package/lib/ProForm/components/base/InputNumber/index.d.ts

@@ -5,6 +5,7 @@ export interface Props extends Omit<InputNumberProps, 'onBlur'> {
     otherProps?: ProFormOtherProps;
     range?: string;
     onBlur?: (value?: number, record?: any, object?: any) => void;
+    isView?: boolean;
 }
 declare const InputNumber: React.FC<Props>;
 export default InputNumber;

package/lib/ProForm/components/base/InputNumber/index.js

@@ -20,6 +20,7 @@ var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _index = require("../../../utils/index");
 var _locale = _interopRequireDefault(require("../../../../locale"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _excluded = ["placeholder", "className", "otherProps", "range", "min", "max", "onBlur"];
 var calc = _utils.tools.calc;
 var rangeReg = /^[([](-?\d+(\.\d+)?)?,\s*(-?\d+(\.\d+)?)?[)\]]$/;
@@ -46,12 +47,13 @@ var InputNumber = function InputNumber(props) {
     max = props.max,
     onBlur = props.onBlur,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref2 = otherProps || {},
-    isView = _ref2.isView,
+  var _ref2 = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref2.isView,
     viewEmpty = _ref2.viewEmpty,
-    viewType = _ref2.viewType,
     valueType = _ref2.valueType,
+    viewType = _ref2.viewType,
     label = _ref2.label;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var valueProps = {};
   if (valueType) {
     switch (valueType) {

package/lib/ProForm/components/base/ProCascader/index.js

@@ -13,7 +13,8 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _ahooks = require("ahooks");
 var _antd = require("antd");
 var _Container = _interopRequireDefault(require("../../Container"));
-var _excluded = ["useRequest", "isView", "otherProps", "dataSource", "options"];
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
+var _excluded = ["useRequest", "otherProps", "dataSource", "options"];
 var defaultFieldNames = {
   value: 'value',
   label: 'label',
@@ -47,19 +48,18 @@ var findTreeTarget = function findTreeTarget(dataSource, value, fieldNames) {
 var ProCascader = function ProCascader(props) {
   var _restProps$fieldNames;
   var requestProps = props.useRequest,
-    isView = props.isView,
     otherProps = props.otherProps,
     dataSource = props.dataSource,
     options = props.options,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref2 = otherProps || {},
-    formIsView = _ref2.isView;
+  var _ref2 = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref2.isView;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var _useRequest = (0, _ahooks.useRequest)(requestProps === null || requestProps === void 0 ? void 0 : requestProps.service, requestProps === null || requestProps === void 0 ? void 0 : requestProps.options),
     data = _useRequest.data;
-  var _isView = isView || formIsView;
   var _dataSource = data || dataSource || options;
   var _fieldNames = (_restProps$fieldNames = restProps.fieldNames) !== null && _restProps$fieldNames !== void 0 ? _restProps$fieldNames : defaultFieldNames;
-  if (_isView) {
+  if (isView) {
     var valueTarget = findTreeTarget(_dataSource, restProps.value, _fieldNames);
     var valueName = _fieldNames.value,
       label = _fieldNames.label;

package/lib/ProForm/components/base/Radio/index.d.ts

@@ -9,6 +9,7 @@ export interface Props extends Omit<RadioProps, 'options' | 'onChange'> {
         value: string;
     };
     otherProps?: ProFormOtherProps;
+    isView?: boolean;
 }
 declare const Radio: React.FC<Props>;
 export default Radio;

package/lib/ProForm/components/base/Radio/index.js

@@ -11,6 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _excluded = ["dataSource", "fieldNames", "onChange", "value", "otherProps"];
 var Radio = function Radio(props) {
   var dataSource = props.dataSource,
@@ -19,9 +20,10 @@ var Radio = function Radio(props) {
     value = props.value,
     otherProps = props.otherProps,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var _ref = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var initialConfig = (0, _ProConfigProvider.useProConfig)('Radio') || {};
   var _fieldNames = fieldNames || initialConfig.fieldNames || {
     label: 'label',

package/lib/ProForm/components/base/RangePicker/index.d.ts

@@ -5,6 +5,7 @@ export type Props = {
     otherProps?: ProFormOtherProps;
     separator?: any;
     showTime?: any;
+    isView?: boolean;
 } & Omit<RangePickerProps, 'separator'>;
 declare const RangePicker: React.FC<Props>;
 export default RangePicker;

package/lib/ProForm/components/base/RangePicker/index.js

@@ -12,8 +12,9 @@ var _antd = require("antd");
 var _lodash = require("lodash");
 var _moment = _interopRequireDefault(require("moment"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _Container = _interopRequireDefault(require("../../Container"));
-var _excluded = ["format", "otherProps", "separator"]; // @ts-check
+var _excluded = ["format", "otherProps", "separator"];
 var AntRangePicker = _antd.DatePicker.RangePicker;
 var RangePicker = function RangePicker(props) {
   var _props$format = props.format,
@@ -22,11 +23,12 @@ var RangePicker = function RangePicker(props) {
     _props$separator = props.separator,
     separator = _props$separator === void 0 ? '~' : _props$separator,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var initialConfig = (0, _ProConfigProvider.useProConfig)('AntRangePicker');
+  var _ref = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
-  var initialConfig = (0, _ProConfigProvider.useProConfig)('AntRangePicker');
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   if (isView) {
     var _props$value = props.value,
       value = _props$value === void 0 ? [] : _props$value;