@zat-design/sisyphus-react 3.2.1 → 3.2.2

package/dist/index.esm.css

@@ -819,6 +819,9 @@
   background-color: var(--zaui-base-bg, #ffffff);
   padding: 24px 0 0 0;
 }
+.pro-header.pro-header-no-back.pro-header-has-describe .pro-header-top {
+  padding-left: var(--zaui-space-size-md, 16px);
+}
 .pro-header.pro-header-no-back .pro-header-top {
   padding-left: 0;
 }
@@ -905,6 +908,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;
@@ -1509,7 +1516,7 @@
   width: 48px;
 }
 .pro-tabs .ant-tabs .ant-tabs-nav-list .ant-tabs-tab {
-  padding: 0;
+  padding: 0 !important;
 }
 .pro-tabs .ant-tabs-top > .ant-tabs-nav::before,
 .pro-tabs .ant-tabs-bottom > .ant-tabs-nav::before,
@@ -1618,6 +1625,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);
@@ -2125,7 +2136,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-modal-select .ant-input-group-wrapper:hover .close-icon > span,
 .pro-tree-modal .ant-input-group-wrapper:hover .close-icon > span {
   position: relative;
-  font-size: var(--zaui-font-size, 14px);
+  font-size: 10px;
   border: none;
   border-radius: 50%;
 }
@@ -2419,8 +2430,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
-  margin-bottom: 0;
   height: auto;
+  margin-bottom: 0;
   padding-top: 6px;
 }
 .pro-form.ant-form-vertical .pro-form-custom-footer .ant-space-align-center {
@@ -2505,13 +2516,23 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper,
 .pro-form .ant-form-item.pro-form-item-changed .ant-select-selector,
 .pro-form .ant-form-item.pro-form-item-changed .ant-picker {
-  background: var(--zaui-contract-bg, #fffaa1);
+  background: var(--zaui-contract-bg, #fffaa1) !important;
 }
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper input,
 .pro-form .ant-form-item.pro-form-item-changed .ant-select-selector input,
 .pro-form .ant-form-item.pro-form-item-changed .ant-picker input {
   background: var(--zaui-contract-bg, #fffaa1);
 }
+.pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper .ant-select-selection-placeholder,
+.pro-form .ant-form-item.pro-form-item-changed .ant-select-selector .ant-select-selection-placeholder,
+.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%;
 }
@@ -5078,16 +5099,16 @@ input[type='button'] {
 .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .ant-table-row:nth-child(even) td,
 .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .ant-table-row:nth-child(even) td.ant-table-cell-fix-right,
 .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .ant-table-row:nth-child(even) td.ant-table-cell-fix-left {
-  background-color: #fff;
+  background-color: #fff !important;
 }
 .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .ant-table-row:nth-child(even) td {
   background-color: #fff;
 }
 .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .ant-table-row:nth-child(odd) {
-  background-color: var(--zaui-table-strip-bg, #fafafa);
+  background-color: var(--zaui-table-strip-bg, #fafafa) !important;
 }
 .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .ant-table-row:nth-child(odd) td {
-  background-color: var(--zaui-table-strip-bg, #fafafa);
+  background-color: var(--zaui-table-strip-bg, #fafafa) !important;
 }
 .ant-table .ant-table-cell .ant-btn-link {
   padding: 0;
@@ -5132,6 +5153,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';
@@ -20,7 +20,7 @@ import { transformColumns } from './utils';
 import { getRandom, getNamePath } from './utils/tools';
 import { DndWrapper, Row, Validator, Summary, RenderToolbar } from './components';
 import Empty from '../assets/empty.png';
-import locale from '../locale';
+import locale, { formatMessage } from '../locale';
 var ProEditTable = function ProEditTable(_ref, ref) {
   var _resetProps$id, _resetProps$id$split, _value$2;
   var value = _ref.value,
@@ -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) {
@@ -290,8 +294,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 formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProEditTable = locale.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
+                total: total
+              });
             },
             onChange: handlePageChange
           }, pagination) : false,

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/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/es/ProForm/components/base/Checkbox/index.js

@@ -7,15 +7,17 @@ import { createElement as _createElement } from "react";
 import { jsx as _jsx } from "react/jsx-runtime";
 import Container from '../../Container';
 import { useProConfig } from '../../../../ProConfigProvider';
+import ProForm from '../../../index';
 var Checkbox = function Checkbox(props) {
   var dataSource = props.dataSource,
     otherProps = props.otherProps,
     fieldNames = props.fieldNames,
     rest = _objectWithoutProperties(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
-    viewEmpty = _ref.viewEmpty;
   var initialConfig = useProConfig('Checkbox') || {};
+  var _ref = ProForm.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/es/ProForm/components/base/DatePicker/index.js

@@ -17,14 +17,15 @@ var DatePicker = function DatePicker(props) {
     format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
     rest = _objectWithoutProperties(props, _excluded);
   var _ref = ProForm.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 = useProConfig('DatePicker');
   var _className = classNames(_defineProperty({
     '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/es/ProForm/components/base/Input/index.js

@@ -8,6 +8,7 @@ import { omit } from 'lodash';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
 import locale from '../../../../locale';
+import ProForm from '../../../index';
 // 参数优先级
 // 组件内默认值 < config默认值 < props
 var Input = function Input(props) {
@@ -17,9 +18,10 @@ var Input = function Input(props) {
     fieldName = props.fieldName,
     otherProps = props.otherProps,
     rest = _objectWithoutProperties(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var _ref = ProForm.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var initialConfig = useProConfig('Input');
   if (isView) {
     return _jsx(Container, {

package/es/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/es/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/es/ProForm/components/base/InputNumber/index.js

@@ -17,6 +17,7 @@ import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
 import { getDecimalDigits } from '../../../utils/index';
 import locale from '../../../../locale';
+import ProForm from '../../../../ProForm';
 var calc = tools.calc;
 var rangeReg = /^[([](-?\d+(\.\d+)?)?,\s*(-?\d+(\.\d+)?)?[)\]]$/;
 /**
@@ -42,12 +43,13 @@ var InputNumber = function InputNumber(props) {
     max = props.max,
     onBlur = props.onBlur,
     rest = _objectWithoutProperties(props, _excluded);
-  var _ref2 = otherProps || {},
-    isView = _ref2.isView,
+  var _ref2 = ProForm.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/es/ProForm/components/base/ProCascader/index.js

@@ -4,10 +4,11 @@ import _Cascader from "antd/es/cascader";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-var _excluded = ["useRequest", "isView", "otherProps", "dataSource", "options"];
+var _excluded = ["useRequest", "otherProps", "dataSource", "options"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useRequest } from 'ahooks';
 import Container from '../../Container';
+import ProForm from '../../../../ProForm';
 var defaultFieldNames = {
   value: 'value',
   label: 'label',
@@ -41,19 +42,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 = _objectWithoutProperties(props, _excluded);
-  var _ref2 = otherProps || {},
-    formIsView = _ref2.isView;
+  var _ref2 = ProForm.useFieldProps() || {},
+    isViewCon = _ref2.isView;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var _useRequest = 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/es/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/es/ProForm/components/base/Radio/index.js

@@ -6,6 +6,7 @@ var _excluded = ["dataSource", "fieldNames", "onChange", "value", "otherProps"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
+import ProForm from '../../../../ProForm';
 var Radio = function Radio(props) {
   var dataSource = props.dataSource,
     fieldNames = props.fieldNames,
@@ -13,9 +14,10 @@ var Radio = function Radio(props) {
     value = props.value,
     otherProps = props.otherProps,
     rest = _objectWithoutProperties(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var _ref = ProForm.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var initialConfig = useProConfig('Radio') || {};
   var _fieldNames = fieldNames || initialConfig.fieldNames || {
     label: 'label',

package/es/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/es/ProForm/components/base/RangePicker/index.js

@@ -9,6 +9,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { isFunction, isString, omit } from 'lodash';
 import moment from 'moment';
 import { useProConfig } from '../../../../ProConfigProvider';
+import ProForm from '../../../../ProForm';
 import Container from '../../Container';
 var AntRangePicker = _DatePicker.RangePicker;
 var RangePicker = function RangePicker(props) {
@@ -18,11 +19,12 @@ var RangePicker = function RangePicker(props) {
     _props$separator = props.separator,
     separator = _props$separator === void 0 ? '~' : _props$separator,
     rest = _objectWithoutProperties(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var initialConfig = useProConfig('AntRangePicker');
+  var _ref = ProForm.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
-  var initialConfig = 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;

package/es/ProForm/components/base/Select/index.d.ts

@@ -5,6 +5,7 @@ export interface Props extends SelectProps {
     dataSource?: any[];
     scrollFollowParent?: boolean;
     otherProps?: ProFormOtherProps;
+    isView?: boolean;
 }
 declare const Select: React.FC<Props>;
 export default Select;

package/es/ProForm/components/base/Select/index.js

@@ -7,6 +7,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import Container from '../../Container';
 import { useProConfig } from '../../../../ProConfigProvider';
 import locale from '../../../../locale';
+import ProForm from '../../../index';
 var Select = function Select(props) {
   var _props$dataSource = props.dataSource,
     dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
@@ -15,9 +16,10 @@ var Select = function Select(props) {
     _props$scrollFollowPa = props.scrollFollowParent,
     scrollFollowParent = _props$scrollFollowPa === void 0 ? true : _props$scrollFollowPa,
     rest = _objectWithoutProperties(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var _ref = ProForm.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var initialConfig = useProConfig('Select') || {};
   var _fieldNames = fieldNames || initialConfig.fieldNames || {
     label: 'label',

package/es/ProForm/components/base/Switch/index.d.ts

@@ -4,6 +4,7 @@ import { ProFormOtherProps } from '../../../propsType';
 export interface Props extends Omit<SwitchProps, 'value'> {
     value: any;
     otherProps?: ProFormOtherProps;
+    isView?: boolean;
 }
 declare const Switch: React.FC<Props>;
 export default Switch;

package/es/ProForm/components/base/Switch/index.js

@@ -8,14 +8,16 @@ import { isNull, isUndefined } from 'lodash';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
 import locale from '../../../../locale';
+import ProForm from '../../../../ProForm';
 var Switch = function Switch(props) {
   var disabled = props.disabled,
     otherProps = props.otherProps,
     res = _objectWithoutProperties(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var _ref = ProForm.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var config = useProConfig('Switch');
   if (isView) {
     if (isUndefined(res === null || res === void 0 ? void 0 : res.checked) || isNull(res === null || res === void 0 ? void 0 : res.checked) || valueType === 'switch' && isUndefined(res.value)) {

package/es/ProForm/components/base/SwitchCheckbox/index.d.ts

@@ -4,6 +4,7 @@ import { ProFormOtherProps } from '../../../propsType';
 export interface Props extends CheckboxProps {
     label?: string;
     otherProps?: ProFormOtherProps;
+    isView?: boolean;
 }
 declare const SwitchCheckbox: React.FC<Props>;
 export default SwitchCheckbox;

package/es/ProForm/components/base/SwitchCheckbox/index.js

@@ -7,16 +7,18 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { isNull, isUndefined } from 'lodash';
 import { useProConfig } from '../../../../ProConfigProvider';
 import locale from '../../../../locale';
+import ProForm from '../../../../ProForm';
 var SwitchCheckbox = function SwitchCheckbox(props) {
   var onChange = props.onChange,
     disabled = props.disabled,
     value = props.value,
     otherProps = props.otherProps,
     restProps = _objectWithoutProperties(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var _ref = ProForm.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var initialConfig = useProConfig('SwitchCheckbox');
   var changeVal = function changeVal(e) {
     onChange(e.target.checked);