Merge branch 'jinfa-0518' into 'jinfa-0518'

src/formSchema/effects/useAsyncSelect.ts

@@ -7,7 +7,7 @@ const { onFormMount$ } = FormEffectHooks
  * @param name 待处理的表单路径
  * @param service 触发的异步函数， 需返回一个{label: any, value: any}形式的数组
  */
-export const useAsyncSelect = async (name, service: () => Promise<any[]>, format?: [string, string], num = 999) => {
+export const useAsyncSelect = async (name, service: () => Promise<any[]>, format?: [string, string]) => {
   const { dispatch, setFieldState } = createFormActions()
 
   const linkage = useLinkageUtils()
@@ -33,7 +33,7 @@ export const useAsyncSelect = async (name, service: () => Promise<any[]>, format
       })
       linkage.loaded(name)
 
-      linkage.enum(name, enums.slice(0,num))
+      linkage.enum(name, enums)
       //请求结束可以dispatch一个自定义事件收尾，方便后续针对该事件做联动
       dispatch('requestAsyncSelect', {
         name,

src/pages/commodity/material/materialPendingAdd/add.tsx

@@ -576,7 +576,7 @@ const MaterialAdd: React.FC<IProps> = (props) => {
         effects={($, actions) => {
           useAsyncCascader('category', fetchCategoryData)
           useAsyncSelect('brand', fetchBrand, ["name", "id"])
-          useAsyncSelect('vendor', fetchVendor, ["name", 'memberGlobalMqId'], 10)
+          useAsyncSelect('vendor', fetchVendor, ["name", 'memberGlobalMqId'])
           useAsyncCascader('materialGroup', fetchTreeData);
           useBusinessEffects()
           useLinkEnumEffect('areaResponses', result => {