@bit-sun/business-component 2.0.30 → 2.0.31

package/dist/index.esm.js

@@ -3447,6 +3447,16 @@ var AddSelect = function AddSelect(props) {
       tableColumns = _useState36[0],
       setTableColumns = _useState36[1];
 
+  var _useState37 = useState(false),
+      _useState38 = _slicedToArray(_useState37, 2),
+      confirmLoading = _useState38[0],
+      setConfirmLoading = _useState38[1];
+
+  var _useState39 = useState(false),
+      _useState40 = _slicedToArray(_useState39, 2),
+      confirmContinueLoading = _useState40[0],
+      setConfirmContinueLoading = _useState40[1];
+
   useEffect(function () {
     setTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns.map(function (item, index) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -3758,6 +3768,10 @@ var AddSelect = function AddSelect(props) {
     }
   };
 
+  var handleLoading = function handleLoading(isContinue, flag) {
+    isContinue ? setConfirmContinueLoading(flag) : setConfirmLoading(flag);
+  };
+
   var handleOk = function handleOk(isContinue) {
     if (!popvalue.length) {
       message.warning('至少选中一条数据');
@@ -3766,6 +3780,7 @@ var AddSelect = function AddSelect(props) {
 
 
     if (onSaveCallback) {
+      handleLoading(isContinue, true);
       onSaveCallback(popvalue).then(function (res) {
         {
           var _document$getElementB2;
@@ -3775,8 +3790,11 @@ var AddSelect = function AddSelect(props) {
           (_document$getElementB2 = document.getElementById('first-query')) === null || _document$getElementB2 === void 0 ? void 0 : _document$getElementB2.focus();
           !isContinue && handleCancel();
         }
+
+        handleLoading(isContinue, false);
       }).catch(function (Error) {
         message.error(Error);
+        handleLoading(isContinue, false);
       });
     } else {
       !isContinue && handleCancel();
@@ -4155,7 +4173,6 @@ var AddSelect = function AddSelect(props) {
     },
     // title={modalTableProps?.modalTableTitle}
     visible: isModalVisible,
-    onOk: handleOk,
     closable: false,
     onCancel: handleCancel,
     footer: selectMode ? [/*#__PURE__*/React.createElement(Button, {
@@ -4170,6 +4187,7 @@ var AddSelect = function AddSelect(props) {
       onClick: function onClick() {
         handleOk(true);
       },
+      loading: confirmContinueLoading,
       disabled: !tableData.length || (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled)
     }, "\u4FDD\u5B58\u5E76\u7EE7\u7EED"), /*#__PURE__*/React.createElement(Button, {
       key: "submit",
@@ -4177,6 +4195,7 @@ var AddSelect = function AddSelect(props) {
       onClick: function onClick() {
         handleOk(false);
       },
+      loading: confirmLoading,
       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", null, /*#__PURE__*/React.createElement("div", {

package/dist/index.js

@@ -3457,6 +3457,16 @@ var AddSelect = function AddSelect(props) {
       tableColumns = _useState36[0],
       setTableColumns = _useState36[1];
 
+  var _useState37 = React.useState(false),
+      _useState38 = _slicedToArray(_useState37, 2),
+      confirmLoading = _useState38[0],
+      setConfirmLoading = _useState38[1];
+
+  var _useState39 = React.useState(false),
+      _useState40 = _slicedToArray(_useState39, 2),
+      confirmContinueLoading = _useState40[0],
+      setConfirmContinueLoading = _useState40[1];
+
   React.useEffect(function () {
     setTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns.map(function (item, index) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -3768,6 +3778,10 @@ var AddSelect = function AddSelect(props) {
     }
   };
 
+  var handleLoading = function handleLoading(isContinue, flag) {
+    isContinue ? setConfirmContinueLoading(flag) : setConfirmLoading(flag);
+  };
+
   var handleOk = function handleOk(isContinue) {
     if (!popvalue.length) {
       antd.message.warning('至少选中一条数据');
@@ -3776,6 +3790,7 @@ var AddSelect = function AddSelect(props) {
 
 
     if (onSaveCallback) {
+      handleLoading(isContinue, true);
       onSaveCallback(popvalue).then(function (res) {
         {
           var _document$getElementB2;
@@ -3785,8 +3800,11 @@ var AddSelect = function AddSelect(props) {
           (_document$getElementB2 = document.getElementById('first-query')) === null || _document$getElementB2 === void 0 ? void 0 : _document$getElementB2.focus();
           !isContinue && handleCancel();
         }
+
+        handleLoading(isContinue, false);
       }).catch(function (Error) {
         antd.message.error(Error);
+        handleLoading(isContinue, false);
       });
     } else {
       !isContinue && handleCancel();
@@ -4165,7 +4183,6 @@ var AddSelect = function AddSelect(props) {
     },
     // title={modalTableProps?.modalTableTitle}
     visible: isModalVisible,
-    onOk: handleOk,
     closable: false,
     onCancel: handleCancel,
     footer: selectMode ? [/*#__PURE__*/React__default['default'].createElement(antd.Button, {
@@ -4180,6 +4197,7 @@ var AddSelect = function AddSelect(props) {
       onClick: function onClick() {
         handleOk(true);
       },
+      loading: confirmContinueLoading,
       disabled: !tableData.length || (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled)
     }, "\u4FDD\u5B58\u5E76\u7EE7\u7EED"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
       key: "submit",
@@ -4187,6 +4205,7 @@ var AddSelect = function AddSelect(props) {
       onClick: function onClick() {
         handleOk(false);
       },
+      loading: confirmLoading,
       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", null, /*#__PURE__*/React__default['default'].createElement("div", {

package/package.json

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

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

@@ -153,6 +153,8 @@ const AddSelect = (props: any) => {
   const [indeterminate, setIndeterminate] = useState(false)
   const [tableFormParams, setTableFormParams] = useState({});
   const [tableColumns, setTableColumns] = useState([]);
+  const [confirmLoading, setConfirmLoading] = useState(false);
+  const [confirmContinueLoading, setConfirmContinueLoading] = useState(false);
 
   useEffect(() => {
     setTableColumns(
@@ -468,6 +470,10 @@ const AddSelect = (props: any) => {
     }
   }
 
+  const handleLoading = (isContinue,flag) => {
+    isContinue ? setConfirmContinueLoading(flag) : setConfirmLoading(flag);
+  }
+
   const handleOk = (isContinue) => {
     if(!popvalue.length)  {
       message.warning('至少选中一条数据')
@@ -475,6 +481,7 @@ const AddSelect = (props: any) => {
     }
     // handleSelectOver(popvalue)
     if(onSaveCallback) {
+      handleLoading(isContinue,true)
       onSaveCallback(popvalue).then(res => {
         if(true) {
           message.success('保存成功')
@@ -483,8 +490,10 @@ const AddSelect = (props: any) => {
         !isContinue && handleCancel();
         } else {
         }
+        handleLoading(isContinue,false)
       }).catch(Error => {
-        message.error(Error)
+        message.error(Error);
+        handleLoading(isContinue,false)
       })
     } else {
       !isContinue && handleCancel();
@@ -836,7 +845,6 @@ const AddSelect = (props: any) => {
           bodyStyle={{ padding: '0px' }}
           // title={modalTableProps?.modalTableTitle}
           visible={isModalVisible}
-          onOk={handleOk}
           closable={false}
           onCancel={handleCancel}
           footer={selectMode ? [
@@ -847,6 +855,7 @@ const AddSelect = (props: any) => {
               key="submit"
               style={{color: '#005CFF', borderColor: '#005CFF'}}
               onClick={() => {handleOk(true)}}
+              loading={confirmContinueLoading}
               disabled={!tableData.length || (selectProps?.disabled || props?.disabled)}
           >
             保存并继续
@@ -855,6 +864,7 @@ const AddSelect = (props: any) => {
               key="submit"
               type="primary"
               onClick={() => {handleOk(false)}}
+              loading={confirmLoading}
               disabled={!tableData.length || (selectProps?.disabled || props?.disabled)}
             >
               确定