@zat-design/sisyphus-react 3.2.1 → 3.2.2

package/es/ProForm/components/render/RenderFields.js

@@ -24,7 +24,8 @@ var RenderFields = function RenderFields(props) {
     originalValues = props.originalValues,
     outerClearNotShow = props.clearNotShow,
     requiredOnView = props.requiredOnView,
-    required = props.required;
+    required = props.required,
+    originalTip = props.originalTip;
   // 是否包含隐藏字段
   var hiddenData = columns.filter(function (item) {
     return Array.isArray(item.hiddenNames);
@@ -119,10 +120,10 @@ var RenderFields = function RenderFields(props) {
       }
     }
     var label = formItemChildProps.label,
-      comDisabled = formItemChildProps.disabled,
       placeholder = formItemChildProps.placeholder,
       dataSource = formItemChildProps.dataSource;
     var formLabel = _formItemProps.label;
+    var comDisabled = formItemChildProps.disabled || fieldProps.disabled || disabled;
     var _disabled = comDisabled === undefined ? formDisabled : comDisabled;
     // 当前组件是不是一个选择组件
     var _isSelect = isSelect({
@@ -131,17 +132,16 @@ var RenderFields = function RenderFields(props) {
     });
     var _placeholder = placeholder || "".concat(_isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(label || formLabel || '');
     // 表单组件Props 兼容2.0版本
-    var _fieldProps = _objectSpread(_objectSpread({
-      disabled: disabled
-    }, formItemChildProps), fieldProps);
+    var _fieldProps = _objectSpread(_objectSpread({}, formItemChildProps), fieldProps);
     if (isBoolean(formDisabled)) {
       _fieldProps.disabled = formDisabled;
     }
-    var componentProps = _objectSpread({
-      disabled: _disabled,
-      placeholder: _placeholder,
+    var componentProps = _objectSpread(_objectSpread({
       disabledStrictly: true
-    }, _fieldProps);
+    }, _fieldProps), {}, {
+      disabled: _disabled,
+      placeholder: _placeholder
+    });
     // switch与SwitchCheckbox单独添加valuePropName
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {
       _formItemProps.valuePropName = 'checked';
@@ -159,7 +159,7 @@ var RenderFields = function RenderFields(props) {
     var otherProps = {
       label: _formItemProps.label,
       name: _formItemProps.name,
-      disabled: formDisabled,
+      disabled: _disabled,
       isView: _isView,
       viewEmpty: viewEmpty,
       valueType: valueType,
@@ -194,7 +194,8 @@ var RenderFields = function RenderFields(props) {
         isSelect: _isSelect,
         originalValues: originalValues,
         equalWith: equalWith,
-        requiredOnView: requiredOnView
+        requiredOnView: requiredOnView,
+        originalTip: originalTip
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
   });

package/es/ProForm/index.js

@@ -12,7 +12,7 @@ import "antd/es/space/style";
 import _Space from "antd/es/space";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required"];
+var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalTip"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DoubleLeftOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
@@ -63,6 +63,8 @@ var ProForm = function ProForm(props, ref) {
     requiredOnView = _props$requiredOnView === void 0 ? true : _props$requiredOnView,
     formId = props.formId,
     required = props.required,
+    _props$originalTip = props.originalTip,
+    originalTip = _props$originalTip === void 0 ? true : _props$originalTip,
     otherProps = _objectWithoutProperties(props, _excluded);
   var _useForm = useForm(originForm),
     _useForm2 = _slicedToArray(_useForm, 1),
@@ -221,7 +223,8 @@ var ProForm = function ProForm(props, ref) {
         originalValues: originalValues,
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
-        required: required
+        required: required,
+        originalTip: originalTip
       }), children, footerRender()]
     }))
   }));

package/es/ProForm/propsType.d.ts

@@ -66,6 +66,7 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
     requiredOnView?: boolean;
     formId?: string;
     required?: boolean;
+    originalTip?: boolean;
 }
 export interface Transform<T = any> {
     normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;

package/es/ProForm/style/index.less

@@ -17,11 +17,11 @@
     }
 
     .pro-form-custom-footer {
-      display      : flex;
-      align-items  : center;
+      display: flex;
+      align-items: center;
+      height: auto;
       margin-bottom: 0;
-      height       : auto;
-      padding-top  : 6px;
+      padding-top: 6px;
 
       .ant-space-align-center {
         align-items: normal;
@@ -45,17 +45,17 @@
   }
 
   span.ant-input-clear-icon {
-    display   : unset;
+    display: unset;
     visibility: hidden;
   }
 
   .ant-input-affix-wrapper:hover span.ant-input-clear-icon {
-    display   : unset;
+    display: unset;
     visibility: unset;
   }
 
   .ant-input-affix-wrapper:hover span.ant-input-clear-icon[class~='ant-input-clear-icon-hidden'] {
-    display   : unset;
+    display: unset;
     visibility: hidden;
   }
 
@@ -90,7 +90,7 @@
   // 展开折叠按钮
   .expand-button {
     line-height: 32px;
-    cursor     : pointer;
+    cursor: pointer;
 
     .rotate-to-top {
       transform: rotate(90deg);
@@ -116,24 +116,32 @@
 
     .ant-form-item-tooltip {
       svg {
-        width         : 14px;
-        height        : 14px;
+        width: 14px;
+        height: 14px;
         vertical-align: bottom;
-        fill          : @zaui-aide-text;
+        fill: @zaui-aide-text;
       }
     }
 
     // 比较原始值场景下  不同时候的样式
     &.pro-form-item-changed {
-
       span.ant-input-affix-wrapper,
       .ant-select-selector,
       .ant-picker {
-        background: @zaui-contract-bg;
+        background: @zaui-contract-bg !important;
 
         input {
           background: @zaui-contract-bg;
         }
+        .ant-select-selection-placeholder {
+          z-index: 9;
+        }
+      }
+
+      .ant-form-item-control-input-content > span {
+        background: @zaui-contract-bg;
+        padding: 4px 8px;
+        border-radius: 4px;
       }
     }
 
@@ -168,9 +176,9 @@
         }
 
         .range-right {
-          width                    : 100%;
-          border                   : 1px solid @zaui-form-control-line;
-          border-top-left-radius   : 0;
+          width: 100%;
+          border: 1px solid @zaui-form-control-line;
+          border-top-left-radius: 0;
           border-bottom-left-radius: 0;
         }
       }
@@ -182,7 +190,7 @@
   }
 
   .ant-form-item-label {
-    >label {
+    > label {
       white-space: pre-wrap;
     }
   }
@@ -193,7 +201,7 @@
 
   .ant-form-item-has-error {
     .group-separator {
-      color       : var(--ant-error-color);
+      color: var(--ant-error-color);
       border-color: var(--ant-error-color);
     }
 
@@ -203,10 +211,9 @@
   }
 
   .site-input-group-wrapper {
-
     // 范围值表单样式
     & .site-input-split {
-      text-align      : center;
+      text-align: center;
       background-color: @zaui-table-strip-bg;
 
       &.site-input-split-disabled {
@@ -252,33 +259,33 @@
       }
     }
 
-    &.ant-input-group.ant-input-group-compact>*:not(:last-child) {
+    &.ant-input-group.ant-input-group-compact > *:not(:last-child) {
       margin-right: 0;
     }
 
-    >*:first-child {
-      border-top-right-radius   : 0 !important;
+    > *:first-child {
+      border-top-right-radius: 0 !important;
       border-bottom-right-radius: 0 !important;
 
-      >.ant-select-selector {
-        border-top-right-radius   : 0 !important;
+      > .ant-select-selector {
+        border-top-right-radius: 0 !important;
         border-bottom-right-radius: 0 !important;
       }
     }
 
-    >*:last-child {
-      border-top-left-radius   : 0 !important;
+    > *:last-child {
+      border-top-left-radius: 0 !important;
       border-bottom-left-radius: 0 !important;
 
-      >.ant-select-selector {
-        border-top-left-radius   : 0 !important;
+      > .ant-select-selector {
+        border-top-left-radius: 0 !important;
         border-bottom-left-radius: 0 !important;
       }
     }
   }
 
-  .ant-input-group.ant-input-group-compact>* {
-    float         : none;
+  .ant-input-group.ant-input-group-compact > * {
+    float: none;
     vertical-align: top;
   }
 
@@ -287,17 +294,17 @@
   }
 
   .noDisabled {
-    color           : @zaui-disabled-text;
-    font-size       : var(--zaui-font-size, 14px);
+    color: @zaui-disabled-text;
+    font-size: var(--zaui-font-size, 14px);
     background-color: transparent;
-    border          : none;
-    cursor          : default;
-    opacity         : 1;
+    border: none;
+    cursor: default;
+    opacity: 1;
   }
 
   div.pro-form-custom-footer {
-    width        : unset !important;
-    height       : 32px;
+    width: unset !important;
+    height:32px;
     margin-bottom: calc(var(--zaui-height-size-md, 16px) * var(--zaui-size, 1));
 
     &.pro-form-custom-footer-hidden {
@@ -306,14 +313,14 @@
   }
 
   .pro-form-view-container {
-    display   : inline-block;
-    color     : var(--zaui-text, #343434);
+    display: inline-block;
+    color: var(--zaui-text, #343434);
     word-break: break-all;
   }
 
   .pro-form-view-container_nowrap {
-    overflow     : hidden;
-    white-space  : nowrap;
+    overflow: hidden;
+    white-space: nowrap;
     text-overflow: ellipsis;
   }
 

package/es/ProForm/utils/contrastOriginal.d.ts

@@ -1 +1,10 @@
-export declare const contrastOriginal: (name: any, names: any, originValues: any, currentValue: any, fun: any) => any;
+import { FormInstance } from 'antd';
+interface Params {
+    originalValues: any;
+    originalValue: any;
+    value: any;
+    form: FormInstance;
+    equalWith?: (originalValue: any, currentValue: any) => boolean;
+}
+export declare const contrastOriginal: (params: Params) => boolean;
+export {};

package/es/ProForm/utils/contrastOriginal.js

@@ -1,28 +1,25 @@
-import { get, isEqual, isFunction } from 'lodash';
+import { isEqual, isFunction } from 'lodash';
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
-export var contrastOriginal = function contrastOriginal(name, names, originValues, currentValue, fun) {
+export var contrastOriginal = function contrastOriginal(params) {
+  var originalValue = params.originalValue,
+    originalValues = params.originalValues,
+    value = params.value,
+    equalWith = params.equalWith;
   // 支持传入自定义比较事件
-  if (isFunction(fun)) {
-    if (names === null || names === void 0 ? void 0 : names.length) {
-      var originVal = names.map(function (key) {
-        return get(originValues, key);
-      });
-      return !fun(originVal, currentValue);
-    }
-    return !fun(get(originValues, name), currentValue);
+  if (isFunction(equalWith)) {
+    return !equalWith(originalValue, value);
   }
-  if (names === null || names === void 0 ? void 0 : names.length) {
-    return names.some(function (nameItem, index) {
-      var originalValue = get(originValues, nameItem);
-      if (!nullValue.includes(currentValue === null || currentValue === void 0 ? void 0 : currentValue[index]) || !nullValue.includes(originalValue)) {
-        return !isEqual(currentValue === null || currentValue === void 0 ? void 0 : currentValue[index], get(originValues, nameItem));
+  if (Array.isArray(originalValue)) {
+    return originalValue.some(function (valueItem, index) {
+      // 如果两个值有一个不是空值, 则进行深比较
+      if (!nullValue.includes(value === null || value === void 0 ? void 0 : value[index]) || !nullValue.includes(valueItem)) {
+        return !isEqual(value === null || value === void 0 ? void 0 : value[index], valueItem);
       }
       return false;
     });
   }
-  var originalValue = get(originValues, name);
-  if (!nullValue.includes(currentValue) || !nullValue.includes(originalValue)) {
-    return !isEqual(currentValue, get(originValues, name));
+  if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
+    return !isEqual(value, originalValue);
   }
   return false;
 };

package/es/ProForm/utils/useChanged.d.ts

@@ -1 +1,15 @@
-export declare const useChanged: (name: any, names: any, nameStr: any, originalValues: any, form: any, fun: any) => any;
+import { FormInstance } from 'antd';
+import { NamePath } from 'antd/lib/form/interface';
+interface Params {
+    name?: NamePath;
+    names?: NamePath[];
+    namesStr?: NamePath;
+    originalName?: NamePath;
+    originalNames?: NamePath[];
+    originalNameStr?: NamePath;
+    originalValues: any;
+    form: FormInstance;
+    equalWith?: (originalValue: any, currentValue: any) => boolean;
+}
+export declare const useChanged: (params: Params) => any[];
+export {};

package/es/ProForm/utils/useChanged.js

@@ -2,13 +2,32 @@ import "antd/es/form/style";
 import _Form from "antd/es/form";
 import { get } from 'lodash';
 import { contrastOriginal } from './contrastOriginal';
-export var useChanged = function useChanged(name, names, nameStr, originalValues, form, fun) {
+export var useChanged = function useChanged(params) {
+  var name = params.name,
+    names = params.names,
+    namesStr = params.namesStr,
+    _params$originalName = params.originalName,
+    originalName = _params$originalName === void 0 ? name : _params$originalName,
+    _params$originalNames = params.originalNames,
+    originalNames = _params$originalNames === void 0 ? names : _params$originalNames,
+    originalValues = params.originalValues,
+    form = params.form,
+    equalWith = params.equalWith;
   var _form = form;
-  if (!originalValues || get(originalValues, nameStr || name) === undefined) {
-    _form = [];
-    return false;
-  }
-  var value = _Form.useWatch(nameStr || name, _form);
-  var changed = contrastOriginal(name, names, originalValues, value, fun);
-  return changed;
+  var originalValue = (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
+    return get(originalValues, originalName);
+  }) : get(originalValues, originalName);
+  var notWatch = !originalValues || originalValue === undefined;
+  // @ts-ignore
+  if (notWatch) _form = [];
+  var value = _Form.useWatch(namesStr || name, _form);
+  if (notWatch) return [false];
+  var changed = contrastOriginal({
+    value: value,
+    originalValue: originalValue,
+    originalValues: originalValues,
+    form: form,
+    equalWith: equalWith
+  });
+  return [changed, originalValue];
 };

package/es/ProLayout/components/ProHeader/index.js

@@ -373,6 +373,7 @@ var ProHeader = function ProHeader(props) {
     'pro-header-fixed': fixedTop,
     'pro-header-shadow': showShadow,
     'pro-header-no-back': !backState,
+    'pro-header-has-describe': !isEmpty(_subDescribeColumns) || !isEmpty(describeColumns) || !isEmpty(describeColumns),
     'pro-header-no-describe': isEmpty(_subDescribeColumns) && isEmpty(describeColumns) || isEmpty(describeColumns)
   }, "".concat(className), className));
   if (title && !isEmpty(_breadcrumbColumns)) {

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

@@ -4,6 +4,12 @@
   background-color: var(--zaui-base-bg, #ffffff);
   padding         : 24px 0 0 0;
 
+  &.pro-header-no-back.pro-header-has-describe {
+    .pro-header-top {
+      padding-left: var(--zaui-space-size-md, 16px);
+    }
+  }
+
   &.pro-header-no-back {
     .pro-header-top {
       padding-left: 0;
@@ -106,6 +112,7 @@
 
     .ant-breadcrumb-link {
       font-size: var(--zaui-font-size-xl, 18px);
+      display  : inline-flex;
     }
 
     .ant-breadcrumb-separator {

package/es/ProSelect/index.js

@@ -9,7 +9,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
-var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse"];
+var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
 import React, { useImperativeHandle, useState, forwardRef } from 'react';
@@ -17,6 +17,7 @@ import { isFunction, isObject, isString, omit, cloneDeep } from 'lodash';
 import { useProConfig } from '../ProConfigProvider';
 import Container from '../ProForm/components/Container';
 import AdaptiveTooltip from './components/AdaptiveTooltip';
+import { ProForm } from '..';
 import locale from '../locale';
 import './index.less';
 var Option = _Select.Option;
@@ -48,11 +49,13 @@ export var ProSelect = function ProSelect(props, ref) {
     onChange = props.onChange,
     updateDataSource = props.updateDataSource,
     transformResponse = props.transformResponse,
+    isViewPro = props.isView,
     selectProps = _objectWithoutProperties(props, _excluded);
   var value = props.value;
-  var _ref2 = otherProps || {},
-    isView = _ref2.isView,
+  var _ref2 = ProForm.useFieldProps() || {},
+    isViewCon = _ref2.isView,
     viewEmpty = _ref2.viewEmpty;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   if (fieldNames && Object.keys(fieldNames).length) {
     code = fieldNames.value;
     label = fieldNames.label;

package/es/ProStep/components/Item/index.js

@@ -26,9 +26,6 @@ export default (function (_ref) {
       title: title
     }, restProps), {}, {
       children: children
-    })) : _jsx("div", {
-      id: id,
-      children: children
-    })
+    })) : children
   });
 });

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

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

package/es/ProTable/style/index.less

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

package/es/ProTabs/style/index.less

@@ -1,6 +1,6 @@
 .pro-tabs {
   .ant-tabs .ant-tabs-nav-list .ant-tabs-tab {
-    padding: 0;
+    padding: 0 !important;
   }
 
   .ant-tabs-top>.ant-tabs-nav::before,