@bit-sun/business-component 4.0.11-alpha.21 → 4.0.11-alpha.23

package/dist/index.esm.js

@@ -4185,7 +4185,8 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     allowClear: true,
     listHeight: 160,
     optionLabelProp: "label",
-    autoClearSearchValue: false
+    autoClearSearchValue: false,
+    placement: 'bottomLeft'
   });
   var initPagination = {
     showQuickJumper: true,
@@ -4200,6 +4201,18 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     current: 1
   });
   var disabled = noOperate || (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled);
+  var isHaveDependency = fixedparameter && fieldValToParam && ctx;
+  var isHaveDValue = function isHaveDValue() {
+    var formValueList = [];
+    fieldValToParam.forEach(function (item, index) {
+      var fixedParamVal = ctx.form.getFieldValue(fieldValToParam[index]);
+      formValueList.push(fixedParamVal);
+    });
+    return formValueList.filter(function (item) {
+      return item;
+    }).length > 0;
+  };
+  var sDisabled = disabled || isHaveDependency && !!!isHaveDValue();
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     items = _useState2[0],
@@ -4333,6 +4346,11 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
         var reset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
         if (reset) {
           if (init) {
+            // 有关联，依赖项清空，此form项数据源也应清空, 也不可点击搜索
+            if (isHaveDependency) {
+              clearSelectDataSource();
+              return;
+            }
             run('init');
           } else {
             clearSelectDataSource();
@@ -4371,7 +4389,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     setFetching(true);
     // 处理dependence参数
     var fixedParam = {};
-    if (fixedparameter && fieldValToParam && ctx) {
+    if (isHaveDependency) {
       fixedparameter.forEach(function (item, index) {
         var fixedParamVal = ctx.form.getFieldValue(fieldValToParam[index]);
         if (fixedParamVal) {
@@ -4671,6 +4689,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     };
   }, [isModalVisible]);
   var showModal = function showModal() {
+    if (sDisabled) return;
     setSelectOpen(false);
     setSearchValue('');
     setModalSearched(false);
@@ -4788,14 +4807,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   var refreshItems = function refreshItems() {
     // 查看是否存在关联值 如果有关联值 就查询 没有就不能查询
     if (fieldValToParam && ctx && fixedparamsDisabled) {
-      var formValueList = [];
-      fieldValToParam.forEach(function (item, index) {
-        var fixedParamVal = ctx.form.getFieldValue(fieldValToParam[index]);
-        formValueList.push(fixedParamVal);
-      });
-      if (formValueList.filter(function (item) {
-        return item;
-      }).length > 0) {
+      if (!!isHaveDValue()) {
         run();
       } else {
         clearSelectDataSource();
@@ -5111,6 +5123,8 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   }];
   var resetSelectDataSource = function resetSelectDataSource() {
     setSearchValue('');
+    // 有关联值 不需要清空下拉框数据 也不需要重新去请求了
+    if (isHaveDependency) return;
     clearSelectDataSource();
     init && run('init');
   };
@@ -5118,6 +5132,18 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     formaData([], items);
     resetSelectDataSource();
   };
+  var onDeselect = function onDeselect() {
+    var oldSelect = (value === null || value === void 0 ? void 0 : value.map(function (s) {
+      return {
+        value: (s === null || s === void 0 ? void 0 : s.value) || s
+      };
+    })) || [];
+    var deRecord = arguments.length <= 1 ? undefined : arguments[1];
+    var srs = oldSelect.filter(function (s) {
+      return s.value != (deRecord === null || deRecord === void 0 ? void 0 : deRecord.value);
+    });
+    onSelectClick(srs, items, false);
+  };
   var onSelectClick = function onSelectClick(srs, ds) {
     var nr = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
     formaData(srs, ds);
@@ -5152,7 +5178,12 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
           var tmpSelectedRows = oldSelect.concat(srs).filter(function (item) {
             return item != undefined;
           });
-          var realSrs = sks.map(function (key) {
+          var realStr = _toConsumableArray(((value === null || value === void 0 ? void 0 : value.map(function (s) {
+            return (s === null || s === void 0 ? void 0 : s.value) || s;
+          })) || []).concat(sks)).filter(function (item) {
+            return item != undefined;
+          }); // 避免搜索之后 没有了选中前的数据
+          var realSrs = realStr.map(function (key) {
             return tmpSelectedRows.filter(function (item) {
               return item[mappingValueField] == key;
             })[0];
@@ -5173,7 +5204,6 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
               };
             })) || [];
             var newSelect = [JSON.parse(JSON.stringify(record))];
-            console.log('行选择：', 'oldSelect', oldSelect, 'newSelect', newSelect, 'record', record);
             var srs = getRealStr(oldSelect, newSelect, record);
             onSelectClick(srs, dataSource, false);
           } // 点击行
@@ -5300,7 +5330,8 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     value: value,
     onChange: onchange,
     onClear: onClear,
-    disabled: disabled,
+    onDeselect: onDeselect,
+    disabled: sDisabled,
     dropdownStyle: {
       borderRadius: '2px',
       padding: '10px 2px'
@@ -5317,7 +5348,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       style: {
         textAlign: 'center'
       }
-    }, /*#__PURE__*/React$1.createElement("div", null, searchValue ? '无匹配结果,请更换其他内容再试' : "\u8BF7\u5F55\u5165".concat(searchStartLength ? '4位数以上' : '', "\u5B57\u7B26\u8FDB\u884C\u6A21\u7CCA\u67E5\u8BE2")))),
+    }, /*#__PURE__*/React$1.createElement("div", null, searchValue || init ? '无匹配结果,请更换其他内容再试' : "\u8BF7\u5F55\u5165".concat(searchStartLength ? '4位数以上' : '', "\u5B57\u7B26\u8FDB\u884C\u6A21\u7CCA\u67E5\u8BE2")))),
     onPopupScroll: SelectScroll,
     style: {
       width: 'calc(100%)'
@@ -5329,7 +5360,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     }
   }, needModalTable ? {
     suffixIcon: /*#__PURE__*/React$1.createElement("div", {
-      className: "search_select_expand_button ".concat(disabled ? 'search_select_expand_button_disabled' : ''),
+      className: "search_select_expand_button ".concat(sDisabled ? 'search_select_expand_button_disabled' : ''),
       onClick: showModal
     }, /*#__PURE__*/React$1.createElement(SearchOutlined, null))
   } : {}), currentSelectProps), {}, {
@@ -5361,7 +5392,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       type: "primary",
       loading: confirmLoading,
       onClick: handleOk,
-      disabled: disabled
+      disabled: sDisabled
     }, "\u786E\u5B9A")] : null,
     wrapClassName: 'search_select_modal_wrapper'
   }, (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalProps) || {}), /*#__PURE__*/React$1.createElement("div", {

package/dist/index.js

@@ -4208,7 +4208,8 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     allowClear: true,
     listHeight: 160,
     optionLabelProp: "label",
-    autoClearSearchValue: false
+    autoClearSearchValue: false,
+    placement: 'bottomLeft'
   });
   var initPagination = {
     showQuickJumper: true,
@@ -4223,6 +4224,18 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     current: 1
   });
   var disabled = noOperate || (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled);
+  var isHaveDependency = fixedparameter && fieldValToParam && ctx;
+  var isHaveDValue = function isHaveDValue() {
+    var formValueList = [];
+    fieldValToParam.forEach(function (item, index) {
+      var fixedParamVal = ctx.form.getFieldValue(fieldValToParam[index]);
+      formValueList.push(fixedParamVal);
+    });
+    return formValueList.filter(function (item) {
+      return item;
+    }).length > 0;
+  };
+  var sDisabled = disabled || isHaveDependency && !!!isHaveDValue();
   var _useState = React$1.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     items = _useState2[0],
@@ -4356,6 +4369,11 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
         var reset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
         if (reset) {
           if (init) {
+            // 有关联，依赖项清空，此form项数据源也应清空, 也不可点击搜索
+            if (isHaveDependency) {
+              clearSelectDataSource();
+              return;
+            }
             run('init');
           } else {
             clearSelectDataSource();
@@ -4394,7 +4412,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     setFetching(true);
     // 处理dependence参数
     var fixedParam = {};
-    if (fixedparameter && fieldValToParam && ctx) {
+    if (isHaveDependency) {
       fixedparameter.forEach(function (item, index) {
         var fixedParamVal = ctx.form.getFieldValue(fieldValToParam[index]);
         if (fixedParamVal) {
@@ -4694,6 +4712,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     };
   }, [isModalVisible]);
   var showModal = function showModal() {
+    if (sDisabled) return;
     setSelectOpen(false);
     setSearchValue('');
     setModalSearched(false);
@@ -4811,14 +4830,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   var refreshItems = function refreshItems() {
     // 查看是否存在关联值 如果有关联值 就查询 没有就不能查询
     if (fieldValToParam && ctx && fixedparamsDisabled) {
-      var formValueList = [];
-      fieldValToParam.forEach(function (item, index) {
-        var fixedParamVal = ctx.form.getFieldValue(fieldValToParam[index]);
-        formValueList.push(fixedParamVal);
-      });
-      if (formValueList.filter(function (item) {
-        return item;
-      }).length > 0) {
+      if (!!isHaveDValue()) {
         run();
       } else {
         clearSelectDataSource();
@@ -5134,6 +5146,8 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   }];
   var resetSelectDataSource = function resetSelectDataSource() {
     setSearchValue('');
+    // 有关联值 不需要清空下拉框数据 也不需要重新去请求了
+    if (isHaveDependency) return;
     clearSelectDataSource();
     init && run('init');
   };
@@ -5141,6 +5155,18 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     formaData([], items);
     resetSelectDataSource();
   };
+  var onDeselect = function onDeselect() {
+    var oldSelect = (value === null || value === void 0 ? void 0 : value.map(function (s) {
+      return {
+        value: (s === null || s === void 0 ? void 0 : s.value) || s
+      };
+    })) || [];
+    var deRecord = arguments.length <= 1 ? undefined : arguments[1];
+    var srs = oldSelect.filter(function (s) {
+      return s.value != (deRecord === null || deRecord === void 0 ? void 0 : deRecord.value);
+    });
+    onSelectClick(srs, items, false);
+  };
   var onSelectClick = function onSelectClick(srs, ds) {
     var nr = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
     formaData(srs, ds);
@@ -5175,7 +5201,12 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
           var tmpSelectedRows = oldSelect.concat(srs).filter(function (item) {
             return item != undefined;
           });
-          var realSrs = sks.map(function (key) {
+          var realStr = _toConsumableArray(((value === null || value === void 0 ? void 0 : value.map(function (s) {
+            return (s === null || s === void 0 ? void 0 : s.value) || s;
+          })) || []).concat(sks)).filter(function (item) {
+            return item != undefined;
+          }); // 避免搜索之后 没有了选中前的数据
+          var realSrs = realStr.map(function (key) {
             return tmpSelectedRows.filter(function (item) {
               return item[mappingValueField] == key;
             })[0];
@@ -5196,7 +5227,6 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
               };
             })) || [];
             var newSelect = [JSON.parse(JSON.stringify(record))];
-            console.log('行选择：', 'oldSelect', oldSelect, 'newSelect', newSelect, 'record', record);
             var srs = getRealStr(oldSelect, newSelect, record);
             onSelectClick(srs, dataSource, false);
           } // 点击行
@@ -5323,7 +5353,8 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     value: value,
     onChange: onchange,
     onClear: onClear,
-    disabled: disabled,
+    onDeselect: onDeselect,
+    disabled: sDisabled,
     dropdownStyle: {
       borderRadius: '2px',
       padding: '10px 2px'
@@ -5340,7 +5371,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
       style: {
         textAlign: 'center'
       }
-    }, /*#__PURE__*/React__default['default'].createElement("div", null, searchValue ? '无匹配结果,请更换其他内容再试' : "\u8BF7\u5F55\u5165".concat(searchStartLength ? '4位数以上' : '', "\u5B57\u7B26\u8FDB\u884C\u6A21\u7CCA\u67E5\u8BE2")))),
+    }, /*#__PURE__*/React__default['default'].createElement("div", null, searchValue || init ? '无匹配结果,请更换其他内容再试' : "\u8BF7\u5F55\u5165".concat(searchStartLength ? '4位数以上' : '', "\u5B57\u7B26\u8FDB\u884C\u6A21\u7CCA\u67E5\u8BE2")))),
     onPopupScroll: SelectScroll,
     style: {
       width: 'calc(100%)'
@@ -5352,7 +5383,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     }
   }, needModalTable ? {
     suffixIcon: /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "search_select_expand_button ".concat(disabled ? 'search_select_expand_button_disabled' : ''),
+      className: "search_select_expand_button ".concat(sDisabled ? 'search_select_expand_button_disabled' : ''),
       onClick: showModal
     }, /*#__PURE__*/React__default['default'].createElement(icons.SearchOutlined, null))
   } : {}), currentSelectProps), {}, {
@@ -5384,7 +5415,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
       type: "primary",
       loading: confirmLoading,
       onClick: handleOk,
-      disabled: disabled
+      disabled: sDisabled
     }, "\u786E\u5B9A")] : null,
     wrapClassName: 'search_select_modal_wrapper'
   }, (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalProps) || {}), /*#__PURE__*/React__default['default'].createElement("div", {

package/package.json

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

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

@@ -68,11 +68,22 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     allowClear: true,
     listHeight: 160,
     optionLabelProp: "label",
-    autoClearSearchValue: false
+    autoClearSearchValue: false,
+    placement: 'bottomLeft'
   }
   const initPagination = { showQuickJumper: true, showSizeChanger: false, showTotal: (total: any) => `共 ${total} 条`, pageSize: tableInitPageSize }
   const tableInitPagination = { ...initPagination, total: 0, current: 1 }
-  const disabled = noOperate || selectProps?.disabled || props?.disabled
+  const disabled = noOperate || selectProps?.disabled || props?.disabled;
+  const isHaveDependency = fixedparameter && fieldValToParam && ctx;
+  const isHaveDValue = () => {
+    let formValueList = [];
+    fieldValToParam.forEach((item: any, index: any) => {
+      const fixedParamVal = ctx.form.getFieldValue(fieldValToParam[index]);
+      formValueList.push(fixedParamVal);
+    });
+    return formValueList.filter((item: any) => item).length > 0
+  }
+  const sDisabled = disabled || (isHaveDependency && !!!isHaveDValue());
 
   const [items, setItems] = useState([]);
   const [selectOpen, setSelectOpen] = useState(false);
@@ -136,6 +147,11 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     refreshDataSource: (reset: boolean = false) => {
       if (reset) {
         if (init) {
+          // 有关联，依赖项清空，此form项数据源也应清空, 也不可点击搜索
+          if(isHaveDependency){
+            clearSelectDataSource();
+            return;
+          }
           run('init');
         } else {
           clearSelectDataSource();
@@ -165,7 +181,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
     // 处理dependence参数
     const fixedParam = {};
-    if (fixedparameter && fieldValToParam && ctx) {
+    if (isHaveDependency) {
       fixedparameter.forEach((item: any, index: any) => {
         const fixedParamVal = ctx.form.getFieldValue(fieldValToParam[index]);
         if(fixedParamVal) {
@@ -487,6 +503,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   },[isModalVisible])
 
   const showModal = () => {
+    if(sDisabled) return;
+    
     setSelectOpen(false)
     setSearchValue('');
     setModalSearched(false);
@@ -582,12 +600,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const refreshItems = () => {
     // 查看是否存在关联值 如果有关联值 就查询 没有就不能查询
     if (fieldValToParam && ctx && fixedparamsDisabled) {
-      let formValueList = [];
-      fieldValToParam.forEach((item: any, index: any) => {
-        const fixedParamVal = ctx.form.getFieldValue(fieldValToParam[index]);
-        formValueList.push(fixedParamVal);
-      });
-      if (formValueList.filter((item: any) => item).length > 0) {
+      if (!!isHaveDValue()) {
         run();
       } else {
         clearSelectDataSource();
@@ -867,6 +880,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   const resetSelectDataSource = () => {
     setSearchValue('');
+    // 有关联值 不需要清空下拉框数据 也不需要重新去请求了
+    if(isHaveDependency) return;
     clearSelectDataSource();
     init && run('init')
   }
@@ -875,6 +890,13 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     formaData([], items);
     resetSelectDataSource();
   }
+
+  const onDeselect = (...arg) => {
+    const oldSelect = value?.map(s => ({ value: s?.value||s }))||[];
+    const deRecord = arg[1];
+    const srs = oldSelect.filter((s: any) => s.value != deRecord?.value)
+    onSelectClick(srs, items,false)
+  }
   const onSelectClick = (srs, ds,nr=true) => {
     formaData(srs, ds);
     nr && setSelectOpen(false);
@@ -901,7 +923,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
               onChange: (sks, srs) => {
                 const oldSelect = value?.map(s => ({ value: s?.value||s }))||[];
                 let tmpSelectedRows = oldSelect.concat(srs).filter(item => item != undefined);
-                let realSrs = sks.map(key => tmpSelectedRows.filter(item => item[mappingValueField] == key)[0]).filter(item => item != undefined)
+                const realStr = [...((value?.map(s => s?.value||s)||[]).concat(sks))].filter(item => item != undefined); // 避免搜索之后 没有了选中前的数据
+                let realSrs = realStr.map(key => tmpSelectedRows.filter(item => item[mappingValueField] == key)[0]).filter(item => item != undefined)
                 onSelectClick(realSrs, dataSource,false)
               }
             },
@@ -912,7 +935,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
                 const oldSelect = value?.map(s => ({ value: s?.value||s }))||[];
                 const newSelect = [JSON.parse(JSON.stringify(record))];
-                console.log('行选择：','oldSelect',oldSelect,'newSelect',newSelect,'record',record)
                 const srs = getRealStr(oldSelect,newSelect,record);
                 onSelectClick(srs,dataSource,false)
               }, // 点击行
@@ -1002,7 +1024,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     return getShowValueStr(kongValue);
   }
 
-  const isShouldShowStr = (props.disabled && ctx) || ctx?.mode == 'view'
+  const isShouldShowStr = (props.disabled && ctx) || ctx?.mode == 'view';
   return (
     <div className={'search_select'}>
       {fieldComponent ? (
@@ -1028,7 +1050,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
             value={value}
             onChange={onchange}
             onClear={onClear}
-            disabled={disabled}
+            onDeselect={onDeselect}
+            disabled={sDisabled}
             dropdownStyle={{ borderRadius: '2px', padding: '10px 2px' }}
             open={selectOpen}
             onDropdownVisibleChange={onDropdownVisibleChange}
@@ -1038,7 +1061,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
                 <Spin size="small" className='searchSelectSpin' />
               ) : (
                 <div style={{ textAlign: 'center' }}>
-                  <div>{searchValue?'无匹配结果,请更换其他内容再试':`请录入${searchStartLength?'4位数以上':''}字符进行模糊查询`}</div>
+                  <div>{(searchValue||init)?'无匹配结果,请更换其他内容再试':`请录入${searchStartLength?'4位数以上':''}字符进行模糊查询`}</div>
                 </div>
               )
             }
@@ -1048,7 +1071,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
             maxTagPlaceholder={maxTagPlaceholder}
             onSearch={(v) => onSearchChange(v)}
             {...(needModalTable ? {
-              suffixIcon: <div className={`search_select_expand_button ${(disabled)?'search_select_expand_button_disabled':''}`} onClick={showModal}><SearchOutlined /></div>
+              suffixIcon: <div className={`search_select_expand_button ${(sDisabled)?'search_select_expand_button_disabled':''}`} onClick={showModal}><SearchOutlined /></div>
             } : {})}
             {...currentSelectProps}
             getPopupContainer={(triggerNode) => (getPopupContainer && getPopupContainer(triggerNode)) || triggerNode.parentElement}
@@ -1085,7 +1108,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
                     type="primary"
                     loading={confirmLoading}
                     onClick={handleOk}
-                    disabled={disabled}
+                    disabled={sDisabled}
                   >
                     确定
                   </Button>,