@bit-sun/business-component 1.1.20 → 1.1.23

package/dist/index.esm.js

@@ -2520,6 +2520,11 @@ var SearchSelect = function SearchSelect(props) {
       popvalue = _useState14[0],
       setPopValue = _useState14[1];
 
+  var _useState15 = useState(sourceName),
+      _useState16 = _slicedToArray(_useState15, 2),
+      uniqueValue = _useState16[0],
+      setUniqueValue = _useState16[1];
+
   var _useDebounceFn = useDebounceFn(function (v) {
     // 优化搜索参数 支持传多个
     var searchParams = {};
@@ -2546,51 +2551,51 @@ var SearchSelect = function SearchSelect(props) {
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
       form = _Form$useForm2[0];
 
-  var _useState15 = useState(true),
-      _useState16 = _slicedToArray(_useState15, 2),
-      caretLeftFlag = _useState16[0],
-      setCaretLeftFlag = _useState16[1];
-
-  var _useState17 = useState([]),
+  var _useState17 = useState(true),
       _useState18 = _slicedToArray(_useState17, 2),
-      tableData = _useState18[0],
-      setTableData = _useState18[1];
+      caretLeftFlag = _useState18[0],
+      setCaretLeftFlag = _useState18[1];
 
-  var _useState19 = useState({
+  var _useState19 = useState([]),
+      _useState20 = _slicedToArray(_useState19, 2),
+      tableData = _useState20[0],
+      setTableData = _useState20[1];
+
+  var _useState21 = useState({
     showQuickJumper: true,
     total: 0,
     current: 1,
     pageSize: tableInitPageSize
   }),
-      _useState20 = _slicedToArray(_useState19, 2),
-      tablePagination = _useState20[0],
-      setTablePagination = _useState20[1];
-
-  var _useState21 = useState([]),
       _useState22 = _slicedToArray(_useState21, 2),
-      selectedRowKeys = _useState22[0],
-      setSelectedRowKeys = _useState22[1];
+      tablePagination = _useState22[0],
+      setTablePagination = _useState22[1];
 
   var _useState23 = useState([]),
       _useState24 = _slicedToArray(_useState23, 2),
-      doubleArr = _useState24[0],
-      setDoubleArr = _useState24[1]; // 存放双数组的数组
+      selectedRowKeys = _useState24[0],
+      setSelectedRowKeys = _useState24[1];
 
-
-  var _useState25 = useState(false),
+  var _useState25 = useState([]),
       _useState26 = _slicedToArray(_useState25, 2),
-      checkedAll = _useState26[0],
-      setCheckedAll = _useState26[1];
+      doubleArr = _useState26[0],
+      setDoubleArr = _useState26[1]; // 存放双数组的数组
+
 
   var _useState27 = useState(false),
       _useState28 = _slicedToArray(_useState27, 2),
-      indeterminate = _useState28[0],
-      setIndeterminate = _useState28[1];
+      checkedAll = _useState28[0],
+      setCheckedAll = _useState28[1];
 
-  var _useState29 = useState({}),
+  var _useState29 = useState(false),
       _useState30 = _slicedToArray(_useState29, 2),
-      tableFormParams = _useState30[0],
-      setTableFormParams = _useState30[1]; // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
+      indeterminate = _useState30[0],
+      setIndeterminate = _useState30[1];
+
+  var _useState31 = useState({}),
+      _useState32 = _slicedToArray(_useState31, 2),
+      tableFormParams = _useState32[0],
+      setTableFormParams = _useState32[1]; // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
 
 
   var getData = function getData() {
@@ -2700,6 +2705,9 @@ var SearchSelect = function SearchSelect(props) {
       onChange(value);
     }
   }, [value]);
+  useEffect(function () {
+    makeUniqueValue();
+  }, [sourceName]);
 
   var showModal = function showModal() {
     getData({
@@ -2802,10 +2810,10 @@ var SearchSelect = function SearchSelect(props) {
   var onResetTable = function onResetTable() {
     form.resetFields();
     setTableFormParams({});
-    handleTableChange({
+    getData({
       pageSize: tableInitPageSize,
       currentPage: 1
-    });
+    }, 2);
   };
 
   var handleTableChange = function handleTableChange(pagination) {
@@ -2910,7 +2918,9 @@ var SearchSelect = function SearchSelect(props) {
 
 
   var makeUniqueValue = function makeUniqueValue() {
-    return ((1 + Math.random()) * 0x10000 | 0).toString(16);
+    var generateUnitKey = ((1 + Math.random()) * 0x10000 | 0).toString(16);
+    setUniqueValue(generateUnitKey);
+    return generateUnitKey;
   };
 
   var rowSelection = {
@@ -2998,7 +3008,7 @@ var SearchSelect = function SearchSelect(props) {
     className: 'search_select'
   }, /*#__PURE__*/React.createElement("div", {
     className: "search_select_show",
-    id: "search_select_div_".concat(makeUniqueValue())
+    id: "search_select_div_".concat(uniqueValue)
   }, /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({
     virtual: true,
     labelInValue: labelInValue,
@@ -3044,7 +3054,7 @@ var SearchSelect = function SearchSelect(props) {
     onPopupScroll: SelectScroll
   }, currentSelectProps), {}, {
     getPopupContainer: function getPopupContainer() {
-      return document.getElementById("search_select_div_".concat(makeUniqueValue()));
+      return document.getElementById("search_select_div_".concat(uniqueValue));
     },
     style: {
       width: 'calc(100% - 30px)'
@@ -3259,7 +3269,7 @@ function commonFun(type, prefixUrl) {
     var haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
     return {
       title: treeDataItem[resKeyValue[1]],
-      key: treeDataItem[resKeyValue[0]],
+      value: treeDataItem[resKeyValue[0]],
       parentId: treeDataItem.parent,
       data: _objectSpread2({}, treeDataItem),
       isLeaf: !haveChildren,

package/dist/index.js

@@ -2531,6 +2531,11 @@ var SearchSelect = function SearchSelect(props) {
       popvalue = _useState14[0],
       setPopValue = _useState14[1];
 
+  var _useState15 = React.useState(sourceName),
+      _useState16 = _slicedToArray(_useState15, 2),
+      uniqueValue = _useState16[0],
+      setUniqueValue = _useState16[1];
+
   var _useDebounceFn = ahooks.useDebounceFn(function (v) {
     // 优化搜索参数 支持传多个
     var searchParams = {};
@@ -2557,51 +2562,51 @@ var SearchSelect = function SearchSelect(props) {
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
       form = _Form$useForm2[0];
 
-  var _useState15 = React.useState(true),
-      _useState16 = _slicedToArray(_useState15, 2),
-      caretLeftFlag = _useState16[0],
-      setCaretLeftFlag = _useState16[1];
-
-  var _useState17 = React.useState([]),
+  var _useState17 = React.useState(true),
       _useState18 = _slicedToArray(_useState17, 2),
-      tableData = _useState18[0],
-      setTableData = _useState18[1];
+      caretLeftFlag = _useState18[0],
+      setCaretLeftFlag = _useState18[1];
 
-  var _useState19 = React.useState({
+  var _useState19 = React.useState([]),
+      _useState20 = _slicedToArray(_useState19, 2),
+      tableData = _useState20[0],
+      setTableData = _useState20[1];
+
+  var _useState21 = React.useState({
     showQuickJumper: true,
     total: 0,
     current: 1,
     pageSize: tableInitPageSize
   }),
-      _useState20 = _slicedToArray(_useState19, 2),
-      tablePagination = _useState20[0],
-      setTablePagination = _useState20[1];
-
-  var _useState21 = React.useState([]),
       _useState22 = _slicedToArray(_useState21, 2),
-      selectedRowKeys = _useState22[0],
-      setSelectedRowKeys = _useState22[1];
+      tablePagination = _useState22[0],
+      setTablePagination = _useState22[1];
 
   var _useState23 = React.useState([]),
       _useState24 = _slicedToArray(_useState23, 2),
-      doubleArr = _useState24[0],
-      setDoubleArr = _useState24[1]; // 存放双数组的数组
+      selectedRowKeys = _useState24[0],
+      setSelectedRowKeys = _useState24[1];
 
-
-  var _useState25 = React.useState(false),
+  var _useState25 = React.useState([]),
       _useState26 = _slicedToArray(_useState25, 2),
-      checkedAll = _useState26[0],
-      setCheckedAll = _useState26[1];
+      doubleArr = _useState26[0],
+      setDoubleArr = _useState26[1]; // 存放双数组的数组
+
 
   var _useState27 = React.useState(false),
       _useState28 = _slicedToArray(_useState27, 2),
-      indeterminate = _useState28[0],
-      setIndeterminate = _useState28[1];
+      checkedAll = _useState28[0],
+      setCheckedAll = _useState28[1];
 
-  var _useState29 = React.useState({}),
+  var _useState29 = React.useState(false),
       _useState30 = _slicedToArray(_useState29, 2),
-      tableFormParams = _useState30[0],
-      setTableFormParams = _useState30[1]; // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
+      indeterminate = _useState30[0],
+      setIndeterminate = _useState30[1];
+
+  var _useState31 = React.useState({}),
+      _useState32 = _slicedToArray(_useState31, 2),
+      tableFormParams = _useState32[0],
+      setTableFormParams = _useState32[1]; // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
 
 
   var getData = function getData() {
@@ -2711,6 +2716,9 @@ var SearchSelect = function SearchSelect(props) {
       onChange(value);
     }
   }, [value]);
+  React.useEffect(function () {
+    makeUniqueValue();
+  }, [sourceName]);
 
   var showModal = function showModal() {
     getData({
@@ -2813,10 +2821,10 @@ var SearchSelect = function SearchSelect(props) {
   var onResetTable = function onResetTable() {
     form.resetFields();
     setTableFormParams({});
-    handleTableChange({
+    getData({
       pageSize: tableInitPageSize,
       currentPage: 1
-    });
+    }, 2);
   };
 
   var handleTableChange = function handleTableChange(pagination) {
@@ -2921,7 +2929,9 @@ var SearchSelect = function SearchSelect(props) {
 
 
   var makeUniqueValue = function makeUniqueValue() {
-    return ((1 + Math.random()) * 0x10000 | 0).toString(16);
+    var generateUnitKey = ((1 + Math.random()) * 0x10000 | 0).toString(16);
+    setUniqueValue(generateUnitKey);
+    return generateUnitKey;
   };
 
   var rowSelection = {
@@ -3009,7 +3019,7 @@ var SearchSelect = function SearchSelect(props) {
     className: 'search_select'
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "search_select_show",
-    id: "search_select_div_".concat(makeUniqueValue())
+    id: "search_select_div_".concat(uniqueValue)
   }, /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({
     virtual: true,
     labelInValue: labelInValue,
@@ -3055,7 +3065,7 @@ var SearchSelect = function SearchSelect(props) {
     onPopupScroll: SelectScroll
   }, currentSelectProps), {}, {
     getPopupContainer: function getPopupContainer() {
-      return document.getElementById("search_select_div_".concat(makeUniqueValue()));
+      return document.getElementById("search_select_div_".concat(uniqueValue));
     },
     style: {
       width: 'calc(100% - 30px)'
@@ -3270,7 +3280,7 @@ function commonFun(type, prefixUrl) {
     var haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
     return {
       title: treeDataItem[resKeyValue[1]],
-      key: treeDataItem[resKeyValue[0]],
+      value: treeDataItem[resKeyValue[0]],
       parentId: treeDataItem.parent,
       data: _objectSpread2({}, treeDataItem),
       isLeaf: !haveChildren,

package/package.json

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

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

@@ -100,7 +100,7 @@ export function commonFun (type?: string, prefixUrl: any) {
     const haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
     return {
       title: treeDataItem[resKeyValue[1]],
-      key: treeDataItem[resKeyValue[0]],
+      value: treeDataItem[resKeyValue[0]],
       parentId: treeDataItem.parent,
       data: { ...treeDataItem },
       isLeaf: !haveChildren,

package/src/components/SearchSelect/index.tsx

@@ -48,6 +48,7 @@ const SearchSelect = (props: any) => {
   const [searchValue, setSearchValue] = useState('');
   const [isModalVisible, setIsModalVisible] = useState(false);
   const [popvalue, setPopValue] = useState(initVal);
+  const [uniqueValue, setUniqueValue] = useState(sourceName)
   const { run } = useDebounceFn(
     (v?: any) => {
       // 优化搜索参数 支持传多个
@@ -183,6 +184,10 @@ const SearchSelect = (props: any) => {
     }
   }, [value]);
 
+  useEffect(() => {
+    makeUniqueValue();
+  }, [sourceName])
+
   const showModal = () => {
     getData({ pageSize: tableInitPageSize, currentPage: 1 }, 2)
     setIsModalVisible(true);
@@ -250,7 +255,7 @@ const SearchSelect = (props: any) => {
   const onResetTable = () => {
     form.resetFields();
     setTableFormParams({});
-    handleTableChange({ pageSize: tableInitPageSize, currentPage: 1 })
+    getData({ pageSize: tableInitPageSize, currentPage: 1 }, 2)
   }
 
   const handleTableChange = (pagination) => {
@@ -345,7 +350,9 @@ const SearchSelect = (props: any) => {
 
   // 生成唯一值
   const makeUniqueValue = () => {
-    return (((1+Math.random())*0x10000)|0).toString(16);
+    const generateUnitKey = (((1+Math.random())*0x10000)|0).toString(16);
+    setUniqueValue(generateUnitKey);
+    return generateUnitKey;
   }
 
   const rowSelection = {
@@ -403,7 +410,7 @@ const SearchSelect = (props: any) => {
 
   return (
     <div className={'search_select'}>
-      <div className="search_select_show" id={`search_select_div_${makeUniqueValue()}`}>
+      <div className="search_select_show" id={`search_select_div_${uniqueValue}`}>
         <Select
           virtual
           labelInValue={labelInValue}
@@ -437,7 +444,7 @@ const SearchSelect = (props: any) => {
           }
           onPopupScroll={SelectScroll}
           {...currentSelectProps}
-          getPopupContainer={() => document.getElementById(`search_select_div_${makeUniqueValue()}`)}
+          getPopupContainer={() => document.getElementById(`search_select_div_${uniqueValue}`)}
           style={{ width: 'calc(100% - 30px)' }}
           placeholder="请选择"
         >