Commit d9ea02ad20fca65d5fdb7c8d70d6cfb21aa3573d

Authored by Min
1 parent 7ee67a6d

1.移动端通过入参isweixin判断是否是微信还是移动端app

src/mobile/common/CommobileSubBill.js
@@ -2076,7 +2076,7 @@ class CommobileBill extends React.Component { @@ -2076,7 +2076,7 @@ class CommobileBill extends React.Component {
2076 2076
2077 2077
2078 const dWidth = document.documentElement.clientWidth || document.body.clientWidth; /* 获取手机视窗宽度 */ 2078 const dWidth = document.documentElement.clientWidth || document.body.clientWidth; /* 获取手机视窗宽度 */
2079 - const dHeight = document.documentElement.clientHeight || document.body.clientHeight; /* 获取手机视窗宽度 */ 2079 + const dHeight = document.documentElement.clientHeight || document.body.clientHeight; /* 获取手机视窗宽1度 */
2080 const formItemLayout = { labelCol: { span: 2 }, wrapperCol: { span: 18 } }; 2080 const formItemLayout = { labelCol: { span: 2 }, wrapperCol: { span: 18 } };
2081 const style = { 2081 const style = {
2082 display: 'flex', 2082 display: 'flex',
@@ -2094,7 +2094,7 @@ class CommobileBill extends React.Component { @@ -2094,7 +2094,7 @@ class CommobileBill extends React.Component {
2094 const rowSum = (rowData, sectionID, rowID) => { 2094 const rowSum = (rowData, sectionID, rowID) => {
2095 return ( 2095 return (
2096 <div style={{ backgroundColor: '#f0f0f0', marginBottom: '8px', borderBottom:'6px solid rgb(236, 236, 237)' }} key={rowID}> 2096 <div style={{ backgroundColor: '#f0f0f0', marginBottom: '8px', borderBottom:'6px solid rgb(236, 236, 237)' }} key={rowID}>
2097 - {commonUtils.isEmptyObject(slaveConfig) ? '' : slaveConfig.gdsconfigformslave.filter(item => item.bVisible && item.sName !== '').map((child) => { 2097 + 2323232 {commonUtils.isEmptyObject(slaveConfig) ? '' : slaveConfig.gdsconfigformslave.filter(item => item.bVisible && item.sName !== '').map((child) => {
2098 const sMemo = child.sName.toLowerCase().endsWith('memo'); 2098 const sMemo = child.sName.toLowerCase().endsWith('memo');
2099 // sUseInfo是指被其他单据调用,或者被审核 2099 // sUseInfo是指被其他单据调用,或者被审核
2100 let enabledNew = (enabled && !child.bReadonly && !child.specialControl && commonUtils.isEmpty(sUseInfo)); 2100 let enabledNew = (enabled && !child.bReadonly && !child.specialControl && commonUtils.isEmpty(sUseInfo));
@@ -2261,6 +2261,11 @@ const TabComponentSlave = (props) =&gt; { @@ -2261,6 +2261,11 @@ const TabComponentSlave = (props) =&gt; {
2261 2261
2262 const { masterConfig, masterData, slaveData: slaveDataOld, slaveConfig, sModelsId, enabled, app, sUseInfo, searchSlaveData:searchSlaveDataOld = [], bSearchModel } = props; 2262 const { masterConfig, masterData, slaveData: slaveDataOld, slaveConfig, sModelsId, enabled, app, sUseInfo, searchSlaveData:searchSlaveDataOld = [], bSearchModel } = props;
2263 2263
  2264 + // 需要优化性能的模块ID列表(PDA慢的界面)
  2265 + const performanceOptimizedModels = [
  2266 + '12710101117220510358930',
  2267 + ];
  2268 + const isPerformanceOptimized = performanceOptimizedModels.includes(sModelsId);
2264 2269
2265 const slaveDataOld2 = slaveDataOld || []; 2270 const slaveDataOld2 = slaveDataOld || [];
2266 let showList = slaveDataOld2; 2271 let showList = slaveDataOld2;
@@ -2443,7 +2448,7 @@ const TabComponentSlave = (props) =&gt; { @@ -2443,7 +2448,7 @@ const TabComponentSlave = (props) =&gt; {
2443 pageSize={commonConfig.pageSize} 2448 pageSize={commonConfig.pageSize}
2444 initialListSize={0} 2449 initialListSize={0}
2445 onScroll={() => {}} 2450 onScroll={() => {}}
2446 - scrollRenderAheadDistance={500} 2451 + scrollRenderAheadDistance={isPerformanceOptimized ? 100 : 500}
2447 onEndReachedThreshold={10} 2452 onEndReachedThreshold={10}
2448 className={styles.listView} 2453 className={styles.listView}
2449 /> 2454 />
@@ -2467,6 +2472,13 @@ const TabComponentSlave = (props) =&gt; { @@ -2467,6 +2472,13 @@ const TabComponentSlave = (props) =&gt; {
2467 const TabComponentSlaveChild = (props) => { 2472 const TabComponentSlaveChild = (props) => {
2468 2473
2469 const { masterConfig, masterData, slaveData: slaveDataOld, slaveChildData: slaveChildDataOld, slaveChildConfig, slaveConfig, sModelsId, enabled, app, sUseInfo } = props; 2474 const { masterConfig, masterData, slaveData: slaveDataOld, slaveChildData: slaveChildDataOld, slaveChildConfig, slaveConfig, sModelsId, enabled, app, sUseInfo } = props;
  2475 +
  2476 + // 需要优化性能的模块ID列表(PDA慢的界面)
  2477 + const performanceOptimizedModels = [
  2478 + '12710101117220510358930',
  2479 + ];
  2480 + const isPerformanceOptimized = performanceOptimizedModels.includes(sModelsId);
  2481 +
2470 const slaveDataOld2 = slaveDataOld === undefined ? [] : slaveDataOld; 2482 const slaveDataOld2 = slaveDataOld === undefined ? [] : slaveDataOld;
2471 const slaveData = dataSource.cloneWithRows(slaveDataOld2); 2483 const slaveData = dataSource.cloneWithRows(slaveDataOld2);
2472 2484
src/mobile/components/FileManageMobileWx.js
@@ -290,6 +290,7 @@ class FileManageMobile extends React.Component { @@ -290,6 +290,7 @@ class FileManageMobile extends React.Component {
290 /* 将二进制地址存储到数据中 */ 290 /* 将二进制地址存储到数据中 */
291 const value ={ picUrl : [base64Url]}; 291 const value ={ picUrl : [base64Url]};
292 const returnData = (await commonServices.postValueService(app.token, value, dataUrl)).data; 292 const returnData = (await commonServices.postValueService(app.token, value, dataUrl)).data;
  293 + console.log('结果返回:', returnData);
293 /* 拿到上传返回的数据库地址 */ 294 /* 拿到上传返回的数据库地址 */
294 const dataReturn = returnData.dataset.rows; 295 const dataReturn = returnData.dataset.rows;
295 if (commonUtils.isNotEmptyArr(dataReturn) && dataReturn.length > 0) { 296 if (commonUtils.isNotEmptyArr(dataReturn) && dataReturn.length > 0) {
@@ -395,7 +396,8 @@ class FileManageMobile extends React.Component { @@ -395,7 +396,8 @@ class FileManageMobile extends React.Component {
395 reader.readAsDataURL(file); 396 reader.readAsDataURL(file);
396 reader.onload = async function (e) { 397 reader.onload = async function (e) {
397 const urlArr = [reader.result]; 398 const urlArr = [reader.result];
398 - const dataUrl = `${commonConfig.server_host}file/mobileuploadwechat?sModelsId=${sModelsId}&token=${token}`; 399 + const dataUrl = `${commonConfig.server_host}file/mobileuploadwechat?sModelsId=${sModelsId}&token=${token}&
  400 + sLanguage=sChinese`;
399 /* 将二进制地址存储到数据中 */ 401 /* 将二进制地址存储到数据中 */
400 const value ={ picUrl : urlArr}; 402 const value ={ picUrl : urlArr};
401 const returnData = (await commonServices.postValueService(app.token, value, dataUrl)).data; 403 const returnData = (await commonServices.postValueService(app.token, value, dataUrl)).data;
src/utils/config.js
@@ -27,7 +27,7 @@ export default { @@ -27,7 +27,7 @@ export default {
27 pageSize: 20, /* 一页个数 */ 27 pageSize: 20, /* 一页个数 */
28 pageSizeOptions: ['20', '50', '100', '200', '500', '1000', '2000', '5000'], /* 选择页数参数 */ 28 pageSizeOptions: ['20', '50', '100', '200', '500', '1000', '2000', '5000'], /* 选择页数参数 */
29 hasSum: false, 29 hasSum: false,
30 - isWeiXin: false, 30 + isWeiXin: location.search?.includes('isweixin'),
31 server_host: bHttps ? `https:${webSite.ipAddress}` : `http:${webSite.ipAddress}`, /* 外网连内网服务器地址 */ 31 server_host: bHttps ? `https:${webSite.ipAddress}` : `http:${webSite.ipAddress}`, /* 外网连内网服务器地址 */
32 ws_host: bHttps ? `wss:${webSite.ipAddress}` : `ws:${webSite.ipAddress}`, 32 ws_host: bHttps ? `wss:${webSite.ipAddress}` : `ws:${webSite.ipAddress}`,
33 file_host: bHttps ? `https:${webSite.fileAddress}` : `http:${webSite.fileAddress}`, /* 外网连内网服务器地址 */ 33 file_host: bHttps ? `https:${webSite.fileAddress}` : `http:${webSite.fileAddress}`, /* 外网连内网服务器地址 */