@zat-design/sisyphus-react 3.7.3-beta.3 → 3.7.3-beta.4

package/.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "kisstkondoros.vscode-codemetrics"
+    ]
+}

package/dist/index.esm.css

@@ -3063,7 +3063,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .pro-form-item-changed .ant-select .ant-select-selector,
 .pro-form .pro-form-item-changed .ant-picker,
 .pro-form .pro-form-item-changed .ant-input-number {
-  background: var(--zaui-contract-bg, #fffaa1) !important;
+  background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1)) !important;
 }
 .pro-form .pro-form-item-changed span.ant-input-affix-wrapper input,
 .pro-form .pro-form-item-changed .ant-select .ant-select-selector input,
@@ -3079,25 +3079,25 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-form .pro-form-item-changed .ant-form-item-control:has(.ant-switch-handle),
 .pro-form .pro-form-item-changed .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
-  background: var(--zaui-contract-bg, #fffaa1);
+  background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1));
   border-radius: 4px;
 }
 .pro-form .pro-form-item-changed .ant-form-item-control-input-content > span {
   border-radius: 4px;
   padding: 5px 8px;
-  background: var(--zaui-contract-bg, #fffaa1);
+  background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1));
 }
 .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-select-selector,
 .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-input-affix-wrapper,
 .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-input-disabled {
-  background: var(--zaui-contract-bg, #fffaa1);
+  background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1));
 }
 .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
-  background: var(--zaui-contract-bg, #fffaa1);
+  background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1));
 }
 .pro-form .pro-form-item-changed .pro-form-view-container {
   padding: 4px 8px;
-  background: var(--zaui-contract-bg, #fffaa1);
+  background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1));
   border-radius: 4px;
 }
 .pro-upload .pro-upload-dragger .pro-upload-handle-box {

package/dist/less.esm.css

@@ -3063,7 +3063,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .pro-form-item-changed .ant-select .ant-select-selector,
 .pro-form .pro-form-item-changed .ant-picker,
 .pro-form .pro-form-item-changed .ant-input-number {
-  background: var(--zaui-contract-bg, #fffaa1) !important;
+  background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1)) !important;
 }
 .pro-form .pro-form-item-changed span.ant-input-affix-wrapper input,
 .pro-form .pro-form-item-changed .ant-select .ant-select-selector input,
@@ -3079,25 +3079,25 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-form .pro-form-item-changed .ant-form-item-control:has(.ant-switch-handle),
 .pro-form .pro-form-item-changed .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
-  background: var(--zaui-contract-bg, #fffaa1);
+  background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1));
   border-radius: 4px;
 }
 .pro-form .pro-form-item-changed .ant-form-item-control-input-content > span {
   border-radius: 4px;
   padding: 5px 8px;
-  background: var(--zaui-contract-bg, #fffaa1);
+  background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1));
 }
 .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-select-selector,
 .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-input-affix-wrapper,
 .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-input-disabled {
-  background: var(--zaui-contract-bg, #fffaa1);
+  background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1));
 }
 .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
-  background: var(--zaui-contract-bg, #fffaa1);
+  background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1));
 }
 .pro-form .pro-form-item-changed .pro-form-view-container {
   padding: 4px 8px;
-  background: var(--zaui-contract-bg, #fffaa1);
+  background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1));
   border-radius: 4px;
 }
 .pro-upload .pro-upload-dragger .pro-upload-handle-box {

package/es/ProForm/components/combination/Container/index.js

@@ -9,11 +9,12 @@ import ProCollapse from '../../../../ProLayout/components/ProCollapse';
 import ProForm from '../../../../ProForm';
 var Container = function Container(props) {
   var children = props.children,
-    otherProps = props.otherProps,
     className = props.className,
     container = props.container,
     show = props.show,
-    clearNotShow = props.clearNotShow;
+    clearNotShow = props.clearNotShow,
+    diffConfig = props.diffConfig,
+    otherProps = props.otherProps;
   var _ref = ProForm.useFieldProps() || {},
     type = _ref.type,
     form = _ref.form,
@@ -38,7 +39,8 @@ var Container = function Container(props) {
   var childRender = function childRender() {
     var child = _jsx(RenderFields, _objectSpread({
       columns: _children,
-      form: form
+      form: form,
+      diffConfig: diffConfig
     }, otherProps));
     if (type === 'ProCollapse') {
       return _jsx(ProCollapse, _objectSpread(_objectSpread({}, omit(props, ['otherProps', 'children', 'onBlur', 'onChange', 'placeholder', 'className'])), {}, {

package/es/ProForm/components/combination/Container/propsType.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { RowProps } from 'antd';
-import { ProColumnProps, ProFormOtherProps } from '../../../propsType';
+import { ProColumnProps, ProFormOtherProps, DiffConfigProps } from '../../../propsType';
 export interface ContainerProps {
     children?: ProColumnProps[];
     otherProps?: ProFormOtherProps;
@@ -8,5 +8,6 @@ export interface ContainerProps {
     className?: string;
     container?: string | React.ReactNode;
     show?: boolean | (() => boolean);
+    diffConfig?: DiffConfigProps;
     clearNotShow?: boolean;
 }

package/es/ProForm/components/combination/ProNumberRange/index.js

@@ -91,7 +91,9 @@ var ProNumberRange = function ProNumberRange(props) {
   });
   // 查看模式
   if (isView || props.isView) {
-    if (isEmpty(value)) {
+    if (isEmpty(value) || (value === null || value === void 0 ? void 0 : value.every(function (item) {
+      return typeof item !== 'number';
+    }))) {
       return viewEmpty;
     }
     switch (valueType) {

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

@@ -24,7 +24,11 @@ var ChangedWrapper = function ChangedWrapper(props) {
     rest = _objectWithoutProperties(props, _excluded);
   var _useProConfig = useProConfig('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
-  var originalValues = diffConfig.originalValues;
+  var originalValues = diffConfig.originalValues,
+    _diffConfig$changeTip = diffConfig.changeTipColor,
+    changeTipColor = _diffConfig$changeTip === void 0 ? '#fffaa1' : _diffConfig$changeTip,
+    _diffConfig$addTipCol = diffConfig.addTipColor,
+    addTipColor = _diffConfig$addTipCol === void 0 ? '#d2fff4' : _diffConfig$addTipCol;
   var toolTip = (_diffConfig$toolTip = diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
   // 不渲染tooltip
   var isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
@@ -60,6 +64,10 @@ var ChangedWrapper = function ChangedWrapper(props) {
     // 传入undefined 鼠标移入显示移出隐藏
     return isChanged ? undefined : false;
   };
+  var style = {
+    '--change-tip-color': changeTipColor || '@zaui-contract-bg',
+    '--add-tip-color': addTipColor || '@zaui-contract-bg'
+  };
   return _jsx(_Tooltip, {
     open: tipOpenCalc(),
     getPopupContainer: function getPopupContainer(target) {
@@ -71,6 +79,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
     placement: "topLeft",
     children: _jsx("div", {
       className: isChanged ? 'pro-form-item-changed' : '',
+      style: style,
       children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest)) : undefined
     })
   });

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

@@ -153,6 +153,7 @@ var RenderFields = function RenderFields(props) {
     if (['ProCollapse', 'Container'].includes(_type)) {
       componentProps.show = show;
       componentProps.clearNotShow = clearNotShow;
+      componentProps.diffConfig = diffConfig;
     }
     // switch与SwitchCheckbox单独添加valuePropName
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {

package/es/ProForm/style/index.less

@@ -328,7 +328,7 @@
     .@{ant-prefix}-select .@{ant-prefix}-select-selector,
     .@{ant-prefix}-picker,
     .@{ant-prefix}-input-number {
-      background: @zaui-contract-bg !important;
+      background: var(--change-tip-color, @zaui-contract-bg) !important;
 
       input {
         background: transparent !important;
@@ -340,7 +340,7 @@
 
     .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-switch-handle),
     .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-checkbox-wrapper-in-form-item) {
-      background: @zaui-contract-bg;
+      background: var(--change-tip-color, @zaui-contract-bg);
       border-radius: 4px;
     }
 
@@ -350,26 +350,26 @@
       & > span {
         border-radius: 4px;
         padding: 5px 8px;
-        background: @zaui-contract-bg;
+        background: var(--change-tip-color, @zaui-contract-bg);
       }
 
       & > .pro-address {
         .@{ant-prefix}-select-selector,
         .@{ant-prefix}-input-affix-wrapper,
         .@{ant-prefix}-input-disabled {
-          background: @zaui-contract-bg;
+          background: var(--change-tip-color, @zaui-contract-bg);
         }
       }
       & > .@{ant-prefix}-input-group {
         .forever-checkbox {
-          background: @zaui-contract-bg;
+          background: var(--change-tip-color, @zaui-contract-bg);
         }
       }
     }
 
     .pro-form-view-container {
       padding: 4px 8px;
-      background: @zaui-contract-bg;
+      background: var(--change-tip-color, @zaui-contract-bg);
       border-radius: 4px;
     }
   }

package/lib/ProForm/components/combination/Container/index.js

@@ -16,11 +16,12 @@ var _ProCollapse = _interopRequireDefault(require("../../../../ProLayout/compone
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var Container = function Container(props) {
   var children = props.children,
-    otherProps = props.otherProps,
     className = props.className,
     container = props.container,
     show = props.show,
-    clearNotShow = props.clearNotShow;
+    clearNotShow = props.clearNotShow,
+    diffConfig = props.diffConfig,
+    otherProps = props.otherProps;
   var _ref = _ProForm.default.useFieldProps() || {},
     type = _ref.type,
     form = _ref.form,
@@ -45,7 +46,8 @@ var Container = function Container(props) {
   var childRender = function childRender() {
     var child = (0, _jsxRuntime.jsx)(_RenderFields.default, (0, _objectSpread2.default)({
       columns: _children,
-      form: form
+      form: form,
+      diffConfig: diffConfig
     }, otherProps));
     if (type === 'ProCollapse') {
       return (0, _jsxRuntime.jsx)(_ProCollapse.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(props, ['otherProps', 'children', 'onBlur', 'onChange', 'placeholder', 'className'])), {}, {

package/lib/ProForm/components/combination/Container/propsType.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { RowProps } from 'antd';
-import { ProColumnProps, ProFormOtherProps } from '../../../propsType';
+import { ProColumnProps, ProFormOtherProps, DiffConfigProps } from '../../../propsType';
 export interface ContainerProps {
     children?: ProColumnProps[];
     otherProps?: ProFormOtherProps;
@@ -8,5 +8,6 @@ export interface ContainerProps {
     className?: string;
     container?: string | React.ReactNode;
     show?: boolean | (() => boolean);
+    diffConfig?: DiffConfigProps;
     clearNotShow?: boolean;
 }

package/lib/ProForm/components/combination/ProNumberRange/index.js

@@ -95,7 +95,9 @@ var ProNumberRange = function ProNumberRange(props) {
   });
   // 查看模式
   if (isView || props.isView) {
-    if ((0, _lodash.isEmpty)(value)) {
+    if ((0, _lodash.isEmpty)(value) || (value === null || value === void 0 ? void 0 : value.every(function (item) {
+      return typeof item !== 'number';
+    }))) {
       return viewEmpty;
     }
     switch (valueType) {

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

@@ -29,7 +29,11 @@ var ChangedWrapper = function ChangedWrapper(props) {
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
-  var originalValues = diffConfig.originalValues;
+  var originalValues = diffConfig.originalValues,
+    _diffConfig$changeTip = diffConfig.changeTipColor,
+    changeTipColor = _diffConfig$changeTip === void 0 ? '#fffaa1' : _diffConfig$changeTip,
+    _diffConfig$addTipCol = diffConfig.addTipColor,
+    addTipColor = _diffConfig$addTipCol === void 0 ? '#d2fff4' : _diffConfig$addTipCol;
   var toolTip = (_diffConfig$toolTip = diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
   // 不渲染tooltip
   var isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
@@ -65,6 +69,10 @@ var ChangedWrapper = function ChangedWrapper(props) {
     // 传入undefined 鼠标移入显示移出隐藏
     return isChanged ? undefined : false;
   };
+  var style = {
+    '--change-tip-color': changeTipColor || '@zaui-contract-bg',
+    '--add-tip-color': addTipColor || '@zaui-contract-bg'
+  };
   return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
     open: tipOpenCalc(),
     getPopupContainer: function getPopupContainer(target) {
@@ -76,6 +84,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
     placement: "topLeft",
     children: (0, _jsxRuntime.jsx)("div", {
       className: isChanged ? 'pro-form-item-changed' : '',
+      style: style,
       children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest)) : undefined
     })
   });

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

@@ -161,6 +161,7 @@ var RenderFields = function RenderFields(props) {
     if (['ProCollapse', 'Container'].includes(_type)) {
       componentProps.show = show;
       componentProps.clearNotShow = clearNotShow;
+      componentProps.diffConfig = diffConfig;
     }
     // switch与SwitchCheckbox单独添加valuePropName
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {

package/lib/ProForm/style/index.less

@@ -328,7 +328,7 @@
     .@{ant-prefix}-select .@{ant-prefix}-select-selector,
     .@{ant-prefix}-picker,
     .@{ant-prefix}-input-number {
-      background: @zaui-contract-bg !important;
+      background: var(--change-tip-color, @zaui-contract-bg) !important;
 
       input {
         background: transparent !important;
@@ -340,7 +340,7 @@
 
     .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-switch-handle),
     .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-checkbox-wrapper-in-form-item) {
-      background: @zaui-contract-bg;
+      background: var(--change-tip-color, @zaui-contract-bg);
       border-radius: 4px;
     }
 
@@ -350,26 +350,26 @@
       & > span {
         border-radius: 4px;
         padding: 5px 8px;
-        background: @zaui-contract-bg;
+        background: var(--change-tip-color, @zaui-contract-bg);
       }
 
       & > .pro-address {
         .@{ant-prefix}-select-selector,
         .@{ant-prefix}-input-affix-wrapper,
         .@{ant-prefix}-input-disabled {
-          background: @zaui-contract-bg;
+          background: var(--change-tip-color, @zaui-contract-bg);
         }
       }
       & > .@{ant-prefix}-input-group {
         .forever-checkbox {
-          background: @zaui-contract-bg;
+          background: var(--change-tip-color, @zaui-contract-bg);
         }
       }
     }
 
     .pro-form-view-container {
       padding: 4px 8px;
-      background: @zaui-contract-bg;
+      background: var(--change-tip-color, @zaui-contract-bg);
       border-radius: 4px;
     }
   }

package/package.json

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