@bit-sun/business-component 4.2.1-alpha.7-aiwei → 4.2.1-alpha.9-aiwei

package/dist/index.esm.js

@@ -5323,7 +5323,9 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     viewShowValueStr = _ref.viewShowValueStr,
     searchStartLength = _ref.searchStartLength,
     _ref$isQuery = _ref.isQuery,
-    isQuery = _ref$isQuery === void 0 ? false : _ref$isQuery;
+    isQuery = _ref$isQuery === void 0 ? false : _ref$isQuery,
+    _ref$requireSearchCon = _ref.requireSearchCondition,
+    requireSearchCondition = _ref$requireSearchCon === void 0 ? false : _ref$requireSearchCon;
   var requestConfig = _objectSpread2({
     url: url,
     method: method,
@@ -5886,6 +5888,16 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   var onSearchTable = function onSearchTable() {
     var params = form.getFieldsValue();
+    // 必须选择一个值
+    if (requireSearchCondition) {
+      var hasValidValue = Object.values(params).some(function (value) {
+        return Array.isArray(value) && value.length > 0 || typeof value === 'string' && value.trim().length > 0;
+      });
+      if (!hasValidValue) {
+        message$1.warning('请至少选择一个搜索条件');
+        return;
+      }
+    }
     setModalSearched(true);
     setTableFormParams(params);
     getData(_objectSpread2(_objectSpread2({}, params), {}, {
@@ -10474,7 +10486,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzdlbm-in',
       type: 'select',
-      label: '大类',
+      label: '品类',
       field: {
         type: 'select',
         props: {
@@ -10493,7 +10505,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzzlbm-in',
       type: 'select',
-      label: '中类',
+      label: '大类',
       field: {
         type: 'select',
         props: {
@@ -10512,7 +10524,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzxlbm-in',
       type: 'select',
-      label: '小类',
+      label: '中类',
       field: {
         type: 'select',
         props: {
@@ -11578,11 +11590,11 @@ function commonFun(type, prefixUrl, parentProps) {
         }
       }
     }, {
-      name: 'qp-channelCode-in',
-      type: 'treeSelect',
-      label: '战区',
+      name: 'qp-operationWarehouseClassification-in',
+      type: 'select',
+      label: '分类',
       field: {
-        type: 'treeSelect',
+        type: 'select',
         props: {
           multiple: true,
           treeData: [],
@@ -11598,7 +11610,8 @@ function commonFun(type, prefixUrl, parentProps) {
           },
           showCheckedStrategy: 'TreeSelect.SHOW_ALL'
         }
-      }
+      },
+      initialSource: getDictionarySource$1('BASIC_OPS_WH_TYPE')
     }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
       name: 'qp-status-eq',
       type: 'select',
@@ -11626,10 +11639,6 @@ function commonFun(type, prefixUrl, parentProps) {
         });
       });
       x[1].data = newData1;
-      var channelDisabledJude = function channelDisabledJude(data) {
-        return data['parentCode'] === '0';
-      }; // 所属销售渠道 树节点不能点判断
-      formatTreeDataSource(x, 1, 3, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择运营仓',
@@ -11901,18 +11910,18 @@ function commonFun(type, prefixUrl, parentProps) {
       name: 'qp-code-like',
       label: '客户编码'
     }, {
-      name: 'qp-createOrgCode-eq',
+      name: 'qp-createOrgCode-in',
       type: 'select',
       label: '创建组织',
       field: {
         type: 'select',
         props: {
-          // mode: 'multiple',
+          mode: 'multiple',
           notFoundContent: '暂无数据',
           allowClear: true,
           showSearch: true,
           showArrow: true,
-          // maxTagCount: 1,
+          maxTagCount: 1,
           optionFilterProp: 'children',
           filterOption: function filterOption(input, option) {
             return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;

package/dist/index.js

@@ -5346,7 +5346,9 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     viewShowValueStr = _ref.viewShowValueStr,
     searchStartLength = _ref.searchStartLength,
     _ref$isQuery = _ref.isQuery,
-    isQuery = _ref$isQuery === void 0 ? false : _ref$isQuery;
+    isQuery = _ref$isQuery === void 0 ? false : _ref$isQuery,
+    _ref$requireSearchCon = _ref.requireSearchCondition,
+    requireSearchCondition = _ref$requireSearchCon === void 0 ? false : _ref$requireSearchCon;
   var requestConfig = _objectSpread2({
     url: url,
     method: method,
@@ -5909,6 +5911,16 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   };
   var onSearchTable = function onSearchTable() {
     var params = form.getFieldsValue();
+    // 必须选择一个值
+    if (requireSearchCondition) {
+      var hasValidValue = Object.values(params).some(function (value) {
+        return Array.isArray(value) && value.length > 0 || typeof value === 'string' && value.trim().length > 0;
+      });
+      if (!hasValidValue) {
+        antd.message.warning('请至少选择一个搜索条件');
+        return;
+      }
+    }
     setModalSearched(true);
     setTableFormParams(params);
     getData(_objectSpread2(_objectSpread2({}, params), {}, {
@@ -10497,7 +10509,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzdlbm-in',
       type: 'select',
-      label: '大类',
+      label: '品类',
       field: {
         type: 'select',
         props: {
@@ -10516,7 +10528,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzzlbm-in',
       type: 'select',
-      label: '中类',
+      label: '大类',
       field: {
         type: 'select',
         props: {
@@ -10535,7 +10547,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzxlbm-in',
       type: 'select',
-      label: '小类',
+      label: '中类',
       field: {
         type: 'select',
         props: {
@@ -11601,11 +11613,11 @@ function commonFun(type, prefixUrl, parentProps) {
         }
       }
     }, {
-      name: 'qp-channelCode-in',
-      type: 'treeSelect',
-      label: '战区',
+      name: 'qp-operationWarehouseClassification-in',
+      type: 'select',
+      label: '分类',
       field: {
-        type: 'treeSelect',
+        type: 'select',
         props: {
           multiple: true,
           treeData: [],
@@ -11621,7 +11633,8 @@ function commonFun(type, prefixUrl, parentProps) {
           },
           showCheckedStrategy: 'TreeSelect.SHOW_ALL'
         }
-      }
+      },
+      initialSource: getDictionarySource$1('BASIC_OPS_WH_TYPE')
     }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
       name: 'qp-status-eq',
       type: 'select',
@@ -11649,10 +11662,6 @@ function commonFun(type, prefixUrl, parentProps) {
         });
       });
       x[1].data = newData1;
-      var channelDisabledJude = function channelDisabledJude(data) {
-        return data['parentCode'] === '0';
-      }; // 所属销售渠道 树节点不能点判断
-      formatTreeDataSource(x, 1, 3, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择运营仓',
@@ -11924,18 +11933,18 @@ function commonFun(type, prefixUrl, parentProps) {
       name: 'qp-code-like',
       label: '客户编码'
     }, {
-      name: 'qp-createOrgCode-eq',
+      name: 'qp-createOrgCode-in',
       type: 'select',
       label: '创建组织',
       field: {
         type: 'select',
         props: {
-          // mode: 'multiple',
+          mode: 'multiple',
           notFoundContent: '暂无数据',
           allowClear: true,
           showSearch: true,
           showArrow: true,
-          // maxTagCount: 1,
+          maxTagCount: 1,
           optionFilterProp: 'children',
           filterOption: function filterOption(input, option) {
             return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;

package/package.json

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

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

@@ -487,7 +487,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
                 option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
             },
           } },
-        { name: 'qp-zzdlbm-in', type: 'select', label: '大类', field: {
+        { name: 'qp-zzdlbm-in', type: 'select', label: '品类', field: {
             type: 'select',
             props: {
               mode: 'multiple',
@@ -501,7 +501,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
                 option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
             },
           } },
-        { name: 'qp-zzzlbm-in', type: 'select', label: '中类', field: {
+        { name: 'qp-zzzlbm-in', type: 'select', label: '大类', field: {
             type: 'select',
             props: {
               mode: 'multiple',
@@ -515,7 +515,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
                 option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
             },
           } },
-        { name: 'qp-zzxlbm-in', type: 'select', label: '小类', field: {
+        { name: 'qp-zzxlbm-in', type: 'select', label: '中类', field: {
             type: 'select',
             props: {
               mode: 'multiple',
@@ -1539,8 +1539,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           },
         } },
         {
-        name: 'qp-channelCode-in', type: 'treeSelect', label: '战区', field: {
-          type: 'treeSelect',
+        name: 'qp-operationWarehouseClassification-in', type: 'select', label: '分类', field: {
+          type: 'select',
           props: {
             multiple: true,
             treeData: [],
@@ -1555,7 +1555,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
             showCheckedStrategy: 'TreeSelect.SHOW_ALL',
           },
-        }
+        },
+         initialSource: getDictionarySource('BASIC_OPS_WH_TYPE')
       },
       ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-status-eq', type: 'select', label: '运营仓状态', initialSource: getDictionarySource('SC00001')  }]:[]),
     ]
@@ -1574,8 +1575,6 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         newData1.push({ code: item.code, name: item.name })
       });
       x[1].data = newData1;
-      const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
-      formatTreeDataSource(x, 1, 3, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
     })
     modalTableProps = {
       modalTableTitle: '选择运营仓',
@@ -1858,15 +1857,15 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
     tableSearchForm = [
       { name: 'qp-name-like', label: '客户名称' },
       { name: 'qp-code-like', label: '客户编码' },
-      { name: 'qp-createOrgCode-eq', type: 'select', label: '创建组织', field: {
+      { name: 'qp-createOrgCode-in', type: 'select', label: '创建组织', field: {
           type: 'select',
           props: {
-            // mode: 'multiple',
+            mode: 'multiple',
             notFoundContent: '暂无数据',
             allowClear: true,
             showSearch: true,
             showArrow: true,
-            // maxTagCount: 1,
+            maxTagCount: 1,
             optionFilterProp: 'children',
             filterOption: (input: string, option: { props: { children: string } }) =>
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,

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

@@ -55,6 +55,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     viewShowValueStr, // 详情展示值,不传展示组件处理的默认值
     searchStartLength, // 默认不校验长度去搜索，如果配置了，则按照配置项长度进行处理搜索
     isQuery = false, // 是否是查询条件
+    requireSearchCondition = false, // 是否必须选择一个值
   } = rCTemp || {};
   const requestConfig = {url,method,otherParams,isMap,fixedparameter,fieldValToParam,fixedparamsDisabled,mappingTextField,mappingTextShowKeyField,mappingValueField,mappingTextShowTextField,init,extralHeaders,specialBracket,noNeedSplit,noOperate,viewShowValueStr,searchStartLength,...rCTemp};
   const resultSourceKey = handleSourceName(sourceName || requestConfig?.sourceName || ctx?.name || 'supplierCode')
@@ -479,6 +480,18 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   const onSearchTable = () => {
     const params = form.getFieldsValue();
+    // 必须选择一个值
+    if(requireSearchCondition) {
+      const hasValidValue = Object.values(params).some(value => 
+        (Array.isArray(value) && value.length > 0) || 
+        (typeof value === 'string' && value.trim().length > 0)
+      );
+      
+      if(!hasValidValue) {
+        message.warning('请至少选择一个搜索条件');
+        return;
+      }
+    }
     setModalSearched(true);
     setTableFormParams(params);
     getData({ ...params, pageSize: tableInitPageSize }, 2, null);