Merge branch 'master-500-dev-xwx' into 'master-500-dev'

aj配置功能还原



See merge request !483

@@ -71,7 +71,7 @@
                 <el-radio v-model="ajConfigFrom.type" label="0" size="large">菜单</el-radio>
                 <el-radio v-model="ajConfigFrom.type" label="0" size="large">菜单</el-radio>
                 <el-radio v-model="ajConfigFrom.type" label="1" size="large">按钮</el-radio>
                 <el-radio v-model="ajConfigFrom.type" label="1" size="large">按钮</el-radio>
                 <el-radio v-model="ajConfigFrom.type" label="2" size="large">详情页</el-radio>
                 <el-radio v-model="ajConfigFrom.type" label="2" size="large">详情页</el-radio>
-<!--                <div style="height: 15px; color: darkgrey">说明：参数中间用'&'拼接</div>-->
+                <!--                <div style="height: 15px; color: darkgrey">说明：参数中间用'&'拼接</div>-->
             </el-form-item>
             </el-form-item>
 
 
 
 

@@ -10,7 +10,7 @@ export default {
                 id: [
                 id: [
                     {
                     {
                         required: true,
                         required: true,
-                        message: '请填写文档编号！',
+                        message: '请填写配置编号！',
                         trigger: 'blur',
                         trigger: 'blur',
                     }
                     }
                 ],
                 ],
@@ -36,7 +36,6 @@ export default {
     setup(props, {attrs, slots, emit}){
     setup(props, {attrs, slots, emit}){
         const {proxy} = Vue.getCurrentInstance();
         const {proxy} = Vue.getCurrentInstance();
         let height = Vue.ref(window.innerHeight - 10);
         let height = Vue.ref(window.innerHeight - 10);
-
         let configs = Vue.ref([{
         let configs = Vue.ref([{
             name:'resId',
             name:'resId',
             desc:'资源ID(资源列表可用)'
             desc:'资源ID(资源列表可用)'
@@ -339,7 +338,8 @@ export default {
             menuList,
             menuList,
             menuOptions,
             menuOptions,
             getResType,
             getResType,
-            configs        }
+            configs
+        }
     }
     }
 
 
 }
 }

-<div class="container" :style="{'height':height+'px','max-height':height+'px'}">
+<div class="container" :style="{'height':height+'px','max-height':height+'px','background':'#fff'}">
   <iframe :src="getSrc"  width="100%" height="100%" ></iframe>
   <iframe :src="getSrc"  width="100%" height="100%" ></iframe>
 </div>
 </div>

@@ -12,8 +12,8 @@ export default {
             let param={
             let param={
                 id:ajConfig
                 id:ajConfig
             }
             }
-            let params = '';
-            let designPage = '';
+            let params='';
+            let designPage='';
             proxy.$http.get(`/api-web/ajConfig/findOneById`, param, function (res) {
             proxy.$http.get(`/api-web/ajConfig/findOneById`, param, function (res) {
                 if (res && res.success == true && res.object) {
                 if (res && res.success == true && res.object) {
                     // 参数替换
                     // 参数替换
@@ -26,7 +26,7 @@ export default {
         }
         }
 
 
         const replaceParams = (params) => {
         const replaceParams = (params) => {
-            return params.replace(/#lgn/g,localStorage.getItem('lgn')).replace(/#user_id/g,sessionStorage.getItem('user_id')).replace(/#access_token/g,localStorage.getItem("access_token"))
+            return params.replace(/#lgn/g,localStorage.getItem('lgn')).replace(/#user_id/g,sessionStorage.getItem('access_token')).replace(/#access_token/g,localStorage.getItem("access_token"))
         }
         }
 
 
         const getParamValue = (code) => {
         const getParamValue = (code) => {
@@ -36,15 +36,22 @@ export default {
             // 获取localStorage
             // 获取localStorage
         }
         }
 
 
-
         // 挂载完
         // 挂载完
         Vue.onMounted(() => {
         Vue.onMounted(() => {
             getUrl();
             getUrl();
+            //start lsq 监听跨域iframe子页面向父页面发送数据(子页面点击名称进入详情页) 2022-03-15
+            window.addEventListener('message',function(e){
+                if(e.data.type=='detail'){
+                    proxy.$global.openDetail(e.data.data.resId, e.data.data.resType, proxy);
+                }else{
+                }
+            })
+            //end lsq 2022-03-15
         })
         })
 
 
         return {
         return {
             height,
             height,
-            getSrc
+            getSrc,
         }
         }
     }
     }
 }
 }