@bit-sun/business-component 4.2.1-alpha.7-aiwei → 4.2.1-alpha.8-aiwei

package/dist/plugin/TableColumnSetting/index.d.ts

@@ -38,14 +38,14 @@ declare class TableColumnSetting extends React.Component<TableColumnSettingProps
     } | {
         title: string;
         dataIndex: string;
-        render: (text: any, record: any) => JSX.Element;
+        render: (text: any, record: any) => React.JSX.Element;
         className?: undefined;
         width?: undefined;
     } | {
         title: string;
         dataIndex: string;
         className: string;
-        render: () => JSX.Element;
+        render: () => React.JSX.Element;
         width?: undefined;
     })[];
     showModal: () => void;
@@ -53,13 +53,13 @@ declare class TableColumnSetting extends React.Component<TableColumnSettingProps
     handleCancel: (e: React.MouseEvent<HTMLElement>) => void;
     handleTableHeadHidden: (title: string) => void;
     onSortEnd: ({ oldIndex, newIndex }: any) => void;
-    DraggableContainer: (props: any) => JSX.Element;
-    DraggableBodyRow: ({ className, style, ...restProps }: any) => JSX.Element;
+    DraggableContainer: (props: any) => React.JSX.Element;
+    DraggableBodyRow: ({ className, style, ...restProps }: any) => React.JSX.Element;
     onChange: (e: any, title: any) => void;
     handleReset: () => void;
     handleResetSetting: () => Promise<unknown>;
     onSearch: (e: any) => void;
     onSearchSort: (e: any) => void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export default TableColumnSetting;

package/dist/utils/TableUtils.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import moment from 'moment';
 type mediaListType = {
     type: number;
@@ -48,24 +49,24 @@ declare const updateGuanDate: (requestParams: any, dateKeyParams?: any) => {
     };
     submit: any;
 };
-declare const textIcon: (type: string | number, text?: string) => JSX.Element | undefined;
-declare const handleTextDoubleOrId: (textOne: string | undefined, textTwo: string | undefined) => JSX.Element;
-declare const handleTextDouble: (textOne: string | undefined, textTwo: string | undefined) => JSX.Element;
-declare const handleTextOverflow: (text: string | undefined, width?: number) => JSX.Element;
-declare const handleTextLineFeed: (text: string | undefined, width?: number) => JSX.Element;
-declare const handleTextTooltip: (text: any) => JSX.Element;
-declare const handleTextBreakSpaces: (text: any) => JSX.Element;
-declare const handleStatusBadge: (text: any, color: any) => JSX.Element;
-declare const HandleTotalCount: (totalParams: any) => JSX.Element;
+declare const textIcon: (type: string | number, text?: string) => React.JSX.Element | undefined;
+declare const handleTextDoubleOrId: (textOne: string | undefined, textTwo: string | undefined) => React.JSX.Element;
+declare const handleTextDouble: (textOne: string | undefined, textTwo: string | undefined) => React.JSX.Element;
+declare const handleTextOverflow: (text: string | undefined, width?: number) => React.JSX.Element;
+declare const handleTextLineFeed: (text: string | undefined, width?: number) => React.JSX.Element;
+declare const handleTextTooltip: (text: any) => React.JSX.Element;
+declare const handleTextBreakSpaces: (text: any) => React.JSX.Element;
+declare const handleStatusBadge: (text: any, color: any) => React.JSX.Element;
+declare const HandleTotalCount: (totalParams: any) => React.JSX.Element;
 declare const handleCommonTimeRender: (text: any, format?: any) => any;
-declare const handleTooltip: (text: any, timeTrue?: boolean) => JSX.Element;
-declare const handleTooltipHours: (text: any, timeTrue?: boolean) => JSX.Element;
+declare const handleTooltip: (text: any, timeTrue?: boolean) => React.JSX.Element;
+declare const handleTooltipHours: (text: any, timeTrue?: boolean) => React.JSX.Element;
 type tableColumnsImageType = {
     width?: number | string;
     height?: number | string;
     [key: string]: any;
 };
-declare const tableColumnsImage: (url?: string, paramsObj?: tableColumnsImageType) => JSX.Element;
+declare const tableColumnsImage: (url?: string, paramsObj?: tableColumnsImageType) => React.JSX.Element;
 interface ColumnsEditInterfave {
     text?: string;
     record?: any;
@@ -81,7 +82,7 @@ interface ColumnsEditInterfave {
     };
     [key: string]: any;
 }
-declare const ColumnsEdit: (props: ColumnsEditInterfave) => JSX.Element;
+declare const ColumnsEdit: (props: ColumnsEditInterfave) => React.JSX.Element;
 type UserColumnsType = {
     name: string;
     department?: string;
@@ -89,13 +90,13 @@ type UserColumnsType = {
     company?: string;
     avatar?: string;
 };
-declare const userColumns: (props: UserColumnsType) => JSX.Element;
-declare const userInfoCard: (props: any) => JSX.Element;
+declare const userColumns: (props: UserColumnsType) => React.JSX.Element;
+declare const userInfoCard: (props: any) => React.JSX.Element;
 declare const getItemDefaultWidth: (item: any) => number;
-declare const sulaTableRenderTooltip: ({ text }: any) => JSX.Element;
+declare const sulaTableRenderTooltip: ({ text }: any) => React.JSX.Element;
 declare const renderNumberText: ({ text }: any) => any;
 declare const renderFixed2: (text: any) => any;
-declare const handleTextWarpCustom: (text: any, style?: {}) => JSX.Element;
+declare const handleTextWarpCustom: (text: any, style?: {}) => React.JSX.Element;
 declare const calculateValidPeriod: (start: any, end: any) => string;
-declare const handleTextWarp: (text: any) => JSX.Element;
+declare const handleTextWarp: (text: any) => React.JSX.Element;
 export { getSkuImg, updateGuanDate, textIcon, handleTextDoubleOrId, handleTextDouble, handleTextOverflow, handleTextLineFeed, handleTextTooltip, handleTextBreakSpaces, handleStatusBadge, HandleTotalCount, handleTooltip, handleCommonTimeRender, handleTooltipHours, tableColumnsImage, ColumnsEdit, userColumns, userInfoCard, getItemDefaultWidth, renderNumberText, sulaTableRenderTooltip, renderFixed2, handleTextWarpCustom, handleTextWarp, calculateValidPeriod };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.2.1-alpha.7-aiwei",
+  "version": "4.2.1-alpha.8-aiwei",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/SearchSelect/BusinessUtils.tsx

@@ -1858,15 +1858,15 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
     tableSearchForm = [
       { name: 'qp-name-like', label: '客户名称' },
       { name: 'qp-code-like', label: '客户编码' },
-      { name: 'qp-createOrgCode-eq', type: 'select', label: '创建组织', field: {
+      { name: 'qp-createOrgCode-in', type: 'select', label: '创建组织', field: {
           type: 'select',
           props: {
-            // mode: 'multiple',
+            mode: 'multiple',
             notFoundContent: '暂无数据',
             allowClear: true,
             showSearch: true,
             showArrow: true,
-            // maxTagCount: 1,
+            maxTagCount: 1,
             optionFilterProp: 'children',
             filterOption: (input: string, option: { props: { children: string } }) =>
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,

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);