@zat-design/sisyphus-react 3.4.13 → 3.5.0-beta.2

package/es/ProForm/utils/useForm.js

@@ -10,7 +10,9 @@ export var useForm = function useForm(originForm) {
     form = _Form$useForm2[0];
   var getFieldsValue = form.getFieldsValue,
     validateFields = form.validateFields,
-    setFieldsValue = form.setFieldsValue;
+    setFieldsValue = form.setFieldsValue,
+    isModified = form.isModified;
+  if (isModified) return [form];
   // @ts-ignore
   var _getFieldsValue = function _getFieldsValue(nameList, filterFunc) {
     // 全部查询
@@ -38,7 +40,6 @@ export var useForm = function useForm(originForm) {
         _form$getInternalHook,
         getFields,
         fieldsList,
-        _error$errorFields,
         _error$errorFields$,
         _args = arguments;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -52,7 +53,7 @@ export var useForm = function useForm(originForm) {
             isRecursive = rest === null || rest === void 0 ? void 0 : (_rest$ = rest[0]) === null || _rest$ === void 0 ? void 0 : _rest$.recursive;
             validateNames = []; // 前缀校验模式
             if (!isRecursive) {
-              _context.next = 10;
+              _context.next = 12;
               break;
             }
             // @ts-ignore
@@ -66,28 +67,34 @@ export var useForm = function useForm(originForm) {
             });
             // @ts-ignore
             delete rest[0].recursive;
-            return _context.abrupt("return", validateFields.apply(void 0, [validateNames].concat(rest)).then(function (values) {
+            _context.next = 11;
+            return validateFields.apply(void 0, [validateNames].concat(rest)).then(function (values) {
               return filterInternalFields(values);
-            }));
-          case 10:
-            return _context.abrupt("return", validateFields.apply(void 0, [nameList].concat(rest)).then(function (values) {
+            });
+          case 11:
+            return _context.abrupt("return", _context.sent);
+          case 12:
+            _context.next = 14;
+            return validateFields.apply(void 0, [nameList].concat(rest)).then(function (values) {
               return nameList ? values : _getFieldsValue();
-            }));
-          case 13:
-            _context.prev = 13;
+            });
+          case 14:
+            return _context.abrupt("return", _context.sent);
+          case 17:
+            _context.prev = 17;
             _context.t0 = _context["catch"](0);
-            if (_context.t0 && (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.errorFields)) {
-              form === null || form === void 0 ? void 0 : form.scrollToField(_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$errorFields = _context.t0.errorFields) === null || _error$errorFields === void 0 ? void 0 : (_error$errorFields$ = _error$errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
+            if (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.errorFields) {
+              form.scrollToField((_error$errorFields$ = _context.t0.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
                 block: 'center',
                 behavior: 'smooth'
               });
             }
             throw _context.t0;
-          case 17:
+          case 21:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 13]]);
+      }, _callee, null, [[0, 17]]);
     }));
     return function _validateFields(_x) {
       return _ref.apply(this, arguments);
@@ -95,6 +102,7 @@ export var useForm = function useForm(originForm) {
   }();
   form.getFieldsValue = _getFieldsValue;
   form.validateFields = _validateFields;
+  form.isModified = true;
   // form.setFieldsValue = _setFieldsValue;
   return [form];
 };

package/es/ProForm/utils/valueType.d.ts

@@ -34,9 +34,6 @@ declare const _default: {
         type: any;
         valueType: any;
     }) => {
-        normalize?: undefined;
-        getValueProps?: undefined;
-    } | {
         normalize: (value: any) => any;
         getValueProps: (value: any) => {
             value: any;
@@ -47,9 +44,6 @@ declare const _default: {
         type: any;
         valueType: any;
     }) => {
-        normalize?: undefined;
-        getValueProps?: undefined;
-    } | {
         normalize: (value: any) => any;
         getValueProps: (value: any) => {
             value: any;

package/es/ProForm/utils/valueType.js

@@ -1,5 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import Big from 'big.js';
+import { isEqual } from 'lodash';
 import { transforms } from '@zat-design/utils';
 var transformDate = transforms.transformDate,
   transformSwitch = transforms.transformSwitch;
@@ -13,8 +14,35 @@ var transformRatio = function transformRatio(_ref) {
     precision = _ref$precision === void 0 ? 2 : _ref$precision,
     valueType = _ref.valueType;
   if (type === 'ProNumberRange' && ['permillage', 'percentage'].includes(valueType)) {
-    console.error('Warning: ProNumberRange valueType can only be set to [thousandth]');
-    return {};
+    var ref = null;
+    return {
+      normalize: function normalize(value) {
+        if (!value || !value.some(function (item) {
+          return item;
+        })) {
+          return {};
+        }
+        return [(value[0] || value[0] === 0) && Number.isFinite(value[0] - 0) ? Big(value[0] - 0).div(Math.pow(10, precision)).toNumber() : null, (value[1] || value[1] === 0) && Number.isFinite(value[1] - 0) ? Big(value[1] - 0).div(Math.pow(10, precision)).toNumber() : null];
+      },
+      getValueProps: function getValueProps(value) {
+        if (!value || !value.some(function (item) {
+          return item;
+        })) {
+          return {
+            value: []
+          };
+        }
+        if (isEqual(ref, value)) {
+          return {
+            value: [(value[0] || value[0] === 0) && Number.isFinite(value[0] - 0) ? Big(value[0] - 0).times(Math.pow(10, precision)).toNumber() : null, (value[1] || value[1] === 0) && Number.isFinite(value[1] - 0) ? Big(value[1] - 0).times(Math.pow(10, precision)).toNumber() : null]
+          };
+        }
+        ref = value;
+        return {
+          value: [(value[0] || value[0] === 0) && Number.isFinite(value[0] - 0) ? Big(value[0] - 0).times(Math.pow(10, precision)).toNumber() : null, (value[1] || value[1] === 0) && Number.isFinite(value[1] - 0) ? Big(value[1] - 0).times(Math.pow(10, precision)).toNumber() : null]
+        };
+      }
+    };
   }
   return {
     normalize: function normalize(value) {

package/es/ProLayout/index.js

@@ -25,7 +25,8 @@ var ProLayout = function ProLayout(props) {
     headerNotice = props.headerNotice,
     noticeIn = props.notice,
     dataSource = props.dataSource,
-    theme = props.theme;
+    theme = props.theme,
+    onCollapsedChange = props.onCollapsedChange;
   var _useSetState = useSetState({
       notice: headerNotice || noticeIn,
       menus: [],
@@ -86,7 +87,10 @@ var ProLayout = function ProLayout(props) {
         dataSource: menus,
         notice: notice,
         collapsed: collapsed,
-        onToggle: toggle
+        onToggle: function onToggle() {
+          toggle();
+          onCollapsedChange && onCollapsedChange(!collapsed);
+        }
       })), _jsx("div", {
         className: "pro-layout-content",
         style: _objectSpread(_objectSpread({}, contentStyle), {}, {

package/es/ProLayout/propTypes.d.ts

@@ -51,6 +51,10 @@ export interface ProLayoutProps {
     contentStyle?: CSSProperties;
     waterMarkProps?: ProWaterMarkProps;
     theme?: themeEnum;
+    /**
+  *  折叠回调事件
+  */
+    onCollapsedChange?: (collapsed: any) => void;
     [key: string]: any;
 }
 export interface ProLayoutStates {

package/es/ProSelect/index.js

@@ -27,7 +27,8 @@ export var ProSelect = function ProSelect(props, ref) {
   var _ref = useProConfig('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
     proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
-    showCodeName = _ref.showCodeName;
+    showCodeName = _ref.showCodeName,
+    gViewportReady = _ref.viewportReady;
   var label = 'label';
   var code = 'value';
   if (proSelectFieldNames && Object.keys(proSelectFieldNames).length) {
@@ -54,16 +55,16 @@ export var ProSelect = function ProSelect(props, ref) {
     updateDataSource = props.updateDataSource,
     transformResponse = props.transformResponse,
     isViewPro = props.isView,
-    _props$viewportReady = props.viewportReady,
-    viewportReady = _props$viewportReady === void 0 ? false : _props$viewportReady,
+    __viewportReady = props.viewportReady,
     selectProps = _objectWithoutProperties(props, _excluded);
+  var viewportReady = __viewportReady || gViewportReady;
   /** 是否在可视区域出现过 */
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     viewFlag = _useState2[0],
     setViewFlag = _useState2[1];
-  var refSelect = useRef();
-  var _useInViewport = useInViewport(refSelect),
+  var refSelect1 = useRef();
+  var _useInViewport = useInViewport(refSelect1),
     _useInViewport2 = _slicedToArray(_useInViewport, 1),
     inViewport = _useInViewport2[0];
   selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
@@ -299,45 +300,51 @@ export var ProSelect = function ProSelect(props, ref) {
       fieldNames: fieldNames
     });
   }
-  return _jsx(_Select, _objectSpread(_objectSpread({
-    placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProSelect = locale.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
-    allowClear: true,
-    showArrow: true,
-    loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
-    onChange: handleChange,
-    optionLabelProp: "children" // 解决warning报错，添加默认值
-    ,
-    showSearch: true,
-    filterOption: isFunction(_onSearch) ? false : function (input, option) {
-      var _option$children, _option$children$prop;
-      var value = isString(option === null || option === void 0 ? void 0 : option.children) ? option === null || option === void 0 ? void 0 : option.children : option === null || option === void 0 ? void 0 : (_option$children = option.children) === null || _option$children === void 0 ? void 0 : (_option$children$prop = _option$children.props) === null || _option$children$prop === void 0 ? void 0 : _option$children$prop.title;
-      return value.toLowerCase().includes(input.toLowerCase());
-    },
-    onSearch: function onSearch(value) {
-      _onSearch && _onSearch(value, _objectSpread({}, fetchFunction));
-    },
-    getPopupContainer: function getPopupContainer(trigger) {
-      return scrollFollowParent ? trigger.parentElement : document.body;
-    }
-  }, omit(cloneDeep(selectProps), ['isView', 'showCodeName', 'form', 'name'])), {}, {
-    value: transformValue(),
-    children: Array.isArray(newSelectList) && newSelectList.map(function (item) {
-      return _jsx(Option, {
-        value: item[code],
-        record: item,
-        disabled: !!item.disabled,
-        children: _jsx(TooltipOption, {
-          title: OptionRender ? OptionRender(item) : selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label],
-          children: OptionRender ? _jsx("span", {
-            title: OptionRender(item),
-            children: OptionRender(item)
-          }) : _jsx("span", {
-            title: "".concat(item[code], "-").concat(item[label]),
-            children: selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label]
-          })
-        }, item[code])
-      }, item[code]);
-    })
-  }));
+  return _jsx("div", {
+    ref: refSelect1,
+    style: props.style,
+    className: "ant-select-compact-item-div",
+    children: _jsx(_Select, _objectSpread(_objectSpread({
+      // id={refSelect1.current}
+      placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProSelect = locale.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
+      allowClear: true,
+      showArrow: true,
+      loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
+      onChange: handleChange,
+      optionLabelProp: "children" // 解决warning报错，添加默认值
+      ,
+      showSearch: true,
+      filterOption: isFunction(_onSearch) ? false : function (input, option) {
+        var _option$children, _option$children$prop;
+        var value = isString(option === null || option === void 0 ? void 0 : option.children) ? option === null || option === void 0 ? void 0 : option.children : option === null || option === void 0 ? void 0 : (_option$children = option.children) === null || _option$children === void 0 ? void 0 : (_option$children$prop = _option$children.props) === null || _option$children$prop === void 0 ? void 0 : _option$children$prop.title;
+        return value.toLowerCase().includes(input.toLowerCase());
+      },
+      onSearch: function onSearch(value) {
+        _onSearch && _onSearch(value, _objectSpread({}, fetchFunction));
+      },
+      getPopupContainer: function getPopupContainer(trigger) {
+        return scrollFollowParent ? trigger.parentElement : document.body;
+      }
+    }, omit(cloneDeep(selectProps), ['isView', 'showCodeName', 'form', 'name', 'style'])), {}, {
+      value: transformValue(),
+      children: Array.isArray(newSelectList) && newSelectList.map(function (item) {
+        return _jsx(Option, {
+          value: item[code],
+          record: item,
+          disabled: !!item.disabled,
+          children: _jsx(TooltipOption, {
+            title: OptionRender ? OptionRender(item) : selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label],
+            children: OptionRender ? _jsx("span", {
+              title: OptionRender(item),
+              children: OptionRender(item)
+            }) : _jsx("span", {
+              title: "".concat(item[code], "-").concat(item[label]),
+              children: selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label]
+            })
+          }, item[code])
+        }, item[code]);
+      })
+    }))
+  });
 };
 export default /*#__PURE__*/forwardRef(ProSelect);

package/es/ProSelect/index.less

@@ -9,3 +9,9 @@
   text-overflow: ellipsis;
   word-break: keep-all;
 }
+.ant-select-compact-item-div {
+  width: 100%;
+  >.ant-select {
+    width: 100%;
+  }
+}

package/es/ProTable/components/DndWrapper/index.d.ts

@@ -0,0 +1,15 @@
+import React, { FC } from 'react';
+interface RowProps extends React.HTMLAttributes<HTMLTableRowElement> {
+    'data-row-key': string;
+    'data-hide'?: boolean;
+    disabled?: boolean;
+}
+export declare const Row: FC<RowProps>;
+declare const DndWrapper: ({ draggable, value, onChange, disabled, children }: {
+    draggable: any;
+    value: any;
+    onChange: any;
+    disabled: any;
+    children: any;
+}) => any;
+export default DndWrapper;

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

@@ -0,0 +1,94 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["disabled", "children"];
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import React from 'react';
+import { DndContext } from '@dnd-kit/core';
+import { arrayMove, useSortable, SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
+import { CSS } from '@dnd-kit/utilities';
+import ProIcon from '../../../ProIcon';
+export var Row = function Row(props) {
+  var disabled = props.disabled,
+    children = props.children,
+    restProps = _objectWithoutProperties(props, _excluded);
+  var data = useSortable({
+    id: props['data-row-key'],
+    disabled: disabled
+  });
+  var attributes = data.attributes,
+    listeners = data.listeners,
+    setNodeRef = data.setNodeRef,
+    transform = data.transform,
+    transition = data.transition,
+    isDragging = data.isDragging;
+  var style = _objectSpread(_objectSpread({}, props.style), {}, {
+    transform: CSS.Transform.toString(transform && _objectSpread(_objectSpread({}, transform), {}, {
+      scaleY: 1
+    })),
+    transition: transition
+  }, isDragging ? {
+    position: 'relative',
+    zIndex: 2
+  } : {});
+  return _jsx("tr", _objectSpread(_objectSpread(_objectSpread({}, restProps), {}, {
+    ref: setNodeRef,
+    style: style
+  }, attributes), {}, {
+    children: React.Children.map(children, function (child) {
+      if (child.key === 'RC_TABLE_KEY') {
+        var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
+          render = _ref.render,
+          record = _ref.record,
+          renderIndex = _ref.renderIndex;
+        return /*#__PURE__*/React.cloneElement(child, {
+          children: _jsxs("span", {
+            className: "drag-wrapper".concat(props['data-hide'] ? ' no-check' : ''),
+            children: [_jsx(ProIcon, _objectSpread({
+              className: "drag-icon",
+              style: {
+                touchAction: 'none',
+                cursor: disabled ? 'no-drop' : 'move'
+              },
+              type: "drag",
+              size: 20
+            }, listeners)), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
+          })
+        });
+      }
+      return child;
+    })
+  }));
+};
+var DndWrapper = function DndWrapper(_ref2) {
+  var _value$;
+  var draggable = _ref2.draggable,
+    value = _ref2.value,
+    onChange = _ref2.onChange,
+    disabled = _ref2.disabled,
+    children = _ref2.children;
+  var onDragEnd = function onDragEnd(_ref3) {
+    var active = _ref3.active,
+      over = _ref3.over;
+    if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
+      var activeIndex = value.findIndex(function (i) {
+        return i.rowKey === active.id;
+      });
+      var overIndex = value.findIndex(function (i) {
+        return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
+      });
+      var nextValue = arrayMove(value, activeIndex, overIndex);
+      onChange(nextValue);
+    }
+  };
+  return draggable && !disabled ? _jsx(DndContext, {
+    onDragEnd: onDragEnd,
+    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) {
+        return i.rowKey;
+      }) : [],
+      strategy: verticalListSortingStrategy,
+      children: children
+    })
+  }) : children;
+};
+export default DndWrapper;

package/es/ProTable/components/index.d.ts

@@ -1,2 +1,3 @@
 export { default as ResizableLine } from './ResizableLine';
 export { default as TableResizable } from './TableResizable';
+export { default as DndWrapper, Row } from './DndWrapper';

package/es/ProTable/components/index.js

@@ -1,2 +1,3 @@
 export { default as ResizableLine } from './ResizableLine';
-export { default as TableResizable } from './TableResizable';
+export { default as TableResizable } from './TableResizable';
+export { default as DndWrapper, Row } from './DndWrapper';

package/es/ProTable/index.d.ts

@@ -10,6 +10,9 @@ declare namespace ProTable {
     var defaultProps: {
         quickConfig: boolean;
         stripe: boolean;
+        draggable: boolean;
+        disabled: boolean;
+        isView: boolean;
     };
     var useAntdTable: typeof import("./useAntdTable").default;
 }