@zat-design/sisyphus-react 3.3.3-beta.2 → 3.3.3-beta.4

package/dist/index.esm.css

@@ -5505,3 +5505,28 @@ input[type='button'] {
   width: -moz-max-content;
   width: max-content;
 }
+.ant-tooltip > .ant-tooltip-content > .ant-tooltip-inner {
+  color: #1d2129;
+  background-color: #fff;
+  -webkit-box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
+          box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
+}
+.ant-tooltip > .ant-tooltip-content > .ant-tooltip-inner::-moz-selection {
+  color: inherit !important;
+  background: rgba(24, 144, 255, 0.3) !important;
+}
+.ant-tooltip > .ant-tooltip-content > .ant-tooltip-inner::selection {
+  color: inherit !important;
+  background: rgba(24, 144, 255, 0.3) !important;
+}
+.ant-tooltip > .ant-tooltip-content > .ant-tooltip-inner > div::-moz-selection {
+  color: inherit !important;
+  background: rgba(24, 144, 255, 0.3) !important;
+}
+.ant-tooltip > .ant-tooltip-content > .ant-tooltip-inner > div::selection {
+  color: inherit !important;
+  background: rgba(24, 144, 255, 0.3) !important;
+}
+.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);
+}

package/es/ProForm/utils/index.d.ts

@@ -84,4 +84,8 @@ export declare const deleteForPath: (values: any, namePath: string | number | (s
  * @returns {}
  */
 export declare const findOptionByValue: (treeData: any[], value: string | number) => any;
+/**
+ * 对比依赖列表中的 值是否变更
+ */
+export declare const equalDependencies: (dependencies: any, prevValues: any, currentValues: any) => any;
 export {};

package/es/ProForm/utils/index.js

@@ -139,17 +139,17 @@ export var filterInternalFields = function filterInternalFields(values) {
     return nextValues;
   }
   if (Array.isArray(nextValues)) {
-    nextValues.forEach(function (item) {
-      filterInternalFields(item);
+    return nextValues.map(function (item) {
+      return filterInternalFields(item);
     });
   }
   if (isObject(nextValues)) {
+    var result = {};
     Object.keys(nextValues).forEach(function (key) {
-      if (key.includes('-')) {
-        delete nextValues[key];
-      }
-      filterInternalFields(nextValues[key]);
+      if (key.includes('-')) return;
+      result[key] = filterInternalFields(nextValues[key]);
     });
+    return result;
   }
   return nextValues;
 };
@@ -407,4 +407,17 @@ export var findOptionByValue = function findOptionByValue(treeData, value) {
       }
     }
   }
+};
+/**
+ * 对比依赖列表中的 值是否变更
+ */
+export var equalDependencies = function equalDependencies(dependencies, prevValues, currentValues) {
+  if (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) {
+    return dependencies.some(function (namePath) {
+      var prevValue = get(prevValues, namePath);
+      var currentValue = get(currentValues, namePath);
+      return prevValue !== currentValue;
+    });
+  }
+  return false;
 };

package/es/ProForm/utils/useForm.js

@@ -12,13 +12,12 @@ export var useForm = function useForm(originForm) {
     validateFields = form.validateFields;
   // @ts-ignore
   var _getFieldsValue = function _getFieldsValue(nameList, filterFunc) {
-    var _nameList = Array.isArray(nameList) ? nameList : true;
     // 全部查询
-    if (_nameList === true) {
+    if (nameList !== true) {
       var values = getFieldsValue(true, filterFunc);
       return filterInternalFields(values);
     }
-    return getFieldsValue(_nameList, filterFunc);
+    return getFieldsValue(nameList, filterFunc);
   };
   var _validateFields = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {

package/es/ProForm/utils/useShouldUpdate.js

@@ -2,7 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useRef, useState } from 'react';
 import { isFunction, isEqualWith } from 'lodash';
-import { customEqualForFun } from './index';
+import { customEqualForFun, equalDependencies } from './index';
 // 代理shouldUpdate事件, 执行函数值的[show, disabled], 当[show, disabled]与上一次值不相同时更新状态
 var useShouldUpdate = function useShouldUpdate(props) {
   var show = props.show,
@@ -20,7 +20,8 @@ var useShouldUpdate = function useShouldUpdate(props) {
     clearNotShow = formItemProps.clearNotShow,
     index = formItemProps.index,
     namePath = formItemProps.namePath,
-    names = formItemProps.names;
+    names = formItemProps.names,
+    dependencies = formItemProps.dependencies;
   var timerRef = useRef();
   var showRef = useRef();
   var disabledRef = useRef();
@@ -171,7 +172,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
       if (_required !== requiredRef.current || !isEqualWith(rulesRef.current, _rules, customEqualForFun)) {
         form.validateFields([name]);
       }
-      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !isEqualWith(rulesRef.current, _rules, customEqualForFun) || !isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) || !isEqualWith(originComponentRef.current, _component, customEqualForFun)) {
+      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !isEqualWith(rulesRef.current, _rules, customEqualForFun) || !isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) || !isEqualWith(originComponentRef.current, _component, customEqualForFun) || equalDependencies(dependencies, prevValues, _currentValues)) {
         showRef.current = _show;
         disabledRef.current = _disabled;
         requiredRef.current = _required;

package/es/style/theme/antd.less

@@ -93,7 +93,8 @@
 
 .@{ant-prefix}-input[disabled],
 .@{ant-prefix}-select-disabled,
-.@{ant-prefix}-select-disabled.@{ant-prefix}-select:not(.@{ant-prefix}-select-customize-input) .@{ant-prefix}-select-selector,
+.@{ant-prefix}-select-disabled.@{ant-prefix}-select:not(.@{ant-prefix}-select-customize-input)
+  .@{ant-prefix}-select-selector,
 .@{ant-prefix}-input-number-disabled,
 .@{ant-prefix}-picker-input > input[disabled],
 .@{ant-prefix}-select-disabled.@{ant-prefix}-select-multiple .@{ant-prefix}-select-selection-item {
@@ -218,7 +219,11 @@
     .@{ant-prefix}-table tfoot > tr > td {
       padding: calc(4px + var(--zaui-size) * 8px);
     }
-    .@{ant-prefix}-table-tbody > tr > td > .@{ant-prefix}-table-wrapper:only-child .@{ant-prefix}-table,
+    .@{ant-prefix}-table-tbody
+      > tr
+      > td
+      > .@{ant-prefix}-table-wrapper:only-child
+      .@{ant-prefix}-table,
     .@{ant-prefix}-table-tbody
       > tr
       > td
@@ -508,7 +513,8 @@
     border-radius: @zaui-border-radius;
   }
 
-  .@{ant-prefix}-select-single:not(.@{ant-prefix}-select-customize-input) .@{ant-prefix}-select-selector {
+  .@{ant-prefix}-select-single:not(.@{ant-prefix}-select-customize-input)
+    .@{ant-prefix}-select-selector {
     .set-text-color();
     .set-text-size();
     width: 100%;
@@ -523,8 +529,12 @@
     border-radius: @zaui-border-radius;
   }
 
-  .@{ant-prefix}-pagination-jump-prev .@{ant-prefix}-pagination-item-container .@{ant-prefix}-pagination-item-link-icon,
-  .@{ant-prefix}-pagination-jump-next .@{ant-prefix}-pagination-item-container .@{ant-prefix}-pagination-item-link-icon {
+  .@{ant-prefix}-pagination-jump-prev
+    .@{ant-prefix}-pagination-item-container
+    .@{ant-prefix}-pagination-item-link-icon,
+  .@{ant-prefix}-pagination-jump-next
+    .@{ant-prefix}-pagination-item-container
+    .@{ant-prefix}-pagination-item-link-icon {
     color: @zaui-brand;
   }
 }
@@ -705,3 +715,34 @@
 .@{ant-prefix}-popover {
   width: max-content;
 }
+
+// tooltip样式重载
+.@{ant-prefix}-tooltip {
+  > .ant-tooltip-content {
+    > .ant-tooltip-inner {
+      color: rgb(29, 33, 41);
+      background-color: #fff;
+      box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08),
+        0 9px 28px 8px rgba(0, 0, 0, 0.05);
+      &::selection {
+        color: inherit !important;
+        background: rgba(@primary-color, 0.3) !important;
+      }
+      > div {
+        &::selection {
+          color: inherit !important;
+          background: rgba(@primary-color, 0.3) !important;
+        }
+      }
+    }
+    > .ant-tooltip-arrow {
+      > .ant-tooltip-arrow-content {
+        --antd-arrow-background-color: linear-gradient(
+          to right bottom,
+          rgba(255, 255, 255, 0.95),
+          rgba(255, 255, 255, 1)
+        );
+      }
+    }
+  }
+}

package/lib/ProForm/utils/index.d.ts

@@ -84,4 +84,8 @@ export declare const deleteForPath: (values: any, namePath: string | number | (s
  * @returns {}
  */
 export declare const findOptionByValue: (treeData: any[], value: string | number) => any;
+/**
+ * 对比依赖列表中的 值是否变更
+ */
+export declare const equalDependencies: (dependencies: any, prevValues: any, currentValues: any) => any;
 export {};

package/lib/ProForm/utils/index.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAllNamePath = exports.findOptionByValue = exports.filterInternalFields = exports.deleteForPath = exports.customEqualForFun = exports.contrast = void 0;
+exports.getAllNamePath = exports.findOptionByValue = exports.filterInternalFields = exports.equalDependencies = exports.deleteForPath = exports.customEqualForFun = exports.contrast = void 0;
 exports.getArrayBeforeNumber = getArrayBeforeNumber;
 exports.hasRowKey = exports.getLayout = exports.getDecimalDigits = void 0;
 exports.initialValuesToNames = initialValuesToNames;
@@ -155,17 +155,17 @@ var filterInternalFields = exports.filterInternalFields = function filterInterna
     return nextValues;
   }
   if (Array.isArray(nextValues)) {
-    nextValues.forEach(function (item) {
-      filterInternalFields(item);
+    return nextValues.map(function (item) {
+      return filterInternalFields(item);
     });
   }
   if ((0, _lodash.isObject)(nextValues)) {
+    var result = {};
     Object.keys(nextValues).forEach(function (key) {
-      if (key.includes('-')) {
-        delete nextValues[key];
-      }
-      filterInternalFields(nextValues[key]);
+      if (key.includes('-')) return;
+      result[key] = filterInternalFields(nextValues[key]);
     });
+    return result;
   }
   return nextValues;
 };
@@ -423,4 +423,17 @@ var findOptionByValue = exports.findOptionByValue = function findOptionByValue(t
       }
     }
   }
+};
+/**
+ * 对比依赖列表中的 值是否变更
+ */
+var equalDependencies = exports.equalDependencies = function equalDependencies(dependencies, prevValues, currentValues) {
+  if (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) {
+    return dependencies.some(function (namePath) {
+      var prevValue = (0, _lodash.get)(prevValues, namePath);
+      var currentValue = (0, _lodash.get)(currentValues, namePath);
+      return prevValue !== currentValue;
+    });
+  }
+  return false;
 };

package/lib/ProForm/utils/useForm.js

@@ -18,13 +18,12 @@ var useForm = exports.useForm = function useForm(originForm) {
     validateFields = form.validateFields;
   // @ts-ignore
   var _getFieldsValue = function _getFieldsValue(nameList, filterFunc) {
-    var _nameList = Array.isArray(nameList) ? nameList : true;
     // 全部查询
-    if (_nameList === true) {
+    if (nameList !== true) {
       var values = getFieldsValue(true, filterFunc);
       return (0, _index.filterInternalFields)(values);
     }
-    return getFieldsValue(_nameList, filterFunc);
+    return getFieldsValue(nameList, filterFunc);
   };
   var _validateFields = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {

package/lib/ProForm/utils/useShouldUpdate.js

@@ -27,7 +27,8 @@ var useShouldUpdate = function useShouldUpdate(props) {
     clearNotShow = formItemProps.clearNotShow,
     index = formItemProps.index,
     namePath = formItemProps.namePath,
-    names = formItemProps.names;
+    names = formItemProps.names,
+    dependencies = formItemProps.dependencies;
   var timerRef = (0, _react.useRef)();
   var showRef = (0, _react.useRef)();
   var disabledRef = (0, _react.useRef)();
@@ -178,7 +179,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
       if (_required !== requiredRef.current || !(0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.customEqualForFun)) {
         form.validateFields([name]);
       }
-      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !(0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.customEqualForFun) || !(0, _lodash.isEqualWith)(fieldPropsRef.current, _fieldProps, _index.customEqualForFun) || !(0, _lodash.isEqualWith)(originComponentRef.current, _component, _index.customEqualForFun)) {
+      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !(0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.customEqualForFun) || !(0, _lodash.isEqualWith)(fieldPropsRef.current, _fieldProps, _index.customEqualForFun) || !(0, _lodash.isEqualWith)(originComponentRef.current, _component, _index.customEqualForFun) || (0, _index.equalDependencies)(dependencies, prevValues, _currentValues)) {
         showRef.current = _show;
         disabledRef.current = _disabled;
         requiredRef.current = _required;

package/lib/style/theme/antd.less

@@ -93,7 +93,8 @@
 
 .@{ant-prefix}-input[disabled],
 .@{ant-prefix}-select-disabled,
-.@{ant-prefix}-select-disabled.@{ant-prefix}-select:not(.@{ant-prefix}-select-customize-input) .@{ant-prefix}-select-selector,
+.@{ant-prefix}-select-disabled.@{ant-prefix}-select:not(.@{ant-prefix}-select-customize-input)
+  .@{ant-prefix}-select-selector,
 .@{ant-prefix}-input-number-disabled,
 .@{ant-prefix}-picker-input > input[disabled],
 .@{ant-prefix}-select-disabled.@{ant-prefix}-select-multiple .@{ant-prefix}-select-selection-item {
@@ -218,7 +219,11 @@
     .@{ant-prefix}-table tfoot > tr > td {
       padding: calc(4px + var(--zaui-size) * 8px);
     }
-    .@{ant-prefix}-table-tbody > tr > td > .@{ant-prefix}-table-wrapper:only-child .@{ant-prefix}-table,
+    .@{ant-prefix}-table-tbody
+      > tr
+      > td
+      > .@{ant-prefix}-table-wrapper:only-child
+      .@{ant-prefix}-table,
     .@{ant-prefix}-table-tbody
       > tr
       > td
@@ -508,7 +513,8 @@
     border-radius: @zaui-border-radius;
   }
 
-  .@{ant-prefix}-select-single:not(.@{ant-prefix}-select-customize-input) .@{ant-prefix}-select-selector {
+  .@{ant-prefix}-select-single:not(.@{ant-prefix}-select-customize-input)
+    .@{ant-prefix}-select-selector {
     .set-text-color();
     .set-text-size();
     width: 100%;
@@ -523,8 +529,12 @@
     border-radius: @zaui-border-radius;
   }
 
-  .@{ant-prefix}-pagination-jump-prev .@{ant-prefix}-pagination-item-container .@{ant-prefix}-pagination-item-link-icon,
-  .@{ant-prefix}-pagination-jump-next .@{ant-prefix}-pagination-item-container .@{ant-prefix}-pagination-item-link-icon {
+  .@{ant-prefix}-pagination-jump-prev
+    .@{ant-prefix}-pagination-item-container
+    .@{ant-prefix}-pagination-item-link-icon,
+  .@{ant-prefix}-pagination-jump-next
+    .@{ant-prefix}-pagination-item-container
+    .@{ant-prefix}-pagination-item-link-icon {
     color: @zaui-brand;
   }
 }
@@ -705,3 +715,34 @@
 .@{ant-prefix}-popover {
   width: max-content;
 }
+
+// tooltip样式重载
+.@{ant-prefix}-tooltip {
+  > .ant-tooltip-content {
+    > .ant-tooltip-inner {
+      color: rgb(29, 33, 41);
+      background-color: #fff;
+      box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08),
+        0 9px 28px 8px rgba(0, 0, 0, 0.05);
+      &::selection {
+        color: inherit !important;
+        background: rgba(@primary-color, 0.3) !important;
+      }
+      > div {
+        &::selection {
+          color: inherit !important;
+          background: rgba(@primary-color, 0.3) !important;
+        }
+      }
+    }
+    > .ant-tooltip-arrow {
+      > .ant-tooltip-arrow-content {
+        --antd-arrow-background-color: linear-gradient(
+          to right bottom,
+          rgba(255, 255, 255, 0.95),
+          rgba(255, 255, 255, 1)
+        );
+      }
+    }
+  }
+}

package/package.json

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