@yilianjituan/yilian_dgerm 1.0.6 → 1.0.7-alpha.2

package/dist/components/PageTemplate/index.js

@@ -111,14 +111,18 @@ var PageTemplate = function PageTemplate(props, ref) {
   useImperativeHandle(ref, function () {
     return {
       onSearch: function onSearch(param) {
+        // isRetainParam 是否保留参数
         var _ref = param || {},
-          pageNo = _ref.pageNo;
-        _onSearch(pageNo || 1);
+          pageNo = _ref.pageNo,
+          _ref$isRetainParam = _ref.isRetainParam,
+          isRetainParam = _ref$isRetainParam === void 0 ? false : _ref$isRetainParam;
+        _onSearch(pageNo, isRetainParam);
       },
       filters: _objectSpread({
         pageNo: current,
         pageSize: pageSizeRef.current
-      }, form.getFieldsValue(true))
+      }, form.getFieldsValue(true)),
+      form: form
     };
   });
   useLayoutEffect(function () {
@@ -179,6 +183,7 @@ var PageTemplate = function PageTemplate(props, ref) {
   }, [props.columns, current, pageSizeRef.current]);
   var _onSearch = function _onSearch() {
     var current = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+    var isRetainParam = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     if (Number.isNaN(Number(current))) current = 1;
     setTableLoading(true);
     var _props$url = props.url,
@@ -197,13 +202,15 @@ var PageTemplate = function PageTemplate(props, ref) {
       } : _props$afterErrorRequ;
     form.validateFields().then(function () {
       var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      // 是否保留参数
+      var _pageNo = isRetainParam ? paramsRef.current.pageNo : current;
       // 当前页码、每页条数暴露给beforeRequest的参数中
       var options = {
-        pageNum: current,
+        pageNum: _pageNo,
         pageSize: pageSizeRef.current
       };
       paramsRef.current = beforeRequest(_objectSpread(_objectSpread({
-        pageNo: current
+        pageNo: _pageNo
       }, values), options));
       if (!paramsRef.current) return; // 是否阻断搜索
 
@@ -231,12 +238,19 @@ var PageTemplate = function PageTemplate(props, ref) {
                   return afterRequest(data.result || {});
                 case 2:
                   result = _context.sent;
-                  _ref3 = result || {}, totalElements = _ref3.totalElements, content = _ref3.content;
-                  setDataSource(content || []);
-                  dataSourceRef.current = content || [];
-                  setTotal(totalElements || '');
-                  setCurrent(current);
-                case 8:
+                  _ref3 = result || {}, totalElements = _ref3.totalElements, content = _ref3.content; // 没有数据，重置到上一页
+                  if (content.length === 0 && _pageNo > 1) {
+                    paramsRef.current = _objectSpread(_objectSpread({}, paramsRef.current), {}, {
+                      pageNo: _pageNo - 1
+                    });
+                    _onSearch(paramsRef.current.pageNo, true);
+                  } else {
+                    setDataSource(content || []);
+                    dataSourceRef.current = content || [];
+                    setTotal(totalElements || '');
+                    setCurrent(_pageNo);
+                  }
+                case 5:
                 case "end":
                   return _context.stop();
               }

package/dist/components/YLModal/index.js

@@ -8,9 +8,10 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import React, { useRef, useState } from 'react';
+import { CloseOutlined } from '@ant-design/icons';
 import { Modal } from 'antd';
 import debounce from 'lodash/debounce';
+import React, { useRef, useState } from 'react';
 import Draggable from 'react-draggable';
 // 平台常见弹窗宽度分类
 // 1300 审方 开户信息查询详情
@@ -66,7 +67,10 @@ var YLModal = function YLModal(props) {
     closable: closable,
     maskClosable: false,
     width: width || 700,
-    className: "yl-modal ".concat(className || '')
+    className: "yl-modal custom_modal_close_icon ".concat(className || ''),
+    closeIcon: /*#__PURE__*/React.createElement("span", {
+      className: "custom_close_icon"
+    }, /*#__PURE__*/React.createElement(CloseOutlined, null), "\u5173\u95ED")
   }, restParams, {
     onOk: whetherDebounce && props.onOk ? React.useMemo(function () {
       return debounce(props.onOk, debounceTimeout);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yilianjituan/yilian_dgerm",
-  "version": "1.0.6",
+  "version": "1.0.7-alpha.2",
   "description": "A react library developed with dumi",
   "keywords": [
     "React",