@bit-sun/business-component 2.3.17 → 2.3.18

package/dist/index.esm.js

@@ -9725,7 +9725,7 @@ function getStorageVale(storageKeyString) {
   return "";
 }
 
-var _excluded$5 = ["ctx", "value", "valueName", "onChange", "onChangeName", "placeholder", "remoteSource", "initialValue", "treeCheckable", "showSearch", "maxTagCount", "multiple", "isChoose", "mode", "getPopupContainer", "labelInValue", "showArrow", "allowClear", "showCheckedStrategy", "style", "getTreeData", "disabled"];
+var _excluded$5 = ["ctx", "value", "valueName", "onChange", "onChangeName", "placeholder", "remoteSource", "initialValue", "treeCheckable", "showSearch", "maxTagCount", "multiple", "isChoose", "rootDisabled", "mode", "getPopupContainer", "labelInValue", "showArrow", "allowClear", "showCheckedStrategy", "style", "getTreeData", "disabled"];
 var TreeSearchSelect = function TreeSearchSelect(props) {
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -9749,6 +9749,8 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
     multiple = _props$multiple === void 0 ? false : _props$multiple,
     _props$isChoose = props.isChoose,
     isChoose = _props$isChoose === void 0 ? false : _props$isChoose,
+    _props$rootDisabled = props.rootDisabled,
+    rootDisabled = _props$rootDisabled === void 0 ? false : _props$rootDisabled,
     mode = props.mode,
     _getPopupContainer = props.getPopupContainer,
     _props$labelInValue = props.labelInValue,
@@ -9775,7 +9777,8 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
     _remoteSource$initial = remoteSource.initialParams,
     initialParams = _remoteSource$initial === void 0 ? {} : _remoteSource$initial;
   var mapSearchTree = function mapSearchTree(treeDataItem) {
-    var haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
+    var haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0; // 盘算是否为父节点
+    var isRoot = (treeDataItem === null || treeDataItem === void 0 ? void 0 : treeDataItem.id) == '0'; // 判断是否为根节点
     return {
       title: treeDataItem[resKeyValue[1]],
       key: treeDataItem[resKeyValue[0]],
@@ -9783,17 +9786,20 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
       parentId: treeDataItem.parent,
       data: _objectSpread2({}, treeDataItem),
       isLeaf: !haveChildren,
-      disabled: isDisabled(haveChildren),
+      disabled: isDisabled(haveChildren, isRoot),
       children: haveChildren ? treeDataItem.children.map(function (i) {
         return mapSearchTree(i);
       }) : []
     };
   };
-  var isDisabled = function isDisabled(children) {
+  var isDisabled = function isDisabled(isParent, isRoot) {
     if (isChoose) {
+      if (rootDisabled && isRoot) {
+        return rootDisabled;
+      }
       return false;
     }
-    return children;
+    return isParent;
   };
   /* 实时查询   但是目前用的直接是完整数据源, 所以没有使用 */
   var handleSearch = function handleSearch(q) {
@@ -9866,10 +9872,53 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
       return _formatResult;
     }
   };
+  var parallelData = function parallelData(data, result) {
+    data.forEach(function (i) {
+      result.push(i);
+      if (i.children) {
+        parallelData(i.children, result);
+      }
+    });
+    return result;
+  };
+  var getSelectItem = function getSelectItem(tData, selectValue) {
+    var handleList = tData || [];
+    var result = [];
+    if (labelInValue) {
+      result = multiple || treeCheckable ? (selectValue === null || selectValue === void 0 ? void 0 : selectValue.map(function (i) {
+        if (handleList.some(function (s) {
+          return s.key == i.value;
+        })) {
+          return handleList.find(function (s) {
+            return s.key == i.value;
+          });
+        }
+      })) || [] : (handleList === null || handleList === void 0 ? void 0 : handleList.find(function (s) {
+        return s.key == (selectValue === null || selectValue === void 0 ? void 0 : selectValue.value);
+      })) || {};
+    } else {
+      var cValue = _.get(selectValue === null || selectValue === void 0 ? void 0 : selectValue[0], 'value', selectValue);
+      result = multiple || treeCheckable ? (selectValue === null || selectValue === void 0 ? void 0 : selectValue.map(function (i) {
+        if (handleList.some(function (s) {
+          return s.key == i;
+        })) {
+          return handleList.find(function (s) {
+            return s.key == i;
+          });
+        }
+      })) || [] : (handleList === null || handleList === void 0 ? void 0 : handleList.find(function (s) {
+        return s.key == cValue;
+      })) || {};
+    }
+    return result;
+  };
   var handleChange = function handleChange(data, dataName) {
     var _ctx$form2;
     var handleData = formatData(data);
-    onChange(handleData, data);
+    // 获取选中树节点当条数据，并返回给调用业务
+    var parallelTreeData = parallelData(treeData, []);
+    var currentItem = getSelectItem(parallelTreeData, data);
+    onChange(handleData, data, currentItem, parallelTreeData);
     onChangeName && onChangeName(dataName);
     getTreeData && getTreeData(treeData); // 把树节点暴露出去
     ctx === null || ctx === void 0 ? void 0 : (_ctx$form2 = ctx.form) === null || _ctx$form2 === void 0 ? void 0 : _ctx$form2.setFieldValue(ctx.name, handleData);

package/dist/index.js

@@ -9744,7 +9744,7 @@ function getStorageVale(storageKeyString) {
   return "";
 }
 
-var _excluded$5 = ["ctx", "value", "valueName", "onChange", "onChangeName", "placeholder", "remoteSource", "initialValue", "treeCheckable", "showSearch", "maxTagCount", "multiple", "isChoose", "mode", "getPopupContainer", "labelInValue", "showArrow", "allowClear", "showCheckedStrategy", "style", "getTreeData", "disabled"];
+var _excluded$5 = ["ctx", "value", "valueName", "onChange", "onChangeName", "placeholder", "remoteSource", "initialValue", "treeCheckable", "showSearch", "maxTagCount", "multiple", "isChoose", "rootDisabled", "mode", "getPopupContainer", "labelInValue", "showArrow", "allowClear", "showCheckedStrategy", "style", "getTreeData", "disabled"];
 var TreeSearchSelect = function TreeSearchSelect(props) {
   var _useState = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -9768,6 +9768,8 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
     multiple = _props$multiple === void 0 ? false : _props$multiple,
     _props$isChoose = props.isChoose,
     isChoose = _props$isChoose === void 0 ? false : _props$isChoose,
+    _props$rootDisabled = props.rootDisabled,
+    rootDisabled = _props$rootDisabled === void 0 ? false : _props$rootDisabled,
     mode = props.mode,
     _getPopupContainer = props.getPopupContainer,
     _props$labelInValue = props.labelInValue,
@@ -9794,7 +9796,8 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
     _remoteSource$initial = remoteSource.initialParams,
     initialParams = _remoteSource$initial === void 0 ? {} : _remoteSource$initial;
   var mapSearchTree = function mapSearchTree(treeDataItem) {
-    var haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
+    var haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0; // 盘算是否为父节点
+    var isRoot = (treeDataItem === null || treeDataItem === void 0 ? void 0 : treeDataItem.id) == '0'; // 判断是否为根节点
     return {
       title: treeDataItem[resKeyValue[1]],
       key: treeDataItem[resKeyValue[0]],
@@ -9802,17 +9805,20 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
       parentId: treeDataItem.parent,
       data: _objectSpread2({}, treeDataItem),
       isLeaf: !haveChildren,
-      disabled: isDisabled(haveChildren),
+      disabled: isDisabled(haveChildren, isRoot),
       children: haveChildren ? treeDataItem.children.map(function (i) {
         return mapSearchTree(i);
       }) : []
     };
   };
-  var isDisabled = function isDisabled(children) {
+  var isDisabled = function isDisabled(isParent, isRoot) {
     if (isChoose) {
+      if (rootDisabled && isRoot) {
+        return rootDisabled;
+      }
       return false;
     }
-    return children;
+    return isParent;
   };
   /* 实时查询   但是目前用的直接是完整数据源, 所以没有使用 */
   var handleSearch = function handleSearch(q) {
@@ -9885,10 +9891,53 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
       return _formatResult;
     }
   };
+  var parallelData = function parallelData(data, result) {
+    data.forEach(function (i) {
+      result.push(i);
+      if (i.children) {
+        parallelData(i.children, result);
+      }
+    });
+    return result;
+  };
+  var getSelectItem = function getSelectItem(tData, selectValue) {
+    var handleList = tData || [];
+    var result = [];
+    if (labelInValue) {
+      result = multiple || treeCheckable ? (selectValue === null || selectValue === void 0 ? void 0 : selectValue.map(function (i) {
+        if (handleList.some(function (s) {
+          return s.key == i.value;
+        })) {
+          return handleList.find(function (s) {
+            return s.key == i.value;
+          });
+        }
+      })) || [] : (handleList === null || handleList === void 0 ? void 0 : handleList.find(function (s) {
+        return s.key == (selectValue === null || selectValue === void 0 ? void 0 : selectValue.value);
+      })) || {};
+    } else {
+      var cValue = ___default['default'].get(selectValue === null || selectValue === void 0 ? void 0 : selectValue[0], 'value', selectValue);
+      result = multiple || treeCheckable ? (selectValue === null || selectValue === void 0 ? void 0 : selectValue.map(function (i) {
+        if (handleList.some(function (s) {
+          return s.key == i;
+        })) {
+          return handleList.find(function (s) {
+            return s.key == i;
+          });
+        }
+      })) || [] : (handleList === null || handleList === void 0 ? void 0 : handleList.find(function (s) {
+        return s.key == cValue;
+      })) || {};
+    }
+    return result;
+  };
   var handleChange = function handleChange(data, dataName) {
     var _ctx$form2;
     var handleData = formatData(data);
-    onChange(handleData, data);
+    // 获取选中树节点当条数据，并返回给调用业务
+    var parallelTreeData = parallelData(treeData, []);
+    var currentItem = getSelectItem(parallelTreeData, data);
+    onChange(handleData, data, currentItem, parallelTreeData);
     onChangeName && onChangeName(dataName);
     getTreeData && getTreeData(treeData); // 把树节点暴露出去
     ctx === null || ctx === void 0 ? void 0 : (_ctx$form2 = ctx.form) === null || _ctx$form2 === void 0 ? void 0 : _ctx$form2.setFieldValue(ctx.name, handleData);

package/package.json

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

package/src/components/Business/TreeSearchSelect/index.md

@@ -26,6 +26,8 @@ export default () => {
   const props = {
     mode: 'create',
     value,
+    treeCheckable: false,
+    rootDisabled: true,
     onChange: (v) => {
       setValue(v)
     },

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

@@ -19,7 +19,8 @@ const TreeSearchSelect = (props: any) => {
     showSearch = true,
     maxTagCount = 1,
     multiple = false,
-    isChoose = false,
+    isChoose = false, // 默认父节点不可选；传true则不限制
+    rootDisabled = false, // 默认根节点可选
     mode,
     getPopupContainer,
     labelInValue = false,
@@ -41,7 +42,8 @@ const TreeSearchSelect = (props: any) => {
   } = remoteSource;
 
   const mapSearchTree = (treeDataItem: any) => {
-    const haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
+    const haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0; // 盘算是否为父节点
+    const isRoot = treeDataItem?.id == '0'; // 判断是否为根节点
     return {
       title: treeDataItem[resKeyValue[1]],
       key: treeDataItem[resKeyValue[0]],
@@ -49,16 +51,19 @@ const TreeSearchSelect = (props: any) => {
       parentId: treeDataItem.parent,
       data: { ...treeDataItem },
       isLeaf: !haveChildren,
-      disabled: isDisabled(haveChildren),
+      disabled: isDisabled(haveChildren,isRoot),
       children: haveChildren ? treeDataItem.children.map((i: any) => mapSearchTree(i)) : [],
     };
   };
 
-  const isDisabled = (children: any) => {
+  const isDisabled = (isParent: boolean,isRoot: boolean) => {
     if (isChoose) {
+      if(rootDisabled && isRoot){
+        return rootDisabled
+      }
       return false;
     }
-    return children;
+    return isParent;
   }
 
   /* 实时查询   但是目前用的直接是完整数据源, 所以没有使用 */
@@ -97,9 +102,40 @@ const TreeSearchSelect = (props: any) => {
       return formatResult
     }
   }
+  const parallelData = (data: any,result: any) => {
+    data.forEach((i: any) => {
+      result.push(i);
+      if (i.children) {
+        parallelData(i.children, result);
+      }
+    });
+    return result;
+  }
+  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)){
+          return handleList.find((s: any) => s.key == i.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)){
+          return handleList.find((s: any) => s.key == i)
+        }
+      }) || []) : (handleList?.find((s: any) => s.key == cValue)||{})
+    }
+    return result;
+  }
   const handleChange = (data: any, dataName: any) => {
     const handleData = formatData(data);
-    onChange(handleData,data);
+    // 获取选中树节点当条数据，并返回给调用业务
+    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);