@bit-sun/business-component 4.0.13-alpha.8 → 4.2.0-aiwei-alpha.1

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

@@ -26,9 +26,9 @@ import {
   ProfileTwoTone,
   UnorderedListOutlined,
 } from '@ant-design/icons';
-import request from '@/utils/request';
+import request from '@/utils/cachedRequest';
 import './index.less';
-import _ from "lodash"
+import _, { ceil, isNumber } from "lodash"
 import { judgeIsRequestError } from '@/utils/requestUtils';
 import { readerXlsxToList } from '@/utils/xlsxUtil';
 
@@ -179,10 +179,26 @@ class DataValidation extends React.Component {
   }
 
   getCount = () => {
-    const { resultData } = this.state;
+    const { resultData = [] } = this.state;
+    const totalQuantity = resultData.reduce((total, item) => {
+        total += Number(item.quantity || 0);
+      return total;
+    }, 0);
+    const totalSuccessQuantity = resultData.filter(item => item.flag).reduce((total, item) => {
+        total += Number(item.quantity || 0);
+      return total;
+    }, 0);
+    const totalErrorQuantity = resultData.filter(item => !item.flag).reduce((total, item) => {
+        total += Number(item.quantity || 0);
+      return total;
+    }, 0);
     return {
       total: resultData.length,
+      totalQuantity,
+      totalSuccessQuantity,
+      totalErrorQuantity,
       error: resultData.filter((item) => !item.flag).length,
+      success: resultData.filter((item) => item.flag).length,
     };
   };
 
@@ -191,7 +207,7 @@ class DataValidation extends React.Component {
     const { notValid } = this.props;
     return {
       container: 'luckysheet',
-      showtoolbar: false,
+      // showtoolbar: false,
       hook: {
         columnTitleCellRenderBefore: function (columnAbc, postion, ctx) {
           if (columnAbc.name) {
@@ -233,18 +249,9 @@ class DataValidation extends React.Component {
           // console.info(data,sheetFile,ctx)
         },
       },
-      // showtoolbarConfig: {
-      //   undoRedo: true, //撤销重做，注意撤消重做是两个按钮，由这一个配置决定显示还是隐藏
-      //   paintFormat: false, //格式刷
-      //   currencyFormat: false, //货币格式
-      //   percentageFormat: false, //百分比格式
-      //   numberDecrease: false, // '减少小数位数'
-      //   numberIncrease: false, // '增加小数位数
-      //   moreFormats: false, // '更多格式'
-      //   font: true, // '字体'
-      //   fontSize: true, // '字号大小'
-
-      // },
+      showtoolbarConfig: {
+        sortAndFilter: true,
+      },
       data: [
         {
           name: 'Cell', //工作表名称
@@ -365,7 +372,7 @@ class DataValidation extends React.Component {
       showsheetbar: false,
       optionstate: false,
       showstatisticBarConfig: {
-        count: false, // 计数栏
+        count: true, // 计数栏
         view: false, // 打印视图
         zoom: false, // 缩放
       },
@@ -422,9 +429,58 @@ class DataValidation extends React.Component {
     return data.filter(d => _.compact(Object.values(d)).length);
   };
 
-  resetData = () => {
-    const { validDataUrl, validDataParams, updateData, columns, isBrandAuth, isCheckStockNum = true, customerColumnsMapping } = this.props;
-    const resultData = this.getData().filter(d => {
+  naturalCompare = (a, b) => {
+  const checkNumber = (value) => {
+    return /^[-+]?(\d+\.?\d*|\.\d+)([eE][-+]?\d+)?$/.test(value.trim())
+  };
+
+  if (checkNumber(a) && checkNumber(b)) {
+    return Number(a) - Number(b);
+  }
+  // 优先处理 "通过" 的情况
+  if (a === "通过" && b !== "通过") return -1;
+  if (b === "通过" && a !== "通过") return 1;
+  
+  return a.localeCompare(b);
+
+}
+
+customSort = (a, b) => {
+
+  // 处理空值
+  const aEmpty = !a;
+
+  const bEmpty = !b;
+
+  if (aEmpty && bEmpty) return 0;
+
+  if (aEmpty) return 1; // a空，排后面
+
+  if (bEmpty) return -1; // b空，a排前面
+
+  return this.naturalCompare(a, b);
+
+}
+
+  sortData = (sorterKey: string) => {
+    let sheetData = luckysheet.getSheetData();
+    let newData = JSON.parse(JSON.stringify(sheetData)).sort((cur, prev) => {
+      let cellIndex = itemsTemp.findIndex(item => item.code === sorterKey);
+      if (sorterKey === 'checkresult') {
+        cellIndex = itemsTemp.length;
+      }
+      return this.customSort(cur[cellIndex]?.v, prev[cellIndex]?.v);
+    })
+    luckysheet.create(this.setConfig(luckysheet.transToCellData(newData)));
+    this.setState({
+      data: luckysheet.transToCellData(newData),
+    });
+  }
+
+  resetData = async () => {
+    const { validDataUrl, validDataParams, updateData, columns, isBrandAuth, isCheckStockNum = true, customerColumnsMapping, checkSharedValue, beforeCheckCallback } = this.props;
+   
+    let resultData = this.getData().filter(d => {
       return _.compact(Object.values(d)).length
     })
 
@@ -436,6 +492,24 @@ class DataValidation extends React.Component {
       otherParams = { brandAuth: 'ctl-withAuth' }
     }
 
+    // 处理校验参数，隐藏校验参数（公用的部分）
+    if(checkSharedValue){
+      resultData = resultData.map(d => {
+        return {
+          ...d,
+          ...checkSharedValue,
+        }
+      })
+    }
+
+    // 调用回调函数
+     if(beforeCheckCallback){
+      resultData = await beforeCheckCallback(resultData);
+      if(!resultData){
+        return;
+      }
+    }
+
     request
       .post(validDataUrl, {
         ...otherParams,
@@ -523,7 +597,6 @@ class DataValidation extends React.Component {
 
   toggleData = () => {
     const { showErrorData, data } = this.state;
-
     if (showErrorData) {
       luckysheet.create(this.setConfig(data));
     } else {
@@ -615,6 +688,44 @@ class DataValidation extends React.Component {
       </div>
     </Menu>
   );
+
+
+  getSortList = () => {
+    let sortList = []
+    if (this.props?.customerColumnsMapping?.length) {
+      sortList = this.props?.customerColumnsMapping?.map((item, index) => {
+        return createItem('item-0', index, item.title, item.name, this.format);
+      })||[]
+    } else {
+      sortList = this.props?.columns?.map((item, index) => {
+        if (!mapping.get(item))
+          throw Error(
+            `${item} is not in DataValidation component, please fix this error`,
+          );
+        return createItem('item-0', index, mapping.get(item), item, this.format);
+      })||[];
+    }
+
+    return (
+      <Menu>
+        {
+          (sortList || []).map((item, index) =>{
+            return  (
+              <>
+                <Menu.Item key={index} className="sheet_table-menu_item_text">
+                  <a onClick={() => this.sortData(item.code)}>{item.content}</a>
+                </Menu.Item>
+                <Menu.Divider />
+              </>
+            )
+          })
+        }
+        <Menu.Item key="checkresult" className="sheet_table-menu_item_text">
+          <a onClick={() => this.sortData('checkresult')}>校验结果</a>
+        </Menu.Item>
+      </Menu>
+    )
+  }
   
   getSheetMap = () => {
     const { customerColumnsMapping, columns } = this.props;
@@ -653,7 +764,7 @@ class DataValidation extends React.Component {
 
   render() {
     const { errorListCheck } = this.state;
-    const { title, notValid, notExcelImport, excelImportConfig } = this.props;
+    const { title, notValid, notExcelImport, excelImportConfig, getTemplate } = this.props;
     const { size, accept, suffixRule } = excelImportConfig || {}
 
     let totalSummary = this.getCount();
@@ -708,6 +819,8 @@ class DataValidation extends React.Component {
       left: '0px',
       top: '0px',
     };
+
+    console.log('itemsTemp', itemsTemp)
     return (
       <>
         <div className="sheet_table_top">
@@ -745,9 +858,16 @@ class DataValidation extends React.Component {
           </Space>
           <Space>
             {!notExcelImport && (
-              <Upload {...uploadProps}>
-                <Button>导入</Button>
-              </Upload>
+              <>
+                {
+                  getTemplate && (
+                    <Button onClick={getTemplate}>下载模板</Button>
+                  )
+                }
+                <Upload {...uploadProps}>
+                  <Button>导入</Button>
+                </Upload>
+              </>
             )}
             <Dropdown
               trigger={['click']}
@@ -759,6 +879,16 @@ class DataValidation extends React.Component {
                 <DownOutlined />
               </Button>
             </Dropdown>
+            <Dropdown
+              trigger={['click']}
+              overlay={this.getSortList()}
+              placement="bottomRight"
+            >
+              <Button>
+                排序
+                <DownOutlined />
+              </Button>
+            </Dropdown>
 
             {!notValid && <Button type="primary" onClick={this.resetData}>
               识别
@@ -769,9 +899,13 @@ class DataValidation extends React.Component {
         <div style={{ position: 'relative', height: '400px' }}>
           <div id="luckysheet" style={luckyCss}></div>
         </div>
-        {!this.props.notValid && <div className="sheet_table_footer">
+        {!this.props.notValid && !!totalSummary.total && <div className="sheet_table_footer">
           <span className="sheet_table_footer_l">
-            共 {totalSummary.total} 条数据{!notValid && `, 其中错误 ${totalSummary.error} 项`}
+            共 {totalSummary.total} 条数据：
+            <span style={{color: 'green', marginLeft: '5px'}}> 成功条数：</span>{totalSummary.success}
+            <span style={{color: 'green', marginLeft: '5px'}}> 成功数量：</span>{totalSummary.totalSuccessQuantity || 0}
+            <span style={{color: 'red', marginLeft: '5px'}}> 失败条数：</span>{totalSummary.error || 0}
+            <span style={{color: 'red', marginLeft: '5px'}}> 失败数量：</span>{totalSummary.totalErrorQuantity || 0}
           </span>
           {!notValid && <Space className="sheet_table_footer_r">
             <Checkbox

package/src/components/Functional/ExportFunctions/ExportIcon/index.tsx

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import React, {Ref} from 'react'
 import {message, Popconfirm, Tooltip} from "antd";
-import request from '@/utils/request';
+import request from '@/utils/cachedRequest';
 import exportlogo from '../../../../assets/exportlogo.png'
 import {omit} from 'lodash'
 import { judgeIsRequestError } from '@/utils/requestUtils';

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

@@ -11,9 +11,9 @@ import { useDebounceFn } from 'ahooks';
 import { Input, Button, Modal, ConfigProvider } from 'antd';
 import './index.less';
 
-const QueryMutipleInput = ({ onValueChange,onPressEnter }) => {
+const QueryMutipleInput = ({ onValueChange,onPressEnter, value: initialValue }) => {
   const [isModalVisible, setIsModalVisible] = useState(false);
-  const [value, setValue] = useState('');
+  const [value, setValue] = useState(initialValue);
   const [popvalue, setPopValue] = useState('');
   const { run } = useDebounceFn(
     () => {
@@ -24,6 +24,14 @@ const QueryMutipleInput = ({ onValueChange,onPressEnter }) => {
     },
   );
 
+  /**
+   * 初始化参数
+   * 处理参数不展示和清空不同步的问题
+  */
+  useEffect(() => {
+    setValue(initialValue);
+  }, [initialValue]);
+
   useEffect(() => {
     setPopValue(value);
     onValueChange(value);
@@ -32,7 +40,7 @@ const QueryMutipleInput = ({ onValueChange,onPressEnter }) => {
   const showModal = () => {
     setIsModalVisible(true);
     //弹窗打开时 默认搜索内容换行显示
-    setPopValue(data => data.replace(/,/g, '\n'));
+    setPopValue(data => data?.replace?.(/,/g, '\n'));
   };
 
   const handleOk = () => {
@@ -67,6 +75,7 @@ const QueryMutipleInput = ({ onValueChange,onPressEnter }) => {
         <Input
           value={value}
           onChange={outerChange}
+          allowClear
           onBlur={(e) => {
             formaData(e.target.value);
           }}

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

@@ -3,7 +3,7 @@ import { useDebounceFn } from 'ahooks';
 import _, { isNil } from "lodash"
 import { Select, Input, Button, Modal, ConfigProvider, Spin, message } from 'antd';
 import { DashOutlined } from '@ant-design/icons';
-import request from '@/utils/request';
+import request from '@/utils/cachedRequest';
 import { judgeIsRequestError } from '@/utils/requestUtils';
 import './index.less';
 import { convertUrlQueryParams, convertBodyParams, convertResData, handleSourceName, makeUniqueValue, LightHeightOption, handleSelectOptionsShowValue, maxTagPlaceholder }  from '../SearchSelect/utils';
@@ -91,6 +91,7 @@ const QueryMutipleSearchSelect = ({ onValueChange, requestConfig={}, selectProps
    const getData = (params: any = {}, callback?: any) => {
     if (!requestConfig) return;
     if (!url) return;
+    if(!searchValue?.length) return; // 空值默认不查询
 
     setFetching(true)
 
@@ -105,7 +106,7 @@ const QueryMutipleSearchSelect = ({ onValueChange, requestConfig={}, selectProps
     let getRequest;
     const methodName = method?.toLocaleLowerCase();
     if(['post','patch','put'].includes(methodName)) {
-      getRequest = request[methodName](`${url}${convertUrlQueryParams(queryParams)}`,convertBodyParams(queryParams))
+      getRequest = request[methodName](`${url}${convertUrlQueryParams(queryParams)}`,convertBodyParams(queryParams),{headers: { ...extralHeaders }})
     } else {
       getRequest = request.get( `${url}${convertUrlQueryParams(queryParams)}`,{headers: { ...extralHeaders }})
     }

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

@@ -249,6 +249,10 @@
       &_wrapLeft1, &_wrapLeft2, &_wrapRight{
         background: #fff;
         width: calc(50% - 5px);
+        // 解决全选按钮位置偏左问题
+        .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table .ant-table-thead .ant-table-selection .ant-checkbox-wrapper {
+          justify-content: center;
+        }
       }
       &_wrapLeft1 {
         width: 100%;

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

@@ -1,16 +1,17 @@
 // @ts-nocheck
 import React, { useState, useEffect, forwardRef, useImperativeHandle } from 'react';
 import { useDebounceFn } from 'ahooks';
-import { Input, Button, Modal, Select, Divider, message, Spin, Form, Table, Checkbox, TreeSelect, Tooltip, Tag, Row, Col, Space, Tabs } from 'antd';
+import { Input, Button, Modal, Select, Divider, message, Spin, Form, Table, Checkbox, TreeSelect, Tooltip, Tag, Row, Col, Space, Tabs, Empty, DatePicker } from 'antd';
 import { SearchOutlined, CopyOutlined, CaretLeftOutlined } from '@ant-design/icons';
-import request from '@/utils/request';
+import request from '@/utils/cachedRequest';
 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, getShowStr, handleTableColumns }  from './utils';
+import { handleSourceName, getFormRowInfo, hasMoreQueryFields, defaultVisibleFieldsCount, getRealStr, 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';
+import ItemPropertySelector from '@/components/Business/ItemPropertySelector';
 
 const { Option } = Select;
 
@@ -31,6 +32,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     highestPopContainer = undefined,
     fieldComponent,
     onSaveCallback,
+    returnFormat = [],
     selectBusinessType,
   } = props;
   const {
@@ -52,6 +54,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     noOperate, // 级联禁用按钮设置字段
     viewShowValueStr, // 详情展示值,不传展示组件处理的默认值
     searchStartLength, // 默认不校验长度去搜索，如果配置了，则按照配置项长度进行处理搜索
+    isQuery = 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')
@@ -64,6 +67,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const selectParamsKey = requestConfig?.filter || 'qp-codeAndName-like'
   const selectParamsInitKey = requestConfig?.filterInit || selectParamsKey
   const currentSelectProps = {
+    // 回显字段可自定义
+    optionLabelProp: "label",
     ...selectProps,
     // 以下属性不可更改----设计配置项
     showArrow: true,
@@ -71,7 +76,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     filterOption: false,
     allowClear: true,
     listHeight: 160,
-    optionLabelProp: "label",
     autoClearSearchValue: false,
     placement: 'bottomRight'
   }
@@ -81,7 +85,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const isFormPage = pathname.match(pattern)?.length > 0;
 
   const initPagination = { showQuickJumper: true, showSizeChanger: true, showTotal: (total: any) => `共 ${total} 条`, pageSize: tableInitPageSize }
-  const tableInitPagination = { ...initPagination, total: 0, current: 1 }
+  const tableInitPagination = { ...initPagination, total: 0, current: 1, pageSizeOptions: [10, 20, 50, 100, 500, 1000] }
   const disabled = !!noOperate || selectProps?.disabled || props?.disabled;
   const isHaveDependency = fixedparameter && fieldValToParam && ctx;
   const isHaveDValue = () => {
@@ -92,7 +96,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     });
     return formValueList.filter((item: any) => item).length > 0
   }
-  const sDisabled = disabled || (isHaveDependency && !!!isHaveDValue());
+  const sDisabled = disabled || (isHaveDependency && !!!isHaveDValue() && !isQuery);
 
   const [items, setItems] = useState([]);
   const [selectOpen, setSelectOpen] = useState(false);
@@ -230,14 +234,14 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
       ...fixedParam,
       ...params,
     };
-    if (isNil(queryParams[selectParamsKey])) {
-      queryParams[selectParamsKey] = searchValue;
+    if (isNil(queryParams[selectParamsKey])&&searchValue?.length) {
+      queryParams[selectParamsKey] = searchValue?.trim?.();
     }
 
     let getRequest;
     const methodName = method?.toLocaleLowerCase?.();
     if(['post','patch','put'].includes(methodName)) {
-      getRequest = request[methodName](`${url}${convertUrlQueryParams(queryParams)}`,convertBodyParams(queryParams))
+      getRequest = request[methodName](`${url}${convertUrlQueryParams(queryParams)}`,convertBodyParams(queryParams), { headers: { ...extralHeaders }})
     } else {
       getRequest = request.get( `${url}${convertUrlQueryParams(queryParams)}`,{headers: { ...extralHeaders }})
     }
@@ -335,8 +339,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   // 处理键盘事件
   const handleKeyPress = (event) => {
-    if ((event.metaKey || event.ctrlKey) && (event.key === 'U' || event.keyCode == 85)) {
-      // ctrl + U 键 重置
+    if ((event.metaKey || event.ctrlKey) && (event.key === 'I' || event.keyCode == 73)) {
+      // ctrl + I 键 重置
       onResetTable()
     } else if (event.key === 'Enter' || event.keyCode == 13) {
       // Enter 键 查询
@@ -429,7 +433,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   const formaData = (value: any, source: any) => {
     if (labelInValue) {
-      const formatResult = value.map((i: any) => ({ key: i[mappingValueField] || i.key, label: i[mappingTextField] || i.label, value: i[mappingValueField] || i.value }))
+      const getFromat = (format, val) => format.map(({key,value})=> ({[key]:val[value]}))
+      const formatResult = value.map((i: any) => (Object.assign({ key: i[mappingValueField] || i.key, label: i[mappingTextField] || i.label, value: i[mappingValueField] || i.value }, ...getFromat(returnFormat, i))))
       onChange(selectMode ? formatResult : formatResult[0], value,source)
     } else {
       const formatResult = selectMode ? value.map((i: any) => i.value) : _.get(value[0], 'value')
@@ -456,7 +461,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const refreshItems = () => {
     // 查看是否存在关联值 如果有关联值 就查询 没有就不能查询
     if (fieldValToParam && ctx && fixedparamsDisabled) {
-      if (!!isHaveDValue()) {
+      if (!!isHaveDValue() || isQuery) {
         run();
       } else {
         clearSelectDataSource();
@@ -467,7 +472,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   }
 
   const onSearchChange = (v) => {
-    setSearchValue(v);
+    setSearchValue(v?.trim?.()||'');
     if(!!searchStartLength && v?.length < searchStartLength) return;
     refreshItems();
   }
@@ -573,9 +578,10 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
         }
       };
 
-      const { emptyArray } = getFormRowInfo(list);
+      const { emptyArray, ColSpan } = getFormRowInfo(list, modalTableProps?.tableSearchColSpan);
       const addKong = emptyArray?.map((i: any) =>({ type: 'kong'}))||[];
-      return list?.concat(addKong)?.map((i: any, index: number) => {
+      const searchList = modalTableProps?.noEmptySearchField ? list : list?.concat(addKong);
+      return searchList.map((i: any, index: number) => {
         if(i?.type === 'kong') return <Col span={ColSpan} key={i}></Col>;
 
         if (i?.type === 'select' || i?.field?.type === 'select') {
@@ -602,6 +608,25 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
           )
         }
 
+        if (i?.type === 'rangepicker' || i?.field?.type === 'rangepicker') {
+          return (
+            <Col span={ColSpan} key={i.name}>
+              <Form.Item name={i.name} label={i.label} key={i.name} initialValue={i?.initialValue ?? []}>
+                <DatePicker.RangePicker style={{ width: '100%' }} placeholder='请选择' {...i?.field?.props} disabled={setDisabled(i.name)}></DatePicker.RangePicker>
+              </Form.Item>
+            </Col>
+          )
+        }
+        if (i?.type === 'datepicker' || i?.field?.type === 'datepicker') {
+          return (
+            <Col span={ColSpan} key={i.name}>
+              <Form.Item name={i.name} label={i.label} key={i.name}>
+                <DatePicker style={{ width: '100%' }} placeholder='请选择' {...i?.field?.props} disabled={setDisabled(i.name)}></DatePicker>
+              </Form.Item>
+            </Col>
+          )
+        }
+
         if (i?.type === 'businessSearchSelect' || i?.field?.type === 'businessSearchSelect') {
           return (
             <Col span={ColSpan} key={i.name}>
@@ -635,6 +660,19 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
             </Col>
           );
         }
+        if (i?.type === 'itemPropertySelector' || i?.field?.type === 'itemPropertySelector') {
+          return (
+            <Col span={ColSpan} key={i.name}>
+              <Form.Item name={i.name} label={i.label} key={i.name}>
+                <ItemPropertySelector
+                  style={{ width: '100%' }}
+                  placeholder="请选择"
+                  {...i?.field?.props}
+                ></ItemPropertySelector>
+              </Form.Item>
+            </Col>
+          );
+        }
         if (i?.field?.type === 'multipleQuerySearchSelect') {
           return (
             <Col span={ColSpan} key={i.name}>
@@ -667,9 +705,15 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     return collapsed ? formItem(list?.slice(0,viCount)) : formItem(list)
   }
 
+  const renderEmptyText = (text: string,x: string) => {
+    return <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} description={text} style={{ margin: `${x} 0px`}} />
+  }
+
   const renderShowTable =  (tableList, type) => {
     const tableBoxHeighth = getTableHeigth(modalTableProps?.tableSearchForm);
-    const oSY = `calc(100vh - ${tableBoxHeighth}px - 82px)`;  // 分页 24+16*2+10 「高 + margin * 2 + paddingBottom 10 」
+    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)`
     return (
       <div style={{ height: `calc(100vh - ${tableBoxHeighth}px)` }}> 
         <Table
@@ -681,14 +725,14 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
           {...type=='noPage'?{
             pagination: { ...initPagination,showSizeChanger: false },
             locale: {
-              emptyText: '暂无已选结果',
+              emptyText: renderEmptyText('暂无已选结果',mTB),
             }
           }:{
             pagination: tablePagination,
             onChange: handleTableChange,
             loading: fetching,
             locale: {
-              emptyText: modalSearched? '无匹配结果,请更换其他内容再试' : '请输入搜索条件',
+              emptyText: modalSearched? renderEmptyText('匹配结果,请更换其他内容再试',mTB) : renderEmptyText('请输入搜索条件',mTB),
             }
           }}
           rowKey={mappingValueField}
@@ -881,7 +925,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
         <Modal
           maskClosable={false}
           destroyOnClose
-          width="80%"
+          width={`calc(100% - 320px)`}
           title={modalTableProps?.modalTableTitle}
           visible={isModalVisible}
           confirmLoading={confirmLoading}
@@ -916,14 +960,14 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
                     {renderFormItem(modalTableProps?.tableSearchForm)}
                     <Col span={6}>
                       <Space>
-                        <Button key="search" type="primary" onClick={onSearchTable}>
+                        <Button key="search" type="primary" onClick={onSearchTable} disabled={fetching}>
                           查询 Enter
                         </Button>
-                        <Button key="reset" onClick={onResetTable}>
-                          重置 ctrl+U
+                        <Button key="reset" onClick={onResetTable} disabled={fetching}>
+                          重置 ctrl+I
                         </Button>
                         <div style={{position: 'absolute',top: 0,right: 0}}>
-                          {hasMoreQueryFields(modalTableProps) && modalTableProps?.isHorizontally
+                          {hasMoreQueryFields(modalTableProps)
                               ? <img onClick={() => {toggleCollapsed()}} style={{
                                 cursor: 'pointer',
                                 fontSize: '10px',