Merge branch 'feature/微前端' into dev

index.html

@@ -26,34 +26,14 @@
   <!-- <script src="//localhost:8090/static/import-component-append.js"></script> -->
   <script>
     if(window.__POWERED_BY_QIANKUN__){
-       let scriptUrls =[
-        "//web-1251519181.file.myqcloud.com/components/header.2.0.78.js",
-        "//web-1251519181.file.myqcloud.com/components/store-selector.1.0.21.js",
-       "//web-1251519181.file.myqcloud.com/components/store.2.0.07.js",
-        "//web-1251519181.file.myqcloud.com/components/img-preview.2.0.05.js",
-        "//web-1251519181.file.myqcloud.com/components/member-group.2.2.41.js",
-        "//web-1251519181.file.myqcloud.com/components/store-card.2.0.37.js",
-        "//web-1251519181.file.myqcloud.com/components/store-new.2.0.81.js",
-        "//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.10.js",
-        "//web-1251519181.file.myqcloud.com/components/people.2.0.47.js",
-        "//web-1251519181.file.myqcloud.com/components/export-excel.2.0.39.js",
-        "//web-1251519181.file.myqcloud.com/components/input.3.0.5.js",
-        "//web-1251519181.file.myqcloud.com/components/delete.2.0.6.js",
-        "//web-1251519181.file.myqcloud.com/components/selector.1.2.42.js",
-        "//web-1251519181.file.myqcloud.com/components/activity-select.1.0.7.js",
-        "//web-1251519181.file.myqcloud.com/components/card.2.0.28.js",
-        "//web-1251519181.file.myqcloud.com/components/radio-transfer.1.0.17.js",
-        "//web-1251519181.file.myqcloud.com/components/material.1.0.13.js",
-        "//web-1251519181.file.myqcloud.com/components/sub-title.1.0.8.js",
-        "//web-1251519181.file.myqcloud.com/components/select-tree.1.0.13.js",
-        "//web-1251519181.file.myqcloud.com/components/base.1.0.5.js",
-     ]
-      scriptUrls.forEach(item => {
+      console.log('appendChild===>')
+        let src = '/component/static/import-component-append.js?timestrap=' + new Date().getTime();
+        let host = window.location.host;
+        host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
+        src= '//'+host+src
         let sc = document.createElement('script');
-        sc.setAttribute('src', item);
+        sc.setAttribute('src', src);
         document.head.appendChild(sc);
-      });
-      console.log('appendChild===>')
     }else{
       (function() {
         var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
@@ -74,24 +54,6 @@
     </div>
   </div>
   <!-- built files will be auto injected -->
-  <!-- 组件引用cdn -->
- <!-- <script src="//192.168.31.190:8000/test.js"></script> -->
-
-  <!-- <script src="//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js"></script>
-  <script src="//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js"></script>
-  <script src="//web-1251519181.file.myqcloud.com/lib/axios/0.18.0/index.min.js"></script>
-  <script src="//web-1251519181.file.myqcloud.com/lib/element-ui/2.15.6/index.js"></script>
-  <script src="//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js"></script>
-  <script src="//web-1251519181.file.myqcloud.com/components/layout.1.0.57.js"></script>
-  <script src="//web-1251519181.file.myqcloud.com/components/header.2.0.78.js"></script> 
-  <script src="//web-1251519181.file.myqcloud.com/components/store-selector.1.0.21.js"></script>
-  <script src="//web-1251519181.file.myqcloud.com/components/base.1.0.5.js"></script>
-  <script src="//web-1251519181.file.myqcloud.com/components/sub-title.1.0.8.js"></script>
-  <script src="//web-1251519181.file.myqcloud.com/components/limit.1.0.60.js"></script>  -->
-
-  <!-- <script src="//gicdev.demogic.com/component/static/import-component-append.js"></script> -->
-
-
   <!-- 4.0组件库中的组件 -->
   <script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js"></script> 
   <script src="//web-1251519181.file.myqcloud.com/components/upload-file.1.0.10.js"></script> 

src/App.vue

@@ -59,6 +59,7 @@ export default {
     this.saveUserId();
     this.changeTab();
     this.$store.dispatch('getIsShowSelfData'); // 展示是否显示 '仅看本人' btn 和列表展示创建人
+    console.log(this.$buttonCode);
   }
 };
 </script>

src/main.js

@@ -37,29 +37,35 @@ Vue.prototype.$tips = function({ message = '提示', type = 'success' }) {
 let instance = null;
 function render(props = {}) {
   const { container } = props;
+  instance = new Vue({
+    router,
+    store,
+    render: h => h(App)
+  }).$mount(container ? container.querySelector('#app') : '#app');
+}
+// 独立运行时
+if (!window.__POWERED_BY_QIANKUN__) {
+  console.log('独立运行');
   limit({
     createApp() {
       window.getLimit(router, 'marketing', '/marketing/').then(() => {
-        instance = new Vue({
-          router,
-          store,
-          render: h => h(App)
-        }).$mount(container ? container.querySelector('#app') : '#app');
+        render();
       });
     }
   });
 }
-// 独立运行时
-if (!window.__POWERED_BY_QIANKUN__) {
-  console.log('独立运行');
-  render();
-}
 
 export async function bootstrap() {
   console.log('[vue] vue app bootstraped');
 }
 export async function mount(props) {
-  render();
+  limit({
+    createApp() {
+      window.getLimit(router, 'marketing', '/marketing/').then(() => {
+        render();
+      });
+    }
+  });
 }
 export async function unmount() {
   instance.$destroy();

src/router/index.js

@@ -25,6 +25,7 @@ let router = new Router({
 router.beforeEach((to, from, next) => {
   // 获取是否限流
   let path = to.path;
+  console.log(path);
   Object.keys(to.params).map(key => {
     path = path.replace(to.params[key], `:${key}`);
   });