Merge branch 'dev_1.1.5' into dev_1.1.5-1

# Conflicts:
#	src/view/iframe/publish/tool-box/child/editor.vue

src/view/iframe/publish/tool-box/child/editor.vue

@@ -6,7 +6,7 @@
       </div>
       <div class="search-wrapper">
         <input class="input" type="text" v-model="siteUrl" placeholder="Enter link">
-        <div class="btn" @click="searchHandler">
+        <div class="btn" @click="searchHandler()">
           <img :src="require('@/assets/svg/icon-tool-box-search-arrow.svg')" />
         </div>
       </div>
@@ -68,6 +68,7 @@ const props = defineProps({
 let siteUrl = ref('');
 
 let selectAppGuideData = {};
+let selectGuideApp = {};
 let openWindowList = [];
 
 let historyList = ref([])
@@ -76,7 +77,7 @@ let appList = ref();
 
 const emits = defineEmits(["changeShowCom"]);
 
-const searchHandler = async () => {
+const searchHandler = async (_params) => {
   let siteTitle = '', favicon = '';
   let timer = null;
 
@@ -130,6 +131,10 @@ const searchHandler = async () => {
     favicon = urlObj.origin + '/favicon.ico';
   }
   currentApp.iconPath = favicon;
+
+  if(_params) {
+    currentApp = _params;
+  }
   
   let convertRes = await convertUrl({ params: { originUrl: siteUrl.value } });
   let params = { convertUrl: siteUrl.value, originUrl: siteUrl.value, appId: '', currentApp };
@@ -162,7 +167,7 @@ const clickHistoryAppHandler = (params) => {
     clickAppHandler(params);
   } else {
     siteUrl.value = params.defaultUrl;
-    searchHandler();
+    searchHandler(params);
   }
 };
 
@@ -198,6 +203,7 @@ const openWindow = (params) => {
 const createGuideWindow = (params, isUpdate = false) => {
   openWindowList = [];
   selectAppGuideData = {};
+  selectGuideApp = {};
 
   let windowWith = window.screen.width - 500;
   let guideUrl = chrome.runtime.getURL('/iframe/tool-box-guide.html');
@@ -219,7 +225,7 @@ const createGuideWindow = (params, isUpdate = false) => {
   }, function (window) {
     openWindowList.push(window);
   })
-
+  selectGuideApp = params;
   if (params.guideData) {
     selectAppGuideData = JSON.parse(params.guideData);
   }
@@ -243,13 +249,14 @@ const onRuntimeMsg = () => {
           actionType: "CONTENT_EDIT_SEND_GUIDE_DATA",
           data: {
             guideData: selectAppGuideData,
-            windowData: openWindowList
+            windowData: openWindowList,
+            selectGuideApp
           }
         }, (response) => { });
         break;
       case 'CONTENT_GUIDE_APPLY_APP':
         siteUrl.value = req.data.siteUrl;
-        searchHandler();
+        searchHandler(req.data.selectGuideApp);
         break;
     }
   })

src/view/iframe/publish/tool-box/child/guide.vue

@@ -35,7 +35,8 @@ let siteUrl = ref('');
 
 let pageData = reactive({
     guideType: '',
-    guideData: []
+    guideData: [],
+    selectGuideApp: {}
 });
 
 const confirm = () => {
@@ -48,7 +49,8 @@ const confirm = () => {
     chrome.runtime.sendMessage({ 
         actionType: "CONTENT_GUIDE_APPLY_APP", 
         data: {
-            siteUrl: siteUrl.value
+            siteUrl: siteUrl.value,
+            selectGuideApp: pageData.selectGuideApp
         }
     },(response) => {});
 
@@ -68,9 +70,10 @@ const onRuntimeMsg = () => {
         sendResponse('ok')
         switch (req.actionType) {
             case 'CONTENT_EDIT_SEND_GUIDE_DATA':
-                let {guideData, windowData} = req.data;
+                let {guideData, windowData, selectGuideApp} = req.data;
                 pageData.guideData = guideData;
                 pageData.windowData = windowData;
+                pageData.selectGuideApp = selectGuideApp;
                 break;
         }
     })