@bit-sun/business-component 2.4.5 → 2.4.7

package/dist/index.esm.js

@@ -734,19 +734,19 @@ function getLoginHeaderInfo(headerkey) {
   }
 }
 function getGuoyaoshukeCompanyId() {
-  return getLoginHeaderInfo('COMPANY_ID');
+  return getLoginHeaderInfo('gksk-company-id');
 }
 function getGuoyaoshukeTenantCode() {
-  return getLoginHeaderInfo('TENANT_ID');
+  return getLoginHeaderInfo('gksk-tenant-code');
 }
 function getGuoyaoshukeTenantId() {
-  return getLoginHeaderInfo('TENANT_CODE') || 1;
+  return getLoginHeaderInfo('gksk-tenant-id') || 1;
 }
 function getGuoyaoshukeToken() {
   return getLoginHeaderInfo('gksk-access-token');
 }
 function getGuoyaoshukeUscCode() {
-  return getLoginHeaderInfo('USC_CODE');
+  return getLoginHeaderInfo('gksk-usc-code');
 }
 //--------国药项目登录信息---------
 
@@ -10386,20 +10386,20 @@ var handleDefaultProps = function handleDefaultProps(type, otherRequestConfig) {
       result = {
         treeCheckable: true,
         isChoose: true,
-        remoteSource: {
+        remoteSource: _objectSpread2({
           url: "/user/orgViewNode/common/getTreeForOrgViewAndTenant",
           headers: otherRequestConfig === null || otherRequestConfig === void 0 ? void 0 : otherRequestConfig.extralHeaders,
           initialParams: {
             'orgViewCode': 'administrative-organization-view'
           },
           resKeyValue: ['code', 'name']
-        }
+        }, otherRequestConfig)
       };
       break;
     case 'sales-organization':
       result = {
         isChoose: true,
-        remoteSource: {
+        remoteSource: _objectSpread2({
           url: "/user/orgViewNode/common/getTreeForOrgViewAndTenant",
           headers: otherRequestConfig === null || otherRequestConfig === void 0 ? void 0 : otherRequestConfig.extralHeaders,
           initialParams: {
@@ -10407,13 +10407,13 @@ var handleDefaultProps = function handleDefaultProps(type, otherRequestConfig) {
             'qp-status-eq': 10
           },
           resKeyValue: ['code', 'name']
-        }
+        }, otherRequestConfig)
       };
       break;
     case 'purchase-organization':
       result = {
         isChoose: true,
-        remoteSource: {
+        remoteSource: _objectSpread2({
           url: "/user/orgViewNode/common/getTreeForOrgViewAndTenant",
           headers: otherRequestConfig === null || otherRequestConfig === void 0 ? void 0 : otherRequestConfig.extralHeaders,
           initialParams: {
@@ -10421,13 +10421,13 @@ var handleDefaultProps = function handleDefaultProps(type, otherRequestConfig) {
             'qp-status-eq': 10
           },
           resKeyValue: ['code', 'name']
-        }
+        }, otherRequestConfig)
       };
       break;
     case 'stock-organization':
       result = {
         isChoose: true,
-        remoteSource: {
+        remoteSource: _objectSpread2({
           url: "/user/orgViewNode/common/getTreeForOrgViewAndTenant",
           headers: otherRequestConfig === null || otherRequestConfig === void 0 ? void 0 : otherRequestConfig.extralHeaders,
           initialParams: {
@@ -10435,13 +10435,13 @@ var handleDefaultProps = function handleDefaultProps(type, otherRequestConfig) {
             'qp-status-eq': 10
           },
           resKeyValue: ['code', 'name']
-        }
+        }, otherRequestConfig)
       };
       break;
     case 'settle-organization':
       result = {
         isChoose: true,
-        remoteSource: {
+        remoteSource: _objectSpread2({
           url: "/user/orgViewNode/common/getTreeForOrgViewAndTenant",
           headers: otherRequestConfig === null || otherRequestConfig === void 0 ? void 0 : otherRequestConfig.extralHeaders,
           initialParams: {
@@ -10449,31 +10449,31 @@ var handleDefaultProps = function handleDefaultProps(type, otherRequestConfig) {
             'qp-status-eq': 10
           },
           resKeyValue: ['code', 'name']
-        }
+        }, otherRequestConfig)
       };
       break;
     case 'market-area':
       result = {
         isChoose: true,
-        remoteSource: {
+        remoteSource: _objectSpread2({
           url: "/channel-manage/tagNode/getTree/10",
           headers: otherRequestConfig === null || otherRequestConfig === void 0 ? void 0 : otherRequestConfig.extralHeaders,
           resKeyValue: ['code', 'name']
-        }
+        }, otherRequestConfig)
       };
       break;
     default:
       result = {
         treeCheckable: true,
         isChoose: true,
-        remoteSource: {
+        remoteSource: _objectSpread2({
           url: "/user/orgViewNode/common/getTreeForOrgViewAndTenant",
           headers: otherRequestConfig === null || otherRequestConfig === void 0 ? void 0 : otherRequestConfig.extralHeaders,
           initialParams: {
             'orgViewCode': 'administrative-organization-view'
           },
           resKeyValue: ['code', 'name']
-        }
+        }, otherRequestConfig)
       };
       break;
   }

package/dist/index.js

@@ -754,19 +754,19 @@ function getLoginHeaderInfo(headerkey) {
   }
 }
 function getGuoyaoshukeCompanyId() {
-  return getLoginHeaderInfo('COMPANY_ID');
+  return getLoginHeaderInfo('gksk-company-id');
 }
 function getGuoyaoshukeTenantCode() {
-  return getLoginHeaderInfo('TENANT_ID');
+  return getLoginHeaderInfo('gksk-tenant-code');
 }
 function getGuoyaoshukeTenantId() {
-  return getLoginHeaderInfo('TENANT_CODE') || 1;
+  return getLoginHeaderInfo('gksk-tenant-id') || 1;
 }
 function getGuoyaoshukeToken() {
   return getLoginHeaderInfo('gksk-access-token');
 }
 function getGuoyaoshukeUscCode() {
-  return getLoginHeaderInfo('USC_CODE');
+  return getLoginHeaderInfo('gksk-usc-code');
 }
 //--------国药项目登录信息---------
 
@@ -10406,20 +10406,20 @@ var handleDefaultProps = function handleDefaultProps(type, otherRequestConfig) {
       result = {
         treeCheckable: true,
         isChoose: true,
-        remoteSource: {
+        remoteSource: _objectSpread2({
           url: "/user/orgViewNode/common/getTreeForOrgViewAndTenant",
           headers: otherRequestConfig === null || otherRequestConfig === void 0 ? void 0 : otherRequestConfig.extralHeaders,
           initialParams: {
             'orgViewCode': 'administrative-organization-view'
           },
           resKeyValue: ['code', 'name']
-        }
+        }, otherRequestConfig)
       };
       break;
     case 'sales-organization':
       result = {
         isChoose: true,
-        remoteSource: {
+        remoteSource: _objectSpread2({
           url: "/user/orgViewNode/common/getTreeForOrgViewAndTenant",
           headers: otherRequestConfig === null || otherRequestConfig === void 0 ? void 0 : otherRequestConfig.extralHeaders,
           initialParams: {
@@ -10427,13 +10427,13 @@ var handleDefaultProps = function handleDefaultProps(type, otherRequestConfig) {
             'qp-status-eq': 10
           },
           resKeyValue: ['code', 'name']
-        }
+        }, otherRequestConfig)
       };
       break;
     case 'purchase-organization':
       result = {
         isChoose: true,
-        remoteSource: {
+        remoteSource: _objectSpread2({
           url: "/user/orgViewNode/common/getTreeForOrgViewAndTenant",
           headers: otherRequestConfig === null || otherRequestConfig === void 0 ? void 0 : otherRequestConfig.extralHeaders,
           initialParams: {
@@ -10441,13 +10441,13 @@ var handleDefaultProps = function handleDefaultProps(type, otherRequestConfig) {
             'qp-status-eq': 10
           },
           resKeyValue: ['code', 'name']
-        }
+        }, otherRequestConfig)
       };
       break;
     case 'stock-organization':
       result = {
         isChoose: true,
-        remoteSource: {
+        remoteSource: _objectSpread2({
           url: "/user/orgViewNode/common/getTreeForOrgViewAndTenant",
           headers: otherRequestConfig === null || otherRequestConfig === void 0 ? void 0 : otherRequestConfig.extralHeaders,
           initialParams: {
@@ -10455,13 +10455,13 @@ var handleDefaultProps = function handleDefaultProps(type, otherRequestConfig) {
             'qp-status-eq': 10
           },
           resKeyValue: ['code', 'name']
-        }
+        }, otherRequestConfig)
       };
       break;
     case 'settle-organization':
       result = {
         isChoose: true,
-        remoteSource: {
+        remoteSource: _objectSpread2({
           url: "/user/orgViewNode/common/getTreeForOrgViewAndTenant",
           headers: otherRequestConfig === null || otherRequestConfig === void 0 ? void 0 : otherRequestConfig.extralHeaders,
           initialParams: {
@@ -10469,31 +10469,31 @@ var handleDefaultProps = function handleDefaultProps(type, otherRequestConfig) {
             'qp-status-eq': 10
           },
           resKeyValue: ['code', 'name']
-        }
+        }, otherRequestConfig)
       };
       break;
     case 'market-area':
       result = {
         isChoose: true,
-        remoteSource: {
+        remoteSource: _objectSpread2({
           url: "/channel-manage/tagNode/getTree/10",
           headers: otherRequestConfig === null || otherRequestConfig === void 0 ? void 0 : otherRequestConfig.extralHeaders,
           resKeyValue: ['code', 'name']
-        }
+        }, otherRequestConfig)
       };
       break;
     default:
       result = {
         treeCheckable: true,
         isChoose: true,
-        remoteSource: {
+        remoteSource: _objectSpread2({
           url: "/user/orgViewNode/common/getTreeForOrgViewAndTenant",
           headers: otherRequestConfig === null || otherRequestConfig === void 0 ? void 0 : otherRequestConfig.extralHeaders,
           initialParams: {
             'orgViewCode': 'administrative-organization-view'
           },
           resKeyValue: ['code', 'name']
-        }
+        }, otherRequestConfig)
       };
       break;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.4.5",
+  "version": "2.4.7",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/TreeSearchSelect/utils.ts

@@ -10,6 +10,7 @@ const handleDefaultProps = (type: string, otherRequestConfig: {extralHeaders?: s
           headers: otherRequestConfig?.extralHeaders,
           initialParams: { 'orgViewCode': 'administrative-organization-view' },
           resKeyValue: ['code', 'name'],
+          ...otherRequestConfig,
         },
       };
       break;
@@ -21,6 +22,7 @@ const handleDefaultProps = (type: string, otherRequestConfig: {extralHeaders?: s
           headers: otherRequestConfig?.extralHeaders,
           initialParams: { 'orgViewCode': 'sales-organizational-view', 'qp-status-eq': 10 }, // status: 10启用 20禁用
           resKeyValue: ['code', 'name'],
+          ...otherRequestConfig,
         },
       };
       break;
@@ -32,6 +34,7 @@ const handleDefaultProps = (type: string, otherRequestConfig: {extralHeaders?: s
           headers: otherRequestConfig?.extralHeaders,
           initialParams: { 'orgViewCode': 'purchase-organizational-view', 'qp-status-eq': 10 },
           resKeyValue: ['code', 'name'],
+          ...otherRequestConfig,
         },
       };
       break;
@@ -43,6 +46,7 @@ const handleDefaultProps = (type: string, otherRequestConfig: {extralHeaders?: s
           headers: otherRequestConfig?.extralHeaders,
           initialParams: { 'orgViewCode': 'stock-organizational-view', 'qp-status-eq': 10 },
           resKeyValue: ['code', 'name'],
+          ...otherRequestConfig,
         },
       };
       break;
@@ -54,6 +58,7 @@ const handleDefaultProps = (type: string, otherRequestConfig: {extralHeaders?: s
           headers: otherRequestConfig?.extralHeaders,
           initialParams: { 'orgViewCode': 'settlement-organizational-view', 'qp-status-eq': 10 },
           resKeyValue: ['code', 'name'],
+          ...otherRequestConfig,
         },
       };
       break;
@@ -64,6 +69,7 @@ const handleDefaultProps = (type: string, otherRequestConfig: {extralHeaders?: s
           url: `/channel-manage/tagNode/getTree/10`,
           headers: otherRequestConfig?.extralHeaders,
           resKeyValue: ['code', 'name'],
+          ...otherRequestConfig,
         },
       };
       break;
@@ -76,6 +82,7 @@ const handleDefaultProps = (type: string, otherRequestConfig: {extralHeaders?: s
           headers: otherRequestConfig?.extralHeaders,
           initialParams: { 'orgViewCode': 'administrative-organization-view' },
           resKeyValue: ['code', 'name'],
+          ...otherRequestConfig,
         },
       };
       break

package/src/utils/CustomLoginInfo.ts

@@ -38,18 +38,18 @@ export function getLoginHeaderInfo(headerkey: string,storage='cookie') {
   }
 }
 export function getGuoyaoshukeCompanyId() {
-  return getLoginHeaderInfo('COMPANY_ID');
+  return getLoginHeaderInfo('gksk-company-id');
 }
 export function getGuoyaoshukeTenantCode() {
-  return getLoginHeaderInfo('TENANT_ID');
+  return getLoginHeaderInfo('gksk-tenant-code');
 }
 export function getGuoyaoshukeTenantId() {
-  return getLoginHeaderInfo('TENANT_CODE') || 1;
+  return getLoginHeaderInfo('gksk-tenant-id') || 1;
 }
 export function getGuoyaoshukeToken() {
   return getLoginHeaderInfo('gksk-access-token');
 }
 export function getGuoyaoshukeUscCode() {
-  return getLoginHeaderInfo('USC_CODE');
+  return getLoginHeaderInfo('gksk-usc-code');
 }
 //--------国药项目登录信息---------