@yilianjituan/yilian_dgerm 0.0.1-alpha.38 → 0.0.1-alpha.39

package/dist/components/DropDownSelect/index.interface.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from "antd";
 export interface OptionItem {
     /**
@@ -11,7 +12,7 @@ export interface OptionItem {
     /**
     * @description list展示项
     */
-    lable: (item: any) => string;
+    lable: (item: any) => string | React.ReactNode;
 }
 export interface DropDownSelectProps extends SelectProps {
     /**
@@ -71,4 +72,8 @@ export interface DropDownSelectProps extends SelectProps {
     * @description 是否开启搜索查询
     */
     changeNoSearch?: boolean;
+    /**
+     * @description 是否初始化搜索
+     */
+    isInitSearch?: boolean;
 }

package/dist/components/DropDownSelect/index.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["http", "url", "method", "handleSelect", "showValue", "customInput", "searchValue", "additionalParameters", "dynamicParameter", "beforeSearch", "filterOptionsCallback", "onChange", "changeNoSearch", "mode"];
+var _excluded = ["http", "url", "method", "handleSelect", "showValue", "customInput", "searchValue", "additionalParameters", "dynamicParameter", "beforeSearch", "filterOptionsCallback", "onChange", "changeNoSearch", "mode", "isInitSearch"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -45,6 +45,8 @@ var Index = function Index(props) {
     changeNoSearch = _props$changeNoSearch === void 0 ? true : _props$changeNoSearch,
     _props$mode = props.mode,
     mode = _props$mode === void 0 ? undefined : _props$mode,
+    _props$isInitSearch = props.isInitSearch,
+    isInitSearch = _props$isInitSearch === void 0 ? false : _props$isInitSearch,
     prop = _objectWithoutProperties(props, _excluded);
   var id = showValue.id,
     value = showValue.value,
@@ -60,8 +62,14 @@ var Index = function Index(props) {
   var totalPagesRef = useRef(1); //总页数
   var pageRef = useRef(1); //当前页
   var paramsRef = useRef(''); //查询参数·
+  var selectValueRef = useRef(''); //当前选中的值
   var storeListRef = useRef([]); //列表
   var selectRef = useRef({});
+  var _useState5 = useState(true),
+    _useState6 = _slicedToArray(_useState5, 2),
+    isFetchedData = _useState6[0],
+    setIsFetchedData = _useState6[1]; // 是否需要获取数据
+  var _additionalParameters = dynamicParameter && beforeSearch ? beforeSearch(dynamicParameter) : additionalParameters;
 
   /**
    * 查询接口
@@ -89,7 +97,7 @@ var Index = function Index(props) {
   */
   var getStoreList = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(type) {
-      var _additionalParameters, data, target, options;
+      var data, target, options;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -100,20 +108,20 @@ var Index = function Index(props) {
             return _context2.abrupt("return");
           case 2:
             setSelectState(true);
-            _additionalParameters = dynamicParameter && beforeSearch ? beforeSearch(dynamicParameter) : additionalParameters;
-            _context2.next = 6;
-            return inquireDiseases(_objectSpread(_defineProperty(_defineProperty(_defineProperty({}, searchValue, paramsRef.current), "pageNo", pageRef.current), "pageSize", 10), _additionalParameters ? _additionalParameters : {}));
-          case 6:
+            _context2.next = 5;
+            return inquireDiseases(_objectSpread(_defineProperty(_defineProperty(_defineProperty({}, searchValue, paramsRef.current), "pageNo", pageRef.current), "pageSize", 10), _additionalParameters || {}));
+          case 5:
             data = _context2.sent;
             if (data.code === "OK") {
               target = data.result;
               totalPagesRef.current = target.totalPages;
-              options = filterOptionsCallback ? filterOptionsCallback(target.content) : target.content || target;
+              options = filterOptionsCallback ? filterOptionsCallback(target.content || target) : target.content || target;
               storeListRef.current = type === 'scoll' ? [].concat(_toConsumableArray(storeListRef.current), _toConsumableArray(options)) : options;
               setStoreList(storeListRef.current || []);
+              setIsFetchedData(false); // 设置不需要获取数据
               setSelectState(false);
             }
-          case 8:
+          case 7:
           case "end":
             return _context2.stop();
         }
@@ -124,8 +132,14 @@ var Index = function Index(props) {
     };
   }();
   useEffect(function () {
-    getStoreList();
-  }, []);
+    if (isInitSearch) {
+      getStoreList();
+    }
+  }, [isInitSearch]);
+  useEffect(function () {
+    setIsFetchedData(true); // 设置需要获取数据
+  }, [_additionalParameters]);
+
   // 搜索
   var onFilterChange = _.debounce(function (e) {
     if (typeof e === 'string') {
@@ -134,15 +148,17 @@ var Index = function Index(props) {
       getStoreList();
     }
   }, 300);
+
   // 选择
   var onChangeSelect = function onChangeSelect(value, option) {
     var _selectRef$current;
     if (changeNoSearch && typeof value === 'string') {
-      paramsRef.current = value;
+      selectValueRef.current = value;
     }
     mode === undefined && ((_selectRef$current = selectRef.current) === null || _selectRef$current === void 0 ? void 0 : _selectRef$current.blur());
     handleSelect === null || handleSelect === void 0 || handleSelect(value, option);
   };
+
   // 下拉加载
   var companyScroll = function companyScroll(e) {
     var target = e.target;
@@ -150,22 +166,34 @@ var Index = function Index(props) {
       scrollHeight = target.scrollHeight,
       scrollTop = target.scrollTop;
     if (Math.ceil(scrollTop + offsetHeight) === scrollHeight) {
-      pageRef.current = pageRef.current + 1;
-      if (pageRef.current <= totalPagesRef.current) {
-        getStoreList('scoll');
+      if (pageRef.current < totalPagesRef.current) {
+        // 检查当前页是否小于总页数
+        pageRef.current += 1; // 增加当前页码
+        getStoreList('scoll'); // 获取下一页数据
       }
     }
   };
+
   // 失焦
   var onBlurSelect = function onBlurSelect() {
-    return !!paramsRef.current && handleSelect && handleSelect(paramsRef.current);
+    paramsRef.current && setIsFetchedData(true); // 如果有搜索内容，则需要获取数据
+    if (!!selectValueRef.current) {
+      handleSelect === null || handleSelect === void 0 || handleSelect(selectValueRef.current);
+    }
   };
+
+  // 聚焦
   var onFocusSelect = function onFocusSelect() {
-    paramsRef.current = '';
-    pageRef.current = 1;
-    setStoreList([]); // 获取焦点时重置列表，否则会偶现没有滚动条
-    getStoreList();
+    if (isFetchedData) {
+      // 需要获取数据
+      paramsRef.current = '';
+      pageRef.current = 1; // 重置当前页码
+      setStoreList([]); // 获取焦点时重置列表，否则会偶现没有滚动条
+      getStoreList();
+    }
   };
+
+  // 下拉框渲染
   var renderCom = function renderCom() {
     var dropdownRender = function dropdownRender(menu) {
       return /*#__PURE__*/React.createElement("div", null, menu, /*#__PURE__*/React.createElement("div", {
@@ -210,7 +238,8 @@ var Index = function Index(props) {
       }
     });
     return /*#__PURE__*/React.createElement(Select, _extends({}, commonProps, {
-      ref: selectRef
+      ref: selectRef,
+      filterOption: false
     }), options);
   };
   return renderCom();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yilianjituan/yilian_dgerm",
-  "version": "0.0.1-alpha.38",
+  "version": "0.0.1-alpha.39",
   "description": "A react library developed with dumi",
   "keywords": [
     "React",
@@ -59,7 +59,7 @@
     "@ant-design/icons": "^5.5.1",
     "@hanyk/rc-viewer": "^0.0.3",
     "ahooks": "^3.7.2",
-    "antd": "^5.18.0",
+    "antd": "^5.21.6",
     "axios": "^1.7.7",
     "copy-to-clipboard": "^3.3.3",
     "dayjs": "^1.11.11",