From 672726d6835dfb5e9e768b914c370bba70609165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <hetongchong@csxjy.com>
Date: Sat, 2 Apr 2022 16:41:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/webpack.config.prod.js                   | 7 +++++--
 src/managements/components/layouts/index.jsx    | 6 ++++--
 src/managements/components/layouts/index.scss   | 2 +-
 src/managements/jurisdiction/index.scss         | 2 +-
 src/managements/jurisdiction/menuList/index.jsx | 1 +
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
index 16563866..55730143 100644
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@@ -19,7 +19,9 @@ const getClientEnvironment = require("./env");
 
 let publicPath = "/react/build/";
 const publicUrl = publicPath.slice(0, -1);
-const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== "false";
+// const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== "false";
+const shouldUseSourceMap = process.env.NODE_ENV !== "production";
+
 const env = getClientEnvironment(publicPath);
 
 // This is the production configuration.
@@ -54,7 +56,8 @@ module.exports = {
   },
   bail: true,
   mode: "production",
-  devtool: false, //测试版
+  // devtool: false, //测试版
+  devtool: shouldUseSourceMap?'source-map':false,
   entry: [require.resolve("./polyfills"), paths.appIndexJs],
   output: {
     path: paths.appBuild,
diff --git a/src/managements/components/layouts/index.jsx b/src/managements/components/layouts/index.jsx
index 5e0fefaf..2acfdeb5 100644
--- a/src/managements/components/layouts/index.jsx
+++ b/src/managements/components/layouts/index.jsx
@@ -101,8 +101,10 @@ export default (props) => {
   }
 
   function iframeLoad() {
+    console.log('iframeLoad----------iframeLoad');
     try {
-      document.getElementById("iframe").height = document.getElementById("iframe").contentWindow.top.document.documentElement.scrollHeight;
+      let myIframe=document.getElementById("iframe");
+      myIframe.height = myIframe.contentWindow.top.document.documentElement.scrollHeight;
     } catch (err) {
       console.error(err);
     }
@@ -145,7 +147,7 @@ export default (props) => {
       <div className="managements">
         <div className="head-title">{head(keyPath)}</div>
         {acitve && acitve.urlType && acitve.urlType !== 'self' ?
-          <iframe id="iframe" className="iframe-item" src={`${setting[acitve.urlType]}${acitve.location && acitve.location.startsWith('/administration') ? acitve.location.replace(/\/administration/, "") : acitve.location}?${acitve.params}`} onLoad={iframeLoad}></iframe>
+          <iframe id="iframe" className="iframe-item" src={`${setting[acitve.urlType]}${acitve.location && acitve.location.startsWith('/administration') ? acitve.location.replace(/\/administration/, "") : acitve.location}?${acitve.params||'layout=none'}`} onLoad={iframeLoad}></iframe>
           : children
         }
       </div>
diff --git a/src/managements/components/layouts/index.scss b/src/managements/components/layouts/index.scss
index 881fa727..bf9f6dd1 100644
--- a/src/managements/components/layouts/index.scss
+++ b/src/managements/components/layouts/index.scss
@@ -58,7 +58,7 @@
   }
   .iframe-item{
     width: 100%;
-    height: 100vh;
+    min-height: 100vh;
     border: 0;
   }
   .ant-input, .ant-select-selection{
diff --git a/src/managements/jurisdiction/index.scss b/src/managements/jurisdiction/index.scss
index 8764f001..ecf1076e 100644
--- a/src/managements/jurisdiction/index.scss
+++ b/src/managements/jurisdiction/index.scss
@@ -4,7 +4,7 @@
     justify-content: flex-end;
 }
 .menuDetail{
-    div{
+    >div{
         display: flex;
         align-items: center;
     }
diff --git a/src/managements/jurisdiction/menuList/index.jsx b/src/managements/jurisdiction/menuList/index.jsx
index 409396e8..9e8edfec 100644
--- a/src/managements/jurisdiction/menuList/index.jsx
+++ b/src/managements/jurisdiction/menuList/index.jsx
@@ -166,6 +166,7 @@ export default Form.create()(({ form}) => {
       icon: values.icon,
       hidden: values.hidden,
       level: parseInt(values.parentKey)+1,
+      urlType:values.urlType,
     }
     createMenu(params).then(response=>{
       if(response && response.message=='success'){