@hw-component/form 1.6.1 → 1.6.3

package/es/Select/hooks/norHooks.js

@@ -1,57 +1,122 @@
 // welcome to hoo hoo hoo
+import 'core-js/modules/es.object.keys.js';
+import 'core-js/modules/es.symbol.js';
+import 'core-js/modules/es.array.filter.js';
+import 'core-js/modules/es.object.get-own-property-descriptor.js';
+import 'core-js/modules/web.dom-collections.for-each.js';
+import 'core-js/modules/es.object.get-own-property-descriptors.js';
+import _toConsumableArray from '@babel/runtime-corejs3/helpers/toConsumableArray';
 import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
+import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
 import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
 import 'core-js/modules/es.array.iterator.js';
 import 'core-js/modules/es.object.to-string.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
 import 'core-js/modules/es.promise.js';
-import { useState, useEffect } from 'react';
+import 'core-js/modules/es.array.concat.js';
+import { useEffect, useState, useMemo } from 'react';
 import { useRequest } from 'ahooks';
 import { useFormContext } from '../../Form/Context/index.js';
 
-var useOptionReq = function useOptionReq(_ref) {
-  var manual = _ref.manual,
-    request = _ref.request,
-    options = _ref.options,
-    serviceSearch = _ref.serviceSearch,
-    showSearch = _ref.showSearch,
-    propsOnSearch = _ref.onSearch,
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var useSaveParams = function useSaveParams() {
+  var saveParams = useMemo(function () {
+    return {
+      listParams: {
+        isEnd: false,
+        page: 1,
+        size: 100,
+        reqParams: {}
+      }
+    };
+  }, []);
+  var resetSaveParams = function resetSaveParams() {
+    saveParams.listParams = {
+      isEnd: false,
+      page: 1,
+      size: 100,
+      reqParams: {}
+    };
+  };
+  var nextPage = function nextPage(data) {
+    var size = data.size,
+      total = data.total,
+      page = data.page;
+    saveParams.listParams.size = size;
+    saveParams.listParams.page = page + 1;
+    saveParams.listParams.isEnd = size * page >= total;
+  };
+  return {
+    saveParams: saveParams,
+    resetSaveParams: resetSaveParams,
+    nextPage: nextPage
+  };
+};
+var useOptionsRequest = function useOptionsRequest(_ref) {
+  var request = _ref.request,
     _ref$dispatch = _ref.dispatch,
-    dispatch = _ref$dispatch === void 0 ? {} : _ref$dispatch;
-  var dispatchManual = dispatch.manual;
+    dispatch = _ref$dispatch === void 0 ? {} : _ref$dispatch,
+    manual = _ref.manual,
+    options = _ref.options,
+    isList = _ref.isList;
+  var _useSaveParams = useSaveParams(),
+    saveParams = _useSaveParams.saveParams,
+    resetSaveParams = _useSaveParams.resetSaveParams,
+    nextPage = _useSaveParams.nextPage;
   var _useFormContext = useFormContext(),
     form = _useFormContext.form;
+  var dispatchManual = dispatch.manual;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     data = _useState2[0],
     setData = _useState2[1];
+  var paramsProvider = function paramsProvider(params) {
+    if (isList) {
+      var page = saveParams.listParams.page;
+      var size = saveParams.listParams.size;
+      return _objectSpread(_objectSpread({}, params), {}, {
+        page: page,
+        size: size
+      });
+    }
+    return params;
+  };
   var _useRequest = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var requestParams,
+        type,
         _requestParams$params,
         params,
         values,
-        _requestParams$type,
-        type,
         formData,
         _args = arguments;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             requestParams = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-            _requestParams$params = requestParams.params, params = _requestParams$params === void 0 ? {} : _requestParams$params, values = requestParams.values, _requestParams$type = requestParams.type, type = _requestParams$type === void 0 ? "init" : _requestParams$type;
+            type = _args.length > 1 && _args[1] !== undefined ? _args[1] : "init";
+            _requestParams$params = requestParams.params, params = _requestParams$params === void 0 ? saveParams.listParams.reqParams : _requestParams$params, values = requestParams.values;
             formData = values || (form === null || form === void 0 ? void 0 : form.getFieldsValue());
             if (type === "init") {
+              resetSaveParams();
               setData(undefined);
             }
+            saveParams.listParams.reqParams = params;
+            if (!(isList && saveParams.listParams.isEnd)) {
+              _context.next = 8;
+              break;
+            }
+            return _context.abrupt("return", data);
+          case 8:
             if (!request) {
-              _context.next = 6;
+              _context.next = 10;
               break;
             }
-            return _context.abrupt("return", request(params, formData));
-          case 6:
+            return _context.abrupt("return", request(paramsProvider(params), formData));
+          case 10:
             return _context.abrupt("return", Promise.resolve(options));
-          case 7:
+          case 11:
           case "end":
             return _context.stop();
         }
@@ -60,16 +125,53 @@ var useOptionReq = function useOptionReq(_ref) {
       manual: dispatchManual === false ? true : manual,
       debounceInterval: 300,
       onSuccess: function onSuccess(resultData) {
-        setData(resultData);
+        if (Array.isArray(resultData) || !resultData) {
+          return setData(resultData);
+        }
+        var oldData = data || [];
+        var resultOption = resultData.data;
+        var op = resultOption || [];
+        nextPage(resultData);
+        setData([].concat(_toConsumableArray(oldData), _toConsumableArray(op)));
       }
     }),
     run = _useRequest.run,
     loading = _useRequest.loading,
     error = _useRequest.error;
+  return {
+    loading: loading,
+    run: run,
+    error: error,
+    data: data,
+    setData: setData
+  };
+};
+var useSelectReq = function useSelectReq(_ref3) {
+  var manual = _ref3.manual,
+    request = _ref3.request,
+    options = _ref3.options,
+    serviceSearch = _ref3.serviceSearch,
+    showSearch = _ref3.showSearch,
+    propsOnSearch = _ref3.onSearch,
+    _ref3$dispatch = _ref3.dispatch,
+    dispatch = _ref3$dispatch === void 0 ? {} : _ref3$dispatch,
+    isList = _ref3.isList;
+  var _useOptionsRequest = useOptionsRequest({
+      request: request,
+      dispatch: dispatch,
+      manual: manual,
+      options: options,
+      isList: isList
+    }),
+    run = _useOptionsRequest.run,
+    loading = _useOptionsRequest.loading,
+    error = _useOptionsRequest.error,
+    data = _useOptionsRequest.data,
+    setData = _useOptionsRequest.setData;
   var reload = function reload(reloadParams) {
-    var _ref3 = reloadParams || {},
-      changeOpts = _ref3.options,
-      params = _ref3.params;
+    var _ref4 = reloadParams || {},
+      changeOpts = _ref4.options,
+      params = _ref4.params;
     if (changeOpts) {
       return setData(changeOpts);
     }
@@ -93,6 +195,13 @@ var useOptionReq = function useOptionReq(_ref) {
       setData(options);
     }
   }, [options]);
+  var onPopupScroll = function onPopupScroll(e) {
+    var target = e.target;
+    var changeTarget = target;
+    if (changeTarget.scrollTop + changeTarget.offsetHeight === changeTarget.scrollHeight) {
+      run({}, "page");
+    }
+  };
   var mathShowSearch = showSearch || serviceSearch;
   return {
     run: run,
@@ -101,19 +210,18 @@ var useOptionReq = function useOptionReq(_ref) {
     data: data,
     onSearch: mathShowSearch ? onSearch : propsOnSearch,
     mathShowSearch: showSearch || serviceSearch,
-    reload: reload
+    reload: reload,
+    onPopupScroll: isList ? onPopupScroll : undefined
   };
 };
-var useFilterOption = function useFilterOption(_ref4) {
-  var filterOption = _ref4.filterOption,
-    serviceSearch = _ref4.serviceSearch;
+var useFilterOption = function useFilterOption(_ref5) {
+  var filterOption = _ref5.filterOption,
+    serviceSearch = _ref5.serviceSearch;
   if (serviceSearch) {
-    return function () {
-      return true;
-    };
+    return false;
   }
   return filterOption;
 };
 
-export { useFilterOption, useOptionReq };
+export { useFilterOption, useSelectReq };
 // powered by hdj

package/es/Select/index.js

@@ -12,7 +12,7 @@ import 'core-js/modules/es.array.map.js';
 import { jsx } from 'react/jsx-runtime';
 import { createElement } from 'react';
 import { Select } from 'antd';
-import { useFilterOption, useOptionReq } from './hooks/norHooks.js';
+import { useFilterOption, useSelectReq } from './hooks/norHooks.js';
 import { useValueChange } from './hooks/changeHooks.js';
 import { defaultModeConfig, defaultSelectConfig } from './defaultConfig.js';
 import Index$1 from './components/DropdownComponent.js';
@@ -20,7 +20,7 @@ import Index$2 from './components/AllSelect.js';
 import { useMatchConfigProps, useChangeOptions } from '../hooks/index.js';
 import HFormConnect from '../Form/HFormConnect.js';
 
-var _excluded = ["style", "mode", "options", "modeConfig", "value", "onChange", "fieldNames", "request", "manual", "optionLabelProp", "filterProvider", "optionFilterProp", "serviceSearch", "onSearch", "filterOption", "showSearch", "labelInValue", "noMatchItemRender", "allSelect", "addDispatchListener", "addFormat", "dispatch"],
+var _excluded = ["style", "mode", "options", "modeConfig", "value", "onChange", "fieldNames", "request", "manual", "optionLabelProp", "filterProvider", "optionFilterProp", "serviceSearch", "onSearch", "filterOption", "showSearch", "labelInValue", "noMatchItemRender", "allSelect", "addDispatchListener", "addFormat", "dispatch", "isList", "onPopupScroll"],
   _excluded2 = ["value", "label"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -55,6 +55,8 @@ var Index = function Index(_ref) {
     addDispatchListener = _ref.addDispatchListener;
     _ref.addFormat;
     var dispatch = _ref.dispatch,
+    isList = _ref.isList,
+    propsOnPopupScroll = _ref.onPopupScroll,
     props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = (modeConfig === null || modeConfig === void 0 ? void 0 : modeConfig[mode || ""]) || {},
     icon = _ref2.icon,
@@ -67,7 +69,7 @@ var Index = function Index(_ref) {
     filterOption: filterOption,
     serviceSearch: serviceSearch
   });
-  var _useOptionReq = useOptionReq({
+  var _useSelectReq = useSelectReq({
       options: options,
       manual: manual,
       fieldNames: fieldNames,
@@ -75,15 +77,17 @@ var Index = function Index(_ref) {
       serviceSearch: serviceSearch,
       showSearch: showSearch,
       onSearch: propsOnSearch,
-      dispatch: dispatch
+      dispatch: dispatch,
+      isList: isList
     }),
-    run = _useOptionReq.run,
-    loading = _useOptionReq.loading,
-    resultData = _useOptionReq.data,
-    error = _useOptionReq.error,
-    onSearch = _useOptionReq.onSearch,
-    mathShowSearch = _useOptionReq.mathShowSearch,
-    reload = _useOptionReq.reload;
+    run = _useSelectReq.run,
+    loading = _useSelectReq.loading,
+    resultData = _useSelectReq.data,
+    error = _useSelectReq.error,
+    onSearch = _useSelectReq.onSearch,
+    mathShowSearch = _useSelectReq.mathShowSearch,
+    reload = _useSelectReq.reload,
+    onPopupScroll = _useSelectReq.onPopupScroll;
   var data = useChangeOptions({
     options: resultData,
     fieldNames: fieldNames
@@ -129,7 +133,8 @@ var Index = function Index(_ref) {
     optionFilterProp: optionFilterProp,
     filterOption: selfFilterOption,
     showSearch: mathShowSearch,
-    labelInValue: true
+    labelInValue: true,
+    onPopupScroll: propsOnPopupScroll || onPopupScroll
   }, props), {}, {
     children: data === null || data === void 0 ? void 0 : data.map(function (item) {
       var optionValue = item.value,

package/es/Select/modal.d.ts

@@ -3,7 +3,6 @@ import type React from "react";
 import type { PromiseFnResult } from "../modal";
 import type { addFormatItemModal, argsFn, DispatchModal } from "../Form/modal";
 export type OptionType = Record<string, any>;
-export type PartialHSelectProps = Partial<HSelectProps>;
 export type RenderFn = (data: OptionType) => React.ReactNode;
 interface ModeConfigItem {
     icon?: React.ReactNode | null;
@@ -14,9 +13,17 @@ export interface ModeConfig {
     tags?: ModeConfigItem;
 }
 type FilterProviderFn = (item: any) => string;
+type OptionsListType = OptionType[];
+export interface OptionsPageResultModal {
+    page: number;
+    size: number;
+    data: OptionsListType;
+    total: number;
+}
+export type OptionsDataType = OptionsListType | OptionsPageResultModal;
 export interface HSelectProps extends Omit<SelectProps, "options" | "placeholder"> {
     style?: React.CSSProperties;
-    request?: PromiseFnResult<any, OptionType[]>;
+    request?: PromiseFnResult<any, OptionsDataType>;
     manual?: boolean;
     modeConfig?: ModeConfig;
     filterProvider?: FilterProviderFn | string;
@@ -28,9 +35,11 @@ export interface HSelectProps extends Omit<SelectProps, "options" | "placeholder
     addFormat?: (format: Record<string, addFormatItemModal>) => void;
     placeholder?: string;
     dispatch?: DispatchModal;
+    isList?: boolean;
 }
 export interface FilterDataModal {
     value: any;
     index: number;
 }
+export type PartialHSelectProps = Partial<HSelectProps>;
 export {};

package/lib/Select/hooks/changeHooks.js

@@ -126,7 +126,11 @@ var matchNotFind = function matchNotFind(_ref5, oldVale) {
   var options = _ref5.options,
     value = _ref5.value,
     mode = _ref5.mode,
-    noMatchItemRender = _ref5.noMatchItemRender;
+    noMatchItemRender = _ref5.noMatchItemRender,
+    labelInValue = _ref5.labelInValue;
+  if (labelInValue) {
+    return value;
+  }
   if (!mode) {
     return single({
       options: options,
@@ -181,20 +185,20 @@ var useValueChange = function useValueChange(params) {
     onChange(newChangeVal, subItemOps);
   };
   React.useEffect(function () {
-    if (mode === "tags") {
-      setVal(value);
-      return;
-    }
     if (value === null || value === undefined) {
       setVal(undefined);
       return;
     }
+    if (mode === "tags") {
+      setVal(value);
+      return;
+    }
     if (options) {
       setVal(function (oldVale) {
         return matchNotFind(params, oldVale);
       });
     }
-  }, [value, options, mode, noMatchItemRender]);
+  }, [value, options, mode, noMatchItemRender, labelInValue]);
   return {
     val: val,
     change: change

package/lib/Select/hooks/norHooks.d.ts

@@ -1,16 +1,18 @@
-import type { OptionType, PartialHSelectProps } from "@/components/Select/modal";
+import type { OptionType, PartialHSelectProps } from "../modal";
+import { OptionsPageResultModal } from "../modal";
 interface ParamsModal {
     options?: OptionType[];
     params?: any;
 }
-export declare const useOptionReq: ({ manual, request, options, serviceSearch, showSearch, onSearch: propsOnSearch, dispatch, }: PartialHSelectProps) => {
-    run: (requestParams?: any) => Promise<OptionType[] | undefined>;
+export declare const useSelectReq: ({ manual, request, options, serviceSearch, showSearch, onSearch: propsOnSearch, dispatch, isList, }: PartialHSelectProps) => {
+    run: (requestParams?: any, type?: any) => Promise<OptionType[] | OptionsPageResultModal | undefined>;
     loading: boolean;
     error: Error | undefined;
     data: OptionType[] | undefined;
     onSearch: ((value: string) => void) | undefined;
     mathShowSearch: boolean | undefined;
-    reload: (reloadParams?: ParamsModal) => void | Promise<OptionType[] | undefined>;
+    reload: (reloadParams?: ParamsModal) => void | Promise<OptionType[] | OptionsPageResultModal | undefined>;
+    onPopupScroll: ((e: any) => void) | undefined;
 };
 export declare const useFilterOption: ({ filterOption, serviceSearch, }: PartialHSelectProps) => boolean | import("rc-select/lib/Select").FilterFunc<import("rc-select/lib/Select").DefaultOptionType> | undefined;
 export {};

package/lib/Select/hooks/norHooks.js

@@ -1,58 +1,123 @@
 'use strict';
 
+require('core-js/modules/es.object.keys.js');
+require('core-js/modules/es.symbol.js');
+require('core-js/modules/es.array.filter.js');
+require('core-js/modules/es.object.get-own-property-descriptor.js');
+require('core-js/modules/web.dom-collections.for-each.js');
+require('core-js/modules/es.object.get-own-property-descriptors.js');
+var _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArray');
 var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
 require('core-js/modules/es.array.iterator.js');
 require('core-js/modules/es.object.to-string.js');
 require('core-js/modules/web.dom-collections.iterator.js');
 require('core-js/modules/es.promise.js');
+require('core-js/modules/es.array.concat.js');
 var React = require('react');
 var ahooks = require('ahooks');
 var index = require('../../Form/Context/index.js');
 
-var useOptionReq = function useOptionReq(_ref) {
-  var manual = _ref.manual,
-    request = _ref.request,
-    options = _ref.options,
-    serviceSearch = _ref.serviceSearch,
-    showSearch = _ref.showSearch,
-    propsOnSearch = _ref.onSearch,
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var useSaveParams = function useSaveParams() {
+  var saveParams = React.useMemo(function () {
+    return {
+      listParams: {
+        isEnd: false,
+        page: 1,
+        size: 100,
+        reqParams: {}
+      }
+    };
+  }, []);
+  var resetSaveParams = function resetSaveParams() {
+    saveParams.listParams = {
+      isEnd: false,
+      page: 1,
+      size: 100,
+      reqParams: {}
+    };
+  };
+  var nextPage = function nextPage(data) {
+    var size = data.size,
+      total = data.total,
+      page = data.page;
+    saveParams.listParams.size = size;
+    saveParams.listParams.page = page + 1;
+    saveParams.listParams.isEnd = size * page >= total;
+  };
+  return {
+    saveParams: saveParams,
+    resetSaveParams: resetSaveParams,
+    nextPage: nextPage
+  };
+};
+var useOptionsRequest = function useOptionsRequest(_ref) {
+  var request = _ref.request,
     _ref$dispatch = _ref.dispatch,
-    dispatch = _ref$dispatch === void 0 ? {} : _ref$dispatch;
-  var dispatchManual = dispatch.manual;
+    dispatch = _ref$dispatch === void 0 ? {} : _ref$dispatch,
+    manual = _ref.manual,
+    options = _ref.options,
+    isList = _ref.isList;
+  var _useSaveParams = useSaveParams(),
+    saveParams = _useSaveParams.saveParams,
+    resetSaveParams = _useSaveParams.resetSaveParams,
+    nextPage = _useSaveParams.nextPage;
   var _useFormContext = index.useFormContext(),
     form = _useFormContext.form;
+  var dispatchManual = dispatch.manual;
   var _useState = React.useState(),
     _useState2 = _slicedToArray(_useState, 2),
     data = _useState2[0],
     setData = _useState2[1];
+  var paramsProvider = function paramsProvider(params) {
+    if (isList) {
+      var page = saveParams.listParams.page;
+      var size = saveParams.listParams.size;
+      return _objectSpread(_objectSpread({}, params), {}, {
+        page: page,
+        size: size
+      });
+    }
+    return params;
+  };
   var _useRequest = ahooks.useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var requestParams,
+        type,
         _requestParams$params,
         params,
         values,
-        _requestParams$type,
-        type,
         formData,
         _args = arguments;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             requestParams = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-            _requestParams$params = requestParams.params, params = _requestParams$params === void 0 ? {} : _requestParams$params, values = requestParams.values, _requestParams$type = requestParams.type, type = _requestParams$type === void 0 ? "init" : _requestParams$type;
+            type = _args.length > 1 && _args[1] !== undefined ? _args[1] : "init";
+            _requestParams$params = requestParams.params, params = _requestParams$params === void 0 ? saveParams.listParams.reqParams : _requestParams$params, values = requestParams.values;
             formData = values || (form === null || form === void 0 ? void 0 : form.getFieldsValue());
             if (type === "init") {
+              resetSaveParams();
               setData(undefined);
             }
+            saveParams.listParams.reqParams = params;
+            if (!(isList && saveParams.listParams.isEnd)) {
+              _context.next = 8;
+              break;
+            }
+            return _context.abrupt("return", data);
+          case 8:
             if (!request) {
-              _context.next = 6;
+              _context.next = 10;
               break;
             }
-            return _context.abrupt("return", request(params, formData));
-          case 6:
+            return _context.abrupt("return", request(paramsProvider(params), formData));
+          case 10:
             return _context.abrupt("return", Promise.resolve(options));
-          case 7:
+          case 11:
           case "end":
             return _context.stop();
         }
@@ -61,16 +126,53 @@ var useOptionReq = function useOptionReq(_ref) {
       manual: dispatchManual === false ? true : manual,
       debounceInterval: 300,
       onSuccess: function onSuccess(resultData) {
-        setData(resultData);
+        if (Array.isArray(resultData) || !resultData) {
+          return setData(resultData);
+        }
+        var oldData = data || [];
+        var resultOption = resultData.data;
+        var op = resultOption || [];
+        nextPage(resultData);
+        setData([].concat(_toConsumableArray(oldData), _toConsumableArray(op)));
       }
     }),
     run = _useRequest.run,
     loading = _useRequest.loading,
     error = _useRequest.error;
+  return {
+    loading: loading,
+    run: run,
+    error: error,
+    data: data,
+    setData: setData
+  };
+};
+var useSelectReq = function useSelectReq(_ref3) {
+  var manual = _ref3.manual,
+    request = _ref3.request,
+    options = _ref3.options,
+    serviceSearch = _ref3.serviceSearch,
+    showSearch = _ref3.showSearch,
+    propsOnSearch = _ref3.onSearch,
+    _ref3$dispatch = _ref3.dispatch,
+    dispatch = _ref3$dispatch === void 0 ? {} : _ref3$dispatch,
+    isList = _ref3.isList;
+  var _useOptionsRequest = useOptionsRequest({
+      request: request,
+      dispatch: dispatch,
+      manual: manual,
+      options: options,
+      isList: isList
+    }),
+    run = _useOptionsRequest.run,
+    loading = _useOptionsRequest.loading,
+    error = _useOptionsRequest.error,
+    data = _useOptionsRequest.data,
+    setData = _useOptionsRequest.setData;
   var reload = function reload(reloadParams) {
-    var _ref3 = reloadParams || {},
-      changeOpts = _ref3.options,
-      params = _ref3.params;
+    var _ref4 = reloadParams || {},
+      changeOpts = _ref4.options,
+      params = _ref4.params;
     if (changeOpts) {
       return setData(changeOpts);
     }
@@ -94,6 +196,13 @@ var useOptionReq = function useOptionReq(_ref) {
       setData(options);
     }
   }, [options]);
+  var onPopupScroll = function onPopupScroll(e) {
+    var target = e.target;
+    var changeTarget = target;
+    if (changeTarget.scrollTop + changeTarget.offsetHeight === changeTarget.scrollHeight) {
+      run({}, "page");
+    }
+  };
   var mathShowSearch = showSearch || serviceSearch;
   return {
     run: run,
@@ -102,20 +211,19 @@ var useOptionReq = function useOptionReq(_ref) {
     data: data,
     onSearch: mathShowSearch ? onSearch : propsOnSearch,
     mathShowSearch: showSearch || serviceSearch,
-    reload: reload
+    reload: reload,
+    onPopupScroll: isList ? onPopupScroll : undefined
   };
 };
-var useFilterOption = function useFilterOption(_ref4) {
-  var filterOption = _ref4.filterOption,
-    serviceSearch = _ref4.serviceSearch;
+var useFilterOption = function useFilterOption(_ref5) {
+  var filterOption = _ref5.filterOption,
+    serviceSearch = _ref5.serviceSearch;
   if (serviceSearch) {
-    return function () {
-      return true;
-    };
+    return false;
   }
   return filterOption;
 };
 
 exports.useFilterOption = useFilterOption;
-exports.useOptionReq = useOptionReq;
+exports.useSelectReq = useSelectReq;
 // powered by h