Commit 41f59973 authored by 周宏民's avatar 周宏民

fix: 修改集成登录跳转的bug

parent b278ba54
Pipeline #93603 waiting for manual action with stages
......@@ -156,7 +156,7 @@ const IntegratedSwitch = props => {
}
// props.instance && props.instance.updateConfig(config);
loginAction && loginAction.getUserInfoAndConfig('', true);
loginAction && loginAction.getUserInfoAndConfig('', true, item.type);
} else {
let { url } = item;
if (url?.indexOf('{userId}') >= 0) {
......
......@@ -45,14 +45,13 @@ const Master = props => {
}, [isPanda]);
const init = async () => {
if (visible || !configSetting) {
console.log('🚀 ~ configSetting:', configSetting);
form.setFieldsValue({
logo: configSetting.logo,
displayMode: configSetting.displayMode || 'default',
subtitle: configSetting.subtitle,
title: configSetting.title,
loginTemplate: configSetting.loginTemplate,
loadingTime: configSetting.loadingTime,
// loadingTime: configSetting.loadingTime,
mapSettings: configSetting.mapSettings,
client: configSetting.client,
isShowTip: configSetting.isShowTip,
......@@ -82,7 +81,7 @@ const Master = props => {
loginTemplate: obj.loginTemplate || 'Default',
title: obj.title,
displayMode: obj.displayMode,
loadingTime: obj.loadingTime,
// loadingTime: obj.loadingTime,
client: obj.client || 'city',
isShowTip: obj.isShowTip,
isShowPanel: obj.isShowPanel,
......@@ -291,7 +290,7 @@ const Master = props => {
<Switch checkedChildren="显示" unCheckedChildren="不显示" />
</Item>
<Item
{/* <Item
label="加载时间"
name="loadingTime"
rules={[
......@@ -302,7 +301,7 @@ const Master = props => {
]}
>
<InputNumber min={0} max={10} addonAfter="秒" />
</Item>
</Item> */}
</Form>
<PreviewModal
visible={previewModal}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment