@bit-sun/business-component 4.2.1-alpha.1-aiwei → 4.2.1-alpha.11-aiwei

package/src/components/Business/SearchSelect/index.md

@@ -317,7 +317,7 @@ export default () => {
     },
     // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
-    selectBusinessType: 'spuCommodityWithProperty',
+    selectBusinessType: 'skuCommodity',
   };
 
   const onTabChange = (key) => {
@@ -859,16 +859,17 @@ export default () => {
       console.log(value)
       setValue(value)
     },
-    // requestConfig: {
-    //   url: `/bop/api/store`,
-    //   filter: 'qp-name,code-orGroup,like',,
-    //   mappingTextField: 'name',
-    //   mappingValueField: 'code',
-    //   otherParams: {
-    //     sorter: 'desc-id'
-    //   }, // 默认参数
-    //   sourceName: 'code',
-    // },
+    requestConfig: {
+      url: `/bop/api/store`,
+      filter: 'qp-name,code-orGroup,like',
+      mappingTextField: 'name',
+      mappingValueField: 'code',
+      otherParams: {
+        sorter: 'desc-id'
+      }, // 默认参数
+      sourceName: 'code',
+      extralHeaders: {'x-biz-code': 3}
+    },
     // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
     selectBusinessType: 'shopFile',
@@ -878,6 +879,25 @@ export default () => {
     ...props,
     // prefixUrl: { selectPrefix: '/channel-manage/', formSelectFix: '/channel-manage/' },
     selectBusinessType: 'shopFile2',
+    modalTableProps: {
+      isOpen: true,
+      querySelectHeadersList: [
+        {
+        'x-biz-code': 3
+      }
+      ]
+    },
+    requestConfig: {
+      url: `/bop/api/store`,
+      filter: 'qp-name,code-orGroup,like',
+      mappingTextField: 'name',
+      mappingValueField: 'code',
+      otherParams: {
+        sorter: 'desc-id'
+      }, // 默认参数
+      sourceName: 'code',
+      extralHeaders: {'x-biz-code': 3}
+    },
   }
 
   const onTabChange = (key) => {

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

@@ -55,6 +55,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     viewShowValueStr, // 详情展示值,不传展示组件处理的默认值
     searchStartLength, // 默认不校验长度去搜索，如果配置了，则按照配置项长度进行处理搜索
     isQuery = false, // 是否是查询条件
+    requireSearchCondition = false, // 是否必须选择一个值
   } = rCTemp || {};
   const requestConfig = {url,method,otherParams,isMap,fixedparameter,fieldValToParam,fixedparamsDisabled,mappingTextField,mappingTextShowKeyField,mappingValueField,mappingTextShowTextField,init,extralHeaders,specialBracket,noNeedSplit,noOperate,viewShowValueStr,searchStartLength,...rCTemp};
   const resultSourceKey = handleSourceName(sourceName || requestConfig?.sourceName || ctx?.name || 'supplierCode')
@@ -479,6 +480,18 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   const onSearchTable = () => {
     const params = form.getFieldsValue();
+    // 必须选择一个值
+    if(requireSearchCondition) {
+      const hasValidValue = Object.values(params).some(value => 
+        (Array.isArray(value) && value.length > 0) || 
+        (typeof value === 'string' && value.trim().length > 0)
+      );
+      
+      if(!hasValidValue) {
+        message.warning('请至少选择一个搜索条件');
+        return;
+      }
+    }
     setModalSearched(true);
     setTableFormParams(params);
     getData({ ...params, pageSize: tableInitPageSize }, 2, null);
@@ -711,7 +724,25 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   }
 
   const renderShowTable =  (tableList, type) => {
-    const tableBoxHeighth = getTableHeigth(modalTableProps?.tableSearchForm);
+    const viCount = modalTableProps?.visibleFieldsCount || defaultVisibleFieldsCount;
+    const canExpand = hasMoreQueryFields(modalTableProps);
+    const collapsedList = modalTableProps?.tableSearchForm?.slice(0, viCount);
+    const baseHeight = getTableHeigth(collapsedList);
+    const rowsCollapsed = getFormRowInfo(collapsedList, modalTableProps?.tableSearchColSpan).totalRows;
+    const rowsExpandedData = getFormRowInfo(modalTableProps?.tableSearchForm, modalTableProps?.tableSearchColSpan);
+    let rowsExpanded = rowsExpandedData.totalRows;
+    let isMoreAction = false;
+    if(24 / modalTableProps?.tableSearchColSpan  - rowsExpandedData.emptyArray.length === 1) {
+      rowsExpanded++; 
+      isMoreAction = true;
+    }
+    const extraRows = (!collapsed && canExpand) ? Math.max(0, rowsExpanded - rowsCollapsed) : 0;
+    let tableBoxHeighth = baseHeight;
+    if(isMoreAction && extraRows > 0) {
+      tableBoxHeighth = tableBoxHeighth + ((extraRows - 1) ? (extraRows - 1) : 0) * 34 + 32
+    } else {
+      tableBoxHeighth = tableBoxHeighth + extraRows * 34
+    }
     const x = tableList?.length ? 82 : 28;  // 无数据没有分页，有数据计算减去：分页 24+16*2+10 「高 + margin * 2 + paddingBottom 10 」
     const oSY = `calc(100vh - ${tableBoxHeighth}px - ${x}px)`; 
     const mTB = `calc(50vh - ${tableBoxHeighth/2}px - ${x/2}px - 40px)`