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

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/old/ProCertValidity/index.js

@@ -10,7 +10,7 @@ var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer"
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // @ts-nocheck
 
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { forwardRef, useMemo, useRef } from 'react';
 var RangePicker = _DatePicker.RangePicker;
 var defaultFormatDate = 'YYYY-MM-DD';
@@ -50,37 +50,37 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
         forever = _value2.forever;
       if (forever === 'Y') {
         return {
-          range: [moment('9999-01-01'), moment('9999-01-01')],
+          range: [dayjs('9999-01-01'), dayjs('9999-01-01')],
           forever: true
         };
       }
       if (startTime && endTime) {
-        var tempStartDate = moment(startTime).format(defaultFormatDate);
-        var tempEndDate = moment(endTime).format(defaultFormatDate);
+        var tempStartDate = dayjs(startTime).format(defaultFormatDate);
+        var tempEndDate = dayjs(endTime).format(defaultFormatDate);
         if ((!forever || forever === 'N') && !checkIsForever(tempStartDate) && !checkIsForever(tempEndDate)) {
           return {
-            range: [moment(startTime), moment(endTime)],
+            range: [dayjs(startTime), dayjs(endTime)],
             forever: false
           };
         }
         if (checkIsForever(tempStartDate) && checkIsForever(tempEndDate) && !isChange.current) {
           return {
-            range: [moment('9999-01-01'), moment('9999-01-01')],
+            range: [dayjs('9999-01-01'), dayjs('9999-01-01')],
             forever: true
           };
         }
       }
     } else {
       if (typeof value === 'string' || value._isAMomentObject) {
-        var tempDate = moment(value).format(defaultFormatDate);
+        var tempDate = dayjs(value).format(defaultFormatDate);
         if (tempDate && tempDate === '9999-01-01') {
           return {
-            range: moment('9999-01-01'),
+            range: dayjs('9999-01-01'),
             forever: true
           };
         }
         return {
-          range: moment(value),
+          range: dayjs(value),
           forever: false
         };
       }
@@ -89,21 +89,21 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
         _forever = _value3.forever;
       if (_forever === 'Y') {
         return {
-          range: moment('9999-01-01'),
+          range: dayjs('9999-01-01'),
           forever: true
         };
       }
       if (dateTime) {
-        var _tempDate = moment(dateTime).format(defaultFormatDate);
+        var _tempDate = dayjs(dateTime).format(defaultFormatDate);
         if ((!_forever || _forever === 'N') && _tempDate !== '9999-01-01') {
           return {
-            range: moment(dateTime),
+            range: dayjs(dateTime),
             forever: false
           };
         }
         if (_tempDate && _tempDate === '9999-01-01' && !isChange.current) {
           return {
-            range: moment('9999-01-01'),
+            range: dayjs('9999-01-01'),
             forever: true
           };
         }
@@ -113,8 +113,8 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, [value, (_value4 = value) === null || _value4 === void 0 ? void 0 : _value4.dateTime]);
   var changeRangeTime = function changeRangeTime(values) {
     onChange({
-      startTime: values ? moment(values === null || values === void 0 ? void 0 : values[0]).format(defaultFormatDate) : null,
-      endTime: values ? moment(values === null || values === void 0 ? void 0 : values[1]).format(defaultFormatDate) : null,
+      startTime: values ? dayjs(values === null || values === void 0 ? void 0 : values[0]).format(defaultFormatDate) : null,
+      endTime: values ? dayjs(values === null || values === void 0 ? void 0 : values[1]).format(defaultFormatDate) : null,
       forever: 'N'
     });
   };
@@ -142,7 +142,7 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
     if (rangeTime.forever) {
       _value = '长期';
     } else {
-      _value = rangeTime.range ? moment(rangeTime.range).format(defaultFormatDate) : null;
+      _value = rangeTime.range ? dayjs(rangeTime.range).format(defaultFormatDate) : null;
     }
     return _jsx(_Input, {
       value: _value,

package/es/ProForm/components/old/ProCertValidity/propsType.d.ts

@@ -1,12 +1,12 @@
 import { DatePickerProps, RangePickerProps } from 'antd/es/date-picker';
-import moment from 'moment';
+import dayjs from 'dayjs';
 interface ICertValidityValuePropsType {
-    dateTime?: moment.Moment | string;
+    dateTime?: dayjs.Dayjs | string;
     forever?: string;
 }
 interface ICertValidityRangeValuePropsType {
-    startTime?: moment.Moment | string;
-    endTime?: moment.Moment | string;
+    startTime?: dayjs.Dayjs | string;
+    endTime?: dayjs.Dayjs | string;
     forever?: string;
 }
 interface IProCertValidityExtraPropsType {

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

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

@@ -1,27 +1,30 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-layout-open-menu {
   color: #fff;
 
-  .ant-menu-root {
+  .@{ant-prefix}-menu-root {
     overflow-y: auto !important;
 
-    &>.ant-menu-submenu>.ant-menu-submenu-title,
-    &>.ant-menu-item.ant-menu-item-only-child {
+    &>.@{ant-prefix}-menu-submenu>.@{ant-prefix}-menu-submenu-title,
+    &>.@{ant-prefix}-menu-item.@{ant-prefix}-menu-item-only-child {
       padding-left: 16px !important;
     }
 
-    &>.ant-menu-submenu {
-      .ant-menu-sub {
+    &>.@{ant-prefix}-menu-submenu {
+      .@{ant-prefix}-menu-sub {
         background: #1A202D;
       }
 
-      &>.ant-menu-sub>.ant-menu-submenu>.ant-menu-submenu-title,
-      &>.ant-menu-item-only-child,
-      &>.ant-menu-sub>.ant-menu-item-only-child {
+      &>.@{ant-prefix}-menu-sub>.@{ant-prefix}-menu-submenu>.@{ant-prefix}-menu-submenu-title,
+      &>.@{ant-prefix}-menu-item-only-child,
+      &>.@{ant-prefix}-menu-sub>.@{ant-prefix}-menu-item-only-child {
         padding-left: 16px !important;
       }
     }
 
-    &>.ant-menu-item-only-child {
+    &>.@{ant-prefix}-menu-item-only-child {
       min-height    : 48px;
       padding-top   : 12px;
       padding-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1) - var(--zaui-space-size-xs; 4px) * var(--zaui-size; 1));
@@ -35,7 +38,7 @@
       }
     }
 
-    .ant-menu-item {
+    .@{ant-prefix}-menu-item {
       padding-left: 30px !important;
 
       &::after {
@@ -45,14 +48,14 @@
 
   }
 
-  .ant-menu-inline {
-    .ant-menu-submenu-title {
+  .@{ant-prefix}-menu-inline {
+    .@{ant-prefix}-menu-submenu-title {
       margin: 0;
     }
   }
 
-  .ant-menu-item,
-  .ant-menu-submenu-title {
+  .@{ant-prefix}-menu-item,
+  .@{ant-prefix}-menu-submenu-title {
     &:hover {
       background: var(--ant-primary-8, #003eb3);
 
@@ -64,11 +67,11 @@
   }
 
 
-  .ant-menu.ant-menu-dark {
+  .@{ant-prefix}-menu.@{ant-prefix}-menu-dark {
     background: #1A202D;
     overflow-x: hidden;
 
-    .ant-menu-item-only-child {
+    .@{ant-prefix}-menu-item-only-child {
       &:hover {
         background: var(--ant-primary-8, #003eb3);
 
@@ -79,7 +82,7 @@
     }
   }
 
-  .ant-menu-item-selected {
+  .@{ant-prefix}-menu-item-selected {
     background: var(--zaui-brand, #006aff) !important;
 
     h2 {
@@ -87,8 +90,8 @@
     }
   }
 
-  .ant-menu-sub.ant-menu-inline>.ant-menu-item,
-  .ant-menu-submenu-title {
+  .@{ant-prefix}-menu-sub.@{ant-prefix}-menu-inline>.@{ant-prefix}-menu-item,
+  .@{ant-prefix}-menu-submenu-title {
     white-space: pre-wrap;
     line-height: initial !important;
     height     : auto !important;
@@ -97,7 +100,7 @@
     min-height : 48px;
   }
 
-  .ant-menu-title-content {
+  .@{ant-prefix}-menu-title-content {
 
 
     div {
@@ -135,19 +138,19 @@
     transition: all 0.1s ease-in;
   }
 
-  .ant-menu-submenu-open {
+  .@{ant-prefix}-menu-submenu-open {
     .anticon-caret-down {
       transform: rotateZ(180deg);
       color    : #fff;
     }
 
-    .ant-menu-submenu-inline {
+    .@{ant-prefix}-menu-submenu-inline {
       .anticon-caret-down {
         transform: rotateZ(0deg);
         color    : #CACACA;
       }
 
-      &.ant-menu-submenu-open {
+      &.@{ant-prefix}-menu-submenu-open {
         .anticon-caret-down {
           transform: rotateZ(180deg);
           color    : #fff;
@@ -156,13 +159,13 @@
     }
   }
 
-  .ant-menu-submenu:hover>.ant-menu-submenu-title>.ant-menu-submenu-expand-icon {
+  .@{ant-prefix}-menu-submenu:hover>.@{ant-prefix}-menu-submenu-title>.@{ant-prefix}-menu-submenu-expand-icon {
     color: #fff;
   }
 
-  .ant-menu-submenu-selected {
-    &>.ant-menu-submenu-title {
-      .ant-menu-title-content div {
+  .@{ant-prefix}-menu-submenu-selected {
+    &>.@{ant-prefix}-menu-submenu-title {
+      .@{ant-prefix}-menu-title-content div {
         .pro-layout-icon {
           color: #fff;
         }
@@ -175,7 +178,7 @@
 
     }
 
-    .ant-menu-item-only-child .ant-menu-title-content div {
+    .@{ant-prefix}-menu-item-only-child .@{ant-prefix}-menu-title-content div {
       .pro-layout-icon {
         color: #CACACA;
       }