@bit-sun/business-component 4.0.13-alpha.32 → 4.0.13-alpha.34

package/dist/index.esm.js

@@ -4229,13 +4229,16 @@ var handleParams = function handleParams(params) {
         });
         delete params[key];
       } else if (element && key.indexOf('*multiInput') >= 0) {
+        var _ref3, _ref3$trim, _key$split, _value, _value$trim;
         var name = '',
-          value = element['value'];
+          value = (_ref3 = (element === null || element === void 0 ? void 0 : element['value']) || element) === null || _ref3 === void 0 ? void 0 : (_ref3$trim = _ref3.trim) === null || _ref3$trim === void 0 ? void 0 : _ref3$trim.call(_ref3);
+        var searchKey = (element === null || element === void 0 ? void 0 : element['name']) || (key === null || key === void 0 ? void 0 : (_key$split = key.split('*multiInput')) === null || _key$split === void 0 ? void 0 : _key$split[0]);
         if (value.indexOf(',') >= 0) {
-          name = "qp-".concat(element['name'], "-in");
+          name = "qp-".concat(searchKey, "-in");
         } else {
-          name = "qp-".concat(element['name'], "-like");
+          name = "qp-".concat(searchKey, "-like");
         }
+        value = (_value = value) === null || _value === void 0 ? void 0 : (_value$trim = _value.trim) === null || _value$trim === void 0 ? void 0 : _value$trim.call(_value);
         params[name] = value;
         delete params[key];
       } else if (element && key.indexOf('*') >= 0) {
@@ -4424,11 +4427,11 @@ var LightHeightOption = function LightHeightOption(props) {
     title: text
   }, renderContent);
 };
-var maxTagPlaceholder = function maxTagPlaceholder(selectedValues, _ref3) {
-  var selectProps = _ref3.selectProps,
-    onChange = _ref3.onChange,
-    value = _ref3.value,
-    setIsMaxTagsOpen = _ref3.setIsMaxTagsOpen;
+var maxTagPlaceholder = function maxTagPlaceholder(selectedValues, _ref4) {
+  var selectProps = _ref4.selectProps,
+    onChange = _ref4.onChange,
+    value = _ref4.value,
+    setIsMaxTagsOpen = _ref4.setIsMaxTagsOpen;
   var labelInValue = selectProps.labelInValue;
   var _onClose = function onClose(e, item) {
     e.preventDefault();
@@ -4482,11 +4485,11 @@ var handleTableColumns = function handleTableColumns(tableColumns) {
 };
 // ------------------------------------------ 数据源展示 相关处理--结束----------------------------------------
 // ------------------------------------------ 选中数据展示 相关处理--开始----------------------------------------
-var getShowLabelTextStr = function getShowLabelTextStr(_ref4) {
-  var kongValue = _ref4.kongValue,
-    selectMode = _ref4.selectMode,
-    value = _ref4.value,
-    items = _ref4.items;
+var getShowLabelTextStr = function getShowLabelTextStr(_ref5) {
+  var kongValue = _ref5.kongValue,
+    selectMode = _ref5.selectMode,
+    value = _ref5.value,
+    items = _ref5.items;
   if (selectMode) {
     var _value$map;
     return Array.isArray(value) && (value === null || value === void 0 ? void 0 : (_value$map = value.map(function (item) {
@@ -4501,11 +4504,11 @@ var getSelectValueText = function getSelectValueText(v, items) {
     return item.value === v;
   })) === null || _filter === void 0 ? void 0 : (_filter$ = _filter[0]) === null || _filter$ === void 0 ? void 0 : _filter$.text) || v || '';
 };
-var getShowValueStr = function getShowValueStr(_ref5) {
-  var kongValue = _ref5.kongValue,
-    selectMode = _ref5.selectMode,
-    value = _ref5.value,
-    items = _ref5.items;
+var getShowValueStr = function getShowValueStr(_ref6) {
+  var kongValue = _ref6.kongValue,
+    selectMode = _ref6.selectMode,
+    value = _ref6.value,
+    items = _ref6.items;
   if (selectMode) {
     var _value$map2;
     return Array.isArray(value) && (value === null || value === void 0 ? void 0 : (_value$map2 = value.map(function (item) {
@@ -4514,12 +4517,12 @@ var getShowValueStr = function getShowValueStr(_ref5) {
   }
   return getSelectValueText(value, items) || kongValue;
 };
-var getShowStr = function getShowStr(_ref6) {
-  var viewShowValueStr = _ref6.viewShowValueStr,
-    labelInValue = _ref6.labelInValue,
-    selectMode = _ref6.selectMode,
-    value = _ref6.value,
-    items = _ref6.items;
+var getShowStr = function getShowStr(_ref7) {
+  var viewShowValueStr = _ref7.viewShowValueStr,
+    labelInValue = _ref7.labelInValue,
+    selectMode = _ref7.selectMode,
+    value = _ref7.value,
+    items = _ref7.items;
   // 优先使用业务使用传入的展示
   if (viewShowValueStr) return viewShowValueStr;
   var kongValue = '无';
@@ -10763,11 +10766,13 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'warehouseIds'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-physicalWarehouseName-like',
-      label: '物理仓名称'
+      name: 'physicalWarehouseName*multiInput',
+      label: '物理仓名称',
+      type: 'multipleQueryInput'
     }, {
-      name: 'qp-physicalWarehouseCode-like',
-      label: '物理仓编码'
+      name: 'physicalWarehouseCode*multiInput',
+      label: '物理仓编码',
+      type: 'multipleQueryInput'
     }, {
       name: 'qp-physicalWarehouseType-eq',
       type: 'select',
@@ -10866,16 +10871,28 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'warehouseIds'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-realWarehouseName-like',
-      label: '逻辑仓名称'
+      name: 'realWarehouseName*multiInput',
+      label: '逻辑仓名称',
+      type: 'multipleQueryInput'
     }, {
-      name: 'qp-realWarehouseCode-like',
-      label: '逻辑仓编码'
+      name: 'realWarehouseCode*multiInput',
+      label: '逻辑仓编码',
+      type: 'multipleQueryInput'
     }, {
       name: 'qp-realWarehouseType-eq',
       type: 'select',
       label: '逻辑仓类型',
       initialSource: getDictionarySource$1('SC00004')
+    }, {
+      name: 'belongArea',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple'
+        }
+      },
+      label: '管理大区',
+      initialSource: getDictionarySource$1('BUSINESS_belongArea')
     }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
       name: 'qp-isEnable-eq',
       type: 'select',
@@ -10911,7 +10928,8 @@ function commonFun(type, prefixUrl, parentProps) {
         render: function render(text) {
           return getDictionaryTextByValue$1('SC00001', text);
         }
-      }] : []))
+      }] : [])),
+      noEmptySearchField: true
     }, modalTableBusProps);
   }
   if (type === 'ownerWarehouse') {
@@ -10940,11 +10958,13 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'qp-operationWarehouseCode-in'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-like',
-      label: '运营仓名称'
+      name: 'name*multiInput',
+      label: '运营仓名称',
+      type: 'multipleQueryInput'
     }, {
-      name: 'qp-operationWarehouseCode-like',
-      label: '运营仓编码'
+      name: 'operationWarehouseCode*multiInput',
+      label: '运营仓编码',
+      type: 'multipleQueryInput'
     }, {
       name: 'qp-groupCode-in',
       type: 'select',
@@ -11525,11 +11545,11 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'code'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-in',
+      name: 'name*multiInput',
       label: '商店名称',
       type: 'multipleQueryInput'
     }, {
-      name: 'qp-code-in',
+      name: 'code*multiInput',
       label: '商店编码',
       type: 'multipleQueryInput'
     }, {

package/dist/index.js

@@ -4252,13 +4252,16 @@ var handleParams = function handleParams(params) {
         });
         delete params[key];
       } else if (element && key.indexOf('*multiInput') >= 0) {
+        var _ref3, _ref3$trim, _key$split, _value, _value$trim;
         var name = '',
-          value = element['value'];
+          value = (_ref3 = (element === null || element === void 0 ? void 0 : element['value']) || element) === null || _ref3 === void 0 ? void 0 : (_ref3$trim = _ref3.trim) === null || _ref3$trim === void 0 ? void 0 : _ref3$trim.call(_ref3);
+        var searchKey = (element === null || element === void 0 ? void 0 : element['name']) || (key === null || key === void 0 ? void 0 : (_key$split = key.split('*multiInput')) === null || _key$split === void 0 ? void 0 : _key$split[0]);
         if (value.indexOf(',') >= 0) {
-          name = "qp-".concat(element['name'], "-in");
+          name = "qp-".concat(searchKey, "-in");
         } else {
-          name = "qp-".concat(element['name'], "-like");
+          name = "qp-".concat(searchKey, "-like");
         }
+        value = (_value = value) === null || _value === void 0 ? void 0 : (_value$trim = _value.trim) === null || _value$trim === void 0 ? void 0 : _value$trim.call(_value);
         params[name] = value;
         delete params[key];
       } else if (element && key.indexOf('*') >= 0) {
@@ -4447,11 +4450,11 @@ var LightHeightOption = function LightHeightOption(props) {
     title: text
   }, renderContent);
 };
-var maxTagPlaceholder = function maxTagPlaceholder(selectedValues, _ref3) {
-  var selectProps = _ref3.selectProps,
-    onChange = _ref3.onChange,
-    value = _ref3.value,
-    setIsMaxTagsOpen = _ref3.setIsMaxTagsOpen;
+var maxTagPlaceholder = function maxTagPlaceholder(selectedValues, _ref4) {
+  var selectProps = _ref4.selectProps,
+    onChange = _ref4.onChange,
+    value = _ref4.value,
+    setIsMaxTagsOpen = _ref4.setIsMaxTagsOpen;
   var labelInValue = selectProps.labelInValue;
   var _onClose = function onClose(e, item) {
     e.preventDefault();
@@ -4505,11 +4508,11 @@ var handleTableColumns = function handleTableColumns(tableColumns) {
 };
 // ------------------------------------------ 数据源展示 相关处理--结束----------------------------------------
 // ------------------------------------------ 选中数据展示 相关处理--开始----------------------------------------
-var getShowLabelTextStr = function getShowLabelTextStr(_ref4) {
-  var kongValue = _ref4.kongValue,
-    selectMode = _ref4.selectMode,
-    value = _ref4.value,
-    items = _ref4.items;
+var getShowLabelTextStr = function getShowLabelTextStr(_ref5) {
+  var kongValue = _ref5.kongValue,
+    selectMode = _ref5.selectMode,
+    value = _ref5.value,
+    items = _ref5.items;
   if (selectMode) {
     var _value$map;
     return Array.isArray(value) && (value === null || value === void 0 ? void 0 : (_value$map = value.map(function (item) {
@@ -4524,11 +4527,11 @@ var getSelectValueText = function getSelectValueText(v, items) {
     return item.value === v;
   })) === null || _filter === void 0 ? void 0 : (_filter$ = _filter[0]) === null || _filter$ === void 0 ? void 0 : _filter$.text) || v || '';
 };
-var getShowValueStr = function getShowValueStr(_ref5) {
-  var kongValue = _ref5.kongValue,
-    selectMode = _ref5.selectMode,
-    value = _ref5.value,
-    items = _ref5.items;
+var getShowValueStr = function getShowValueStr(_ref6) {
+  var kongValue = _ref6.kongValue,
+    selectMode = _ref6.selectMode,
+    value = _ref6.value,
+    items = _ref6.items;
   if (selectMode) {
     var _value$map2;
     return Array.isArray(value) && (value === null || value === void 0 ? void 0 : (_value$map2 = value.map(function (item) {
@@ -4537,12 +4540,12 @@ var getShowValueStr = function getShowValueStr(_ref5) {
   }
   return getSelectValueText(value, items) || kongValue;
 };
-var getShowStr = function getShowStr(_ref6) {
-  var viewShowValueStr = _ref6.viewShowValueStr,
-    labelInValue = _ref6.labelInValue,
-    selectMode = _ref6.selectMode,
-    value = _ref6.value,
-    items = _ref6.items;
+var getShowStr = function getShowStr(_ref7) {
+  var viewShowValueStr = _ref7.viewShowValueStr,
+    labelInValue = _ref7.labelInValue,
+    selectMode = _ref7.selectMode,
+    value = _ref7.value,
+    items = _ref7.items;
   // 优先使用业务使用传入的展示
   if (viewShowValueStr) return viewShowValueStr;
   var kongValue = '无';
@@ -10786,11 +10789,13 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'warehouseIds'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-physicalWarehouseName-like',
-      label: '物理仓名称'
+      name: 'physicalWarehouseName*multiInput',
+      label: '物理仓名称',
+      type: 'multipleQueryInput'
     }, {
-      name: 'qp-physicalWarehouseCode-like',
-      label: '物理仓编码'
+      name: 'physicalWarehouseCode*multiInput',
+      label: '物理仓编码',
+      type: 'multipleQueryInput'
     }, {
       name: 'qp-physicalWarehouseType-eq',
       type: 'select',
@@ -10889,16 +10894,28 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'warehouseIds'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-realWarehouseName-like',
-      label: '逻辑仓名称'
+      name: 'realWarehouseName*multiInput',
+      label: '逻辑仓名称',
+      type: 'multipleQueryInput'
     }, {
-      name: 'qp-realWarehouseCode-like',
-      label: '逻辑仓编码'
+      name: 'realWarehouseCode*multiInput',
+      label: '逻辑仓编码',
+      type: 'multipleQueryInput'
     }, {
       name: 'qp-realWarehouseType-eq',
       type: 'select',
       label: '逻辑仓类型',
       initialSource: getDictionarySource$1('SC00004')
+    }, {
+      name: 'belongArea',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple'
+        }
+      },
+      label: '管理大区',
+      initialSource: getDictionarySource$1('BUSINESS_belongArea')
     }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
       name: 'qp-isEnable-eq',
       type: 'select',
@@ -10934,7 +10951,8 @@ function commonFun(type, prefixUrl, parentProps) {
         render: function render(text) {
           return getDictionaryTextByValue$1('SC00001', text);
         }
-      }] : []))
+      }] : [])),
+      noEmptySearchField: true
     }, modalTableBusProps);
   }
   if (type === 'ownerWarehouse') {
@@ -10963,11 +10981,13 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'qp-operationWarehouseCode-in'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-like',
-      label: '运营仓名称'
+      name: 'name*multiInput',
+      label: '运营仓名称',
+      type: 'multipleQueryInput'
     }, {
-      name: 'qp-operationWarehouseCode-like',
-      label: '运营仓编码'
+      name: 'operationWarehouseCode*multiInput',
+      label: '运营仓编码',
+      type: 'multipleQueryInput'
     }, {
       name: 'qp-groupCode-in',
       type: 'select',
@@ -11548,11 +11568,11 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'code'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-in',
+      name: 'name*multiInput',
       label: '商店名称',
       type: 'multipleQueryInput'
     }, {
-      name: 'qp-code-in',
+      name: 'code*multiInput',
       label: '商店编码',
       type: 'multipleQueryInput'
     }, {

package/package.json

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

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

@@ -1069,8 +1069,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'qp-physicalWarehouseName-like', label: '物理仓名称' },
-      { name: 'qp-physicalWarehouseCode-like', label: '物理仓编码' },
+      { name: 'physicalWarehouseName*multiInput', label: '物理仓名称', type: 'multipleQueryInput' },
+      { name: 'physicalWarehouseCode*multiInput', label: '物理仓编码', type: 'multipleQueryInput' },
       { name: 'qp-physicalWarehouseType-eq', type: 'select', label: '物理仓类型', initialSource: getDictionarySource('SC00002')  },
       { name: 'qp-companyCode-eq', type: 'select', label: '所属公司', field: {
           type: 'select',
@@ -1167,9 +1167,10 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'qp-realWarehouseName-like', label: '逻辑仓名称' },
-      { name: 'qp-realWarehouseCode-like', label: '逻辑仓编码' },
+      { name: 'realWarehouseName*multiInput', label: '逻辑仓名称', type: 'multipleQueryInput' },
+      { name: 'realWarehouseCode*multiInput', label: '逻辑仓编码', type: 'multipleQueryInput' },
       { name: 'qp-realWarehouseType-eq', type: 'select', label: '逻辑仓类型', initialSource: getDictionarySource('SC00004')  },
+      { name: 'belongArea', field: {type: 'select', props: {mode: 'multiple',}}, label: '管理大区', initialSource: getDictionarySource('BUSINESS_belongArea'),   },
       ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-isEnable-eq', type: 'select', label: '逻辑仓状态', initialSource: getDictionarySource('SC00001')  }]:[])
     ]
     modalTableProps = {
@@ -1204,6 +1205,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           render: (text: number) => getDictionaryTextByValue('SC00001', text),
         }]:[]),
       ],
+      noEmptySearchField: true,
       ...modalTableBusProps,
     }
   }
@@ -1238,8 +1240,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'qp-name-like', label: '运营仓名称' },
-      { name: 'qp-operationWarehouseCode-like', label: '运营仓编码' },
+      { name: 'name*multiInput', label: '运营仓名称', type: 'multipleQueryInput' },
+      { name: 'operationWarehouseCode*multiInput', label: '运营仓编码', type: 'multipleQueryInput' },
       { name: 'qp-groupCode-in', type: 'select', label: '运营组', field: {
           type: 'select',
           props: {
@@ -1816,8 +1818,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'qp-name-in', label: '商店名称', type: 'multipleQueryInput' },
-      { name: 'qp-code-in', label: '商店编码', type: 'multipleQueryInput' },
+      { name: 'name*multiInput', label: '商店名称', type: 'multipleQueryInput' },
+      { name: 'code*multiInput', label: '商店编码', type: 'multipleQueryInput' },
       { name: 'qp-type-in', type: 'select', label: '商店类型', initialSource: shopFile2Type },
       { name: 'qp-status-in', type: 'select', label: '商店状态', initialSource: shopFile2Status },
       { name: 'qp-orgCode-in', type: 'select', label: '所属销售组织', field: {

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

@@ -520,7 +520,7 @@ export default () => {
     //   needStatusSearch: true
     // },
     selectProps,
-    selectBusinessType: 'brand',
+    selectBusinessType: 'realWarehouse',
   };
 
   const onTabChange = (key) => {

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

@@ -158,12 +158,14 @@ export const handleParams = (params: any) => {
         delete params[key];
       } else if (element && key.indexOf('*multiInput') >= 0) {
       let name = '',
-        value = element['value'];
+        value = (element?.['value']||element)?.trim?.();
+        const searchKey = element?.['name']||key?.split('*multiInput')?.[0]
       if (value.indexOf(',') >= 0) {
-        name = `qp-${element['name']}-in`;
+        name = `qp-${searchKey}-in`;
       } else {
-        name = `qp-${element['name']}-like`;
+        name = `qp-${searchKey}-like`;
       }
+      value = value?.trim?.();
       params[name] = value;
       delete params[key];
     }