@bit-sun/business-component 4.2.0-alpha.8 → 4.2.0-alpha.9

package/.umirc.ts

@@ -35,7 +35,7 @@ export default defineConfig({
   proxy: {
     '/bop/api/': {
       // target: 'http://bitsun.product.app.business-operation-platform.v1-dev:8050', // 开发环境
-      target: 'https://occp-dev.xtepchina.com/', // 测试环境
+      target: 'https://ocean-test.bitsun-inc.com/', // 测试环境
       // target: 'http://yxzttest.yangzijiang.com/', // 扬子江测试环境
       // target: 'http://yxzt.yangzijiang.com/', // 扬子江测试环境
       changeOrigin: true,
@@ -48,37 +48,37 @@ export default defineConfig({
       // target: 'http://bitsun.product.app.business-operation-platform.v1-dev:8050', // 开发环境
       // 英伦
       // target: 'http://47.100.87.54:9102/', // 开发环境
-      target: 'https://occp-dev.xtepchina.com/', // 测试环境
+      target: 'https://ocean-test.bitsun-inc.com/', // 测试环境
       // target: 'http://www.i-baby.net/', // 生产
       changeOrigin: true,
       // pathRewrite: { '^/wms-ops/': '/wms-ops/' }, // 开发环境
     },
     '/user/': {
-      target: 'https://occp-dev.xtepchina.com/', // 开发环境
+      target: 'https://ocean-test.bitsun-inc.com/', // 开发环境
       changeOrigin: true,
     },
     '/drp-ops/': {
-      target: 'https://occp-dev.xtepchina.com/', // 开发环境
+      target: 'https://ocean-test.bitsun-inc.com/', // 开发环境
       changeOrigin: true,
     },
     '/channel-manage/': {
-      target: 'https://occp-dev.xtepchina.com/', // 开发环境
+      target: 'https://ocean-test.bitsun-inc.com/', // 开发环境
       changeOrigin: true,
     },
     '/items/': {
-      target: 'https://occp-dev.xtepchina.com/', // 开发环境
+      target: 'https://ocean-test.bitsun-inc.com/', // 开发环境
       changeOrigin: true,
     },
     '/stock/': {
-      target: 'https://occp-dev.xtepchina.com/', // 开发环境
+      target: 'https://ocean-test.bitsun-inc.com/', // 开发环境
       changeOrigin: true,
     },
     '/basic/': {
-      target: 'https://occp-dev.xtepchina.com/', // 开发环境
+      target: 'https://ocean-test.bitsun-inc.com/', // 开发环境
       changeOrigin: true,
     },
     '/srm-ops/': {
-      target: 'https://occp-dev.xtepchina.com/', // 开发环境
+      target: 'https://ocean-test.bitsun-inc.com/', // 开发环境
       changeOrigin: true,
     },
   },

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, isBoolean, debounce, cloneDeep as cloneDeep$1, throttle, isEmpty } from 'lodash';
+import _, { omit, uniqBy, escapeRegExp, isNil, cloneDeep, isEmpty, isBoolean, debounce, throttle } 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';
@@ -21,7 +21,7 @@ import { SortableHandle, SortableElement, SortableContainer } from 'react-sortab
 import { arrayMoveImmutable } from 'array-move';
 import classNames from 'classnames';
 import ProLayout from '@ant-design/pro-layout';
-import cloneDeep from 'lodash/cloneDeep';
+import cloneDeep$1 from 'lodash/cloneDeep';
 import debounce$1 from 'lodash/debounce';
 import { DndProvider, useDrop, useDrag } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
@@ -5743,6 +5743,29 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       removeListener();
     };
   }, [isModalVisible]);
+  var safeJSONParse = function safeJSONParse(str) {
+    try {
+      return JSON.parse(str);
+    } catch (error) {
+      console.warn('JSON解析失败:', error);
+      return null;
+    }
+  };
+  // 获取回显的value值 如果开启了搜索条件 则需要过滤掉搜索条件
+  var getShowValue = function getShowValue(value) {
+    var newValue = cloneDeep(value);
+    if (selectProps.useSearchCondition && newValue) {
+      // 回显的时候 把搜索项的内容去掉
+      if (selectMode) {
+        newValue = newValue.filter(function (item) {
+          var parsedItem = safeJSONParse(decodeURIComponent(item));
+          // 过滤掉JSON对象（搜索条件），保留非JSON数据（实际选择项）
+          return !parsedItem || !(parsedItem && _typeof(parsedItem) === 'object' && !Array.isArray(parsedItem));
+        });
+      }
+    }
+    return newValue;
+  };
   var showModal = function showModal() {
     if (sDisabled) return;
     setSelectOpen(false);
@@ -5752,12 +5775,13 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     // 回显
     if (value) {
       if (selectMode) {
-        setSelectedRowKeys(labelInValue ? value.map(function (i) {
+        var newValue = getShowValue(value);
+        setSelectedRowKeys(labelInValue ? newValue.map(function (i) {
           return i.key;
-        }) : value);
-        setSelectedRows(labelInValue ? value.map(function (i) {
+        }) : newValue);
+        setSelectedRows(labelInValue ? newValue.map(function (i) {
           return _defineProperty(_defineProperty(_defineProperty({}, mappingValueField, i.key), "value", i.key), "text", i.label);
-        }) : value.map(function (i) {
+        }) : newValue.map(function (i) {
           return _defineProperty(_defineProperty({}, mappingValueField, i), "value", i);
         }));
         setPopValue(labelInValue ? value.map(function (i) {
@@ -5794,7 +5818,24 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       formaData(selectedValue, source);
     } else {
       var formatResult = selectMode ? [] : null;
-      onChange(formatResult, selectedValue);
+      // 支持使用查询条件 筛选
+      if (selectProps.useSearchCondition) {
+        var formValue = form.getFieldsValue();
+        // 一次性处理数据转换和过滤
+        var processedFormValue = Object.keys(formValue).reduce(function (acc, key) {
+          var value = formValue[key];
+          // 过滤空值（确保trim函数存在）
+          var trimmedValue = typeof value === 'string' ? value.trim() : value;
+          if (trimmedValue && trimmedValue !== '') {
+            acc[key] = trimmedValue;
+          }
+          return acc;
+        }, {});
+        var result = encodeURIComponent(JSON.stringify(processedFormValue));
+        onChange(isEmpty(processedFormValue) ? formatResult : selectMode ? [result] : result, selectedValue);
+      } else {
+        onChange(formatResult, selectedValue);
+      }
     }
   };
   var handleOk = function handleOk() {
@@ -5824,7 +5865,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
         setConfirmLoading(false);
       });
     } else {
-      handleSelectOver(popvalue);
+      handleSelectOver(selectedRows.length ? popvalue : []);
       handleCancel();
     }
   };
@@ -6450,9 +6491,25 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     confirmLoading: confirmLoading,
     onOk: handleOk,
     onCancel: handleCancel,
-    footer: selectMode || (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalRadioNeedFooter) ? [/*#__PURE__*/React$1.createElement(Button, {
+    footer: selectMode || (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalRadioNeedFooter) ? [selectProps.useSearchCondition ? (/*#__PURE__*/React$1.createElement("div", {
+      key: "instructions",
+      style: {
+        position: 'absolute',
+        width: 'calc(100% - 500px)',
+        textAlign: 'left'
+      }
+    }, /*#__PURE__*/React$1.createElement("div", null, "\u64CD\u4F5C\u8BF4\u660E\uFF1A\u7ED3\u679C\u96C6\u8FC7\u591A\u65F6\uFF0C\u53EF\u65E0\u9700\u9009\u62E9\u5177\u4F53\u6570\u636E\uFF0C\u7CFB\u7EDF\u5C06\u76F4\u63A5\u6309\u5DF2\u8BBE\u7B5B\u9009\u6761\u4EF6\u67E5\u8BE2"), /*#__PURE__*/React$1.createElement(Input, {
+      style: {
+        marginTop: '3px',
+        height: '22px'
+      },
+      value: value
+    }))) : /*#__PURE__*/React$1.createElement(React$1.Fragment, null), /*#__PURE__*/React$1.createElement(Button, {
       key: "back",
-      onClick: handleCancel
+      onClick: handleCancel,
+      style: {
+        margin: selectProps.useSearchCondition ? '10px 0' : 0
+      }
     }, "\u53D6\u6D88"), /*#__PURE__*/React$1.createElement(Button, {
       key: "submit",
       type: "primary",
@@ -20215,7 +20272,7 @@ var searchMenuData = function searchMenuData(router, name, callBack) {
   }
   var btnAuth = JSON.parse(localStorage.getItem(getMenuAuthDataKey()) || '[]');
   var resultList = [];
-  var newRouter = cloneDeep(router);
+  var newRouter = cloneDeep$1(router);
   var _deep = function deep(router) {
     if (router && Array.isArray(router)) {
       router.forEach(function (item) {
@@ -21156,7 +21213,7 @@ var GlobalHeaderCom = function GlobalHeaderCom(props) {
   };
   var initRoute = function initRoute(router, name) {
     var resultList = [];
-    var newRouter = cloneDeep$1(router);
+    var newRouter = cloneDeep(router);
     var btnAuth = JSON.parse(localStorage.getItem(getMenuAuthDataKey()) || '[]');
     var _deep = function deep(router) {
       if (router && Array.isArray(router)) {

package/dist/index.js

@@ -5766,6 +5766,29 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
       removeListener();
     };
   }, [isModalVisible]);
+  var safeJSONParse = function safeJSONParse(str) {
+    try {
+      return JSON.parse(str);
+    } catch (error) {
+      console.warn('JSON解析失败:', error);
+      return null;
+    }
+  };
+  // 获取回显的value值 如果开启了搜索条件 则需要过滤掉搜索条件
+  var getShowValue = function getShowValue(value) {
+    var newValue = _.cloneDeep(value);
+    if (selectProps.useSearchCondition && newValue) {
+      // 回显的时候 把搜索项的内容去掉
+      if (selectMode) {
+        newValue = newValue.filter(function (item) {
+          var parsedItem = safeJSONParse(decodeURIComponent(item));
+          // 过滤掉JSON对象（搜索条件），保留非JSON数据（实际选择项）
+          return !parsedItem || !(parsedItem && _typeof(parsedItem) === 'object' && !Array.isArray(parsedItem));
+        });
+      }
+    }
+    return newValue;
+  };
   var showModal = function showModal() {
     if (sDisabled) return;
     setSelectOpen(false);
@@ -5775,12 +5798,13 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     // 回显
     if (value) {
       if (selectMode) {
-        setSelectedRowKeys(labelInValue ? value.map(function (i) {
+        var newValue = getShowValue(value);
+        setSelectedRowKeys(labelInValue ? newValue.map(function (i) {
           return i.key;
-        }) : value);
-        setSelectedRows(labelInValue ? value.map(function (i) {
+        }) : newValue);
+        setSelectedRows(labelInValue ? newValue.map(function (i) {
           return _defineProperty(_defineProperty(_defineProperty({}, mappingValueField, i.key), "value", i.key), "text", i.label);
-        }) : value.map(function (i) {
+        }) : newValue.map(function (i) {
           return _defineProperty(_defineProperty({}, mappingValueField, i), "value", i);
         }));
         setPopValue(labelInValue ? value.map(function (i) {
@@ -5817,7 +5841,24 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
       formaData(selectedValue, source);
     } else {
       var formatResult = selectMode ? [] : null;
-      onChange(formatResult, selectedValue);
+      // 支持使用查询条件 筛选
+      if (selectProps.useSearchCondition) {
+        var formValue = form.getFieldsValue();
+        // 一次性处理数据转换和过滤
+        var processedFormValue = Object.keys(formValue).reduce(function (acc, key) {
+          var value = formValue[key];
+          // 过滤空值（确保trim函数存在）
+          var trimmedValue = typeof value === 'string' ? value.trim() : value;
+          if (trimmedValue && trimmedValue !== '') {
+            acc[key] = trimmedValue;
+          }
+          return acc;
+        }, {});
+        var result = encodeURIComponent(JSON.stringify(processedFormValue));
+        onChange(_.isEmpty(processedFormValue) ? formatResult : selectMode ? [result] : result, selectedValue);
+      } else {
+        onChange(formatResult, selectedValue);
+      }
     }
   };
   var handleOk = function handleOk() {
@@ -5847,7 +5888,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
         setConfirmLoading(false);
       });
     } else {
-      handleSelectOver(popvalue);
+      handleSelectOver(selectedRows.length ? popvalue : []);
       handleCancel();
     }
   };
@@ -6473,9 +6514,25 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     confirmLoading: confirmLoading,
     onOk: handleOk,
     onCancel: handleCancel,
-    footer: selectMode || (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalRadioNeedFooter) ? [/*#__PURE__*/React__default['default'].createElement(antd.Button, {
+    footer: selectMode || (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalRadioNeedFooter) ? [selectProps.useSearchCondition ? (/*#__PURE__*/React__default['default'].createElement("div", {
+      key: "instructions",
+      style: {
+        position: 'absolute',
+        width: 'calc(100% - 500px)',
+        textAlign: 'left'
+      }
+    }, /*#__PURE__*/React__default['default'].createElement("div", null, "\u64CD\u4F5C\u8BF4\u660E\uFF1A\u7ED3\u679C\u96C6\u8FC7\u591A\u65F6\uFF0C\u53EF\u65E0\u9700\u9009\u62E9\u5177\u4F53\u6570\u636E\uFF0C\u7CFB\u7EDF\u5C06\u76F4\u63A5\u6309\u5DF2\u8BBE\u7B5B\u9009\u6761\u4EF6\u67E5\u8BE2"), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+      style: {
+        marginTop: '3px',
+        height: '22px'
+      },
+      value: value
+    }))) : /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
       key: "back",
-      onClick: handleCancel
+      onClick: handleCancel,
+      style: {
+        margin: selectProps.useSearchCondition ? '10px 0' : 0
+      }
     }, "\u53D6\u6D88"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
       key: "submit",
       type: "primary",

package/package.json

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

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

@@ -4,7 +4,7 @@ import { useDebounceFn } from 'ahooks';
 import { Input, Button, Modal, Select, Divider, message, Spin, Form, Table, Checkbox, TreeSelect, Tooltip, Tag, Row, Col, Space, Tabs, Empty, DatePicker } from 'antd';
 import { SearchOutlined, CopyOutlined, CaretLeftOutlined } from '@ant-design/icons';
 import request from '@/utils/request';
-import _, { escapeRegExp, isNil, values } from "lodash"
+import _, { escapeRegExp, isNil, values, cloneDeep, isEmpty } from "lodash"
 import './index.less';
 import { BusinessSearchSelect, QueryMutipleInput, QueryMutipleSearchSelect } from '@/index';
 import { handleSourceName, getFormRowInfo, hasMoreQueryFields, defaultVisibleFieldsCount, getRealStr, getTableHeigth, getCurrentSRKs, getRenderSource, handleParams, convertUrlQueryParams, convertBodyParams, formatSelectedValue, convertResData, makeUniqueValue, handleSelectOptionsShowValue, LightHeightOption, maxTagPlaceholder, getShowStr, handleTableColumns }  from './utils';
@@ -362,6 +362,30 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     };
   },[isModalVisible])
 
+  const safeJSONParse = (str: string) => {
+    try {
+      return JSON.parse(str);
+    } catch (error) {
+      console.warn('JSON解析失败:', error);
+      return null;
+    }
+  };
+
+  // 获取回显的value值 如果开启了搜索条件 则需要过滤掉搜索条件
+  const getShowValue = (value: any) => {
+    let newValue = cloneDeep(value);
+    if(selectProps.useSearchCondition && newValue) {
+      // 回显的时候 把搜索项的内容去掉
+      if(selectMode) {
+        newValue = newValue.filter((item: any) => {
+          const parsedItem = safeJSONParse(decodeURIComponent(item));
+          // 过滤掉JSON对象（搜索条件），保留非JSON数据（实际选择项）
+          return !parsedItem || !(parsedItem && typeof parsedItem === 'object' && !Array.isArray(parsedItem));
+        });
+      }
+    }
+    return newValue;
+  }
   const showModal = () => {
     if(sDisabled) return;
     
@@ -373,8 +397,9 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     // 回显
     if (value) {
       if (selectMode) {
-        setSelectedRowKeys(labelInValue ? value.map(i => i.key) : value)
-        setSelectedRows(labelInValue ? value.map(i => ({ [mappingValueField]: i.key, value: i.key, text: i.label })) : value.map(i => ({ [mappingValueField]: i, value: i })))
+        const newValue = getShowValue(value);
+        setSelectedRowKeys(labelInValue ? newValue.map(i => i.key) : newValue)
+        setSelectedRows(labelInValue ? newValue.map(i => ({ [mappingValueField]: i.key, value: i.key, text: i.label })) : newValue.map(i => ({ [mappingValueField]: i, value: i })))
         setPopValue(labelInValue ? value.map(i => ({ value: i.key, text: i.label })) : value.map(i => ({ value: i })));
         setIndeterminate(!!value.length && value.length < itemsTotal);
         setCheckedAll(itemsTotal && value.length === itemsTotal);
@@ -395,8 +420,25 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
       setSelectDataSource(source,source?.length)
       formaData(selectedValue, source);
     } else {
-      const formatResult = selectMode ? [] : null
-      onChange(formatResult, selectedValue)
+      var formatResult = selectMode ? [] : null;
+      // 支持使用查询条件 筛选
+      if (selectProps.useSearchCondition) {
+        var formValue = form.getFieldsValue();
+        // 一次性处理数据转换和过滤
+        var processedFormValue = Object.keys(formValue).reduce(function (acc, key) {
+          var value = formValue[key];
+          // 过滤空值（确保trim函数存在）
+          var trimmedValue = typeof value === 'string' ? value.trim() : value;
+          if (trimmedValue && trimmedValue !== '') {
+            acc[key] = trimmedValue;
+          }
+          return acc;
+        }, {});
+        const result = encodeURIComponent(JSON.stringify(processedFormValue))
+        onChange(isEmpty(processedFormValue) ? formatResult : selectMode ? [result] : result, selectedValue);
+      } else {
+        onChange(formatResult, selectedValue);
+      }
     }
   }
   const handleOk = () => {
@@ -426,7 +468,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
         setConfirmLoading(false)
       })
     } else {
-      handleSelectOver(popvalue)
+      handleSelectOver(selectedRows.length ? popvalue : [])
       handleCancel();
     }
   };
@@ -934,7 +976,20 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
           footer={
             selectMode || modalTableProps?.modalRadioNeedFooter
               ? [
-                  <Button key="back" onClick={handleCancel}>
+                  selectProps.useSearchCondition ? (
+                    <div 
+                      key="instructions" 
+                      style={{ 
+                        position: 'absolute', 
+                        width: 'calc(100% - 500px)', 
+                        textAlign: 'left' 
+                      }}
+                    >
+                      <div>操作说明：结果集过多时，可无需选择具体数据，系统将直接按已设筛选条件查询</div>
+                      <Input style={{marginTop: '3px', height: '22px'}} value={value} />
+                    </div>
+                  ) : <></>,
+                  <Button key="back" onClick={handleCancel} style={{margin: selectProps.useSearchCondition ? '10px 0' : 0}}>
                     取消
                   </Button>,
                   <Button