@bit-sun/business-component 2.1.14 → 2.1.16

package/dist/components/Business/BsLayouts/utils.d.ts

@@ -11,3 +11,4 @@ export declare function handleUserPhone(): any;
 export declare const setLoginOutPath: () => void;
 export declare const getBreadcrumbNameMap: (menuData: any) => {};
 export declare const ergodicMenuRoutes: (routes: any) => any[];
+export declare const encodeUrlQuery: (pathStr: any) => string;

package/dist/index.esm.js

@@ -14234,7 +14234,7 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
       var columnConfig = _this.getConfigFromlocalstorage();
 
       var initialDataSourceData = columnConfig.length ? datasource.map(function (item) {
-        var _showColumnItem$, _inner$;
+        var _inner$, _showColumnItem$, _inner$2;
 
         var inner = columnConfig.filter(function (innerItem) {
           return innerItem.dataIndex && innerItem.dataIndex === item.dataIndex || innerItem.key && innerItem.key === item.key;
@@ -14243,8 +14243,9 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
           return inneritem.dataIndex && inneritem.dataIndex === item.dataIndex || inneritem.key && inneritem.key === item.key;
         });
         return _objectSpread2(_objectSpread2({}, item), {}, {
+          fixed: inner.length ? (_inner$ = inner[0]) === null || _inner$ === void 0 ? void 0 : _inner$.fixed : item === null || item === void 0 ? void 0 : item.fixed,
           key: item.key || item.dataIndex,
-          width: ((_showColumnItem$ = showColumnItem[0]) === null || _showColumnItem$ === void 0 ? void 0 : _showColumnItem$.width) || ((_inner$ = inner[0]) === null || _inner$ === void 0 ? void 0 : _inner$.width) || item.width,
+          width: ((_showColumnItem$ = showColumnItem[0]) === null || _showColumnItem$ === void 0 ? void 0 : _showColumnItem$.width) || ((_inner$2 = inner[0]) === null || _inner$2 === void 0 ? void 0 : _inner$2.width) || item.width,
           hidden: columnConfig.length && !inner.length
         });
       }) : _toConsumableArray(datasource);
@@ -17556,6 +17557,27 @@ var ergodicMenuRoutes = function ergodicMenuRoutes(routes) {
   ergodicRoutes(routes);
   return codeArray;
 };
+var encodeUrlQuery = function encodeUrlQuery(pathStr) {
+  var newPathStr = '';
+
+  if (pathStr.indexOf('#') > -1) {
+    var index = pathStr.indexOf('?');
+    var str1 = pathStr.substr(0, index + 1);
+    var str2 = pathStr.substr(index + 1, pathStr.length - index - 1);
+    var queryArr = str2.split('&');
+    var newArr = queryArr.map(function (item) {
+      var index = item.indexOf('=');
+      var s1 = item.substr(0, index);
+      var s2 = item.substr(index + 1, item.length - index - 1);
+      return "".concat(s1, "=").concat(encodeURIComponent(s2));
+    });
+    newPathStr = "".concat(str1).concat(newArr.join('&'));
+  } else {
+    newPathStr = pathStr;
+  }
+
+  return newPathStr;
+};
 
 var AllFunc = function AllFunc(props) {
   var _useState = useState(''),
@@ -19933,7 +19955,8 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         });
 
         localStorage.setItem('isTabChange', '1');
-        history.push(key);
+        var newKey = encodeUrlQuery(key);
+        history.push(newKey);
       }
     };
 
@@ -20010,8 +20033,9 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           listenRouterState: newListenRouterState,
           listenRouterKey: newListenRouterKey
         }, function () {
+          var newKey = encodeUrlQuery(newActiveKey);
           history.push({
-            pathname: newActiveKey
+            pathname: newKey
           });
 
           _this.checkisNavSlide();
@@ -20046,8 +20070,9 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
 
     _this.handleMenuClick = function (item) {
       if (item.children || !item.component) return;
+      var newKey = encodeUrlQuery(item.path);
       history.push({
-        pathname: item.path
+        pathname: newKey
       });
 
       _this.setShowMenu(false);
@@ -20165,8 +20190,9 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
 
         _this.updateState(newlistenRouterState, newlistenRouterKey, function () {
           if (deleteKey === activeKey) {
+            var newKey = encodeUrlQuery(newActiveKey);
             history.push({
-              pathname: newActiveKey
+              pathname: newKey
             });
           }
         });
@@ -20189,8 +20215,9 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           })) {
             return;
           } else {
+            var newKey = encodeUrlQuery(key);
             history.push({
-              pathname: key
+              pathname: newKey
             });
           }
         });
@@ -20218,8 +20245,9 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           })) {
             return;
           } else {
+            var newKey = encodeUrlQuery(key);
             history.push({
-              pathname: key
+              pathname: newKey
             });
           }
         });
@@ -20244,8 +20272,9 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           return item === key || item === '/';
         }), function () {
           if (key !== activeKey) {
+            var newKey = encodeUrlQuery(key);
             history.push({
-              pathname: key
+              pathname: newKey
             });
           }
         });
@@ -20316,7 +20345,8 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         }
 
         if (typeof e.data === 'string') {
-          history.push(e.data.replace(/^\/\w+\//, '/'));
+          var newKey = encodeUrlQuery(e.data.replace(/^\/\w+\//, '/'));
+          history.push(newKey);
         } else {
           var info = e.data;
 
@@ -20567,8 +20597,9 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           }), listenRouterKey.filter(function (d) {
             return d !== activeKey;
           }), function () {
+            var newKey = encodeUrlQuery(newActiveKey);
             history.push({
-              pathname: newActiveKey
+              pathname: newKey
             });
           });
         }

package/dist/index.js

@@ -14248,7 +14248,7 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
       var columnConfig = _this.getConfigFromlocalstorage();
 
       var initialDataSourceData = columnConfig.length ? datasource.map(function (item) {
-        var _showColumnItem$, _inner$;
+        var _inner$, _showColumnItem$, _inner$2;
 
         var inner = columnConfig.filter(function (innerItem) {
           return innerItem.dataIndex && innerItem.dataIndex === item.dataIndex || innerItem.key && innerItem.key === item.key;
@@ -14257,8 +14257,9 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
           return inneritem.dataIndex && inneritem.dataIndex === item.dataIndex || inneritem.key && inneritem.key === item.key;
         });
         return _objectSpread2(_objectSpread2({}, item), {}, {
+          fixed: inner.length ? (_inner$ = inner[0]) === null || _inner$ === void 0 ? void 0 : _inner$.fixed : item === null || item === void 0 ? void 0 : item.fixed,
           key: item.key || item.dataIndex,
-          width: ((_showColumnItem$ = showColumnItem[0]) === null || _showColumnItem$ === void 0 ? void 0 : _showColumnItem$.width) || ((_inner$ = inner[0]) === null || _inner$ === void 0 ? void 0 : _inner$.width) || item.width,
+          width: ((_showColumnItem$ = showColumnItem[0]) === null || _showColumnItem$ === void 0 ? void 0 : _showColumnItem$.width) || ((_inner$2 = inner[0]) === null || _inner$2 === void 0 ? void 0 : _inner$2.width) || item.width,
           hidden: columnConfig.length && !inner.length
         });
       }) : _toConsumableArray(datasource);
@@ -17570,6 +17571,27 @@ var ergodicMenuRoutes = function ergodicMenuRoutes(routes) {
   ergodicRoutes(routes);
   return codeArray;
 };
+var encodeUrlQuery = function encodeUrlQuery(pathStr) {
+  var newPathStr = '';
+
+  if (pathStr.indexOf('#') > -1) {
+    var index = pathStr.indexOf('?');
+    var str1 = pathStr.substr(0, index + 1);
+    var str2 = pathStr.substr(index + 1, pathStr.length - index - 1);
+    var queryArr = str2.split('&');
+    var newArr = queryArr.map(function (item) {
+      var index = item.indexOf('=');
+      var s1 = item.substr(0, index);
+      var s2 = item.substr(index + 1, item.length - index - 1);
+      return "".concat(s1, "=").concat(encodeURIComponent(s2));
+    });
+    newPathStr = "".concat(str1).concat(newArr.join('&'));
+  } else {
+    newPathStr = pathStr;
+  }
+
+  return newPathStr;
+};
 
 var AllFunc = function AllFunc(props) {
   var _useState = React.useState(''),
@@ -19947,7 +19969,8 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         });
 
         localStorage.setItem('isTabChange', '1');
-        umi.history.push(key);
+        var newKey = encodeUrlQuery(key);
+        umi.history.push(newKey);
       }
     };
 
@@ -20024,8 +20047,9 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           listenRouterState: newListenRouterState,
           listenRouterKey: newListenRouterKey
         }, function () {
+          var newKey = encodeUrlQuery(newActiveKey);
           umi.history.push({
-            pathname: newActiveKey
+            pathname: newKey
           });
 
           _this.checkisNavSlide();
@@ -20060,8 +20084,9 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
 
     _this.handleMenuClick = function (item) {
       if (item.children || !item.component) return;
+      var newKey = encodeUrlQuery(item.path);
       umi.history.push({
-        pathname: item.path
+        pathname: newKey
       });
 
       _this.setShowMenu(false);
@@ -20179,8 +20204,9 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
 
         _this.updateState(newlistenRouterState, newlistenRouterKey, function () {
           if (deleteKey === activeKey) {
+            var newKey = encodeUrlQuery(newActiveKey);
             umi.history.push({
-              pathname: newActiveKey
+              pathname: newKey
             });
           }
         });
@@ -20203,8 +20229,9 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           })) {
             return;
           } else {
+            var newKey = encodeUrlQuery(key);
             umi.history.push({
-              pathname: key
+              pathname: newKey
             });
           }
         });
@@ -20232,8 +20259,9 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           })) {
             return;
           } else {
+            var newKey = encodeUrlQuery(key);
             umi.history.push({
-              pathname: key
+              pathname: newKey
             });
           }
         });
@@ -20258,8 +20286,9 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           return item === key || item === '/';
         }), function () {
           if (key !== activeKey) {
+            var newKey = encodeUrlQuery(key);
             umi.history.push({
-              pathname: key
+              pathname: newKey
             });
           }
         });
@@ -20330,7 +20359,8 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         }
 
         if (typeof e.data === 'string') {
-          history.push(e.data.replace(/^\/\w+\//, '/'));
+          var newKey = encodeUrlQuery(e.data.replace(/^\/\w+\//, '/'));
+          history.push(newKey);
         } else {
           var info = e.data;
 
@@ -20581,8 +20611,9 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           }), listenRouterKey.filter(function (d) {
             return d !== activeKey;
           }), function () {
+            var newKey = encodeUrlQuery(newActiveKey);
             umi.history.push({
-              pathname: newActiveKey
+              pathname: newKey
             });
           });
         }

package/package.json

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

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

@@ -33,6 +33,7 @@ import {
   getBreadcrumbNameMap,
   ergodicMenuRoutes,
   matchPath,
+  encodeUrlQuery,
 } from './utils';
 import moment from 'moment';
 import GlobalHeaderCom from './Components/GlobalHeader';
@@ -347,7 +348,8 @@ class BasicLayout extends React.PureComponent {
         }
 
         if (typeof e.data === 'string') {
-          history.push(e.data.replace(/^\/\w+\//, '/'));
+          let newKey = encodeUrlQuery(e.data.replace(/^\/\w+\//, '/'));
+          history.push(newKey);
         } else {
           const info = e.data;
           if (info.type === 'remove') {
@@ -638,7 +640,8 @@ class BasicLayout extends React.PureComponent {
         activeKey: key,
       });
       localStorage.setItem('isTabChange', '1');
-      history.push(key);
+      let newKey = encodeUrlQuery(key);
+      history.push(newKey);
     }
   };
 
@@ -718,8 +721,9 @@ class BasicLayout extends React.PureComponent {
           listenRouterKey: newListenRouterKey,
         },
         () => {
+          let newKey = encodeUrlQuery(newActiveKey);
           history.push({
-            pathname: newActiveKey,
+            pathname: newKey,
           });
           this.checkisNavSlide();
         },
@@ -754,8 +758,9 @@ class BasicLayout extends React.PureComponent {
 
   handleMenuClick = (item: any) => {
     if (item.children || !item.component) return;
+    let newKey = encodeUrlQuery(item.path);
     history.push({
-      pathname: item.path,
+      pathname: newKey,
     });
     this.setShowMenu(false);
   };
@@ -868,8 +873,9 @@ class BasicLayout extends React.PureComponent {
       newlistenRouterKey = listenRouterKey.filter((d) => d !== key);
       this.updateState(newlistenRouterState, newlistenRouterKey, () => {
         if (deleteKey === activeKey) {
+          let newKey = encodeUrlQuery(newActiveKey);
           history.push({
-            pathname: newActiveKey,
+            pathname: newKey,
           });
         }
       });
@@ -886,8 +892,9 @@ class BasicLayout extends React.PureComponent {
         if (newlistenRouterKey.find((item) => item === activeKey)) {
           return;
         } else {
+          let newKey = encodeUrlQuery(key);
           history.push({
-            pathname: key,
+            pathname: newKey,
           });
         }
       });
@@ -909,8 +916,9 @@ class BasicLayout extends React.PureComponent {
           if (newlistenRouterKey.find((item) => item === activeKey)) {
             return;
           } else {
+            let newKey = encodeUrlQuery(key);
             history.push({
-              pathname: key,
+              pathname: newKey,
             });
           }
         },
@@ -935,8 +943,9 @@ class BasicLayout extends React.PureComponent {
         listenRouterKey.filter((item) => item === key || item === '/'),
         () => {
           if (key !== activeKey) {
+            let newKey = encodeUrlQuery(key);
             history.push({
-              pathname: key,
+              pathname: newKey,
             });
           }
         },
@@ -1036,8 +1045,9 @@ class BasicLayout extends React.PureComponent {
                 listenRouterState.filter((d) => d.key !== activeKey),
                 listenRouterKey.filter((d) => d !== activeKey),
                 () => {
+                  let newKey = encodeUrlQuery(newActiveKey);
                   history.push({
-                    pathname: newActiveKey,
+                    pathname: newKey,
                   });
                 },
               );

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

@@ -208,4 +208,24 @@ export const ergodicMenuRoutes = (routes) => {
   ergodicRoutes(routes);
 
   return codeArray;
-};
+};
+
+export const encodeUrlQuery = (pathStr: any) => {
+  let newPathStr='';
+  if (pathStr.indexOf('#') > -1) {
+    let index = pathStr.indexOf('?');
+    let str1 = pathStr.substr(0, index+1);
+    let str2 = pathStr.substr(index+1, pathStr.length - index -1);
+    let queryArr = str2.split('&');
+    let newArr = queryArr.map(item => {
+      let index = item.indexOf('=');
+      let s1 = item.substr(0, index);
+      let s2 = item.substr(index+1, item.length - index -1);
+      return `${s1}=${encodeURIComponent(s2)}`;
+    })
+    newPathStr = `${str1}${newArr.join('&')}`;
+  } else {
+    newPathStr = pathStr;
+  }
+  return newPathStr;
+}

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

@@ -119,6 +119,7 @@ class SortableTable extends React.Component<SortTableProps> {
       let showColumnItem = showColumns.filter((inneritem:any) => ((inneritem.dataIndex && inneritem.dataIndex === item.dataIndex) || (inneritem.key && inneritem.key === item.key)))
       return {
         ...item,
+        fixed: inner.length ? inner[0]?.fixed : item?.fixed,
         key: item.key || item.dataIndex,
         width: showColumnItem[0]?.width || inner[0]?.width || item.width,
         hidden: columnConfig.length && !inner.length,