@zat-design/sisyphus-react 3.7.3-beta.17 → 3.7.3-beta.19

package/es/ProEditTable/components/RenderField/index.js

@@ -510,7 +510,7 @@ var RenderField = function RenderField(_ref) {
       form: form,
       names: names,
       namePath: [].concat(_toConsumableArray(namePath), [index]),
-      name: cellName,
+      name: originalName,
       listName: cellName,
       viewEmpty: viewEmpty,
       valueType: _valueType,

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

@@ -27,7 +27,7 @@ import { SearchOutlined } from '@ant-design/icons';
 import { useDeepCompareEffect, useMount, useSetState } from 'ahooks';
 import { debounce, isArray, isEqual, isFunction, omit } from 'lodash';
 import { ReactSVG } from 'react-svg';
-import React, { forwardRef, useEffect, useImperativeHandle, useMemo } from 'react';
+import React, { forwardRef, useImperativeHandle, useMemo } from 'react';
 import { ProForm, ProDrawerForm, ProTable, useProConfig, ProSelect } from '../../../../index';
 import Container from '../../Container';
 import viewSvg from '../../../../assets/view.svg';
@@ -137,10 +137,10 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }, _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
       manual: true,
       onSuccess: function onSuccess(res) {
-        var _res$data;
+        var _res$data, _ref5;
         var list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list : res === null || res === void 0 ? void 0 : res.data;
         setState({
-          options: transformResponse ? transformResponse(res === null || res === void 0 ? void 0 : res.data) : list
+          options: (_ref5 = transformResponse ? transformResponse(res === null || res === void 0 ? void 0 : res.data) : list) !== null && _ref5 !== void 0 ? _ref5 : []
         });
       }
     })),
@@ -166,9 +166,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleFormat = onFormat || defaultOptionRender;
   if (showCodeName) {
-    handleFormat = function handleFormat(_ref5) {
-      var value = _ref5.value,
-        label = _ref5.label;
+    handleFormat = function handleFormat(_ref6) {
+      var value = _ref6.value,
+        label = _ref6.label;
       return "".concat(value, "-").concat(label);
     };
   }
@@ -237,7 +237,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     onChange(val, option);
   };
   var handleClick = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _yield$beforeOpen, res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -280,7 +280,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, _callee);
     }));
     return function handleClick() {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
   var handleClose = function handleClose() {
@@ -299,7 +299,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
   };
   var handleFinish = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -360,11 +360,11 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, _callee2, null, [[0, 18]]);
     }));
     return function handleFinish() {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
   var handleSearch = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var values;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -383,7 +383,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, _callee3);
     }));
     return function handleSearch() {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
   var _rowSelection = _objectSpread({
@@ -437,7 +437,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
       var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -495,12 +495,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, _callee4);
     }));
     return function getInitValues() {
-      return _ref9.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }();
   // 初始化回显，当传入initParams时，前端用来回险
   var getDefaultOneValues = /*#__PURE__*/function () {
-    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
       var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -548,7 +548,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, _callee5);
     }));
     return function getDefaultOneValues() {
-      return _ref10.apply(this, arguments);
+      return _ref11.apply(this, arguments);
     };
   }();
   useImperativeHandle(ref, function () {
@@ -579,7 +579,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       });
     }
   });
-  useEffect(function () {
+  useDeepCompareEffect(function () {
     if (onOff && !visible) {
       var _useRequest$options6;
       if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.manual) !== true) {
@@ -615,12 +615,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       setState(nextState);
     }
   }, [onOff, visible, value]);
-  useEffect(function () {
+  useDeepCompareEffect(function () {
     if (value && !visible && isInit && !readOnly) {
       getInitValues();
     }
-  }, [value, visible, isInit, useRequest]);
-  useEffect(function () {
+  }, [value, visible, isInit]);
+  useDeepCompareEffect(function () {
     if (value && !visible && readOnly) {
       var _options$some;
       var isHasValue = options === null || options === void 0 ? void 0 : (_options$some = options.some) === null || _options$some === void 0 ? void 0 : _options$some.call(options, function (item) {
@@ -647,7 +647,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, 300);
     }
   }, [value, options, visible, useRequest]);
-  useEffect(function () {
+  useDeepCompareEffect(function () {
     if (!value) {
       if (defaultOne) {
         getDefaultOneValues();
@@ -747,7 +747,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       children: customRender
     });
   }
-  useEffect(function () {
+  useDeepCompareEffect(function () {
     if (isTooltip && value) {
       var dom = document.getElementById(uuid);
       dom.addEventListener('mouseover', function (e) {
@@ -784,7 +784,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   }, [value, isTooltip]);
   useDeepCompareEffect(function () {
     setState({
-      options: tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource
+      options: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource) || []
     });
   }, [tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource]);
   // 当搜索条件只有一个时，且为输入框，默认设置suffix

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

@@ -32,7 +32,6 @@ var ChangedWrapper = function ChangedWrapper(props) {
     changeTipColor = diffConfig.changeTipColor,
     addTipColor = diffConfig.addTipColor;
   var toolTip = (_diffConfig$toolTip = diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
-  // 不渲染tooltip
   var isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
   var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
     return get(originalValues, name);
@@ -57,7 +56,11 @@ var ChangedWrapper = function ChangedWrapper(props) {
     }, valuePropName, originalValue))) : undefined;
   }, [originalValue, children]);
   if (!isWatch || noChange) {
-    return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest));
+    // 嵌套子组件
+    var isNestedField = ['ProEditTable'].includes(type);
+    return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({
+      originalValues: isNestedField ? originalValues : undefined
+    }, children.props), rest));
   }
   var tipOpenCalc = function tipOpenCalc() {
     if (!toolTip) return false;

package/es/ProSelect/index.js

@@ -24,7 +24,6 @@ import './index.less';
 var Option = _Select.Option;
 export var ProSelect = function ProSelect(props, ref) {
   var _selectProps$showCode, _locale$ProSelect;
-  console.log('props11: ', props);
   var _ref = useProConfig('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
     proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,

package/lib/ProEditTable/components/RenderField/index.js

@@ -517,7 +517,7 @@ var RenderField = function RenderField(_ref) {
       form: form,
       names: names,
       namePath: [].concat((0, _toConsumableArray2.default)(namePath), [index]),
-      name: cellName,
+      name: originalName,
       listName: cellName,
       viewEmpty: viewEmpty,
       valueType: _valueType,

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

@@ -132,10 +132,10 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
       manual: true,
       onSuccess: function onSuccess(res) {
-        var _res$data;
+        var _res$data, _ref5;
         var list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list : res === null || res === void 0 ? void 0 : res.data;
         setState({
-          options: transformResponse ? transformResponse(res === null || res === void 0 ? void 0 : res.data) : list
+          options: (_ref5 = transformResponse ? transformResponse(res === null || res === void 0 ? void 0 : res.data) : list) !== null && _ref5 !== void 0 ? _ref5 : []
         });
       }
     })),
@@ -161,9 +161,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleFormat = onFormat || defaultOptionRender;
   if (showCodeName) {
-    handleFormat = function handleFormat(_ref5) {
-      var value = _ref5.value,
-        label = _ref5.label;
+    handleFormat = function handleFormat(_ref6) {
+      var value = _ref6.value,
+        label = _ref6.label;
       return "".concat(value, "-").concat(label);
     };
   }
@@ -232,7 +232,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     onChange(val, option);
   };
   var handleClick = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _yield$beforeOpen, res;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -275,7 +275,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, _callee);
     }));
     return function handleClick() {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
   var handleClose = function handleClose() {
@@ -294,7 +294,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
   };
   var handleFinish = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+    var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
       var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -355,11 +355,11 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, _callee2, null, [[0, 18]]);
     }));
     return function handleFinish() {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
   var handleSearch = /*#__PURE__*/function () {
-    var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
+    var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
       var values;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -378,7 +378,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, _callee3);
     }));
     return function handleSearch() {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
   var _rowSelection = (0, _objectSpread3.default)({
@@ -432,7 +432,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
-    var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
+    var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
       var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -490,12 +490,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, _callee4);
     }));
     return function getInitValues() {
-      return _ref9.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }();
   // 初始化回显，当传入initParams时，前端用来回险
   var getDefaultOneValues = /*#__PURE__*/function () {
-    var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
+    var _ref11 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
       var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
@@ -543,7 +543,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, _callee5);
     }));
     return function getDefaultOneValues() {
-      return _ref10.apply(this, arguments);
+      return _ref11.apply(this, arguments);
     };
   }();
   (0, _react.useImperativeHandle)(ref, function () {
@@ -574,7 +574,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       });
     }
   });
-  (0, _react.useEffect)(function () {
+  (0, _ahooks.useDeepCompareEffect)(function () {
     if (onOff && !visible) {
       var _useRequest$options6;
       if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.manual) !== true) {
@@ -610,12 +610,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       setState(nextState);
     }
   }, [onOff, visible, value]);
-  (0, _react.useEffect)(function () {
+  (0, _ahooks.useDeepCompareEffect)(function () {
     if (value && !visible && isInit && !readOnly) {
       getInitValues();
     }
-  }, [value, visible, isInit, useRequest]);
-  (0, _react.useEffect)(function () {
+  }, [value, visible, isInit]);
+  (0, _ahooks.useDeepCompareEffect)(function () {
     if (value && !visible && readOnly) {
       var _options$some;
       var isHasValue = options === null || options === void 0 ? void 0 : (_options$some = options.some) === null || _options$some === void 0 ? void 0 : _options$some.call(options, function (item) {
@@ -642,7 +642,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, 300);
     }
   }, [value, options, visible, useRequest]);
-  (0, _react.useEffect)(function () {
+  (0, _ahooks.useDeepCompareEffect)(function () {
     if (!value) {
       if (defaultOne) {
         getDefaultOneValues();
@@ -742,7 +742,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       children: customRender
     });
   }
-  (0, _react.useEffect)(function () {
+  (0, _ahooks.useDeepCompareEffect)(function () {
     if (isTooltip && value) {
       var dom = document.getElementById(uuid);
       dom.addEventListener('mouseover', function (e) {
@@ -779,7 +779,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   }, [value, isTooltip]);
   (0, _ahooks.useDeepCompareEffect)(function () {
     setState({
-      options: tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource
+      options: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource) || []
     });
   }, [tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource]);
   // 当搜索条件只有一个时，且为输入框，默认设置suffix

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

@@ -37,7 +37,6 @@ var ChangedWrapper = function ChangedWrapper(props) {
     changeTipColor = diffConfig.changeTipColor,
     addTipColor = diffConfig.addTipColor;
   var toolTip = (_diffConfig$toolTip = diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
-  // 不渲染tooltip
   var isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
   var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
     return (0, _lodash.get)(originalValues, name);
@@ -62,7 +61,11 @@ var ChangedWrapper = function ChangedWrapper(props) {
     }, valuePropName, originalValue))) : undefined;
   }, [originalValue, children]);
   if (!isWatch || noChange) {
-    return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest));
+    // 嵌套子组件
+    var isNestedField = ['ProEditTable'].includes(type);
+    return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({
+      originalValues: isNestedField ? originalValues : undefined
+    }, children.props), rest));
   }
   var tipOpenCalc = function tipOpenCalc() {
     if (!toolTip) return false;

package/lib/ProSelect/index.js

@@ -25,7 +25,6 @@ var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames"
 var Option = _antd.Select.Option;
 var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
   var _selectProps$showCode, _locale$ProSelect;
-  console.log('props11: ', props);
   var _ref = (0, _ProConfigProvider.useProConfig)('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
     proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,

package/package.json

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