Commit c1497f57dad073ef660c08e01b665a3def301eb5
1 parent
1213124c
1.存储登录缓存，不要记住密码
Showing
2 changed files
with
9 additions
and
7 deletions
src/components/Common/CommonTable/index.js
| @@ -4376,8 +4376,8 @@ class CommonTableRc extends React.Component { | @@ -4376,8 +4376,8 @@ class CommonTableRc extends React.Component { | ||
| 4376 | search = false; | 4376 | search = false; |
| 4377 | } | 4377 | } |
| 4378 | } | 4378 | } |
| 4379 | - console.log(props, 'props.data'); | ||
| 4380 | - | 4379 | + |
| 4380 | + | ||
| 4381 | if ( | 4381 | if ( |
| 4382 | column.dataIndex === "spicture" || | 4382 | column.dataIndex === "spicture" || |
| 4383 | column.dataIndex === "tableLastEmpty" || | 4383 | column.dataIndex === "tableLastEmpty" || |
| @@ -6982,7 +6982,7 @@ class CommonTableRc extends React.Component { | @@ -6982,7 +6982,7 @@ class CommonTableRc extends React.Component { | ||
| 6982 | this.props.onSelectCommonPopup(name, selectConfig, selectData, tb?.name, tb?.config, { index: this.rowClickRef.current }); | 6982 | this.props.onSelectCommonPopup(name, selectConfig, selectData, tb?.name, tb?.config, { index: this.rowClickRef.current }); |
| 6983 | return; | 6983 | return; |
| 6984 | } | 6984 | } |
| 6985 | - | 6985 | + |
| 6986 | this.props.onSelectCommonPopup(name, selectConfig, selectData, tb?.name, commonPopupShowConfig); | 6986 | this.props.onSelectCommonPopup(name, selectConfig, selectData, tb?.name, commonPopupShowConfig); |
| 6987 | } | 6987 | } |
| 6988 | }; | 6988 | }; |
| @@ -12209,7 +12209,7 @@ const useGetTableBtnOprSetting = props => { | @@ -12209,7 +12209,7 @@ const useGetTableBtnOprSetting = props => { | ||
| 12209 | return parts[parts.length - 1].replace(/^btn/i, ''); // 取最后一部分 | 12209 | return parts[parts.length - 1].replace(/^btn/i, ''); // 取最后一部分 |
| 12210 | }; | 12210 | }; |
| 12211 | if (sDefault === '') { | 12211 | if (sDefault === '') { |
| 12212 | - // sDefault = | 12212 | + // sDefault = |
| 12213 | const btnList = gdsconfigformslave.filter(item => item.bVisible && item.sControlName.includes('Btn')) | 12213 | const btnList = gdsconfigformslave.filter(item => item.bVisible && item.sControlName.includes('Btn')) |
| 12214 | sDefault = btnList?.map(item => { | 12214 | sDefault = btnList?.map(item => { |
| 12215 | return getButtonName(item.sControlName.toLowerCase()) | 12215 | return getButtonName(item.sControlName.toLowerCase()) |
src/mes/login/index.js
| @@ -318,9 +318,11 @@ const useLoginEvent = props => { | @@ -318,9 +318,11 @@ const useLoginEvent = props => { | ||
| 318 | JSON.stringify(statusData) | 318 | JSON.stringify(statusData) |
| 319 | ); | 319 | ); |
| 320 | const { masterData = {} } = props; | 320 | const { masterData = {} } = props; |
| 321 | + const storeMasterData = JSON.parse(JSON.stringify(masterNewData)); | ||
| 322 | + delete storeMasterData?.sPassWord; | ||
| 321 | localStorage.setItem( | 323 | localStorage.setItem( |
| 322 | `${commonConfig.prefix}masterData`, | 324 | `${commonConfig.prefix}masterData`, |
| 323 | - JSON.stringify(masterNewData) | 325 | + JSON.stringify(storeMasterData) |
| 324 | ) | 326 | ) |
| 325 | 327 | ||
| 326 | handleUserlogin({ | 328 | handleUserlogin({ |
| @@ -398,7 +400,7 @@ const handleGetFormItem = (props, item) => { | @@ -398,7 +400,7 @@ const handleGetFormItem = (props, item) => { | ||
| 398 | } else if (item.iTag === 3) { | 400 | } else if (item.iTag === 3) { |
| 399 | enabledNew = true; | 401 | enabledNew = true; |
| 400 | } | 402 | } |
| 401 | - | 403 | + |
| 402 | const showTypeProps = { | 404 | const showTypeProps = { |
| 403 | bNewForm: true, | 405 | bNewForm: true, |
| 404 | iColValue: 24, | 406 | iColValue: 24, |
| @@ -436,7 +438,7 @@ const handleGetFormItem = (props, item) => { | @@ -436,7 +438,7 @@ const handleGetFormItem = (props, item) => { | ||
| 436 | style: { backgroundColor: "#eaeaea" } | 438 | style: { backgroundColor: "#eaeaea" } |
| 437 | }; | 439 | }; |
| 438 | console.log(showTypeProps, 'showTypeProps'); | 440 | console.log(showTypeProps, 'showTypeProps'); |
| 439 | - | 441 | + |
| 440 | const showName = sLanguage === 'sChinese' ? item.sChinese : sLanguage === 'sEnglish' ? item.sEnglish | 442 | const showName = sLanguage === 'sChinese' ? item.sChinese : sLanguage === 'sEnglish' ? item.sEnglish |
| 441 | : item.sBig5; | 443 | : item.sBig5; |
| 442 | return ( | 444 | return ( |