@bit-sun/business-component 2.0.3 → 2.0.4

package/dist/index.esm.js

@@ -4480,7 +4480,8 @@ var AddSelect = function AddSelect(props) {
       _props$getPopupContai = props.getPopupContainer,
       onSaveCallback = props.onSaveCallback,
       _props$buttonText = props.buttonText,
-      buttonText = _props$buttonText === void 0 ? '添加' : _props$buttonText;
+      buttonText = _props$buttonText === void 0 ? '添加' : _props$buttonText,
+      beforeShowModal = props.beforeShowModal;
 
   var _ref = requestConfig || {},
       url = _ref.url,
@@ -4779,6 +4780,8 @@ var AddSelect = function AddSelect(props) {
       } else {
         var keys = res.list ? 'list' : 'items';
         source = res ? res[keys] ? res[keys].map(function (item) {
+          var _item$packingUnitList, _item$packingUnitList2;
+
           var textShowText = item[mappingTextField];
 
           if (mappingTextShowTextField) {
@@ -4797,9 +4800,14 @@ var AddSelect = function AddSelect(props) {
             text: item[mappingTextField],
             textShowText: textShowText,
             textShowKey: item[mappingTextShowKeyField || mappingValueField],
-            value: item[mappingValueField]
+            value: item[mappingValueField],
+            baseUnitCode: item === null || item === void 0 ? void 0 : (_item$packingUnitList = item.packingUnitList) === null || _item$packingUnitList === void 0 ? void 0 : (_item$packingUnitList2 = _item$packingUnitList.find(function (item) {
+              return item.baseUnit === true;
+            })) === null || _item$packingUnitList2 === void 0 ? void 0 : _item$packingUnitList2.unitCode
           });
         }) : Array.isArray(res) && (res === null || res === void 0 ? void 0 : res.map(function (item) {
+          var _item$packingUnitList3, _item$packingUnitList4;
+
           var textShowText = item[mappingTextField];
 
           if (mappingTextShowTextField) {
@@ -4818,7 +4826,10 @@ var AddSelect = function AddSelect(props) {
             text: item[mappingTextField],
             textShowText: textShowText,
             textShowKey: item[mappingTextShowKeyField || mappingValueField],
-            value: item[mappingValueField]
+            value: item[mappingValueField],
+            baseUnitCode: item === null || item === void 0 ? void 0 : (_item$packingUnitList3 = item.packingUnitList) === null || _item$packingUnitList3 === void 0 ? void 0 : (_item$packingUnitList4 = _item$packingUnitList3.find(function (item) {
+              return item.baseUnit === true;
+            })) === null || _item$packingUnitList4 === void 0 ? void 0 : _item$packingUnitList4.unitCode
           });
         })) : [];
       }
@@ -4845,7 +4856,6 @@ var AddSelect = function AddSelect(props) {
   };
 
   useEffect(function () {
-    // run('init')
     Promise.all([loadSelectSource("/items/brand/queryBrandList", {
       pageSize: 5000,
       currentPage: 1,
@@ -4910,6 +4920,18 @@ var AddSelect = function AddSelect(props) {
     }, 50);
   };
 
+  var handleShowModal = function handleShowModal() {
+    if (beforeShowModal) {
+      beforeShowModal(popvalue).then(function (res) {
+        showModal();
+      }).catch(function (Error) {
+        message.warning(Error);
+      });
+    } else {
+      showModal();
+    }
+  };
+
   var handleOk = function handleOk(isContinue) {
     if (!popvalue.length) {
       message.warning('至少选中一条数据');
@@ -5280,7 +5302,7 @@ var AddSelect = function AddSelect(props) {
     className: "add_select_show",
     id: "add_select_div_".concat(uniqueValue)
   }, /*#__PURE__*/React.createElement(Button, {
-    onClick: showModal,
+    onClick: handleShowModal,
     type: "primary"
   }, buttonText)), needModalTable && isModalVisible && /*#__PURE__*/React.createElement(Modal, {
     width: '1200px',
@@ -7220,6 +7242,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       console.log(value);
       setValue(value);
     },
+    beforeShowModal: parProps === null || parProps === void 0 ? void 0 : parProps.beforeShowModal,
     onSaveCallback: parProps.onSaveCallback // onSaveCallback: (rows) => {
     //   console.log('save call', rows);
     //   // return Promise.resolve(true);
@@ -7441,8 +7464,11 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
           });
 
           if (base.length) {
+            var _base$;
+
             baseUnitCode = base[0].unitCode;
             record.selectUnitCode = base[0].unitCode;
+            record.selectedScale = ((_base$ = base[0]) === null || _base$ === void 0 ? void 0 : _base$.baseUnitScale) || 1;
           }
         }
 
@@ -7450,7 +7476,12 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
           return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Select, {
             defaultValue: baseUnitCode,
             onChange: function onChange(value) {
+              var _record$packingUnitLi, _record$packingUnitLi2;
+
               record.selectUnitCode = value;
+              record.selectedScale = (record === null || record === void 0 ? void 0 : (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : (_record$packingUnitLi2 = _record$packingUnitLi.find(function (item) {
+                return item.unitCode === value;
+              })) === null || _record$packingUnitLi2 === void 0 ? void 0 : _record$packingUnitLi2.baseUnitScale) || 1;
             },
             style: {
               width: '60px'

package/dist/index.js

@@ -4491,7 +4491,8 @@ var AddSelect = function AddSelect(props) {
       _props$getPopupContai = props.getPopupContainer,
       onSaveCallback = props.onSaveCallback,
       _props$buttonText = props.buttonText,
-      buttonText = _props$buttonText === void 0 ? '添加' : _props$buttonText;
+      buttonText = _props$buttonText === void 0 ? '添加' : _props$buttonText,
+      beforeShowModal = props.beforeShowModal;
 
   var _ref = requestConfig || {},
       url = _ref.url,
@@ -4790,6 +4791,8 @@ var AddSelect = function AddSelect(props) {
       } else {
         var keys = res.list ? 'list' : 'items';
         source = res ? res[keys] ? res[keys].map(function (item) {
+          var _item$packingUnitList, _item$packingUnitList2;
+
           var textShowText = item[mappingTextField];
 
           if (mappingTextShowTextField) {
@@ -4808,9 +4811,14 @@ var AddSelect = function AddSelect(props) {
             text: item[mappingTextField],
             textShowText: textShowText,
             textShowKey: item[mappingTextShowKeyField || mappingValueField],
-            value: item[mappingValueField]
+            value: item[mappingValueField],
+            baseUnitCode: item === null || item === void 0 ? void 0 : (_item$packingUnitList = item.packingUnitList) === null || _item$packingUnitList === void 0 ? void 0 : (_item$packingUnitList2 = _item$packingUnitList.find(function (item) {
+              return item.baseUnit === true;
+            })) === null || _item$packingUnitList2 === void 0 ? void 0 : _item$packingUnitList2.unitCode
           });
         }) : Array.isArray(res) && (res === null || res === void 0 ? void 0 : res.map(function (item) {
+          var _item$packingUnitList3, _item$packingUnitList4;
+
           var textShowText = item[mappingTextField];
 
           if (mappingTextShowTextField) {
@@ -4829,7 +4837,10 @@ var AddSelect = function AddSelect(props) {
             text: item[mappingTextField],
             textShowText: textShowText,
             textShowKey: item[mappingTextShowKeyField || mappingValueField],
-            value: item[mappingValueField]
+            value: item[mappingValueField],
+            baseUnitCode: item === null || item === void 0 ? void 0 : (_item$packingUnitList3 = item.packingUnitList) === null || _item$packingUnitList3 === void 0 ? void 0 : (_item$packingUnitList4 = _item$packingUnitList3.find(function (item) {
+              return item.baseUnit === true;
+            })) === null || _item$packingUnitList4 === void 0 ? void 0 : _item$packingUnitList4.unitCode
           });
         })) : [];
       }
@@ -4856,7 +4867,6 @@ var AddSelect = function AddSelect(props) {
   };
 
   React.useEffect(function () {
-    // run('init')
     Promise.all([loadSelectSource("/items/brand/queryBrandList", {
       pageSize: 5000,
       currentPage: 1,
@@ -4921,6 +4931,18 @@ var AddSelect = function AddSelect(props) {
     }, 50);
   };
 
+  var handleShowModal = function handleShowModal() {
+    if (beforeShowModal) {
+      beforeShowModal(popvalue).then(function (res) {
+        showModal();
+      }).catch(function (Error) {
+        antd.message.warning(Error);
+      });
+    } else {
+      showModal();
+    }
+  };
+
   var handleOk = function handleOk(isContinue) {
     if (!popvalue.length) {
       antd.message.warning('至少选中一条数据');
@@ -5291,7 +5313,7 @@ var AddSelect = function AddSelect(props) {
     className: "add_select_show",
     id: "add_select_div_".concat(uniqueValue)
   }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
-    onClick: showModal,
+    onClick: handleShowModal,
     type: "primary"
   }, buttonText)), needModalTable && isModalVisible && /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
     width: '1200px',
@@ -7231,6 +7253,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       console.log(value);
       setValue(value);
     },
+    beforeShowModal: parProps === null || parProps === void 0 ? void 0 : parProps.beforeShowModal,
     onSaveCallback: parProps.onSaveCallback // onSaveCallback: (rows) => {
     //   console.log('save call', rows);
     //   // return Promise.resolve(true);
@@ -7452,8 +7475,11 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
           });
 
           if (base.length) {
+            var _base$;
+
             baseUnitCode = base[0].unitCode;
             record.selectUnitCode = base[0].unitCode;
+            record.selectedScale = ((_base$ = base[0]) === null || _base$ === void 0 ? void 0 : _base$.baseUnitScale) || 1;
           }
         }
 
@@ -7461,7 +7487,12 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
           return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
             defaultValue: baseUnitCode,
             onChange: function onChange(value) {
+              var _record$packingUnitLi, _record$packingUnitLi2;
+
               record.selectUnitCode = value;
+              record.selectedScale = (record === null || record === void 0 ? void 0 : (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : (_record$packingUnitLi2 = _record$packingUnitLi.find(function (item) {
+                return item.unitCode === value;
+              })) === null || _record$packingUnitLi2 === void 0 ? void 0 : _record$packingUnitLi2.baseUnitScale) || 1;
             },
             style: {
               width: '60px'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -22,6 +22,10 @@ import { AddSkuSelect } from '../../../index.ts';
 export default () => {
   const config = {
     buttonText: 'context',
+    beforeShowModal: () => {
+      return Promise.resolve(true);
+      // return Promise.reject('校验有误');
+    },
     onSaveCallback: (rows) => {
       console.log('save call', rows);
       return Promise.resolve(true);
@@ -34,4 +38,4 @@ export default () => {
     </div>
   );
 };
-```
+```

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

@@ -30,6 +30,7 @@ export const AddSkuSelect = (parProps: any) => {
       console.log(value)
       setValue(value)
     },
+    beforeShowModal: parProps?.beforeShowModal,
     onSaveCallback: parProps.onSaveCallback
     // onSaveCallback: (rows) => {
     //   console.log('save call', rows);
@@ -240,12 +241,13 @@ export const AddSkuSelect = (parProps: any) => {
             if (base.length) {
               baseUnitCode = base[0].unitCode
               record.selectUnitCode = base[0].unitCode
+              record.selectedScale = base[0]?.baseUnitScale || 1
             }
           }
 
           if (baseUnitCode) {
             return <>
-              <Select defaultValue={baseUnitCode}  onChange={(value) => {record.selectUnitCode = value}} style={{width: '60px'}}>
+              <Select defaultValue={baseUnitCode}  onChange={(value) => {record.selectUnitCode = value;record.selectedScale = record?.packingUnitList?.find((item: any) => item.unitCode === value)?.baseUnitScale || 1}} style={{width: '60px'}}>
                   {record.packingUnitList && record.packingUnitList.map((item: any) => {
                     return <Select.Option value={item.unitCode}>{item.name}</Select.Option>
                   })}
@@ -292,4 +294,4 @@ export const AddSkuSelect = (parProps: any) => {
       />
     </div>
   );
-};
+};

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

@@ -72,7 +72,8 @@ const AddSelect = (props: any) => {
     needModalTable = true,
     getPopupContainer = undefined,
     onSaveCallback,
-    buttonText = '添加'
+    buttonText = '添加',
+    beforeShowModal
   } = props;
   const { url, otherParams, isMap, fixedparameter, fieldValToParam, mappingTextField = 'name', mappingTextShowKeyField, mappingValueField = 'code', mappingTextShowTextField } = requestConfig || {};
   const resultSourceKey = sourceName || requestConfig?.sourceName || 'supplierCode'
@@ -289,6 +290,7 @@ const AddSelect = (props: any) => {
                   textShowText,
                   textShowKey: item[mappingTextShowKeyField || mappingValueField],
                   value: item[mappingValueField],
+                  baseUnitCode: item?.packingUnitList?.find((item: any) => item.baseUnit === true)?.unitCode
                 };
               })
               : Array.isArray(res) &&
@@ -310,6 +312,7 @@ const AddSelect = (props: any) => {
                   textShowText,
                   textShowKey: item[mappingTextShowKeyField || mappingValueField],
                   value: item[mappingValueField],
+                  baseUnitCode: item?.packingUnitList?.find((item: any) => item.baseUnit === true)?.unitCode
                 };
               })
             : [];
@@ -353,7 +356,6 @@ const AddSelect = (props: any) => {
   }
 
   useEffect(() => {
-    // run('init')
     Promise.all([
       loadSelectSource(`/items/brand/queryBrandList`, {
         pageSize: 5000,
@@ -405,6 +407,18 @@ const AddSelect = (props: any) => {
     }, 50)
   };
 
+  const handleShowModal = () => {
+    if(beforeShowModal) {
+      beforeShowModal(popvalue).then(res => {
+        showModal()
+      }).catch(Error => {
+        message.warning(Error)
+      })
+    } else {
+      showModal()
+    }
+  }
+
   const handleSelectOver = (selectedValue: any) => {
     if (selectedValue?.length) {
       formaData(selectedValue);
@@ -760,7 +774,7 @@ const AddSelect = (props: any) => {
   return (
     <div className={'add_select'}>
       <div className="add_select_show" id={`add_select_div_${uniqueValue}`}>
-        <Button onClick={showModal} type="primary">
+        <Button onClick={handleShowModal} type="primary">
           {buttonText}
         </Button>
       </div>