@bit-sun/business-component 4.2.1-alpha.6-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.6-aiwei",
+  "version": "4.2.1-alpha.8-aiwei",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -6,7 +6,7 @@ import { handleTextOverflow, tableColumnsImage, handleTooltip } from '@/componen
 import { getSkuImg } from '@/utils/TableUtils';
 import { getEmployeeCode, getCurrentTargetBgId } from '@/utils/LocalstorageUtils';
 import { Image } from 'antd';
-import { isBoolean } from 'lodash';
+import { isBoolean, trim } from 'lodash';
 
 const hasDictSharingType =  getDictionarySource('UC000013')?.length;
 const sharingTypeDataList = hasDictSharingType && getDictionarySource('UC000013') || sharingType
@@ -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,
@@ -2295,11 +2295,74 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           },
         },
       },
-      { name: 'qp-manageSupervisor-like', label: '管理督导', type: 'input' },
-      { name: 'qp-directSupervisor-like', label: '直接督导', type: 'input' },
-      { name: 'qp-distributionItem-like', label: '分销商品', type: 'input' },
-      { name: 'qp-headItem-like', label: '总部商品', type: 'input' },
-      { name: 'qp-storeChannelName-like', label: '管理模式', type: 'input' },
+      { name: 'qp-manageSupervisor-like', type: 'select', label: '管理督导', field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+             {
+              debugger
+              return (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+             }
+        },
+      } },
+      { name: 'qp-directSupervisor-like', type: 'select', label: '直接督导', field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+             (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+        },
+      } },
+      { name: 'qp-distributionItem-like', type: 'select', label: '分销商品', field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+             (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+        },
+      } },
+      { name: 'qp-headItem-like', type: 'select', label: '总部商品', field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+             (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+        },
+      } },
+      { name: 'qp-storeChannelName-like', type: 'select', label: '管理模式', field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+             (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+        },
+      } },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -2320,7 +2383,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         pageSize: 5000,
         currentPage: 1,
         'ctl-withAuth': true,
-      },getQueryHeadersItem(queryHeaderParams,'ctl-withAuth'))
+      },getQueryHeadersItem(queryHeaderParams,'ctl-withAuth')),
+      loadSelectSource(`/channel-manage/store/selectStoreOperationalInfo`, {}, getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in'))
     ]).then((x: any)=>{
       const newData1: any[] = [];
       x[1]?.data[0]?.channelInfoSon?.forEach((item: any) => {
@@ -2333,6 +2397,25 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       formatTreeDataSource(x, 1, 4, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
       formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
       formatSource(x,3, 7, tableSearchForm, ['brandCode', 'name']);
+      
+      const opRaw = x[4]?.data;
+      // 新增label属性
+      opList?.forEach((r: any) => {
+        r.label = r?.value;
+      })
+      let opList = Array.isArray(opRaw) ? opRaw : (opRaw?.items || opRaw?.list || []);
+      if (Array.isArray(opList) && Array.isArray(opList[0]) && !opList[0]?.field) { opList = opList[0]; }
+      const m1 = opList?.filter((r: any) => r?.field === 'manage_supervisor' && trim(r?.value));
+      const m2 = opList?.filter((r: any) => r?.field === 'direct_supervisor' && trim(r?.value));
+      const m3 = opList?.filter((r: any) => r?.field === 'distribution_item' && trim(r?.value));
+      debugger
+      const m4 = opList?.filter((r: any) => r?.field === 'head_item' && trim(r?.value));
+      const m5 = opList?.filter((r: any) => r?.field === 'store_channel_name' && trim(r?.value));
+      tableSearchForm[8] = { ...tableSearchForm[8], initialSource: m1 };
+      tableSearchForm[9] = { ...tableSearchForm[9], initialSource: m2 };
+      tableSearchForm[10] = { ...tableSearchForm[10], initialSource: m3 };
+      tableSearchForm[11] = { ...tableSearchForm[11], initialSource: m4 };
+      tableSearchForm[12] = { ...tableSearchForm[12], initialSource: m5 };
     })
     modalTableProps = {
       modalTableTitle: '选择商店',

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