WeiYe-Jing · fun3c · Mar 11, 2022 · Mar 11, 2022 · Mar 20, 2022 · Mar 20, 2022
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@ selenium-debug.log
 *.njsproj
 *.sln
 *.local
+*.history
 
 package-lock.json
 yarn.lock
diff --git a/mock/mock-server.js b/mock/mock-server.js
@@ -5,9 +5,9 @@ const path = require('path')
 
 const mockDir = path.join(process.cwd(), 'mock')
 
-function registerRoutes(app) {
+async function registerRoutes(app) {
   let mockLastIndex
-  const { default: mocks } = require('./index.js')
+  const { default: mocks } =  await import('./index.js')
   for (const mock of mocks) {
     app[mock.type](mock.url, mock.response)
     mockLastIndex = app._router.stack.length

diff --git a/public/avatar.jpg b/public/avatar.jpg
diff --git a/public/avatar_1.jpg b/public/avatar_1.jpg
diff --git a/public/avatar_bak.jpg b/public/avatar_bak.jpg
diff --git a/public/cd701950a4b57a46.png b/public/cd701950a4b57a46.png
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/favicon_1.ico b/public/favicon_1.ico
diff --git a/public/index.html b/public/index.html
@@ -9,7 +9,7 @@
     <title><%= webpackConfig.name %></title>
   </head>
   <body>
-    <div id="app"></div>
+    <div id="dataxApp"></div>
     <!-- built files will be auto injected -->
   </body>
 </html>
diff --git a/public/logo-DataLink-light.png b/public/logo-DataLink-light.png
diff --git a/public/logo-DataLink.png b/public/logo-DataLink.png
diff --git a/public/logo-white.svg b/public/logo-white.svg
diff --git a/public/logo@7247x1171.png b/public/logo@7247x1171.png
diff --git a/src/App.vue b/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="app">
+  <div id="dataxApp">
     <router-view />
   </div>
 </template>

diff --git a/src/api/metadata-query.js b/src/api/metadata-query.js
@@ -43,7 +43,7 @@ export function createTable(params) {
   return request({
     url: '/api/metadata/createTable',
     method: 'post',
-    params
+    data: params
   })
 }
 // 判断字段是否存在，存在，即更新值，否则添加字段

diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
@@ -3,17 +3,18 @@
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo">
-        <h1 v-else class="sidebar-title">{{ title }} </h1>
+        <!-- <h1 v-else class="sidebar-title">{{ title }} </h1> -->
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo">
-        <h1 class="sidebar-title">{{ title }} </h1>
+        <!-- <h1 class="sidebar-title">{{ title }} </h1> -->
       </router-link>
     </transition>
   </div>
 </template>
 
 <script>
+import LogoImg from '../../../../public/logo@7247x1171.png'
 export default {
   name: 'SidebarLogo',
   props: {
@@ -24,8 +25,8 @@ export default {
   },
   data() {
     return {
-      title: 'Vue Element Admin',
-      logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
+      title: 'Data Link',
+      logo: LogoImg
     }
   }
 }
@@ -55,8 +56,8 @@ export default {
     width: 100%;
 
     & .sidebar-logo {
-      width: 32px;
-      height: 32px;
+      // width: 32px;
+      height: 25px;
       vertical-align: middle;
       margin-right: 12px;
     }

diff --git a/src/main.js b/src/main.js
@@ -1,5 +1,7 @@
-import Vue from 'vue'
 
+import './public-path'
+import Vue from 'vue'
+import VueRouter from 'vue-router';
 import Cookies from 'js-cookie'
 
 import 'normalize.css/normalize.css' // a modern alternative to CSS resets
@@ -12,7 +14,6 @@ import '@/styles/index.scss' // global css
 import App from './App'
 import store from './store'
 import router from './router'
-
 import './icons' // icon
 import './permission' // permission control
 import './utils/error-log' // error log
@@ -44,9 +45,33 @@ Object.keys(filters).forEach(key => {
 
 Vue.config.productionTip = false
 
-new Vue({
-  el: '#app',
-  router,
-  store,
-  render: h => h(App)
-})
+let instance = null
+
+const render = (props) => {
+  const { container } = props;
+  instance = new Vue({
+    el: '#dataxApp',
+    router,
+    store,
+    render: h => h(App)
+  }).$mount(container ? container.querySelector('#dataxApp') : '#dataxApp')
+}
+
+if (!window.__POWERED_BY_QIANKUN__) {
+  render(document);
+}
+
+export async function bootstrap(props) {
+  console.log('[vue] vue app bootstraped', props)
+  Vue.prototype.parentData = {...props.data}
+}
+export async function mount(props) {
+  console.log('[vue] props from main framework', props)
+  render(props)
+}
+export async function unmount() {
+  instance.$destroy()
+  instance.$el.innerHTML = ''
+  instance = null
+  // router = null;
+}
diff --git a/src/public-path.js b/src/public-path.js
@@ -0,0 +1,3 @@
+if (window.__POWERED_BY_QIANKUN__) {
+    __webpack_public_path__ = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
+  }
diff --git a/src/router/index.js b/src/router/index.js
@@ -266,6 +266,7 @@ export const asyncRoutes = [
 
 const createRouter = () => new Router({
   // mode: 'history', // require service support
+  base: window.__POWERED_BY_QIANKUN__ ? '/datax' : '/',
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes
 })

diff --git a/src/settings.js b/src/settings.js
@@ -1,5 +1,5 @@
 module.exports = {
-  title: 'Datax Web',
+  title: 'Data Link',
 
   /**
    * @type {boolean} true | false
@@ -23,7 +23,7 @@ module.exports = {
    * @type {boolean} true | false
    * @description Whether show the logo in sidebar
    */
-  sidebarLogo: false,
+  sidebarLogo: true,
 
   /**
    * @type {string | array} 'production' | ['production', 'development']

diff --git a/src/styles/index.scss b/src/styles/index.scss
@@ -22,7 +22,7 @@ html {
   box-sizing: border-box;
 }
 
-#app {
+#dataxApp {
   height: 100%;
 }
 

diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
@@ -1,4 +1,4 @@
-#app {
+#dataxApp {
 
   .main-container {
     min-height: 100%;

diff --git a/src/views/datax/jobInfo/index.vue b/src/views/datax/jobInfo/index.vue
@@ -425,6 +425,7 @@ export default {
         readerTable: ''
       },
       resetTemp() {
+        console.log('%cindex.vue line:428 this.$options', 'color: white; background-color: #007acc;', this.$options.data())
         this.temp = this.$options.data().temp
         this.jobJson = ''
         this.glueSource = ''

diff --git a/src/views/datax/json-build/index.vue b/src/views/datax/json-build/index.vue
@@ -143,18 +143,27 @@ export default {
       }
     }
   },
+  watch: {
+    '$route': function(to, from) {
+      if (to.name === 'JsonBuild') {
+        location.reload()
+      }
+    }
+  },
   created() {
     // this.getJdbcDs()
   },
   methods: {
     next() {
       const fromColumnList = this.$refs.reader.getData().columns
       const toColumnsList = this.$refs.writer.getData().columns
-      // const fromTableName = this.$refs.reader.getData().tableName
+      const fromTableName = this.$refs.reader.getData().tableName
+      const readerDatabase = this.$refs.reader.getReaderDatabase()
       // 第一步 reader 判断是否已选字段
       if (this.active === 1) {
         // 实现第一步骤读取的表和字段直接带到第二步骤
         // this.$refs.writer.sendTableNameAndColumns(fromTableName, fromColumnList)
+        this.$refs.writer.sendNewTableNameAndColumns(readerDatabase, fromColumnList, fromTableName)
         // 取子组件的数据
         // console.info(this.$refs.reader.getData())
         this.active++
@@ -173,7 +182,9 @@ export default {
               duration: 2000
             })
             // 切回第一步
-            this.active = 1
+            // this.active = 1
+            // 跳转到任务管理
+            this.$router.push('/datax/job/jobInfo')
           })
         } else {
           this.active++

diff --git a/src/views/datax/json-build/reader.vue b/src/views/datax/json-build/reader.vue
@@ -35,6 +35,9 @@ export default {
     showDataSource(data) {
       this.dataSource = data
       this.getData()
+    },
+    getReaderDatabase() {
+      return this.$refs.rdbmsreader.getReaderDatabase()
     }
   }
 }

diff --git a/src/views/datax/json-build/reader/RDBMSReader.vue b/src/views/datax/json-build/reader/RDBMSReader.vue
@@ -91,11 +91,17 @@ export default {
         datasourceId: [{ required: true, message: 'this is required', trigger: 'change' }],
         tableName: [{ required: true, message: 'this is required', trigger: 'change' }],
         tableSchema: [{ required: true, message: 'this is required', trigger: 'change' }]
+      },
+      readerDatabase: {
+        datasourceId: '',
+        rDsList: []
       }
     }
   },
   watch: {
     'readerForm.datasourceId': function(oldVal, newVal) {
+      this.readerDatabase.datasourceId = newVal || oldVal
+      this.readerDatabase.rDsList = this.rDsList
       if (this.dataSource === 'postgresql' || this.dataSource === 'oracle' || this.dataSource === 'sqlserver') {
         this.getSchema()
       } else {
@@ -220,6 +226,9 @@ export default {
         this.readerForm.datasourceId = Bus.dataSourceId
       }
       return this.readerForm
+    },
+    getReaderDatabase() {
+      return this.readerDatabase
     }
   }
 }

diff --git a/src/views/datax/json-build/writer.vue b/src/views/datax/json-build/writer.vue
@@ -54,6 +54,11 @@ export default {
     sendTableNameAndColumns(fromTableName, fromColumnList) {
       this.$refs.hivewriter.fromTableName = fromTableName
       this.$refs.hivewriter.fromColumnList = fromColumnList
+    },
+    sendNewTableNameAndColumns(originTableNames, originColumnList, originTableName) {
+      this.$refs.rdbmswriter.originTableNames = originTableNames
+      this.$refs.rdbmswriter.originColumnList = originColumnList
+      this.$refs.rdbmswriter.originTableName = originTableName
     }
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ html { @@
       box-sizing: border-box;
     }
-    #app {
+    #dataxApp {
       height: 100%;
     }
@@ Expand Down @@