Merge pull request #2002 from dataease/pr@dev@refactor_panel-view-style

frontend/src/components/canvas/components/Editor/ComponentWrapper.vue

@@ -35,6 +35,7 @@
         :edit-mode="'preview'"
         :filters="filters"
         :terminal="terminal"
+        :screen-shot="screenShot"
       />
     </div>
   </div>

frontend/src/components/canvas/custom-component/DeFrame.vue

 <template>
   <el-row class="main-frame">
     <div v-if="element.frameLinks.src" class="main-frame">
-      <iframe id="iframe" :src="element.frameLinks.src" scrolling="auto" frameborder="0" class="main-frame" />
+      <iframe id="iframe" :src="element.frameLinks.src" scrolling="auto" frameborder="0" class="main-frame" @load="loaded" @error="onError" />
       <div v-if="editMode==='edit'" class="frame-mask">
         <span style="opacity: 1;">
           <span style="font-weight: bold;color: lawngreen;">{{ $t('panel.edit_web_tips') }}</span>
         </span>
       </div>
+      <div v-if="screenShot" class="frame-mask" />
     </div>
     <div v-else class="info-class">
       {{ $t('panel.web_add_tips') }}
@@ -18,7 +19,7 @@
 import { mapState } from 'vuex'
 import NProgress from 'nprogress'
 export default {
-  name: 'DeVideo',
+  name: 'DeFrame',
   props: {
     propValue: {
       type: String,
@@ -36,6 +37,10 @@ export default {
       type: Boolean,
       require: false,
       default: false
+    },
+    screenShot: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -59,6 +64,12 @@ export default {
   mounted() {
   },
   methods: {
+    loaded(e) {
+      console.log('loaded:', e)
+    },
+    onError(e) {
+      console.log('onError:', e)
+    }
 
   }
 }

frontend/src/lang/en.js

@@ -1395,7 +1395,7 @@ export default {
     board_radio: 'Board Radio',
     background: 'Background',
     component_style: 'component Style',
-    web_set_tips: 'Some Websites Cannot Be Displayed Because Of Cross Domain Problems  ',
+    web_set_tips: 'Some Websites Cannot Be Displayed Because Of Not Allow Embedded ',
     repeat_params: 'Repeat Params Exist',
     enable_outer_param_set: 'Enable Outer Param Set',
     select_param: 'Please Select Param...',

frontend/src/lang/tw.js

@@ -1396,7 +1396,7 @@ export default {
     board_radio: '边框半径',
     background: '背景',
     component_style: '组件样式',
-    web_set_tips: '部分网站可能存在跨域问题无法显示',
+    web_set_tips: '部分网站可能设置不允许嵌入而无法显示',
     repeat_params: '存在名称重复的参数',
     enable_outer_param_set: '启用外部参数设置',
     select_param: '请选择参数...',

frontend/src/lang/zh.js

@@ -1404,7 +1404,7 @@ export default {
     board_radio: '边框半径',
     background: '背景',
     component_style: '组件样式',
-    web_set_tips: '部分网站可能存在跨域问题无法显示',
+    web_set_tips: '部分网站可能设置不允许嵌入而无法显示',
     repeat_params: '存在名称重复的参数',
     enable_outer_param_set: '启用外部参数设置',
     select_param: '请选择参数...',