@bit-sun/business-component 2.2.2 → 2.2.4

package/dist/index.esm.js

@@ -14316,12 +14316,30 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
       };
     }());
   };
+  var formatData = function formatData(value) {
+    if (labelInValue) {
+      var formatResult = multiple ? value.map(function (i) {
+        return _objectSpread2(_objectSpread2({}, i), {}, {
+          key: i.value
+        });
+      }) : _objectSpread2(_objectSpread2({}, value), {}, {
+        key: value === null || value === void 0 ? void 0 : value.value
+      });
+      return formatResult;
+    } else {
+      var _formatResult = multiple ? value.map(function (i) {
+        return (i === null || i === void 0 ? void 0 : i.value) || i;
+      }) : _.get(value[0], 'value') || value;
+      return _formatResult;
+    }
+  };
   var handleChange = function handleChange(data, dataName) {
     var _ctx$form2;
-    onChange(data);
+    var handleData = formatData(data);
+    onChange(handleData, data);
     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, data);
+    ctx === null || ctx === void 0 ? void 0 : (_ctx$form2 = ctx.form) === null || _ctx$form2 === void 0 ? void 0 : _ctx$form2.setFieldValue(ctx.name, handleData);
   };
   useEffect(function () {
     handleSearch(initialValue);
@@ -20069,10 +20087,6 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         var replaceRouter = routerArray.filter(function (itemRoute) {
           return pathToRegexp(itemRoute.key || '').test(route.pathname);
         })[0];
-        if (!istParent) {
-          if (route.pathname === '/') return;
-          window.parent.postMessage("/parent/".concat(itemPath).concat(route.pathname), '*');
-        }
         var currentKey = '';
         if (replaceRouter && replaceRouter.isOnlyOnePage) {
           // 处理中英文和特殊字符
@@ -20080,6 +20094,10 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         } else {
           currentKey = decodeURIComponent(route.pathname + _this2.parseQueryString(route.search));
         }
+        if (!istParent) {
+          if (route.pathname === '/') return;
+          window.parent.postMessage("/parent/".concat(itemPath).concat(currentKey), '*');
+        }
         // 防止出错
         if (listenRouterKey.length !== listenRouterState.length) {
           listenRouterState.forEach(function (item, index) {

package/dist/index.js

@@ -14334,12 +14334,30 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
       };
     }());
   };
+  var formatData = function formatData(value) {
+    if (labelInValue) {
+      var formatResult = multiple ? value.map(function (i) {
+        return _objectSpread2(_objectSpread2({}, i), {}, {
+          key: i.value
+        });
+      }) : _objectSpread2(_objectSpread2({}, value), {}, {
+        key: value === null || value === void 0 ? void 0 : value.value
+      });
+      return formatResult;
+    } else {
+      var _formatResult = multiple ? value.map(function (i) {
+        return (i === null || i === void 0 ? void 0 : i.value) || i;
+      }) : ___default['default'].get(value[0], 'value') || value;
+      return _formatResult;
+    }
+  };
   var handleChange = function handleChange(data, dataName) {
     var _ctx$form2;
-    onChange(data);
+    var handleData = formatData(data);
+    onChange(handleData, data);
     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, data);
+    ctx === null || ctx === void 0 ? void 0 : (_ctx$form2 = ctx.form) === null || _ctx$form2 === void 0 ? void 0 : _ctx$form2.setFieldValue(ctx.name, handleData);
   };
   React.useEffect(function () {
     handleSearch(initialValue);
@@ -20087,10 +20105,6 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         var replaceRouter = routerArray.filter(function (itemRoute) {
           return pathToRegexp(itemRoute.key || '').test(route.pathname);
         })[0];
-        if (!istParent) {
-          if (route.pathname === '/') return;
-          window.parent.postMessage("/parent/".concat(itemPath).concat(route.pathname), '*');
-        }
         var currentKey = '';
         if (replaceRouter && replaceRouter.isOnlyOnePage) {
           // 处理中英文和特殊字符
@@ -20098,6 +20112,10 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         } else {
           currentKey = decodeURIComponent(route.pathname + _this2.parseQueryString(route.search));
         }
+        if (!istParent) {
+          if (route.pathname === '/') return;
+          window.parent.postMessage("/parent/".concat(itemPath).concat(currentKey), '*');
+        }
         // 防止出错
         if (listenRouterKey.length !== listenRouterState.length) {
           listenRouterState.forEach(function (item, index) {

package/package.json

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

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

@@ -375,11 +375,6 @@ class BasicLayout extends React.PureComponent {
         pathToRegexp(itemRoute.key || '').test(route.pathname),
       )[0];
 
-      if (!istParent) {
-        if (route.pathname === '/') return;
-        window.parent.postMessage(`/parent/${itemPath}${route.pathname}`, '*');
-      }
-
       let currentKey = '';
 
       if (replaceRouter && replaceRouter.isOnlyOnePage) {
@@ -391,6 +386,11 @@ class BasicLayout extends React.PureComponent {
         );
       }
 
+      if (!istParent) {
+        if (route.pathname === '/') return;
+        window.parent.postMessage(`/parent/${itemPath}${currentKey}`, '*');
+      }
+
       // 防止出错
       if (listenRouterKey.length !== listenRouterState.length) {
         listenRouterState.forEach((item, index) => {

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

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { TreeSelect, Tooltip, Tag } from 'antd';
 import axios from 'axios';
 import { stringify } from 'querystring';
+import _ from "lodash"
 
 const TreeSearchSelect = (props: any) => {
   const [treeData, setTreeData] = useState([]);
@@ -85,11 +86,21 @@ const TreeSearchSelect = (props: any) => {
     });
   };
 
+  const formatData = (value: any) => {
+    if (labelInValue) {
+      const formatResult = multiple ? value.map((i: any) => ({...i, key: i.value})) : { ...value, key: value?.value };
+      return formatResult
+    } else {
+      const formatResult = multiple ? value.map((i: any) => (i?.value || i)) : (_.get(value[0], 'value') || value)
+      return formatResult
+    }
+  }
   const handleChange = (data: any, dataName: any) => {
-    onChange(data);
+    const handleData = formatData(data);
+    onChange(handleData,data);
     onChangeName && onChangeName(dataName);
     getTreeData && getTreeData(treeData); // 把树节点暴露出去
-    ctx?.form?.setFieldValue(ctx.name, data);
+    ctx?.form?.setFieldValue(ctx.name, handleData);
   };
 
   useEffect(() => {