@bit-sun/business-component 2.4.10 → 2.4.12

package/dist/components/Business/JsonQueryTable/static.d.ts

@@ -34,6 +34,7 @@ export declare const choiceType: Readonly<{
     340: "规则模板选择器";
     350: "营销区域选择器";
     360: "角色选择器";
+    370: "销售渠道选择器";
 }>;
 export declare const inputType: any;
 export declare const valueType: any;

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的公共回显样式
@@ -10173,9 +10177,11 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
     _remoteSource$resKeyV = remoteSource.resKeyValue,
     resKeyValue = _remoteSource$resKeyV === void 0 ? ['id', 'name'] : _remoteSource$resKeyV,
     _remoteSource$initial = remoteSource.initialParams,
-    initialParams = _remoteSource$initial === void 0 ? {} : _remoteSource$initial;
+    initialParams = _remoteSource$initial === void 0 ? {} : _remoteSource$initial,
+    _remoteSource$treeChi = remoteSource.treeChildrenRoom,
+    treeChildrenRoom = _remoteSource$treeChi === void 0 ? 'children' : _remoteSource$treeChi;
   var mapSearchTree = function mapSearchTree(treeDataItem) {
-    var haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0; // 盘算是否为父节点
+    var haveChildren = Array.isArray(treeDataItem[treeChildrenRoom]) && treeDataItem[treeChildrenRoom].length > 0; // 盘算是否为父节点
     var isRoot = (treeDataItem === null || treeDataItem === void 0 ? void 0 : treeDataItem.id) == '0'; // 判断是否为根节点
     return {
       title: treeDataItem[resKeyValue[1]],
@@ -10185,7 +10191,7 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
       data: _objectSpread2({}, treeDataItem),
       isLeaf: !haveChildren,
       disabled: isDisabled(haveChildren, isRoot),
-      children: haveChildren ? treeDataItem.children.map(function (i) {
+      children: haveChildren ? treeDataItem[treeChildrenRoom].map(function (i) {
         return mapSearchTree(i);
       }) : []
     };
@@ -10273,8 +10279,8 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
   var parallelData = function parallelData(data, result) {
     data.forEach(function (i) {
       result.push(i);
-      if (i.children) {
-        parallelData(i.children, result);
+      if (i[treeChildrenRoom]) {
+        parallelData(i[treeChildrenRoom], result);
       }
     });
     return result;
@@ -10468,6 +10474,16 @@ var handleDefaultProps = function handleDefaultProps(type, otherRequestConfig) {
         }, otherRequestConfig)
       };
       break;
+    case 'market-channel':
+      result = {
+        isChoose: true,
+        remoteSource: _objectSpread2({
+          url: "/channel-manage/channelInfo/tree",
+          headers: otherRequestConfig === null || otherRequestConfig === void 0 ? void 0 : otherRequestConfig.extralHeaders,
+          resKeyValue: ['code', 'name']
+        }, otherRequestConfig)
+      };
+      break;
     default:
       result = {
         treeCheckable: true,
@@ -11964,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],
@@ -12088,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", {
@@ -24630,6 +24647,19 @@ var inputTypes = {
           filter: 'qp-name,code-orGroup-in'
         }
       })
+    },
+    370: {
+      type: 'bs-marketChannelSelect',
+      props: _objectSpread2({
+        treeCheckable: false,
+        requestConfig: {
+          treeChildrenRoom: 'channelInfoSon',
+          initialParams: {
+            'qp-isMain-eq': 1,
+            'qp-type-eq': 1
+          }
+        }
+      }, normalSingleSelectProps)
     }
   },
   30: {
@@ -24795,6 +24825,20 @@ var inputTypes = {
           filter: 'qp-name,code-orGroup-in'
         }
       })
+    },
+    370: {
+      type: 'bs-marketChannelSelect',
+      props: _objectSpread2({
+        treeCheckable: true,
+        treeCheckStrictly: true,
+        requestConfig: {
+          treeChildrenRoom: 'channelInfoSon',
+          initialParams: {
+            'qp-isMain-eq': 1,
+            'qp-type-eq': 1
+          }
+        }
+      }, normalSingleSelectProps)
     }
   }
 };
@@ -24827,7 +24871,8 @@ var choiceType = Object.freeze({
   330: '变量',
   340: '规则模板选择器',
   350: '营销区域选择器',
-  360: '角色选择器'
+  360: '角色选择器',
+  370: '销售渠道选择器'
 });
 var inputType = {
   10: '输入',
@@ -29816,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,
@@ -29860,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的公共回显样式
@@ -10193,9 +10197,11 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
     _remoteSource$resKeyV = remoteSource.resKeyValue,
     resKeyValue = _remoteSource$resKeyV === void 0 ? ['id', 'name'] : _remoteSource$resKeyV,
     _remoteSource$initial = remoteSource.initialParams,
-    initialParams = _remoteSource$initial === void 0 ? {} : _remoteSource$initial;
+    initialParams = _remoteSource$initial === void 0 ? {} : _remoteSource$initial,
+    _remoteSource$treeChi = remoteSource.treeChildrenRoom,
+    treeChildrenRoom = _remoteSource$treeChi === void 0 ? 'children' : _remoteSource$treeChi;
   var mapSearchTree = function mapSearchTree(treeDataItem) {
-    var haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0; // 盘算是否为父节点
+    var haveChildren = Array.isArray(treeDataItem[treeChildrenRoom]) && treeDataItem[treeChildrenRoom].length > 0; // 盘算是否为父节点
     var isRoot = (treeDataItem === null || treeDataItem === void 0 ? void 0 : treeDataItem.id) == '0'; // 判断是否为根节点
     return {
       title: treeDataItem[resKeyValue[1]],
@@ -10205,7 +10211,7 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
       data: _objectSpread2({}, treeDataItem),
       isLeaf: !haveChildren,
       disabled: isDisabled(haveChildren, isRoot),
-      children: haveChildren ? treeDataItem.children.map(function (i) {
+      children: haveChildren ? treeDataItem[treeChildrenRoom].map(function (i) {
         return mapSearchTree(i);
       }) : []
     };
@@ -10293,8 +10299,8 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
   var parallelData = function parallelData(data, result) {
     data.forEach(function (i) {
       result.push(i);
-      if (i.children) {
-        parallelData(i.children, result);
+      if (i[treeChildrenRoom]) {
+        parallelData(i[treeChildrenRoom], result);
       }
     });
     return result;
@@ -10488,6 +10494,16 @@ var handleDefaultProps = function handleDefaultProps(type, otherRequestConfig) {
         }, otherRequestConfig)
       };
       break;
+    case 'market-channel':
+      result = {
+        isChoose: true,
+        remoteSource: _objectSpread2({
+          url: "/channel-manage/channelInfo/tree",
+          headers: otherRequestConfig === null || otherRequestConfig === void 0 ? void 0 : otherRequestConfig.extralHeaders,
+          resKeyValue: ['code', 'name']
+        }, otherRequestConfig)
+      };
+      break;
     default:
       result = {
         treeCheckable: true,
@@ -11984,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],
@@ -12108,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", {
@@ -24650,6 +24667,19 @@ var inputTypes = {
           filter: 'qp-name,code-orGroup-in'
         }
       })
+    },
+    370: {
+      type: 'bs-marketChannelSelect',
+      props: _objectSpread2({
+        treeCheckable: false,
+        requestConfig: {
+          treeChildrenRoom: 'channelInfoSon',
+          initialParams: {
+            'qp-isMain-eq': 1,
+            'qp-type-eq': 1
+          }
+        }
+      }, normalSingleSelectProps)
     }
   },
   30: {
@@ -24815,6 +24845,20 @@ var inputTypes = {
           filter: 'qp-name,code-orGroup-in'
         }
       })
+    },
+    370: {
+      type: 'bs-marketChannelSelect',
+      props: _objectSpread2({
+        treeCheckable: true,
+        treeCheckStrictly: true,
+        requestConfig: {
+          treeChildrenRoom: 'channelInfoSon',
+          initialParams: {
+            'qp-isMain-eq': 1,
+            'qp-type-eq': 1
+          }
+        }
+      }, normalSingleSelectProps)
     }
   }
 };
@@ -24847,7 +24891,8 @@ var choiceType = Object.freeze({
   330: '变量',
   340: '规则模板选择器',
   350: '营销区域选择器',
-  360: '角色选择器'
+  360: '角色选择器',
+  370: '销售渠道选择器'
 });
 var inputType = {
   10: '输入',
@@ -29836,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,
@@ -29880,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.4.10",
+  "version": "2.4.12",
   "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/Business/JsonQueryTable/static.ts

@@ -178,6 +178,17 @@ export const inputTypes:any = {
         },
       },
     },
+    370: {
+      type: 'bs-marketChannelSelect',
+      props: {
+        treeCheckable: false,
+        requestConfig: { 
+          treeChildrenRoom: 'channelInfoSon', 
+          initialParams: { 'qp-isMain-eq': 1, 'qp-type-eq': 1 },
+        },
+        ...normalSingleSelectProps,
+      },
+    },
   },
   30: {
     10: {
@@ -361,6 +372,18 @@ export const inputTypes:any = {
         },
       },
     },
+    370: {
+      type: 'bs-marketChannelSelect',
+      props: {
+        treeCheckable: true,
+        treeCheckStrictly: true,
+        requestConfig: { 
+          treeChildrenRoom: 'channelInfoSon', 
+          initialParams: { 'qp-isMain-eq': 1, 'qp-type-eq': 1 } 
+        },
+        ...normalSingleSelectProps,
+      },
+    },
   },
 };
 
@@ -403,6 +426,7 @@ export const choiceType = Object.freeze({
   340: '规则模板选择器',
   350: '营销区域选择器',
   360: '角色选择器',
+  370: '销售渠道选择器',
 });
 export const inputType:any ={
   10: '输入',

package/src/components/Business/TreeSearchSelect/utils.ts

@@ -73,6 +73,17 @@ const handleDefaultProps = (type: string, otherRequestConfig: {extralHeaders?: s
         },
       };
       break;
+    case 'market-channel':
+      result =  {
+        isChoose: true,
+        remoteSource: {
+          url: `/channel-manage/channelInfo/tree`,
+          headers: otherRequestConfig?.extralHeaders,
+          resKeyValue: ['code', 'name'],
+          ...otherRequestConfig,
+        },
+      };
+      break;
     default:
       result =  {
         treeCheckable: true,

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

@@ -40,10 +40,11 @@ const TreeSearchSelect = (props: any) => {
     paramsKey = 'qp-name-like',
     resKeyValue = ['id', 'name'],
     initialParams = {},
+    treeChildrenRoom = 'children',// 树状结构的子集容器 默认为 'children'
   } = remoteSource;
 
   const mapSearchTree = (treeDataItem: any) => {
-    const haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0; // 盘算是否为父节点
+    const haveChildren = Array.isArray(treeDataItem[treeChildrenRoom]) && treeDataItem[treeChildrenRoom].length > 0; // 盘算是否为父节点
     const isRoot = treeDataItem?.id == '0'; // 判断是否为根节点
     return {
       title: treeDataItem[resKeyValue[1]],
@@ -53,7 +54,7 @@ const TreeSearchSelect = (props: any) => {
       data: { ...treeDataItem },
       isLeaf: !haveChildren,
       disabled: isDisabled(haveChildren,isRoot),
-      children: haveChildren ? treeDataItem.children.map((i: any) => mapSearchTree(i)) : [],
+      children: haveChildren ? treeDataItem[treeChildrenRoom].map((i: any) => mapSearchTree(i)) : [],
     };
   };
 
@@ -106,8 +107,8 @@ const TreeSearchSelect = (props: any) => {
   const parallelData = (data: any,result: any) => {
     data.forEach((i: any) => {
       result.push(i);
-      if (i.children) {
-        parallelData(i.children, result);
+      if (i[treeChildrenRoom]) {
+        parallelData(i[treeChildrenRoom], result);
       }
     });
     return result;

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;