@zat-design/sisyphus-react 3.1.4 → 3.1.5-beta.10

package/lib/ProForm/style/index.less

@@ -11,6 +11,16 @@
 @import '../components/old/EnumSelect/style/index.less';
 
 .pro-form {
+  &.ant-form-vertical {
+    .ant-form-item .ant-form-item-label {
+      flex: none;
+    }
+  }
+
+  &.ant-form {
+    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
+  }
+
   .pro-collapse-level2 {
     .ant-collapse-item {
       margin-bottom: 0 !important;
@@ -23,17 +33,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;
   }
 
@@ -67,8 +77,8 @@
 
   // 展开折叠按钮
   .expand-button {
-    line-height: 32px;
-    cursor: pointer;
+    line-height: @zaui-space-card;
+    cursor     : pointer;
 
     .rotate-to-top {
       transform: rotate(90deg);
@@ -80,40 +90,29 @@
   }
 
   .ant-form-item {
-    margin-bottom: 22px !important;
+    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1)) !important;
 
     .ant-form-item-tooltip {
       svg {
-        width: 14px;
-        height: 14px;
+        width         : 14px;
+        height        : 14px;
         vertical-align: bottom;
-        fill: #909090;
+        fill          : @zaui-aide-text;
       }
     }
 
     // 比较原始值场景下  不同时候的样式
     &.pro-form-item-changed {
+
       span.ant-input-affix-wrapper,
       .ant-select-selector,
       .ant-picker {
-        background: #fffaa1;
+        background: @zaui-contract-bg;
 
         input {
-          background: #fffaa1;
+          background: @zaui-contract-bg;
         }
       }
-
-      #switch {
-        background: #bfbfbf;
-      }
-    }
-
-    // 自定义label宽度场景
-    &.label-width {
-      .ant-form-item-label {
-        width: auto !important;
-        max-width: fit-content !important;
-      }
     }
 
     .ant-row {
@@ -147,9 +146,9 @@
         }
 
         .range-right {
-          width: 100%;
-          border: 1px solid #d9d9d9;
-          border-top-left-radius: 0;
+          width                    : 100%;
+          border                   : 1px solid @zaui-form-control-line;
+          border-top-left-radius   : 0;
           border-bottom-left-radius: 0;
         }
       }
@@ -160,149 +159,36 @@
     display: none;
   }
 
-  // 查看模式
-  &.mode-view {
-    // 查看模式样式覆盖
-    .ant-input[disabled] {
-      .noDisabled();
-    }
-
-    .ant-input-disabled {
-      .noDisabled();
-    }
-
-    .ant-picker.ant-picker-disabled {
-      .noDisabled();
-    }
-
-    .ant-picker-input > input[disabled] {
-      .noDisabled();
-    }
-
-    .ant-picker-suffix {
-      display: none;
-    }
-
-    .ant-input-textarea.ant-input-textarea-show-count::after {
-      display: none;
-    }
-
-    .ant-select-disabled.ant-select:not(.ant-select-customize-input) .ant-select-selector {
-      .noDisabled();
-    }
-
-    .ant-select-arrow {
-      display: none;
-    }
-
-    .ant-upload.ant-upload-disabled {
-      display: none;
-    }
-
-    .ant-switch-loading,
-    .ant-switch-disabled {
-      .ant-switch-inner {
-        .noDisabled();
-      }
-
-      .ant-switch-handle {
-        display: none;
-      }
-
-      background-color: #fff;
-      cursor: default;
-      opacity: 1;
-    }
-
-    .ant-radio-wrapper.ant-radio-wrapper-checked.ant-radio-wrapper-disabled {
-      display: block;
-
-      .ant-radio.ant-radio-checked.ant-radio-disabled {
-        display: none;
-      }
-
-      > span {
-        .noDisabled();
-        position: relative;
-        top: -3px;
-      }
-    }
-
-    .ant-radio-wrapper.ant-radio-wrapper-disabled {
-      display: none;
-    }
-
-    .ant-checkbox-wrapper.ant-checkbox-wrapper-checked.ant-checkbox-wrapper-disabled {
-      display: block;
-
-      .ant-checkbox.ant-checkbox-checked.ant-checkbox-disabled {
-        display: none;
-      }
-
-      > span {
-        .noDisabled();
-        position: relative;
-        top: -3px;
-      }
-    }
-
-    .ant-checkbox-wrapper.ant-checkbox-wrapper-disabled {
-      display: none;
-    }
-
-    .ant-form-item-has-error {
-      .ant-form-item-explain.ant-form-item-explain-error {
-        display: none;
-      }
-    }
-
-    ::placeholder {
-      font-size: 0px;
-    }
-
-    .ant-input-affix-wrapper-disabled {
-      background-color: transparent;
-      border: none;
-    }
-
-    .ant-select-selection-placeholder {
-      display: none;
-    }
-
-    .ant-input-suffix {
-      display: none;
-    }
-  }
-
   .ant-form-item-label {
-    > label {
+    >label {
       white-space: pre-wrap;
     }
   }
 
   .suffix-value {
-    margin-left: 8px;
+    margin-left: @zaui-space-size-sm;
   }
 
   .ant-form-item-has-error {
     .group-separator {
-      color: var(--ant-error-color);
+      color       : var(--ant-error-color);
       border-color: var(--ant-error-color);
     }
 
     .site-input-split {
-      border-color: #ff4d4f;
+      border-color: @zaui-danger;
     }
   }
 
   .site-input-group-wrapper {
+
     // 范围值表单样式
     & .site-input-split {
-      text-align: center;
-      background-color: #fafafa;
+      text-align      : center;
+      background-color: @zaui-table-strip-bg;
 
       &.site-input-split-disabled {
-        background-color: #f2f2f2;
+        background-color: @zaui-disabled-bg;
       }
     }
 
@@ -344,33 +230,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;
   }
 
@@ -379,17 +265,17 @@
   }
 
   .noDisabled {
-    color: #333;
-    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       : @zaui-space-card;
     margin-bottom: calc(var(--zaui-height-size-md, 16px) * var(--zaui-size, 1));
 
     &.pro-form-custom-footer-hidden {
@@ -398,14 +284,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/lib/ProForm/utils/useShouldUpdate.js

@@ -11,16 +11,16 @@ var _react = require("react");
 var _lodash = require("lodash");
 var _index = require("./index");
 // 代理shouldUpdate事件, 执行函数值的[show, disabled], 当[show, disabled]与上一次值不相同时更新状态
-var useShouldUpdate = function useShouldUpdate(_ref) {
-  var show = _ref.show,
-    formItemProps = _ref.formItemProps,
-    form = _ref.form,
-    disabled = _ref.disabled,
-    rules = _ref.rules,
-    required = _ref.required,
-    fieldProps = _ref.fieldProps,
-    component = _ref.component,
-    originComponent = _ref.originComponent;
+var useShouldUpdate = function useShouldUpdate(props) {
+  var show = props.show,
+    formItemProps = props.formItemProps,
+    form = props.form,
+    disabled = props.disabled,
+    rules = props.rules,
+    required = props.required,
+    fieldProps = props.fieldProps,
+    component = props.component,
+    originComponent = props.originComponent;
   var _shouldUpdate = formItemProps.shouldUpdate,
     name = formItemProps.name,
     clearNotShow = formItemProps.clearNotShow,
@@ -39,12 +39,6 @@ var useShouldUpdate = function useShouldUpdate(_ref) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     reRender = _useState2[1];
   var values = {};
-  if (namePath) {
-    // formList场景values取当前行数据
-    values = form.getFieldValue(namePath) || {};
-  } else {
-    values = form.getFieldsValue(true);
-  }
   // 不是动态函数直接返回
   if (!(0, _lodash.isFunction)(show) && !(0, _lodash.isFunction)(disabled) && !(0, _lodash.isFunction)(required) && !(0, _lodash.isFunction)(rules) && !(0, _lodash.isFunction)(fieldProps) && !(0, _lodash.isFunction)(originComponent)) {
     return {
@@ -57,6 +51,12 @@ var useShouldUpdate = function useShouldUpdate(_ref) {
       component: newComponent
     };
   }
+  if (namePath) {
+    // formList场景values取当前行数据
+    values = form.getFieldValue(namePath) || {};
+  } else {
+    values = form.getFieldsValue(true);
+  }
   if ((0, _lodash.isFunction)(show)) {
     showRef.current = Boolean(show(values, {
       form: form,

package/lib/ProLayout/components/Layout/Menu/OpenMenu/style/index.less

@@ -24,7 +24,7 @@
     &>.ant-menu-item-only-child {
       min-height    : 48px;
       padding-top   : 12px;
-      padding-bottom: 12px;
+      padding-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1) - var(--zaui-space-size-xs; 4px) * var(--zaui-size; 1));
       margin        : 0;
       height        : auto;
 
@@ -94,7 +94,7 @@
     height        : auto !important;
     margin        : 0;
     padding-top   : 12px;
-    padding-bottom: 12px;
+    padding-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1) - var(--zaui-space-size-xs; 4px) * var(--zaui-size; 1));
     min-height    : 48px;
   }
 

package/lib/ProLayout/components/ProCollapse/style/index.less

@@ -9,13 +9,13 @@
 
   &.ant-collapse {
     .pro-collapse-panel {
-      margin-bottom: var(--zaui-space-size-md, 16px);
+      margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
     }
   }
 
   .ant-collapse-header {
     align-items: center !important;
-    padding    : 14px var(--zaui-space-size-md, 16px) !important;
+    padding    : 12px var(--zaui-space-size-md, 16px) !important;
     background : var(--zaui-area, #fafafa);
   }
 
@@ -49,7 +49,7 @@
     background   : var(--zaui-base-bg, #ffffff);
 
     .ant-collapse-header {
-      margin-bottom: var(--zaui-space-size-md, 16px);
+      margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
       padding      : 0 !important;
       background   : var(--zaui-base-bg, #ffffff);
 
@@ -154,7 +154,7 @@
     }
 
     .ant-descriptions {
-      margin-bottom: var(--zaui-space-size-md, 16px);
+      margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
     }
   }
 }

package/lib/ProLayout/components/ProHeader/components/ProBackBtn/style/index.less

@@ -0,0 +1,21 @@
+.back-button-container {
+  &.ant-btn {
+    color      : var(--zaui-text);
+    font-weight: 400;
+    background : var(--zaui-disabled-bg);
+    border     : none;
+
+    &:hover {
+      color     : var(--zaui-aide-text);
+      background: var(--zaui-disabled-bg);
+      border    : none;
+    }
+
+    &:active,
+    &:focus {
+      color      : var(--zaui-text);
+      font-weight: 400;
+      background : var(--zaui-disabled-bg);
+    }
+  }
+}

package/lib/ProLayout/components/ProHeader/components/index.d.ts

@@ -1 +1,2 @@
 export { default as Copy } from './Copy';
+export { default as ProBackBtn } from './ProBackBtn';

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

@@ -10,4 +10,11 @@ Object.defineProperty(exports, "Copy", {
     return _Copy.default;
   }
 });
-var _Copy = _interopRequireDefault(require("./Copy"));
+Object.defineProperty(exports, "ProBackBtn", {
+  enumerable: true,
+  get: function get() {
+    return _ProBackBtn.default;
+  }
+});
+var _Copy = _interopRequireDefault(require("./Copy"));
+var _ProBackBtn = _interopRequireDefault(require("./ProBackBtn"));

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

@@ -20,7 +20,6 @@ var _reactSvg = require("react-svg");
 var _arrow = _interopRequireDefault(require("../../../assets/arrow.svg"));
 var _components = require("./components");
 var _getEnumLabel = _interopRequireDefault(require("../../../ProEnum/utils/getEnumLabel"));
-var _index = require("../../../index");
 /* eslint-disable react/no-array-index-key */
 
 var formatAmount = _utils.tools.formatAmount;
@@ -387,6 +386,9 @@ var ProHeader = function ProHeader(props) {
   var onConfirm = function onConfirm() {
     if (!isConfirmBack) {
       onBack && onBack();
+      if (!onBack) {
+        window.history.back();
+      }
       return false;
     }
     _antd.Modal.confirm((0, _objectSpread2.default)({
@@ -417,7 +419,7 @@ var ProHeader = function ProHeader(props) {
           }),
           children: (0, _jsxRuntime.jsxs)(_antd.Space, {
             size: backState ? 4 : 0,
-            children: [backState ? (0, _jsxRuntime.jsx)(_index.ProBackBtn, {
+            children: [backState ? (0, _jsxRuntime.jsx)(_components.ProBackBtn, {
               onBack: onConfirm
             }) : null, (0, _jsxRuntime.jsx)(_antd.Breadcrumb, {
               separator: ">",

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

@@ -1,16 +1,25 @@
+@import '../components/ProBackBtn/style/index';
+
 .pro-header {
   background-color: var(--zaui-base-bg, #ffffff);
-  padding         : var(--zaui-space-size-lg, 32px) 0 0 0;
+  padding         : calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1) + var(--zaui-space-size-sm; 8px) * var(--zaui-size; 1)) 0 0 0;
 
   &.pro-header-no-back {
     .pro-header-top {
       padding-left: 0;
     }
+
+    .pro-header-left {
+      &.pro-header-left-space {
+        margin-left: 0 !important;
+      }
+
+    }
   }
 
   &.pro-header-no-describe {
     box-shadow   : none;
-    margin-bottom: var(--zaui-space-size-md, 16px);
+    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
 
     .pro-header-title,
     .pro-header-top {
@@ -21,7 +30,7 @@
 
   &.pro-header-fixed.pro-header-no-describe {
     .pro-header-top {
-      padding-bottom: 12px;
+      padding-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1) - var(--zaui-space-size-xs; 4px) * var(--zaui-size; 1));
     }
   }
 
@@ -111,7 +120,7 @@
     display        : flex;
     justify-content: space-between;
     align-items    : center;
-    margin-bottom  : var(--zaui-space-size-sm, 8px);
+    margin-bottom  : calc(var(--zaui-space-size-sm; 8px) * var(--zaui-size; 1));
     padding        : 0 var(--zaui-space-size-md, 16px);
 
     .pro-header-left {
@@ -265,7 +274,7 @@
       li {
         margin-right : 52px;
         margin-top   : 4px;
-        margin-bottom: 12px;
+        margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
 
         &:last-child {
           margin-right: 0;
@@ -303,9 +312,9 @@
   .pro-header-describe {
     display       : flex;
     flex-wrap     : wrap;
-    font-size     : 14px;
+    font-size     : var(--zaui-font-size, 14px);
     padding       : 0 var(--zaui-space-size-md, 16px);
-    padding-bottom: 12px;
+    padding-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1) - var(--zaui-space-size-xs; 4px) * var(--zaui-size; 1));
 
     li {
       margin-left: var(--zaui-space-card, 32px);

package/lib/ProStep/style/index.less

@@ -150,7 +150,6 @@
           color        : #ff5050;
           font-weight  : 600;
           font-size    : var(--aui-font-size-sm, 12px);
-          font-family  : PingFangSC-Semibold, PingFang SC;
           border-radius: 8px;
         }
       }

package/lib/ProTable/components/RenderColumn/index.d.ts

@@ -1,14 +1,14 @@
 import { FC } from 'react';
-import { ProTableValueType } from '../../propsType';
 interface Props {
-    valueType?: ProTableValueType;
-    code?: string | string[] | (() => string);
+    valueType?: string;
+    node?: any;
     value?: any;
-    record?: any;
+    currentValue?: any;
     copyable?: boolean;
+    originalTip?: boolean;
     ellipsis?: any;
     width?: number | string;
-    transform?: (value: any, record?: any) => string[];
+    originalValue?: any;
 }
 declare const RenderColumn: FC<Props>;
 export default RenderColumn;