@bit-sun/business-component 4.0.11-alpha.10 → 4.0.11-alpha.12

package/dist/components/Functional/SearchSelect/utils.d.ts

@@ -6,3 +6,4 @@ export declare const getFormRowInfo: (list: any) => {
 export declare const defaultVisibleFieldsCount = 7;
 export declare const getVisibleFieldsCount: (modalTableProps: any) => any;
 export declare const hasMoreQueryFields: (modalTableProps: any) => boolean;
+export declare const getRealStr: (oldSelect: any, newSelect: any, record: any) => any;

package/dist/index.esm.js

@@ -4071,7 +4071,7 @@ function ToCDB(str) {
   return tmp;
 }
 
-var css_248z$5 = ".search_select_show {\n  display: flex;\n}\n.search_select_show .ant-select-clear {\n  right: 33px;\n}\n.search_select_expand_button {\n  position: relative;\n  right: -11px;\n  width: 30px;\n  border-left: 1px solid #d9d9d9;\n  height: 24px;\n  cursor: pointer;\n  font-size: 14px;\n  font-weight: bolder;\n}\n.search_select_expand_button span {\n  position: absolute;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n.search_select_expand_button:hover {\n  background-color: #005cff;\n  color: #fff;\n}\n.search_select_dropdown_table .ant-table-cell .ant-table-selection-column .ant-radio,\n.search_select_dropdown_table table tr td.ant-table-selection-column .ant-radio-wrapper {\n  display: none;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table {\n  font-family: MiSans-Regular;\n  font-weight: 400;\n  font-size: 12px;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table thead > tr > th {\n  color: #7F7F7F;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table .ant-table-thead .ant-table-selection .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table tbody > tr > td {\n  color: #333333;\n}\n.search_select_dropdown_table1 .ant-table.ant-table-bordered > .ant-table-container .ant-table-body > table > tbody > tr > td.ant-table-selection-column,\n.search_select_dropdown_table1 .ant-table.ant-table-bordered > .ant-table-container .ant-table-header > table > thead > tr > th.ant-table-selection-column {\n  display: none;\n}\n.search_select_modal_wrapper .ant-modal {\n  top: 60px;\n}\n.search_select_modal_wrapper .ant-modal-header {\n  padding: 6px 0px 6px 16px;\n}\n.search_select_modal_wrapper .ant-modal-header .ant-modal-title {\n  height: 20px;\n  color: #000000;\n  line-height: 20px;\n}\n.search_select_modal_wrapper .ant-modal-close-x {\n  width: 32px;\n  height: 32px;\n  line-height: 32px;\n}\n.search_select_modal_wrapper .ant-modal-body {\n  padding: 0px;\n  background: #F3F3F3;\n  height: 684px;\n  overflow: hidden;\n}\n.search_select_wrapper {\n  position: relative;\n  min-height: 80vh;\n  max-height: 80vh;\n  overflow: hidden;\n  font-size: 14px;\n}\n.search_select_wrapper_topForm .select_list_columns {\n  width: 100%;\n  padding: 10px 6px 2px 16px;\n  background-color: #fff;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form {\n  padding: 0;\n  overflow: hidden;\n  display: flex;\n  align-items: flex-start;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item {\n  font-size: 12px !important;\n  margin-right: 0px !important;\n  margin-bottom: 8px !important;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row.ant-form-item-row {\n  background-color: #fafafa;\n  border: 0.8px solid #D9D9D9;\n  border-radius: 2px;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row {\n  width: 100%;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-label {\n  width: 110px;\n  order: 1;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-label label {\n  width: 100%;\n  text-align: left;\n  padding: 0 10px;\n  color: #333333;\n  font-size: 12px;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control {\n  order: 2;\n  width: 100px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-input-affix-wrapper {\n  border: 0;\n  font-size: 12px;\n  background-color: #fafafa;\n  padding: 0 11px;\n  height: 24px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-input-affix-wrapper .ant-input {\n  background-color: #fafafa !important;\n  border: 0;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-select-selector {\n  border: 0 !important;\n  background-color: #fafafa !important;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .query_input .ant-input {\n  background-color: #fafafa !important;\n  border: 0;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-btn-primary {\n  background: #005cff;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form > .ant-row > .ant-col {\n  order: 2;\n  padding-right: 10px;\n}\n.search_select_wrapper_topForm .select_list_button_space {\n  margin-right: 10px;\n}\n.search_select_wrapper_bottomTable {\n  margin: 10px;\n  display: flex;\n  justify-content: space-between;\n}\n.search_select_wrapper_bottomTable_wrapLeft1,\n.search_select_wrapper_bottomTable_wrapLeft2,\n.search_select_wrapper_bottomTable_wrapRight {\n  background: #fff;\n  width: calc(50% - 5px);\n}\n.search_select_wrapper_bottomTable_wrapLeft1 {\n  width: 100%;\n}\n.search_select_wrapper_bottomTable_wrapRight {\n  margin-left: 10px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav {\n  margin: 0;\n  padding: 6px 18.5px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-nav-wrap {\n  height: 28px;\n  font-size: 14px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-tab {\n  padding: 4px 0;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-ink-bar {\n  left: 3px !important;\n  width: 40px !important;\n  background: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-extra-content > span {\n  color: #005cff;\n  cursor: pointer;\n}\n.search_select_wrapper_bottomTable .ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {\n  color: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder {\n  padding: 10px 10px 7px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table-thead > tr > th {\n  color: #7F7F7F;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table-thead .ant-table-selection .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table.ant-table-small .ant-table-tbody > tr > td {\n  color: #333333;\n}\n.search_select_wrapper_bottomTable .ant-checkbox-checked .ant-checkbox-inner {\n  color: #005cff;\n  background: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-pagination-item-active a {\n  color: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-pagination-item-active {\n  border-color: #005cff;\n}\n.searchSelectSpin > div {\n  height: 300px !important;\n}\n";
+var css_248z$5 = ".search_select_show {\n  display: flex;\n}\n.search_select_show .ant-select-clear {\n  right: 33px;\n}\n.search_select_expand_button {\n  position: relative;\n  right: -11px;\n  width: 30px;\n  border-left: 1px solid #d9d9d9;\n  height: 24px;\n  cursor: pointer;\n  font-size: 14px;\n  font-weight: bolder;\n}\n.search_select_expand_button span {\n  position: absolute;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n.search_select_expand_button:hover {\n  background-color: #005cff;\n  color: #fff;\n}\n.search_select_dropdown_table .ant-table-cell .ant-table-selection-column .ant-radio,\n.search_select_dropdown_table table tr td.ant-table-selection-column .ant-radio-wrapper {\n  display: none;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table {\n  font-family: MiSans-Regular;\n  font-weight: 400;\n  font-size: 12px;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table thead > tr > th {\n  color: #7F7F7F;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table .ant-table-thead .ant-table-selection .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table tbody > tr > td {\n  color: #333333;\n}\n.search_select_dropdown_table1 .ant-table.ant-table-bordered > .ant-table-container .ant-table-body > table > tbody > tr > td.ant-table-selection-column,\n.search_select_dropdown_table1 .ant-table.ant-table-bordered > .ant-table-container .ant-table-header > table > thead > tr > th.ant-table-selection-column {\n  display: none;\n}\n.search_select_modal_wrapper .ant-modal {\n  top: 60px;\n}\n.search_select_modal_wrapper .ant-modal-header {\n  padding: 6px 0px 6px 16px;\n}\n.search_select_modal_wrapper .ant-modal-header .ant-modal-title {\n  height: 20px;\n  color: #000000;\n  line-height: 20px;\n}\n.search_select_modal_wrapper .ant-modal-close-x {\n  width: 32px;\n  height: 32px;\n  line-height: 32px;\n}\n.search_select_modal_wrapper .ant-modal-body {\n  padding: 0px;\n  background: #F3F3F3;\n  height: 684px;\n  overflow: hidden;\n}\n.search_select_modal_wrapper .ant-modal-footer .ant-btn.ant-btn-default {\n  color: #005cff;\n  border-color: #005cff;\n}\n.search_select_modal_wrapper .ant-modal-footer .ant-btn-primary,\n.search_select_modal_wrapper .ant-modal-footer .ant-btn-primary[disabled] {\n  background: #005cff;\n  border-color: #005cff;\n}\n.search_select_modal_wrapper .ant-modal-footer .ant-btn-primary[disabled] {\n  opacity: 0.5;\n  color: #fff;\n}\n.search_select_wrapper {\n  position: relative;\n  font-size: 14px;\n}\n.search_select_wrapper_topForm .select_list_columns {\n  width: 100%;\n  padding: 10px 6px 2px 16px;\n  background-color: #fff;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form {\n  padding: 0;\n  overflow: hidden;\n  display: flex;\n  align-items: flex-start;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item,\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-col .ant-space {\n  font-size: 12px !important;\n  margin-right: 0px !important;\n  margin-bottom: 8px !important;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row.ant-form-item-row {\n  background-color: #fafafa;\n  border: 0.8px solid #D9D9D9;\n  border-radius: 2px;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row {\n  width: 100%;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-label {\n  width: 110px;\n  order: 1;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-label label {\n  width: 100%;\n  text-align: left;\n  padding: 0 10px;\n  color: #333333;\n  font-size: 12px;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control {\n  order: 2;\n  width: 100px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-input-affix-wrapper {\n  border: 0;\n  font-size: 12px;\n  background-color: #fafafa;\n  padding: 0 11px;\n  height: 24px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-input-affix-wrapper .ant-input {\n  background-color: #fafafa !important;\n  border: 0;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-select-selector {\n  border: 0 !important;\n  background-color: #fafafa !important;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .query_input .ant-input {\n  background-color: #fafafa !important;\n  border: 0;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-btn-primary {\n  background: #005cff;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form > .ant-row > .ant-col {\n  order: 2;\n  padding-right: 10px;\n}\n.search_select_wrapper_topForm .select_list_button_space {\n  margin-right: 10px;\n}\n.search_select_wrapper_bottomTable {\n  margin: 10px;\n  display: flex;\n  justify-content: space-between;\n}\n.search_select_wrapper_bottomTable_wrapLeft1,\n.search_select_wrapper_bottomTable_wrapLeft2,\n.search_select_wrapper_bottomTable_wrapRight {\n  background: #fff;\n  width: calc(50% - 5px);\n}\n.search_select_wrapper_bottomTable_wrapLeft1 {\n  width: 100%;\n}\n.search_select_wrapper_bottomTable_wrapRight {\n  margin-left: 10px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav {\n  margin: 0;\n  padding: 6px 18.5px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-nav-wrap {\n  height: 28px;\n  font-size: 14px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-tab {\n  padding: 4px 0;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-ink-bar {\n  left: 3px !important;\n  width: 40px !important;\n  background: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-extra-content > span {\n  color: #005cff;\n  cursor: pointer;\n}\n.search_select_wrapper_bottomTable .ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {\n  color: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder {\n  padding: 10px 10px 7px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table-thead > tr > th {\n  color: #7F7F7F;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table-thead .ant-table-selection .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table.ant-table-small .ant-table-tbody > tr > td {\n  color: #333333;\n}\n.search_select_wrapper_bottomTable .ant-checkbox-checked .ant-checkbox-inner {\n  color: #005cff;\n  background: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-pagination-item-active a {\n  color: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-pagination-item-active {\n  border-color: #005cff;\n}\n.searchSelectSpin > div {\n  height: 300px !important;\n}\n";
 styleInject(css_248z$5);
 
 var handleSourceName = function handleSourceName(sName) {
@@ -4106,6 +4106,13 @@ var hasMoreQueryFields = function hasMoreQueryFields(modalTableProps) {
   var visibleFieldsCount = getVisibleFieldsCount(modalTableProps);
   return visibleFieldsCount < (tableSearchForm === null || tableSearchForm === void 0 ? void 0 : tableSearchForm.length);
 };
+var getRealStr = function getRealStr(oldSelect, newSelect, record) {
+  return (oldSelect === null || oldSelect === void 0 ? void 0 : oldSelect.length) ? oldSelect.some(function (o) {
+    return o.value == record.value;
+  }) ? oldSelect.filter(function (s) {
+    return s.value != record.value;
+  }) : [].concat(_toConsumableArray(oldSelect), _toConsumableArray(newSelect)) : newSelect;
+};
 
 var zhankaitiaojian = "data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22UTF-8%22%3F%3E%3Csvg%20width%3D%2224px%22%20height%3D%2224px%22%20viewBox%3D%220%200%2024%2024%22%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%3E%20%20%20%20%3Ctitle%3Ezhankaitiaojian-icon%3C%2Ftitle%3E%20%20%20%20%3Cdefs%3E%20%20%20%20%20%20%20%20%3Crect%20id%3D%22path-1%22%20x%3D%220%22%20y%3D%220%22%20width%3D%2224%22%20height%3D%2224%22%3E%3C%2Frect%3E%20%20%20%20%3C%2Fdefs%3E%20%20%20%20%3Cg%20id%3D%22%E9%A1%B5%E9%9D%A2-1%22%20stroke%3D%22none%22%20stroke-width%3D%221%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%20%20%20%20%20%20%20%20%3Cg%20id%3D%22icon%22%20transform%3D%22translate%28-702.000000%2C%20-498.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20id%3D%22zhankaitiaojian-icon%22%20transform%3D%22translate%28702.000000%2C%20498.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cmask%20id%3D%22mask-2%22%20fill%3D%22white%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cuse%20xlink%3Ahref%3D%22%23path-1%22%3E%3C%2Fuse%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fmask%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cuse%20id%3D%22%E8%92%99%E7%89%88%22%20fill%3D%22%23D8D8D8%22%20opacity%3D%220%22%20xlink%3Ahref%3D%22%23path-1%22%3E%3C%2Fuse%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cpath%20d%3D%22M12.0142082%2C6%20L18%2C11.9972435%20L12.0142082%2C18%20L11.04209%2C17.0260337%20L16.0562218%2C11.9972435%20L11.04209%2C6.97396631%20L12.0142082%2C6%20Z%20M6.97257658%2C6%20L12.9583683%2C11.9972435%20L6.97257658%2C18%20L6.00091666%2C17.0260337%20L11.0150485%2C11.9972435%20L6%2C6.97396631%20L6.97257658%2C6%20Z%22%20id%3D%22%E5%BD%A2%E7%8A%B6%22%20fill%3D%22%23005CFF%22%20fill-rule%3D%22nonzero%22%20mask%3D%22url%28%23mask-2%29%22%20transform%3D%22translate%2812.000000%2C%2012.000000%29%20rotate%28-270.000000%29%20translate%28-12.000000%2C%20-12.000000%29%20%22%3E%3C%2Fpath%3E%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%3C%2Fg%3E%3C%2Fsvg%3E";
 
@@ -4174,15 +4181,15 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   });
   var initPagination = {
     showQuickJumper: true,
-    showSizeChanger: true,
+    showSizeChanger: false,
     showTotal: function showTotal(total) {
       return "\u5171 ".concat(total, " \u6761");
-    }
+    },
+    pageSize: tableInitPageSize
   };
   var tableInitPagination = _objectSpread2(_objectSpread2({}, initPagination), {}, {
     total: 0,
-    current: 1,
-    pageSize: tableInitPageSize
+    current: 1
   });
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -4300,6 +4307,10 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState42 = _slicedToArray(_useState41, 2),
     confirmLoading = _useState42[0],
     setConfirmLoading = _useState42[1];
+  var _useState43 = useState(false),
+    _useState44 = _slicedToArray(_useState43, 2),
+    modalSearched = _useState44[0],
+    setModalSearched = _useState44[1];
   useImperativeHandle(ref, function () {
     return {
       refreshDataSource: function refreshDataSource() {
@@ -4332,6 +4343,13 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       },
       refreshSelectDataSource: function refreshSelectDataSource() {
         refreshItems();
+      },
+      handleModalVisible: function handleModalVisible(flag) {
+        if (flag) {
+          showModal();
+        } else {
+          handleCancel();
+        }
       }
     };
   });
@@ -4619,7 +4637,6 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   }, [selectBusinessType]);
   // 处理键盘事件
   var handleKeyPress = function handleKeyPress(event) {
-    console.log(event, '----event');
     if ((event.metaKey || event.ctrlKey) && (event.key === 'U' || event.keyCode == 85)) {
       // ctrl + U 键 重置
       onResetTable();
@@ -4643,8 +4660,9 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     };
   }, [isModalVisible]);
   var showModal = function showModal() {
-    // 弹窗打开默认不查询
-    // getData({ pageSize: tableInitPageSize, currentPage: 1 }, 3)
+    setSelectOpen(false);
+    setSearchValue('');
+    setModalSearched(false);
     setIsModalVisible(true);
     // 回显
     if (value) {
@@ -4755,9 +4773,6 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   var handleCancel = function handleCancel() {
     clearModalTable();
     setIsModalVisible(false);
-    if (selectMode) {
-      run();
-    }
   };
   var refreshItems = function refreshItems() {
     // 查看是否存在关联值 如果有关联值 就查询 没有就不能查询
@@ -4786,13 +4801,12 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   var onSearchTable = function onSearchTable() {
     var params = form.getFieldsValue();
+    // const isHaveParams = params && Object.keys(params).filter(item => params[item]).length > 0;
+    setModalSearched(true);
     setTableFormParams(params);
     getData(_objectSpread2(_objectSpread2({}, params), {}, {
       pageSize: tableInitPageSize
     }), 2);
-    if (selectMode) {
-      getData(params);
-    }
   };
   var onResetTable = function onResetTable() {
     form.resetFields();
@@ -4880,8 +4894,13 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     }
   };
   var onDoubleClickSelect = function onDoubleClickSelect(e, record) {
-    if (!selectMode && !((selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled) || !items.length && !tableData.length)) {
+    if (!((selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled) || !items.length && !tableData.length)) {
       var srs = [JSON.parse(JSON.stringify(record))];
+      if (selectMode) {
+        var oldSelect = selectedRows;
+        var newSelect = [JSON.parse(JSON.stringify(record))];
+        srs = getRealStr(oldSelect, newSelect, record);
+      }
       var sks = srs.map(function (i) {
         return i.value;
       });
@@ -4926,7 +4945,10 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
             style: {
               width: '100%'
             },
-            placeholder: "\u8BF7\u9009\u62E9"
+            placeholder: "\u8BF7\u9009\u62E9",
+            onDeselect: function onDeselect(v) {
+              return onSearchTable();
+            }
           }, i === null || i === void 0 ? void 0 : (_i$field2 = i.field) === null || _i$field2 === void 0 ? void 0 : _i$field2.props), {}, {
             disabled: setDisabled(i.name)
           }), (i === null || i === void 0 ? void 0 : (_i$initialSource = i.initialSource) === null || _i$initialSource === void 0 ? void 0 : _i$initialSource.length) && (i === null || i === void 0 ? void 0 : i.initialSource.map(function (m) {
@@ -5015,9 +5037,12 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   //   bsTableCode={bsTableCode}
   // />
   var renderShowTable = function renderShowTable(tableList, type) {
+    var _getFormRowInfo2 = getFormRowInfo(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchForm),
+      totalRows = _getFormRowInfo2.totalRows;
+    var tableBoxHeighth = 548 - totalRows * 10;
     return /*#__PURE__*/React$1.createElement("div", {
       style: {
-        height: '528px'
+        height: "".concat(tableBoxHeighth, "px")
       }
     }, /*#__PURE__*/React$1.createElement(Table, _objectSpread2(_objectSpread2({
       bordered: true,
@@ -5026,11 +5051,17 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       columns: tableShowColumns,
       dataSource: tableList
     }, type == 'noPage' ? {
-      pagination: initPagination
+      pagination: initPagination,
+      locale: {
+        emptyText: '暂无已选结果'
+      }
     } : {
       pagination: tablePagination,
       onChange: handleTableChange,
-      loading: fetching
+      loading: fetching,
+      locale: {
+        emptyText: modalSearched ? '无匹配结果,请更换其他内容再试' : '请输入搜索条件'
+      }
     }), {}, {
       rowKey: mappingValueField,
       scroll: {
@@ -5064,10 +5095,18 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   var onClear = function onClear() {
     formaData([], items);
   };
+  var onSelectClick = function onSelectClick(srs, ds) {
+    var nr = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+    formaData(srs, ds);
+    nr && setSelectOpen(false);
+  };
   var onDropdownVisibleChange = function onDropdownVisibleChange(visible) {
     setSelectOpen(visible);
-    // 解决多选时，关闭下拉框值 搜索项被清空但是没有重新调用onsearch事件的问题
-    selectMode && !visible && setSearchValue('');
+    // 关闭下拉框 如果没有选中数据-需要清空查询数据源
+    if (!visible && !(value === null || value === void 0 ? void 0 : value.length)) {
+      setItems([]);
+      setItemsTotal(0);
+    }
   };
   var renderTable = function renderTable(dataSource) {
     return /*#__PURE__*/React$1.createElement("div", {
@@ -5078,12 +5117,33 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     }, selectMode ? {
       rowSelection: {
         type: 'checkbox',
+        columnWidth: '24px',
         selectedRowKeys: labelInValue ? value.map(function (s) {
           return (s === null || s === void 0 ? void 0 : s.value) || s;
         }) : value,
         onChange: function onChange(sks, srs) {
-          formaData(srs, dataSource);
+          var oldSelect = labelInValue ? value : value.map(function (s) {
+            return {
+              value: s
+            };
+          });
+          var realSrs = getRealStr(oldSelect, srs, srs[0]);
+          onSelectClick(realSrs, dataSource, false);
         }
+      },
+      onRow: function onRow(record, rowKey) {
+        return {
+          onClick: function onClick(event) {
+            var oldSelect = labelInValue ? value : value.map(function (s) {
+              return {
+                value: s
+              };
+            });
+            var newSelect = [JSON.parse(JSON.stringify(record))];
+            var srs = getRealStr(oldSelect, newSelect, record);
+            onSelectClick(srs, dataSource, false);
+          } // 点击行
+        };
       }
     } : {
       rowSelection: {
@@ -5093,11 +5153,10 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       },
       onRow: function onRow(record, rowKey) {
         return {
-          onDoubleClick: function onDoubleClick() {
+          onClick: function onClick(event) {
             var srs = [JSON.parse(JSON.stringify(record))];
-            formaData(srs, dataSource);
-            setSelectOpen(false);
-          }
+            onSelectClick(srs, dataSource);
+          } // 点击行
         };
       }
     }), {}, {
@@ -5250,6 +5309,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       filterTxt: searchValue
     }));
   }))), needModalTable && isModalVisible && (/*#__PURE__*/React$1.createElement(Modal, _objectSpread2({
+    maskClosable: false,
     destroyOnClose: true,
     width: "80%",
     title: modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalTableTitle,
@@ -5265,7 +5325,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       type: "primary",
       loading: confirmLoading,
       onClick: handleOk,
-      disabled: !tableData.length || (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled)
+      disabled: (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled)
     }, "\u786E\u5B9A")] : null,
     wrapClassName: 'search_select_modal_wrapper'
   }, (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalProps) || {}), /*#__PURE__*/React$1.createElement("div", {
@@ -8898,7 +8958,6 @@ function commonFun(type, prefixUrl, parentProps) {
       modalTableTitle: '选择SKU',
       tableSearchForm: tableSearchForm,
       isHorizontally: true,
-      modalRadioNeedFooter: true,
       tableColumns: [{
         title: '序号',
         dataIndex: 'keyIndex',

package/dist/index.js

@@ -4094,7 +4094,7 @@ function ToCDB(str) {
   return tmp;
 }
 
-var css_248z$5 = ".search_select_show {\n  display: flex;\n}\n.search_select_show .ant-select-clear {\n  right: 33px;\n}\n.search_select_expand_button {\n  position: relative;\n  right: -11px;\n  width: 30px;\n  border-left: 1px solid #d9d9d9;\n  height: 24px;\n  cursor: pointer;\n  font-size: 14px;\n  font-weight: bolder;\n}\n.search_select_expand_button span {\n  position: absolute;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n.search_select_expand_button:hover {\n  background-color: #005cff;\n  color: #fff;\n}\n.search_select_dropdown_table .ant-table-cell .ant-table-selection-column .ant-radio,\n.search_select_dropdown_table table tr td.ant-table-selection-column .ant-radio-wrapper {\n  display: none;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table {\n  font-family: MiSans-Regular;\n  font-weight: 400;\n  font-size: 12px;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table thead > tr > th {\n  color: #7F7F7F;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table .ant-table-thead .ant-table-selection .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table tbody > tr > td {\n  color: #333333;\n}\n.search_select_dropdown_table1 .ant-table.ant-table-bordered > .ant-table-container .ant-table-body > table > tbody > tr > td.ant-table-selection-column,\n.search_select_dropdown_table1 .ant-table.ant-table-bordered > .ant-table-container .ant-table-header > table > thead > tr > th.ant-table-selection-column {\n  display: none;\n}\n.search_select_modal_wrapper .ant-modal {\n  top: 60px;\n}\n.search_select_modal_wrapper .ant-modal-header {\n  padding: 6px 0px 6px 16px;\n}\n.search_select_modal_wrapper .ant-modal-header .ant-modal-title {\n  height: 20px;\n  color: #000000;\n  line-height: 20px;\n}\n.search_select_modal_wrapper .ant-modal-close-x {\n  width: 32px;\n  height: 32px;\n  line-height: 32px;\n}\n.search_select_modal_wrapper .ant-modal-body {\n  padding: 0px;\n  background: #F3F3F3;\n  height: 684px;\n  overflow: hidden;\n}\n.search_select_wrapper {\n  position: relative;\n  min-height: 80vh;\n  max-height: 80vh;\n  overflow: hidden;\n  font-size: 14px;\n}\n.search_select_wrapper_topForm .select_list_columns {\n  width: 100%;\n  padding: 10px 6px 2px 16px;\n  background-color: #fff;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form {\n  padding: 0;\n  overflow: hidden;\n  display: flex;\n  align-items: flex-start;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item {\n  font-size: 12px !important;\n  margin-right: 0px !important;\n  margin-bottom: 8px !important;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row.ant-form-item-row {\n  background-color: #fafafa;\n  border: 0.8px solid #D9D9D9;\n  border-radius: 2px;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row {\n  width: 100%;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-label {\n  width: 110px;\n  order: 1;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-label label {\n  width: 100%;\n  text-align: left;\n  padding: 0 10px;\n  color: #333333;\n  font-size: 12px;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control {\n  order: 2;\n  width: 100px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-input-affix-wrapper {\n  border: 0;\n  font-size: 12px;\n  background-color: #fafafa;\n  padding: 0 11px;\n  height: 24px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-input-affix-wrapper .ant-input {\n  background-color: #fafafa !important;\n  border: 0;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-select-selector {\n  border: 0 !important;\n  background-color: #fafafa !important;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .query_input .ant-input {\n  background-color: #fafafa !important;\n  border: 0;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-btn-primary {\n  background: #005cff;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form > .ant-row > .ant-col {\n  order: 2;\n  padding-right: 10px;\n}\n.search_select_wrapper_topForm .select_list_button_space {\n  margin-right: 10px;\n}\n.search_select_wrapper_bottomTable {\n  margin: 10px;\n  display: flex;\n  justify-content: space-between;\n}\n.search_select_wrapper_bottomTable_wrapLeft1,\n.search_select_wrapper_bottomTable_wrapLeft2,\n.search_select_wrapper_bottomTable_wrapRight {\n  background: #fff;\n  width: calc(50% - 5px);\n}\n.search_select_wrapper_bottomTable_wrapLeft1 {\n  width: 100%;\n}\n.search_select_wrapper_bottomTable_wrapRight {\n  margin-left: 10px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav {\n  margin: 0;\n  padding: 6px 18.5px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-nav-wrap {\n  height: 28px;\n  font-size: 14px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-tab {\n  padding: 4px 0;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-ink-bar {\n  left: 3px !important;\n  width: 40px !important;\n  background: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-extra-content > span {\n  color: #005cff;\n  cursor: pointer;\n}\n.search_select_wrapper_bottomTable .ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {\n  color: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder {\n  padding: 10px 10px 7px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table-thead > tr > th {\n  color: #7F7F7F;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table-thead .ant-table-selection .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table.ant-table-small .ant-table-tbody > tr > td {\n  color: #333333;\n}\n.search_select_wrapper_bottomTable .ant-checkbox-checked .ant-checkbox-inner {\n  color: #005cff;\n  background: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-pagination-item-active a {\n  color: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-pagination-item-active {\n  border-color: #005cff;\n}\n.searchSelectSpin > div {\n  height: 300px !important;\n}\n";
+var css_248z$5 = ".search_select_show {\n  display: flex;\n}\n.search_select_show .ant-select-clear {\n  right: 33px;\n}\n.search_select_expand_button {\n  position: relative;\n  right: -11px;\n  width: 30px;\n  border-left: 1px solid #d9d9d9;\n  height: 24px;\n  cursor: pointer;\n  font-size: 14px;\n  font-weight: bolder;\n}\n.search_select_expand_button span {\n  position: absolute;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n.search_select_expand_button:hover {\n  background-color: #005cff;\n  color: #fff;\n}\n.search_select_dropdown_table .ant-table-cell .ant-table-selection-column .ant-radio,\n.search_select_dropdown_table table tr td.ant-table-selection-column .ant-radio-wrapper {\n  display: none;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table {\n  font-family: MiSans-Regular;\n  font-weight: 400;\n  font-size: 12px;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table thead > tr > th {\n  color: #7F7F7F;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table .ant-table-thead .ant-table-selection .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table tbody > tr > td {\n  color: #333333;\n}\n.search_select_dropdown_table1 .ant-table.ant-table-bordered > .ant-table-container .ant-table-body > table > tbody > tr > td.ant-table-selection-column,\n.search_select_dropdown_table1 .ant-table.ant-table-bordered > .ant-table-container .ant-table-header > table > thead > tr > th.ant-table-selection-column {\n  display: none;\n}\n.search_select_modal_wrapper .ant-modal {\n  top: 60px;\n}\n.search_select_modal_wrapper .ant-modal-header {\n  padding: 6px 0px 6px 16px;\n}\n.search_select_modal_wrapper .ant-modal-header .ant-modal-title {\n  height: 20px;\n  color: #000000;\n  line-height: 20px;\n}\n.search_select_modal_wrapper .ant-modal-close-x {\n  width: 32px;\n  height: 32px;\n  line-height: 32px;\n}\n.search_select_modal_wrapper .ant-modal-body {\n  padding: 0px;\n  background: #F3F3F3;\n  height: 684px;\n  overflow: hidden;\n}\n.search_select_modal_wrapper .ant-modal-footer .ant-btn.ant-btn-default {\n  color: #005cff;\n  border-color: #005cff;\n}\n.search_select_modal_wrapper .ant-modal-footer .ant-btn-primary,\n.search_select_modal_wrapper .ant-modal-footer .ant-btn-primary[disabled] {\n  background: #005cff;\n  border-color: #005cff;\n}\n.search_select_modal_wrapper .ant-modal-footer .ant-btn-primary[disabled] {\n  opacity: 0.5;\n  color: #fff;\n}\n.search_select_wrapper {\n  position: relative;\n  font-size: 14px;\n}\n.search_select_wrapper_topForm .select_list_columns {\n  width: 100%;\n  padding: 10px 6px 2px 16px;\n  background-color: #fff;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form {\n  padding: 0;\n  overflow: hidden;\n  display: flex;\n  align-items: flex-start;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item,\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-col .ant-space {\n  font-size: 12px !important;\n  margin-right: 0px !important;\n  margin-bottom: 8px !important;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row.ant-form-item-row {\n  background-color: #fafafa;\n  border: 0.8px solid #D9D9D9;\n  border-radius: 2px;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row {\n  width: 100%;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-label {\n  width: 110px;\n  order: 1;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-label label {\n  width: 100%;\n  text-align: left;\n  padding: 0 10px;\n  color: #333333;\n  font-size: 12px;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control {\n  order: 2;\n  width: 100px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-input-affix-wrapper {\n  border: 0;\n  font-size: 12px;\n  background-color: #fafafa;\n  padding: 0 11px;\n  height: 24px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-input-affix-wrapper .ant-input {\n  background-color: #fafafa !important;\n  border: 0;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-select-selector {\n  border: 0 !important;\n  background-color: #fafafa !important;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .query_input .ant-input {\n  background-color: #fafafa !important;\n  border: 0;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-btn-primary {\n  background: #005cff;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form > .ant-row > .ant-col {\n  order: 2;\n  padding-right: 10px;\n}\n.search_select_wrapper_topForm .select_list_button_space {\n  margin-right: 10px;\n}\n.search_select_wrapper_bottomTable {\n  margin: 10px;\n  display: flex;\n  justify-content: space-between;\n}\n.search_select_wrapper_bottomTable_wrapLeft1,\n.search_select_wrapper_bottomTable_wrapLeft2,\n.search_select_wrapper_bottomTable_wrapRight {\n  background: #fff;\n  width: calc(50% - 5px);\n}\n.search_select_wrapper_bottomTable_wrapLeft1 {\n  width: 100%;\n}\n.search_select_wrapper_bottomTable_wrapRight {\n  margin-left: 10px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav {\n  margin: 0;\n  padding: 6px 18.5px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-nav-wrap {\n  height: 28px;\n  font-size: 14px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-tab {\n  padding: 4px 0;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-ink-bar {\n  left: 3px !important;\n  width: 40px !important;\n  background: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-extra-content > span {\n  color: #005cff;\n  cursor: pointer;\n}\n.search_select_wrapper_bottomTable .ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {\n  color: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder {\n  padding: 10px 10px 7px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table-thead > tr > th {\n  color: #7F7F7F;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table-thead .ant-table-selection .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table.ant-table-small .ant-table-tbody > tr > td {\n  color: #333333;\n}\n.search_select_wrapper_bottomTable .ant-checkbox-checked .ant-checkbox-inner {\n  color: #005cff;\n  background: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-pagination-item-active a {\n  color: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-pagination-item-active {\n  border-color: #005cff;\n}\n.searchSelectSpin > div {\n  height: 300px !important;\n}\n";
 styleInject(css_248z$5);
 
 var handleSourceName = function handleSourceName(sName) {
@@ -4129,6 +4129,13 @@ var hasMoreQueryFields = function hasMoreQueryFields(modalTableProps) {
   var visibleFieldsCount = getVisibleFieldsCount(modalTableProps);
   return visibleFieldsCount < (tableSearchForm === null || tableSearchForm === void 0 ? void 0 : tableSearchForm.length);
 };
+var getRealStr = function getRealStr(oldSelect, newSelect, record) {
+  return (oldSelect === null || oldSelect === void 0 ? void 0 : oldSelect.length) ? oldSelect.some(function (o) {
+    return o.value == record.value;
+  }) ? oldSelect.filter(function (s) {
+    return s.value != record.value;
+  }) : [].concat(_toConsumableArray(oldSelect), _toConsumableArray(newSelect)) : newSelect;
+};
 
 var zhankaitiaojian = "data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22UTF-8%22%3F%3E%3Csvg%20width%3D%2224px%22%20height%3D%2224px%22%20viewBox%3D%220%200%2024%2024%22%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%3E%20%20%20%20%3Ctitle%3Ezhankaitiaojian-icon%3C%2Ftitle%3E%20%20%20%20%3Cdefs%3E%20%20%20%20%20%20%20%20%3Crect%20id%3D%22path-1%22%20x%3D%220%22%20y%3D%220%22%20width%3D%2224%22%20height%3D%2224%22%3E%3C%2Frect%3E%20%20%20%20%3C%2Fdefs%3E%20%20%20%20%3Cg%20id%3D%22%E9%A1%B5%E9%9D%A2-1%22%20stroke%3D%22none%22%20stroke-width%3D%221%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%20%20%20%20%20%20%20%20%3Cg%20id%3D%22icon%22%20transform%3D%22translate%28-702.000000%2C%20-498.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20id%3D%22zhankaitiaojian-icon%22%20transform%3D%22translate%28702.000000%2C%20498.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cmask%20id%3D%22mask-2%22%20fill%3D%22white%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cuse%20xlink%3Ahref%3D%22%23path-1%22%3E%3C%2Fuse%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fmask%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cuse%20id%3D%22%E8%92%99%E7%89%88%22%20fill%3D%22%23D8D8D8%22%20opacity%3D%220%22%20xlink%3Ahref%3D%22%23path-1%22%3E%3C%2Fuse%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cpath%20d%3D%22M12.0142082%2C6%20L18%2C11.9972435%20L12.0142082%2C18%20L11.04209%2C17.0260337%20L16.0562218%2C11.9972435%20L11.04209%2C6.97396631%20L12.0142082%2C6%20Z%20M6.97257658%2C6%20L12.9583683%2C11.9972435%20L6.97257658%2C18%20L6.00091666%2C17.0260337%20L11.0150485%2C11.9972435%20L6%2C6.97396631%20L6.97257658%2C6%20Z%22%20id%3D%22%E5%BD%A2%E7%8A%B6%22%20fill%3D%22%23005CFF%22%20fill-rule%3D%22nonzero%22%20mask%3D%22url%28%23mask-2%29%22%20transform%3D%22translate%2812.000000%2C%2012.000000%29%20rotate%28-270.000000%29%20translate%28-12.000000%2C%20-12.000000%29%20%22%3E%3C%2Fpath%3E%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%3C%2Fg%3E%3C%2Fsvg%3E";
 
@@ -4197,15 +4204,15 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   });
   var initPagination = {
     showQuickJumper: true,
-    showSizeChanger: true,
+    showSizeChanger: false,
     showTotal: function showTotal(total) {
       return "\u5171 ".concat(total, " \u6761");
-    }
+    },
+    pageSize: tableInitPageSize
   };
   var tableInitPagination = _objectSpread2(_objectSpread2({}, initPagination), {}, {
     total: 0,
-    current: 1,
-    pageSize: tableInitPageSize
+    current: 1
   });
   var _useState = React$1.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -4323,6 +4330,10 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     _useState42 = _slicedToArray(_useState41, 2),
     confirmLoading = _useState42[0],
     setConfirmLoading = _useState42[1];
+  var _useState43 = React$1.useState(false),
+    _useState44 = _slicedToArray(_useState43, 2),
+    modalSearched = _useState44[0],
+    setModalSearched = _useState44[1];
   React$1.useImperativeHandle(ref, function () {
     return {
       refreshDataSource: function refreshDataSource() {
@@ -4355,6 +4366,13 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
       },
       refreshSelectDataSource: function refreshSelectDataSource() {
         refreshItems();
+      },
+      handleModalVisible: function handleModalVisible(flag) {
+        if (flag) {
+          showModal();
+        } else {
+          handleCancel();
+        }
       }
     };
   });
@@ -4642,7 +4660,6 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   }, [selectBusinessType]);
   // 处理键盘事件
   var handleKeyPress = function handleKeyPress(event) {
-    console.log(event, '----event');
     if ((event.metaKey || event.ctrlKey) && (event.key === 'U' || event.keyCode == 85)) {
       // ctrl + U 键 重置
       onResetTable();
@@ -4666,8 +4683,9 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     };
   }, [isModalVisible]);
   var showModal = function showModal() {
-    // 弹窗打开默认不查询
-    // getData({ pageSize: tableInitPageSize, currentPage: 1 }, 3)
+    setSelectOpen(false);
+    setSearchValue('');
+    setModalSearched(false);
     setIsModalVisible(true);
     // 回显
     if (value) {
@@ -4778,9 +4796,6 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   var handleCancel = function handleCancel() {
     clearModalTable();
     setIsModalVisible(false);
-    if (selectMode) {
-      run();
-    }
   };
   var refreshItems = function refreshItems() {
     // 查看是否存在关联值 如果有关联值 就查询 没有就不能查询
@@ -4809,13 +4824,12 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   };
   var onSearchTable = function onSearchTable() {
     var params = form.getFieldsValue();
+    // const isHaveParams = params && Object.keys(params).filter(item => params[item]).length > 0;
+    setModalSearched(true);
     setTableFormParams(params);
     getData(_objectSpread2(_objectSpread2({}, params), {}, {
       pageSize: tableInitPageSize
     }), 2);
-    if (selectMode) {
-      getData(params);
-    }
   };
   var onResetTable = function onResetTable() {
     form.resetFields();
@@ -4903,8 +4917,13 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     }
   };
   var onDoubleClickSelect = function onDoubleClickSelect(e, record) {
-    if (!selectMode && !((selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled) || !items.length && !tableData.length)) {
+    if (!((selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled) || !items.length && !tableData.length)) {
       var srs = [JSON.parse(JSON.stringify(record))];
+      if (selectMode) {
+        var oldSelect = selectedRows;
+        var newSelect = [JSON.parse(JSON.stringify(record))];
+        srs = getRealStr(oldSelect, newSelect, record);
+      }
       var sks = srs.map(function (i) {
         return i.value;
       });
@@ -4949,7 +4968,10 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
             style: {
               width: '100%'
             },
-            placeholder: "\u8BF7\u9009\u62E9"
+            placeholder: "\u8BF7\u9009\u62E9",
+            onDeselect: function onDeselect(v) {
+              return onSearchTable();
+            }
           }, i === null || i === void 0 ? void 0 : (_i$field2 = i.field) === null || _i$field2 === void 0 ? void 0 : _i$field2.props), {}, {
             disabled: setDisabled(i.name)
           }), (i === null || i === void 0 ? void 0 : (_i$initialSource = i.initialSource) === null || _i$initialSource === void 0 ? void 0 : _i$initialSource.length) && (i === null || i === void 0 ? void 0 : i.initialSource.map(function (m) {
@@ -5038,9 +5060,12 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   //   bsTableCode={bsTableCode}
   // />
   var renderShowTable = function renderShowTable(tableList, type) {
+    var _getFormRowInfo2 = getFormRowInfo(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchForm),
+      totalRows = _getFormRowInfo2.totalRows;
+    var tableBoxHeighth = 548 - totalRows * 10;
     return /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
-        height: '528px'
+        height: "".concat(tableBoxHeighth, "px")
       }
     }, /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2(_objectSpread2({
       bordered: true,
@@ -5049,11 +5074,17 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
       columns: tableShowColumns,
       dataSource: tableList
     }, type == 'noPage' ? {
-      pagination: initPagination
+      pagination: initPagination,
+      locale: {
+        emptyText: '暂无已选结果'
+      }
     } : {
       pagination: tablePagination,
       onChange: handleTableChange,
-      loading: fetching
+      loading: fetching,
+      locale: {
+        emptyText: modalSearched ? '无匹配结果,请更换其他内容再试' : '请输入搜索条件'
+      }
     }), {}, {
       rowKey: mappingValueField,
       scroll: {
@@ -5087,10 +5118,18 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   var onClear = function onClear() {
     formaData([], items);
   };
+  var onSelectClick = function onSelectClick(srs, ds) {
+    var nr = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+    formaData(srs, ds);
+    nr && setSelectOpen(false);
+  };
   var onDropdownVisibleChange = function onDropdownVisibleChange(visible) {
     setSelectOpen(visible);
-    // 解决多选时，关闭下拉框值 搜索项被清空但是没有重新调用onsearch事件的问题
-    selectMode && !visible && setSearchValue('');
+    // 关闭下拉框 如果没有选中数据-需要清空查询数据源
+    if (!visible && !(value === null || value === void 0 ? void 0 : value.length)) {
+      setItems([]);
+      setItemsTotal(0);
+    }
   };
   var renderTable = function renderTable(dataSource) {
     return /*#__PURE__*/React__default['default'].createElement("div", {
@@ -5101,12 +5140,33 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     }, selectMode ? {
       rowSelection: {
         type: 'checkbox',
+        columnWidth: '24px',
         selectedRowKeys: labelInValue ? value.map(function (s) {
           return (s === null || s === void 0 ? void 0 : s.value) || s;
         }) : value,
         onChange: function onChange(sks, srs) {
-          formaData(srs, dataSource);
+          var oldSelect = labelInValue ? value : value.map(function (s) {
+            return {
+              value: s
+            };
+          });
+          var realSrs = getRealStr(oldSelect, srs, srs[0]);
+          onSelectClick(realSrs, dataSource, false);
         }
+      },
+      onRow: function onRow(record, rowKey) {
+        return {
+          onClick: function onClick(event) {
+            var oldSelect = labelInValue ? value : value.map(function (s) {
+              return {
+                value: s
+              };
+            });
+            var newSelect = [JSON.parse(JSON.stringify(record))];
+            var srs = getRealStr(oldSelect, newSelect, record);
+            onSelectClick(srs, dataSource, false);
+          } // 点击行
+        };
       }
     } : {
       rowSelection: {
@@ -5116,11 +5176,10 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
       },
       onRow: function onRow(record, rowKey) {
         return {
-          onDoubleClick: function onDoubleClick() {
+          onClick: function onClick(event) {
             var srs = [JSON.parse(JSON.stringify(record))];
-            formaData(srs, dataSource);
-            setSelectOpen(false);
-          }
+            onSelectClick(srs, dataSource);
+          } // 点击行
         };
       }
     }), {}, {
@@ -5273,6 +5332,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
       filterTxt: searchValue
     }));
   }))), needModalTable && isModalVisible && (/*#__PURE__*/React__default['default'].createElement(antd.Modal, _objectSpread2({
+    maskClosable: false,
     destroyOnClose: true,
     width: "80%",
     title: modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalTableTitle,
@@ -5288,7 +5348,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
       type: "primary",
       loading: confirmLoading,
       onClick: handleOk,
-      disabled: !tableData.length || (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled)
+      disabled: (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled)
     }, "\u786E\u5B9A")] : null,
     wrapClassName: 'search_select_modal_wrapper'
   }, (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalProps) || {}), /*#__PURE__*/React__default['default'].createElement("div", {
@@ -8921,7 +8981,6 @@ function commonFun(type, prefixUrl, parentProps) {
       modalTableTitle: '选择SKU',
       tableSearchForm: tableSearchForm,
       isHorizontally: true,
-      modalRadioNeedFooter: true,
       tableColumns: [{
         title: '序号',
         dataIndex: 'keyIndex',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.0.11-alpha.10",
+  "version": "4.0.11-alpha.12",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -380,7 +380,6 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       modalTableTitle: '选择SKU',
       tableSearchForm,
       isHorizontally: true,
-      modalRadioNeedFooter: true,
       tableColumns: [
         {
           title: '序号',

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

@@ -115,6 +115,11 @@ export default () => {
   const selectPropsMultiple = {
     mode: 'multiple',
     maxTagCount: 1,
+    onSaveCallback: (rows) => {
+      console.log('save call', rows);
+      return Promise.resolve(true);
+      // return Promise.reject('FAILE')
+    }
   }
 
   const singleConfirmModalTableProps = {
@@ -146,11 +151,6 @@ export default () => {
     // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
     selectBusinessType: 'skuCommodity',
-    onSaveCallback: (rows) => {
-      console.log('save call', rows);
-      return Promise.resolve(true);
-      // return Promise.reject('FAILE')
-    }
   };
 
   const onTabChange = (key) => {

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

@@ -95,13 +95,24 @@
       height: 684px;
       overflow: hidden;
     }
+    .ant-modal-footer {
+      .ant-btn.ant-btn-default {
+        color: @primary-color;
+        border-color: @primary-color;
+      }
+      .ant-btn-primary,.ant-btn-primary[disabled] {
+        background: @primary-color;
+        border-color: @primary-color;
+      }
+      .ant-btn-primary[disabled] {
+        opacity: .5;
+        color: #fff;
+      }
+    }
   }
 
   &_wrapper {
     position: relative;
-    min-height: 80vh;
-    max-height: 80vh;
-    overflow: hidden;
     font-size: 14px;
 
     &_topForm {
@@ -115,7 +126,7 @@
           display: flex;
           align-items: flex-start;
 
-          .ant-row .ant-form-item {
+          .ant-row .ant-form-item, .ant-row .ant-col .ant-space {
             font-size: 12px !important;
             margin-right: 0px !important;
             margin-bottom: 8px !important;

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

@@ -8,7 +8,7 @@ import { stringify } from 'querystring';
 import _, { escapeRegExp, isNil, values } from "lodash"
 import './index.less';
 import { BusinessSearchSelect, QueryMutipleInput } from '@/index';
-import { handleSourceName, getFormRowInfo, hasMoreQueryFields, defaultVisibleFieldsCount }  from './utils';
+import { handleSourceName, getFormRowInfo, hasMoreQueryFields, defaultVisibleFieldsCount, getRealStr }  from './utils';
 import { judgeIsRequestError } from '@/utils/requestUtils';
 import zhankaitiaojian from '../../../assets/zhankaitiaojian-icon.svg';
 
@@ -68,8 +68,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     optionLabelProp: "label",
     autoClearSearchValue: false
   }
-  const initPagination = { showQuickJumper: true, showSizeChanger: true, showTotal: (total: any) => `共 ${total} 条` }
-  const tableInitPagination = { ...initPagination, total: 0, current: 1, pageSize: tableInitPageSize }
+  const initPagination = { showQuickJumper: true, showSizeChanger: false, showTotal: (total: any) => `共 ${total} 条`, pageSize: tableInitPageSize }
+  const tableInitPagination = { ...initPagination, total: 0, current: 1 }
 
   const [items, setItems] = useState([]);
   const [selectOpen, setSelectOpen] = useState(false);
@@ -119,6 +119,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   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 [confirmLoading, setConfirmLoading] = useState(false);
+  const [modalSearched, setModalSearched]=useState(false);
 
   useImperativeHandle(ref, () => ({
     refreshDataSource: (reset: boolean = false) => {
@@ -146,6 +147,9 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     },
     refreshSelectDataSource: () => {
       refreshItems()
+    },
+    handleModalVisible: (flag) => {
+      if (flag) { showModal(); } else { handleCancel(); }
     }
   }))
 
@@ -453,7 +457,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   // 处理键盘事件
   const handleKeyPress = (event) => {
-    console.log(event,'----event')
     if ((event.metaKey || event.ctrlKey) && (event.key === 'U' || event.keyCode == 85)) {
       // ctrl + U 键 重置
       onResetTable()
@@ -478,8 +481,10 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   },[isModalVisible])
 
   const showModal = () => {
-    // 弹窗打开默认不查询
-    // getData({ pageSize: tableInitPageSize, currentPage: 1 }, 3)
+    setSelectOpen(false)
+    setSearchValue('');
+    setModalSearched(false);
+
     setIsModalVisible(true);
     // 回显
     if (value) {
@@ -566,9 +571,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const handleCancel = () => {
     clearModalTable();
     setIsModalVisible(false);
-    if (selectMode) {
-      run();
-    }
   };
 
   const refreshItems = () => {
@@ -598,11 +600,12 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   const onSearchTable = () => {
     const params = form.getFieldsValue();
+
+    // const isHaveParams = params && Object.keys(params).filter(item => params[item]).length > 0;
+    setModalSearched(true);
+
     setTableFormParams(params);
     getData({ ...params, pageSize: tableInitPageSize }, 2)
-    if (selectMode) {
-      getData(params)
-    }
   }
 
   const onResetTable = () => {
@@ -701,9 +704,15 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   };
 
   const onDoubleClickSelect = (e, record) => {
-    if (!selectMode && !(selectProps?.disabled || props?.disabled || (!items.length && !tableData.length))) {
-      const srs = [JSON.parse(JSON.stringify(record))]
+    if (!(selectProps?.disabled || props?.disabled || (!items.length && !tableData.length))) {
+      let srs = [JSON.parse(JSON.stringify(record))]
+      if(selectMode) {
+        const oldSelect = selectedRows;
+        const newSelect = [JSON.parse(JSON.stringify(record))];
+        srs = getRealStr(oldSelect,newSelect,record);
+      }
       const sks = srs.map((i: any) => i.value)
+
       onChangeSelectedKeys(sks, srs)
     }
   }
@@ -729,7 +738,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
           return (
             <Col span={ColSpan} key={i.name}>
               <Form.Item name={i.name} label={i.label} key={i.name}>
-                <Select style={{ width: '100%' }} placeholder='请选择' {...i?.field?.props} disabled={setDisabled(i.name)}>
+                <Select style={{ width: '100%' }} placeholder='请选择' onDeselect	={v => onSearchTable()} {...i?.field?.props} disabled={setDisabled(i.name)}>
                   {i?.initialSource?.length && i?.initialSource.map((m: any) => (
                     <Option value={m.value} key={m.value}>{m.text}</Option>
                   ))}
@@ -800,9 +809,11 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   //   bsTableCode={bsTableCode}
   // />
 
-  const renderShowTable =  (tableList, type,) => {
+  const renderShowTable =  (tableList, type) => {
+    const { totalRows } = getFormRowInfo(modalTableProps?.tableSearchForm);
+    const tableBoxHeighth = 548 - totalRows*10;
     return (
-      <div style={{ height: '528px' }}>
+      <div style={{ height: `${tableBoxHeighth}px` }}> 
         <Table
           bordered
           size="middle"
@@ -810,11 +821,17 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
           columns={tableShowColumns}
           dataSource={tableList}
           {...type=='noPage'?{
-            pagination: initPagination
+            pagination: initPagination,
+            locale: {
+              emptyText: '暂无已选结果',
+            }
           }:{
             pagination: tablePagination,
             onChange: handleTableChange,
-            loading: fetching
+            loading: fetching,
+            locale: {
+              emptyText: modalSearched? '无匹配结果,请更换其他内容再试' : '请输入搜索条件',
+            }
           }}
           rowKey={mappingValueField}
           scroll={{
@@ -842,11 +859,18 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const onClear = () => {
     formaData([], items);
   }
+  const onSelectClick = (srs, ds,nr=true) => {
+    formaData(srs, ds);
+    nr && setSelectOpen(false);
+  }
 
   const onDropdownVisibleChange = (visible) => {
     setSelectOpen(visible); 
-    // 解决多选时，关闭下拉框值 搜索项被清空但是没有重新调用onsearch事件的问题
-    selectMode && !visible && setSearchValue('')
+    // 关闭下拉框 如果没有选中数据-需要清空查询数据源
+    if (!visible && !value?.length) {
+      setItems([]);
+      setItemsTotal(0);
+    }
   }
   const renderTable = (dataSource) => {
     return (
@@ -857,11 +881,22 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
           {...(selectMode?{
             rowSelection: {
               type: 'checkbox',  
+              columnWidth: '24px',
               selectedRowKeys: labelInValue ? value.map(s=> (s?.value||s)) : value,
               onChange: (sks, srs) => {
-                formaData(srs, dataSource);
+                const oldSelect = labelInValue ? value : value.map(s => ({ value: s }));
+                const realSrs = getRealStr(oldSelect,srs,srs[0]);
+                onSelectClick(realSrs, dataSource,false)
               }
-            }
+            },
+            onRow: (record, rowKey) => ({
+              onClick: event => {
+                const oldSelect = labelInValue ? value : value.map(s => ({ value: s }));
+                const newSelect = [JSON.parse(JSON.stringify(record))];
+                const srs = getRealStr(oldSelect,newSelect,record);
+                onSelectClick(srs,dataSource,false)
+              }, // 点击行
+            })
           }:{
             rowSelection: {
               type: 'radio',
@@ -869,11 +904,10 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
               selectedRowKeys: labelInValue ? value?.value&&[value?.value]||[] : value&&[value]||[],
             },
             onRow: (record, rowKey) => ({
-              onDoubleClick: () => {
+              onClick: event => {
                 const srs = [JSON.parse(JSON.stringify(record))]
-                formaData(srs, dataSource);
-                setSelectOpen(false)
-              },
+                onSelectClick(srs,dataSource)
+              }, // 点击行
             })
           })}
           columns={selectProps?.renderTableColumns||[]}
@@ -1009,6 +1043,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
       )}
       {needModalTable && isModalVisible && (
         <Modal
+          maskClosable={false}
           destroyOnClose
           width="80%"
           title={modalTableProps?.modalTableTitle}
@@ -1027,11 +1062,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
                     type="primary"
                     loading={confirmLoading}
                     onClick={handleOk}
-                    disabled={
-                      !tableData.length ||
-                      selectProps?.disabled ||
-                      props?.disabled
-                    }
+                    disabled={selectProps?.disabled || props?.disabled}
                   >
                     确定
                   </Button>,

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

@@ -24,4 +24,8 @@ export const hasMoreQueryFields = (modalTableProps: any) => {
   const { tableSearchForm } = modalTableProps || {}
   const visibleFieldsCount = getVisibleFieldsCount(modalTableProps);
   return visibleFieldsCount < tableSearchForm?.length;
+}
+
+export const getRealStr = (oldSelect: any,newSelect: any, record: any) => {
+  return oldSelect?.length ? oldSelect.some((o: any) => o.value == record.value) ? oldSelect.filter((s: any) => s.value != record.value) : [...oldSelect,...newSelect] : newSelect;
 }