@zat-design/sisyphus-react 4.0.0-beta.2 → 4.0.0-beta.3

package/es/ProEditTable/components/RcTable/DraggableTable.js

@@ -1,15 +1,16 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _isNumber from "lodash/isNumber";
 var _excluded = ["disabled", "children"],
   _excluded2 = ["tableProps", "draggableProps"];
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Table } from 'antd';
 import React, { memo, useCallback } from 'react';
 import { DndContext } from '@dnd-kit/core';
+import { isNumber } from 'lodash';
 import { arrayMove, useSortable, SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
-import ProIcon from '../../../ProIcon';
+import ProIcon from "../../../ProIcon";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var Row = function Row(props) {
   var disabled = props.disabled,
     children = props.children,
@@ -33,7 +34,7 @@ var Row = function Row(props) {
     position: 'relative',
     zIndex: 2
   } : {});
-  return _jsx("tr", _objectSpread(_objectSpread(_objectSpread({}, restProps), {}, {
+  return /*#__PURE__*/_jsx("tr", _objectSpread(_objectSpread(_objectSpread({}, restProps), {}, {
     ref: setNodeRef,
     style: style
   }, attributes), {}, {
@@ -46,9 +47,9 @@ var Row = function Row(props) {
           renderIndex = _ref.renderIndex;
         var isDrag = restProps['data-row-draggable'] ? (_restProps$dataRowD = restProps['data-row-draggable']) === null || _restProps$dataRowD === void 0 ? void 0 : _restProps$dataRowD.call(restProps, record) : true;
         return /*#__PURE__*/React.cloneElement(child, {
-          children: _jsxs("span", {
+          children: /*#__PURE__*/_jsxs("span", {
             className: "drag-wrapper".concat(props['data-hide'] ? ' no-check' : ''),
-            children: [isDrag ? _jsx(ProIcon, _objectSpread({
+            children: [isDrag ? /*#__PURE__*/_jsx(ProIcon, _objectSpread({
               className: "drag-icon",
               style: {
                 touchAction: 'none',
@@ -56,7 +57,7 @@ var Row = function Row(props) {
               },
               type: "drag",
               size: 20
-            }, listeners)) : _jsx(ProIcon, {
+            }, listeners)) : /*#__PURE__*/_jsx(ProIcon, {
               size: 20
             }), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
           })
@@ -94,10 +95,10 @@ var DndWrapper = function DndWrapper(_ref2) {
       onChange(nextValue);
     }
   };
-  return draggable && !disabled ? _jsx(DndContext, {
+  return draggable && !disabled ? /*#__PURE__*/_jsx(DndContext, {
     onDragEnd: onDragEndtInside,
-    children: _jsx(SortableContext, {
-      items: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value.map(function (i) {
+    children: /*#__PURE__*/_jsx(SortableContext, {
+      items: value !== null && value !== void 0 && (_value$ = value[0]) !== null && _value$ !== void 0 && _value$.rowKey ? value.map(function (i) {
         return i.rowKey;
       }) : [],
       strategy: verticalListSortingStrategy,
@@ -135,18 +136,18 @@ var DraggableTable = function DraggableTable(_ref3) {
     draggable = draggableProps.draggable,
     onDragEnd = draggableProps.onDragEnd;
   var getScroll = useCallback(function () {
-    if ((scroll === null || scroll === void 0 ? void 0 : scroll.x) && (scroll === null || scroll === void 0 ? void 0 : scroll.y)) {
+    if (scroll !== null && scroll !== void 0 && scroll.x && scroll !== null && scroll !== void 0 && scroll.y) {
       return {
         x: scroll === null || scroll === void 0 ? void 0 : scroll.x,
         y: Number(scroll === null || scroll === void 0 ? void 0 : scroll.y)
       };
     }
-    if ((scroll === null || scroll === void 0 ? void 0 : scroll.x) && !_isNumber(scroll === null || scroll === void 0 ? void 0 : scroll.y)) {
+    if (scroll !== null && scroll !== void 0 && scroll.x && !isNumber(scroll === null || scroll === void 0 ? void 0 : scroll.y)) {
       return {
         x: scroll === null || scroll === void 0 ? void 0 : scroll.x
       };
     }
-    if ((scroll === null || scroll === void 0 ? void 0 : scroll.y) && !(scroll === null || scroll === void 0 ? void 0 : scroll.x)) {
+    if (scroll !== null && scroll !== void 0 && scroll.y && !(scroll !== null && scroll !== void 0 && scroll.x)) {
       return {
         y: Number(scroll === null || scroll === void 0 ? void 0 : scroll.y)
       };
@@ -171,7 +172,7 @@ var DraggableTable = function DraggableTable(_ref3) {
         onClick: function onClick() {}
       };
     },
-    dataSource: (value === null || value === void 0 ? void 0 : (_value$2 = value[0]) === null || _value$2 === void 0 ? void 0 : _value$2.rowKey) ? value : []
+    dataSource: value !== null && value !== void 0 && (_value$2 = value[0]) !== null && _value$2 !== void 0 && _value$2.rowKey ? value : []
   }, resetProps), {}, {
     rowKey: rowKey || 'rowKey',
     pagination: pagination ? _objectSpread({
@@ -183,7 +184,7 @@ var DraggableTable = function DraggableTable(_ref3) {
       showTotal: function showTotal(total) {
         var _locale$ProEditTable;
         if (!total) return;
-        return formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProEditTable = locale.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
+        return formatMessage(locale === null || locale === void 0 || (_locale$ProEditTable = locale.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
           total: total
         });
       },
@@ -192,17 +193,17 @@ var DraggableTable = function DraggableTable(_ref3) {
     scroll: getScroll(),
     summary: summary
   });
-  return _jsxs(DndWrapper, {
+  return /*#__PURE__*/_jsxs(DndWrapper, {
     value: value,
     onChange: onChange,
     onDrag: onDrag,
     onDragEnd: onDragEnd,
     disabled: disabled,
     draggable: draggable,
-    children: [headerRender ? _jsx("div", {
+    children: [headerRender ? /*#__PURE__*/_jsx("div", {
       className: "pro-edit-table-header",
       children: typeof headerRender === 'function' ? headerRender() : headerRender
-    }) : null, _jsx(Table, _objectSpread({
+    }) : null, /*#__PURE__*/_jsx(Table, _objectSpread({
       ref: tableRef
     }, nextTableProps))]
   });

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

@@ -1,4 +1,4 @@
 /** 基础表格 */
-export { default as BaseTable } from './BaseTable';
+export { default as BaseTable } from "./BaseTable";
 /** 拖拽表格 */
-export { default as DraggableTable } from './DraggableTable';
+export { default as DraggableTable } from "./DraggableTable";

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

@@ -1,15 +1,16 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _get from "lodash/get";
 var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "onDiff", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useMemo } from 'react';
 import { Space, Tooltip } from 'antd';
 import classnames from 'classnames';
-import { diffOriginal } from '../../utils/diffOriginal';
-import { useProConfig } from '../../../ProConfigProvider';
-import { isEmpty } from '../../../utils';
+import { get } from 'lodash';
+import { diffOriginal } from "../../utils/diffOriginal";
+import { useProConfig } from "../../../ProConfigProvider";
+import { isEmpty } from "../../../utils";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
     return name;
@@ -35,26 +36,28 @@ var getOriginalValue = function getOriginalValue(_ref) {
   if (rowKeyPath) {
     var rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1); // 表单中变动值所在行
     var rowKeyName = rowKeyPath[rowKeyPath.length - 1]; // rowKey在行内的name
+
     var rowValue = form.getFieldValue(rowValueNamePath);
     if (!rowValue) return undefined;
     var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
     if (!keyValue) return undefined;
-    var originalValueList = _get(originalValues, originalName.slice(0, rowKeyPath.length - 2));
+    var originalValueList = get(originalValues, originalName.slice(0, rowKeyPath.length - 2));
     originRecord = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(function (item) {
       return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
     });
     var originalValue;
-    if (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) {
+    if (originalNames !== null && originalNames !== void 0 && originalNames.length) {
       var originalNamesValue = originalNames.map(function (originalName) {
-        return _get(originRecord, originalName.slice(rowKeyPath.length - 1));
+        return get(originRecord, originalName.slice(rowKeyPath.length - 1));
       });
+
       // 有可能出现数组中全是undefined的情况  视为没有值
       var fillUndefined = originalNamesValue.every(function (valItem) {
         return valItem === undefined;
       });
       originalValue = fillUndefined ? undefined : originalNamesValue;
     } else {
-      originalValue = _get(originRecord, originalName.slice(rowKeyPath.length - 1));
+      originalValue = get(originRecord, originalName.slice(rowKeyPath.length - 1));
     }
     return {
       originalValue: originalValue,
@@ -62,11 +65,12 @@ var getOriginalValue = function getOriginalValue(_ref) {
       record: rowValue
     };
   }
+
   // 这个方法是给editTable专用的  暂时不存在不传rowKey的情况
   return {
-    originalValue: (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
-      return _get(originalValues, originalName);
-    }) : _get(originalValues, originalName),
+    originalValue: originalNames !== null && originalNames !== void 0 && originalNames.length ? originalNames.map(function (originalName) {
+      return get(originalValues, originalName);
+    }) : get(originalValues, originalName),
     originRecord: originRecord
   };
 };
@@ -117,8 +121,10 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     if (!isWatch || noChange) return 'same';
     var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
     : props[valuePropName];
+
     // fix:修复 DatePicker时，originalValue与最新值一致时，显示为 changed的问题
     var _originalValue = normalize && ['DatePicker'].includes(props.type) ? normalize(originalValue, undefined, undefined, true) : originalValue;
+
     // fix:修复 InputNumber 时，originalValue与最新值一致都为'0'时，显示为 changed的问题
     if (['InputNumber'].includes(props.type) && normalize && _value === Number(originalValue)) {
       return 'same';
@@ -139,6 +145,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     var _getValueProps;
     if (!isWatch || noChange) return undefined;
     var orgValue = getValueProps ? (_getValueProps = getValueProps(originalValue, true)) === null || _getValueProps === void 0 ? void 0 : _getValueProps[valuePropName] : originalValue;
+
     // 兼容viewRender函数和Element场景
     var _children = children;
     if (viewRender) {
@@ -159,13 +166,16 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   if (!isWatch || noChange) {
     return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest));
   }
+
   // eslint-disable-next-line react-hooks/rules-of-hooks
   // const isFocus = useFocus(contentRef.current);
   var tipOpenCalc = function tipOpenCalc() {
     if (!toolTip) return false;
+
     // 传入undefined 鼠标移入显示移出隐藏
     return isChanged ? undefined : false;
   };
+
   // @ts-ignore
   var _showEllipse = ((_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.showEllipse) || ((_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : _children$props2.tooltip);
   var classNames = classnames({
@@ -177,7 +187,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     'pro-form-item-add': isAdd
   });
   var open = tipOpenCalc();
-  return _jsx(Tooltip, {
+  return /*#__PURE__*/_jsx(Tooltip, {
     open: open,
     getPopupContainer: function getPopupContainer(trigger) {
       return scrollFollowParent ? trigger.parentElement : document.body;
@@ -187,21 +197,21 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     },
     placement: "topLeft",
     autoAdjustOverflow: false,
-    title: _jsxs(Space, {
+    title: /*#__PURE__*/_jsxs(Space, {
       direction: "vertical",
       className: "changed-tooltip",
-      children: [_jsxs(Space, {
+      children: [/*#__PURE__*/_jsxs(Space, {
         align: "start",
         className: "original-value-container",
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
-      }), _showEllipse && _jsxs(Space, {
+      }), _showEllipse && /*#__PURE__*/_jsxs(Space, {
         className: "current-value-container",
         children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
           isView: true
         })) : undefined]
       })]
     }),
-    children: _jsx("div", {
+    children: /*#__PURE__*/_jsx("div", {
       className: diffClassName,
       children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
         otherProps: _objectSpread(_objectSpread({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {