@zat-design/sisyphus-react 3.2.2 → 3.3.0

package/es/ProForm/components/combination/ProCombination/style/index.less

@@ -1,4 +1,7 @@
-.pro-combination.ant-input-group.ant-input-group-compact {
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
+.pro-combination.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact {
   display: flex;
 
   & > * {
@@ -9,7 +12,7 @@
     flex: none;
   }
 
-  & > *:not(.ant-btn) {
+  & > *:not(.@{ant-prefix}-btn) {
     flex: 1;
   }
 }

package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -5,6 +5,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useDebounceFn, usePrevious, useRequest } from 'ahooks';
 import { isEqual } from 'lodash';
 import { useCallback, useEffect, useMemo, useState } from 'react';
+import locale, { formatMessage } from '../../../../../locale';
 var defaultPage = {
   pageNum: 1,
   pageSize: 10
@@ -128,7 +129,11 @@ export function useRequestList(service, options, useRequestOptions) {
       onShowSizeChange: onChange,
       hideOnSinglePage: page.pageSize === 10,
       showTotal: function showTotal(total) {
-        return "\u5171".concat(total, "\u6761");
+        var _locale$ProEditTable;
+        if (!total) return;
+        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
+        });
       }
     } : false
   });

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

@@ -1,6 +1,9 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-modal-select,
 .pro-tree-modal {
-  .ant-input-group-wrapper {
+  .@{ant-prefix}-input-group-wrapper {
     .close-icon {
       display: none;
     }
@@ -32,31 +35,49 @@
       }
     }
     &:hover {
-      .ant-input,
-      .ant-input-group-addon {
+      .@{ant-prefix}-input,
+      .@{ant-prefix}-input-group-addon {
         border-color: var(--zaui-brand-hover, #3387ff);
       }
+
+      .@{ant-prefix}-input-disabled {
+        border-color: #d9d9d9;
+      }
+
+      .@{ant-prefix}-input-disabled + span {
+        border-color: #d9d9d9;
+        .close-icon {
+          display: none;
+        }
+      }
+    }
+  }
+
+  .pro-tree-modal-input-appoint {
+    .@{ant-prefix}-input {
+      border-top-left-radius: 0;
+      border-bottom-left-radius: 0;
     }
   }
 
-  .ant-input-group-wrapper-status-error {
+  .@{ant-prefix}-input-group-wrapper-status-error {
     &:hover {
-      .ant-input,
-      .ant-input-group-addon {
+      .@{ant-prefix}-input,
+      .@{ant-prefix}-input-group-addon {
         border-color: var(--ant-error-color, #ff4d4f);
       }
     }
   }
-  .ant-input-group {
-    .ant-input {
+  .@{ant-prefix}-input-group {
+    .@{ant-prefix}-input {
       padding-right: 26px;
     }
   }
 
   .trigger-no-hover {
     &:hover {
-      .ant-input,
-      .ant-input-group-addon {
+      .@{ant-prefix}-input,
+      .@{ant-prefix}-input-group-addon {
         border-color: @zaui-form-control-line;
       }
     }
@@ -72,7 +93,7 @@
     fill: #c5c7cd;
   }
 
-  .ant-input-group-addon {
+  .@{ant-prefix}-input-group-addon {
     padding: 0px var(--zaui-space-size-sm, 8px);
     background-color: var(--zaui-base-bg, #ffffff);
     cursor: pointer;

package/es/ProForm/components/combination/ProNumberRange/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-number-range {
 
   .range-split {
@@ -8,7 +11,7 @@
     text-align    : center !important;
   }
 
-  .ant-input-status-error {
+  .@{ant-prefix}-input-status-error {
     &.range-split {
       border-color: @zaui-danger;
     }
@@ -16,16 +19,16 @@
 
 
 
-  & .ant-input-rtl.range-right {
+  & .@{ant-prefix}-input-rtl.range-right {
     border-right-width: 0;
   }
 
-  & .ant-input-rtl.range-right:hover,
-  & .ant-input-rtl.range-right:focus {
+  & .@{ant-prefix}-input-rtl.range-right:hover,
+  & .@{ant-prefix}-input-rtl.range-right:focus {
     border-right-width: 1px;
   }
 
-  .ant-form-item {
+  .@{ant-prefix}-form-item {
     margin-bottom: 0;
   }
 
@@ -36,13 +39,13 @@
   }
 
   .range-left {
-    .ant-input-number {
+    .@{ant-prefix}-input-number {
       border-right: none;
     }
   }
 
   .range-right {
-    .ant-input-number {
+    .@{ant-prefix}-input-number {
       border-left: none;
     }
 
@@ -53,7 +56,7 @@
     }
   }
 
-  &.ant-input-group.ant-input-group-compact>*:not(:last-child) {
+  &.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact>*:not(:last-child) {
     margin-right: 0;
   }
 
@@ -61,7 +64,7 @@
     border-top-right-radius   : 0 !important;
     border-bottom-right-radius: 0 !important;
 
-    >.ant-select-selector {
+    >.@{ant-prefix}-select-selector {
       border-top-right-radius   : 0 !important;
       border-bottom-right-radius: 0 !important;
     }
@@ -71,7 +74,7 @@
     border-top-left-radius   : 0 !important;
     border-bottom-left-radius: 0 !important;
 
-    >.ant-select-selector {
+    >.@{ant-prefix}-select-selector {
       border-top-left-radius   : 0 !important;
       border-bottom-left-radius: 0 !important;
     }

package/es/ProForm/components/combination/ProTimeLimit/style/index.less

@@ -1,10 +1,13 @@
-.ant-form-item-has-error {
-  .ant-picker-status-error
-    ~ .forever-checkbox:not(.ant-input-disabled):not(.ant-input-borderless).ant-input {
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
+.@{ant-prefix}-form-item-has-error {
+  .@{ant-prefix}-picker-status-error
+    ~ .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(.@{ant-prefix}-input-borderless).@{ant-prefix}-input {
     background: @zaui-base-bg;
     border-color: var(--ant-error-color);
   }
-  .forever-checkbox:not(.ant-input-disabled):not(.ant-input-borderless).ant-input:focus {
+  .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(.@{ant-prefix}-input-borderless).@{ant-prefix}-input:focus {
     border-color: var(--ant-error-color-hover);
     border-right-width: 1px;
     outline: 0;
@@ -12,12 +15,12 @@
   }
 }
 
-span.ant-input-group-compact {
+span.@{ant-prefix}-input-group-compact {
   &.pro-time-limit,
   &.pro-range-limit {
     display: flex;
 
-    .ant-picker {
+    .@{ant-prefix}-picker {
       flex: 1;
     }
 

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

@@ -66,8 +66,7 @@ var RenderFields = function RenderFields(props) {
       formItemChildProps = _column$formItemChild === void 0 ? {} : _column$formItemChild,
       _column$fieldProps = column.fieldProps,
       fieldProps = _column$fieldProps === void 0 ? {} : _column$fieldProps,
-      _column$disabled = column.disabled,
-      disabled = _column$disabled === void 0 ? false : _column$disabled,
+      disabled = column.disabled,
       equalWith = column.equalWith,
       _column$clearNotShow = column.clearNotShow,
       clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,
@@ -137,10 +136,10 @@ var RenderFields = function RenderFields(props) {
       _fieldProps.disabled = formDisabled;
     }
     var componentProps = _objectSpread(_objectSpread({
-      disabledStrictly: true
-    }, _fieldProps), {}, {
-      disabled: _disabled,
+      disabledStrictly: true,
       placeholder: _placeholder
+    }, _fieldProps), {}, {
+      disabled: _disabled
     });
     // switch与SwitchCheckbox单独添加valuePropName
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {

package/es/ProForm/style/index.less

@@ -1,3 +1,5 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
 @import '../components/base/SwitchCheckbox/style/index.less';
 @import '../components/base/TextArea/index.less';
 @import '../components/combination/FormList/style/index.less';
@@ -11,8 +13,8 @@
 @import '../components/old/EnumSelect/style/index.less';
 
 .pro-form {
-  &.ant-form-vertical {
-    .ant-form-item .ant-form-item-label {
+  &.@{ant-prefix}-form-vertical {
+    .@{ant-prefix}-form-item .@{ant-prefix}-form-item-label {
       flex: none !important;
     }
 
@@ -23,66 +25,66 @@
       margin-bottom: 0;
       padding-top: 6px;
 
-      .ant-space-align-center {
+      .@{ant-prefix}-space-align-center {
         align-items: normal;
       }
     }
   }
 
-  &.ant-form {
+  &.@{ant-prefix}-form {
     margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
   }
 
   .pro-collapse-level2 {
-    .ant-collapse-item {
+    .@{ant-prefix}-collapse-item {
       margin-bottom: 0 !important;
     }
   }
 
-  .ant-form-item-control-input {
+  .@{ant-prefix}-form-item-control-input {
     flex-grow: 1;
     max-width: 100%;
   }
 
-  span.ant-input-clear-icon {
+  span.@{ant-prefix}-input-clear-icon {
     display: unset;
     visibility: hidden;
   }
 
-  .ant-input-affix-wrapper:hover span.ant-input-clear-icon {
+  .@{ant-prefix}-input-affix-wrapper:hover span.@{ant-prefix}-input-clear-icon {
     display: unset;
     visibility: unset;
   }
 
-  .ant-input-affix-wrapper:hover span.ant-input-clear-icon[class~='ant-input-clear-icon-hidden'] {
+  .@{ant-prefix}-input-affix-wrapper:hover span.@{ant-prefix}-input-clear-icon[class~='ant-input-clear-icon-hidden'] {
     display: unset;
     visibility: hidden;
   }
 
   &.pro-form-view {
-    .ant-form-item-label {
+    .@{ant-prefix}-form-item-label {
       label {
         color: var(--zaui-aide-text, #939599);
       }
     }
 
-    .ant-form-item {
+    .@{ant-prefix}-form-item {
       margin-bottom: 0 !important;
     }
 
-    .ant-form-item {
-      .ant-tree-icon-hide input {
+    .@{ant-prefix}-form-item {
+      .@{ant-prefix}-tree-icon-hide input {
         display: none !important;
       }
     }
   }
 
-  .ant-picker-range {
+  .@{ant-prefix}-picker-range {
     width: 100%;
   }
 
   .pro-form-list-line {
-    .ant-row {
+    .@{ant-prefix}-row {
       width: 100%;
     }
   }
@@ -101,20 +103,20 @@
     }
   }
 
-  .ant-form-item {
+  .@{ant-prefix}-form-item {
     margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1)) !important;
 
     &.pro-form-item-width-auto {
-      .ant-form-item-control-input {
+      .@{ant-prefix}-form-item-control-input {
         flex-grow: inherit;
       }
 
-      .ant-form-item-control-input-content {
+      .@{ant-prefix}-form-item-control-input-content {
         flex: initial;
       }
     }
 
-    .ant-form-item-tooltip {
+    .@{ant-prefix}-form-item-tooltip {
       svg {
         width: 14px;
         height: 14px;
@@ -125,53 +127,53 @@
 
     // 比较原始值场景下  不同时候的样式
     &.pro-form-item-changed {
-      span.ant-input-affix-wrapper,
-      .ant-select-selector,
-      .ant-picker {
+      span.@{ant-prefix}-input-affix-wrapper,
+      .@{ant-prefix}-select-selector,
+      .@{ant-prefix}-picker {
         background: @zaui-contract-bg !important;
 
         input {
           background: @zaui-contract-bg;
         }
-        .ant-select-selection-placeholder {
+        .@{ant-prefix}-select-selection-placeholder {
           z-index: 9;
         }
       }
 
-      .ant-form-item-control-input-content > span {
+      .@{ant-prefix}-form-item-control-input-content > span {
         background: @zaui-contract-bg;
         padding: 4px 8px;
         border-radius: 4px;
       }
     }
 
-    .ant-row {
+    .@{ant-prefix}-row {
       width: 100%;
     }
 
-    .ant-col.ant-col-0 {
+    .@{ant-prefix}-col.@{ant-prefix}-col-0 {
       display: none;
     }
 
-    .ant-form-item-explain {
+    .@{ant-prefix}-form-item-explain {
       height: auto;
 
-      .ant-form-item-explain-error {
+      .@{ant-prefix}-form-item-explain-error {
         font-size: var(--zaui-font-size, 14px);
       }
     }
 
-    .ant-input-number {
+    .@{ant-prefix}-input-number {
       width: 100%;
     }
 
     .pro-number-range {
-      .ant-input-number {
+      .@{ant-prefix}-input-number {
         width: calc(50% - 20px);
       }
 
       .range-right {
-        .ant-input-number {
+        .@{ant-prefix}-input-number {
           border-left: none;
         }
 
@@ -185,11 +187,11 @@
     }
   }
 
-  .ant-form-item-hidden {
+  .@{ant-prefix}-form-item-hidden {
     display: none;
   }
 
-  .ant-form-item-label {
+  .@{ant-prefix}-form-item-label {
     > label {
       white-space: pre-wrap;
     }
@@ -199,7 +201,7 @@
     margin-left: @zaui-space-size-sm;
   }
 
-  .ant-form-item-has-error {
+  .@{ant-prefix}-form-item-has-error {
     .group-separator {
       color: var(--ant-error-color);
       border-color: var(--ant-error-color);
@@ -229,16 +231,16 @@
       border-left-width: 1px;
     }
 
-    & .ant-input-rtl.site-input-right {
+    & .@{ant-prefix}-input-rtl.site-input-right {
       border-right-width: 0;
     }
 
-    & .ant-input-rtl.site-input-right:hover,
-    & .ant-input-rtl.site-input-right:focus {
+    & .@{ant-prefix}-input-rtl.site-input-right:hover,
+    & .@{ant-prefix}-input-rtl.site-input-right:focus {
       border-right-width: 1px;
     }
 
-    .ant-form-item {
+    .@{ant-prefix}-form-item {
       margin-bottom: 0;
     }
 
@@ -248,18 +250,18 @@
     }
 
     .site-input-left {
-      .ant-input-number {
+      .@{ant-prefix}-input-number {
         border-right: none;
       }
     }
 
     .site-input-right {
-      .ant-input-number {
+      .@{ant-prefix}-input-number {
         border-left: none;
       }
     }
 
-    &.ant-input-group.ant-input-group-compact > *:not(:last-child) {
+    &.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact > *:not(:last-child) {
       margin-right: 0;
     }
 
@@ -267,7 +269,7 @@
       border-top-right-radius: 0 !important;
       border-bottom-right-radius: 0 !important;
 
-      > .ant-select-selector {
+      > .@{ant-prefix}-select-selector {
         border-top-right-radius: 0 !important;
         border-bottom-right-radius: 0 !important;
       }
@@ -277,14 +279,14 @@
       border-top-left-radius: 0 !important;
       border-bottom-left-radius: 0 !important;
 
-      > .ant-select-selector {
+      > .@{ant-prefix}-select-selector {
         border-top-left-radius: 0 !important;
         border-bottom-left-radius: 0 !important;
       }
     }
   }
 
-  .ant-input-group.ant-input-group-compact > * {
+  .@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact > * {
     float: none;
     vertical-align: top;
   }

package/es/ProIcon/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-icon {
   cursor: pointer;
 
@@ -17,7 +20,7 @@
     display: inline-block;
   }
 
-  &.ant-btn-icon-only {
+  &.@{ant-prefix}-btn-icon-only {
     width  : auto;
     height : auto;
     padding: 0;

package/es/ProLayout/components/Layout/Header/style/index.less

@@ -15,7 +15,7 @@
     box-shadow     : 0px 1px 2px 0px rgba(0, 55, 93, 0.1) !important;
 
     .pro-layout-header-actions {
-      .ant-avatar {
+      .@{ant-prefix}-avatar {
         background: var(--zaui-brand, #006aff);
       }
     }

package/es/ProLayout/components/Layout/Menu/FoldMenu/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-layout-menu-fold-list {
   padding-top: 4px;
   overflow-y : auto;
@@ -73,28 +76,28 @@
   top: 80px !important
 }
 
-.pro-layout-menu-tooltip.pro-layout-menu-tooltip-nav-open.ant-popover-placement-rightBottom,
-.pro-layout-menu-tooltip.pro-layout-menu-tooltip-nav-open.ant-popover-placement-rightTop {
+.pro-layout-menu-tooltip.pro-layout-menu-tooltip-nav-open.@{ant-prefix}-popover-placement-rightBottom,
+.pro-layout-menu-tooltip.pro-layout-menu-tooltip-nav-open.@{ant-prefix}-popover-placement-rightTop {
   left: 220px !important
 }
 
-.pro-layout-menu-tooltip.ant-popover-placement-rightBottom,
-.pro-layout-menu-tooltip.ant-popover-placement-rightTop {
+.pro-layout-menu-tooltip.@{ant-prefix}-popover-placement-rightBottom,
+.pro-layout-menu-tooltip.@{ant-prefix}-popover-placement-rightTop {
   position    : fixed;
   z-index     : 1001;
   left        : 49px !important;
   padding-left: 0
 }
 
-.pro-layout-menu-tooltip .ant-popover-inner-content {
+.pro-layout-menu-tooltip .@{ant-prefix}-popover-inner-content {
   padding: 0
 }
 
-.pro-layout-menu-tooltip .ant-popover-content>.ant-popover-arrow {
+.pro-layout-menu-tooltip .@{ant-prefix}-popover-content>.@{ant-prefix}-popover-arrow {
   display: none
 }
 
-.pro-layout-menu-tooltip .ant-popover-content .ant-popover-inner {
+.pro-layout-menu-tooltip .@{ant-prefix}-popover-content .@{ant-prefix}-popover-inner {
   padding   : 0;
   box-shadow: 2px 0px 5px 0px rgba(0, 55, 93, 0.1);
 }