@bit-sun/business-component 4.0.12-alpha.22 → 4.0.12-alpha.24

package/package.json

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

package/src/components/Business/PropertyModal/index.tsx

@@ -84,11 +84,11 @@ const PropertySelector = ({
 
             const newArr = (data?.data || []).map((item: any) => {
                 return {
-                    propertyCode: item.property.propertyCode,
-                    propertyName: item.property.name,
-                    propertyId: item.property.id,
-                    isCommonUse: item.property.isCommonUse === 'commonUse',
-                    detailList: item.propertyValueList.map((detail: any) => ({
+                    propertyCode: item.property?.propertyCode,
+                    propertyName: item.property?.name,
+                    propertyId: item.property?.id,
+                    isCommonUse: item.property?.isCommonUse === 'commonUse',
+                    detailList: (item.propertyValueList || []).map((detail: any) => ({
                         name: detail.value,
                         value: detail.value,
                         isCommonUse: detail.isCommonUse === 'commonUse',
@@ -104,17 +104,19 @@ const PropertySelector = ({
 
 
     useEffect(() => {
-        // 获取选中品类信息
-        setChoosedClassify(value?.classifyCode);
-
+        if (visible) {
+            // 获取选中品类信息
+            setChoosedClassify(value?.classifyCode || classifyOptionList[0]?.value);
+        }
         // 获取选中属性值展示
         const choosedPropertyList = (value?.propertyList || []).map(item => (item.detailList || []).map(detail => detail.name)).flat();
         if ((value?.propertyList || []).some(item => !item.isCommonUse)) {
             setShowNotCommon(true);
         }
-        setChoosedValues(choosedPropertyList);
         settingValue.current = {...value};
-    }, [value])
+        setChoosedValues(choosedPropertyList);
+
+    }, [value, visible])
 
     // 关闭弹窗回传组件值
     const handleConfirm = () => {

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

@@ -2,29 +2,16 @@
  * @Description:
  * @Author: rodchen
  * @Date: 2021-12-01 10:52:08
- * @LastEditTime: 2024-11-15 15:25:29
- * @LastEditors: rodchen rodchen_king@outlook.com
+ * @LastEditTime: 2021-12-29 19:14:56
+ * @LastEditors: rodchen
  */
 // @ts-nocheck
 import React, { useState, useEffect } from 'react';
 import { useDebounceFn } from 'ahooks';
-import { debounce } from 'lodash';
 import { Input, Button, Modal, ConfigProvider } from 'antd';
 import './index.less';
 
-export const handlePressEnter = debounce((ctx) => {
-  if (ctx?.table) {
-    ctx?.form?.validateFields?.().then((data: any) => {
-      const {
-        pagination: { pageSize },
-        sorter,
-      } = ctx?.table?.getPaging();
-      ctx?.table?.refreshTable({ pageSize, current: 1 }, data, sorter);
-    });
-  }
-}, 50);
-
-const QueryMutipleInput = ({ onValueChange,onPressEnter, ctx }) => {
+const QueryMutipleInput = ({ onValueChange,onPressEnter }) => {
   const [isModalVisible, setIsModalVisible] = useState(false);
   const [value, setValue] = useState('');
   const [popvalue, setPopValue] = useState('');
@@ -90,12 +77,7 @@ const QueryMutipleInput = ({ onValueChange,onPressEnter, ctx }) => {
           style={{ width: 'calc(100%)' }}
           suffix={<div className="query_input_expand_button" onClick={showModal}>...</div>}
           placeholder="请输入（查询多个值请用 ; 或 , 分割）"
-          onPressEnter={(e) => {
-            if (onPressEnter) {
-              onPressEnter(e);
-            }
-            if(ctx) handlePressEnter(ctx);
-          }}
+          onPressEnter={()=>onPressEnter?.()}
         />
       </div>
       <Modal

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

@@ -20,7 +20,7 @@
 
     .ant-select-dropdown {
       top: 24px !important;
-      width: calc(150%) !important;
+      width: calc(141%) !important;
     }
 
     // 下拉框清除图标位置调整
@@ -37,7 +37,7 @@
   &_show.search_select_show_list {
     .ant-select-dropdown {
       top: 24px !important;
-      width: calc(141%) !important;
+      width: calc(100% + 110px) !important;
     }
   }
 

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

@@ -5,7 +5,7 @@ import { Input, Button, Modal, Select, Divider, message, Spin, Form, Table, Chec
 import { SearchOutlined, CopyOutlined, CaretLeftOutlined } from '@ant-design/icons';
 import request from '@/utils/request';
 import { stringify } from 'querystring';
-import _, { escapeRegExp, isNil, values, debounce } from "lodash"
+import _, { escapeRegExp, isNil, values } from "lodash"
 import './index.less';
 import { BusinessSearchSelect, QueryMutipleInput } from '@/index';
 import { handleSourceName, getFormRowInfo, hasMoreQueryFields, defaultVisibleFieldsCount, getRealStr, ColSpan, getTableHeigth, getCurrentSRKs, getRenderSource }  from './utils';
@@ -13,18 +13,6 @@ import { judgeIsRequestError } from '@/utils/requestUtils';
 import zhankaitiaojian from '../../../assets/zhankaitiaojian-icon.svg';
 import PropertySelector from '@/components/Business/PropertyModal';
 
-export const handlePressEnter = debounce((ctx) => {
-  if (ctx?.table) {
-    ctx?.form?.validateFields?.().then((data) => {
-      const {
-        pagination: { pageSize },
-        sorter,
-      } = ctx?.table?.getPaging();
-      ctx?.table?.refreshTable({ pageSize, current: 1 }, data, sorter);
-    });
-  }
-}, 50);
-
 const { Option } = Select;
 
 const SearchSelect = forwardRef((props: any, ref: any) => {
@@ -1023,10 +1011,10 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     { label: `已选（${selectedRowKeys?.length || 0}）`, key: 'selected', children: renderShowTable(selectedRows?.map((s,index)=> ({...s,keyIndex:index+1}))||[],'noPage')  },
   ];
 
-  const resetSelectDataSource = () => {
+  const resetSelectDataSource = (isClear=false) => {
     setSearchValue('');
     // 有关联值 不需要清空下拉框数据 也不需要重新去请求了
-    if(isHaveDependency) return;
+    if(!isClear && isHaveDependency) return; // 清空时需要放开：级联首次回之后，清空数据需要重新查询下拉框的值
     clearSelectDataSource();
     init && run('init')
   }
@@ -1038,7 +1026,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     formaData([], items);
     onChangeSelectedKeys([], [])
     // 重置下拉框数据源
-    resetSelectDataSource();
+    resetSelectDataSource(true);
   }
 
   const onDeselect = (...arg) => {
@@ -1243,22 +1231,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
               )
             }
             onPopupScroll={SelectScroll}
-            onKeyDown={(e) => {
-              if ((e.key === 'Enter' || e.keyCode === 13) && !selectOpen) {
-                if (props?.onPressEnter) {
-                  props.onPressEnter?.(e);
-                }
-                handlePressEnter(ctx);
-                setSelectOpen(false)
-                e.preventDefault();
-                e.stopPropagation();
-                return;
-              } else if(e.keyCode === 9 || e.key === 'Tab') {
-                setSelectOpen(false)
-              } else {
-                setSelectOpen(true)
-              }
-            }}
             style={{ width: 'calc(100%)' }}
             placeholder="请选择"
             maxTagPlaceholder={maxTagPlaceholder}