@bit-sun/business-component 2.4.13 → 2.4.15-alpha.1

package/dist/components/Functional/BsAntdSula/index.d 6.ts

@@ -0,0 +1 @@
+export { default as BsCascader } from './BsCascader';

package/dist/index.esm.js

@@ -10190,12 +10190,14 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
     _remoteSource$initial = remoteSource.initialParams,
     initialParams = _remoteSource$initial === void 0 ? {} : _remoteSource$initial,
     _remoteSource$treeChi = remoteSource.treeChildrenRoom,
-    treeChildrenRoom = _remoteSource$treeChi === void 0 ? 'children' : _remoteSource$treeChi;
+    treeChildrenRoom = _remoteSource$treeChi === void 0 ? 'children' : _remoteSource$treeChi,
+    _remoteSource$special = remoteSource.specialBracket,
+    specialBracket = _remoteSource$special === void 0 ? false : _remoteSource$special;
   var mapSearchTree = function mapSearchTree(treeDataItem) {
     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]],
+      title: specialBracket ? "\u3010".concat(treeDataItem[resKeyValue[0]], "\u3011").concat(treeDataItem[resKeyValue[1]]) : treeDataItem[resKeyValue[1]],
       key: treeDataItem[resKeyValue[0]],
       value: treeDataItem[resKeyValue[0]],
       parentId: treeDataItem.parent,

package/dist/index.js

@@ -10210,12 +10210,14 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
     _remoteSource$initial = remoteSource.initialParams,
     initialParams = _remoteSource$initial === void 0 ? {} : _remoteSource$initial,
     _remoteSource$treeChi = remoteSource.treeChildrenRoom,
-    treeChildrenRoom = _remoteSource$treeChi === void 0 ? 'children' : _remoteSource$treeChi;
+    treeChildrenRoom = _remoteSource$treeChi === void 0 ? 'children' : _remoteSource$treeChi,
+    _remoteSource$special = remoteSource.specialBracket,
+    specialBracket = _remoteSource$special === void 0 ? false : _remoteSource$special;
   var mapSearchTree = function mapSearchTree(treeDataItem) {
     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]],
+      title: specialBracket ? "\u3010".concat(treeDataItem[resKeyValue[0]], "\u3011").concat(treeDataItem[resKeyValue[1]]) : treeDataItem[resKeyValue[1]],
       key: treeDataItem[resKeyValue[0]],
       value: treeDataItem[resKeyValue[0]],
       parentId: treeDataItem.parent,

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

@@ -0,0 +1,4 @@
+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

@@ -0,0 +1,4 @@
+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

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

package/package.json

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

package/src/components/Business/SearchSelect/BusinessUtils.ts

@@ -1832,5 +1832,72 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     }
   }
 
+  // 销售渠道选择器
+  if(type === 'market-channel') {
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/channelInfo`,
+      filter: 'qp-name,code-orGroup,like', // 过滤参数
+      mappingTextField: 'name',
+      mappingTextShowKeyField: 'code',
+      mappingValueField: 'code',
+      otherParams: {
+        'qp-type-eq': 1, //销售渠道类型
+        'qp-isMain-eq': 1,
+        'qp-status-eq': 10, // 10启用 20禁用
+        sorter: 'desc-id',
+      }, // 默认参数
+      sourceName: 'marketChannelCode',
+      ...requestConfigProp
+    }
+    tableSearchForm = [
+      { name: 'qp-name-like', label: '销售渠道名称' },
+      { name: 'qp-code-like', label: '销售渠道编码' },
+      { name: 'qp-salesOrgCode-in', type: 'select', label: '所属销售组织', field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+        },
+      } },
+    ]
+    Promise.all([
+      loadSelectSource(`${prefixUrl.formSelectFix}/orgView/getTree/sales-organizational-view`, {
+        'qp-employeeCode-eq': getEmployeeCode(),
+        'qp-realOrg-eq': true,
+        'qp-status-eq': 10
+      }),
+    ]).then((x: any)=>{
+      formatSource(x, 0, 2, tableSearchForm);
+    })
+    modalTableProps = {
+      modalTableTitle: '选择销售渠道',
+      tableSearchForm,
+      tableColumns: [
+        {
+          title: '销售渠道编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '销售渠道名称',
+          dataIndex: 'name',
+          render: (text: any) => handleTextOverflow(text),
+        },
+        {
+          title: '所属销售组织',
+          dataIndex: 'salesOrgCodeName',
+          render: (text: any) => handleTextOverflow(text),
+        },
+      ],
+      ...modalTableBusProps
+    }
+  }
+
   return { modalTableProps, requestConfig, needModalTable };
 }

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

@@ -41,26 +41,29 @@ const TreeSearchSelect = (props: any) => {
     resKeyValue = ['id', 'name'],
     initialParams = {},
     treeChildrenRoom = 'children',// 树状结构的子集容器 默认为 'children'
+    specialBracket = false
   } = remoteSource;
 
   const mapSearchTree = (treeDataItem: any) => {
     const haveChildren = Array.isArray(treeDataItem[treeChildrenRoom]) && treeDataItem[treeChildrenRoom].length > 0; // 盘算是否为父节点
     const isRoot = treeDataItem?.id == '0'; // 判断是否为根节点
     return {
-      title: treeDataItem[resKeyValue[1]],
+      title: specialBracket
+        ? `【${treeDataItem[resKeyValue[0]]}】${treeDataItem[resKeyValue[1]]}`
+        : treeDataItem[resKeyValue[1]],
       key: treeDataItem[resKeyValue[0]],
       value: treeDataItem[resKeyValue[0]],
       parentId: treeDataItem.parent,
       data: { ...treeDataItem },
       isLeaf: !haveChildren,
-      disabled: isDisabled(haveChildren,isRoot),
+      disabled: isDisabled(haveChildren, isRoot),
       children: haveChildren ? treeDataItem[treeChildrenRoom].map((i: any) => mapSearchTree(i)) : [],
     };
   };
 
-  const isDisabled = (isParent: boolean,isRoot: boolean) => {
+  const isDisabled = (isParent: boolean, isRoot: boolean) => {
     if (isChoose) {
-      if(rootDisabled && isRoot){
+      if (rootDisabled && isRoot) {
         return rootDisabled
       }
       return false;
@@ -74,11 +77,11 @@ const TreeSearchSelect = (props: any) => {
       [`${paramsKey}`]: q,
       ...initialParams,
     }
-    axios.get(`${url}?${stringify(paramsData)}`, {headers}).then(async (res: any) => {
+    axios.get(`${url}?${stringify(paramsData)}`, { headers }).then(async (res: any) => {
       const resData = res?.data || [];
       let coverData;
 
-      if(judgeIsRequestSuccess(resData)) {
+      if (judgeIsRequestSuccess(resData)) {
         const { data } = resData;
         if (remoteSource.converter) {
           coverData = await remoteSource.converter({ data: [data] })
@@ -97,14 +100,14 @@ const TreeSearchSelect = (props: any) => {
 
   const formatData = (value: any) => {
     if (labelInValue) {
-      const formatResult = multiple||treeCheckable ? value.map((i: any) => ({...i, key: i.value})) : { ...value, key: value?.value };
+      const formatResult = multiple || treeCheckable ? value.map((i: any) => ({ ...i, key: i.value })) : { ...value, key: value?.value };
       return formatResult
     } else {
-      const formatResult = multiple||treeCheckable ? value.map((i: any) => (i?.value || i)) : (_.get(value?.[0], 'value') || value)
+      const formatResult = multiple || treeCheckable ? value.map((i: any) => (i?.value || i)) : (_.get(value?.[0], 'value') || value)
       return formatResult
     }
   }
-  const parallelData = (data: any,result: any) => {
+  const parallelData = (data: any, result: any) => {
     data.forEach((i: any) => {
       result.push(i);
       if (i[treeChildrenRoom]) {
@@ -113,31 +116,31 @@ const TreeSearchSelect = (props: any) => {
     });
     return result;
   }
-  const getSelectItem = (tData: any,selectValue: any) => {
-    const handleList = tData||[];
+  const getSelectItem = (tData: any, selectValue: any) => {
+    const handleList = tData || [];
     let result = [];
-    if(labelInValue) {
-      result = multiple||treeCheckable ? (selectValue?.map((i: any) => {
-        if(handleList.some((s: any) => s.key == i.value)){
+    if (labelInValue) {
+      result = multiple || treeCheckable ? (selectValue?.map((i: any) => {
+        if (handleList.some((s: any) => s.key == i.value)) {
           return handleList.find((s: any) => s.key == i.value)
         }
-      }) || []) : (handleList?.find((s: any) => s.key == selectValue?.value)||{})
+      }) || []) : (handleList?.find((s: any) => s.key == selectValue?.value) || {})
     } else {
       const cValue = _.get(selectValue?.[0], 'value', selectValue);
-      result = multiple||treeCheckable ? (selectValue?.map((i: any) => {
-        if(handleList.some((s: any) => s.key == i)){
+      result = multiple || treeCheckable ? (selectValue?.map((i: any) => {
+        if (handleList.some((s: any) => s.key == i)) {
           return handleList.find((s: any) => s.key == i)
         }
-      }) || []) : (handleList?.find((s: any) => s.key == cValue)||{})
+      }) || []) : (handleList?.find((s: any) => s.key == cValue) || {})
     }
     return result;
   }
   const handleChange = (data: any, dataName: any) => {
     const handleData = formatData(data);
     // 获取选中树节点当条数据，并返回给调用业务
-    const parallelTreeData = parallelData(treeData,[])
-    const currentItem = getSelectItem(parallelTreeData,data)
-    onChange(handleData,data,currentItem,parallelTreeData);
+    const parallelTreeData = parallelData(treeData, [])
+    const currentItem = getSelectItem(parallelTreeData, data)
+    onChange(handleData, data, currentItem, parallelTreeData);
     onChangeName && onChangeName(dataName);
     getTreeData && getTreeData(treeData); // 把树节点暴露出去
     ctx?.form?.setFieldValue(ctx.name, handleData);
@@ -148,17 +151,17 @@ const TreeSearchSelect = (props: any) => {
   }, []);
 
   const maxTagPlaceholder = (selectedValues: any) => {
-    const onClose = (e: any,item: any) => {
+    const onClose = (e: any, item: any) => {
       e.preventDefault();
-      const newValue = labelInValue ? JSON.parse(JSON.stringify(value)).filter((i: any) => i.value !== item.value): JSON.parse(JSON.stringify(value)).filter((i: any) => i !== item.value)
-      const newValueName = labelInValue ? null: JSON.parse(JSON.stringify(valueName)).filter((i: any) => i !== item.label)
+      const newValue = labelInValue ? JSON.parse(JSON.stringify(value)).filter((i: any) => i.value !== item.value) : JSON.parse(JSON.stringify(value)).filter((i: any) => i !== item.value)
+      const newValueName = labelInValue ? null : JSON.parse(JSON.stringify(valueName)).filter((i: any) => i !== item.label)
       handleChange(newValue, newValueName);
     }
     return (
       <Tooltip title={selectedValues.map((i: any) => (
         <Tag
           closable={true}
-          onClose={(e) => onClose(e,i)}
+          onClose={(e) => onClose(e, i)}
           style={{ marginRight: 3, background: '#f5f5f5', height: '24px', border: '1px solid #f0f0f0' }}
         >
           {i.label}
@@ -190,7 +193,7 @@ const TreeSearchSelect = (props: any) => {
         multiple={multiple} // 	支持多选（当设置 treeCheckable 时自动变为 true）
         maxTagPlaceholder={maxTagPlaceholder}
         onChange={handleChange}
-        disabled={disabled || mode==='view' || ctx?.mode === 'view'}
+        disabled={disabled || mode === 'view' || ctx?.mode === 'view'}
         getPopupContainer={(triggerNode) => (getPopupContainer && getPopupContainer(triggerNode)) || document.body}
       >
       </TreeSelect>