@bit-sun/business-component 2.3.23-beta02 → 2.3.23-beta03

package/dist/index.esm.js

@@ -1279,9 +1279,13 @@ var formatter = function formatter(data, parentAuthority, parentName) {
   });
 };
 var memoizeOneFormatter = index$1(formatter, isEqual);
-var go2BackAndClose = function go2BackAndClose() {
+var go2BackAndClose = function go2BackAndClose(backHistoryPath) {
   localStorage.setItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK, 1);
-  history.goBack();
+  if (backHistoryPath) {
+    history.push(backHistoryPath);
+  } else {
+    history.goBack();
+  }
 };
 /**
  * 处理bssulaTable的公共回显样式
@@ -11976,7 +11980,8 @@ var DetailWrapper = /*#__PURE__*/React.memo(function (_ref) {
     _ref$donotNeedShowScr = _ref.donotNeedShowScreenIcon,
     donotNeedShowScreenIcon = _ref$donotNeedShowScr === void 0 ? false : _ref$donotNeedShowScr,
     title = _ref.title,
-    pathToRegexp = _ref.pathToRegexp;
+    pathToRegexp = _ref.pathToRegexp,
+    backHistoryPath = _ref.backHistoryPath;
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
     isFullScreen = _useState4[0],
@@ -12100,7 +12105,7 @@ var DetailWrapper = /*#__PURE__*/React.memo(function (_ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: 'back_home_img_content',
     onClick: function onClick() {
-      go2BackAndClose();
+      go2BackAndClose(backHistoryPath);
       // history.goBack();
     }
   }, /*#__PURE__*/React.createElement(ArrowLeftOutlined, null)), /*#__PURE__*/React.createElement("div", {
@@ -29856,9 +29861,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
                 };
               }) || undefined;
               _this.propertyCodeToRangeIdMap["".concat(item.code, ".").concat(element.code)] = list;
-            } else {
-              _this.propertyCodeToRangeIdMap["".concat(item.code, ".").concat(element.code)] = Object.keys(infoVo).length ? infoVo : undefined;
-            }
+            } else ;
             var child = {
               title: "".concat(item.name, "-").concat(element.name),
               key: element.id,
@@ -29900,9 +29903,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
             };
           }) || undefined;
           _this.propertyCodeToRangeIdMap["".concat(rootObjCode, ".").concat(parentKey, ".").concat(element.code)] = _list;
-        } else {
-          _this.propertyCodeToRangeIdMap["".concat(rootObjCode, ".").concat(parentKey, ".").concat(element.code)] = Object.keys(infoVo).length ? infoVo : undefined;
-        }
+        } else ;
         var child = {
           title: "".concat(parentTitle, "-").concat(element.name),
           key: "".concat(parentKey, ".").concat(element.id),

package/dist/index.js

@@ -1299,9 +1299,13 @@ var formatter = function formatter(data, parentAuthority, parentName) {
   });
 };
 var memoizeOneFormatter = index$1(formatter, isEqual__default['default']);
-var go2BackAndClose = function go2BackAndClose() {
+var go2BackAndClose = function go2BackAndClose(backHistoryPath) {
   localStorage.setItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK, 1);
-  umi.history.goBack();
+  if (backHistoryPath) {
+    umi.history.push(backHistoryPath);
+  } else {
+    umi.history.goBack();
+  }
 };
 /**
  * 处理bssulaTable的公共回显样式
@@ -11996,7 +12000,8 @@ var DetailWrapper = /*#__PURE__*/React__default['default'].memo(function (_ref)
     _ref$donotNeedShowScr = _ref.donotNeedShowScreenIcon,
     donotNeedShowScreenIcon = _ref$donotNeedShowScr === void 0 ? false : _ref$donotNeedShowScr,
     title = _ref.title,
-    pathToRegexp = _ref.pathToRegexp;
+    pathToRegexp = _ref.pathToRegexp,
+    backHistoryPath = _ref.backHistoryPath;
   var _useState3 = React.useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
     isFullScreen = _useState4[0],
@@ -12120,7 +12125,7 @@ var DetailWrapper = /*#__PURE__*/React__default['default'].memo(function (_ref)
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'back_home_img_content',
     onClick: function onClick() {
-      go2BackAndClose();
+      go2BackAndClose(backHistoryPath);
       // history.goBack();
     }
   }, /*#__PURE__*/React__default['default'].createElement(icons.ArrowLeftOutlined, null)), /*#__PURE__*/React__default['default'].createElement("div", {
@@ -29876,9 +29881,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
                 };
               }) || undefined;
               _this.propertyCodeToRangeIdMap["".concat(item.code, ".").concat(element.code)] = list;
-            } else {
-              _this.propertyCodeToRangeIdMap["".concat(item.code, ".").concat(element.code)] = Object.keys(infoVo).length ? infoVo : undefined;
-            }
+            } else ;
             var child = {
               title: "".concat(item.name, "-").concat(element.name),
               key: element.id,
@@ -29920,9 +29923,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
             };
           }) || undefined;
           _this.propertyCodeToRangeIdMap["".concat(rootObjCode, ".").concat(parentKey, ".").concat(element.code)] = _list;
-        } else {
-          _this.propertyCodeToRangeIdMap["".concat(rootObjCode, ".").concat(parentKey, ".").concat(element.code)] = Object.keys(infoVo).length ? infoVo : undefined;
-        }
+        } else ;
         var child = {
           title: "".concat(parentTitle, "-").concat(element.name),
           key: "".concat(parentKey, ".").concat(element.id),

package/dist/utils/utils.d.ts

@@ -1,7 +1,7 @@
 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: any;
-export declare const go2BackAndClose: () => void;
+export declare const go2BackAndClose: (backHistoryPath: any) => void;
 /**
  * 处理bssulaTable的公共回显样式
  * @param col 每一具体行

package/package.json

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

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

@@ -63,6 +63,7 @@ const DetailWrapper = React.memo(
     donotNeedShowScreenIcon=false,
     title,
     pathToRegexp,
+    backHistoryPath,
   }: any) => {
     const [isFullScreen, setIsFnllScreen]: any = useState(false);
     const [breadcrumbArr, setBreadCrumbArr]: any = useState([]);
@@ -218,7 +219,7 @@ const DetailWrapper = React.memo(
             <div
               className={'back_home_img_content'}
               onClick={() => {
-                go2BackAndClose();
+                go2BackAndClose(backHistoryPath);
                 // history.goBack();
               }}
             >
@@ -311,4 +312,4 @@ const DetailWrapper = React.memo(
     }
     return true;
   },
-);
+);

package/src/components/Solution/RuleComponent/index.js

@@ -138,9 +138,9 @@ class RuleObjectComponent extends Component {
                     `${item.code}.${element.code}`
                   ] = list;
                 } else {
-                  this.propertyCodeToRangeIdMap[
-                    `${item.code}.${element.code}`
-                  ] = Object.keys(infoVo).length ? infoVo : undefined;
+                  // this.propertyCodeToRangeIdMap[
+                  //   `${item.code}.${element.code}`
+                  // ] = Object.keys(infoVo).length ? infoVo : undefined;
                 }
                 let child = {
                   title: `${item.name}-${element.name}`,
@@ -200,9 +200,9 @@ class RuleObjectComponent extends Component {
           `${rootObjCode}.${parentKey}.${element.code}`
         ] = list;
       } else {
-        this.propertyCodeToRangeIdMap[
-          `${rootObjCode}.${parentKey}.${element.code}`
-        ] = Object.keys(infoVo).length ? infoVo : undefined;
+        // this.propertyCodeToRangeIdMap[
+        //   `${rootObjCode}.${parentKey}.${element.code}`
+        // ] = Object.keys(infoVo).length ? infoVo : undefined;
       }
       let child = {
         title: `${parentTitle}-${element.name}`,

package/src/utils/utils.ts

@@ -60,9 +60,13 @@ export const formatter = (data, parentAuthority, parentName) => {
 
 export const memoizeOneFormatter = memoizeOne(formatter, isEqual);
 
-export const go2BackAndClose = () => {
+export const go2BackAndClose = (backHistoryPath) => {
   localStorage.setItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK, 1);
-  history.goBack();
+  if(backHistoryPath){
+    history.push(backHistoryPath)
+  } else {
+    history.goBack();
+  }
 }
 
 /**

package/dist 2/components/Business/BsLayouts/Components/CustomerMenu/MenuSetting/index.d.ts

@@ -1,4 +0,0 @@
-import React from "react";
-import './index.less';
-declare const MenuSetting: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-export default MenuSetting;

package/dist 2/components/Business/BsLayouts/Components/CustomerMenu/globalMenu/DrawContent.d.ts

@@ -1,4 +0,0 @@
-import React from 'react';
-import './drawContent.less';
-declare const DrawContent: ({ onClose, originRoutes, itemPath }: any) => React.JSX.Element;
-export default DrawContent;

package/dist 2/components/Business/BsLayouts/Components/CustomerMenu/globalMenu/customMenuHeader.d.ts

@@ -1,3 +0,0 @@
-import React from "react";
-declare const CustomerMenuHeader: ({ collapsed, handleClose, originRoutes, itemPath }: any) => React.JSX.Element;
-export default CustomerMenuHeader;