@zat-design/sisyphus-react 3.11.9 → 3.11.11-beta.1

package/README.md

@@ -104,4 +104,12 @@ npm publish --registry https://registry.npmjs.org --access=public
     "registry": "https://npm.zhonganinfo.com"
   },
 ```
-2. 之后使用 `npm publish` 发布, 如果提示登录使用域账号登录
+2. 之后使用 `npm publish` 发布, 如果提示登录使用域账号登录
+
+
+### 聚合 docs 下所有 Markdown 文件内容
+
+```
+node scripts/aggregateDocs.ts
+```
+

package/es/ProEditTable/index.js

@@ -189,12 +189,14 @@ var ProEditTable = function ProEditTable(_ref, ref) {
               recursive: true
             });
           case 7:
-            setState({
-              page: {
-                pageNum: current,
-                pageSize: pageSize !== null && pageSize !== void 0 ? pageSize : page.pageSize
-              }
-            });
+            if (current !== page.pageNum) {
+              setState({
+                page: {
+                  pageNum: current,
+                  pageSize: pageSize !== null && pageSize !== void 0 ? pageSize : page.pageSize
+                }
+              });
+            }
           case 8:
             _context.next = 13;
             break;
@@ -439,7 +441,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         className: "pro-edit-table-footer",
         children: footerRender
       }) : null, pagination ? _jsx("div", {
-        id: "pro-edit-table-pagination",
+        id: "pro-edit-table-pagination-".concat(config.name.join('-')),
         onClick: function onClick() {
           onPageCheck({
             form: form,

package/es/ProEditTable/utils/config.js

@@ -167,20 +167,20 @@ export var actions = {
     }
   },
   add: function () {
-    var _add = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
+    var _add = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref5) {
       var _tableRef$current$que, _tableRef$current$que2;
       var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, page, handlePageChange, nextData, rowKey, addData, nextPageNum, nextEditingKeys;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             result = _ref5.result, insertType = _ref5.insertType, editingKeys = _ref5.editingKeys, setState = _ref5.setState, form = _ref5.form, name = _ref5.name, virtualName = _ref5.virtualName, virtualKey = _ref5.virtualKey, onlyOneLineMsg = _ref5.onlyOneLineMsg, tableRef = _ref5.tableRef, _ref5$prefixCls = _ref5.prefixCls, prefixCls = _ref5$prefixCls === void 0 ? 'ant' : _ref5$prefixCls, page = _ref5.page, handlePageChange = _ref5.handlePageChange;
             nextData = _toConsumableArray(form.getFieldValue(name) || []); // 单行编辑时，需要先保存，才能进行下面的编辑
             if (!(virtualKey && editingKeys.length >= 1)) {
-              _context2.next = 5;
+              _context4.next = 5;
               break;
             }
             _message.warning(onlyOneLineMsg);
-            return _context2.abrupt("return", false);
+            return _context4.abrupt("return", false);
           case 5:
             rowKey = getRandom(); // 添加新增对象数据
             addData = _objectSpread(_objectSpread({}, _typeof(result) === 'object' ? result : {}), {}, {
@@ -192,11 +192,31 @@ export var actions = {
             }
             if (insertType === 'before') {
               nextData.unshift(addData);
-              handlePageChange(1);
+              setTimeout(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+                return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                  while (1) switch (_context2.prev = _context2.next) {
+                    case 0:
+                      handlePageChange(1, page.pageSize);
+                    case 1:
+                    case "end":
+                      return _context2.stop();
+                  }
+                }, _callee2);
+              })), 0);
             } else {
               nextData.push(addData);
               nextPageNum = Math.ceil(tools.calc(nextData.length, '/', page.pageSize));
-              handlePageChange(nextPageNum);
+              setTimeout(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+                return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                  while (1) switch (_context3.prev = _context3.next) {
+                    case 0:
+                      handlePageChange(nextPageNum, page.pageSize);
+                    case 1:
+                    case "end":
+                      return _context3.stop();
+                  }
+                }, _callee3);
+              })), 0);
             }
             // 当单选情况下，存储正在编辑值
             if (virtualKey) {
@@ -213,30 +233,30 @@ export var actions = {
               behavior: 'smooth'
             });
             if (!virtualKey) {
-              _context2.next = 15;
+              _context4.next = 15;
               break;
             }
-            _context2.next = 15;
+            _context4.next = 15;
             return form.validateFields([name]);
           case 15:
           case "end":
-            return _context2.stop();
+            return _context4.stop();
         }
-      }, _callee2);
+      }, _callee4);
     }));
     function add(_x2) {
       return _add.apply(this, arguments);
     }
     return add;
   }(),
-  mulDelete: function mulDelete(_ref6) {
-    var form = _ref6.form,
-      name = _ref6.name,
-      virtualKey = _ref6.virtualKey,
-      setState = _ref6.setState,
-      selectedRowKeys = _ref6.selectedRowKeys,
-      _ref6$editingKeys = _ref6.editingKeys,
-      editingKeys = _ref6$editingKeys === void 0 ? [] : _ref6$editingKeys;
+  mulDelete: function mulDelete(_ref8) {
+    var form = _ref8.form,
+      name = _ref8.name,
+      virtualKey = _ref8.virtualKey,
+      setState = _ref8.setState,
+      selectedRowKeys = _ref8.selectedRowKeys,
+      _ref8$editingKeys = _ref8.editingKeys,
+      editingKeys = _ref8$editingKeys === void 0 ? [] : _ref8$editingKeys;
     // 删除选中数据
     onDelete({
       name: name,

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

@@ -661,8 +661,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     if (value && !visible && readOnly && (!isEqual(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
       var _options$some;
       preValue.current = value;
+      var _data3 = labelInValue ? value[valueKey] : value;
       var isHasValue = options === null || options === void 0 ? void 0 : (_options$some = options.some) === null || _options$some === void 0 ? void 0 : _options$some.call(options, function (item) {
-        return item[valueKey] === value;
+        return item[valueKey] === _data3;
       });
       if (isHasValue) {
         return;
@@ -673,8 +674,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           var params = withPagination ? {
             pageNum: 1,
             pageSize: 50,
-            queryBean: _objectSpread(_objectSpread({}, defaultParams), initParams)
-          } : _objectSpread(_objectSpread({}, defaultParams), initParams);
+            queryBean: _objectSpread(_objectSpread(_objectSpread({}, defaultParams), initParams), {}, _defineProperty({}, searchKey !== null && searchKey !== void 0 ? searchKey : valueKey, _data3))
+          } : _objectSpread(_objectSpread(_objectSpread({}, defaultParams), initParams), {}, _defineProperty({}, searchKey !== null && searchKey !== void 0 ? searchKey : valueKey, _data3));
           var nextParams = transformParams ? transformParams(params) : params;
           run(nextParams);
         }, 300);

package/es/ProForm/utils/useForm.js

@@ -57,6 +57,7 @@ export var useForm = function useForm(originForm, options) {
         _form$getInternalHook,
         getFields,
         fieldsList,
+        _document,
         tablePagination,
         _tablePagination$clic,
         _error$errorFields,
@@ -97,18 +98,21 @@ export var useForm = function useForm(originForm, options) {
           case 11:
             return _context.abrupt("return", _context.sent);
           case 12:
-            tablePagination = document.querySelector('#pro-edit-table-pagination');
-            if (tablePagination) {
-              tablePagination === null || tablePagination === void 0 ? void 0 : (_tablePagination$clic = tablePagination.click) === null || _tablePagination$clic === void 0 ? void 0 : _tablePagination$clic.call(tablePagination);
+            // 解决，单个pro-edit-table的表单校验
+            if ((nameList === null || nameList === void 0 ? void 0 : nameList.length) && !nameList.join('-').includes(',')) {
+              tablePagination = document && ((_document = document) === null || _document === void 0 ? void 0 : _document.querySelector("#pro-edit-table-pagination-".concat(nameList.join('-'))));
+              if (tablePagination) {
+                tablePagination === null || tablePagination === void 0 ? void 0 : (_tablePagination$clic = tablePagination.click) === null || _tablePagination$clic === void 0 ? void 0 : _tablePagination$clic.call(tablePagination);
+              }
             }
-            _context.next = 16;
+            _context.next = 15;
             return validateFields.apply(void 0, [nameList].concat(rest)).then(function (values) {
               return nameList ? values : _getFieldsValue();
             });
-          case 16:
+          case 15:
             return _context.abrupt("return", _context.sent);
-          case 19:
-            _context.prev = 19;
+          case 18:
+            _context.prev = 18;
             _context.t0 = _context["catch"](0);
             if (scrollToError && (_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$errorFields = _context.t0.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length)) {
               form.scrollToField((_error$errorFields$ = _context.t0.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
@@ -118,11 +122,11 @@ export var useForm = function useForm(originForm, options) {
             }
             handleScrollToError();
             throw _context.t0;
-          case 24:
+          case 23:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 19]]);
+      }, _callee, null, [[0, 18]]);
     }));
     return function _validateFields(_x) {
       return _ref2.apply(this, arguments);

package/es/ProLayout/components/Layout/Menu/OpenMenu/index.js

@@ -37,7 +37,8 @@ var OpenMenu = function OpenMenu(props) {
     setState = _useSetState2[1];
   var query = new URLSearchParams(window.location.search);
   var _useContext = useContext(LayoutContext),
-    onSelected = _useContext.onSelected;
+    onSelected = _useContext.onSelected,
+    target = _useContext.target;
   var cls = classnames(_defineProperty({
     'pro-layout-open-menu': true
   }, "".concat(className), className));
@@ -149,12 +150,17 @@ var OpenMenu = function OpenMenu(props) {
         onSelected({
           selectedPath: item === null || item === void 0 ? void 0 : (_item$props2 = item.props) === null || _item$props2 === void 0 ? void 0 : _item$props2.router
         });
-        setTimeout(function () {
-          // 路由变更，且不再demo文档中
-          if (!window.location.href.includes('~demos/prolayout')) {
-            linkRef.current.click();
-          }
-        }, 100);
+        if (target) {
+          var _item$props3;
+          window.open(item === null || item === void 0 ? void 0 : (_item$props3 = item.props) === null || _item$props3 === void 0 ? void 0 : _item$props3.router, target);
+        } else {
+          setTimeout(function () {
+            // 路由变更，且不再demo文档中
+            if (!window.location.href.includes('~demos/prolayout')) {
+              linkRef.current.click();
+            }
+          }, 100);
+        }
       },
       style: {
         height: dataSource.sideMenu ? 'auto' : "calc(100vh - ".concat((dataSource === null || dataSource === void 0 ? void 0 : dataSource.height) || 0, "px)"),

package/es/ProLayout/index.d.ts

@@ -3,6 +3,7 @@ import type { ProLayoutProps } from './propTypes';
 export declare const LayoutContext: import("react").Context<{
     selectedPath: string;
     onSelected: (params: any) => void;
+    target: '_blank' | '_parent' | '_self' | '_top';
 }>;
 declare const ProLayout: {
     (props: ProLayoutProps): import("react/jsx-runtime").JSX.Element;

package/es/ProLayout/index.js

@@ -29,6 +29,7 @@ var ProLayout = function ProLayout(props) {
     _props$pathPrefix = props.pathPrefix,
     pathPrefix = _props$pathPrefix === void 0 ? '' : _props$pathPrefix,
     theme = props.theme,
+    target = props.target,
     onCollapsedChange = props.onCollapsedChange;
   var _useSetState = useSetState({
       notice: headerNotice || noticeIn,
@@ -108,6 +109,7 @@ var ProLayout = function ProLayout(props) {
   return _jsx(LayoutContext.Provider, {
     value: {
       selectedPath: selectedPath,
+      target: target,
       onSelected: setState
     },
     children: !((_Object$keys = Object.keys(waterMarkProps)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) ? layoutDom : _jsx(ProWaterMark, _objectSpread(_objectSpread({}, waterMarkProps), {}, {

package/es/ProLayout/propTypes.d.ts

@@ -59,6 +59,13 @@ export interface ProLayoutProps {
   *  折叠回调事件
   */
     onCollapsedChange?: (collapsed: any) => void;
+    /** 规定在何处打开被链接文档
+     *  _blank
+     *  _parent
+     *  _self
+     *  _top
+     */
+    target?: '_blank' | '_parent' | '_self' | '_top';
     [key: string]: any;
 }
 export interface ProLayoutStates {

package/lib/ProEditTable/index.js

@@ -192,12 +192,14 @@ var ProEditTable = function ProEditTable(_ref, ref) {
               recursive: true
             });
           case 7:
-            setState({
-              page: {
-                pageNum: current,
-                pageSize: pageSize !== null && pageSize !== void 0 ? pageSize : page.pageSize
-              }
-            });
+            if (current !== page.pageNum) {
+              setState({
+                page: {
+                  pageNum: current,
+                  pageSize: pageSize !== null && pageSize !== void 0 ? pageSize : page.pageSize
+                }
+              });
+            }
           case 8:
             _context.next = 13;
             break;
@@ -442,7 +444,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         className: "pro-edit-table-footer",
         children: footerRender
       }) : null, pagination ? (0, _jsxRuntime.jsx)("div", {
-        id: "pro-edit-table-pagination",
+        id: "pro-edit-table-pagination-".concat(config.name.join('-')),
         onClick: function onClick() {
           (0, _tools.onPageCheck)({
             form: form,

package/lib/ProEditTable/utils/config.js

@@ -173,20 +173,20 @@ var actions = exports.actions = {
     }
   },
   add: function () {
-    var _add = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref5) {
+    var _add = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4(_ref5) {
       var _tableRef$current$que, _tableRef$current$que2;
       var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, page, handlePageChange, nextData, rowKey, addData, nextPageNum, nextEditingKeys;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             result = _ref5.result, insertType = _ref5.insertType, editingKeys = _ref5.editingKeys, setState = _ref5.setState, form = _ref5.form, name = _ref5.name, virtualName = _ref5.virtualName, virtualKey = _ref5.virtualKey, onlyOneLineMsg = _ref5.onlyOneLineMsg, tableRef = _ref5.tableRef, _ref5$prefixCls = _ref5.prefixCls, prefixCls = _ref5$prefixCls === void 0 ? 'ant' : _ref5$prefixCls, page = _ref5.page, handlePageChange = _ref5.handlePageChange;
             nextData = (0, _toConsumableArray2.default)(form.getFieldValue(name) || []); // 单行编辑时，需要先保存，才能进行下面的编辑
             if (!(virtualKey && editingKeys.length >= 1)) {
-              _context2.next = 5;
+              _context4.next = 5;
               break;
             }
             _antd.message.warning(onlyOneLineMsg);
-            return _context2.abrupt("return", false);
+            return _context4.abrupt("return", false);
           case 5:
             rowKey = (0, _tools.getRandom)(); // 添加新增对象数据
             addData = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _typeof2.default)(result) === 'object' ? result : {}), {}, {
@@ -198,11 +198,31 @@ var actions = exports.actions = {
             }
             if (insertType === 'before') {
               nextData.unshift(addData);
-              handlePageChange(1);
+              setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+                return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
+                  while (1) switch (_context2.prev = _context2.next) {
+                    case 0:
+                      handlePageChange(1, page.pageSize);
+                    case 1:
+                    case "end":
+                      return _context2.stop();
+                  }
+                }, _callee2);
+              })), 0);
             } else {
               nextData.push(addData);
               nextPageNum = Math.ceil(_utils.tools.calc(nextData.length, '/', page.pageSize));
-              handlePageChange(nextPageNum);
+              setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
+                return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
+                  while (1) switch (_context3.prev = _context3.next) {
+                    case 0:
+                      handlePageChange(nextPageNum, page.pageSize);
+                    case 1:
+                    case "end":
+                      return _context3.stop();
+                  }
+                }, _callee3);
+              })), 0);
             }
             // 当单选情况下，存储正在编辑值
             if (virtualKey) {
@@ -219,30 +239,30 @@ var actions = exports.actions = {
               behavior: 'smooth'
             });
             if (!virtualKey) {
-              _context2.next = 15;
+              _context4.next = 15;
               break;
             }
-            _context2.next = 15;
+            _context4.next = 15;
             return form.validateFields([name]);
           case 15:
           case "end":
-            return _context2.stop();
+            return _context4.stop();
         }
-      }, _callee2);
+      }, _callee4);
     }));
     function add(_x2) {
       return _add.apply(this, arguments);
     }
     return add;
   }(),
-  mulDelete: function mulDelete(_ref6) {
-    var form = _ref6.form,
-      name = _ref6.name,
-      virtualKey = _ref6.virtualKey,
-      setState = _ref6.setState,
-      selectedRowKeys = _ref6.selectedRowKeys,
-      _ref6$editingKeys = _ref6.editingKeys,
-      editingKeys = _ref6$editingKeys === void 0 ? [] : _ref6$editingKeys;
+  mulDelete: function mulDelete(_ref8) {
+    var form = _ref8.form,
+      name = _ref8.name,
+      virtualKey = _ref8.virtualKey,
+      setState = _ref8.setState,
+      selectedRowKeys = _ref8.selectedRowKeys,
+      _ref8$editingKeys = _ref8.editingKeys,
+      editingKeys = _ref8$editingKeys === void 0 ? [] : _ref8$editingKeys;
     // 删除选中数据
     (0, _tools.onDelete)({
       name: name,

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

@@ -10,7 +10,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 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"));
+var _objectSpread5 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -134,7 +134,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       withPagination: withPagination,
       transformParams: transformParams,
       transformResponse: transformResponse
-    }, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
+    }, (0, _objectSpread5.default)((0, _objectSpread5.default)({}, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
       manual: true,
       onSuccess: function onSuccess(res) {
         var _res$data, _ref5;
@@ -158,7 +158,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       withPagination: withPagination,
       transformParams: transformParams,
       transformResponse: transformResponse
-    }, (0, _objectSpread3.default)({
+    }, (0, _objectSpread5.default)({
       manual: true,
       ready: (initParams || defaultOne) && !readOnly || visible
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options)),
@@ -192,13 +192,13 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       return data;
     }
     if (Object.prototype.toString.call(data) === '[object Object]') {
-      return handleFormat((0, _objectSpread3.default)((0, _objectSpread3.default)({}, data), {}, {
+      return handleFormat((0, _objectSpread5.default)((0, _objectSpread5.default)({}, data), {}, {
         value: data[valueKey],
         label: data[labelKey]
       }));
     }
     return (0, _lodash.isArray)(data) ? data === null || data === void 0 ? void 0 : (_data$map = data.map(function (item) {
-      return handleFormat((0, _objectSpread3.default)((0, _objectSpread3.default)({}, item), {}, {
+      return handleFormat((0, _objectSpread5.default)((0, _objectSpread5.default)({}, item), {}, {
         value: item[valueKey],
         label: item[labelKey]
       }));
@@ -403,7 +403,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
             return form.validateFields();
           case 2:
             values = _context3.sent;
-            onSearch((0, _objectSpread3.default)((0, _objectSpread3.default)({}, values), {}, {
+            onSearch((0, _objectSpread5.default)((0, _objectSpread5.default)({}, values), {}, {
               d: Date.now()
             }));
           case 4:
@@ -416,7 +416,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       return _ref9.apply(this, arguments);
     };
   }();
-  var _rowSelection = (0, _objectSpread3.default)({
+  var _rowSelection = (0, _objectSpread5.default)({
     type: type,
     onChange: function onChange(rowKeys, rows) {
       setState({
@@ -476,12 +476,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               _context4.next = 9;
               break;
             }
-            queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, defaultParams), initParams || {});
-            page = (0, _objectSpread3.default)({
+            queryBean = (0, _objectSpread5.default)((0, _objectSpread5.default)({}, defaultParams), initParams || {});
+            page = (0, _objectSpread5.default)({
               pageNum: 1,
               pageSize: 10
             }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.page);
-            params = withPagination ? (0, _objectSpread3.default)((0, _objectSpread3.default)({}, page), {}, {
+            params = withPagination ? (0, _objectSpread5.default)((0, _objectSpread5.default)({}, page), {}, {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
             params = transformParams ? transformParams(params) : params;
@@ -534,12 +534,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            queryBean = (0, _objectSpread3.default)({}, defaultParams);
-            page = (0, _objectSpread3.default)({
+            queryBean = (0, _objectSpread5.default)({}, defaultParams);
+            page = (0, _objectSpread5.default)({
               pageNum: 1,
               pageSize: 10
             }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.page);
-            params = withPagination ? (0, _objectSpread3.default)((0, _objectSpread3.default)({}, page), {}, {
+            params = withPagination ? (0, _objectSpread5.default)((0, _objectSpread5.default)({}, page), {}, {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
             params = transformParams ? transformParams(params) : params;
@@ -656,8 +656,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     if (value && !visible && readOnly && (!(0, _lodash.isEqual)(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
       var _options$some;
       preValue.current = value;
+      var _data3 = labelInValue ? value[valueKey] : value;
       var isHasValue = options === null || options === void 0 ? void 0 : (_options$some = options.some) === null || _options$some === void 0 ? void 0 : _options$some.call(options, function (item) {
-        return item[valueKey] === value;
+        return item[valueKey] === _data3;
       });
       if (isHasValue) {
         return;
@@ -668,8 +669,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           var params = withPagination ? {
             pageNum: 1,
             pageSize: 50,
-            queryBean: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, defaultParams), initParams)
-          } : (0, _objectSpread3.default)((0, _objectSpread3.default)({}, defaultParams), initParams);
+            queryBean: (0, _objectSpread5.default)((0, _objectSpread5.default)((0, _objectSpread5.default)({}, defaultParams), initParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : valueKey, _data3))
+          } : (0, _objectSpread5.default)((0, _objectSpread5.default)((0, _objectSpread5.default)({}, defaultParams), initParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : valueKey, _data3));
           var nextParams = transformParams ? transformParams(params) : params;
           run(nextParams);
         }, 300);
@@ -697,7 +698,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleSelectSearch = (0, _lodash.debounce)(function (val) {
     if (useRequest) {
-      var queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, defaultParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
+      var queryBean = (0, _objectSpread5.default)((0, _objectSpread5.default)({}, defaultParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
       var params = withPagination ? {
         pageNum: 1,
         pageSize: 50,
@@ -742,7 +743,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       width: '100%'
     },
     block: true,
-    children: [readOnly ? (0, _jsxRuntime.jsx)(_index.ProSelect, (0, _objectSpread3.default)({
+    children: [readOnly ? (0, _jsxRuntime.jsx)(_index.ProSelect, (0, _objectSpread5.default)({
       value: value,
       onChange: handleSelectValue,
       disabled: disabled,
@@ -761,7 +762,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }
-    }, restProps)) : (0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread3.default)({
+    }, restProps)) : (0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread5.default)({
       value: viewText,
       onChange: handleChangeValue,
       disabled: disabled,
@@ -856,7 +857,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         title: viewText,
         children: initRender
       }) : initRender
-    }), (0, _jsxRuntime.jsxs)(_index.ProDrawerForm, (0, _objectSpread3.default)((0, _objectSpread3.default)({
+    }), (0, _jsxRuntime.jsxs)(_index.ProDrawerForm, (0, _objectSpread5.default)((0, _objectSpread5.default)({
       showType: "Modal",
       title: title,
       onOk: handleFinish,
@@ -871,7 +872,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         onFinish: handleSearch,
         confirmLoading: loading,
         footer: (formColumns === null || formColumns === void 0 ? void 0 : formColumns.length) > 1
-      }), (0, _jsxRuntime.jsx)(_index.ProTable, (0, _objectSpread3.default)({
+      }), (0, _jsxRuntime.jsx)(_index.ProTable, (0, _objectSpread5.default)({
         onRow: function onRow(record) {
           return {
             onClick: function onClick() {

package/lib/ProForm/utils/useForm.js

@@ -63,6 +63,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
         _form$getInternalHook,
         getFields,
         fieldsList,
+        _document,
         tablePagination,
         _tablePagination$clic,
         _error$errorFields,
@@ -103,18 +104,21 @@ var useForm = exports.useForm = function useForm(originForm, options) {
           case 11:
             return _context.abrupt("return", _context.sent);
           case 12:
-            tablePagination = document.querySelector('#pro-edit-table-pagination');
-            if (tablePagination) {
-              tablePagination === null || tablePagination === void 0 ? void 0 : (_tablePagination$clic = tablePagination.click) === null || _tablePagination$clic === void 0 ? void 0 : _tablePagination$clic.call(tablePagination);
+            // 解决，单个pro-edit-table的表单校验
+            if ((nameList === null || nameList === void 0 ? void 0 : nameList.length) && !nameList.join('-').includes(',')) {
+              tablePagination = document && ((_document = document) === null || _document === void 0 ? void 0 : _document.querySelector("#pro-edit-table-pagination-".concat(nameList.join('-'))));
+              if (tablePagination) {
+                tablePagination === null || tablePagination === void 0 ? void 0 : (_tablePagination$clic = tablePagination.click) === null || _tablePagination$clic === void 0 ? void 0 : _tablePagination$clic.call(tablePagination);
+              }
             }
-            _context.next = 16;
+            _context.next = 15;
             return validateFields.apply(void 0, [nameList].concat(rest)).then(function (values) {
               return nameList ? values : _getFieldsValue();
             });
-          case 16:
+          case 15:
             return _context.abrupt("return", _context.sent);
-          case 19:
-            _context.prev = 19;
+          case 18:
+            _context.prev = 18;
             _context.t0 = _context["catch"](0);
             if (scrollToError && (_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$errorFields = _context.t0.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length)) {
               form.scrollToField((_error$errorFields$ = _context.t0.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
@@ -124,11 +128,11 @@ var useForm = exports.useForm = function useForm(originForm, options) {
             }
             (0, _tools.handleScrollToError)();
             throw _context.t0;
-          case 24:
+          case 23:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 19]]);
+      }, _callee, null, [[0, 18]]);
     }));
     return function _validateFields(_x) {
       return _ref2.apply(this, arguments);

package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.js

@@ -43,7 +43,8 @@ var OpenMenu = function OpenMenu(props) {
     setState = _useSetState2[1];
   var query = new URLSearchParams(window.location.search);
   var _useContext = (0, _react.useContext)(_index.LayoutContext),
-    onSelected = _useContext.onSelected;
+    onSelected = _useContext.onSelected,
+    target = _useContext.target;
   var cls = (0, _classnames2.default)((0, _defineProperty2.default)({
     'pro-layout-open-menu': true
   }, "".concat(className), className));
@@ -155,12 +156,17 @@ var OpenMenu = function OpenMenu(props) {
         onSelected({
           selectedPath: item === null || item === void 0 ? void 0 : (_item$props2 = item.props) === null || _item$props2 === void 0 ? void 0 : _item$props2.router
         });
-        setTimeout(function () {
-          // 路由变更，且不再demo文档中
-          if (!window.location.href.includes('~demos/prolayout')) {
-            linkRef.current.click();
-          }
-        }, 100);
+        if (target) {
+          var _item$props3;
+          window.open(item === null || item === void 0 ? void 0 : (_item$props3 = item.props) === null || _item$props3 === void 0 ? void 0 : _item$props3.router, target);
+        } else {
+          setTimeout(function () {
+            // 路由变更，且不再demo文档中
+            if (!window.location.href.includes('~demos/prolayout')) {
+              linkRef.current.click();
+            }
+          }, 100);
+        }
       },
       style: {
         height: dataSource.sideMenu ? 'auto' : "calc(100vh - ".concat((dataSource === null || dataSource === void 0 ? void 0 : dataSource.height) || 0, "px)"),

package/lib/ProLayout/index.d.ts

@@ -3,6 +3,7 @@ import type { ProLayoutProps } from './propTypes';
 export declare const LayoutContext: import("react").Context<{
     selectedPath: string;
     onSelected: (params: any) => void;
+    target: '_blank' | '_parent' | '_self' | '_top';
 }>;
 declare const ProLayout: {
     (props: ProLayoutProps): import("react/jsx-runtime").JSX.Element;

package/lib/ProLayout/index.js

@@ -35,6 +35,7 @@ var ProLayout = function ProLayout(props) {
     _props$pathPrefix = props.pathPrefix,
     pathPrefix = _props$pathPrefix === void 0 ? '' : _props$pathPrefix,
     theme = props.theme,
+    target = props.target,
     onCollapsedChange = props.onCollapsedChange;
   var _useSetState = (0, _ahooks.useSetState)({
       notice: headerNotice || noticeIn,
@@ -114,6 +115,7 @@ var ProLayout = function ProLayout(props) {
   return (0, _jsxRuntime.jsx)(LayoutContext.Provider, {
     value: {
       selectedPath: selectedPath,
+      target: target,
       onSelected: setState
     },
     children: !((_Object$keys = Object.keys(waterMarkProps)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) ? layoutDom : (0, _jsxRuntime.jsx)(_index.ProWaterMark, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, waterMarkProps), {}, {

package/lib/ProLayout/propTypes.d.ts

@@ -59,6 +59,13 @@ export interface ProLayoutProps {
   *  折叠回调事件
   */
     onCollapsedChange?: (collapsed: any) => void;
+    /** 规定在何处打开被链接文档
+     *  _blank
+     *  _parent
+     *  _self
+     *  _top
+     */
+    target?: '_blank' | '_parent' | '_self' | '_top';
     [key: string]: any;
 }
 export interface ProLayoutStates {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.11.9",
+  "version": "3.11.11-beta.1",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "kisstkondoros.vscode-codemetrics"
-    ]
-}