@zat-design/sisyphus-react 3.6.4-beta.13 → 3.6.4-beta.14

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

@@ -17,7 +17,7 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
 /* eslint-disable prefer-const */
 import React, { useCallback, useEffect } from 'react';
 import classNames from 'classnames';
-import { cloneDeep, isEqual, omit, isFunction, debounce } from 'lodash';
+import { cloneDeep, isEqual, debounce, omit, isFunction } from 'lodash';
 import valueTypeMap from '../../../ProForm/utils/valueType';
 import transformMap from '../../utils/transform';
 import { getNamePath, difference, getDisabled } from '../../utils/tools';
@@ -329,7 +329,7 @@ var RenderField = function RenderField(_ref) {
           }
           _args = [].concat(args);
           rowPath = [].concat(_toConsumableArray(namePath), [index]);
-          row = form.getFieldValue(rowPath, true);
+          row = form.getFieldValue(rowPath, true); // if (type === 'InputNumber' && column.name) row[column.name] = args[0];
           orgRow = cloneDeep(row);
           if (!onFieldChange) {
             _context.next = 20;
@@ -374,7 +374,7 @@ var RenderField = function RenderField(_ref) {
           return onChange.apply(void 0, _toConsumableArray(_args));
         case 29:
           // 判断属性是否变动
-          form.setFieldValue(rowPath, _objectSpread({}, row));
+          form.setFieldValue(rowPath, row);
           if (!isEqual(orgRow, row)) {
             diff = difference(row, orgRow) || {};
             validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
@@ -446,7 +446,7 @@ var RenderField = function RenderField(_ref) {
             return onBlur.apply(void 0, _toConsumableArray(_args));
           case 16:
             // 判断属性是否变动
-            form.setFieldValue(rowPath, _objectSpread({}, row));
+            form.setFieldValue(rowPath, row);
             if (!isEqual(orgRow, row)) {
               diff = difference(row, orgRow) || {};
               validateFieldKeys = (_Object$keys2 = Object.keys(diff)) === null || _Object$keys2 === void 0 ? void 0 : (_Object$keys2$map = _Object$keys2.map) === null || _Object$keys2$map === void 0 ? void 0 : _Object$keys2$map.call(_Object$keys2, function (key) {

package/es/ProForm/components/FormFooter/index.js

@@ -34,7 +34,7 @@ var FormFooter = function FormFooter(props) {
       form.setFieldsValue(cache[formId]);
     }
     return cache;
-  }, []);
+  }, [formId]);
   var _onOk = function _onOk() {
     if (formId) {
       var values = form.getFieldsValue();

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

@@ -5,7 +5,6 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { forwardRef, useCallback, useImperativeHandle } from 'react';
 import { DndContext } from '@dnd-kit/core';
-import { cloneDeep, isFunction } from 'lodash';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { toArray } from '../../../utils';
 import { namesPathTransform } from './utils';
@@ -56,10 +55,6 @@ var FormList = function FormList(props, ref) {
         listName: [].concat(_toConsumableArray(namePath), [item.name]),
         label: mode === 'less' ? undefined : item.label
       });
-      // 可编辑表格的columns需要消除引用关系，防止串数据
-      if (column.type === 'ProEditTable' && !isFunction(column.fieldProps)) {
-        column.fieldProps.columns = cloneDeep(column.fieldProps.columns);
-      }
       return column;
     });
   }, [columns]);

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

@@ -160,7 +160,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var defaultOptionRender = function defaultOptionRender(rowData) {
     return rowData === null || rowData === void 0 ? void 0 : rowData[labelKey];
   };
-  var handleFormat = optionRender || onFormat || defaultOptionRender;
+  var handleFormat = onFormat || defaultOptionRender;
   if (showCodeName) {
     handleFormat = function handleFormat(_ref5) {
       var value = _ref5.value,
@@ -681,6 +681,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       showCodeName: showCodeName,
       labelInValue: labelInValue,
       dataSource: options,
+      optionRender: optionRender,
       scrollFollowParent: false,
       mode: isMultiple ? 'multiple' : undefined,
       onFocus: function onFocus() {

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

@@ -332,7 +332,7 @@ var RenderField = function RenderField(_ref) {
           }
           _args = [].concat(args);
           rowPath = [].concat((0, _toConsumableArray2.default)(namePath), [index]);
-          row = form.getFieldValue(rowPath, true);
+          row = form.getFieldValue(rowPath, true); // if (type === 'InputNumber' && column.name) row[column.name] = args[0];
           orgRow = (0, _lodash.cloneDeep)(row);
           if (!onFieldChange) {
             _context.next = 20;
@@ -377,7 +377,7 @@ var RenderField = function RenderField(_ref) {
           return onChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
         case 29:
           // 判断属性是否变动
-          form.setFieldValue(rowPath, (0, _objectSpread2.default)({}, row));
+          form.setFieldValue(rowPath, row);
           if (!(0, _lodash.isEqual)(orgRow, row)) {
             diff = (0, _tools.difference)(row, orgRow) || {};
             validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
@@ -449,7 +449,7 @@ var RenderField = function RenderField(_ref) {
             return onBlur.apply(void 0, (0, _toConsumableArray2.default)(_args));
           case 16:
             // 判断属性是否变动
-            form.setFieldValue(rowPath, (0, _objectSpread2.default)({}, row));
+            form.setFieldValue(rowPath, row);
             if (!(0, _lodash.isEqual)(orgRow, row)) {
               diff = (0, _tools.difference)(row, orgRow) || {};
               validateFieldKeys = (_Object$keys2 = Object.keys(diff)) === null || _Object$keys2 === void 0 ? void 0 : (_Object$keys2$map = _Object$keys2.map) === null || _Object$keys2$map === void 0 ? void 0 : _Object$keys2$map.call(_Object$keys2, function (key) {

package/lib/ProForm/components/FormFooter/index.js

@@ -38,7 +38,7 @@ var FormFooter = function FormFooter(props) {
       form.setFieldsValue(cache[formId]);
     }
     return cache;
-  }, []);
+  }, [formId]);
   var _onOk = function _onOk() {
     if (formId) {
       var values = form.getFieldsValue();

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

@@ -11,7 +11,6 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _antd = require("antd");
 var _core = require("@dnd-kit/core");
-var _lodash = require("lodash");
 var _sortable = require("@dnd-kit/sortable");
 var _utils = require("../../../utils");
 var _utils2 = require("./utils");
@@ -62,10 +61,6 @@ var FormList = function FormList(props, ref) {
         listName: [].concat((0, _toConsumableArray2.default)(namePath), [item.name]),
         label: mode === 'less' ? undefined : item.label
       });
-      // 可编辑表格的columns需要消除引用关系，防止串数据
-      if (column.type === 'ProEditTable' && !(0, _lodash.isFunction)(column.fieldProps)) {
-        column.fieldProps.columns = (0, _lodash.cloneDeep)(column.fieldProps.columns);
-      }
       return column;
     });
   }, [columns]);

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

@@ -157,7 +157,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var defaultOptionRender = function defaultOptionRender(rowData) {
     return rowData === null || rowData === void 0 ? void 0 : rowData[labelKey];
   };
-  var handleFormat = optionRender || onFormat || defaultOptionRender;
+  var handleFormat = onFormat || defaultOptionRender;
   if (showCodeName) {
     handleFormat = function handleFormat(_ref5) {
       var value = _ref5.value,
@@ -678,6 +678,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       showCodeName: showCodeName,
       labelInValue: labelInValue,
       dataSource: options,
+      optionRender: optionRender,
       scrollFollowParent: false,
       mode: isMultiple ? 'multiple' : undefined,
       onFocus: function onFocus() {

package/package.json

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