@bit-sun/business-component 2.2.0-alpha.25 → 2.2.0-alpha.26

package/dist/index.esm.js

@@ -2701,9 +2701,11 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       sksResult = selectRows.map(function (i) {
         return i.value;
       });
-      // 单选直接选中 不需要确定
-      handleSelectOver(filterRows);
-      handleCancel();
+      // 单选 默认直接选中 不需要确定  配置了modalRadioNeedFooter就需要确定
+      if (!(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalRadioNeedFooter)) {
+        handleSelectOver(filterRows);
+        handleCancel();
+      }
     }
     setSelectedRowKeys(sksResult);
     setPopValue(filterRows);
@@ -2916,8 +2918,8 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     placeholder: "\u8BF7\u9009\u62E9",
     maxTagPlaceholder: maxTagPlaceholder
   }, currentSelectProps), {}, {
-    getPopupContainer: function getPopupContainer() {
-      return _getPopupContainer && _getPopupContainer() || document.getElementById("search_select_div_".concat(uniqueValue));
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return _getPopupContainer && _getPopupContainer(triggerNode) || triggerNode.parentElement;
     }
   }), items.map(function (item) {
     return /*#__PURE__*/React.createElement(Option, {
@@ -2935,13 +2937,13 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     },
     onClick: showModal,
     type: "primary"
-  }, /*#__PURE__*/React.createElement(SearchOutlined, null))), needModalTable && isModalVisible && /*#__PURE__*/React.createElement(Modal, {
+  }, /*#__PURE__*/React.createElement(SearchOutlined, null))), needModalTable && isModalVisible && /*#__PURE__*/React.createElement(Modal, _objectSpread2({
     width: '80%',
     title: modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalTableTitle,
     visible: isModalVisible,
     onOk: handleOk,
     onCancel: handleCancel,
-    footer: selectMode ? [/*#__PURE__*/React.createElement(Button, {
+    footer: selectMode || (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalRadioNeedFooter) ? [/*#__PURE__*/React.createElement(Button, {
       key: "back",
       onClick: handleCancel
     }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
@@ -2950,7 +2952,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       onClick: handleOk,
       disabled: !tableData.length || (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled)
     }, "\u786E\u5B9A")] : null
-  }, /*#__PURE__*/React.createElement("div", {
+  }, (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalProps) || {}), /*#__PURE__*/React.createElement("div", {
     className: 'search_select_wrapper'
   }, /*#__PURE__*/React.createElement("div", {
     className: 'search_select_wrapper_click_flag',
@@ -10218,15 +10220,22 @@ var AddSelect = function AddSelect(props) {
       return _ref4.apply(this, arguments);
     };
   }();
-  var setBusinessDefaultValue = function setBusinessDefaultValue(list, record) {
-    var _record$colorValues;
+  var setBusinessDefaultValue = function setBusinessDefaultValue(list, recordList) {
     var result = list;
-    if (businessType == 'spu' && (record === null || record === void 0 ? void 0 : (_record$colorValues = record.colorValues) === null || _record$colorValues === void 0 ? void 0 : _record$colorValues.length) == 1) {
+    if (businessType == 'spu' && ((recordList === null || recordList === void 0 ? void 0 : recordList.some(function (i) {
+      var _i$colorValues;
+      return (i === null || i === void 0 ? void 0 : (_i$colorValues = i.colorValues) === null || _i$colorValues === void 0 ? void 0 : _i$colorValues.length) == 1;
+    })) || (recordList === null || recordList === void 0 ? void 0 : recordList.some(function (i) {
+      return i === null || i === void 0 ? void 0 : i.defaultMatchingCode;
+    })))) {
       result = list.map(function (i) {
-        if (i.uuid == (record === null || record === void 0 ? void 0 : record.uuid)) {
-          var _record$colorValues$;
-          i.colorName = (_record$colorValues$ = record.colorValues[0]) === null || _record$colorValues$ === void 0 ? void 0 : _record$colorValues$.value;
-        }
+        recordList.forEach(function (record) {
+          if (i.uuid == (record === null || record === void 0 ? void 0 : record.uuid)) {
+            var _record$colorValues$;
+            i.colorName = (_record$colorValues$ = record.colorValues[0]) === null || _record$colorValues$ === void 0 ? void 0 : _record$colorValues$.value;
+            i.selectPropertyGroupCode = record === null || record === void 0 ? void 0 : record.defaultMatchingCode;
+          }
+        });
         return i;
       });
     }
@@ -10835,16 +10844,15 @@ var AddSelect = function AddSelect(props) {
       }
     }
     if (isAllowRepeatedSelect) {
-      var newUuid = uuid();
-      var list = popvalue.concat(selectRows).map(function (i) {
+      var handleSelectRows = selectRows.map(function (i) {
+        var newUuid = uuid();
         return _objectSpread2(_objectSpread2({}, i), {}, {
-          uuid: i.uuid || newUuid
+          uuid: newUuid
         });
       });
-      var recordItem = _objectSpread2(_objectSpread2({}, selectRows[0]), {}, {
-        uuid: newUuid
-      });
-      setPopValue(setBusinessDefaultValue(list, recordItem));
+      var list = popvalue.concat(handleSelectRows);
+      var recordList = handleSelectRows;
+      setPopValue(setBusinessDefaultValue(list, recordList));
       setSelectedRowKeys([]);
     } else {
       setPopValue(selectRows);
@@ -14920,6 +14928,7 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
       filter: 'qp-itemCode,name-orGroup,like',
       otherParams: {
         'qp-approveStatus-eq': 1,
+        'qp-status-eq': 1,
         sorter: 'desc-id'
       },
       mappingTextField: 'name',
@@ -15436,8 +15445,8 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
     maxTagPlaceholder: maxTagPlaceholder,
     onChange: handleChange,
     disabled: disabled || mode === 'view' || (ctx === null || ctx === void 0 ? void 0 : ctx.mode) === 'view',
-    getPopupContainer: function getPopupContainer() {
-      return _getPopupContainer && _getPopupContainer() || document.body;
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return _getPopupContainer && _getPopupContainer(triggerNode) || document.body;
     }
   })));
 };

package/dist/index.js

@@ -2719,9 +2719,11 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
       sksResult = selectRows.map(function (i) {
         return i.value;
       });
-      // 单选直接选中 不需要确定
-      handleSelectOver(filterRows);
-      handleCancel();
+      // 单选 默认直接选中 不需要确定  配置了modalRadioNeedFooter就需要确定
+      if (!(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalRadioNeedFooter)) {
+        handleSelectOver(filterRows);
+        handleCancel();
+      }
     }
     setSelectedRowKeys(sksResult);
     setPopValue(filterRows);
@@ -2934,8 +2936,8 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
     placeholder: "\u8BF7\u9009\u62E9",
     maxTagPlaceholder: maxTagPlaceholder
   }, currentSelectProps), {}, {
-    getPopupContainer: function getPopupContainer() {
-      return _getPopupContainer && _getPopupContainer() || document.getElementById("search_select_div_".concat(uniqueValue));
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return _getPopupContainer && _getPopupContainer(triggerNode) || triggerNode.parentElement;
     }
   }), items.map(function (item) {
     return /*#__PURE__*/React__default['default'].createElement(Option, {
@@ -2953,13 +2955,13 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
     },
     onClick: showModal,
     type: "primary"
-  }, /*#__PURE__*/React__default['default'].createElement(icons.SearchOutlined, null))), needModalTable && isModalVisible && /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
+  }, /*#__PURE__*/React__default['default'].createElement(icons.SearchOutlined, null))), needModalTable && isModalVisible && /*#__PURE__*/React__default['default'].createElement(antd.Modal, _objectSpread2({
     width: '80%',
     title: modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalTableTitle,
     visible: isModalVisible,
     onOk: handleOk,
     onCancel: handleCancel,
-    footer: selectMode ? [/*#__PURE__*/React__default['default'].createElement(antd.Button, {
+    footer: selectMode || (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalRadioNeedFooter) ? [/*#__PURE__*/React__default['default'].createElement(antd.Button, {
       key: "back",
       onClick: handleCancel
     }, "\u53D6\u6D88"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
@@ -2968,7 +2970,7 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
       onClick: handleOk,
       disabled: !tableData.length || (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled)
     }, "\u786E\u5B9A")] : null
-  }, /*#__PURE__*/React__default['default'].createElement("div", {
+  }, (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalProps) || {}), /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'search_select_wrapper'
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'search_select_wrapper_click_flag',
@@ -10236,15 +10238,22 @@ var AddSelect = function AddSelect(props) {
       return _ref4.apply(this, arguments);
     };
   }();
-  var setBusinessDefaultValue = function setBusinessDefaultValue(list, record) {
-    var _record$colorValues;
+  var setBusinessDefaultValue = function setBusinessDefaultValue(list, recordList) {
     var result = list;
-    if (businessType == 'spu' && (record === null || record === void 0 ? void 0 : (_record$colorValues = record.colorValues) === null || _record$colorValues === void 0 ? void 0 : _record$colorValues.length) == 1) {
+    if (businessType == 'spu' && ((recordList === null || recordList === void 0 ? void 0 : recordList.some(function (i) {
+      var _i$colorValues;
+      return (i === null || i === void 0 ? void 0 : (_i$colorValues = i.colorValues) === null || _i$colorValues === void 0 ? void 0 : _i$colorValues.length) == 1;
+    })) || (recordList === null || recordList === void 0 ? void 0 : recordList.some(function (i) {
+      return i === null || i === void 0 ? void 0 : i.defaultMatchingCode;
+    })))) {
       result = list.map(function (i) {
-        if (i.uuid == (record === null || record === void 0 ? void 0 : record.uuid)) {
-          var _record$colorValues$;
-          i.colorName = (_record$colorValues$ = record.colorValues[0]) === null || _record$colorValues$ === void 0 ? void 0 : _record$colorValues$.value;
-        }
+        recordList.forEach(function (record) {
+          if (i.uuid == (record === null || record === void 0 ? void 0 : record.uuid)) {
+            var _record$colorValues$;
+            i.colorName = (_record$colorValues$ = record.colorValues[0]) === null || _record$colorValues$ === void 0 ? void 0 : _record$colorValues$.value;
+            i.selectPropertyGroupCode = record === null || record === void 0 ? void 0 : record.defaultMatchingCode;
+          }
+        });
         return i;
       });
     }
@@ -10853,16 +10862,15 @@ var AddSelect = function AddSelect(props) {
       }
     }
     if (isAllowRepeatedSelect) {
-      var newUuid = uuid();
-      var list = popvalue.concat(selectRows).map(function (i) {
+      var handleSelectRows = selectRows.map(function (i) {
+        var newUuid = uuid();
         return _objectSpread2(_objectSpread2({}, i), {}, {
-          uuid: i.uuid || newUuid
+          uuid: newUuid
         });
       });
-      var recordItem = _objectSpread2(_objectSpread2({}, selectRows[0]), {}, {
-        uuid: newUuid
-      });
-      setPopValue(setBusinessDefaultValue(list, recordItem));
+      var list = popvalue.concat(handleSelectRows);
+      var recordList = handleSelectRows;
+      setPopValue(setBusinessDefaultValue(list, recordList));
       setSelectedRowKeys([]);
     } else {
       setPopValue(selectRows);
@@ -14938,6 +14946,7 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
       filter: 'qp-itemCode,name-orGroup,like',
       otherParams: {
         'qp-approveStatus-eq': 1,
+        'qp-status-eq': 1,
         sorter: 'desc-id'
       },
       mappingTextField: 'name',
@@ -15454,8 +15463,8 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
     maxTagPlaceholder: maxTagPlaceholder,
     onChange: handleChange,
     disabled: disabled || mode === 'view' || (ctx === null || ctx === void 0 ? void 0 : ctx.mode) === 'view',
-    getPopupContainer: function getPopupContainer() {
-      return _getPopupContainer && _getPopupContainer() || document.body;
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return _getPopupContainer && _getPopupContainer(triggerNode) || document.body;
     }
   })));
 };

package/package.json

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

package/src/components/Business/AddSelectBusiness/index.tsx

@@ -691,6 +691,7 @@ export const AddSpuSelect = (parProps: any) => {
       filter: 'qp-itemCode,name-orGroup,like', // 过滤参数
       otherParams: {
         'qp-approveStatus-eq': 1, // 审核状态(0.待审批;1.审批通过;2.驳回;3.审批未通过)
+        'qp-status-eq': 1,
         sorter: 'desc-id'
       }, // 默认参数
       mappingTextField: 'name',

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

@@ -117,6 +117,10 @@ export default () => {
     maxTagCount: 1,
   }
 
+  const singleConfirmModalTableProps = {
+    modalRadioNeedFooter: true
+  }
+
   const [ tabKey, setTabKey ] = useState('single')
   const [value, setValue] = useState(selectProps?.mode ? [] : null);
   
@@ -153,6 +157,11 @@ export default () => {
             <BusinessSearchSelect {...props} />
           )}
         </TabPane>
+        <TabPane tab='单选弹窗可点击确定' key='singleConfirm'>
+          {tabKey === 'singleConfirm' && (
+            <BusinessSearchSelect {...props} modalTableProps={singleConfirmModalTableProps} />
+          )}
+        </TabPane>
         <TabPane tab='多选' key='multiple'>
           {tabKey === 'multiple' && (
             <BusinessSearchSelect {...props} selectProps={selectPropsMultiple} />
@@ -1225,7 +1234,7 @@ export default () => {
 
   const onTabChange = (key) => {
     setTabKey(key)
-    setValue(key === 'single' ? null: [])
+    setValue(key === 'multiple' ? []: null)
   }
   
   return (

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

@@ -229,13 +229,16 @@ const AddSelect = (props: any) => {
     }
     return true
   }
-  const setBusinessDefaultValue = (list: any, record: any) => {
+  const setBusinessDefaultValue = (list: any, recordList: any) => {
     let result = list;
-    if(businessType == 'spu' && record?.colorValues?.length == 1) {
+    if(businessType == 'spu' && (recordList?.some((i: any) => i?.colorValues?.length == 1) || recordList?.some((i: any) => i?.defaultMatchingCode))) {
       result = list.map((i: any) => {
-        if(i.uuid == record?.uuid) {
-          i.colorName = record.colorValues[0]?.value
-        }
+        recordList.forEach((record: any) => {
+          if(i.uuid == record?.uuid) {
+            i.colorName = record.colorValues[0]?.value;
+            i.selectPropertyGroupCode = record?.defaultMatchingCode;
+          }
+        })
         return i
       })
     }
@@ -896,10 +899,13 @@ const AddSelect = (props: any) => {
       }
     }
     if(isAllowRepeatedSelect) {
-      const newUuid = uuid();
-      const list = popvalue.concat(selectRows).map((i: any) => ({...i, uuid: i.uuid || newUuid}));
-      const recordItem = {...selectRows[0], uuid: newUuid }
-      setPopValue(setBusinessDefaultValue(list,recordItem));
+      const handleSelectRows = selectRows.map((i: any) => {
+        const newUuid = uuid();
+        return {...i, uuid: newUuid}
+      })
+      const list = popvalue.concat(handleSelectRows);
+      const recordList = handleSelectRows
+      setPopValue(setBusinessDefaultValue(list,recordList));
       setSelectedRowKeys([])
     } else {
       setPopValue(selectRows);

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

@@ -586,9 +586,11 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
       // 处理单选
       filterRows = selectRows;
       sksResult = selectRows.map((i) => i.value)
-      // 单选直接选中 不需要确定
-      handleSelectOver(filterRows)
-      handleCancel();
+      // 单选 默认直接选中 不需要确定  配置了modalRadioNeedFooter就需要确定
+      if(!modalTableProps?.modalRadioNeedFooter) {
+        handleSelectOver(filterRows)
+        handleCancel();
+      }
     }
 
     setSelectedRowKeys(sksResult)
@@ -759,7 +761,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
             placeholder="请选择"
             maxTagPlaceholder={maxTagPlaceholder}
             {...currentSelectProps}
-            getPopupContainer={() => (getPopupContainer && getPopupContainer()) || document.getElementById(`search_select_div_${uniqueValue}`)}
+            getPopupContainer={(triggerNode) => (getPopupContainer && getPopupContainer(triggerNode)) || triggerNode.parentElement}
           >
             {items.map(item => (
               <Option key={item.value} label={item.text}>
@@ -780,7 +782,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
           visible={isModalVisible}
           onOk={handleOk}
           onCancel={handleCancel}
-          footer={selectMode ? [
+          footer={(selectMode || modalTableProps?.modalRadioNeedFooter) ? [
             <Button key="back" onClick={handleCancel}>
               取消
             </Button>,
@@ -793,6 +795,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
               确定
             </Button>,
           ] : null}
+          {...(modalTableProps?.modalProps || {})}
         >
           <div className={'search_select_wrapper'}>
             <div className={'search_select_wrapper_click_flag'} onClick={() => setCaretLeftFlag(!caretLeftFlag)}>

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

@@ -152,7 +152,7 @@ const TreeSearchSelect = (props: any) => {
         maxTagPlaceholder={maxTagPlaceholder}
         onChange={handleChange}
         disabled={disabled || mode==='view' || ctx?.mode === 'view'}
-        getPopupContainer={() => (getPopupContainer && getPopupContainer()) || document.body}
+        getPopupContainer={(triggerNode) => (getPopupContainer && getPopupContainer(triggerNode)) || document.body}
       >
       </TreeSelect>
     </div>