refactor: 移动端代码合并

9b15f26c · fit2cloud-chenyw · a50c94fb · 9b15f26c · 9b15f26c · 9b15f26c
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -410,13 +410,13 @@
                                </move>

                                <copy todir="src/main/resources/static/de-app">
-                                    <fileset dir="../../dataease-app/dist/build/h5">
+                                    <fileset dir="../mobile/dist/build/h5">
                                        <exclude name="*.html"/>
                                    </fileset>
                                </copy>

                                
-                                <copy file="../../dataease-app/dist/build/h5/index.html" tofile="src/main/resources/templates/app.html" />
+                                <copy file="../mobile/dist/build/h5/index.html" tofile="src/main/resources/templates/app.html" />
                                    
                                
                            </target>

--- a/mobile/.env.development
+++ b/mobile/.env.development
+# just a flag
+ENV = 'development'
+
+# base api
+VUE_APP_BASE_API = 'http://localhost:8081/'
+# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
+# to control whether the babel-plugin-dynamic-import-node plugin is enabled.
+# It only does one thing by converting all import() to require().
+# This configuration can significantly increase the speed of hot updates,
+# when you have a large number of pages.
+# Detail:  https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js
+
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
--- a/mobile/.env.production
+++ b/mobile/.env.production
+# just a flag
+ENV = 'production'
+
+# base api
+# VUE_APP_BASE_API = 'http://localhost:8081/'
+VUE_APP_BASE_API = '/'
+
--- a/mobile/README.md
+++ b/mobile/README.md
+# dataease-mobile
+
+## Project setup
+```
+npm install
+```
+
+### Compiles and hot-reloads for development
+```
+npm run serve
+```
+
+### Compiles and minifies for production
+```
+npm run build
+```
+
+### Customize configuration
+See [Configuration Reference](https://cli.vuejs.org/config/).
--- a/mobile/babel.config.js
+++ b/mobile/babel.config.js
+const plugins = []
+
+if (process.env.UNI_OPT_TREESHAKINGNG) {
+  plugins.push(require('@dcloudio/vue-cli-plugin-uni-optimize/packages/babel-plugin-uni-api/index.js'))
+}
+
+if (
+  (
+    process.env.UNI_PLATFORM === 'app-plus' &&
+    process.env.UNI_USING_V8
+  ) ||
+  (
+    process.env.UNI_PLATFORM === 'h5' &&
+    process.env.UNI_H5_BROWSER === 'builtin'
+  )
+) {
+  const path = require('path')
+
+  const isWin = /^win/.test(process.platform)
+
+  const normalizePath = path => (isWin ? path.replace(/\\/g, '/') : path)
+
+  const input = normalizePath(process.env.UNI_INPUT_DIR)
+  try {
+    plugins.push([
+      require('@dcloudio/vue-cli-plugin-hbuilderx/packages/babel-plugin-console'),
+      {
+        file (file) {
+          file = normalizePath(file)
+          if (file.indexOf(input) === 0) {
+            return path.relative(input, file)
+          }
+          return false
+        }
+      }
+    ])
+  } catch (e) {}
+}
+
+process.UNI_LIBRARIES = process.UNI_LIBRARIES || ['@dcloudio/uni-ui']
+process.UNI_LIBRARIES.forEach(libraryName => {
+  plugins.push([
+    'import',
+    {
+      'libraryName': libraryName,
+      'customName': (name) => {
+        return `${libraryName}/lib/${name}/${name}`
+      }
+    }
+  ])
+})
+module.exports = {
+  presets: [
+    [
+      '@vue/app',
+      {
+        modules: 'commonjs',
+        useBuiltIns: process.env.UNI_PLATFORM === 'h5' ? 'usage' : 'entry'
+      }
+    ]
+  ],
+  plugins
+}
--- a/mobile/dist/build/.automator/h5/.automator.json
+++ b/mobile/dist/build/.automator/h5/.automator.json
--- a/mobile/dist/build/h5/index.html
+++ b/mobile/dist/build/h5/index.html
+<!DOCTYPE html><html lang="zh-CN"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><title></title><script>document.addEventListener('DOMContentLoaded', function() {
+                document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
+            })
+            var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel="stylesheet" href="/de-app/static/index.a5c69d49.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script src="/de-app/static/js/chunk-vendors.2822c2ee.js"></script><script src="/de-app/static/js/index.12bd8b7a.js"></script></body></html>
\ No newline at end of file
--- a/mobile/dist/build/h5/static/DataEase-01.png
+++ b/mobile/dist/build/h5/static/DataEase-01.png
--- a/mobile/dist/build/h5/static/about.png
+++ b/mobile/dist/build/h5/static/about.png
--- a/mobile/dist/build/h5/static/dir.png
+++ b/mobile/dist/build/h5/static/dir.png
--- a/mobile/dist/build/h5/static/folder-close.png
+++ b/mobile/dist/build/h5/static/folder-close.png
--- a/mobile/dist/build/h5/static/folder-open.png
+++ b/mobile/dist/build/h5/static/folder-open.png
--- a/mobile/dist/build/h5/static/folder.png
+++ b/mobile/dist/build/h5/static/folder.png
--- a/mobile/dist/build/h5/static/fonts/uni.75745d34.ttf
+++ b/mobile/dist/build/h5/static/fonts/uni.75745d34.ttf
--- a/mobile/dist/build/h5/static/home.png
+++ b/mobile/dist/build/h5/static/home.png
--- a/mobile/dist/build/h5/static/img/DataEase-01.b9bf8897.png
+++ b/mobile/dist/build/h5/static/img/DataEase-01.b9bf8897.png
--- a/mobile/dist/build/h5/static/img/logo-bg.e3894578.jpg
+++ b/mobile/dist/build/h5/static/img/logo-bg.e3894578.jpg
--- a/mobile/dist/build/h5/static/img/user.1e5d0b29.png
+++ b/mobile/dist/build/h5/static/img/user.1e5d0b29.png
--- a/mobile/dist/build/h5/static/index.a5c69d49.css
+++ b/mobile/dist/build/h5/static/index.a5c69d49.css
--- a/mobile/dist/build/h5/static/js/chunk-vendors.2822c2ee.js
+++ b/mobile/dist/build/h5/static/js/chunk-vendors.2822c2ee.js
--- a/mobile/dist/build/h5/static/js/index.12bd8b7a.js
+++ b/mobile/dist/build/h5/static/js/index.12bd8b7a.js
--- a/mobile/dist/build/h5/static/js/pages-index-index.c4389d2e.js
+++ b/mobile/dist/build/h5/static/js/pages-index-index.c4389d2e.js
--- a/mobile/dist/build/h5/static/js/pages-login-index.3d0da2f3.js
+++ b/mobile/dist/build/h5/static/js/pages-login-index.3d0da2f3.js
--- a/mobile/dist/build/h5/static/js/pages-login-index~pages-tabBar-dir-folder~pages-tabBar-dir-index~pages-tabBar-dir-search~pages-tabBa~a44ba637.9affcae7.js
+++ b/mobile/dist/build/h5/static/js/pages-login-index~pages-tabBar-dir-folder~pages-tabBar-dir-index~pages-tabBar-dir-search~pages-tabBa~a44ba637.9affcae7.js
--- a/mobile/dist/build/h5/static/js/pages-tabBar-dir-folder.79329ccc.js
+++ b/mobile/dist/build/h5/static/js/pages-tabBar-dir-folder.79329ccc.js
--- a/mobile/dist/build/h5/static/js/pages-tabBar-dir-folder~pages-tabBar-dir-index~pages-tabBar-home-detail~pages-tabBar-me-about~pages-~aae7fe21.cb9438bf.js
+++ b/mobile/dist/build/h5/static/js/pages-tabBar-dir-folder~pages-tabBar-dir-index~pages-tabBar-home-detail~pages-tabBar-me-about~pages-~aae7fe21.cb9438bf.js
--- a/mobile/dist/build/h5/static/js/pages-tabBar-dir-index.de037b26.js
+++ b/mobile/dist/build/h5/static/js/pages-tabBar-dir-index.de037b26.js
--- a/mobile/dist/build/h5/static/js/pages-tabBar-dir-search.1c4fdeee.js
+++ b/mobile/dist/build/h5/static/js/pages-tabBar-dir-search.1c4fdeee.js
--- a/mobile/dist/build/h5/static/js/pages-tabBar-home-detail.9ffb65b4.js
+++ b/mobile/dist/build/h5/static/js/pages-tabBar-home-detail.9ffb65b4.js
--- a/mobile/dist/build/h5/static/js/pages-tabBar-home-index.dbcbfb00.js
+++ b/mobile/dist/build/h5/static/js/pages-tabBar-home-index.dbcbfb00.js
--- a/mobile/dist/build/h5/static/js/pages-tabBar-me-about.2943630b.js
+++ b/mobile/dist/build/h5/static/js/pages-tabBar-me-about.2943630b.js
--- a/mobile/dist/build/h5/static/js/pages-tabBar-me-index.8ad5856a.js
+++ b/mobile/dist/build/h5/static/js/pages-tabBar-me-index.8ad5856a.js
--- a/mobile/dist/build/h5/static/js/pages-tabBar-me-language.f2cb05fe.js
+++ b/mobile/dist/build/h5/static/js/pages-tabBar-me-language.f2cb05fe.js
--- a/mobile/dist/build/h5/static/js/pages-tabBar-me-outlink.f2df7eb4.js
+++ b/mobile/dist/build/h5/static/js/pages-tabBar-me-outlink.f2df7eb4.js
--- a/mobile/dist/build/h5/static/js/pages-tabBar-me-person.43d2b31a.js
+++ b/mobile/dist/build/h5/static/js/pages-tabBar-me-person.43d2b31a.js
--- a/mobile/dist/build/h5/static/language.png
+++ b/mobile/dist/build/h5/static/language.png
--- a/mobile/dist/build/h5/static/login-logo.png
+++ b/mobile/dist/build/h5/static/login-logo.png
--- a/mobile/dist/build/h5/static/logo-bg.jpg
+++ b/mobile/dist/build/h5/static/logo-bg.jpg
--- a/mobile/dist/build/h5/static/logo.png
+++ b/mobile/dist/build/h5/static/logo.png
--- a/mobile/dist/build/h5/static/me.png
+++ b/mobile/dist/build/h5/static/me.png
--- a/mobile/dist/build/h5/static/msg.png
+++ b/mobile/dist/build/h5/static/msg.png
--- a/mobile/dist/build/h5/static/uni.png
+++ b/mobile/dist/build/h5/static/uni.png
--- a/mobile/dist/build/h5/static/uni.ttf
+++ b/mobile/dist/build/h5/static/uni.ttf
--- a/mobile/dist/build/h5/static/user.png
+++ b/mobile/dist/build/h5/static/user.png
--- a/mobile/dist/build/h5/static/yibiaobans.png
+++ b/mobile/dist/build/h5/static/yibiaobans.png
--- a/mobile/package.json
+++ b/mobile/package.json
--- a/mobile/pom.xml
+++ b/mobile/pom.xml
--- a/mobile/postcss.config.js
+++ b/mobile/postcss.config.js
--- a/mobile/public/index.html
+++ b/mobile/public/index.html
--- a/mobile/src/App.vue
+++ b/mobile/src/App.vue
--- a/mobile/src/api/auth.js
+++ b/mobile/src/api/auth.js
--- a/mobile/src/api/panel.js
+++ b/mobile/src/api/panel.js
--- a/mobile/src/common/js/request/index.js
+++ b/mobile/src/common/js/request/index.js
--- a/mobile/src/common/style/index.css
+++ b/mobile/src/common/style/index.css
--- a/mobile/src/common/style/uni-nvue.css
+++ b/mobile/src/common/style/uni-nvue.css
--- a/mobile/src/common/style/uni.css
+++ b/mobile/src/common/style/uni.css
--- a/mobile/src/common/utils.js
+++ b/mobile/src/common/utils.js
--- a/mobile/src/components/DeContainer.nvue
+++ b/mobile/src/components/DeContainer.nvue
--- a/mobile/src/components/amap-wx/js/util.js
+++ b/mobile/src/components/amap-wx/js/util.js
--- a/mobile/src/components/amap-wx/lib/amap-wx.js
+++ b/mobile/src/components/amap-wx/lib/amap-wx.js
--- a/mobile/src/components/m-icon/m-icon.css
+++ b/mobile/src/components/m-icon/m-icon.css
--- a/mobile/src/components/m-icon/m-icon.vue
+++ b/mobile/src/components/m-icon/m-icon.vue
--- a/mobile/src/components/m-input.vue
+++ b/mobile/src/components/m-input.vue
--- a/mobile/src/components/uni-card/uni-card.vue
+++ b/mobile/src/components/uni-card/uni-card.vue
--- a/mobile/src/components/uni-icons/icons.js
+++ b/mobile/src/components/uni-icons/icons.js
--- a/mobile/src/components/uni-icons/uni-icons.vue
+++ b/mobile/src/components/uni-icons/uni-icons.vue
--- a/mobile/src/components/uni-icons/uni.ttf
+++ b/mobile/src/components/uni-icons/uni.ttf
--- a/mobile/src/components/uni-link/uni-link.vue
+++ b/mobile/src/components/uni-link/uni-link.vue
--- a/mobile/src/components/uni-list-item/uni-list-item.vue
+++ b/mobile/src/components/uni-list-item/uni-list-item.vue
--- a/mobile/src/components/uni-list/uni-list.vue
+++ b/mobile/src/components/uni-list/uni-list.vue
--- a/mobile/src/components/uni-list/uni-refresh.vue
+++ b/mobile/src/components/uni-list/uni-refresh.vue
--- a/mobile/src/components/uni-list/uni-refresh.wxs
+++ b/mobile/src/components/uni-list/uni-refresh.wxs
--- a/mobile/src/locale/en.json
+++ b/mobile/src/locale/en.json
--- a/mobile/src/locale/zh-Hans.json
+++ b/mobile/src/locale/zh-Hans.json
--- a/mobile/src/locale/zh-Hant.json
+++ b/mobile/src/locale/zh-Hant.json
--- a/mobile/src/main.js
+++ b/mobile/src/main.js
--- a/mobile/src/manifest.json
+++ b/mobile/src/manifest.json
--- a/mobile/src/pages.json
+++ b/mobile/src/pages.json
--- a/mobile/src/pages/index/index.vue
+++ b/mobile/src/pages/index/index.vue
--- a/mobile/src/pages/login/index.vue
+++ b/mobile/src/pages/login/index.vue
--- a/mobile/src/pages/tabBar/dir/folder.vue
+++ b/mobile/src/pages/tabBar/dir/folder.vue
--- a/mobile/src/pages/tabBar/dir/index.vue
+++ b/mobile/src/pages/tabBar/dir/index.vue
--- a/mobile/src/pages/tabBar/dir/search.vue
+++ b/mobile/src/pages/tabBar/dir/search.vue
--- a/mobile/src/pages/tabBar/home/detail.nvue
+++ b/mobile/src/pages/tabBar/home/detail.nvue
--- a/mobile/src/pages/tabBar/home/index.nvue
+++ b/mobile/src/pages/tabBar/home/index.nvue
--- a/mobile/src/pages/tabBar/home/index2.nvue
+++ b/mobile/src/pages/tabBar/home/index2.nvue
--- a/mobile/src/pages/tabBar/home/news-item.nvue
+++ b/mobile/src/pages/tabBar/home/news-item.nvue
--- a/mobile/src/pages/tabBar/me/about.vue
+++ b/mobile/src/pages/tabBar/me/about.vue
--- a/mobile/src/pages/tabBar/me/index.vue
+++ b/mobile/src/pages/tabBar/me/index.vue
--- a/mobile/src/pages/tabBar/me/language.vue
+++ b/mobile/src/pages/tabBar/me/language.vue
--- a/mobile/src/pages/tabBar/me/outlink.vue
+++ b/mobile/src/pages/tabBar/me/outlink.vue
--- a/mobile/src/pages/tabBar/me/person.vue
+++ b/mobile/src/pages/tabBar/me/person.vue
--- a/mobile/src/settings.js
+++ b/mobile/src/settings.js
--- a/mobile/src/static/DataEase-01.png
+++ b/mobile/src/static/DataEase-01.png
--- a/mobile/src/static/about.png
+++ b/mobile/src/static/about.png
--- a/mobile/src/static/dir.png
+++ b/mobile/src/static/dir.png
--- a/mobile/src/static/folder-close.png
+++ b/mobile/src/static/folder-close.png
--- a/mobile/src/static/folder-open.png
+++ b/mobile/src/static/folder-open.png
--- a/mobile/src/static/folder.png
+++ b/mobile/src/static/folder.png
--- a/mobile/src/static/home.png
+++ b/mobile/src/static/home.png
--- a/mobile/src/static/language.png
+++ b/mobile/src/static/language.png
--- a/mobile/src/static/login-logo.png
+++ b/mobile/src/static/login-logo.png
--- a/mobile/src/static/logo-bg.jpg
+++ b/mobile/src/static/logo-bg.jpg
--- a/mobile/src/static/logo.png
+++ b/mobile/src/static/logo.png
--- a/mobile/src/static/me.png
+++ b/mobile/src/static/me.png
--- a/mobile/src/static/msg.png
+++ b/mobile/src/static/msg.png
--- a/mobile/src/static/uni.png
+++ b/mobile/src/static/uni.png
--- a/mobile/src/static/uni.ttf
+++ b/mobile/src/static/uni.ttf
--- a/mobile/src/static/user.png
+++ b/mobile/src/static/user.png
--- a/mobile/src/static/yibiaobans.png
+++ b/mobile/src/static/yibiaobans.png
--- a/mobile/src/uni.scss
+++ b/mobile/src/uni.scss
--- a/mobile/tsconfig.json
+++ b/mobile/tsconfig.json
--- a/pom.xml
+++ b/pom.xml