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

package/dist/index.esm.css

@@ -1387,7 +1387,6 @@
   content: '';
 }
 .pro-layout.pro-layout-light .pro-layout-open-menu .ant-menu-item-selected {
-  padding-right: 16px;
   background: transparent !important;
 }
 .pro-layout.pro-layout-light .pro-layout-open-menu .ant-menu-item-selected::after {
@@ -2024,7 +2023,6 @@
   height: 100%;
 }
 .pro-table .ant-table .ant-table-thead > tr > th {
-  white-space: nowrap;
   background: var(--zaui-table-header-bg, #f2f3f5);
   border-bottom: 0;
 }
@@ -4433,7 +4431,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-edit-table .ant-table-thead > tr > th {
   border: 0;
-  white-space: nowrap;
   background-color: var(--zaui-table-header-bg, #f2f3f5);
 }
 .pro-edit-table .ant-table-thead > tr > th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan])::before {

package/dist/less.esm.css

@@ -1387,7 +1387,6 @@
   content: '';
 }
 .pro-layout.pro-layout-light .pro-layout-open-menu .ant-menu-item-selected {
-  padding-right: 16px;
   background: transparent !important;
 }
 .pro-layout.pro-layout-light .pro-layout-open-menu .ant-menu-item-selected::after {
@@ -2024,7 +2023,6 @@
   height: 100%;
 }
 .pro-table .ant-table .ant-table-thead > tr > th {
-  white-space: nowrap;
   background: var(--zaui-table-header-bg, #f2f3f5);
   border-bottom: 0;
 }
@@ -4433,7 +4431,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-edit-table .ant-table-thead > tr > th {
   border: 0;
-  white-space: nowrap;
   background-color: var(--zaui-table-header-bg, #f2f3f5);
 }
 .pro-edit-table .ant-table-thead > tr > th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan])::before {

package/es/ProEditTable/style/index.less

@@ -206,7 +206,6 @@
 
   .@{ant-prefix}-table-thead>tr>th {
     border          : 0;
-    white-space     : nowrap;
     background-color: var(--zaui-table-header-bg, #f2f3f5);
   }
 

package/es/ProEditTable/utils/config.js

@@ -168,7 +168,7 @@ export var actions = {
   add: function () {
     var _add = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
       var _tableRef$current$que, _tableRef$current$que2;
-      var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, nextData, rowKey, addData, nextEditingKeys;
+      var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, nextData, rowKey, addData, nextEditingKeys, _obj, obj;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -194,23 +194,27 @@ export var actions = {
             if (virtualKey) {
               nextEditingKeys = _toConsumableArray(editingKeys); // 开启编辑状态
               nextEditingKeys.push(rowKey);
-              form.setFieldValue(virtualName, nextData);
+              _obj = {};
+              set(_obj, virtualName, nextData);
+              form.setFieldsValue(_obj);
               setState({
                 editingKeys: nextEditingKeys
               });
             }
-            form.setFieldValue(name, nextData);
+            obj = {};
+            set(obj, name, nextData);
+            form.setFieldsValue(obj);
             (_tableRef$current$que = tableRef.current.querySelector(".".concat(prefixCls, "-table-body"))) === null || _tableRef$current$que === void 0 ? void 0 : (_tableRef$current$que2 = _tableRef$current$que.scrollTo) === null || _tableRef$current$que2 === void 0 ? void 0 : _tableRef$current$que2.call(_tableRef$current$que, {
               top: insertType === 'before' ? -10000 : 10000,
               behavior: 'smooth'
             });
             if (!virtualKey) {
-              _context2.next = 15;
+              _context2.next = 17;
               break;
             }
-            _context2.next = 15;
+            _context2.next = 17;
             return form.validateFields([name]);
-          case 15:
+          case 17:
           case "end":
             return _context2.stop();
         }

package/es/ProEditTable/utils/index.js

@@ -13,7 +13,7 @@ var _excluded = ["type", "label", "show", "needConfirm", "onHandle", "onClick"],
   _excluded2 = ["title", "icon"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
-import { cloneDeep, cloneDeepWith, isArray, isBoolean, isEqual } from 'lodash';
+import { cloneDeepWith, isArray, isBoolean, isEqual } from 'lodash';
 import classnames from 'classnames';
 import { ReactSVG } from 'react-svg';
 import { tools } from '@zat-design/utils';
@@ -284,7 +284,7 @@ export var transformColumns = function transformColumns() {
         if (!(_cacheMap === null || _cacheMap === void 0 ? void 0 : (_cacheMap$item$dataIn = _cacheMap[item.dataIndex]) === null || _cacheMap$item$dataIn === void 0 ? void 0 : (_cacheMap$item$dataIn2 = _cacheMap$item$dataIn.dataSource) === null || _cacheMap$item$dataIn2 === void 0 ? void 0 : _cacheMap$item$dataIn2.length)) {
           var _item$fieldProps, _item$fieldProps2;
           _cacheMap[item.dataIndex] = {
-            useRequest: cloneDeep((_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.useRequest),
+            useRequest: (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.useRequest,
             dataSource: [],
             transformResponse: (_item$fieldProps2 = item.fieldProps) === null || _item$fieldProps2 === void 0 ? void 0 : _item$fieldProps2.transformResponse
           };

package/es/ProEditTable/utils/tools.js

@@ -1,6 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import React from 'react';
-import { cloneDeep, cloneDeepWith, isString, isObject, isEqual, transform, isFunction, isBoolean } from 'lodash';
+import { cloneDeep, cloneDeepWith, isString, isObject, isEqual, transform, isFunction, isBoolean, set } from 'lodash';
 export var getRandom = function getRandom() {
   return Math.random().toString(36).slice(-6);
 };
@@ -61,7 +61,9 @@ export var onDelete = function onDelete(_ref) {
   dataSource = dataSource.filter(function (row) {
     return !selectedRowKeys.includes(row.rowKey);
   });
-  form.setFieldValue(name, dataSource);
+  var obj = {};
+  set(obj, name, dataSource);
+  form.setFieldsValue(obj);
   // 单行模式数据流处理 重置中间正在编辑状态单行数据
   if (virtualKey) {
     var _virtualList;
@@ -71,7 +73,9 @@ export var onDelete = function onDelete(_ref) {
       virtualList = virtualList.filter(function (row) {
         return !selectedRowKeys.includes(row.rowKey);
       });
-      form.setFieldValue(namePath, virtualList);
+      var _obj = {};
+      set(_obj, namePath, virtualList);
+      form.setFieldsValue(_obj);
     }
   }
 };

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

@@ -9,6 +9,7 @@ import _Spin from "antd/es/spin";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/message/style";
 import _message from "antd/es/message";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
@@ -24,7 +25,7 @@ var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames",
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { SearchOutlined } from '@ant-design/icons';
 import { useDeepCompareEffect, useMount, useSetState } from 'ahooks';
-import { cloneDeep, debounce, isArray, isEqual, isFunction, omit } from 'lodash';
+import { debounce, isArray, isEqual, isFunction, omit } from 'lodash';
 import { ReactSVG } from 'react-svg';
 import React, { forwardRef, useEffect, useImperativeHandle, useMemo } from 'react';
 import { ProForm, ProDrawerForm, ProTable, useProConfig, ProSelect } from '../../../../index';
@@ -409,8 +410,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
     if (record === null || record === void 0 ? void 0 : record.disabled) return;
     var selectedValue = getRowKey(record);
-    var tempSelectedRows = cloneDeep(selectedRows);
-    var tempSelectedRowKeys = cloneDeep(selectedRowKeys);
+    var tempSelectedRows = _toConsumableArray(selectedRows);
+    var tempSelectedRowKeys = _toConsumableArray(selectedRowKeys);
     if (isMultiple) {
       var rowIndex = tempSelectedRows.findIndex(function (item) {
         return getRowKey(item) === selectedValue;

package/es/ProLayout/style/index.less

@@ -242,7 +242,6 @@
     }
 
     .pro-layout-open-menu .@{ant-prefix}-menu-item-selected {
-      padding-right: 16px;
       &::after {
         display: none;
       }

package/es/ProTable/components/RcTable/components/BaseTable/index.js

@@ -25,7 +25,6 @@ var BaseTable = function BaseTable(_ref) {
     return null;
   };
   return _jsx(_Table, _objectSpread(_objectSpread({
-    className: "pro-edit-table-drag",
     components: renderComponents(),
     columns: columns,
     locale: {

package/es/ProTable/components/RcTable/components/DraggableTable/index.js

@@ -8,7 +8,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * @Author: za-xuwenli xuwenli@zhongan.io
  * @Date: 2024-08-09 13:48:59
  * @LastEditors: za-xuwenli xuwenli@zhongan.io
- * @LastEditTime: 2024-08-20 19:31:24
+ * @LastEditTime: 2024-08-27 15:27:44
  * @FilePath: /za-material-warehouse/src/ProTable/components/RcTable/components/DraggableTable/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */

package/es/ProTable/components/RenderFooter/index.js

@@ -1,9 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 var RenderFooter = function RenderFooter(props) {
   var _ref = props || {},
-    footerRender = _ref.footerRender,
-    pagination = _ref.pagination,
-    _dataSource = _ref._dataSource;
+    dataSource = _ref.dataSource;
+  var _ref2 = dataSource || {},
+    footerRender = _ref2.footerRender,
+    pagination = _ref2.pagination,
+    _dataSource = _ref2._dataSource;
   return footerRender ? _jsx("div", {
     className: "pro-table-footer ".concat(pagination && !!(_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.length) ? 'has-page' : 'no-page'),
     children: typeof footerRender === 'function' ? footerRender() : footerRender

package/es/ProTable/style/index.less

@@ -403,7 +403,6 @@
   }
 
   .@{ant-prefix}-table .@{ant-prefix}-table-thead > tr > th {
-    white-space: nowrap;
     background: var(--zaui-table-header-bg, #f2f3f5);
     border-bottom: 0;
 
@@ -558,4 +557,4 @@
       }
     }
   }
-}
+}

package/lib/ProEditTable/style/index.less

@@ -206,7 +206,6 @@
 
   .@{ant-prefix}-table-thead>tr>th {
     border          : 0;
-    white-space     : nowrap;
     background-color: var(--zaui-table-header-bg, #f2f3f5);
   }
 

package/lib/ProEditTable/utils/config.js

@@ -174,7 +174,7 @@ var actions = exports.actions = {
   add: function () {
     var _add = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref5) {
       var _tableRef$current$que, _tableRef$current$que2;
-      var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, nextData, rowKey, addData, nextEditingKeys;
+      var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, nextData, rowKey, addData, nextEditingKeys, _obj, obj;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -200,23 +200,27 @@ var actions = exports.actions = {
             if (virtualKey) {
               nextEditingKeys = (0, _toConsumableArray2.default)(editingKeys); // 开启编辑状态
               nextEditingKeys.push(rowKey);
-              form.setFieldValue(virtualName, nextData);
+              _obj = {};
+              (0, _lodash.set)(_obj, virtualName, nextData);
+              form.setFieldsValue(_obj);
               setState({
                 editingKeys: nextEditingKeys
               });
             }
-            form.setFieldValue(name, nextData);
+            obj = {};
+            (0, _lodash.set)(obj, name, nextData);
+            form.setFieldsValue(obj);
             (_tableRef$current$que = tableRef.current.querySelector(".".concat(prefixCls, "-table-body"))) === null || _tableRef$current$que === void 0 ? void 0 : (_tableRef$current$que2 = _tableRef$current$que.scrollTo) === null || _tableRef$current$que2 === void 0 ? void 0 : _tableRef$current$que2.call(_tableRef$current$que, {
               top: insertType === 'before' ? -10000 : 10000,
               behavior: 'smooth'
             });
             if (!virtualKey) {
-              _context2.next = 15;
+              _context2.next = 17;
               break;
             }
-            _context2.next = 15;
+            _context2.next = 17;
             return form.validateFields([name]);
-          case 15:
+          case 17:
           case "end":
             return _context2.stop();
         }

package/lib/ProEditTable/utils/index.js

@@ -288,7 +288,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
         if (!(_cacheMap === null || _cacheMap === void 0 ? void 0 : (_cacheMap$item$dataIn = _cacheMap[item.dataIndex]) === null || _cacheMap$item$dataIn === void 0 ? void 0 : (_cacheMap$item$dataIn2 = _cacheMap$item$dataIn.dataSource) === null || _cacheMap$item$dataIn2 === void 0 ? void 0 : _cacheMap$item$dataIn2.length)) {
           var _item$fieldProps, _item$fieldProps2;
           _cacheMap[item.dataIndex] = {
-            useRequest: (0, _lodash.cloneDeep)((_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.useRequest),
+            useRequest: (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.useRequest,
             dataSource: [],
             transformResponse: (_item$fieldProps2 = item.fieldProps) === null || _item$fieldProps2 === void 0 ? void 0 : _item$fieldProps2.transformResponse
           };

package/lib/ProEditTable/utils/tools.js

@@ -69,7 +69,9 @@ var onDelete = exports.onDelete = function onDelete(_ref) {
   dataSource = dataSource.filter(function (row) {
     return !selectedRowKeys.includes(row.rowKey);
   });
-  form.setFieldValue(name, dataSource);
+  var obj = {};
+  (0, _lodash.set)(obj, name, dataSource);
+  form.setFieldsValue(obj);
   // 单行模式数据流处理 重置中间正在编辑状态单行数据
   if (virtualKey) {
     var _virtualList;
@@ -79,7 +81,9 @@ var onDelete = exports.onDelete = function onDelete(_ref) {
       virtualList = virtualList.filter(function (row) {
         return !selectedRowKeys.includes(row.rowKey);
       });
-      form.setFieldValue(namePath, virtualList);
+      var _obj = {};
+      (0, _lodash.set)(_obj, namePath, virtualList);
+      form.setFieldsValue(_obj);
     }
   }
 };

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -404,8 +405,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
     if (record === null || record === void 0 ? void 0 : record.disabled) return;
     var selectedValue = getRowKey(record);
-    var tempSelectedRows = (0, _lodash.cloneDeep)(selectedRows);
-    var tempSelectedRowKeys = (0, _lodash.cloneDeep)(selectedRowKeys);
+    var tempSelectedRows = (0, _toConsumableArray2.default)(selectedRows);
+    var tempSelectedRowKeys = (0, _toConsumableArray2.default)(selectedRowKeys);
     if (isMultiple) {
       var rowIndex = tempSelectedRows.findIndex(function (item) {
         return getRowKey(item) === selectedValue;

package/lib/ProLayout/style/index.less

@@ -242,7 +242,6 @@
     }
 
     .pro-layout-open-menu .@{ant-prefix}-menu-item-selected {
-      padding-right: 16px;
       &::after {
         display: none;
       }

package/lib/ProTable/components/RcTable/components/BaseTable/index.js

@@ -31,7 +31,6 @@ var BaseTable = function BaseTable(_ref) {
     return null;
   };
   return (0, _jsxRuntime.jsx)(_antd.Table, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-    className: "pro-edit-table-drag",
     components: renderComponents(),
     columns: columns,
     locale: {

package/lib/ProTable/components/RcTable/components/DraggableTable/index.js

@@ -19,7 +19,7 @@ var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "
  * @Author: za-xuwenli xuwenli@zhongan.io
  * @Date: 2024-08-09 13:48:59
  * @LastEditors: za-xuwenli xuwenli@zhongan.io
- * @LastEditTime: 2024-08-20 19:31:24
+ * @LastEditTime: 2024-08-27 15:27:44
  * @FilePath: /za-material-warehouse/src/ProTable/components/RcTable/components/DraggableTable/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */

package/lib/ProTable/components/RenderFooter/index.js

@@ -7,9 +7,11 @@ exports.default = void 0;
 var _jsxRuntime = require("react/jsx-runtime");
 var RenderFooter = function RenderFooter(props) {
   var _ref = props || {},
-    footerRender = _ref.footerRender,
-    pagination = _ref.pagination,
-    _dataSource = _ref._dataSource;
+    dataSource = _ref.dataSource;
+  var _ref2 = dataSource || {},
+    footerRender = _ref2.footerRender,
+    pagination = _ref2.pagination,
+    _dataSource = _ref2._dataSource;
   return footerRender ? (0, _jsxRuntime.jsx)("div", {
     className: "pro-table-footer ".concat(pagination && !!(_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.length) ? 'has-page' : 'no-page'),
     children: typeof footerRender === 'function' ? footerRender() : footerRender

package/lib/ProTable/style/index.less

@@ -403,7 +403,6 @@
   }
 
   .@{ant-prefix}-table .@{ant-prefix}-table-thead > tr > th {
-    white-space: nowrap;
     background: var(--zaui-table-header-bg, #f2f3f5);
     border-bottom: 0;
 
@@ -558,4 +557,4 @@
       }
     }
   }
-}
+}

package/package.json

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