xlyErp / xlyUmi

Commit 749504f5751b22fae3640890e149b9dd30ed435a

Authored by Min
1 parent 6793b1cd

1.处理选择颜色，再次加载的时候 ，没勾选已选中数据

Inline Side-by-side
Showing 5 changed files with 8 additions and 6 deletions
src/components/Common/CommonBillEvent.js
  View file @749504f
... ... @@ -3477,7 +3477,7 @@ export default (ChildComponent) => {
3477 3477 const tableRow = tableData.find(item => item.sId === treeSelectedKeys[0]);
3478 3478 if(commonUtils.isNotEmptyObject(tableRow)) {
3479 3479 const controlChildData = tableData.filter(item => commonUtils.isNotEmptyObject(item.sControlParentId) && item.sControlParentId === tableRow.sNodeId);
3480   - console.log('ziji', controlChildData);
  3480 +
3481 3481 controlChildData.forEach((itemNew) => {
3482 3482 tableSelectedRowKeys.push(itemNew.sId);
3483 3483 });
... ...
src/components/Common/CommonListSelectFlex/index.js
  View file @749504f
... ... @@ -246,7 +246,7 @@ class CommonList extends Component {
246 246 }
247 247  
248 248 handleTableSelectRowChange = (name, selectedRowKeys, changeValue, chooseProcessParams) => { /* 表格行选择 */
249   - const bContinueClick = true;
  249 + const bContinueClick = false;
250 250 if (bContinueClick) { /* 连续点击 */
251 251 this.handleTableSelectRowChangeContinue(name, selectedRowKeys, changeValue, chooseProcessParams);
252 252 } else {
... ... @@ -462,7 +462,7 @@ const CommonListComponent = Form.create({
462 462 tableProps: {
463 463 rowKey: 'sSlaveId', pagination, onChange: props.onTitleChange, chooseProcessParams: true, sModelsType, AutoTableHeight: 350, // chooseProcessParams为选择工序中点击工序名称表格行出现弹窗
464 464 },
465   - bContinueClick: true,
  465 + // bContinueClick: true,
466 466 };
467 467  
468 468 const tableFilterProps = {
... ...
src/components/Common/CommonTable/index.js
  View file @749504f
... ... @@ -7528,7 +7528,7 @@ const CommonTable = (props) => {
7528 7528 setUpdateRowNumTime(pre => pre + 1);
7529 7529 }
7530 7530 const uniqueTableId = `table_${props.formId}_${props.config?.sId}`;
7531   -
  7531 +
7532 7532 addState.xlyTableMax = props.app?.currentPane?.route === "/indexPage/commonList" && localStorage.getItem(`${commonConfig.prefix}TableMax`);
7533 7533  
7534 7534 return (
... ...
src/components/Manufacture/ProcessCardPackTableTreeNew/index.js
  View file @749504f
... ... @@ -225,7 +225,7 @@ const ProcessCardPackTableTreeNewEvent = props => {
225 225 }, {});
226 226  
227 227 const func = props[`${tableName}Props`]?.[funcName];
228   - console.log("=====func", func);
  228 +
229 229 if (func) {
230 230 return func(params);
231 231 }
... ...
src/utils/config.js
  View file @749504f
... ... @@ -9,7 +9,9 @@ const API = process.env.API;
9 9 const bHttps = false;
10 10 export const webSite = {
11 11 faceAddress: isDev ? '//118.178.19.35:8088/xlyFace' : '//' + location.host + '/xlyFace',
12   - ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//118.178.19.35:8088/xlyEntry/' : '//' + location.host + '/xlyEntry/',
  12 + ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//km5cjx.gnway.cc:36867/xlyEntry/' : '//' + location.host + '/xlyEntry/',
  13 + // ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//118.178.19.35:8088/xlyEntry/' : '//' + location.host + '/xlyEntry/',
  14 + // ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//8.130.144.93:8088/xlyEntry/' : '//' + location.host + '/xlyEntry/',
13 15 interfaceAddress: localStorage.apiAddress ? localStorage.apiAddress : isDev ? '//118.178.19.35:8088/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址
14 16 fileAddress: isDev ? '//118.178.19.35:8088/xlyReport/' : '//' + location.host + '/xlyReport/', // 接口地址
15 17 fileAddressEbc: isDev ? '//118.178.19.35:8088/xlyReport/' : '//' + location.host + '/xlyReport/',
... ...