@bit-sun/business-component 3.1.10-alpha.5 → 3.1.10-alpha.6

package/dist/index.esm.js

@@ -8323,13 +8323,7 @@ var hasDictSharingType = (_getDictionarySource = getDictionarySource$1('UC000013
 var sharingTypeDataList = hasDictSharingType && getDictionarySource$1('UC000013') || sharingType;
 function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps, hiddenFields) {
   // 默认type === 'supplier' 供应商选择器
-  var requestConfig = _objectSpread2({
-    url: "".concat(prefixUrl.selectPrefix, "/supplier"),
-    filter: 'qp-name,code-orGroup,like',
-    otherParams: {
-      sorter: 'desc-id'
-    }
-  }, requestConfigProp);
+  var requestConfig = _objectSpread2({}, requestConfigProp);
   /*
   * 处理 格式化下拉框数据源
   * reData 必传 promise返回响应的数据 格式为[{},{},{},...] Promise.all第一个参数数组有多少个数组长度就是多少，其中每个对象为每次请求的结果数据
@@ -8389,6 +8383,12 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps, hidde
     tableColumns: []
   }, modalTableBusProps);
   var needModalTable = (modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needModalTable) !== undefined ? modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needModalTable : true;
+  //自定义 配置取外层传过来的
+  if (type === 'custom') {
+    modalTableProps = _objectSpread2({
+      requestConfig: requestConfig
+    }, modalTableBusProps);
+  }
   // 供应商选择器
   if (type === 'supplier') {
     tableSearchForm = [{
@@ -10818,7 +10818,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps, hidde
 
 var MemoSearchSelect = /*#__PURE__*/React$1.memo(SearchSelect);
 var BusinessSearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
-  var businessType = (props === null || props === void 0 ? void 0 : props.selectBusinessType) || 'supplier';
+  var businessType = (props === null || props === void 0 ? void 0 : props.selectBusinessType) || 'custom';
   var prefixUrl = (props === null || props === void 0 ? void 0 : props.prefixUrl) || {
     selectPrefix: handleDefaultPrefixUrl(businessType),
     formSelectFix: handleDefaultPrefixUrl(businessType)

package/dist/index.js

@@ -8346,13 +8346,7 @@ var hasDictSharingType = (_getDictionarySource = getDictionarySource$1('UC000013
 var sharingTypeDataList = hasDictSharingType && getDictionarySource$1('UC000013') || sharingType;
 function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps, hiddenFields) {
   // 默认type === 'supplier' 供应商选择器
-  var requestConfig = _objectSpread2({
-    url: "".concat(prefixUrl.selectPrefix, "/supplier"),
-    filter: 'qp-name,code-orGroup,like',
-    otherParams: {
-      sorter: 'desc-id'
-    }
-  }, requestConfigProp);
+  var requestConfig = _objectSpread2({}, requestConfigProp);
   /*
   * 处理 格式化下拉框数据源
   * reData 必传 promise返回响应的数据 格式为[{},{},{},...] Promise.all第一个参数数组有多少个数组长度就是多少，其中每个对象为每次请求的结果数据
@@ -8412,6 +8406,12 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps, hidde
     tableColumns: []
   }, modalTableBusProps);
   var needModalTable = (modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needModalTable) !== undefined ? modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needModalTable : true;
+  //自定义 配置取外层传过来的
+  if (type === 'custom') {
+    modalTableProps = _objectSpread2({
+      requestConfig: requestConfig
+    }, modalTableBusProps);
+  }
   // 供应商选择器
   if (type === 'supplier') {
     tableSearchForm = [{
@@ -10841,7 +10841,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps, hidde
 
 var MemoSearchSelect = /*#__PURE__*/React__default['default'].memo(SearchSelect);
 var BusinessSearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
-  var businessType = (props === null || props === void 0 ? void 0 : props.selectBusinessType) || 'supplier';
+  var businessType = (props === null || props === void 0 ? void 0 : props.selectBusinessType) || 'custom';
   var prefixUrl = (props === null || props === void 0 ? void 0 : props.prefixUrl) || {
     selectPrefix: handleDefaultPrefixUrl(businessType),
     formSelectFix: handleDefaultPrefixUrl(businessType)

package/package.json

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

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

@@ -13,11 +13,11 @@ const sharingTypeDataList = hasDictSharingType && getDictionarySource('UC000013'
 export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: any, modalTableBusProps?:any, hiddenFields?:any) {
   // 默认type === 'supplier' 供应商选择器
   let requestConfig = {
-    url: `${prefixUrl.selectPrefix}/supplier`,
-    filter: 'qp-name,code-orGroup,like', // 过滤参数
-    otherParams: {
-      sorter: 'desc-id'
-    }, // 默认参数
+    // url: `${prefixUrl.selectPrefix}/supplier`,
+    // filter: 'qp-name,code-orGroup,like', // 过滤参数
+    // otherParams: {
+    //   sorter: 'desc-id'
+    // }, // 默认参数
     ...requestConfigProp
   }
 
@@ -74,6 +74,14 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
   }
   let needModalTable = modalTableBusProps?.needModalTable !== undefined ? modalTableBusProps?.needModalTable : true;
 
+
+  //自定义 配置取外层传过来的
+  if (type === 'custom') { 
+    modalTableProps = {
+      requestConfig,
+      ...modalTableBusProps,
+    }
+  }
   // 供应商选择器
   if(type === 'supplier') {
     tableSearchForm = [

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

@@ -13,7 +13,7 @@ import SearchSelect from '@/components/Functional/SearchSelect';
 const MemoSearchSelect = React.memo(SearchSelect)
 
 const BusinessSearchSelect = forwardRef((props: any, ref: any) => {
-  const businessType = props?.selectBusinessType || 'supplier';
+  const businessType = props?.selectBusinessType || 'custom';
   const prefixUrl = props?.prefixUrl || { selectPrefix: handleDefaultPrefixUrl(businessType), formSelectFix: handleDefaultPrefixUrl(businessType) };
   const innerRef = useRef();