首页 发现 帮助
登录
jianyu
/
web
6
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

merge: 处理分支冲突

zhangyuhan 1 年之前
父节点
effde4746d
当前提交
d86a386613
共有 2 个文件被更改，包括 3 次插入 和 59 次删除
合并视图 显示文件统计
  1. 0 49
      apps/work-bench/public/index.html.bak
  2. 3 10
      apps/work-bench/src/register-app.js

+ 0 - 49
apps/work-bench/public/index.html.bak
查看文件 

@@ -1,49 +0,0 @@
 
-<!DOCTYPE html>
 
-<html>
 
-  <head>
 
-    <meta charset="utf-8">
 
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
-<<<<<<< HEAD
 
-    <link rel="stylesheet" href="https://cdn-common.jianyu360.com/cdn/assets/iconfont/pc/23.8.30/iconfont.css">
 
-=======
 
-    <link rel="stylesheet" href="https://cdn-common.jianyu360.com/cdn/assets/iconfont/pc/23.9.28/iconfont.css">
 
->>>>>>> main
 
-    <title>工作台</title>
 
-    <% if (process.env.NODE_ENV === 'production') { %>
 
-        <script src="/common-module/public/head.js?v=<%= htmlWebpackPlugin.options.assets.version %>"></script>
 
-    <% } %>
 
-  </head>
 
-  <body>
 
-    <noscript>
 
-      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
 
-    </noscript>
 
-    <div id="app"></div>
 
-<<<<<<< HEAD
 
-    <script src="https://cdn-common.jianyu360.com/cdn/assets/iconfont/pc/23.8.30/iconfont.js"></script>
 
-=======
 
-    <script src="https://cdn-common.jianyu360.com/cdn/assets/iconfont/pc/23.9.28/iconfont.js"></script>
 
->>>>>>> main
 
-    <script src="//cdn-common.jianyu360.com/cdn/lib/jquery/3.5.1/jquery.min.js"></script>
 
-
 
-    <% if (process.env.NODE_ENV === 'production') { %>
 
-    <!--  临时处理 fotter 中覆盖 appendChild 导致的 qiankun 加载资源异常问题  -->
 
-    <!--  （后续可尝试从 qiankun 自定义资源拦截排查处理该问题）  -->
 
-    <script>
 
-        window._needInjectionTrackStatus = false
 
-    </script>
 
-    <script src="/common-module/public/fotter.js?v=<%= htmlWebpackPlugin.options.assets.version %>"></script>
 
-    <script src="/js/jyWebScoket.js?v=<%= htmlWebpackPlugin.options.assets.version %>"></script>
 
-    <script src="/common-module/ad/js/msgbuoy.js?v=<%= htmlWebpackPlugin.options.assets.version %>"></script>
 
-<!--    智能助手-->
 
-<!--    <script src="/common-module/chat/jy-chat.umd.js?auto=true&v=<%= htmlWebpackPlugin.options.assets.version %>"></script>-->
 
-    <% } %>
 
-
 
-    <% if (process.env.NODE_ENV === 'development') { %>
 
-    <!-- test--- msg加载 公共js方法 -->
 
-    <script src="/common-module/ad/js/msgbuoy.js?v=<%= htmlWebpackPlugin.options.assets.version %>"></script>
 
-    <% } %>
 
-
 
-    <!-- built files will be auto injected -->
 
-  </body>
 
-</html>

+ 3 - 10
apps/work-bench/src/register-app.js
查看文件 

@@ -4,12 +4,9 @@ import Vue from 'vue'
 
 /**
 
 /**
 
  * 新旧应用路径拦截，分发
 
  * 新旧应用路径拦截，分发
 
  */
 
  */
 
-function addChangeOpenRouteType (router, {
 
-  appName = '',
 
-  qiankunRoutes = []
 
-}) {
 
+function addChangeOpenRouteType (router, { appName = '', qiankunRoutes = [] }) {
 
   router.beforeEach(async (to, from, next) => {
 
   router.beforeEach(async (to, from, next) => {
 
-    const inQK = qiankunRoutes.some(r => new RegExp(r).test(to?.path))
 
+    const inQK = qiankunRoutes.some((r) => new RegExp(r).test(to?.path))
 
     const canNext = to.path !== from.path && from.path !== '/'
 
     const canNext = to.path !== from.path && from.path !== '/'
 
 
 
     const params = {
 
     const params = {
 
@@ -106,11 +103,7 @@ export const subApps = {
 
     describe: '该应用包含大会员画像、推送、周报月报、个人桌面等功能',
 
     describe: '该应用包含大会员画像、推送、周报月报、个人桌面等功能',
 
     qiankun: {
 
     qiankun: {
 
       name: 'bigMemberSubApp',
 
       name: 'bigMemberSubApp',
 
-<<<<<<< HEAD
 
-      entry: 'http://192.168.40.158:8081/page_big_pc/index.html',
 
-=======
 
       entry: '/page_big_pc/index.html',
 
       entry: '/page_big_pc/index.html',
 
->>>>>>> main
 
       rule: '/big',
 
       rule: '/big',
 
       props: {
 
       props: {
 
         inject: ({ Vue, router }) => {
 
         inject: ({ Vue, router }) => {
 
@@ -186,6 +179,6 @@ function registerApps (apps = []) {
 
 }
 
 }
 
 
 
 export function microAppsStart () {
 
 export function microAppsStart () {
 
-  const apps = Object.values(subApps).map(v => v.qiankun)
 
+  const apps = Object.values(subApps).map((v) => v.qiankun)
 
   registerApps(apps)
 
   registerApps(apps)
 
 }
 
 }