@xfe-repo/web-components 1.7.3 → 1.7.5

package/dist/index.d.mts

@@ -893,8 +893,6 @@ interface Props$7 {
     onChange?: (value?: BrandValueType, label?: string) => void;
     value?: BrandValueType;
     defaultValue?: BrandValueType;
-    /** 已知初始选项的显示文本，传入后首屏跳过接口请求，展开下拉时再加载完整选项 */
-    defaultLabel?: string;
     disabled?: boolean;
     categoryId?: number;
     mode?: 'multiple' | 'tags';

package/dist/index.d.ts

@@ -893,8 +893,6 @@ interface Props$7 {
     onChange?: (value?: BrandValueType, label?: string) => void;
     value?: BrandValueType;
     defaultValue?: BrandValueType;
-    /** 已知初始选项的显示文本，传入后首屏跳过接口请求，展开下拉时再加载完整选项 */
-    defaultLabel?: string;
     disabled?: boolean;
     categoryId?: number;
     mode?: 'multiple' | 'tags';

package/dist/index.js

@@ -4383,12 +4383,10 @@ var import_antd23 = require("antd");
 var import_immutable2 = __toESM(require("swr/immutable"));
 function useBrandOptions(params) {
     var _useRequestConfig = useRequestConfig(), config = _useRequestConfig.config, apiService = _useRequestConfig.apiService;
-    var _ref = (0, import_immutable2.default)(// 只有当 params 存在时才发起请求，避免无效请求
-    params != null ? [
+    var _ref = (0, import_immutable2.default)([
         "/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) {
@@ -4399,7 +4397,7 @@ function useBrandOptions(params) {
                             apiService.brandComboBox(_object_spread({
                                 page: 1,
                                 pageSize: 500
-                            }, _params), config)
+                            }, params), config)
                         ];
                     case 1:
                         res = _state.sent();
@@ -4724,9 +4722,9 @@ var import_antd29 = require("antd");
 // src/EffectBrandSelect/index.tsx
 var import_react39 = require("react");
 var import_react_use10 = require("react-use");
-var import_tools7 = require("@xfe-repo/web-utils/tools");
-var import_classnames9 = __toESM(require("classnames"));
 var import_antd26 = require("antd");
+var import_classnames9 = __toESM(require("classnames"));
+var import_tools7 = require("@xfe-repo/web-utils/tools");
 // src/EffectSkuSelect/index.tsx
 var import_react38 = require("react");
 var import_react_use9 = require("react-use");
@@ -5129,26 +5127,17 @@ var OTHER_BRAND_OPTION = {
     value: 1310
 };
 var EffectBrandSelect = (0, import_react39.memo)(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 _ref = _sliced_to_array((0, import_react39.useState)(controlValue || defaultValue), 2), value = _ref[0], setValue = _ref[1];
-    var _ref1 = _sliced_to_array((0, import_react39.useState)(function() {
-        if (hasDefaultLabel) return null;
-        return {
-            /** 兼容 props 分类 Id 异常传入 */ categoryId: getNumberValue(categoryId),
-            sysBizTypeId: sysBizTypeId,
-            brandId: initialValue === null || initialValue === void 0 ? void 0 : initialValue.toString()
-        };
+    var _state_data;
+    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 _ref = _sliced_to_array((0, import_react39.useState)(controlValue !== null && controlValue !== void 0 ? controlValue : defaultValue), 2), value = _ref[0], setValue = _ref[1];
+    var _ref1 = _sliced_to_array((0, import_react39.useState)({
+        /** 兼容 props 分类 Id 异常传入 */ categoryId: getNumberValue(categoryId),
+        sysBizTypeId: sysBizTypeId,
+        brandId: value === null || value === void 0 ? void 0 : value.toString()
     }), 2), params = _ref1[0], setParams = _ref1[1];
-    var _ref2 = _sliced_to_array((0, import_react39.useState)(hasDefaultLabel ? [
-        {
-            label: defaultLabel,
-            value: initialValue
-        }
-    ] : []), 2), options = _ref2[0], setOptions = _ref2[1];
     var prevControlValue = (0, import_react_use10.usePrevious)(controlValue);
     var state = useBrandOptions(params);
+    var _ref2 = _sliced_to_array((0, import_react39.useState)((_state_data = state.data) !== null && _state_data !== void 0 ? _state_data : []), 2), options = _ref2[0], setOptions = _ref2[1];
     var searchFetch = (0, import_react39.useCallback)(function(brandName, brandId) {
         setParams({
             /** 兼容 props 分类 Id 异常传入 */ categoryId: getNumberValue(categoryId),
@@ -5196,19 +5185,22 @@ var EffectBrandSelect = (0, import_react39.memo)(function(props) {
     }, [
         controlValue
     ]);
-    var handleChange = function handleChange(_value, _option) {
+    var handleChange = (0, import_react39.useCallback)(function(_value, _option) {
         setValue(_value);
         if (mode === "multiple") {
-            var options2 = _option;
-            var labels = options2 === null || options2 === void 0 ? void 0 : options2.map(function(option) {
-                return option.label;
+            var selectedOptions = _option;
+            var labels = selectedOptions === null || selectedOptions === void 0 ? void 0 : selectedOptions.map(function(opt) {
+                return opt.label;
             }).join(">>>");
             onChange === null || onChange === void 0 ? void 0 : onChange(_value, labels);
         } else {
-            var option = _option;
-            onChange === null || onChange === void 0 ? void 0 : onChange(_value, option === null || option === void 0 ? void 0 : option.label);
+            var selectedOption = _option;
+            onChange === null || onChange === void 0 ? void 0 : onChange(_value, selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.label);
         }
-    };
+    }, [
+        mode,
+        onChange
+    ]);
     if (state.error) {
         var _state_error;
         return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(import_antd26.Typography.Text, {

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();
@@ -4430,9 +4428,9 @@ import { Table as Table3 } from "antd";
 // src/EffectBrandSelect/index.tsx
 import { memo as memo25, useCallback as useCallback18, useState as useState19 } from "react";
 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";
+import classnames8 from "classnames";
+import { debounce as debounce3 } from "@xfe-repo/web-utils/tools";
 // 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";
@@ -4835,26 +4833,17 @@ var OTHER_BRAND_OPTION = {
     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 _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()
-        };
+    var _state_data;
+    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 !== null && controlValue !== void 0 ? controlValue : defaultValue), 2), value = _useState19[0], setValue = _useState19[1];
+    var _useState191 = _sliced_to_array(useState19({
+        /** 兼容 props 分类 Id 异常传入 */ categoryId: getNumberValue(categoryId),
+        sysBizTypeId: sysBizTypeId,
+        brandId: value === null || value === void 0 ? void 0 : value.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 _useState192 = _sliced_to_array(useState19((_state_data = state.data) !== null && _state_data !== void 0 ? _state_data : []), 2), options = _useState192[0], setOptions = _useState192[1];
     var searchFetch = useCallback18(function(brandName, brandId) {
         setParams({
             /** 兼容 props 分类 Id 异常传入 */ categoryId: getNumberValue(categoryId),
@@ -4902,19 +4891,22 @@ var EffectBrandSelect = memo25(function(props) {
     }, [
         controlValue
     ]);
-    var handleChange = function handleChange(_value, _option) {
+    var handleChange = useCallback18(function(_value, _option) {
         setValue(_value);
         if (mode === "multiple") {
-            var options2 = _option;
-            var labels = options2 === null || options2 === void 0 ? void 0 : options2.map(function(option) {
-                return option.label;
+            var selectedOptions = _option;
+            var labels = selectedOptions === null || selectedOptions === void 0 ? void 0 : selectedOptions.map(function(opt) {
+                return opt.label;
             }).join(">>>");
             onChange === null || onChange === void 0 ? void 0 : onChange(_value, labels);
         } else {
-            var option = _option;
-            onChange === null || onChange === void 0 ? void 0 : onChange(_value, option === null || option === void 0 ? void 0 : option.label);
+            var selectedOption = _option;
+            onChange === null || onChange === void 0 ? void 0 : onChange(_value, selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.label);
         }
-    };
+    }, [
+        mode,
+        onChange
+    ]);
     if (state.error) {
         var _state_error;
         return /* @__PURE__ */ jsx35(Typography3.Text, {

package/package.json

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