@zat-design/sisyphus-react 3.4.13-beta.6 → 3.4.13-beta.8

package/es/ProEditTable/index.js

@@ -9,7 +9,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "footerRender"];
+var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "footerRender", "scroll"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { get, isArray } from 'lodash';
@@ -51,6 +51,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     rowKey = _ref.rowKey,
     rowDisabled = _ref.rowDisabled,
     footerRender = _ref.footerRender,
+    scroll = _ref.scroll,
     resetProps = _objectWithoutProperties(_ref, _excluded);
   // 上下文form
   var contentForm = _Form.useFormInstance();
@@ -346,7 +347,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
             pageSize: page.pageSize,
             showSizeChanger: false,
             showQuickJumper: true,
-            total: value.length,
+            total: value === null || value === void 0 ? void 0 : value.length,
             showTotal: function showTotal(total) {
               var _locale$ProEditTable;
               if (!total) return;
@@ -357,6 +358,10 @@ var ProEditTable = function ProEditTable(_ref, ref) {
             onChange: handlePageChange
           }, pagination) : false,
           rowKey: "rowKey",
+          scroll: {
+            x: scroll === null || scroll === void 0 ? void 0 : scroll.x,
+            y: (value === null || value === void 0 ? void 0 : value.length) ? scroll === null || scroll === void 0 ? void 0 : scroll.y : undefined
+          },
           summary: _summary
         }))]
       }), !isView && (value === null || value === void 0 ? void 0 : value.length) ? _jsx("div", {

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

@@ -706,7 +706,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, 2000),
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
-      }
+      },
+      className: "ant-select-compact-item"
     }, omit(restProps, ['otherProps']))) : _jsx(_Input, _objectSpread({
       value: viewText,
       onChange: handleChangeValue,

package/es/ProSelect/index.js

@@ -63,12 +63,8 @@ export var ProSelect = function ProSelect(props, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     viewFlag = _useState2[0],
     setViewFlag = _useState2[1];
-  var _useState3 = useState(),
-    _useState4 = _slicedToArray(_useState3, 2),
-    inputEl = _useState4[0],
-    setInputEl = _useState4[1];
-  var refSelect1 = useRef((Math.random() * 100).toFixed(0));
-  var _useInViewport = useInViewport(inputEl),
+  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;
@@ -81,15 +77,15 @@ export var ProSelect = function ProSelect(props, ref) {
     code = fieldNames.value;
     label = fieldNames.label;
   }
-  var _useState5 = useState(dataSource || []),
-    _useState6 = _slicedToArray(_useState5, 2),
-    selectList = _useState6[0],
-    setSelectList = _useState6[1];
+  var _useState3 = useState(dataSource || []),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectList = _useState4[0],
+    setSelectList = _useState4[1];
   // 用来控制只有第一次才会设置 defaultOne 属性、🔒
-  var _useState7 = useState(false),
-    _useState8 = _slicedToArray(_useState7, 2),
-    isDefaultOne = _useState8[0],
-    setIsDefaultOne = _useState8[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    isDefaultOne = _useState6[0],
+    setIsDefaultOne = _useState6[1];
   var OptionRender = optionRender;
   var defaultOnSuccessFun = function defaultOnSuccessFun(res) {
     var _res$status = res.status,
@@ -160,12 +156,6 @@ export var ProSelect = function ProSelect(props, ref) {
       setViewFlag(true);
     }
   }, [inViewport]);
-  useEffect(function () {
-    var el = document.getElementById(refSelect1 === null || refSelect1 === void 0 ? void 0 : refSelect1.current);
-    if (el) {
-      setInputEl(el);
-    }
-  }, []);
   // disable默认值
   if (defaultDisableValue) {
     return _jsx("span", {
@@ -310,46 +300,51 @@ export var ProSelect = function ProSelect(props, ref) {
       fieldNames: fieldNames
     });
   }
-  return _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'])), {}, {
-    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: props.className,
+    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', 'className'])), {}, {
+      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,8 @@
   text-overflow: ellipsis;
   word-break: keep-all;
 }
+.ant-select-compact-item {
+  >.ant-select {
+    width: 100%;
+  }
+}

package/lib/ProEditTable/index.js

@@ -23,7 +23,7 @@ var _components = require("./components");
 var _ProForm = _interopRequireDefault(require("../ProForm"));
 var _empty = _interopRequireDefault(require("../assets/empty.png"));
 var _locale = _interopRequireWildcard(require("../locale"));
-var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "footerRender"];
+var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "footerRender", "scroll"];
 var ProEditTable = function ProEditTable(_ref, ref) {
   var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _value$2;
   var value = _ref.value,
@@ -54,6 +54,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     rowKey = _ref.rowKey,
     rowDisabled = _ref.rowDisabled,
     footerRender = _ref.footerRender,
+    scroll = _ref.scroll,
     resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   // 上下文form
   var contentForm = _antd.Form.useFormInstance();
@@ -349,7 +350,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
             pageSize: page.pageSize,
             showSizeChanger: false,
             showQuickJumper: true,
-            total: value.length,
+            total: value === null || value === void 0 ? void 0 : value.length,
             showTotal: function showTotal(total) {
               var _locale$ProEditTable;
               if (!total) return;
@@ -360,6 +361,10 @@ var ProEditTable = function ProEditTable(_ref, ref) {
             onChange: handlePageChange
           }, pagination) : false,
           rowKey: "rowKey",
+          scroll: {
+            x: scroll === null || scroll === void 0 ? void 0 : scroll.x,
+            y: (value === null || value === void 0 ? void 0 : value.length) ? scroll === null || scroll === void 0 ? void 0 : scroll.y : undefined
+          },
           summary: _summary
         }))]
       }), !isView && (value === null || value === void 0 ? void 0 : value.length) ? (0, _jsxRuntime.jsx)("div", {

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

@@ -703,7 +703,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, 2000),
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
-      }
+      },
+      className: "ant-select-compact-item"
     }, (0, _lodash.omit)(restProps, ['otherProps']))) : (0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread3.default)({
       value: viewText,
       onChange: handleChangeValue,

package/lib/ProSelect/index.js

@@ -64,12 +64,8 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     viewFlag = _useState2[0],
     setViewFlag = _useState2[1];
-  var _useState3 = (0, _react.useState)(),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    inputEl = _useState4[0],
-    setInputEl = _useState4[1];
-  var refSelect1 = (0, _react.useRef)((Math.random() * 100).toFixed(0));
-  var _useInViewport = (0, _ahooks.useInViewport)(inputEl),
+  var refSelect1 = (0, _react.useRef)();
+  var _useInViewport = (0, _ahooks.useInViewport)(refSelect1),
     _useInViewport2 = (0, _slicedToArray2.default)(_useInViewport, 1),
     inViewport = _useInViewport2[0];
   selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
@@ -82,15 +78,15 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     code = fieldNames.value;
     label = fieldNames.label;
   }
-  var _useState5 = (0, _react.useState)(dataSource || []),
-    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    selectList = _useState6[0],
-    setSelectList = _useState6[1];
+  var _useState3 = (0, _react.useState)(dataSource || []),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    selectList = _useState4[0],
+    setSelectList = _useState4[1];
   // 用来控制只有第一次才会设置 defaultOne 属性、🔒
-  var _useState7 = (0, _react.useState)(false),
-    _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-    isDefaultOne = _useState8[0],
-    setIsDefaultOne = _useState8[1];
+  var _useState5 = (0, _react.useState)(false),
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+    isDefaultOne = _useState6[0],
+    setIsDefaultOne = _useState6[1];
   var OptionRender = optionRender;
   var defaultOnSuccessFun = function defaultOnSuccessFun(res) {
     var _res$status = res.status,
@@ -161,12 +157,6 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
       setViewFlag(true);
     }
   }, [inViewport]);
-  (0, _react.useEffect)(function () {
-    var el = document.getElementById(refSelect1 === null || refSelect1 === void 0 ? void 0 : refSelect1.current);
-    if (el) {
-      setInputEl(el);
-    }
-  }, []);
   // disable默认值
   if (defaultDisableValue) {
     return (0, _jsxRuntime.jsx)("span", {
@@ -311,46 +301,53 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
       fieldNames: fieldNames
     });
   }
-  return (0, _jsxRuntime.jsx)(_antd.Select, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-    id: refSelect1.current,
-    placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProSelect = _locale.default.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: (0, _lodash.isFunction)(_onSearch) ? false : function (input, option) {
-      var _option$children, _option$children$prop;
-      var value = (0, _lodash.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, (0, _objectSpread2.default)({}, fetchFunction));
-    },
-    getPopupContainer: function getPopupContainer(trigger) {
-      return scrollFollowParent ? trigger.parentElement : document.body;
-    }
-  }, (0, _lodash.omit)((0, _lodash.cloneDeep)(selectProps), ['isView', 'showCodeName', 'form', 'name'])), {}, {
-    value: transformValue(),
-    children: Array.isArray(newSelectList) && newSelectList.map(function (item) {
-      return (0, _jsxRuntime.jsx)(Option, {
-        value: item[code],
-        record: item,
-        disabled: !!item.disabled,
-        children: (0, _jsxRuntime.jsx)(TooltipOption, {
-          title: OptionRender ? OptionRender(item) : selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label],
-          children: OptionRender ? (0, _jsxRuntime.jsx)("span", {
-            title: OptionRender(item),
-            children: OptionRender(item)
-          }) : (0, _jsxRuntime.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 (0, _jsxRuntime.jsx)("div", {
+    ref: refSelect1,
+    style: props.style,
+    className: props.className,
+    children: (0, _jsxRuntime.jsx)(_antd.Select
+    // id={refSelect1.current}
+    , (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      // id={refSelect1.current}
+      placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProSelect = _locale.default.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: (0, _lodash.isFunction)(_onSearch) ? false : function (input, option) {
+        var _option$children, _option$children$prop;
+        var value = (0, _lodash.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, (0, _objectSpread2.default)({}, fetchFunction));
+      },
+      getPopupContainer: function getPopupContainer(trigger) {
+        return scrollFollowParent ? trigger.parentElement : document.body;
+      }
+    }, (0, _lodash.omit)((0, _lodash.cloneDeep)(selectProps), ['isView', 'showCodeName', 'form', 'name', 'style', 'className'])), {}, {
+      value: transformValue(),
+      children: Array.isArray(newSelectList) && newSelectList.map(function (item) {
+        return (0, _jsxRuntime.jsx)(Option, {
+          value: item[code],
+          record: item,
+          disabled: !!item.disabled,
+          children: (0, _jsxRuntime.jsx)(TooltipOption, {
+            title: OptionRender ? OptionRender(item) : selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label],
+            children: OptionRender ? (0, _jsxRuntime.jsx)("span", {
+              title: OptionRender(item),
+              children: OptionRender(item)
+            }) : (0, _jsxRuntime.jsx)("span", {
+              title: "".concat(item[code], "-").concat(item[label]),
+              children: selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label]
+            })
+          }, item[code])
+        }, item[code]);
+      })
+    }))
+  });
 };
 var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(ProSelect);

package/lib/ProSelect/index.less

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

package/package.json

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