@bit-sun/business-component 4.2.0-alpha.20 → 4.2.0-alpha.21

package/dist/index.esm.js

@@ -4180,14 +4180,17 @@ var handleParams = function handleParams(params) {
         params[_dataParams2[0]] = element[1];
         delete params[key];
       } else if (element && key.indexOf('*fullDate*') >= 0) {
+        var _params$key;
         var _dataParams3 = key.split('*fullDate*');
-        _dataParams3.forEach(function (value, index) {
-          if (index === 0) {
-            params[value] = moment$1(element[index]).millisecond(0).second(0).minute(0).hour(0).format('YYYY-MM-DD HH:mm:ss');
-          } else {
-            params[value] = moment$1(element[index]).millisecond(59).second(59).minute(59).hour(23).format('YYYY-MM-DD HH:mm:ss');
-          }
-        });
+        if ((params === null || params === void 0 ? void 0 : params[key]) && (params === null || params === void 0 ? void 0 : (_params$key = params[key]) === null || _params$key === void 0 ? void 0 : _params$key.length)) {
+          _dataParams3.forEach(function (value, index) {
+            if (index === 0) {
+              params[value] = moment$1(element[index]).millisecond(0).second(0).minute(0).hour(0).format('YYYY-MM-DD HH:mm:ss');
+            } else {
+              params[value] = moment$1(element[index]).millisecond(59).second(59).minute(59).hour(23).format('YYYY-MM-DD HH:mm:ss');
+            }
+          });
+        }
         delete params[key];
       } else if (typeof element === 'boolean' && key.indexOf('*checkBox*') >= 0) {
         var _dataParams4 = key.split('*checkBox*');
@@ -4276,6 +4279,7 @@ var convertUrlQueryParams = function convertUrlQueryParams(params) {
   return (params === null || params === void 0 ? void 0 : params.noUrlQueryParams) ? '' : "?".concat(stringify(convertQueryParams(params)));
 };
 var convertBodyParams = function convertBodyParams(params) {
+  var _params$requestType;
   // 处理sku选择器属性参数
   var unique_params = null;
   if (params['UNIQUE_SPEC']) {
@@ -4284,11 +4288,10 @@ var convertBodyParams = function convertBodyParams(params) {
   }
   // body参数来源：sku选择器固定参数 > 调用所传bodyParams > 默认参数-无
   // post 方式参数 来源默认的bodyParams 以及原有搜索项的参数
+  if ((params === null || params === void 0 ? void 0 : params.requestType) && (params === null || params === void 0 ? void 0 : (_params$requestType = params.requestType) === null || _params$requestType === void 0 ? void 0 : _params$requestType.toLocaleLowerCase()) == 'post') {
+    return omit(_objectSpread2(_objectSpread2({}, params === null || params === void 0 ? void 0 : params.bodyParams), params), ['bodyParams', 'noUrlQueryParams', 'requestType']);
+  }
   return unique_params || (params === null || params === void 0 ? void 0 : params.bodyParams) || null;
-  // return unique_params || omit({
-  //   ...params,
-  //   ...params?.bodyParams,
-  // },['bodyParams', 'noUrlQueryParams']);
 };
 var convertRes = function convertRes(data, otherParams) {
   var mappingTextField = otherParams.mappingTextField,
@@ -4555,7 +4558,9 @@ var QueryMutipleSearchSelect = function QueryMutipleSearchSelect(_ref) {
     _requestConfig$specia = requestConfig.specialBracket,
     specialBracket = _requestConfig$specia === void 0 ? false : _requestConfig$specia,
     _requestConfig$noNeed = requestConfig.noNeedSplit,
-    noNeedSplit = _requestConfig$noNeed === void 0 ? false : _requestConfig$noNeed;
+    noNeedSplit = _requestConfig$noNeed === void 0 ? false : _requestConfig$noNeed,
+    _requestConfig$reques = requestConfig.requestType,
+    requestType = _requestConfig$reques === void 0 ? 'get' : _requestConfig$reques;
   var selectParamsKey = filter || 'qp-codeAndName-like';
   var resultSourceKey = handleSourceName((requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.sourceName) || (ctx === null || ctx === void 0 ? void 0 : ctx.name) || 'skuCode');
   var currentSelectProps = _objectSpread2({
@@ -4656,7 +4661,9 @@ var QueryMutipleSearchSelect = function QueryMutipleSearchSelect(_ref) {
     var getRequest;
     var methodName = method === null || method === void 0 ? void 0 : method.toLocaleLowerCase();
     if (['post', 'patch', 'put'].includes(methodName)) {
-      getRequest = requestUtil[methodName]("".concat(url).concat(convertUrlQueryParams(queryParams)), convertBodyParams(queryParams), {
+      getRequest = requestUtil[methodName]("".concat(url).concat(convertUrlQueryParams(queryParams)), convertBodyParams(_objectSpread2(_objectSpread2({}, queryParams), {}, {
+        requestType: requestType
+      })), {
         headers: _objectSpread2({}, extralHeaders)
       });
     } else {
@@ -5331,7 +5338,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$requestType = _ref.requestType,
+    requestType = _ref$requestType === void 0 ? 'get' : _ref$requestType;
   var requestConfig = _objectSpread2({
     url: url,
     method: method,
@@ -5618,7 +5627,9 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     var getRequest;
     var methodName = method === null || method === void 0 ? void 0 : (_method$toLocaleLower = method.toLocaleLowerCase) === null || _method$toLocaleLower === void 0 ? void 0 : _method$toLocaleLower.call(method);
     if (['post', 'patch', 'put'].includes(methodName)) {
-      getRequest = requestUtil[methodName]("".concat(url).concat(convertUrlQueryParams(queryParams)), convertBodyParams(queryParams), {
+      getRequest = requestUtil[methodName]("".concat(url).concat(convertUrlQueryParams(queryParams)), convertBodyParams(_objectSpread2(_objectSpread2({}, queryParams), {}, {
+        requestType: requestType
+      })), {
         headers: _objectSpread2({}, extralHeaders)
       });
     } else {
@@ -10273,6 +10284,16 @@ function commonFun(type, prefixUrl, parentProps) {
           }
         }
       }
+    }, {
+      name: 'qp-enableDropShipping-eq',
+      label: '启用工厂直发',
+      type: 'select',
+      initialSource: getDictionarySource$1('BSC00001')
+    }, {
+      name: 'qp-enableVmiStock-eq',
+      label: '启用VMI库存管理',
+      type: 'select',
+      initialSource: getDictionarySource$1('BSC00001')
     }];
     var _queryHeaderParams = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
@@ -10307,6 +10328,20 @@ function commonFun(type, prefixUrl, parentProps) {
         title: '使用组织',
         dataIndex: 'salesOrgName',
         defaultSort: 4
+      }, {
+        title: '启用工厂直发',
+        dataIndex: 'enableDropShipping',
+        defaultSort: 5,
+        render: function render(text) {
+          return getDictionaryTextByValue$1('BSC00001', text);
+        }
+      }, {
+        title: '启用VMI库存管理',
+        dataIndex: 'enableVmiStock',
+        defaultSort: 6,
+        render: function render(text) {
+          return getDictionaryTextByValue$1('BSC00001', text);
+        }
       }]
     }, modalTableBusProps);
   }

package/dist/index.js

@@ -4203,14 +4203,17 @@ var handleParams = function handleParams(params) {
         params[_dataParams2[0]] = element[1];
         delete params[key];
       } else if (element && key.indexOf('*fullDate*') >= 0) {
+        var _params$key;
         var _dataParams3 = key.split('*fullDate*');
-        _dataParams3.forEach(function (value, index) {
-          if (index === 0) {
-            params[value] = moment__default['default'](element[index]).millisecond(0).second(0).minute(0).hour(0).format('YYYY-MM-DD HH:mm:ss');
-          } else {
-            params[value] = moment__default['default'](element[index]).millisecond(59).second(59).minute(59).hour(23).format('YYYY-MM-DD HH:mm:ss');
-          }
-        });
+        if ((params === null || params === void 0 ? void 0 : params[key]) && (params === null || params === void 0 ? void 0 : (_params$key = params[key]) === null || _params$key === void 0 ? void 0 : _params$key.length)) {
+          _dataParams3.forEach(function (value, index) {
+            if (index === 0) {
+              params[value] = moment__default['default'](element[index]).millisecond(0).second(0).minute(0).hour(0).format('YYYY-MM-DD HH:mm:ss');
+            } else {
+              params[value] = moment__default['default'](element[index]).millisecond(59).second(59).minute(59).hour(23).format('YYYY-MM-DD HH:mm:ss');
+            }
+          });
+        }
         delete params[key];
       } else if (typeof element === 'boolean' && key.indexOf('*checkBox*') >= 0) {
         var _dataParams4 = key.split('*checkBox*');
@@ -4299,6 +4302,7 @@ var convertUrlQueryParams = function convertUrlQueryParams(params) {
   return (params === null || params === void 0 ? void 0 : params.noUrlQueryParams) ? '' : "?".concat(querystring.stringify(convertQueryParams(params)));
 };
 var convertBodyParams = function convertBodyParams(params) {
+  var _params$requestType;
   // 处理sku选择器属性参数
   var unique_params = null;
   if (params['UNIQUE_SPEC']) {
@@ -4307,11 +4311,10 @@ var convertBodyParams = function convertBodyParams(params) {
   }
   // body参数来源：sku选择器固定参数 > 调用所传bodyParams > 默认参数-无
   // post 方式参数 来源默认的bodyParams 以及原有搜索项的参数
+  if ((params === null || params === void 0 ? void 0 : params.requestType) && (params === null || params === void 0 ? void 0 : (_params$requestType = params.requestType) === null || _params$requestType === void 0 ? void 0 : _params$requestType.toLocaleLowerCase()) == 'post') {
+    return _.omit(_objectSpread2(_objectSpread2({}, params === null || params === void 0 ? void 0 : params.bodyParams), params), ['bodyParams', 'noUrlQueryParams', 'requestType']);
+  }
   return unique_params || (params === null || params === void 0 ? void 0 : params.bodyParams) || null;
-  // return unique_params || omit({
-  //   ...params,
-  //   ...params?.bodyParams,
-  // },['bodyParams', 'noUrlQueryParams']);
 };
 var convertRes = function convertRes(data, otherParams) {
   var mappingTextField = otherParams.mappingTextField,
@@ -4578,7 +4581,9 @@ var QueryMutipleSearchSelect = function QueryMutipleSearchSelect(_ref) {
     _requestConfig$specia = requestConfig.specialBracket,
     specialBracket = _requestConfig$specia === void 0 ? false : _requestConfig$specia,
     _requestConfig$noNeed = requestConfig.noNeedSplit,
-    noNeedSplit = _requestConfig$noNeed === void 0 ? false : _requestConfig$noNeed;
+    noNeedSplit = _requestConfig$noNeed === void 0 ? false : _requestConfig$noNeed,
+    _requestConfig$reques = requestConfig.requestType,
+    requestType = _requestConfig$reques === void 0 ? 'get' : _requestConfig$reques;
   var selectParamsKey = filter || 'qp-codeAndName-like';
   var resultSourceKey = handleSourceName((requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.sourceName) || (ctx === null || ctx === void 0 ? void 0 : ctx.name) || 'skuCode');
   var currentSelectProps = _objectSpread2({
@@ -4679,7 +4684,9 @@ var QueryMutipleSearchSelect = function QueryMutipleSearchSelect(_ref) {
     var getRequest;
     var methodName = method === null || method === void 0 ? void 0 : method.toLocaleLowerCase();
     if (['post', 'patch', 'put'].includes(methodName)) {
-      getRequest = requestUtil[methodName]("".concat(url).concat(convertUrlQueryParams(queryParams)), convertBodyParams(queryParams), {
+      getRequest = requestUtil[methodName]("".concat(url).concat(convertUrlQueryParams(queryParams)), convertBodyParams(_objectSpread2(_objectSpread2({}, queryParams), {}, {
+        requestType: requestType
+      })), {
         headers: _objectSpread2({}, extralHeaders)
       });
     } else {
@@ -5354,7 +5361,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$requestType = _ref.requestType,
+    requestType = _ref$requestType === void 0 ? 'get' : _ref$requestType;
   var requestConfig = _objectSpread2({
     url: url,
     method: method,
@@ -5641,7 +5650,9 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     var getRequest;
     var methodName = method === null || method === void 0 ? void 0 : (_method$toLocaleLower = method.toLocaleLowerCase) === null || _method$toLocaleLower === void 0 ? void 0 : _method$toLocaleLower.call(method);
     if (['post', 'patch', 'put'].includes(methodName)) {
-      getRequest = requestUtil[methodName]("".concat(url).concat(convertUrlQueryParams(queryParams)), convertBodyParams(queryParams), {
+      getRequest = requestUtil[methodName]("".concat(url).concat(convertUrlQueryParams(queryParams)), convertBodyParams(_objectSpread2(_objectSpread2({}, queryParams), {}, {
+        requestType: requestType
+      })), {
         headers: _objectSpread2({}, extralHeaders)
       });
     } else {
@@ -10296,6 +10307,16 @@ function commonFun(type, prefixUrl, parentProps) {
           }
         }
       }
+    }, {
+      name: 'qp-enableDropShipping-eq',
+      label: '启用工厂直发',
+      type: 'select',
+      initialSource: getDictionarySource$1('BSC00001')
+    }, {
+      name: 'qp-enableVmiStock-eq',
+      label: '启用VMI库存管理',
+      type: 'select',
+      initialSource: getDictionarySource$1('BSC00001')
     }];
     var _queryHeaderParams = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
@@ -10330,6 +10351,20 @@ function commonFun(type, prefixUrl, parentProps) {
         title: '使用组织',
         dataIndex: 'salesOrgName',
         defaultSort: 4
+      }, {
+        title: '启用工厂直发',
+        dataIndex: 'enableDropShipping',
+        defaultSort: 5,
+        render: function render(text) {
+          return getDictionaryTextByValue$1('BSC00001', text);
+        }
+      }, {
+        title: '启用VMI库存管理',
+        dataIndex: 'enableVmiStock',
+        defaultSort: 6,
+        render: function render(text) {
+          return getDictionaryTextByValue$1('BSC00001', text);
+        }
       }]
     }, modalTableBusProps);
   }

package/package.json

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

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

@@ -266,6 +266,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
         } },
+      { name: 'qp-enableDropShipping-eq', label: '启用工厂直发', type: 'select', initialSource: getDictionarySource('BSC00001')  },
+      { name: 'qp-enableVmiStock-eq', label: '启用VMI库存管理', type: 'select', initialSource: getDictionarySource('BSC00001')  },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -305,6 +307,18 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           dataIndex: 'salesOrgName',
           defaultSort: 4,
         },
+        {
+          title: '启用工厂直发',
+          dataIndex: 'enableDropShipping',
+          defaultSort: 5,
+          render: (text: number) => getDictionaryTextByValue('BSC00001', text),
+        },
+        {
+          title: '启用VMI库存管理',
+          dataIndex: 'enableVmiStock',
+          defaultSort: 6,
+          render: (text: number) => getDictionaryTextByValue('BSC00001', text),
+        },
       ],
       ...modalTableBusProps
     }

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

@@ -13,7 +13,7 @@ export const getValue = (value: any, selectMode?: any) => {
 }
 
 const QueryMutipleSearchSelect = ({ onValueChange, requestConfig={}, selectProps={}, ctx }: any) => {
-  const { filter, method = 'get', url, extralHeaders = {}, otherParams = {}, specialBracket = false, noNeedSplit = false, } = requestConfig;
+  const { filter, method = 'get', url, extralHeaders = {}, otherParams = {}, specialBracket = false, noNeedSplit = false, requestType = 'get' } = requestConfig;
   const selectParamsKey = filter || 'qp-codeAndName-like';
   const resultSourceKey = handleSourceName(requestConfig?.sourceName || ctx?.name || 'skuCode')
   const currentSelectProps = {
@@ -106,7 +106,7 @@ const QueryMutipleSearchSelect = ({ onValueChange, requestConfig={}, selectProps
     let getRequest;
     const methodName = method?.toLocaleLowerCase();
     if(['post','patch','put'].includes(methodName)) {
-      getRequest = request[methodName](`${url}${convertUrlQueryParams(queryParams)}`,convertBodyParams(queryParams),{headers: { ...extralHeaders }})
+      getRequest = request[methodName](`${url}${convertUrlQueryParams(queryParams)}`,convertBodyParams({...queryParams, requestType}),{headers: { ...extralHeaders }})
     } else {
       getRequest = request.get( `${url}${convertUrlQueryParams(queryParams)}`,{headers: { ...extralHeaders }})
     }

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

@@ -55,6 +55,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     viewShowValueStr, // 详情展示值,不传展示组件处理的默认值
     searchStartLength, // 默认不校验长度去搜索，如果配置了，则按照配置项长度进行处理搜索
     isQuery = false, // 是否是查询条件
+    requestType = 'get', // 自定义弹窗时候的查询方式 如果是post 并且需要所有参数都放在body里 需要设置此参数 && 兼容之前逻辑
   } = 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')
@@ -241,7 +242,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     let getRequest;
     const methodName = method?.toLocaleLowerCase?.();
     if(['post','patch','put'].includes(methodName)) {
-      getRequest = request[methodName](`${url}${convertUrlQueryParams(queryParams)}`,convertBodyParams(queryParams), { headers: { ...extralHeaders }})
+      getRequest = request[methodName](`${url}${convertUrlQueryParams(queryParams)}`,convertBodyParams({...queryParams, requestType}), { headers: { ...extralHeaders }})
     } else {
       getRequest = request.get( `${url}${convertUrlQueryParams(queryParams)}`,{headers: { ...extralHeaders }})
     }

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

@@ -116,23 +116,25 @@ export const handleParams = (params: any) => {
         delete params[key];
       } else if (element && key.indexOf('*fullDate*') >= 0) {
         const dataParams = key.split('*fullDate*');
-        dataParams.forEach((value, index) => {
-          if (index === 0) {
-            params[value] = moment(element[index])
-              .millisecond(0)
-              .second(0)
-              .minute(0)
-              .hour(0)
-              .format('YYYY-MM-DD HH:mm:ss');
-          } else {
-            params[value] = moment(element[index])
-              .millisecond(59)
-              .second(59)
-              .minute(59)
-              .hour(23)
-              .format('YYYY-MM-DD HH:mm:ss');
-          }
-        });
+        if(params?.[key] && params?.[key]?.length) {
+          dataParams.forEach((value, index) => {
+            if (index === 0) {
+              params[value] = moment(element[index])
+                .millisecond(0)
+                .second(0)
+                .minute(0)
+                .hour(0)
+                .format('YYYY-MM-DD HH:mm:ss');
+            } else {
+              params[value] = moment(element[index])
+                .millisecond(59)
+                .second(59)
+                .minute(59)
+                .hour(23)
+                .format('YYYY-MM-DD HH:mm:ss');
+            }
+          });
+        }
         delete params[key];
       } else if (typeof element === 'boolean' && key.indexOf('*checkBox*') >= 0) {
         const dataParams = key.split('*checkBox*');
@@ -234,11 +236,13 @@ export const convertBodyParams = (params: any) => {
 
   // body参数来源：sku选择器固定参数 > 调用所传bodyParams > 默认参数-无
   // post 方式参数 来源默认的bodyParams 以及原有搜索项的参数
+  if(params?.requestType && (params?.requestType?.toLocaleLowerCase() == 'post')) {
+    return omit({
+      ...params?.bodyParams,
+      ...params,
+    },['bodyParams', 'noUrlQueryParams', 'requestType']);
+  }
   return unique_params || params?.bodyParams || null;
-  // return unique_params || omit({
-  //   ...params,
-  //   ...params?.bodyParams,
-  // },['bodyParams', 'noUrlQueryParams']);
 }