@bit-sun/business-component 4.0.12-alpha.3 → 4.0.12-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.0.12-alpha.3",
+  "version": "4.0.12-alpha.4",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Functional/SearchSelect/index.tsx

@@ -531,19 +531,20 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const handleSelectOver = (selectedValue: any) => {
     if (selectedValue?.length) {
       // 解决选择最后1页的sku，返回后，不显示名称问题
-      updateSelectDataSource(selectedValue)
+      const source = _.uniqBy(items.concat(selectedValue), 'value')
+      ctx?.form?.setFieldSource(resultSourceKey, source)
+      setSelectDataSource(source,source?.length)
       formaData(selectedValue, source);
     } else {
       const formatResult = selectMode ? [] : null
       onChange(formatResult, selectedValue)
     }
   }
-  const handleOk = (sValue?:any) => {
-    const pValue = sValue || popvalue
+  const handleOk = () => {
     // 按钮保存可传入
     if(onSaveCallback) {
       setConfirmLoading(true)
-      onSaveCallback(pValue).then(res => {
+      onSaveCallback(popvalue).then(res => {
         if(true) {
           // 成功信息可以在调用处处理 即resolve({messageSuccessBackInfo: { needThrowSuccess: false } })、resolve({messageSuccessBackInfo: { needThrowSuccess: true, successMessage: '已保存' } })
           let initSuccessMessage = '保存成功'
@@ -566,19 +567,11 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
         setConfirmLoading(false)
       })
     } else {
-      handleSelectOver(pValue)
+      handleSelectOver(popvalue)
       handleCancel();
     }
   };
 
-  // 更新选中数据位置
-  const updateSelectDataSource = (selectedValues) => {
-    const nSource = _.uniqBy(selectedValues.concat(items), 'value')
-    ctx?.form?.setFieldSource(resultSourceKey, nSource)
-    setSelectDataSource(nSource,nSource?.length)
-  };
-
-  // 下拉框 / 弹窗 选中数据之后 最终都会执行此函数
   const formaData = (value: any, source: any) => {
     if (labelInValue) {
       const formatResult = value.map((i: any) => ({ key: i[mappingValueField] || i.key, label: i[mappingTextField] || i.label, value: i[mappingValueField] || i.value }))
@@ -693,7 +686,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
     // 单选 默认直接选中 不需要确定  配置了modalRadioNeedFooter就需要确定
     if(!selectMode && !modalTableProps?.modalRadioNeedFooter) {
-      handleOk(selectRows)
+      handleSelectOver(selectRows)
+      handleCancel();
     }
 
     setSelectedRowKeys(sksResult)