eoss-ui 0.5.95 → 0.5.96

package/packages/main/src/simplicity/index.vue

@@ -140,6 +140,7 @@
           </template>
           <template v-else>
             <es-wujie
+              :host="host"
               :show="true"
               :props="wjProps"
               :attrs="wjAttrs"
@@ -233,8 +234,13 @@
           :label="item.text || item.name"
           :name="item.id"
         >
+          <router-page
+            v-if="item.method === 'router'"
+            v-bind="item"
+            :query="$parent.params"
+          ></router-page>
           <iframe
-            v-if="(isIE && item.method !== 'router') || item.method == 'iframe'"
+            v-else-if="isIE || item.method == 'iframe'"
             :id="activeName == item.id ? iframeId : ''"
             :name="activeName == item.id ? iframeId : ''"
             frameborder="0"
@@ -243,18 +249,14 @@
             :src="item.url"
           ></iframe>
           <es-wujie
-            v-else-if="item.method === 'wujie' && item.refresh"
+            v-else-if="item.method === 'wujie'"
+            :host="host"
             :show="true"
             :props="wjProps"
             :attrs="wjAttrs"
             :name="item.appCode"
             :url="item.url"
           ></es-wujie>
-          <router-page
-            v-else-if="item.method === 'router' && item.refresh"
-            v-bind="item"
-            :query="$parent.params"
-          ></router-page>
         </el-tab-pane>
       </el-tabs>
       <!-- 路由、iframe end -->
@@ -346,11 +348,14 @@ let events = [
 
     if (tab.method == 'iframe') {
       tabs[index].url = util.handlerUrl(tab.url);
-    } else {
-      tabs[index].refresh = false;
-      that.$nextTick(() => {
-        tabs[index].refresh = true;
-      });
+    }
+    if (tab.method === 'wujie' && tab.appCode) {
+      window.document
+        .querySelector(`iframe[name=${tab.appCode}]`)
+        .contentWindow.location.reload(true);
+    }
+    if (tab.method === 'router') {
+      that.$set(tabs[index], 'keys', util.uuid());
     }
     return tabs;
   },
@@ -504,7 +509,13 @@ export default {
       default: 220
     },
     //路由方式
-    routeType: String
+    routeType: String,
+    host: {
+      type: String,
+      default() {
+        return sessionStorage.getItem('host') || '';
+      }
+    }
   },
   data() {
     return {
@@ -1056,12 +1067,12 @@ export default {
      **/
     setIframeType(res) {
       let { url } = res;
-      if (url) {
-        res.refresh = false;
-      }
       let urls = url.split('?');
       if (urls[0].indexOf('.js') > 1 && !isIE) {
         res.method = 'wujie';
+        if (!res.appCode) {
+          res.appCode = 'application_' + Date.now();
+        }
       } else if (
         urls[0].indexOf('.dhtml') > 0 ||
         (urls[0].indexOf('.html') > 0 && urls[0].indexOf('.html#') === -1)
@@ -1077,6 +1088,7 @@ export default {
             if (path && this.routeType !== 'wujie') {
               res.method = 'router';
               res.path = path;
+              res.keys = util.uuid();
             } else {
               let urlopenmode = util.getParams({
                 url: url,
@@ -1091,6 +1103,9 @@ export default {
                 res.method = 'iframe';
               } else {
                 res.method = 'wujie';
+                if (!res.appCode) {
+                  res.appCode = 'application_' + Date.now();
+                }
               }
             }
           } else if (
@@ -1098,14 +1113,14 @@ export default {
             urls[0].indexOf('/#/') > -1
           ) {
             res.method = 'wujie';
+            if (!res.appCode) {
+              res.appCode = 'application_' + Date.now();
+            }
           } else {
             res.method = 'iframe';
           }
         }
       }
-      if (Object.prototype.hasOwnProperty.call(res, 'refresh')) {
-        res.refresh = true;
-      }
       return res;
     },
     /**
@@ -1463,14 +1478,15 @@ export default {
           this.activeName = res.id;
           this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
         } else {
-          this.$set(this.tabs[i], 'refresh', false);
-          if (tab.method === 'wujie') {
-            this.activeName = res.id;
+          if (tab.method === 'wujie' && tab.appCode) {
+            window.document
+              .querySelector(`iframe[name=${tab.appCode}]`)
+              .contentWindow.location.reload(true);
           }
-          this.$nextTick(() => {
-            this.$set(this.tabs[i], 'refresh', true);
-            this.activeName = res.id;
-          });
+          if (tab.method === 'router') {
+            this.$set(this.tabs[i], 'keys', util.uuid());
+          }
+          this.activeName = res.id;
         }
       }
     },
@@ -1531,11 +1547,14 @@ export default {
         let tab = this.tabs[i];
         if (tab.method === 'iframe') {
           this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
-        } else {
-          this.$set(this.tabs[i], 'refresh', false);
-          this.$nextTick(() => {
-            this.$set(this.tabs[i], 'refresh', true);
-          });
+        }
+        if (tab.method === 'wujie' && tab.appCode) {
+          window.document
+            .querySelector(`iframe[name=${tab.appCode}]`)
+            .contentWindow.location.reload(true);
+        }
+        if (tab.method === 'router') {
+          this.$set(this.tabs[i], 'keys', util.uuid());
         }
       }
     },
@@ -1653,11 +1672,14 @@ export default {
               let tab = this.tabs[i];
               if (tab.method === 'iframe') {
                 this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
-              } else {
-                this.$set(this.tabs[i], 'refresh', false);
-                this.$nextTick(() => {
-                  this.$set(this.tabs[i], 'refresh', true);
-                });
+              }
+              if (tab.method === 'wujie' && tab.appCode) {
+                window.document
+                  .querySelector(`iframe[name=${tab.appCode}]`)
+                  .contentWindow.location.reload(true);
+              }
+              if (tab.method === 'router') {
+                this.$set(this.tabs[i], 'keys', util.uuid());
               }
             }
             this.activeName = this.homePage.id;
@@ -1822,11 +1844,14 @@ export default {
           let tab = this.tabs[i];
           if (tab.method === 'iframe') {
             this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
-          } else {
-            this.$set(this.tabs[i], 'refresh', false);
-            this.$nextTick(() => {
-              this.$set(this.tabs[i], 'refresh', true);
-            });
+          }
+          if (tab.method === 'wujie' && tab.appCode) {
+            window.document
+              .querySelector(`iframe[name=${tab.appCode}]`)
+              .contentWindow.location.reload(true);
+          }
+          if (tab.method === 'router') {
+            this.$set(this.tabs[i], 'keys', util.uuid());
           }
         }
         if (close) {

package/packages/main/src/simplicity/router-page.vue

@@ -1,7 +1,7 @@
 <template>
-  <keep-alive>
-    <router-view :name="appCode" />
-  </keep-alive>
+  <div style="height: 100%">
+    <router-view :key="keys || appCode" :name="appCode" />
+  </div>
 </template>
 
 <script>
@@ -18,7 +18,8 @@ export default {
       default() {
         return {};
       }
-    }
+    },
+    keys: String
   },
   data() {
     return {};

package/packages/wujie/src/main.vue

@@ -39,6 +39,10 @@ export default {
     height: { type: String, default: '100%' },
     name: { type: String, default: '' },
     loading: { type: HTMLElement, default: undefined },
+    host: {
+      type: String,
+      default: ''
+    },
     url: { type: String, default: '' },
     sync: { type: Boolean, default: false },
     prefix: { type: Object, default: undefined },
@@ -111,8 +115,9 @@ export default {
         if (val) {
           let urls = val.split('?');
           let plugins = this.plugins;
+          let defaultUrl = '';
           if (urls[0].indexOf('.js') > 1) {
-            this.defaultUrl = this.param
+            defaultUrl = this.param
               ? util.urlJoinParams({
                   url: './primary.html',
                   param: this.param,
@@ -123,8 +128,11 @@ export default {
               jsBeforeLoaders: [{ src: val }]
             });
           } else {
-            this.defaultUrl = val;
+            defaultUrl = val;
           }
+          this.defaultUrl = util.startWith(defaultUrl, 'http')
+            ? defaultUrl
+            : this.host + defaultUrl;
           this.defaultPlugins = plugins;
         }
       }

package/src/index.js

@@ -121,7 +121,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.5.95',
+  version: '0.5.96',
   install,
   Button,
   ButtonGroup,