@zat-design/sisyphus-react 3.8.2-beta.1 → 3.8.2-beta.3

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

@@ -155,7 +155,7 @@ var Render = function Render(props) {
     };
   }
   /** 移除多余参数，防止透传给formItem报错 */
-  var _otherFormItemProps = omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow']);
+  var _otherFormItemProps = omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames']);
   /**
    * globalControl 全局控制优先
    * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】

package/es/ProForm/components/render/propsType.d.ts

@@ -182,6 +182,8 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     }) => React.ReactElement<any, any> | string | undefined | null;
     viewType?: ViewType;
     colProps?: ColProps;
+    /** 依赖刷新字段列表 */
+    dependNames?: NamePath[];
     /**
      * @description       表单item的props属性
      * @deprecated        将于下个版本 4.0.0 被弃用
@@ -190,6 +192,8 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     formItemProps?: FormItemProps<Values> & {
         index?: number;
         namePath?: NamePath;
+        /** 依赖刷新字段列表 */
+        dependNames?: NamePath[];
     };
     /**
      * @description       表单props属性

package/es/ProForm/utils/useShouldUpdate.js

@@ -1,7 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useRef, useState } from 'react';
-import { isFunction, isEqualWith } from 'lodash';
-import { customEqualForFun, equalDependencies } from './index';
+import { isFunction, isEqualWith, get } from 'lodash';
+import { customEqualForFun } from './index';
 // 代理shouldUpdate事件, 执行函数值的[show, disabled], 当[show, disabled]与上一次值不相同时更新状态
 var useShouldUpdate = function useShouldUpdate(props) {
   var show = props.show,
@@ -20,7 +20,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
     index = formItemProps.index,
     namePath = formItemProps.namePath,
     names = formItemProps.names,
-    dependencies = formItemProps.dependencies;
+    dependNames = formItemProps.dependNames;
   var timerRef = useRef();
   var needClear = useRef(); // 是否需要执行清值操作
   var showRef = useRef();
@@ -29,13 +29,14 @@ var useShouldUpdate = function useShouldUpdate(props) {
   var rulesRef = useRef();
   var fieldPropsRef = useRef();
   var originComponentRef = useRef();
+  var dependNamesRef = useRef();
   var newComponent = originComponent || component; // 解决component默认赋值污染问题，需要使用originComponent
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     reRender = _useState2[1];
   var values = {};
   // 不是动态函数直接返回
-  if (!isFunction(show) && !isFunction(disabled) && !isFunction(required) && !isFunction(rules) && !isFunction(fieldProps) && !isFunction(originComponent)) {
+  if (!(dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) && !isFunction(show) && !isFunction(disabled) && !isFunction(required) && !isFunction(rules) && !isFunction(fieldProps) && !isFunction(originComponent)) {
     return {
       shouldUpdate: _shouldUpdate,
       show: show,
@@ -119,9 +120,22 @@ var useShouldUpdate = function useShouldUpdate(props) {
   } else {
     fieldPropsRef.current = fieldProps;
   }
+  if (dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) {
+    dependNamesRef.current = dependNames.map(function (name) {
+      return get(values, name);
+    });
+  }
   return {
     shouldUpdate: function shouldUpdate(prevValues, currentValues) {
       // @ts-ignore formList场景取当前行数据，不取shouldUpdate变更后值
+      if (dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) {
+        var curDependNamesValue = dependNames.map(function (name) {
+          return get(currentValues, name);
+        });
+        var dependNamesChanged = !isEqualWith(dependNamesRef.current, curDependNamesValue, customEqualForFun);
+        dependNamesRef.current = curDependNamesValue;
+        if (!dependNamesChanged) return false;
+      }
       var _currentValues;
       if (namePath) {
         // formList场景values取当前行数据
@@ -182,11 +196,12 @@ var useShouldUpdate = function useShouldUpdate(props) {
       }
       var equalRes = isEqualWith(rulesRef.current, _rules, customEqualForFun);
       var proEqualRes = isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun);
-      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !equalRes || !proEqualRes ||
+      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !equalRes || !proEqualRes
       // 值变更，需要同步更新函数式的fieldProps
       // (isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) && !isEqual(prevValues, currentValues)) ||
       // !isEqualWith(originComponentRef.current, _component, customEqualForFun) ||
-      equalDependencies(dependencies, prevValues, _currentValues)) {
+      // equalDependencies(dependencies, prevValues, _currentValues)
+      ) {
         showRef.current = _show;
         disabledRef.current = _disabled;
         requiredRef.current = _required;

package/es/ProTable/index.js

@@ -30,7 +30,7 @@ export var defaultPage = {
   pageSize: 10
 };
 function ProTable(props) {
-  var _locale$ProTable, _curTableConfig$pathK;
+  var _locale$ProTable, _props$scroll, _curTableConfig$pathK;
   var _ref = useProConfig('globalConfig') || {},
     configStorage = _ref.storage; // 获取全局缓存位置配置
   var _ref2 = useProConfig('ProTable') || {},
@@ -58,6 +58,9 @@ function ProTable(props) {
     restProps = _objectWithoutProperties(props, _excluded);
   var _props$scrollFollowPa = props.scrollFollowParent,
     scrollFollowParent = _props$scrollFollowPa === void 0 ? true : _props$scrollFollowPa;
+  var _scroll = (_props$scroll = props === null || props === void 0 ? void 0 : props.scroll) !== null && _props$scroll !== void 0 ? _props$scroll : {
+    x: 'max-content'
+  };
   var wrapToolTipProps = {
     getPopupContainer: scrollFollowParent ? function (triggerNode) {
       return triggerNode.parentNode;
@@ -415,7 +418,8 @@ function ProTable(props) {
             summary: summary,
             dataSource: _dataSource
           },
-          dataSource: _dataSource
+          dataSource: _dataSource,
+          scroll: _scroll
         })), _jsx("span", {
           className: "pro-table-resizable-line",
           style: {

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

@@ -155,7 +155,7 @@ var Render = function Render(props) {
     };
   }
   /** 移除多余参数，防止透传给formItem报错 */
-  var _otherFormItemProps = (0, _lodash.omit)(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow']);
+  var _otherFormItemProps = (0, _lodash.omit)(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames']);
   /**
    * globalControl 全局控制优先
    * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】

package/lib/ProForm/components/render/propsType.d.ts

@@ -182,6 +182,8 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     }) => React.ReactElement<any, any> | string | undefined | null;
     viewType?: ViewType;
     colProps?: ColProps;
+    /** 依赖刷新字段列表 */
+    dependNames?: NamePath[];
     /**
      * @description       表单item的props属性
      * @deprecated        将于下个版本 4.0.0 被弃用
@@ -190,6 +192,8 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     formItemProps?: FormItemProps<Values> & {
         index?: number;
         namePath?: NamePath;
+        /** 依赖刷新字段列表 */
+        dependNames?: NamePath[];
     };
     /**
      * @description       表单props属性

package/lib/ProForm/utils/useShouldUpdate.js

@@ -27,7 +27,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
     index = formItemProps.index,
     namePath = formItemProps.namePath,
     names = formItemProps.names,
-    dependencies = formItemProps.dependencies;
+    dependNames = formItemProps.dependNames;
   var timerRef = (0, _react.useRef)();
   var needClear = (0, _react.useRef)(); // 是否需要执行清值操作
   var showRef = (0, _react.useRef)();
@@ -36,13 +36,14 @@ var useShouldUpdate = function useShouldUpdate(props) {
   var rulesRef = (0, _react.useRef)();
   var fieldPropsRef = (0, _react.useRef)();
   var originComponentRef = (0, _react.useRef)();
+  var dependNamesRef = (0, _react.useRef)();
   var newComponent = originComponent || component; // 解决component默认赋值污染问题，需要使用originComponent
   var _useState = (0, _react.useState)({}),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     reRender = _useState2[1];
   var values = {};
   // 不是动态函数直接返回
-  if (!(0, _lodash.isFunction)(show) && !(0, _lodash.isFunction)(disabled) && !(0, _lodash.isFunction)(required) && !(0, _lodash.isFunction)(rules) && !(0, _lodash.isFunction)(fieldProps) && !(0, _lodash.isFunction)(originComponent)) {
+  if (!(dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) && !(0, _lodash.isFunction)(show) && !(0, _lodash.isFunction)(disabled) && !(0, _lodash.isFunction)(required) && !(0, _lodash.isFunction)(rules) && !(0, _lodash.isFunction)(fieldProps) && !(0, _lodash.isFunction)(originComponent)) {
     return {
       shouldUpdate: _shouldUpdate,
       show: show,
@@ -126,9 +127,22 @@ var useShouldUpdate = function useShouldUpdate(props) {
   } else {
     fieldPropsRef.current = fieldProps;
   }
+  if (dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) {
+    dependNamesRef.current = dependNames.map(function (name) {
+      return (0, _lodash.get)(values, name);
+    });
+  }
   return {
     shouldUpdate: function shouldUpdate(prevValues, currentValues) {
       // @ts-ignore formList场景取当前行数据，不取shouldUpdate变更后值
+      if (dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) {
+        var curDependNamesValue = dependNames.map(function (name) {
+          return (0, _lodash.get)(currentValues, name);
+        });
+        var dependNamesChanged = !(0, _lodash.isEqualWith)(dependNamesRef.current, curDependNamesValue, _index.customEqualForFun);
+        dependNamesRef.current = curDependNamesValue;
+        if (!dependNamesChanged) return false;
+      }
       var _currentValues;
       if (namePath) {
         // formList场景values取当前行数据
@@ -189,11 +203,12 @@ var useShouldUpdate = function useShouldUpdate(props) {
       }
       var equalRes = (0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.customEqualForFun);
       var proEqualRes = (0, _lodash.isEqualWith)(fieldPropsRef.current, _fieldProps, _index.customEqualForFun);
-      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !equalRes || !proEqualRes ||
+      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !equalRes || !proEqualRes
       // 值变更，需要同步更新函数式的fieldProps
       // (isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) && !isEqual(prevValues, currentValues)) ||
       // !isEqualWith(originComponentRef.current, _component, customEqualForFun) ||
-      (0, _index.equalDependencies)(dependencies, prevValues, _currentValues)) {
+      // equalDependencies(dependencies, prevValues, _currentValues)
+      ) {
         showRef.current = _show;
         disabledRef.current = _disabled;
         requiredRef.current = _required;

package/lib/ProTable/index.js

@@ -37,7 +37,7 @@ var defaultPage = exports.defaultPage = {
   pageSize: 10
 };
 function ProTable(props) {
-  var _locale$ProTable, _curTableConfig$pathK;
+  var _locale$ProTable, _props$scroll, _curTableConfig$pathK;
   var _ref = (0, _index.useProConfig)('globalConfig') || {},
     configStorage = _ref.storage; // 获取全局缓存位置配置
   var _ref2 = (0, _index.useProConfig)('ProTable') || {},
@@ -65,6 +65,9 @@ function ProTable(props) {
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _props$scrollFollowPa = props.scrollFollowParent,
     scrollFollowParent = _props$scrollFollowPa === void 0 ? true : _props$scrollFollowPa;
+  var _scroll = (_props$scroll = props === null || props === void 0 ? void 0 : props.scroll) !== null && _props$scroll !== void 0 ? _props$scroll : {
+    x: 'max-content'
+  };
   var wrapToolTipProps = {
     getPopupContainer: scrollFollowParent ? function (triggerNode) {
       return triggerNode.parentNode;
@@ -422,7 +425,8 @@ function ProTable(props) {
             summary: summary,
             dataSource: _dataSource
           },
-          dataSource: _dataSource
+          dataSource: _dataSource,
+          scroll: _scroll
         })), (0, _jsxRuntime.jsx)("span", {
           className: "pro-table-resizable-line",
           style: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.8.2-beta.1",
+  "version": "3.8.2-beta.3",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -49,7 +49,8 @@
     "Android >= 4"
   ],
   "resolutions": {
-    "@types/react": "^17.0.53"
+    "@types/react": "^17.0.53",
+    "mockjs/commander": "9.2.0"
   },
   "dependencies": {
     "@ant-design/icons": "^4.2.2",

package/.vscode/extensions.json

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