@bit-sun/business-component 4.2.0-alpha.4 → 4.2.0-alpha.6

package/dist/index.esm.js

@@ -2,7 +2,7 @@ import axios from 'axios';
 import request$1 from 'umi-request';
 import cookie from 'js-cookie';
 import { message as message$1, Tooltip, Image, Popover, Card, Avatar, Badge, Menu, Input, InputNumber, Space, Button, Dropdown, Upload, Checkbox, Modal, ConfigProvider, Tag, Select, Spin, Form, Table, Empty, Row, Col, Tabs, TreeSelect, DatePicker, Typography, Alert, Breadcrumb, Drawer as Drawer$1, List, Radio, Tree, Result, Affix, Cascader, TimePicker, Divider, Switch, Collapse } from 'antd';
-import _, { omit, uniqBy, escapeRegExp, isNil, debounce, cloneDeep as cloneDeep$1, throttle, isEmpty } from 'lodash';
+import _, { omit, uniqBy, escapeRegExp, isNil, isBoolean, debounce, cloneDeep as cloneDeep$1, throttle, isEmpty } from 'lodash';
 import memoizeOne from 'memoize-one';
 import { formatMessage, history, useLocation, Link, useModel, setLocale, useIntl, request as request$3 } from 'umi';
 import isEqual from 'lodash/isEqual';
@@ -10002,7 +10002,7 @@ function commonFun(type, prefixUrl, parentProps) {
       parentId: treeDataItem.parent,
       data: _objectSpread2({}, treeDataItem),
       isLeaf: !haveChildren,
-      disabled: disabledJudge !== undefined ? disabledJudge : haveChildren,
+      disabled: disabledJudge !== undefined ? isBoolean(disabledJudge) ? disabledJudge : disabledJudge(treeDataItem) : haveChildren,
       children: haveChildren ? treeDataItem[childrenKey].map(function (i) {
         return _mapSearchTree(i, resKeyValue, disabledJudge, childrenKey);
       }) : []
@@ -10012,12 +10012,16 @@ function commonFun(type, prefixUrl, parentProps) {
     var _reData$position2;
     var resKeyValue = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : ['id', 'name'];
     var childrenKey = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'children';
+    var nodeDisabledJudge = arguments.length > 6 ? arguments[6] : undefined;
     var data = reData && ((_reData$position2 = reData[position]) === null || _reData$position2 === void 0 ? void 0 : _reData$position2.data);
     var disabledJudge;
     if (data && _typeof(data) === 'object' && !Array.isArray(data) && Object.keys(data).length > 0) {
       data = [data];
       disabledJudge = false;
     }
+    if (nodeDisabledJudge) {
+      disabledJudge = nodeDisabledJudge;
+    }
     var formatData = data && Array.isArray(data) && data.length && data.map(function (ites) {
       return _mapSearchTree(ites, resKeyValue, disabledJudge, childrenKey);
     }) || [];
@@ -11914,9 +11918,6 @@ function commonFun(type, prefixUrl, parentProps) {
           filterOption: function filterOption(input, option) {
             return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
           },
-          disabledJude: function disabledJude(data) {
-            return data['parentCode'] === '0';
-          },
           showCheckedStrategy: 'TreeSelect.SHOW_ALL'
         }
       }
@@ -11939,9 +11940,6 @@ function commonFun(type, prefixUrl, parentProps) {
           filterOption: function filterOption(input, option) {
             return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
           },
-          disabledJude: function disabledJude(data) {
-            return data['parent'] === '0';
-          },
           showCheckedStrategy: 'TreeSelect.SHOW_ALL'
         }
       }
@@ -11981,9 +11979,15 @@ function commonFun(type, prefixUrl, parentProps) {
     }, getQueryHeadersItem(_queryHeaderParams11, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/tagNode/getTree/10"), {
       'qp-status-eq': 1
     }, getQueryHeadersItem(_queryHeaderParams11, 'qp-orgCode-in'))]).then(function (x) {
+      var channelDisabledJude = function channelDisabledJude(data) {
+        return data['parentCode'] === '0';
+      }; // 所属销售渠道 树节点不能点判断
+      var areaDisabledJude = function areaDisabledJude(data) {
+        return data['parent'] === '0';
+      }; // 所属营销区域 树节点不能点判断
       formatSource(x, 0, 3, tableSearchForm);
-      formatTreeDataSource(x, 1, 4, tableSearchForm, ['id', 'name'], 'channelInfoSon');
-      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children');
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择商店',

package/dist/index.js

@@ -10025,7 +10025,7 @@ function commonFun(type, prefixUrl, parentProps) {
       parentId: treeDataItem.parent,
       data: _objectSpread2({}, treeDataItem),
       isLeaf: !haveChildren,
-      disabled: disabledJudge !== undefined ? disabledJudge : haveChildren,
+      disabled: disabledJudge !== undefined ? _.isBoolean(disabledJudge) ? disabledJudge : disabledJudge(treeDataItem) : haveChildren,
       children: haveChildren ? treeDataItem[childrenKey].map(function (i) {
         return _mapSearchTree(i, resKeyValue, disabledJudge, childrenKey);
       }) : []
@@ -10035,12 +10035,16 @@ function commonFun(type, prefixUrl, parentProps) {
     var _reData$position2;
     var resKeyValue = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : ['id', 'name'];
     var childrenKey = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'children';
+    var nodeDisabledJudge = arguments.length > 6 ? arguments[6] : undefined;
     var data = reData && ((_reData$position2 = reData[position]) === null || _reData$position2 === void 0 ? void 0 : _reData$position2.data);
     var disabledJudge;
     if (data && _typeof(data) === 'object' && !Array.isArray(data) && Object.keys(data).length > 0) {
       data = [data];
       disabledJudge = false;
     }
+    if (nodeDisabledJudge) {
+      disabledJudge = nodeDisabledJudge;
+    }
     var formatData = data && Array.isArray(data) && data.length && data.map(function (ites) {
       return _mapSearchTree(ites, resKeyValue, disabledJudge, childrenKey);
     }) || [];
@@ -11937,9 +11941,6 @@ function commonFun(type, prefixUrl, parentProps) {
           filterOption: function filterOption(input, option) {
             return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
           },
-          disabledJude: function disabledJude(data) {
-            return data['parentCode'] === '0';
-          },
           showCheckedStrategy: 'TreeSelect.SHOW_ALL'
         }
       }
@@ -11962,9 +11963,6 @@ function commonFun(type, prefixUrl, parentProps) {
           filterOption: function filterOption(input, option) {
             return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
           },
-          disabledJude: function disabledJude(data) {
-            return data['parent'] === '0';
-          },
           showCheckedStrategy: 'TreeSelect.SHOW_ALL'
         }
       }
@@ -12004,9 +12002,15 @@ function commonFun(type, prefixUrl, parentProps) {
     }, getQueryHeadersItem(_queryHeaderParams11, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/tagNode/getTree/10"), {
       'qp-status-eq': 1
     }, getQueryHeadersItem(_queryHeaderParams11, 'qp-orgCode-in'))]).then(function (x) {
+      var channelDisabledJude = function channelDisabledJude(data) {
+        return data['parentCode'] === '0';
+      }; // 所属销售渠道 树节点不能点判断
+      var areaDisabledJude = function areaDisabledJude(data) {
+        return data['parent'] === '0';
+      }; // 所属营销区域 树节点不能点判断
       formatSource(x, 0, 3, tableSearchForm);
-      formatTreeDataSource(x, 1, 4, tableSearchForm, ['id', 'name'], 'channelInfoSon');
-      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children');
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择商店',

package/package.json

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

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

@@ -6,6 +6,7 @@ import { handleTextOverflow, tableColumnsImage, handleTooltip } from '@/componen
 import { getSkuImg } from '@/utils/TableUtils';
 import { getEmployeeCode, getCurrentTargetBgId } from '@/utils/LocalstorageUtils';
 import { Image } from 'antd';
+import { isBoolean } from 'lodash';
 
 const hasDictSharingType =  getDictionarySource('UC000013')?.length;
 const sharingTypeDataList = hasDictSharingType && getDictionarySource('UC000013') || sharingType
@@ -50,17 +51,28 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       parentId: treeDataItem.parent,
       data: { ...treeDataItem },
       isLeaf: !haveChildren,
-      disabled: disabledJudge!==undefined? disabledJudge : haveChildren,
+      disabled: disabledJudge !== undefined ? isBoolean(disabledJudge) ? disabledJudge : disabledJudge(treeDataItem) : haveChildren,
       children: haveChildren ? treeDataItem[childrenKey].map((i: any) => mapSearchTree(i, resKeyValue, disabledJudge, childrenKey)) : [],
     };
   };
-  const formatTreeDataSource = (reData: any, position: number, changePosition: number,changeSearchForm: any,resKeyValue=['id', 'name'], childrenKey = 'children') => {
+  const formatTreeDataSource = (
+    reData: any, 
+    position: number, 
+    changePosition: number,
+    changeSearchForm: any,
+    resKeyValue=['id', 'name'], 
+    childrenKey = 'children',
+    nodeDisabledJudge?: (data: any) => boolean, // 树节点能不能选 函数判断
+  ) => {
     let data = reData && reData[position]?.data;
     let disabledJudge;
     if(data && typeof data === 'object' && !Array.isArray(data) && Object.keys(data).length > 0) {
       data = [data];
       disabledJudge=false
     }
+    if(nodeDisabledJudge) {
+      disabledJudge = nodeDisabledJudge;
+    }
     const formatData = (data &&
       Array.isArray(data) &&
       data.length &&
@@ -1875,7 +1887,6 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           optionFilterProp: 'children',
           filterOption: (input: string, option: { props: { children: string } }) =>
             option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
-          disabledJude: (data: any) => data['parentCode'] === '0',
           showCheckedStrategy: 'TreeSelect.SHOW_ALL',
         },
       } },
@@ -1893,7 +1904,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           optionFilterProp: 'children',
           filterOption: (input: string, option: { props: { children: string } }) =>
             option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
-          disabledJude: (data: any) => data['parent'] === '0',
+        
           showCheckedStrategy: 'TreeSelect.SHOW_ALL',
         },
       } },
@@ -1930,9 +1941,11 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         'qp-status-eq': 1,
       },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
     ]).then((x: any)=>{
+      const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
+      const areaDisabledJude = (data: any) => data['parent'] === '0'; // 所属营销区域 树节点不能点判断
       formatSource(x,0, 3, tableSearchForm);
-      formatTreeDataSource(x, 1, 4, tableSearchForm, ['id','name'], 'channelInfoSon')
-      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children')
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
+      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
     })
     modalTableProps = {
       modalTableTitle: '选择商店',