功能变化: 优化主框架外打开

web/src/components/selector-table/loading-spin.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="32" height="32" fill="#999">
+  <path opacity=".25" d="M16 0 A16 16 0 0 0 16 32 A16 16 0 0 0 16 0 M16 4 A12 12 0 0 1 16 28 A12 12 0 0 1 16 4"/>
+  <path d="M16 0 A16 16 0 0 1 32 16 L28 16 A12 12 0 0 0 16 4z">
+    <animateTransform attributeName="transform" type="rotate" from="0 16 16" to="360 16 16" dur="0.8s" repeatCount="indefinite" />
+  </path>
+</svg>

web/src/components/selector-table/selector-table.vue

@@ -40,7 +40,18 @@
           <el-table-column fixed type="index" label="#" width="50"/>
           <span v-for="(item,index) in _elProps.tableConfig.columns" :key="index" >
             <el-table-column :prop="item.prop" :label="item.label" :width="item.width"
-                           v-if="item.show !== false"/>
+                           v-if="item.show !== false">
+              <template slot-scope="scope">
+                <span v-if="item.type === 'image'">
+                  <el-image :src="baseURL + scope.row[item.prop]" style="height: 30px;width: 30px;">
+                    <div slot="placeholder" class="image-slot">
+                      <img src="./loading-spin.svg">
+                    </div>
+                  </el-image>
+                </span>
+                <span v-else>{{ scope.row[item.prop] }}</span>
+              </template>
+            </el-table-column>
           </span>
         </el-table>
         <el-pagination style="margin-top: 10px;max-width: 200px" background
@@ -80,6 +91,7 @@
 import { request } from '@/api/service'
 import XEUtils from 'xe-utils'
 import { d2CrudPlus } from 'd2-crud-plus'
+import util from '@/libs/util'
 
 export default {
   name: 'selector-table-input',
@@ -147,7 +159,8 @@ export default {
       search: null,
       tableData: [],
       multipleSelection: [],
-      collapseTags: false
+      collapseTags: false,
+      baseURL: util.baseURL()
     }
   },
   computed: {

web/src/router/index.js

@@ -87,8 +87,11 @@ router.beforeEach(async (to, from, next) => {
     } else {
       const childrenPath = window.qiankunActiveRule || []
       if (to.name) {
+        if (to.meta.openInNewWindow && (from.query.newWindow && to.query.newWindow !== '1' || from.path === '/')) {
+          to.query.newWindow = '1'
+        }
         // 有 name 属性，说明是主应用的路由
-        if (to.meta.openInNewWindow && !to.query.newWindow) {
+        if (to.meta.openInNewWindow && !to.query.newWindow && !from.query.newWindow && from.path !== '/') {
           // 在新窗口中打开路由
           const { href } = router.resolve({
             path: to.path + '?newWindow=1'