diff --git a/src/components/Common/CommonHooks/useCommonBase.js b/src/components/Common/CommonHooks/useCommonBase.js index f548420..67d6208 100644 --- a/src/components/Common/CommonHooks/useCommonBase.js +++ b/src/components/Common/CommonHooks/useCommonBase.js @@ -4191,8 +4191,8 @@ const useSetConfigStatus = props => { sButtonEnabledStr, [] ); - - sButtonEnabled.forEach(sButtonEnabledItem => { + if(commonUtils.isNotEmptyArr(sButtonEnabled) && Array.isArray(sButtonEnabled)) { + sButtonEnabled?.forEach(sButtonEnabledItem => { const { showColumn = [], hideColumn = [], @@ -4244,6 +4244,7 @@ const useSetConfigStatus = props => { ]; } }); + } }); }); diff --git a/src/utils/config.js b/src/utils/config.js index 4a86e2c..8533d31 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -4,9 +4,9 @@ const bHttps = location.protocol === 'https:'; export const webSite = { // ipAddress: '//t0.xlyprint.com:8000/xlyEntry/', /* 服务器地址 */ // faceAddress: isDev ? '//192.168.11.22:8080/xlyFace' : '//' + location.host + '/xlyFace', - fileAddress: isDev ? '//18573763961.gnway.cc:51599/xlyEntry/' : '//' + location.host + '/xlyEntry/', // 接口地址 - faceAddress: isDev ? '//18573763961.gnway.cc:51599/xlyFace' : '//' + location.host + '/xlyFace', - ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//18573763961.gnway.cc:51599/xlyEntry/' : '//' + location.host + '/xlyEntry/', + fileAddress: isDev ? '//122.4.194.110:9098/xlyEntry/' : '//' + location.host + '/xlyEntry/', // 接口地址 + faceAddress: isDev ? '//122.4.194.110:9098/xlyFace' : '//' + location.host + '/xlyFace', + ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//122.4.194.110:9098/xlyEntry/' : '//' + location.host + '/xlyEntry/', interfaceAddress: isDev ? '//18573763961.gnway.cc:51599/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址88 // ipAddress: isDev ? '//ebc.jinjia.com:8091/xlyEntry/' : '//' + location.host + '/xlyEntry/', // interfaceAddress: isDev ? '//ebc.jinjia.com:8091/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址