@xfe-repo/web-components 1.7.3 → 1.7.4

package/dist/index.mjs

@@ -4089,12 +4089,10 @@ import { Transfer, Typography as Typography2 } from "antd";
 import useSWRImmutable2 from "swr/immutable";
 function useBrandOptions(params) {
     var _useRequestConfig = useRequestConfig(), config = _useRequestConfig.config, apiService = _useRequestConfig.apiService;
-    var _useSWRImmutable2 = useSWRImmutable2(// 只有当 params 存在时才发起请求，避免无效请求
-    params != null ? [
+    var _useSWRImmutable2 = useSWRImmutable2([
         "/product/brand/combo-box",
         params
-    ] : null, function(param) {
-        var _param = _sliced_to_array(param, 2), _params = _param[1];
+    ], function() {
         return _async_to_generator(function() {
             var _res_data, res, options;
             return _ts_generator(this, function(_state) {
@@ -4105,7 +4103,7 @@ function useBrandOptions(params) {
                             apiService.brandComboBox(_object_spread({
                                 page: 1,
                                 pageSize: 500
-                            }, _params), config)
+                            }, params), config)
                         ];
                     case 1:
                         res = _state.sent();
@@ -4432,15 +4430,22 @@ import { memo as memo25, useCallback as useCallback18, useState as useState19 }
 import { usePrevious as usePrevious4, useUpdateEffect as useUpdateEffect9 } from "react-use";
 import { debounce as debounce3 } from "@xfe-repo/web-utils/tools";
 import classnames8 from "classnames";
-import { Select as Select4, Typography as Typography3 } from "antd";
+// src/EffectBrandSelect/index.module.less
+var index_module_default11 = {
+    input: "index_module_input3",
+    select: "index_module_select2"
+};
+// src/EffectBrandSelect/index.tsx
+import { Select as Select4 } from "antd";
+import { Typography as Typography3 } from "antd";
 // src/EffectSkuSelect/index.tsx
 import { memo as memo24, useCallback as useCallback17, useEffect as useEffect16, useMemo as useMemo14, useState as useState18 } from "react";
 import { useMount, useUpdateEffect as useUpdateEffect8, usePrevious as usePrevious3 } from "react-use";
 import { debounce as debounce2, uuid as uuid2 } from "@xfe-repo/web-utils/tools";
 import classnames7 from "classnames";
 // src/EffectSkuSelect/index.module.less
-var index_module_default11 = {
-    input: "index_module_input3",
+var index_module_default12 = {
+    input: "index_module_input4",
     image: "index_module_image",
     preview: "index_module_preview",
     icon: "index_module_icon",
@@ -4711,7 +4716,7 @@ var EffectSkuSelect = memo24(function(props) {
         }
     };
     return /* @__PURE__ */ jsx34(Select3, _object_spread({
-        className: classnames7(index_module_default11.input, className)
+        className: classnames7(index_module_default12.input, className)
     }, selectBrandProps));
 });
 var SelectDropdown = memo24(function(props) {
@@ -4732,7 +4737,7 @@ var SelectDropdown = memo24(function(props) {
     }, []);
     return /* @__PURE__ */ jsx34("div", {
         id: selectDropdownId,
-        className: index_module_default11.select_dropdown,
+        className: index_module_default12.select_dropdown,
         onMouseDown: handleMouseDown,
         children: /* @__PURE__ */ jsx34(InfiniteScroll, {
             dataLength: options.length,
@@ -4749,22 +4754,22 @@ var SelectDropdown = memo24(function(props) {
             scrollableTarget: selectDropdownId,
             scrollThreshold: "100px",
             children: /* @__PURE__ */ jsx34("div", {
-                className: index_module_default11.options,
+                className: index_module_default12.options,
                 children: options.map(function(item) {
                     return /* @__PURE__ */ jsxs14("div", {
-                        className: classnames7(index_module_default11.option, item.value === value && index_module_default11.active),
+                        className: classnames7(index_module_default12.option, item.value === value && index_module_default12.active),
                         onClick: function onClick() {
                             return handleOnSelect(item);
                         },
                         children: [
                             /* @__PURE__ */ jsx34(ImageItem, {
-                                className: index_module_default11.select_image,
+                                className: index_module_default12.select_image,
                                 item: item,
                                 previewed: item.image === previewImage2,
                                 onPreview: handlePreview
                             }),
                             /* @__PURE__ */ jsx34("p", {
-                                className: index_module_default11.label,
+                                className: index_module_default12.label,
                                 children: item.label
                             })
                         ]
@@ -4785,7 +4790,7 @@ var ImageItem = memo24(function(props) {
     ]);
     var previewProps = useMemo14(function() {
         return {
-            maskClassName: "".concat(index_module_default11.item_mask_img),
+            maskClassName: "".concat(index_module_default12.item_mask_img),
             visible: previewed,
             onVisibleChange: function onVisibleChange(value) {
                 return !value && (onPreview === null || onPreview === void 0 ? void 0 : onPreview());
@@ -4796,16 +4801,16 @@ var ImageItem = memo24(function(props) {
         onPreview
     ]);
     return /* @__PURE__ */ jsxs14("div", {
-        className: classnames7(index_module_default11.image, className),
+        className: classnames7(index_module_default12.image, className),
         children: [
             /* @__PURE__ */ jsxs14("div", {
-                className: index_module_default11.preview,
+                className: index_module_default12.preview,
                 onClick: function onClick(event) {
                     return handlePreview(event);
                 },
                 children: [
                     /* @__PURE__ */ jsx34(EyeOutlined2, {
-                        className: index_module_default11.icon
+                        className: index_module_default12.icon
                     }),
                     " \u9884\u89C8"
                 ]
@@ -4823,64 +4828,44 @@ var getNumberValue = function getNumberValue(value) {
     var numValue = Number(value);
     return Number.isNaN(numValue) ? void 0 : numValue;
 };
-// src/EffectBrandSelect/index.module.less
-var index_module_default12 = {
-    input: "index_module_input4",
-    select: "index_module_select2"
-};
 // src/EffectBrandSelect/index.tsx
 import { jsx as jsx35 } from "react/jsx-runtime";
-var OTHER_BRAND_OPTION = {
-    label: "\u5176\u5B83",
-    value: 1310
-};
 var EffectBrandSelect = memo25(function(props) {
-    var onChange = props.onChange, className = props.className, defaultValue = props.defaultValue, controlValue = props.value, defaultLabel = props.defaultLabel, disabled = props.disabled, mode = props.mode, categoryId = props.categoryId, sysBizTypeId = props.sysBizTypeId, showOtherBrand = props.showOtherBrand, style = props.style;
-    var initialValue = controlValue !== null && controlValue !== void 0 ? controlValue : defaultValue;
-    var hasDefaultLabel = !!defaultLabel && initialValue !== void 0;
+    var onChange = props.onChange, className = props.className, defaultValue = props.defaultValue, controlValue = props.value, disabled = props.disabled, mode = props.mode, categoryId = props.categoryId, sysBizTypeId = props.sysBizTypeId, showOtherBrand = props.showOtherBrand, style = props.style;
     var _useState19 = _sliced_to_array(useState19(controlValue || defaultValue), 2), value = _useState19[0], setValue = _useState19[1];
-    var _useState191 = _sliced_to_array(useState19(function() {
-        if (hasDefaultLabel) return null;
-        return {
-            /** 兼容 props 分类 Id 异常传入 */ categoryId: getNumberValue(categoryId),
-            sysBizTypeId: sysBizTypeId,
-            brandId: initialValue === null || initialValue === void 0 ? void 0 : initialValue.toString()
-        };
-    }), 2), params = _useState191[0], setParams = _useState191[1];
-    var _useState192 = _sliced_to_array(useState19(hasDefaultLabel ? [
-        {
-            label: defaultLabel,
-            value: initialValue
-        }
-    ] : []), 2), options = _useState192[0], setOptions = _useState192[1];
-    var prevControlValue = usePrevious4(controlValue);
-    var state = useBrandOptions(params);
     var searchFetch = useCallback18(function(brandName, brandId) {
+        if (brandId !== void 0) brandId = String(brandId);
         setParams({
-            /** 兼容 props 分类 Id 异常传入 */ categoryId: getNumberValue(categoryId),
+            categoryId: getNumberValue(categoryId),
             sysBizTypeId: sysBizTypeId,
-            brandName: brandName || void 0,
-            brandId: brandId === null || brandId === void 0 ? void 0 : brandId.toString()
+            brandName: brandName,
+            brandId: brandId
         });
     }, [
         categoryId,
         sysBizTypeId
     ]);
-    var handleSearch = useCallback18(debounce3(800, function(searchName) {
-        return searchFetch(searchName);
-    }), [
-        searchFetch
-    ]);
-    var handleReset = useCallback18(function() {
-        return searchFetch("");
-    }, [
-        searchFetch
-    ]);
+    var _useState191 = _sliced_to_array(useState19({
+        /** 兼容props分类Id 异常传入 */ categoryId: getNumberValue(categoryId),
+        sysBizTypeId: sysBizTypeId,
+        brandName: "",
+        brandId: value === null || value === void 0 ? void 0 : value.toString()
+    }), 2), params = _useState191[0], setParams = _useState191[1];
+    var prevControlValue = usePrevious4(controlValue);
+    var state = useBrandOptions(params);
+    var _useState192 = _sliced_to_array(useState19(state.data || []), 2), options = _useState192[0], setOptions = _useState192[1];
     useUpdateEffect9(function() {
         if (!state.data) return;
-        setOptions(showOtherBrand ? _to_consumable_array(state.data).concat([
-            OTHER_BRAND_OPTION
-        ]) : state.data);
+        if (!showOtherBrand) {
+            setOptions(state.data);
+        } else {
+            setOptions(state.data.concat([
+                {
+                    label: "\u5176\u5B83",
+                    value: 1310
+                }
+            ]));
+        }
     }, [
         state.data,
         showOtherBrand
@@ -4902,7 +4887,7 @@ var EffectBrandSelect = memo25(function(props) {
     }, [
         controlValue
     ]);
-    var handleChange = function handleChange(_value, _option) {
+    var handleOnChange = function handleOnChange(_value, _option) {
         setValue(_value);
         if (mode === "multiple") {
             var options2 = _option;
@@ -4915,6 +4900,19 @@ var EffectBrandSelect = memo25(function(props) {
             onChange === null || onChange === void 0 ? void 0 : onChange(_value, option === null || option === void 0 ? void 0 : option.label);
         }
     };
+    var handleOnDeselect = function handleOnDeselect(_value) {
+        searchFetch("");
+    };
+    var handleOnSearch = function handleOnSearch(searchName) {
+        return searchFetch(searchName);
+    };
+    var handleOnSearchDebounce = useCallback18(debounce3(800, handleOnSearch), [
+        categoryId,
+        sysBizTypeId
+    ]);
+    var handleOnClear = function handleOnClear() {
+        return searchFetch("");
+    };
     if (state.error) {
         var _state_error;
         return /* @__PURE__ */ jsx35(Typography3.Text, {
@@ -4922,34 +4920,53 @@ var EffectBrandSelect = memo25(function(props) {
             children: (_state_error = state.error) === null || _state_error === void 0 ? void 0 : _state_error.toString()
         });
     }
-    return /* @__PURE__ */ jsx35(Select4, {
-        className: classnames8(index_module_default12.input, className),
+    var notFoundContent = state.isLoading ? "\u641C\u7D22\u4E2D" : "\u672A\u67E5\u8BE2\u5230\u76F8\u5173\u54C1\u724C";
+    var selectBrandProps = {
         popupMatchSelectWidth: false,
-        notFoundContent: state.isLoading ? "\u641C\u7D22\u4E2D" : "\u672A\u67E5\u8BE2\u5230\u76F8\u5173\u54C1\u724C",
+        notFoundContent: notFoundContent,
         placeholder: "\u8BF7\u8F93\u5165\u54C1\u724C\u540D\u79F0",
         optionFilterProp: "label",
         showSearch: true,
         allowClear: true,
         defaultActiveFirstOption: false,
         filterOption: false,
-        onChange: handleChange,
-        onSearch: handleSearch,
-        onDeselect: handleReset,
-        onClear: handleReset,
+        onChange: handleOnChange,
+        onSearch: handleOnSearchDebounce,
+        onDeselect: handleOnDeselect,
+        onClear: handleOnClear,
         loading: state.isLoading,
         value: value,
         options: options,
         disabled: disabled,
         mode: mode,
         style: style
-    });
+    };
+    return /* @__PURE__ */ jsx35(Select4, _object_spread({
+        className: classnames8(index_module_default11.input, className)
+    }, selectBrandProps));
 });
 // src/EffectSeriesSelect/index.tsx
-import { memo as memo26, useCallback as useCallback19, useEffect as useEffect17, useMemo as useMemo15, useRef as useRef11, useState as useState20 } from "react";
-import { Select as Select5 } from "antd";
+import { memo as memo26, useCallback as useCallback19, useState as useState20, useMemo as useMemo15, useEffect as useEffect17 } from "react";
 import { useMount as useMount2, usePrevious as usePrevious5, useUpdateEffect as useUpdateEffect10 } from "react-use";
 import { debounce as debounce4 } from "@xfe-repo/web-utils/tools";
 import classnames9 from "classnames";
+// src/EffectSeriesSelect/index.module.less
+var index_module_default13 = {
+    input: "index_module_input5",
+    hover: "index_module_hover",
+    dropdown: "index_module_dropdown",
+    img_opt: "index_module_img_opt",
+    item: "index_module_item",
+    icon_preview: "index_module_icon_preview",
+    icon_eye: "index_module_icon_eye",
+    item_img: "index_module_item_img",
+    item_mask_img: "index_module_item_mask_img",
+    item_label: "index_module_item_label",
+    txt_opt: "index_module_txt_opt",
+    active: "index_module_active2"
+};
+// src/EffectSeriesSelect/index.tsx
+import { Select as Select5 } from "antd";
 // src/EffectSeriesSelect/useSeriesOptions.ts
 import useSWRImmutable4 from "swr/immutable";
 function useSeriesOptions(params) {
@@ -4998,21 +5015,6 @@ function useSeriesOptions(params) {
         mutate: mutate
     };
 }
-// src/EffectSeriesSelect/index.module.less
-var index_module_default13 = {
-    input: "index_module_input5",
-    hover: "index_module_hover",
-    dropdown: "index_module_dropdown",
-    img_opt: "index_module_img_opt",
-    item: "index_module_item",
-    icon_preview: "index_module_icon_preview",
-    icon_eye: "index_module_icon_eye",
-    item_img: "index_module_item_img",
-    item_mask_img: "index_module_item_mask_img",
-    item_label: "index_module_item_label",
-    txt_opt: "index_module_txt_opt",
-    active: "index_module_active2"
-};
 // src/EffectSeriesSelect/index.tsx
 import { jsx as jsx36 } from "react/jsx-runtime";
 var EffectSeriesSelect = memo26(function(props) {
@@ -5021,11 +5023,13 @@ var EffectSeriesSelect = memo26(function(props) {
     var _useState201 = _sliced_to_array(useState20([]), 2), options = _useState201[0], setOptions = _useState201[1];
     var _useState202 = _sliced_to_array(useState20(controlValue || defaultValue), 2), value = _useState202[0], setValue = _useState202[1];
     var _useState203 = _sliced_to_array(useState20(""), 2), searchValue = _useState203[0], setSearchValue = _useState203[1];
-    var pageData = useRef11({
-        page: 1,
-        pageSize: 12,
-        hasMore: true
-    });
+    var pageData = useMemo15(function() {
+        return {
+            page: 1,
+            pageSize: 12,
+            hasMore: true
+        };
+    }, []);
     var conditions = useMemo15(function() {
         return {
             categoryId: categoryId,
@@ -5035,30 +5039,29 @@ var EffectSeriesSelect = memo26(function(props) {
         categoryId,
         brandId
     ]);
+    var searchFetch = useCallback19(function(params2) {
+        var page = params2.page, searchValue2 = params2.searchValue, conditions2 = params2.conditions, value2 = params2.value;
+        var pageSize = pageData.pageSize;
+        var id = getNumberValue(value2);
+        var serviceParams = _object_spread_props(_object_spread({}, conditions2), {
+            id: id,
+            seriesName: searchValue2,
+            page: page,
+            pageSize: pageSize
+        });
+        setParams(serviceParams);
+    }, []);
     var _useState204 = _sliced_to_array(useState20({
         categoryId: categoryId,
         brandId: brandId,
-        /** 兼容 props 分类 Id 异常传入 */ id: getNumberValue(value),
+        /** 兼容props分类Id 异常传入 */ id: getNumberValue(value),
         seriesName: searchValue,
-        page: pageData.current.page,
-        pageSize: pageData.current.pageSize
+        page: pageData.page,
+        pageSize: pageData.pageSize
     }), 2), params = _useState204[0], setParams = _useState204[1];
     var state = useSeriesOptions(params);
     var prevControlValue = usePrevious5(controlValue);
-    var searchFetch = useCallback19(function(fetchParams) {
-        var page = fetchParams.page, searchValue2 = fetchParams.searchValue, conditions2 = fetchParams.conditions, value2 = fetchParams.value;
-        var pageSize = pageData.current.pageSize;
-        var id = getNumberValue(value2);
-        setParams(_object_spread_props(_object_spread({}, conditions2), {
-            id: id,
-            seriesName: searchValue2,
-            page: page,
-            pageSize: pageSize
-        }));
-    }, []);
-    var debounceSearchFetch = useMemo15(function() {
-        return debounce4(300, searchFetch);
-    }, [
+    var debounceSearchFetch = useCallback19(debounce4(300, searchFetch), [
         searchFetch
     ]);
     useEffect17(function() {
@@ -5074,12 +5077,9 @@ var EffectSeriesSelect = memo26(function(props) {
                 brandId: brandId
             };
         });
-        var isFirstPage = state.data.page === 1;
-        pageData.current.page = state.data.page;
-        pageData.current.hasMore = pageData.current.pageSize * pageData.current.page < state.data.total && newOptions.length > 0;
-        setOptions(function(prev) {
-            return isFirstPage ? newOptions : _to_consumable_array(prev).concat(_to_consumable_array(newOptions));
-        });
+        pageData.page = state.data.page;
+        pageData.page === 1 ? setOptions(newOptions) : setOptions(_to_consumable_array(options).concat(_to_consumable_array(newOptions)));
+        pageData.hasMore = pageData.pageSize * pageData.page < state.data.total && newOptions.length > 0;
     }, [
         state.data
     ]);
@@ -5116,8 +5116,8 @@ var EffectSeriesSelect = memo26(function(props) {
         searchValue,
         conditions
     ]);
-    var handleOnSearch = useCallback19(function(text) {
-        return setSearchValue(text);
+    var handleOnSearch = useCallback19(function(value2) {
+        return setSearchValue(value2);
     }, []);
     var handleOnClear = useCallback19(function() {
         return setSearchValue("");
@@ -5130,7 +5130,7 @@ var EffectSeriesSelect = memo26(function(props) {
                         return [
                             4,
                             searchFetch({
-                                page: pageData.current.page + 1,
+                                page: pageData.page + 1,
                                 value: value,
                                 searchValue: searchValue,
                                 conditions: conditions
@@ -5149,11 +5149,11 @@ var EffectSeriesSelect = memo26(function(props) {
         searchValue,
         conditions
     ]);
-    var handleOnChange = useCallback19(function(newValue, option) {
+    var handleOnChange = useCallback19(function(value2, option) {
         var label = (option || {}).label;
-        var numValue = getNumberValue(newValue);
-        setValue(numValue);
-        onChange === null || onChange === void 0 ? void 0 : onChange(numValue, label);
+        value2 = getNumberValue(value2);
+        setValue(value2);
+        onChange === null || onChange === void 0 ? void 0 : onChange(value2, label);
         setOpenDropDown(false);
     }, [
         onChange
@@ -5163,25 +5163,27 @@ var EffectSeriesSelect = memo26(function(props) {
         if (options.length) return "\u6CA1\u6709\u66F4\u591A\u4E86~";
         return "\u6682\u65E0\u6570\u636E";
     }, [
-        state.isLoading,
-        options.length
+        state,
+        options,
+        brandId
     ]);
     var popupRender = useCallback19(function(_menu) {
         return /* @__PURE__ */ jsx36(SelectDropdown, {
             value: value,
             options: options,
             onLoadMore: handleOnLoadMore,
-            hasMore: pageData.current.hasMore,
+            hasMore: pageData.hasMore,
             noMoreText: noMoreText,
             onChange: handleOnChange
         });
     }, [
         value,
         options,
+        state,
         noMoreText,
         handleOnChange
     ]);
-    var selectProps = {
+    var selectBrandProps = {
         popupMatchSelectWidth: false,
         placeholder: "\u8BF7\u8F93\u5165\u7CFB\u5217\u540D\u79F0",
         optionFilterProp: "label",
@@ -5206,7 +5208,7 @@ var EffectSeriesSelect = memo26(function(props) {
     };
     return /* @__PURE__ */ jsx36(Select5, _object_spread({
         className: classnames9(index_module_default13.input, className)
-    }, selectProps));
+    }, selectBrandProps));
 });
 // src/EffectSpuSelect/index.tsx
 import { memo as memo27, useCallback as useCallback20, useEffect as useEffect18, useMemo as useMemo16, useState as useState21 } from "react";
@@ -5747,7 +5749,7 @@ var EffectSkuTable = memo28(function(props) {
     }));
 });
 // src/EffectWithFilePanel/index.tsx
-import { memo as memo29, useRef as useRef12, useState as useState23 } from "react";
+import { memo as memo29, useRef as useRef11, useState as useState23 } from "react";
 // src/EffectWithFilePanel/index.module.less
 var index_module_default15 = {
     accept: "index_module_accept"
@@ -5760,7 +5762,7 @@ var EffectWithFilePanel = memo29(function(props) {
     var _useState23 = _sliced_to_array(useState23(false), 2), uploadLoading = _useState23[0], setUploadLoading = _useState23[1];
     var _useState231 = _sliced_to_array(useState23(disabled ? "\u786E\u5B9A" : "\u4FDD\u5B58"), 2), submitText = _useState231[0], setSubmitText = _useState231[1];
     var drawerTitle = title || (disabled ? "\u67E5\u770B\u9644\u4EF6" : "\u4E0A\u4F20\u9644\u4EF6");
-    var uploadRef = useRef12(null);
+    var uploadRef = useRef11(null);
     var handleCLose = function handleCLose() {
         if (!uploadLoading) return true;
         return new Promise(function(resolve) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/web-components",
-  "version": "1.7.3",
+  "version": "1.7.4",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "sideEffects": [