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

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

@@ -73,11 +73,6 @@
   &_dropdown_table {
     // padding: 4px 10px 6px;
 
-    // 下拉table 复选框为单选时候隐藏
-    .ant-table-cell .ant-table-selection-column .ant-radio,table tr td.ant-table-selection-column .ant-radio-wrapper {
-      display: none;
-    }
-
     // 下拉table 表头表体样式
     .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table {
       font-family: MiSans-Regular;
@@ -103,7 +98,18 @@
     .ant-table.ant-table-bordered > .ant-table-container {
       .ant-table-body > table > tbody > tr > td.ant-table-selection-column,
       .ant-table-header > table > thead > tr > th.ant-table-selection-column {
-        display: none;
+        visibility: hidden; // 不使用 display: none; 是因为此设置不占位，会导致表格scroll.x: 'max-content' 计算不准确
+        padding: 0;
+        margin: 0;
+        width: 0;
+        height: 0;
+        min-width: 0;
+        min-height: 0;
+        border: none;
+
+        .ant-radio-wrapper {
+          display: none;
+        }
       }
     }
   }

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

@@ -7,7 +7,7 @@ import request from '@/utils/request';
 import _, { escapeRegExp, isNil, values } from "lodash"
 import './index.less';
 import { BusinessSearchSelect, QueryMutipleInput, QueryMutipleSearchSelect } from '@/index';
-import { handleSourceName, getFormRowInfo, hasMoreQueryFields, defaultVisibleFieldsCount, getRealStr, ColSpan, getTableHeigth, getCurrentSRKs, getRenderSource, handleParams, convertUrlQueryParams, convertBodyParams, formatSelectedValue, convertResData, makeUniqueValue, handleSelectOptionsShowValue, LightHeightOption, maxTagPlaceholder }  from './utils';
+import { handleSourceName, getFormRowInfo, hasMoreQueryFields, defaultVisibleFieldsCount, getRealStr, ColSpan, getTableHeigth, getCurrentSRKs, getRenderSource, handleParams, convertUrlQueryParams, convertBodyParams, formatSelectedValue, convertResData, makeUniqueValue, handleSelectOptionsShowValue, LightHeightOption, maxTagPlaceholder, getShowStr, handleTableColumns }  from './utils';
 import { judgeIsRequestError } from '@/utils/requestUtils';
 import zhankaitiaojian from '../../../assets/zhankaitiaojian-icon.svg';
 import PropertySelector from '@/components/Business/PropertyModal';
@@ -21,7 +21,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     selectProps = {},
     modalTableProps = {},
     labelInValue = false,
-    requestConfig,
+    needTopSelectedSource,
+    requestConfig:rCTemp,
     ctx,
     onlyShowStr = false,
     sourceName,
@@ -51,7 +52,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     noOperate, // 级联禁用按钮设置字段
     viewShowValueStr, // 详情展示值,不传展示组件处理的默认值
     searchStartLength, // 默认不校验长度去搜索，如果配置了，则按照配置项长度进行处理搜索
-  } = requestConfig || {};
+  } = 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')
 
   const selectMode = selectProps?.mode  // 设定当前选择器 为单选或者多选模式 无设定为单选模式（默认）
@@ -80,7 +82,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   const initPagination = { showQuickJumper: true, showSizeChanger: true, showTotal: (total: any) => `共 ${total} 条`, pageSize: tableInitPageSize }
   const tableInitPagination = { ...initPagination, total: 0, current: 1 }
-  const disabled = noOperate || selectProps?.disabled || props?.disabled;
+  const disabled = !!noOperate || selectProps?.disabled || props?.disabled;
   const isHaveDependency = fixedparameter && fieldValToParam && ctx;
   const isHaveDValue = () => {
     let formValueList = [];
@@ -139,7 +141,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const [indeterminate, setIndeterminate] = useState(false)
   const [tableFormParams, setTableFormParams] = useState({});
   const [tooltipVisible, setTooltipVisible] = useState(false);
-  const [tableShowColumns, setTabletShowColumns] = useState(modalTableProps?.tableColumns?.filter(s => typeof s.defaultSort == 'number')?.sort((a,b)=> a.defaultSort-b.defaultSort)||[]);
+  const [tableShowColumns, setTabletShowColumns] = useState(handleTableColumns(modalTableProps?.tableColumns)); // 默认展示表头-modalTableProps?.tableColumns
   const [confirmLoading, setConfirmLoading] = useState(false);
   const [modalSearched, setModalSearched]=useState(false);
 
@@ -233,7 +235,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     }
 
     let getRequest;
-    const methodName = method?.toLocaleLowerCase();
+    const methodName = method?.toLocaleLowerCase?.();
     if(['post','patch','put'].includes(methodName)) {
       getRequest = request[methodName](`${url}${convertUrlQueryParams(queryParams)}`,convertBodyParams(queryParams))
     } else {
@@ -250,7 +252,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
           return;
         }
         const res = result.data;
-        const source: any = convertResData(requestConfig, res, { selectMode, labelInValue, value, type, items, queryParams });
+        const source: any = convertResData(requestConfig, res, { selectMode, labelInValue, value, type, items, queryParams, needTopSelectedSource });
         
         if(callback) {
           callback(source)
@@ -321,6 +323,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   useEffect(() => {
     setUniqueValue(makeUniqueValue());
+    setTabletShowColumns(handleTableColumns(modalTableProps?.tableColumns));
   }, [resultSourceKey])
 
   useEffect(() => {
@@ -811,34 +814,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     );
   }
 
-  const getShowLabelTextStr = (kongValue): string => {
-    if (selectMode) {
-      return Array.isArray(value) && value?.map(item => item.label || item.text || '')?.join(',') || kongValue;
-    }
-    return (value?.label || value?.text || kongValue) as string;
-  };
-  const getSelectValueText = (v: any) => {
-    return (items || []).filter(item => item.value === v)?.[0]?.text || v || '';
-  }
-  const getShowValueStr = (kongValue): string => {
-    if (selectMode) {
-      return Array.isArray(value) && value?.map(item => getSelectValueText(item))?.join(',') || kongValue;
-    }
-    return (getSelectValueText(value) || kongValue) as string;
-  }
-  const getShowStr = () => {
-    // 优先使用业务使用传入的展示
-    if(viewShowValueStr) return viewShowValueStr;
-
-    const kongValue = '无'
-    // 先判断labelInValue与否，labelInValue可以直接去value中获取字段名称，否则去下拉框数据里面去拿；
-    // 再判断是单选还是多选，数据类型不同取值方式也不同
-    if (labelInValue) {
-      return getShowLabelTextStr(kongValue);
-    }
-    return getShowValueStr(kongValue);
-  }
-
   const isShouldShowStr = (props.disabled && ctx) || ctx?.mode == 'view';
   return (
     <div className={'search_select'}>
@@ -853,8 +828,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
         </div>
       ) : (
         isShouldShowStr ?
-        (<div title={getShowStr()} style={{overflow:'hidden',textOverflow:'ellipsis',whiteSpace:'nowrap'}} className={'search_select_show'}>
-          {getShowStr()}
+        (<div title={getShowStr({ viewShowValueStr, labelInValue, selectMode, value, items })} style={{overflow:'hidden',textOverflow:'ellipsis',whiteSpace:'nowrap'}} className={'search_select_show'}>
+          {getShowStr({viewShowValueStr, labelInValue, selectMode, value, items })}
         </div>) :
         <div
           className={`${isFormPage ? '' : 'search_select_show_list'} search_select_show`}

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

@@ -366,7 +366,6 @@ export const maxTagPlaceholder = (selectedValues: any, { selectProps, onChange,
   }
   return (
     <Tooltip 
-      open={true}
       overlayClassName='searchSelectMaxTagToolTip'
       destroyTooltipOnHide 
       placement="topRight" 
@@ -398,4 +397,43 @@ export const maxTagPlaceholder = (selectedValues: any, { selectProps, onChange,
   )
 }
 
-// ------------------------------------------ 数据源展示 相关处理--结束----------------------------------------
+// 弹窗数据表头处理
+export const handleTableColumns = (tableColumns: any) => {
+  // 按照默认设置排序 > 没有排序字段的展示所有列表头 > 没有表头列不展示
+  const showTableColumns = tableColumns?.filter((s: any) => typeof s.defaultSort == 'number')||tableColumns||[];
+  return showTableColumns?.sort((a: any,b: any)=> a.defaultSort-b.defaultSort)||[]
+};
+
+// ------------------------------------------ 数据源展示 相关处理--结束----------------------------------------
+
+
+
+// ------------------------------------------ 选中数据展示 相关处理--开始----------------------------------------
+const getShowLabelTextStr = ({ kongValue, selectMode, value, items }: any) => {
+  if (selectMode) {
+    return Array.isArray(value) && value?.map(item => item.label || item.text || '')?.join(',') || kongValue;
+  }
+  return (value?.label || value?.text || kongValue) as string;
+};
+const getSelectValueText = (v: any, items: any) => {
+  return (items || []).filter((item: any) => item.value === v)?.[0]?.text || v || '';
+}
+const getShowValueStr = ({ kongValue, selectMode, value, items }: any): string => {
+  if (selectMode) {
+    return Array.isArray(value) && value?.map(item => getSelectValueText(item, items))?.join(',') || kongValue;
+  }
+  return (getSelectValueText(value, items) || kongValue) as string;
+}
+export const getShowStr = ({ viewShowValueStr, labelInValue, selectMode, value, items }: any) => {
+  // 优先使用业务使用传入的展示
+  if(viewShowValueStr) return viewShowValueStr;
+
+  const kongValue = '无'
+  // 先判断labelInValue与否，labelInValue可以直接去value中获取字段名称，否则去下拉框数据里面去拿；
+  // 再判断是单选还是多选，数据类型不同取值方式也不同
+  if (labelInValue) {
+    return getShowLabelTextStr({ kongValue, selectMode, value, items});
+  }
+  return getShowValueStr({ kongValue, selectMode, value, items });
+}
+// ------------------------------------------ 选中数据展示 相关处理--结束---------------------------------------