Merge branch 'dev' into dep-lock

# Conflicts:
#	src/config.js

package.json

@@ -22,6 +22,7 @@
 		"monaco-editor-webpack-plugin": "^1.8.1",
 		"path": "^0.12.7",
 		"psd-parse-web": "http://gitlab2.dui88.com/laoqifeng/psd-parse-web.git",
+		"props-compute": "http://gitlab2.dui88.com/laoqifeng/props-compute.git",
 		"querystringify": "^2.1.1",
 		"semver": "^7.1.1",
 		"socket.io-client": "^2.3.0",

src/config.js

@@ -5,8 +5,8 @@
 export let API_HOST;
 if (process.env.NODE_ENV === 'development') {
 	//API_HOST = '//10.10.95.74:7777';
-	API_HOST = '//192.168.1.16:7777';
-	//API_HOST = '//192.168.0.104:7777';
+	//API_HOST = '//192.168.1.16:7777';
+	API_HOST = '//192.168.2.143:7777';
 	//API_HOST = '//10.10.92.33:7777';
 	//API_HOST = '//localhost:3002';
 	//API_HOST = window.__data.apiHost;

src/locales/zh-CN.json

@@ -171,7 +171,7 @@
 	"Import single": "导入单",
 	"Import multi": "导入多",
 	"Import view success": "视图导入成功",
-	"Input projectx id": "请舒服{envName}星速台项目ID",
+	"Input projectx id": "请输入{envName}星速台项目ID",
 	"Save template to projectx": "是否保存皮肤到星速台",
 	"eventGroup": {
 		"in": "接收",

src/utils/properties.js

@@ -179,11 +179,16 @@ export default {
       },*/
       value: 12
     },
-    lineHeight: {
+    lineSpacing: {
+      title: '行间距',
+      type: 'inputNumber',
+      value: 14
+    },
+    /*lineHeight: {
       title: '行高',
       type: 'inputNumber',
       value: 1
-    },
+    },*/
     textAlign: {
       title: '文本对齐',
       type: 'select',
@@ -252,8 +257,8 @@ export default {
       ],
       value: 'text'
     },
-    pattern: {
-      title: '输入模式',
+    charRegStr: {
+      title: '字符正则式',
       type: 'input',
       value: '',
       props: {

src/views/Editor/dialogs/ProjectxOptions.vue

@@ -76,9 +76,9 @@ export default {
   },
   data() {
     return {
-      pxEnvs: this.$t('pxEnvs'),
-      tplOperates: this.$t('tplOperates'),
-      tplTypes: this.$t('tplTypes'),
+      pxEnvs: this.$t("pxEnvs"),
+      tplOperates: this.$t("tplOperates"),
+      tplTypes: this.$t("tplTypes"),
 
       env: "dev",
       operate: 1,
@@ -155,7 +155,7 @@ export default {
     },
     hasIndex() {
       const { skinList } = this;
-      return skinList.some(v => v.type === '1');
+      return skinList.some(v => v.type === "1");
     },
     async saveSkins() {
       const {
@@ -209,14 +209,20 @@ export default {
     },
     /** 获取访问链接 */
     getUrl() {
-      const { tplType, env, skinId, projectId } = this;
+      const { tplType, env, skinId, projectId, skinList } = this;
+      let type = 1;
+      skinList.forEach(skin => {
+        if (skin.id === skinId) {
+          type = skin.type;
+        }
+      });
       const mapping = {
         dev: "activity.m.duibadev.com.cn",
         test: "activity.m.duibatest.com.cn",
         prod: "https://activity.m.duiba.com.cn"
       };
       const url = `${mapping[env]}/projectx/${projectId}/${
-        tplType === 0 ? "index" : skinId
+        type === "1" ? "index" : skinId
       }.html`;
       copy(url);
       this.$message({

src/views/Preview.vue

@@ -7,9 +7,11 @@
 				<el-dropdown-item command="refresh">刷新</el-dropdown-item>
 			</el-dropdown-menu>
 		</el-dropdown>-->
-		<!--<iframe ref="proxyIframe" id="proxyIframe"
-		        src="http://activity.m.duibadev.com.cn/projectx/p7c3b4fa4/index.html?__proxy_mode1__"
-		        @load="onProxyIframeLoaded"></iframe>-->
+		<!--<div ref="proxyIframeWrapper" class="proxy-iframe-wrapper">
+			<iframe ref="proxyIframe" v-if="showProxyIframe"
+							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"
 		           @click="reload"/>
 	</div>
@@ -28,6 +30,7 @@
 				ts: '',
 				flag: false,
 				proxyReady: true,
+				showProxyIframe: false,
 			}
 		},
 		async mounted() {
@@ -43,6 +46,18 @@
 			await db.open();
 
 			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() {
 			document.removeEventListener("visibilitychange", this.onVisibilityChange);
@@ -117,6 +132,7 @@
 				doc.write(tpl);
 
 				//win.proxy_window = this.$refs.proxyIframe.contentWindow;
+				//win.proxy_window = this.proxyWindow;
 
 				applyMock(projectID, win);
 			},
@@ -156,11 +172,17 @@
 		bottom: 10px;
 	}
 
-	#proxyIframe {
+	.proxy-iframe-wrapper{
 		/*display: none;*/
-		position: absolute;
 		top: 0;
-		width: 100px;
-		height: 100px;
+		position: absolute;
+		width: 200px;
+		height: 300px;
+
+	}
+
+	.proxy-iframe-wrapper iframe {
+		width: 100%;
+		height: 100%;
 	}
 </style>
\ No newline at end of file

yarn.lock

@@ -6783,6 +6783,10 @@ promise-inflight@^1.0.1:
   resolved "https://registry.npm.taobao.org/promise-inflight/download/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
+"props-compute@http://gitlab2.dui88.com/laoqifeng/props-compute.git":
+  version "1.0.0"
+  resolved "http://gitlab2.dui88.com/laoqifeng/props-compute.git#c676e9e12a06ccc3556101197171ee47e9ebdd3c"
+
 proxy-addr@~2.0.5:
   version "2.0.5"
   resolved "https://registry.npm.taobao.org/proxy-addr/download/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"