@bit-sun/business-component 2.1.0 → 2.1.1-alpha.0

package/dist/index.js

@@ -3,19 +3,19 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var axios = require('axios');
-var React = require('react');
 var antd = require('antd');
+var _ = require('lodash');
+var React = require('react');
 var reactBeautifulDnd = require('react-beautiful-dnd');
 var icons = require('@ant-design/icons');
-var _ = require('lodash');
 var ahooks = require('ahooks');
+var umi = require('umi');
+var isEqual$1 = require('lodash/isEqual');
 var querystring = require('querystring');
 var reactResizable = require('react-resizable');
 var bssula = require('bssula');
 var reactSortableHoc = require('react-sortable-hoc');
 var arrayMove = require('array-move');
-var umi = require('umi');
-var isEqual$1 = require('lodash/isEqual');
 var ProLayout = require('@ant-design/pro-layout');
 var cloneDeep = require('lodash/cloneDeep');
 var classNames = require('classnames');
@@ -25,8 +25,8 @@ var reactDndHtml5Backend = require('react-dnd-html5-backend');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual$1);
 var ProLayout__default = /*#__PURE__*/_interopDefaultLegacy(ProLayout);
 var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
@@ -39,7 +39,8 @@ var ENUM = {
     MAIN_AUTH_CODES: 'menuAuth_mainProject',
     LIMIT_MENU_DATA: 'limitedMenuData',
     USER_INFO: 'userInfo',
-    DICT_CODES: 'dicData' //数据字典数据
+    DICT_CODES: 'dicData',
+    CHILD_APP_BACK: 'child_app_back' //标记子应用goback事件
 
   }
 };
@@ -737,6 +738,52 @@ function _nonIterableRest() {
   throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 
+var checkQuantityAccuracy = function checkQuantityAccuracy(value, accuracy, errorInfo) {
+  var errorMessage = _objectSpread2({
+    showTips: true,
+    tipsMessage: null
+  }, errorInfo);
+
+  if (___default['default'].trim(value)) {
+    var target = "".concat(value);
+
+    if (target.includes(".")) {
+      if (target.split(".")[1].length > accuracy) {
+        if (errorMessage === null || errorMessage === void 0 ? void 0 : errorMessage.showTips) {
+          antd.message.warning((errorMessage === null || errorMessage === void 0 ? void 0 : errorMessage.tipsMessage) || "\u7CFB\u7EDF\u8BBE\u7F6E\u6570\u91CF\u6700\u5927\u7CBE\u5EA6\u4E3A".concat(accuracy, "\u4F4D"));
+        }
+
+        return false;
+      }
+    }
+  }
+
+  return true;
+};
+
+var precisionQuantity = function precisionQuantity(num, accuracy) {
+  if (___default['default'].trim(num)) {
+    var target = "".concat(num);
+
+    if (target.includes(".")) {
+      if (target.split(".")[1].length > accuracy) {
+        var _target$split$;
+
+        var beforeDot = target.split(".")[0];
+        var afterDot = (_target$split$ = target.split(".")[1]) === null || _target$split$ === void 0 ? void 0 : _target$split$.slice(0, accuracy);
+        var result = accuracy == 0 ? Number("".concat(beforeDot)) : Number("".concat(beforeDot, ".").concat(afterDot));
+        return result;
+      } else if (target.split(".")[1].length < accuracy) {
+        return Number(Number(num).toFixed(Math.abs(accuracy)));
+      } else {
+        return Number(num);
+      }
+    }
+  }
+
+  return '';
+};
+
 function styleInject(css, ref) {
   if ( ref === void 0 ) ref = {};
   var insertAt = ref.insertAt;
@@ -2028,6 +2075,108 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
 var css_248z$2 = ".query_input_show {\n  display: flex;\n}\n.query_input_expand_button {\n  position: relative;\n  width: 30px;\n  color: #ffffff;\n  cursor: pointer;\n}\n.query_input_expand_button span {\n  position: absolute;\n  height: 20px;\n  line-height: 14px;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n.query_input_wrapper {\n  display: flex;\n}\n.query_input_wrapper_left {\n  width: 100px;\n}\n.query_input_wrapper_right {\n  color: #9e9e9e;\n}\n.query_input_textArea {\n  margin-top: 15px;\n}\n";
 styleInject(css_248z$2);
 
+var safeIsNaN = Number.isNaN ||
+    function ponyfill(value) {
+        return typeof value === 'number' && value !== value;
+    };
+function isEqual(first, second) {
+    if (first === second) {
+        return true;
+    }
+    if (safeIsNaN(first) && safeIsNaN(second)) {
+        return true;
+    }
+    return false;
+}
+function areInputsEqual(newInputs, lastInputs) {
+    if (newInputs.length !== lastInputs.length) {
+        return false;
+    }
+    for (var i = 0; i < newInputs.length; i++) {
+        if (!isEqual(newInputs[i], lastInputs[i])) {
+            return false;
+        }
+    }
+    return true;
+}
+
+function memoizeOne(resultFn, isEqual) {
+    if (isEqual === void 0) { isEqual = areInputsEqual; }
+    var cache = null;
+    function memoized() {
+        var newArgs = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            newArgs[_i] = arguments[_i];
+        }
+        if (cache && cache.lastThis === this && isEqual(newArgs, cache.lastArgs)) {
+            return cache.lastResult;
+        }
+        var lastResult = resultFn.apply(this, newArgs);
+        cache = {
+            lastResult: lastResult,
+            lastArgs: newArgs,
+            lastThis: this,
+        };
+        return lastResult;
+    }
+    memoized.clear = function clear() {
+        cache = null;
+    };
+    return memoized;
+}
+
+var formatter = function formatter(data, parentAuthority, parentName) {
+  return data.map(function (item) {
+    if (!item.name || !item.path) {
+      return null;
+    }
+
+    var locale = 'menu';
+
+    if (parentName) {
+      locale = "".concat(parentName, ".").concat(item.name);
+    } else {
+      locale = "menu.".concat(item.name);
+    }
+
+    var result = _objectSpread2(_objectSpread2({}, item), {}, {
+      name: umi.formatMessage && umi.formatMessage({
+        id: locale,
+        defaultMessage: item.name
+      }) || item.name,
+      locale: locale,
+      authority: item.authority || parentAuthority
+    });
+
+    if (item.routes) {
+      var children = formatter(item.routes, item.authority, locale); // Reduce memory usage
+
+      result.children = children;
+    }
+
+    delete result.routes;
+    return result;
+  }).filter(function (item) {
+    return item;
+  });
+};
+var memoizeOneFormatter = memoizeOne(formatter, isEqual__default['default']);
+var go2BackAndClose = function go2BackAndClose() {
+  localStorage.setItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK, 1);
+  umi.history.goBack();
+};
+var getModalContainer = function getModalContainer() {
+  try {
+    if (window.top != window && window.parent.document) {
+      return window.parent.document.body;
+    }
+  } catch (error) {
+    console.log(error);
+  }
+
+  return document.body;
+};
+
 var QueryMutipleInput = function QueryMutipleInput(_ref) {
   var onValueChange = _ref.onValueChange;
 
@@ -2115,6 +2264,7 @@ var QueryMutipleInput = function QueryMutipleInput(_ref) {
     type: "primary"
   }, "...")), /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
     width: 600,
+    getContainer: getModalContainer,
     title: "\u591A\u503C\u5F55\u5165",
     visible: isModalVisible,
     onOk: handleOk,
@@ -3131,6 +3281,7 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, /*#__PURE__*/React__default['default'].createElement(icons.SearchOutlined, null))), needModalTable && isModalVisible && /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
     width: '80%',
     title: modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalTableTitle,
+    getContainer: getModalContainer,
     visible: isModalVisible,
     onOk: handleOk,
     onCancel: handleCancel,
@@ -4034,16 +4185,52 @@ var AddSelect = function AddSelect(props) {
       inputIndex++;
       return _objectSpread2(_objectSpread2({}, item), {}, {
         render: function render(text, record, index) {
+          var _record$packingUnitLi, _record$packingUnitLi2;
+
           // let
           if (record.needFocus === true && currentIndex === 0) ;
 
-          return /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
-            defaultValue: text || '',
+          var precisionObj = {};
+          var unitAccuracy = (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : (_record$packingUnitLi2 = _record$packingUnitLi[0]) === null || _record$packingUnitLi2 === void 0 ? void 0 : _record$packingUnitLi2.unitAccuracy;
+          var isCountUnitAccuracyCheck = item.dataIndex == 'count' && unitAccuracy !== undefined;
+
+          if (isCountUnitAccuracyCheck) {
+            precisionObj = {
+              onBlur: function onBlur(e) {
+                var value = e.target.value;
+
+                if (!checkQuantityAccuracy(value, Number(unitAccuracy))) {
+                  record[item.dataIndex] = precisionQuantity(value, Number(unitAccuracy));
+                  var newPopValue = popvalue.map(function (i, innerIndex) {
+                    if (innerIndex == index) {
+                      i[item.dataIndex] = record[item.dataIndex];
+                    }
+
+                    return i;
+                  });
+                  setPopValue(newPopValue);
+                }
+              } // precision: unitAccuracy
+
+            };
+          }
+
+          return /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, _objectSpread2(_objectSpread2({
+            value: text || '',
             min: 0,
             autoFocus: record.needFocus,
-            keyboard: false,
+            keyboard: false
+          }, precisionObj), {}, {
             onChange: function onChange(value) {
               record[item.dataIndex] = value;
+              var newPopValue = popvalue.map(function (i, innerIndex) {
+                if (innerIndex == index) {
+                  i[item.dataIndex] = record[item.dataIndex];
+                }
+
+                return i;
+              });
+              setPopValue(newPopValue);
             },
             // onFocus={(e)=> {
             //   let dom1 = e.currentTarget;
@@ -4154,7 +4341,7 @@ var AddSelect = function AddSelect(props) {
                 e.preventDefault();
               }
             }
-          });
+          }));
         }
       });
     }
@@ -4210,6 +4397,7 @@ var AddSelect = function AddSelect(props) {
     },
     // title={modalTableProps?.modalTableTitle}
     visible: isModalVisible,
+    getContainer: getModalContainer,
     closable: false,
     onCancel: handleCancel,
     footer: selectMode ? [/*#__PURE__*/React__default['default'].createElement(antd.Button, {
@@ -4343,6 +4531,8 @@ styleInject(css_248z$5);
 var _this = undefined;
 
 var InputElement = function InputElement(_ref) {
+  var _record$packingUnitLi, _record$packingUnitLi2;
+
   var record = _ref.record,
       text = _ref.text,
       currentIndex = _ref.currentIndex,
@@ -4610,6 +4800,31 @@ var InputElement = function InputElement(_ref) {
     }));
   };
 
+  var precisionObj = {};
+  var unitAccuracy = (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : (_record$packingUnitLi2 = _record$packingUnitLi[0]) === null || _record$packingUnitLi2 === void 0 ? void 0 : _record$packingUnitLi2.unitAccuracy;
+  var isCountUnitAccuracyCheck = item.dataIndex == 'count' && unitAccuracy !== undefined;
+
+  if (isCountUnitAccuracyCheck) {
+    precisionObj = {
+      onBlur: function onBlur(e) {
+        var value = e.target.value;
+
+        if (!checkQuantityAccuracy(value, Number(unitAccuracy))) {
+          record[item.dataIndex] = precisionQuantity(value, Number(unitAccuracy));
+          var newData = data.map(function (i, innerIndex) {
+            if (innerIndex == index) {
+              i[item.dataIndex] = record[item.dataIndex];
+            }
+
+            return i;
+          });
+          setData(newData);
+        }
+      } // precision: unitAccuracy
+
+    };
+  }
+
   return /*#__PURE__*/React__default['default'].createElement(antd.Popover, {
     placement: "bottomLeft",
     destroyTooltipOnHide: {
@@ -4753,13 +4968,22 @@ var InputElement = function InputElement(_ref) {
       }
     }
   }) : /*#__PURE__*/React__default['default'].createElement(antd.InputNumber // onBlur={() => {updateHoverVisibled(false)}}
-  , {
+  , _objectSpread2(_objectSpread2({
     // onBlur={() => {updateHoverVisibled(false)}}
-    defaultValue: text || '',
+    value: text || '',
     min: 0,
-    keyboard: false,
+    keyboard: false
+  }, precisionObj), {}, {
     onChange: function onChange(value) {
       record[item.dataIndex] = value;
+      var newData = data.map(function (i, innerIndex) {
+        if (innerIndex == index) {
+          i[item.dataIndex] = record[item.dataIndex];
+        }
+
+        return i;
+      });
+      setData(newData);
     },
     onKeyDown: function onKeyDown(e) {
       // if (e.keyCode === 13 && e.ctrlKey) {
@@ -4869,7 +5093,7 @@ var InputElement = function InputElement(_ref) {
         }]));
       }
     }
-  }));
+  })));
 };
 
 var BillEntry = function BillEntry(_ref3) {
@@ -4904,9 +5128,9 @@ var BillEntry = function BillEntry(_ref3) {
     dataIndex: 'selectUnitCode',
     width: 100,
     render: function render(text, record) {
-      var _record$packingUnitLi;
+      var _record$packingUnitLi3;
 
-      if (record === null || record === void 0 ? void 0 : (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : _record$packingUnitLi.length) {
+      if (record === null || record === void 0 ? void 0 : (_record$packingUnitLi3 = record.packingUnitList) === null || _record$packingUnitLi3 === void 0 ? void 0 : _record$packingUnitLi3.length) {
         var basePackUnit = record === null || record === void 0 ? void 0 : record.packingUnitList[0];
         record.selectUnitCode = basePackUnit.unitCode;
         return basePackUnit.name || basePackUnit.unitCode;
@@ -7366,7 +7590,8 @@ var CommodityEntry = function CommodityEntry(props) {
     onOk: handleOk,
     onCancel: handleCancel,
     destroyOnClose: true,
-    zIndex: 15
+    zIndex: 15,
+    getContainer: getModalContainer
   }), /*#__PURE__*/React__default['default'].createElement(DataValidation, {
     onRef: function onRef(ref) {
       dataValidationRef = ref;
@@ -8523,6 +8748,7 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
         title: "\u8BBE\u7F6E\u8868\u5934\u5185\u5BB9",
         wrapClassName: 'sort_table_wrapper',
+        getContainer: getModalContainer,
         width: 820,
         visible: visible,
         onOk: this.handleOk,
@@ -9339,6 +9565,7 @@ var doDetailPageAction = function doDetailPageAction(config) {
       confirm({
         title: config.title,
         icon: /*#__PURE__*/React__default['default'].createElement(icons.ExclamationCircleOutlined, null),
+        getContainer: getModalContainer,
         content: config.content,
         okText: '确定',
         okType: 'danger',
@@ -9381,93 +9608,6 @@ var getMainCrumbNameMap = function getMainCrumbNameMap(menuData) {
   return routerMap;
 };
 
-var safeIsNaN = Number.isNaN ||
-    function ponyfill(value) {
-        return typeof value === 'number' && value !== value;
-    };
-function isEqual(first, second) {
-    if (first === second) {
-        return true;
-    }
-    if (safeIsNaN(first) && safeIsNaN(second)) {
-        return true;
-    }
-    return false;
-}
-function areInputsEqual(newInputs, lastInputs) {
-    if (newInputs.length !== lastInputs.length) {
-        return false;
-    }
-    for (var i = 0; i < newInputs.length; i++) {
-        if (!isEqual(newInputs[i], lastInputs[i])) {
-            return false;
-        }
-    }
-    return true;
-}
-
-function memoizeOne(resultFn, isEqual) {
-    if (isEqual === void 0) { isEqual = areInputsEqual; }
-    var cache = null;
-    function memoized() {
-        var newArgs = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            newArgs[_i] = arguments[_i];
-        }
-        if (cache && cache.lastThis === this && isEqual(newArgs, cache.lastArgs)) {
-            return cache.lastResult;
-        }
-        var lastResult = resultFn.apply(this, newArgs);
-        cache = {
-            lastResult: lastResult,
-            lastArgs: newArgs,
-            lastThis: this,
-        };
-        return lastResult;
-    }
-    memoized.clear = function clear() {
-        cache = null;
-    };
-    return memoized;
-}
-
-var formatter = function formatter(data, parentAuthority, parentName) {
-  return data.map(function (item) {
-    if (!item.name || !item.path) {
-      return null;
-    }
-
-    var locale = 'menu';
-
-    if (parentName) {
-      locale = "".concat(parentName, ".").concat(item.name);
-    } else {
-      locale = "menu.".concat(item.name);
-    }
-
-    var result = _objectSpread2(_objectSpread2({}, item), {}, {
-      name: umi.formatMessage && umi.formatMessage({
-        id: locale,
-        defaultMessage: item.name
-      }) || item.name,
-      locale: locale,
-      authority: item.authority || parentAuthority
-    });
-
-    if (item.routes) {
-      var children = formatter(item.routes, item.authority, locale); // Reduce memory usage
-
-      result.children = children;
-    }
-
-    delete result.routes;
-    return result;
-  }).filter(function (item) {
-    return item;
-  });
-};
-var memoizeOneFormatter = memoizeOne(formatter, isEqual__default['default']);
-
 var css_248z$9 = ".detail_page_head {\n  height: 54px;\n  display: flex;\n  align-items: center;\n  background-color: #FFFFFF;\n  border-bottom: 1px solid #f0f0f0;\n}\n.detail_page_head .ant-breadcrumb {\n  display: block !important;\n}\n.detail_page_head .ant-breadcrumb .ant-breadcrumb-separator {\n  margin: 0 2px;\n}\n.detail_page_head .ant-breadcrumb li .bread_name {\n  color: #8A8F8D;\n  font-size: 12px;\n  cursor: pointer;\n}\n.detail_page_head .ant-breadcrumb li .bread_name:hover {\n  color: #000000d9;\n}\n.back_home_img_content {\n  display: inline-block;\n  height: 28px;\n  width: 28px;\n  border: 1px solid #BABABA;\n  margin: 0 12px 0 20px;\n  border-radius: 14px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  cursor: pointer;\n}\n.back_home_img_content .anticon-arrow-left {\n  color: #BABABA;\n}\n.back_home_img_content:hover {\n  background-color: #005CFF;\n  border: 1px solid #005CFF;\n}\n.back_home_img_content:hover .anticon-arrow-left {\n  color: #FFFFFF;\n}\n.detail_page_title_box {\n  flex-grow: 1;\n}\n.detail_page_title {\n  height: 20px;\n  font-family: PingFangSC;\n  font-weight: 600;\n  font-size: 16px;\n  margin-top: 2px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 20px;\n}\n.detail_page_btns {\n  display: flex;\n  gap: 8px;\n  margin-right: 20px;\n}\n.detail_page_btns button {\n  height: 32px !important;\n  display: flex;\n  align-items: center;\n  gap: 2px;\n  border-radius: 3px;\n  padding: 0 10px;\n}\n.detail_page_btns .ant-btn-dangerous {\n  background-color: #EC5246 !important;\n}\n";
 styleInject(css_248z$9);
 
@@ -9721,7 +9861,7 @@ var DetailWrapper = /*#__PURE__*/React__default['default'].memo(function (_ref)
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'back_home_img_content',
     onClick: function onClick() {
-      umi.history.goBack();
+      go2BackAndClose(); // history.goBack();
     }
   }, /*#__PURE__*/React__default['default'].createElement(icons.ArrowLeftOutlined, null)), /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'detail_page_title_box'
@@ -16458,6 +16598,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
         visible: visible,
         onOk: this.handleOk,
         onCancel: this.handleCancel,
+        getContainer: getModalContainer,
         footer: [/*#__PURE__*/React__default['default'].createElement(antd.Button, {
           key: "back",
           onClick: this.handleReset
@@ -20083,7 +20224,12 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
       var self = this;
       window.top != window && window.addEventListener('message', function (e) {
         istParent = 1;
-        localStorage.setItem('isTabChange', true);
+
+        if (localStorage.getItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK)) {
+          localStorage.removeItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK);
+        } else {
+          localStorage.setItem('isTabChange', true);
+        }
 
         if (typeof e.data === 'string') {
           history.push(e.data.replace(/^\/\w+\//, '/'));

package/dist/utils/checkUtils.d.ts

@@ -0,0 +1,3 @@
+declare const checkQuantityAccuracy: (value: any, accuracy: any, errorInfo?: any) => boolean;
+declare const precisionQuantity: (num: any, accuracy: any) => number | "";
+export { checkQuantityAccuracy, precisionQuantity };

package/dist/utils/enumConfig.d.ts

@@ -5,6 +5,7 @@ declare const _default: {
         LIMIT_MENU_DATA: string;
         USER_INFO: string;
         DICT_CODES: string;
+        CHILD_APP_BACK: string;
     };
 };
 export default _default;

package/dist/utils/index.d.ts

@@ -0,0 +1,2 @@
+import './requestUtils';
+import './checkUtils';

package/dist/utils/utils.d.ts

@@ -1,3 +1,5 @@
 export declare function downloadExcel(data: any, fileName?: any, isResUrl?: boolean): void;
 export declare const formatter: (data: any, parentAuthority: any, parentName: any) => any;
 export declare const memoizeOneFormatter: import("memoize-one").MemoizedFn<(data: any, parentAuthority: any, parentName: any) => any>;
+export declare const go2BackAndClose: () => void;
+export declare const getModalContainer: () => HTMLElement;

package/package.json

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

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

@@ -340,7 +340,11 @@ class BasicLayout extends React.PureComponent {
     window.top != window &&
       window.addEventListener('message', function (e) {
         istParent = 1;
-        localStorage.setItem('isTabChange', true);
+        if (localStorage.getItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK)) {
+          localStorage.removeItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK);
+        } else {
+          localStorage.setItem('isTabChange', true);
+        }
 
         if (typeof e.data === 'string') {
           history.push(e.data.replace(/^\/\w+\//, '/'));

package/src/components/Business/BsSulaQueryTable/setting.tsx

@@ -26,6 +26,7 @@ import fixedRight from '../../../assets/fixed-right.svg';
 import fixedRightActive from '../../../assets/fixed-right-active.svg';
 import './index.less';
 import ENUM from '@/utils/enumConfig';
+import { getModalContainer } from '../../../utils/utils';
 
 const DragHandle = SortableHandle(() => <img src={drag} />);
 
@@ -602,6 +603,7 @@ class SortableTable extends React.Component {
             visible={visible}
             onOk={this.handleOk}
             onCancel={this.handleCancel}
+            getContainer={getModalContainer}
             footer={[
               <Button key="back" onClick={this.handleReset}>
                 恢复默认

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

@@ -2,6 +2,7 @@
 import React, { useRef, useState } from 'react';
 import { Modal, Button, message } from 'antd';
 import DataValidation from '@/components/Functional/DataValidation';
+import { getModalContainer } from '@/utils/utils';
 
 const CommodityEntry = (props: any) => {
   let dataValidationRef: DataValidation = useRef();
@@ -63,7 +64,7 @@ const CommodityEntry = (props: any) => {
     <div>
       <Button onClick={handleShowModal} {...buttonProps}>{buttonName}</Button>
       {modalProps.visible && (
-        <Modal {...modalProps} onOk={handleOk} onCancel={handleCancel} destroyOnClose={true} zIndex={15}>
+        <Modal {...modalProps} onOk={handleOk} onCancel={handleCancel} destroyOnClose={true} zIndex={15} getContainer={getModalContainer}>
           <DataValidation
             onRef={(ref) => { dataValidationRef = ref }}
             columns={columns}

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

@@ -6,7 +6,7 @@ import { Anchor, Tooltip, Button, Menu, Dropdown, Breadcrumb } from 'antd';
 import React, { useEffect, useState, useMemo } from 'react';
 import { history } from 'umi';
 import { getMainCrumbNameMap, doDetailPageAction, judgeIsEmpty } from './utils';
-import { memoizeOneFormatter } from '@/utils/utils';
+import { memoizeOneFormatter, go2BackAndClose } from '@/utils/utils';
 import './index.less';
 import quanping from '../../../assets/icon-quanping.svg';
 import scanning from '../../../assets/scanning.svg';
@@ -240,7 +240,8 @@ const DetailWrapper = React.memo(
             <div
               className={'back_home_img_content'}
               onClick={() => {
-                history.goBack();
+                go2BackAndClose();
+                // history.goBack();
               }}
             >
               <ArrowLeftOutlined />

package/src/components/Business/DetailPageWrapper/utils.tsx

@@ -4,6 +4,7 @@ import { Modal } from 'antd';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
 import React from 'react';
 import { history } from 'umi';
+import { getModalContainer } from '@/utils/utils';
 
 interface actionItem {
   [propName: string]: any;
@@ -40,6 +41,7 @@ export const doDetailPageAction = (config: actionItem) => {
       confirm({
         title: config.title,
         icon: <ExclamationCircleOutlined />,
+        getContainer: getModalContainer,
         content: config.content,
         okText: '确定',
         okType: 'danger',

package/src/components/Business/columnSettingTable/columnSetting.tsx

@@ -19,6 +19,7 @@ import axios from 'axios';
 // import { request } from 'umi';
 import './index.less';
 import ENUM from '@/utils/enumConfig';
+import { getModalContainer } from '../../../utils/utils';
 
 interface SortTableProps {
   [propName: string]: any;
@@ -566,6 +567,7 @@ class SortableTable extends React.Component<SortTableProps> {
         <Modal
           title="设置表头内容"
           wrapClassName={'sort_table_wrapper'}
+          getContainer={getModalContainer}
           width={820}
           visible={visible}
           onOk={this.handleOk}