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

package/dist/index.esm.css

@@ -331,7 +331,7 @@
   line-height: initial !important;
   height: auto !important;
   margin: 0;
-  padding-top: 12px 0;
+  padding: 12px 0;
   min-height: 48px;
 }
 .pro-layout-open-menu .ant-menu-title-content div {
@@ -2419,8 +2419,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 {
@@ -2470,7 +2470,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   width: 100%;
 }
 .pro-form .expand-button {
-  line-height: 32px;
+  line-height: calc(var(--zaui-space-card, 32px) * var(--zaui-size, 1));
   cursor: pointer;
 }
 .pro-form .expand-button .rotate-to-top {
@@ -2505,13 +2505,18 @@ 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 .ant-row {
   width: 100%;
 }
@@ -2627,7 +2632,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-form div.pro-form-custom-footer {
   width: unset !important;
-  height: 32px;
+  height: calc(var(--zaui-space-card, 32px) * var(--zaui-size, 1));
   margin-bottom: calc(var(--zaui-height-size-md, 16px) * var(--zaui-size, 1));
 }
 .pro-form div.pro-form-custom-footer.pro-form-custom-footer-hidden {

package/es/ProDownload/utils.js

@@ -4,8 +4,6 @@ import _message from "antd/es/message";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-/* eslint-disable no-empty */
-/* eslint-disable prefer-promise-reject-errors */
 import { isFunction, get } from 'lodash';
 import locale from '../locale';
 var stringify = function stringify(data) {

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);

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

@@ -8,6 +8,7 @@ import { omit } from 'lodash';
 import classnames from 'classnames';
 import { useProConfig } from '../../../../ProConfigProvider';
 import locale from '../../../../locale';
+import ProForm from '../../../../ProForm';
 import './index.less';
 var TextArea = _Input.TextArea;
 var TextAreaDef = function TextAreaDef(props) {
@@ -15,10 +16,10 @@ var TextAreaDef = function TextAreaDef(props) {
     otherProps = props.otherProps,
     className = props.className,
     rest = _objectWithoutProperties(props, _excluded);
-  var _ref = otherProps || {},
+  var _ref = ProForm.useFieldProps() || {},
     label = _ref.label,
-    isView = _ref.isView,
-    viewEmpty = _ref.viewEmpty;
+    isViewCon = _ref.isView;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var initialConfig = useProConfig('TextArea');
   var disabled = (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.disabled) || rest.disabled;
   if (isView) {

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

@@ -7,6 +7,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import moment from 'moment';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
+import ProForm from '../../../../ProForm';
 import './style/index.less';
 var TimePicker = function TimePicker(props) {
   var _props$format = props.format,
@@ -15,11 +16,12 @@ var TimePicker = function TimePicker(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,
     _ref$valueType = _ref.valueType,
     valueType = _ref$valueType === void 0 ? 'dateTime' : _ref$valueType;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var initialConfig = useProConfig('AntTimePicker');
   var handleChange = function handleChange(value) {
     if (valueType === 'dateTime') {

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

@@ -6,16 +6,18 @@ import { omit } from 'lodash';
 import classnames from 'classnames';
 import RenderFields from '../../render/RenderFields';
 import ProCollapse from '../../../../ProLayout/components/ProCollapse';
+import ProForm from '../../../../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.useFieldProps() || {},
+    type = _ref.type,
+    form = _ref.form,
+    show = _ref.show,
+    required = _ref.required,
+    disabled = _ref.disabled;
   var _className = classnames(_defineProperty({
     'pro-container': true,
     'pro-container-diy': type === 'Container'

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

@@ -11,9 +11,9 @@ import { namesPathTransform } from './utils';
 import ToolbarButton from './components/ToolbarButton';
 import BlockFields from './components/BlockFields';
 import LineFields from './components/LineFields';
+import ProForm from '../../../../ProForm';
 var FormList = function FormList(props, ref) {
   var columns = props.columns,
-    otherProps = props.otherProps,
     min = props.min,
     max = props.max,
     toolbarProps = props.toolbarProps,
@@ -29,10 +29,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.useFieldProps() || {},
+    form = _ref.form,
+    name = _ref.name,
+    isView = _ref.isView,
+    disabled = _ref.disabled;
   var errors = meta.errors;
   var _namePath = toArray(name);
   var processColumns = useCallback(function (fieldName, namePath) {

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

@@ -10,6 +10,7 @@ import { omit } from 'lodash';
 import classnames from 'classnames';
 import RenderFields from '../../render/RenderFields';
 import { insertSeparator, parseName } from './utils';
+import ProForm from '../../../../ProForm';
 var Group = function Group(props) {
   var columns = props.children,
     otherProps = props.otherProps,
@@ -19,9 +20,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.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 = parseName(id);