Commit 7aa6eb23 authored by rockyl's avatar rockyl

修改节点属性

parent ceb066c8
...@@ -6,10 +6,10 @@ export let API_HOST; ...@@ -6,10 +6,10 @@ export let API_HOST;
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
//API_HOST = '//10.10.95.74:7777'; //API_HOST = '//10.10.95.74:7777';
//API_HOST = '//192.168.1.16:7777'; //API_HOST = '//192.168.1.16:7777';
//API_HOST = '//192.168.0.104:7777'; API_HOST = '//192.168.2.143:7777';
//API_HOST = '//10.10.92.33:7777'; //API_HOST = '//10.10.92.33:7777';
//API_HOST = '//localhost:3002'; //API_HOST = '//localhost:3002';
API_HOST = window.__data.apiHost; //API_HOST = window.__data.apiHost;
//API_HOST = ''; //API_HOST = '';
} else { } else {
API_HOST = window.__data.apiHost; API_HOST = window.__data.apiHost;
......
...@@ -179,11 +179,16 @@ export default { ...@@ -179,11 +179,16 @@ export default {
},*/ },*/
value: 12 value: 12
}, },
lineHeight: { lineSpacing: {
title: '行间距',
type: 'inputNumber',
value: 14
},
/*lineHeight: {
title: '行高', title: '行高',
type: 'inputNumber', type: 'inputNumber',
value: 1 value: 1
}, },*/
textAlign: { textAlign: {
title: '文本对齐', title: '文本对齐',
type: 'select', type: 'select',
...@@ -252,8 +257,8 @@ export default { ...@@ -252,8 +257,8 @@ export default {
], ],
value: 'text' value: 'text'
}, },
pattern: { charRegStr: {
title: '输入模式', title: '字符正则式',
type: 'input', type: 'input',
value: '', value: '',
props: { props: {
......
...@@ -7,9 +7,11 @@ ...@@ -7,9 +7,11 @@
<el-dropdown-item command="refresh">刷新</el-dropdown-item> <el-dropdown-item command="refresh">刷新</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown>--> </el-dropdown>-->
<!--<iframe ref="proxyIframe" id="proxyIframe" <!--<div ref="proxyIframeWrapper" class="proxy-iframe-wrapper">
src="http://activity.m.duibadev.com.cn/projectx/p7c3b4fa4/index.html?__proxy_mode1__" <iframe ref="proxyIframe" v-if="showProxyIframe"
@load="onProxyIframeLoaded"></iframe>--> src="http://activity.m.duibadev.com.cn/projectx/p46967122/index.html?__proxy_mode__"
@load="onProxyIframeLoaded"></iframe>
</div>-->
<el-button style="opacity: 0.5" circle plain class="side-bar micro" icon="el-icon-refresh" :underline="false" <el-button style="opacity: 0.5" circle plain class="side-bar micro" icon="el-icon-refresh" :underline="false"
@click="reload"/> @click="reload"/>
</div> </div>
...@@ -28,6 +30,7 @@ ...@@ -28,6 +30,7 @@
ts: '', ts: '',
flag: false, flag: false,
proxyReady: true, proxyReady: true,
showProxyIframe: false,
} }
}, },
async mounted() { async mounted() {
...@@ -43,6 +46,18 @@ ...@@ -43,6 +46,18 @@
await db.open(); await db.open();
this.reload(); this.reload();
/*let url = 'http://activity.m.duibadev.com.cn/projectx/p46967122/index.html?__proxy_mode__';
let proxyWindow = this.proxyWindow = window.open(url,"myWindow",'width=1,height=1');
/!*proxyWindow.onload = function(){
console.log('proxyWindow loaded');
};*!/
setTimeout(()=>{
this.onProxyIframeLoaded();
//this.showProxyIframe = true;
//myWindow.close();
//this.$refs.proxyIframeWrapper.innerHTML = iframe;
},1000);*/
}, },
destroyed() { destroyed() {
document.removeEventListener("visibilitychange", this.onVisibilityChange); document.removeEventListener("visibilitychange", this.onVisibilityChange);
...@@ -117,6 +132,7 @@ ...@@ -117,6 +132,7 @@
doc.write(tpl); doc.write(tpl);
//win.proxy_window = this.$refs.proxyIframe.contentWindow; //win.proxy_window = this.$refs.proxyIframe.contentWindow;
//win.proxy_window = this.proxyWindow;
applyMock(projectID, win); applyMock(projectID, win);
}, },
...@@ -156,11 +172,17 @@ ...@@ -156,11 +172,17 @@
bottom: 10px; bottom: 10px;
} }
#proxyIframe { .proxy-iframe-wrapper{
/*display: none;*/ /*display: none;*/
position: absolute;
top: 0; top: 0;
width: 100px; position: absolute;
height: 100px; width: 200px;
height: 300px;
}
.proxy-iframe-wrapper iframe {
width: 100%;
height: 100%;
} }
</style> </style>
\ No newline at end of file
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