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

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

@@ -12,6 +12,7 @@ var _antd = require("antd");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _locale = _interopRequireDefault(require("../../../../locale"));
+var _index = _interopRequireDefault(require("../../../index"));
 var _excluded = ["dataSource", "fieldNames", "otherProps", "scrollFollowParent"];
 var Select = function Select(props) {
   var _props$dataSource = props.dataSource,
@@ -21,9 +22,10 @@ var Select = function Select(props) {
     _props$scrollFollowPa = props.scrollFollowParent,
     scrollFollowParent = _props$scrollFollowPa === void 0 ? true : _props$scrollFollowPa,
     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)('Select') || {};
   var _fieldNames = fieldNames || initialConfig.fieldNames || {
     label: 'label',

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

@@ -13,15 +13,17 @@ var _lodash = require("lodash");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _excluded = ["disabled", "otherProps"];
 var Switch = function Switch(props) {
   var disabled = props.disabled,
     otherProps = props.otherProps,
     res = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var _ref = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var config = (0, _ProConfigProvider.useProConfig)('Switch');
   if (isView) {
     if ((0, _lodash.isUndefined)(res === null || res === void 0 ? void 0 : res.checked) || (0, _lodash.isNull)(res === null || res === void 0 ? void 0 : res.checked) || valueType === 'switch' && (0, _lodash.isUndefined)(res.value)) {

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

@@ -12,6 +12,7 @@ var _antd = require("antd");
 var _lodash = require("lodash");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _locale = _interopRequireDefault(require("../../../../locale"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _excluded = ["onChange", "disabled", "value", "otherProps"];
 var SwitchCheckbox = function SwitchCheckbox(props) {
   var onChange = props.onChange,
@@ -19,10 +20,11 @@ var SwitchCheckbox = function SwitchCheckbox(props) {
     value = props.value,
     otherProps = props.otherProps,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var _ref = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var initialConfig = (0, _ProConfigProvider.useProConfig)('SwitchCheckbox');
   var changeVal = function changeVal(e) {
     onChange(e.target.checked);

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

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

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

@@ -13,6 +13,7 @@ var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _locale = _interopRequireDefault(require("../../../../locale"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 require("./index.less");
 var _excluded = ["placeholder", "otherProps", "className"];
 var TextArea = _antd.Input.TextArea;
@@ -21,10 +22,10 @@ var TextAreaDef = function TextAreaDef(props) {
     otherProps = props.otherProps,
     className = props.className,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
+  var _ref = _ProForm.default.useFieldProps() || {},
     label = _ref.label,
-    isView = _ref.isView,
-    viewEmpty = _ref.viewEmpty;
+    isViewCon = _ref.isView;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var initialConfig = (0, _ProConfigProvider.useProConfig)('TextArea');
   var disabled = (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.disabled) || rest.disabled;
   if (isView) {

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

@@ -8,6 +8,7 @@ export interface Props {
     onChange?: (value: string) => void;
     value?: string;
     otherProps?: ProFormOtherProps;
+    isView?: boolean;
 }
 declare const TimePicker: React.FC<Props & TimePickerProps>;
 export default TimePicker;

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

@@ -12,6 +12,7 @@ var _antd = require("antd");
 var _moment = _interopRequireDefault(require("moment"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 require("./style/index.less");
 var _excluded = ["format", "onChange", "value", "otherProps"];
 var TimePicker = function TimePicker(props) {
@@ -21,11 +22,12 @@ var TimePicker = function TimePicker(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,
     _ref$valueType = _ref.valueType,
     valueType = _ref$valueType === void 0 ? 'dateTime' : _ref$valueType;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var initialConfig = (0, _ProConfigProvider.useProConfig)('AntTimePicker');
   var handleChange = function handleChange(value) {
     if (valueType === 'dateTime') {

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

@@ -13,16 +13,18 @@ var _lodash = require("lodash");
 var _classnames2 = _interopRequireDefault(require("classnames"));
 var _RenderFields = _interopRequireDefault(require("../../render/RenderFields"));
 var _ProCollapse = _interopRequireDefault(require("../../../../ProLayout/components/ProCollapse"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var Container = function Container(props) {
   var children = props.children,
     otherProps = props.otherProps,
     className = props.className,
     container = props.container;
-  var type = otherProps.type,
-    form = otherProps.form,
-    show = otherProps.show,
-    required = otherProps.required,
-    disabled = otherProps.disabled;
+  var _ref = _ProForm.default.useFieldProps() || {},
+    type = _ref.type,
+    form = _ref.form,
+    show = _ref.show,
+    required = _ref.required,
+    disabled = _ref.disabled;
   var _className = (0, _classnames2.default)((0, _defineProperty2.default)({
     'pro-container': true,
     'pro-container-diy': type === 'Container'

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

@@ -17,9 +17,9 @@ var _utils2 = require("./utils");
 var _ToolbarButton = _interopRequireDefault(require("./components/ToolbarButton"));
 var _BlockFields = _interopRequireDefault(require("./components/BlockFields"));
 var _LineFields = _interopRequireDefault(require("./components/LineFields"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var FormList = function FormList(props, ref) {
   var columns = props.columns,
-    otherProps = props.otherProps,
     min = props.min,
     max = props.max,
     toolbarProps = props.toolbarProps,
@@ -35,10 +35,11 @@ var FormList = function FormList(props, ref) {
       key: String(item.key)
     });
   });
-  var form = otherProps.form,
-    name = otherProps.name,
-    isView = otherProps.isView,
-    disabled = otherProps.disabled;
+  var _ref = _ProForm.default.useFieldProps() || {},
+    form = _ref.form,
+    name = _ref.name,
+    isView = _ref.isView,
+    disabled = _ref.disabled;
   var errors = meta.errors;
   var _namePath = (0, _utils.toArray)(name);
   var processColumns = (0, _react.useCallback)(function (fieldName, namePath) {

package/lib/ProForm/components/combination/FormList/style/index.less

@@ -1,28 +1,20 @@
 .pro-form-list-block-title {
-  height      : 14px;
-  margin      : @zaui-space-size-xs 0;
+  height: 14px;
+  margin: @zaui-space-size-xs 0;
   padding-left: @zaui-space-size-sm;
-  font-weight : 600;
-  line-height : 14px;
-  border-left : 4px solid @zaui-brand;
+  font-weight: 600;
+  line-height: 14px;
+  border-left: 4px solid @zaui-brand;
 }
 
 .pro-form-list {
-  display       : flex;
+  display: flex;
   padding-bottom: 0;
 
-  &.pro-form-list-last {
-
-    .pro-form-list-drag-handle,
-    .ant-form-item {
-      margin-bottom: 0 !important;
-    }
-  }
-
   .single-delete {
-    width : 14px !important;
+    width: 14px !important;
     height: 14px !important;
-    color : @zaui-placeholder;
+    color: @zaui-placeholder;
 
     &:hover {
       color: @zaui-aide-text;
@@ -36,24 +28,25 @@
   .pro-form-list-action {
     padding-bottom: var(--zaui-height-size-md, 16px);
 
-    &>.ant-space-item:first-child>.ant-btn-link {
+    & > .ant-space-item:first-child > .ant-btn-link {
       margin-left: @zaui-space-size-sm;
     }
   }
 
   .pro-form-list-drag-handle {
-    display      : flex;
-    align-items  : center;
-    height       : 32px;
+    display: flex;
+    align-items: center;
+    height: 32px;
     margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
-    padding      : 0;
+    padding: 0;
     padding-right: @zaui-space-size-sm;
-    border       : none;
+    border: none;
   }
 }
 
 .pro-form-list-line {
   padding: var(--zaui-height-size-md, 16px);
+  padding-bottom: 0;
 
   &:hover {
     background: rgba(0, 0, 0, 0.018);

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

@@ -14,6 +14,7 @@ var _lodash = require("lodash");
 var _classnames2 = _interopRequireDefault(require("classnames"));
 var _RenderFields = _interopRequireDefault(require("../../render/RenderFields"));
 var _utils = require("./utils");
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var Group = function Group(props) {
   var columns = props.children,
     otherProps = props.otherProps,
@@ -23,9 +24,11 @@ var Group = function Group(props) {
       size: 12
     } : _props$space,
     id = props.id;
-  var name = otherProps.name,
-    form = otherProps.form;
-  if (!Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.names)) {
+  var _ref = _ProForm.default.useFieldProps() || {},
+    names = _ref.names,
+    name = _ref.name,
+    form = _ref.form;
+  if (!Array.isArray(names)) {
     console.error('Warning: Composite form components whose type is Group must be configured with names');
   }
   var _parentNames = (0, _utils.parseName)(id);

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

@@ -10,7 +10,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
@@ -20,7 +19,7 @@ var _utils = require("@zat-design/utils");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _useEnum = _interopRequireDefault(require("../../../../ProEnum/hooks/useEnum"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
-var _excluded = ["className", "getPopupContainer", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var transformDataName = _utils.tools.transformDataName;
 var Text = _antd.Typography.Text;
 var filterDataSource = function filterDataSource(dataSource, level) {
@@ -48,7 +47,7 @@ var levelMap = {
   3: 'county'
 };
 var ProAddressBar = function ProAddressBar(props) {
-  var _otherProps$otherProp, _ref11, _ref11$filter, _locale$ProAddressBar, _locale$ProAddressBar2, _locale$ProAddressBar3;
+  var _ref12, _ref12$filter, _locale$ProAddressBar, _locale$ProAddressBar2, _locale$ProAddressBar3;
   var _ref = (0, _ProConfigProvider.useProConfig)('ProAddressBar') || {},
     configUseRequest = _ref.useRequest,
     configTransformResponse = _ref.transformResponse,
@@ -78,30 +77,30 @@ var ProAddressBar = function ProAddressBar(props) {
     transformResponse = _props$transformRespo === void 0 ? configTransformResponse : _props$transformRespo,
     _props$level = props.level,
     level = _props$level === void 0 ? 3 : _props$level,
-    _props$isView = props.isView,
-    isView = _props$isView === void 0 ? false : _props$isView,
+    isView = props.isView,
     _props$enumCode = props.enumCode,
     enumCode = _props$enumCode === void 0 ? configEnumCode : _props$enumCode,
     _props$code = props.code,
     code = _props$code === void 0 ? configCode : _props$code,
     tooltip = props.tooltip,
     _props$separator = props.separator,
-    separator = _props$separator === void 0 ? '' : _props$separator,
-    otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+    separator = _props$separator === void 0 ? '' : _props$separator;
+  var _ref2 = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref2.isView;
   var addressCode = code || enumCode;
-  var realIsView = isView || (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$otherProp = otherProps.otherProps) === null || _otherProps$otherProp === void 0 ? void 0 : _otherProps$otherProp.isView);
-  var _ref2 = value || [],
-    _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
-    province = _ref3[0],
-    city = _ref3[1];
+  var realIsView = typeof isView === 'boolean' ? isView : isViewCon;
+  var _ref3 = value || [],
+    _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
+    province = _ref4[0],
+    city = _ref4[1];
   var realLevel = Math.max(2, level);
   var county = realLevel === 3 ? value === null || value === void 0 ? void 0 : value[realLevel - 1] : undefined;
   var address = value === null || value === void 0 ? void 0 : value[realLevel];
   var enumData = (0, _useEnum.default)(addressCode);
-  var _ref4 = Array.isArray(enumData) ? enumData : [],
-    _ref5 = (0, _slicedToArray2.default)(_ref4, 1),
-    _ref5$ = _ref5[0],
-    enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
+  var _ref5 = Array.isArray(enumData) ? enumData : [],
+    _ref6 = (0, _slicedToArray2.default)(_ref5, 1),
+    _ref6$ = _ref6[0],
+    enumDataSource = _ref6$ === void 0 ? [] : _ref6$;
   var realDataSource = (0, _react.useMemo)(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
     return realLevel === 2 ? filterDataSource(innerDataSource, level) : innerDataSource;
@@ -141,12 +140,12 @@ var ProAddressBar = function ProAddressBar(props) {
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     defaultLabel = _useSetState2[0],
     setDefaultLabel = _useSetState2[1];
-  var _ref6 = defaultLabel || {},
-    provinceLabel = _ref6.province,
-    cityLabel = _ref6.city,
-    countyLabel = _ref6.county;
+  var _ref7 = defaultLabel || {},
+    provinceLabel = _ref7.province,
+    cityLabel = _ref7.city,
+    countyLabel = _ref7.county;
   var getProvinces = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(loadData) {
+    var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(loadData) {
       var _yield$service, data, newData, _newData, _provinces, transFormData;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -186,11 +185,11 @@ var ProAddressBar = function ProAddressBar(props) {
       }, _callee);
     }));
     return function getProvinces(_x) {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
   var getAddressData = /*#__PURE__*/function () {
-    var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(params) {
+    var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(params) {
       var _yield$service2, data;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -214,12 +213,12 @@ var ProAddressBar = function ProAddressBar(props) {
       }, _callee2);
     }));
     return function getAddressData(_x2) {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
   // 传入useRequest时，得到地址省市区的label，初次加载需要
   var initAddressLabel = /*#__PURE__*/function () {
-    var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3(key, value, extra) {
+    var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3(key, value, extra) {
       var selectProvince, _newData2, _yield$service3, data, newData;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -259,7 +258,7 @@ var ProAddressBar = function ProAddressBar(props) {
       }, _callee3);
     }));
     return function initAddressLabel(_x3, _x4, _x5) {
-      return _ref9.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }();
   (0, _react.useEffect)(function () {
@@ -298,7 +297,7 @@ var ProAddressBar = function ProAddressBar(props) {
     }
   }, [realIsView, value, serviceData]);
   var handleLoadData = /*#__PURE__*/function () {
-    var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4(selectedOptions) {
+    var _ref11 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4(selectedOptions) {
       var targetOption, data;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -327,7 +326,7 @@ var ProAddressBar = function ProAddressBar(props) {
       }, _callee4);
     }));
     return function handleLoadData(_x6) {
-      return _ref10.apply(this, arguments);
+      return _ref11.apply(this, arguments);
     };
   }();
   var handleChange = function handleChange(changeValue, selectedOptions) {
@@ -369,9 +368,9 @@ var ProAddressBar = function ProAddressBar(props) {
     })) === null || _filter === void 0 ? void 0 : _filter.join('/') : undefined;
   };
   var addressValue = value && (province || city || county) ? [province, city, county].slice(0, realLevel) : undefined;
-  var viewValue = ((_ref11 = [provinceLabel, cityLabel, countyLabel, value === null || value === void 0 ? void 0 : value[realLevel]]) === null || _ref11 === void 0 ? void 0 : (_ref11$filter = _ref11.filter(function (item) {
+  var viewValue = ((_ref12 = [provinceLabel, cityLabel, countyLabel, value === null || value === void 0 ? void 0 : value[realLevel]]) === null || _ref12 === void 0 ? void 0 : (_ref12$filter = _ref12.filter(function (item) {
     return !!item;
-  })) === null || _ref11$filter === void 0 ? void 0 : _ref11$filter.join(separator)) || '-';
+  })) === null || _ref12$filter === void 0 ? void 0 : _ref12$filter.join(separator)) || '-';
   return realIsView ? tooltip ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
     className: className,
     title: tooltip === true ? viewValue : tooltip,

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
 
@@ -53,17 +54,16 @@ var ProCombination = exports.ProCombination = function ProCombination(props) {
     }, {
       renderType: 'Input'
     }] : _props$childProps,
-    separator = props.separator,
-    _props$otherProps = props.otherProps,
-    otherProps = _props$otherProps === void 0 ? {} : _props$otherProps;
-  var _otherProps$isView = otherProps.isView,
-    isView = _otherProps$isView === void 0 ? false : _otherProps$isView,
-    viewEmpty = otherProps.viewEmpty,
-    form = otherProps.form;
+    separator = props.separator;
+  var _ref = _ProForm.default.useFieldProps() || {},
+    _ref$isView = _ref.isView,
+    isView = _ref$isView === void 0 ? false : _ref$isView,
+    viewEmpty = _ref.viewEmpty,
+    form = _ref.form;
   // 取到对应组件
-  var _ref = [componentMap[((_childProps$ = childProps[0]) === null || _childProps$ === void 0 ? void 0 : _childProps$.renderType) || 'Input'], componentMap[((_childProps$2 = childProps[1]) === null || _childProps$2 === void 0 ? void 0 : _childProps$2.renderType) || 'Input']],
-    BeforeCom = _ref[0],
-    AfterCom = _ref[1];
+  var _ref2 = [componentMap[((_childProps$ = childProps[0]) === null || _childProps$ === void 0 ? void 0 : _childProps$.renderType) || 'Input'], componentMap[((_childProps$2 = childProps[1]) === null || _childProps$2 === void 0 ? void 0 : _childProps$2.renderType) || 'Input']],
+    BeforeCom = _ref2[0],
+    AfterCom = _ref2[1];
   var _useControlled = useControlled(props),
     _useControlled2 = (0, _slicedToArray2.default)(_useControlled, 2),
     values = _useControlled2[0],
@@ -111,7 +111,7 @@ var ProCombination = exports.ProCombination = function ProCombination(props) {
   // 查看模式
   if (isView) {
     if (!values || !Array.isArray(values)) {
-      return otherProps.viewEmpty;
+      return viewEmpty;
     }
     var childData = childProps;
     if (!childData || Array.isArray(childData) && !childData.length) {

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

@@ -24,7 +24,7 @@ var _Container = _interopRequireDefault(require("../../Container"));
 var _view = _interopRequireDefault(require("../../../../assets/view.svg"));
 var _useRequestList2 = _interopRequireDefault(require("./hooks/useRequestList"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
-var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "isTooltip", "otherProps", "searchForm", "defaultOne"],
+var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "isTooltip", "searchForm", "defaultOne"],
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 var ProModalSelect = function ProModalSelect(props, ref) {
@@ -48,7 +48,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     className = props.className,
     beforeOpen = props.beforeOpen,
     isTooltip = props.isTooltip,
-    otherProps = props.otherProps,
     searchForm = props.searchForm,
     defaultOne = props.defaultOne,
     restInputProps = (0, _objectWithoutProperties2.default)(props, _excluded);
@@ -69,10 +68,10 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var _ref = modalProps || {},
     onOk = _ref.onOk,
     restModalProps = (0, _objectWithoutProperties2.default)(_ref, _excluded2);
-  var _ref2 = otherProps || {},
-    _ref2$isView = _ref2.isView,
-    isView = _ref2$isView === void 0 ? false : _ref2$isView,
+  var _ref2 = _index.ProForm.useFieldProps() || {},
+    isViewCon = _ref2.isView,
     viewEmpty = _ref2.viewEmpty;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   // 是否多选
   var isMultiple = type === 'checkbox';
   // 生成一个唯一id，用于满足tooltip功能

package/lib/ProForm/components/combination/ProModalSelect/style/index.less

@@ -22,7 +22,7 @@
 
       > span {
         position: relative;
-        font-size: var(--zaui-font-size, 14px);
+        font-size: 10px;
         border: none;
         border-radius: 50%;
       }

package/lib/ProForm/components/combination/ProNumberRange/index.d.ts

@@ -1,3 +1,3 @@
 import { ProNumberRangeProps } from './propsType';
-declare const ProNumberRange: (props: ProNumberRangeProps) => import("react").ReactNode;
+declare const ProNumberRange: (props: ProNumberRangeProps) => any;
 export default ProNumberRange;

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

@@ -16,6 +16,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _utils = require("@zat-design/utils");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var formatAmount = _utils.tools.formatAmount,
   formatPercent = _utils.tools.formatPercent,
   formatPerMill = _utils.tools.formatPerMill;
@@ -33,17 +34,16 @@ var ProNumberRange = function ProNumberRange(props) {
     decimal = _props$decimal === void 0 ? 2 : _props$decimal,
     precision = props.precision,
     childProps = props.childProps,
-    otherProps = props.otherProps,
     addonBefore = props.addonBefore,
     addonAfter = props.addonAfter,
     _props$separator = props.separator,
     separator = _props$separator === void 0 ? '~' : _props$separator,
     inValueType = props.valueType;
-  var _ref = otherProps || {},
-    _ref$isView = _ref.isView,
-    isView = _ref$isView === void 0 ? false : _ref$isView,
-    valueType = _ref.valueType,
-    viewEmpty = _ref.viewEmpty;
+  var _ref = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref.isView,
+    viewEmpty = _ref.viewEmpty,
+    valueType = _ref.valueType;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var _useSetState = (0, _ahooks.useSetState)({
       range: value || []
     }),
@@ -94,7 +94,7 @@ var ProNumberRange = function ProNumberRange(props) {
   // 查看模式
   if (isView || props.isView) {
     if ((0, _lodash.isEmpty)(value)) {
-      return otherProps.viewEmpty;
+      return viewEmpty;
     }
     switch (valueType) {
       // 百分比

package/lib/ProForm/components/combination/ProRangeLimit/index.d.ts

@@ -10,6 +10,7 @@ export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'se
     value?: ValueStr;
     format?: string;
     separator?: any;
+    isView?: boolean;
 };
 type Value = [Moment?, Moment?, boolean?];
 type ValueStr = [string?, string?, string?];

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

@@ -17,6 +17,7 @@ var _moment = _interopRequireDefault(require("moment"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _excluded = ["disabled", "foreverText", "foreverDate", "format", "otherProps", "separator"];
 var defaultPickerValue = [(0, _moment.default)(), (0, _moment.default)()];
 var useControlled = function useControlled(props) {
@@ -54,9 +55,10 @@ var ProRangeLimit = function ProRangeLimit(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 _ref = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var _useControlled = useControlled((0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
       format: format
     })),

package/lib/ProForm/components/combination/ProTimeLimit/index.d.ts

@@ -15,6 +15,7 @@ export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onC
     valueType?: 'moment' | 'format' | 'ISO';
     otherProps?: ProFormOtherProps;
     mode?: 'DatePicker';
+    isView?: boolean;
 };
 export declare const ProTimeLimit: React.FC<ProTimeLimitProps>;
 export type ProLimitProps = ProTimeLimitProps | (ProRangeLimitProps & {