vue2-client 1.8.36 → 1.8.38

package/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.8.37 -2024-1-30 @江超**
+- 开发环境增加水印
+
 **1.8.36 -2024-1-25 @江超**
 - 处理登录时指定资源名的情况
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.36",
+  "version": "1.8.38",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/App.vue

@@ -10,6 +10,7 @@ import { mapState, mapMutations } from 'vuex'
 import themeUtil from '@vue2-client/utils/themeUtil'
 import { getI18nKey } from '@vue2-client/utils/routerUtil'
 import { setSystemVersion } from '@vue2-client/utils/request'
+import createWaterMark from '@vue2-client/utils/waterMark'
 
 export default {
   name: 'App',
@@ -25,6 +26,14 @@ export default {
   },
   mounted () {
     this.setWeekModeTheme(this.weekMode)
+    const configStr = localStorage.getItem(process.env.VUE_APP_WEB_CONFIG_KEY)
+    if (configStr) {
+      const config = JSON.parse()
+      if (config.$globalProp.environment === 'dev') {
+        // 设置水印
+        createWaterMark('开发环境')
+      }
+    }
     // 设置系统版本
     setSystemVersion(this.compatible)
     // 获取基座应用得路由地址
@@ -126,3 +135,26 @@ export default {
 #id {
 }
 </style>
+<style lang="less">
+.water-mark-wrap {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  z-index: 9999;
+  pointer-events: none;
+  top: 0;
+  left: 0;
+  display: flex;
+  overflow: hidden;
+  flex-wrap: wrap;
+}
+.water-word {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 18px;
+  color: rgba(8, 8, 8, 0.1);
+  transform: rotate(-45deg);
+  user-select: none;
+}
+</style>

package/src/config/default/setting.config.js

@@ -43,7 +43,7 @@ module.exports = {
   // 旧系统路径
   iframeSrc: '/singlepage/index.html',
   // 兼容旧版本 V4（最新产品）  V3(V3产品)  OA(公司OA)
-  compatible: 'V3',
+  compatible: 'V4',
   // 路由资源名称
   routeName: '智慧燃气',
   // 自定义组件集合 格式为组件名: 组件路径（不需要带@/）

package/src/layouts/tabs/TabsView.vue

@@ -75,7 +75,7 @@ export default {
     this.loadCacheConfig(this.$router?.options?.routes)
     this.loadCachedTabs()
     // 解决单页面为首页时首次登录不加载问题
-    if (this.$route.meta.singlePage && this.single.length === 0){
+    if (this.$route.meta.singlePage && this.single.length === 0) {
       this.allSinglePages.forEach(item => {
         if (this.$route.fullPath.includes(item.fullPath)) {
           this.setSingle(item)

package/src/main.js

@@ -1,49 +1,26 @@
 import Vue from 'vue'
 import App from './App.vue'
 import Router from 'vue-router'
-import { modules } from '@vue2-client/store'
-import '@vue2-client/theme/index.less'
-import '@vue2-client/utils/filter'
-import 'animate.css/source/animate.css'
-import 'moment/locale/zh-cn'
-import Viser from 'viser-vue'
 import Vuex from 'vuex'
-
-// 插件
-import Antd from 'ant-design-vue'
-import Plugins from '@vue2-client/base-client/plugins'
-import { initI18n } from '@vue2-client/utils/i18n'
-import { loadInterceptors } from '@vue2-client/utils/request'
-import routes from './router'
-
-Vue.config.productionTip = false
-
-const i18n = initI18n('CN', 'US')
-
-const message = Vue.prototype.$message
+import { routerOptions, modules, i18n, message, bootstrap } from '../index'
 
 Vue.use(Router)
 Vue.use(Vuex)
-Vue.use(Antd)
-Vue.use(Viser)
-Vue.use(Plugins)
 
+// 创建router store
 const store = new Vuex.Store({ modules })
-const router = new Router({
-  mode: 'history', // 启用 history 模式
-  routes: routes // （缩写）相当于 routes: routes
-})
+const router = new Router(routerOptions)
 
 // 绑定原型，用于amis
 Vue.$store = store
 Vue.$router = router
 Vue.$i18n = i18n
 
-// 加载 axios 拦截器
-loadInterceptors({ i18n, message })
-new Vue({
-  router, // 注入路由配置到根实例
-  store,
-  i18n,
-  render: h => h(App),
-}).$mount('#app')
+bootstrap({ router, store, i18n, message }).then(() => {
+  new Vue({
+    router,
+    store,
+    i18n,
+    render: h => h(App)
+  }).$mount('#app')
+})

package/src/utils/waterMark.js

@@ -0,0 +1,31 @@
+/**
+ * @description: createWaterMark.js 加水印功能
+ */
+let waterMarkDOM
+
+const clearWaterMark = () => {
+  if (waterMarkDOM) waterMarkDOM.remove()
+}
+/**
+ * @description: 创建水印
+ * @param waterMarkName 水印内容
+ */
+export default function createWaterMark (waterMarkName) {
+  clearWaterMark()
+  if (!waterMarkName) {
+    return
+  }
+  const width = document.body.clientWidth
+  const canvasWidth = width / width / 320
+  const fontFamily = window.getComputedStyle(document.body)['font-family']
+  const fragment = document.createDocumentFragment()
+  waterMarkDOM = document.createElement('div')
+  waterMarkDOM.className = 'water-mark-wrap'
+  let spanStr = ''
+  for (let i = 0; i < 100; i++) {
+    spanStr += `<span class="water-word" style=width:${canvasWidth}px;height:200px;font: ${fontFamily}>${waterMarkName}</span>`
+  }
+  waterMarkDOM.innerHTML = spanStr
+  fragment.appendChild(waterMarkDOM)
+  document.body.appendChild(fragment)
+}

package/vue.config.js

@@ -11,11 +11,11 @@ const productionGzipExtensions = ['js', 'css']
 const isProd = process.env.NODE_ENV === 'production'
 
 // v4 产品演示
-// const v3Server = 'http://121.36.106.17:8400'
-// const gateway = 'http://192.168.50.77:31466'
+const v3Server = 'http://121.36.106.17:8400'
+const gateway = 'http://192.168.50.67:31567'
 // v3 铜川
-const v3Server = 'http://61.134.55.234:8405'
-const gateway = 'http://61.134.55.234:8456/webmeter'
+// const v3Server = 'http://61.134.55.234:8405'
+// const gateway = 'http://61.134.55.234:8456/webmeter'
 // v3 涉县
 // const v3Server = 'http://221.193.244.147:9600'
 // const gateway = 'http://221.193.244.147:9600/webmeter'
@@ -35,7 +35,7 @@ module.exports = {
       },
       '/api': {
         // v3用
-        pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
+        // pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
         target: gateway,
         changeOrigin: true
       },