@zat-design/sisyphus-react 3.7.3-beta.7 → 3.7.3-beta.9

package/dist/index.esm.css

@@ -2890,12 +2890,14 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1)) !important;
 }
 .pro-form .ant-form-item.pro-form-item-width-auto .ant-form-item-control-input {
+  width: 100%;
   -webkit-box-flex: inherit;
   -webkit-flex-grow: inherit;
       -ms-flex-positive: inherit;
           flex-grow: inherit;
 }
 .pro-form .ant-form-item.pro-form-item-width-auto .ant-form-item-control-input-content {
+  width: 100%;
   -webkit-box-flex: initial;
   -webkit-flex: initial;
       -ms-flex: initial;
@@ -3061,8 +3063,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-form .pro-form-item-changed {
   border-radius: 4px;
-  height: 100%;
-  width: 100%;
+  background: var(--zaui-contract-bg, #fffaa1) !important;
+}
+.pro-form .pro-form-item-changed .ant-select.ant-select-disabled .ant-select-selector {
   background: var(--zaui-contract-bg, #fffaa1) !important;
 }
 .pro-form .pro-form-item-changed span.ant-input-affix-wrapper,
@@ -3101,6 +3104,15 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
   background: var(--zaui-contract-bg, #fffaa1);
 }
+.pro-form .pro-form-item-changed .ant-checkbox-group {
+  padding: 5px 0;
+}
+.pro-form .pro-form-item-changed:has(.ant-switch) {
+  padding: 5px 0;
+}
+.pro-form .pro-form-item-changed .ant-input-textarea > textarea {
+  background: var(--zaui-contract-bg, #fffaa1);
+}
 .pro-form .pro-form-item-changed .pro-form-view-container {
   padding: 4px 8px;
   background: var(--zaui-contract-bg, #fffaa1);
@@ -3108,8 +3120,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-form .pro-form-item-add {
   border-radius: 4px;
-  height: 100%;
-  width: 100%;
+  background: var(--zaui-contract-bg-add, #d2fff4) !important;
+}
+.pro-form .pro-form-item-add .ant-select.ant-select-disabled .ant-select-selector {
   background: var(--zaui-contract-bg-add, #d2fff4) !important;
 }
 .pro-form .pro-form-item-add span.ant-input-affix-wrapper,
@@ -3148,6 +3161,15 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .pro-form-item-add .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
   background: var(--zaui-contract-bg-add, #d2fff4);
 }
+.pro-form .pro-form-item-add .ant-checkbox-group {
+  padding: 5px 0;
+}
+.pro-form .pro-form-item-add:has(.ant-switch) {
+  padding: 5px 0;
+}
+.pro-form .pro-form-item-add .ant-input-textarea > textarea {
+  background: var(--zaui-contract-bg-add, #d2fff4);
+}
 .pro-form .pro-form-item-add .pro-form-view-container {
   padding: 4px 8px;
   background: var(--zaui-contract-bg-add, #d2fff4);
@@ -5936,3 +5958,6 @@ input[type='button'] {
 .ant-tooltip > .ant-tooltip-content > .ant-tooltip-arrow > .ant-tooltip-arrow-content {
   --antd-arrow-background-color: linear-gradient(to right bottom, rgba(255, 255, 255, 0.95), #ffffff);
 }
+.ant-picker.ant-picker-disabled {
+  background: var(--zaui-disabled-bg);
+}

package/dist/less.esm.css

@@ -2890,12 +2890,14 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1)) !important;
 }
 .pro-form .ant-form-item.pro-form-item-width-auto .ant-form-item-control-input {
+  width: 100%;
   -webkit-box-flex: inherit;
   -webkit-flex-grow: inherit;
       -ms-flex-positive: inherit;
           flex-grow: inherit;
 }
 .pro-form .ant-form-item.pro-form-item-width-auto .ant-form-item-control-input-content {
+  width: 100%;
   -webkit-box-flex: initial;
   -webkit-flex: initial;
       -ms-flex: initial;
@@ -3061,8 +3063,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-form .pro-form-item-changed {
   border-radius: 4px;
-  height: 100%;
-  width: 100%;
+  background: var(--zaui-contract-bg, #fffaa1) !important;
+}
+.pro-form .pro-form-item-changed .ant-select.ant-select-disabled .ant-select-selector {
   background: var(--zaui-contract-bg, #fffaa1) !important;
 }
 .pro-form .pro-form-item-changed span.ant-input-affix-wrapper,
@@ -3101,6 +3104,15 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
   background: var(--zaui-contract-bg, #fffaa1);
 }
+.pro-form .pro-form-item-changed .ant-checkbox-group {
+  padding: 5px 0;
+}
+.pro-form .pro-form-item-changed:has(.ant-switch) {
+  padding: 5px 0;
+}
+.pro-form .pro-form-item-changed .ant-input-textarea > textarea {
+  background: var(--zaui-contract-bg, #fffaa1);
+}
 .pro-form .pro-form-item-changed .pro-form-view-container {
   padding: 4px 8px;
   background: var(--zaui-contract-bg, #fffaa1);
@@ -3108,8 +3120,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-form .pro-form-item-add {
   border-radius: 4px;
-  height: 100%;
-  width: 100%;
+  background: var(--zaui-contract-bg-add, #d2fff4) !important;
+}
+.pro-form .pro-form-item-add .ant-select.ant-select-disabled .ant-select-selector {
   background: var(--zaui-contract-bg-add, #d2fff4) !important;
 }
 .pro-form .pro-form-item-add span.ant-input-affix-wrapper,
@@ -3148,6 +3161,15 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .pro-form-item-add .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
   background: var(--zaui-contract-bg-add, #d2fff4);
 }
+.pro-form .pro-form-item-add .ant-checkbox-group {
+  padding: 5px 0;
+}
+.pro-form .pro-form-item-add:has(.ant-switch) {
+  padding: 5px 0;
+}
+.pro-form .pro-form-item-add .ant-input-textarea > textarea {
+  background: var(--zaui-contract-bg-add, #d2fff4);
+}
 .pro-form .pro-form-item-add .pro-form-view-container {
   padding: 4px 8px;
   background: var(--zaui-contract-bg-add, #d2fff4);

package/es/ProEnum/style/index.less

@@ -19,7 +19,7 @@
     justify-content: center;
     margin-right: var(--zaui-space-size-sm);
     padding: var(--zaui-space-size-xs) 10px;
-    background-color: #f5f5f5;
+    background-color: var(--zaui-disabled-bg);
     border-radius: var(--zaui-space-size-xs);
     cursor: pointer;
   }
@@ -29,7 +29,7 @@
     background-color: var(--zaui-brand);
   }
   &-tag-item-disabled {
-    background-color: #f5f5f5;
+    background-color: var(--zaui-disabled-bg);
     pointer-events: none;
   }
 
@@ -90,12 +90,16 @@
 
     .pro-enum-group-item-disabled {
       color: rgba(0, 0, 0, 0.25);
-      background: #f5f5f5;
+      background: var(--zaui-disabled-bg);
       cursor: not-allowed;
     }
   }
 
   &-group-root-disabled {
-    opacity: 0.7;
+    color: #bfbfbf;
+
+    .pro-enum-group-item {
+      background: var(--zaui-disabled-bg);
+    }
   }
 }

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

@@ -4,7 +4,7 @@ import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig"];
+var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classNames from 'classnames';
 import { get } from 'lodash';
@@ -22,6 +22,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
     children = props.children,
     type = props.type,
     diffConfig = props.diffConfig,
+    _props$valuePropName = props.valuePropName,
+    valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     rest = _objectWithoutProperties(props, _excluded);
   var _useProConfig = useProConfig('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
@@ -39,12 +41,12 @@ var ChangedWrapper = function ChangedWrapper(props) {
     if (!isWatch || noChange) return 'same';
     return diffOriginal({
       originalValue: originalValue,
-      value: props.value,
+      value: props[valuePropName],
       form: form,
       equalWith: equalWith
       // name: namesStr || name,
     });
-  }, [isWatch, noChange, props.value, originalValue]);
+  }, [isWatch, noChange, props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
   var tipContent = useMemo(function () {

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

@@ -436,6 +436,7 @@ var Render = function Render(props) {
         equalWith: equalWith,
         type: type,
         onChange: handleChange,
+        valuePropName: _otherFormItemProps.valuePropName,
         children: child
       });
     }

package/es/ProForm/style/index.less

@@ -99,10 +99,12 @@
 
     &.pro-form-item-width-auto {
       .@{ant-prefix}-form-item-control-input {
+        width: 100%;
         flex-grow: inherit;
       }
 
       .@{ant-prefix}-form-item-control-input-content {
+        width: 100%;
         flex: initial;
       }
     }
@@ -314,21 +316,23 @@
       vertical-align: middle;
     }
   }
-  .pro-form-list-mode-block{
-    .pro-collapse-content{
-      .@{ant-prefix}-row{
+
+  .pro-form-list-mode-block {
+    .pro-collapse-content {
+      .@{ant-prefix}-row {
         width: auto;
       }
     }
   }
 
-  // 比较原始值场景下  不同时的样式
   .pro-form-item-changed {
     border-radius: 4px;
-    height: 100%;
-    width: 100%;
     background: @zaui-contract-bg !important;
 
+    .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
+      background: @zaui-contract-bg !important;
+    }
+
     span.@{ant-prefix}-input-affix-wrapper,
     .@{ant-prefix}-select .@{ant-prefix}-select-selector,
     .@{ant-prefix}-picker,
@@ -372,6 +376,20 @@
       }
     }
 
+    // checkbox
+    .@{ant-prefix}-checkbox-group {
+      padding: 5px 0
+    }
+    // switch
+    &:has(.@{ant-prefix}-switch) {
+      padding: 5px 0;
+    }
+    
+    // textArea
+    .@{ant-prefix}-input-textarea > textarea  {
+      background: @zaui-contract-bg;
+    }
+
     .pro-form-view-container {
       padding: 4px 8px;
       background: @zaui-contract-bg;
@@ -382,10 +400,12 @@
 
   // 比较原始值场景下  不同时的样式
   .pro-form-item-add {
-        border-radius: 4px;
-        height: 100%;
-        width: 100%;
-        background: @zaui-contract-bg-add !important;
+    border-radius: 4px;
+    background: @zaui-contract-bg-add !important;
+
+    .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
+      background: @zaui-contract-bg-add !important;
+    }
 
     span.@{ant-prefix}-input-affix-wrapper,
     .@{ant-prefix}-select .@{ant-prefix}-select-selector,
@@ -430,6 +450,21 @@
       }
     }
 
+    // checkbox
+    .@{ant-prefix}-checkbox-group {
+      padding: 5px 0
+    }
+    // switch
+    &:has(.@{ant-prefix}-switch) {
+      padding: 5px 0;
+    }
+    
+    // textArea
+    .@{ant-prefix}-input-textarea > textarea {
+      background: @zaui-contract-bg-add;
+    }
+
+
     .pro-form-view-container {
       padding: 4px 8px;
       background: @zaui-contract-bg-add;

package/es/ProTree/components/ProTreeSelect/style/index.less

@@ -70,7 +70,7 @@
                     }
                 }
                 .@{ant-prefix}-select-tree-treenode:hover{
-                    background-color: #f5f5f5;
+                    background-color:  var(--zaui-disabled-bg);
                 }
                 .check-option-text{
                     .check-mark-icon{
@@ -90,7 +90,7 @@
                     padding-left: 7px;
                 }
                 .@{ant-prefix}-select-tree-treenode:hover{
-                    background-color: #f5f5f5;
+                    background-color:  var(--zaui-disabled-bg);;
                 }
                 .@{ant-prefix}-select-tree-node-content-wrapper{
                     padding-right: var(--zaui-space-size-md);

package/es/style/theme/antd.less

@@ -749,3 +749,8 @@
     }
   }
 }
+
+.@{ant-prefix}-picker.@{ant-prefix}-picker-disabled  {
+  background: var(--zaui-disabled-bg);
+}
+

package/lib/ProEnum/style/index.less

@@ -19,7 +19,7 @@
     justify-content: center;
     margin-right: var(--zaui-space-size-sm);
     padding: var(--zaui-space-size-xs) 10px;
-    background-color: #f5f5f5;
+    background-color: var(--zaui-disabled-bg);
     border-radius: var(--zaui-space-size-xs);
     cursor: pointer;
   }
@@ -29,7 +29,7 @@
     background-color: var(--zaui-brand);
   }
   &-tag-item-disabled {
-    background-color: #f5f5f5;
+    background-color: var(--zaui-disabled-bg);
     pointer-events: none;
   }
 
@@ -90,12 +90,16 @@
 
     .pro-enum-group-item-disabled {
       color: rgba(0, 0, 0, 0.25);
-      background: #f5f5f5;
+      background: var(--zaui-disabled-bg);
       cursor: not-allowed;
     }
   }
 
   &-group-root-disabled {
-    opacity: 0.7;
+    color: #bfbfbf;
+
+    .pro-enum-group-item {
+      background: var(--zaui-disabled-bg);
+    }
   }
 }

package/lib/ProForm/components/render/ChangedWrapper.js

@@ -16,7 +16,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _diffOriginal = require("../../utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
-var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig"];
+var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName"];
 var ChangedWrapper = function ChangedWrapper(props) {
   var _diffConfig$toolTip;
   var name = props.name,
@@ -27,6 +27,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
     children = props.children,
     type = props.type,
     diffConfig = props.diffConfig,
+    _props$valuePropName = props.valuePropName,
+    valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
@@ -44,12 +46,12 @@ var ChangedWrapper = function ChangedWrapper(props) {
     if (!isWatch || noChange) return 'same';
     return (0, _diffOriginal.diffOriginal)({
       originalValue: originalValue,
-      value: props.value,
+      value: props[valuePropName],
       form: form,
       equalWith: equalWith
       // name: namesStr || name,
     });
-  }, [isWatch, noChange, props.value, originalValue]);
+  }, [isWatch, noChange, props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
   var tipContent = (0, _react.useMemo)(function () {

package/lib/ProForm/components/render/Render.js

@@ -436,6 +436,7 @@ var Render = function Render(props) {
         equalWith: equalWith,
         type: type,
         onChange: handleChange,
+        valuePropName: _otherFormItemProps.valuePropName,
         children: child
       });
     }

package/lib/ProForm/style/index.less

@@ -99,10 +99,12 @@
 
     &.pro-form-item-width-auto {
       .@{ant-prefix}-form-item-control-input {
+        width: 100%;
         flex-grow: inherit;
       }
 
       .@{ant-prefix}-form-item-control-input-content {
+        width: 100%;
         flex: initial;
       }
     }
@@ -314,21 +316,23 @@
       vertical-align: middle;
     }
   }
-  .pro-form-list-mode-block{
-    .pro-collapse-content{
-      .@{ant-prefix}-row{
+
+  .pro-form-list-mode-block {
+    .pro-collapse-content {
+      .@{ant-prefix}-row {
         width: auto;
       }
     }
   }
 
-  // 比较原始值场景下  不同时的样式
   .pro-form-item-changed {
     border-radius: 4px;
-    height: 100%;
-    width: 100%;
     background: @zaui-contract-bg !important;
 
+    .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
+      background: @zaui-contract-bg !important;
+    }
+
     span.@{ant-prefix}-input-affix-wrapper,
     .@{ant-prefix}-select .@{ant-prefix}-select-selector,
     .@{ant-prefix}-picker,
@@ -372,6 +376,20 @@
       }
     }
 
+    // checkbox
+    .@{ant-prefix}-checkbox-group {
+      padding: 5px 0
+    }
+    // switch
+    &:has(.@{ant-prefix}-switch) {
+      padding: 5px 0;
+    }
+    
+    // textArea
+    .@{ant-prefix}-input-textarea > textarea  {
+      background: @zaui-contract-bg;
+    }
+
     .pro-form-view-container {
       padding: 4px 8px;
       background: @zaui-contract-bg;
@@ -382,10 +400,12 @@
 
   // 比较原始值场景下  不同时的样式
   .pro-form-item-add {
-        border-radius: 4px;
-        height: 100%;
-        width: 100%;
-        background: @zaui-contract-bg-add !important;
+    border-radius: 4px;
+    background: @zaui-contract-bg-add !important;
+
+    .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
+      background: @zaui-contract-bg-add !important;
+    }
 
     span.@{ant-prefix}-input-affix-wrapper,
     .@{ant-prefix}-select .@{ant-prefix}-select-selector,
@@ -430,6 +450,21 @@
       }
     }
 
+    // checkbox
+    .@{ant-prefix}-checkbox-group {
+      padding: 5px 0
+    }
+    // switch
+    &:has(.@{ant-prefix}-switch) {
+      padding: 5px 0;
+    }
+    
+    // textArea
+    .@{ant-prefix}-input-textarea > textarea {
+      background: @zaui-contract-bg-add;
+    }
+
+
     .pro-form-view-container {
       padding: 4px 8px;
       background: @zaui-contract-bg-add;

package/lib/ProTree/components/ProTreeSelect/style/index.less

@@ -70,7 +70,7 @@
                     }
                 }
                 .@{ant-prefix}-select-tree-treenode:hover{
-                    background-color: #f5f5f5;
+                    background-color:  var(--zaui-disabled-bg);
                 }
                 .check-option-text{
                     .check-mark-icon{
@@ -90,7 +90,7 @@
                     padding-left: 7px;
                 }
                 .@{ant-prefix}-select-tree-treenode:hover{
-                    background-color: #f5f5f5;
+                    background-color:  var(--zaui-disabled-bg);;
                 }
                 .@{ant-prefix}-select-tree-node-content-wrapper{
                     padding-right: var(--zaui-space-size-md);

package/lib/style/theme/antd.less

@@ -749,3 +749,8 @@
     }
   }
 }
+
+.@{ant-prefix}-picker.@{ant-prefix}-picker-disabled  {
+  background: var(--zaui-disabled-bg);
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.7.3-beta.7",
+  "version": "3.7.3-beta.9",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",