agilebuilder-ui 1.1.50-rc1 → 1.1.50-rc3

package/src/utils/watermark.js

@@ -1,5 +1,4 @@
-'use strict'
-// import ssoService from '../api/sso-service'
+import {getWatermark, cacheWatermark, removeWatermark} from './watermark-cache'
 const watermark = {}
 
 const setWatermark = (str, parma, paramId) => {
@@ -35,12 +34,12 @@ const setWatermark = (str, parma, paramId) => {
   const div = document.createElement('div')
   div.id = id
   div.style.pointerEvents = 'none'
-  div.style.top = '80px'
-  div.style.left = '200px'
+  div.style.top = '10px'  // 80px
+  div.style.left = '0px' // 200px
   div.style.position = 'fixed'
   div.style.zIndex = '10000'
-  div.style.width = '70%'
-  div.style.height = '80%'
+  div.style.width = '100%' // 70%
+  div.style.height = '100%' // 80%
   div.style.background =
     'url(' + can.toDataURL('image/png') + ') left top repeat'
 
@@ -71,6 +70,48 @@ export function showWatermark(label, parma, user, paramId) {
     }
   })
 }
+
+// 获得水印维护信息
+export function getWatermarkSetting(){
+  return new Promise((resolve,reject)=>{
+    let watermark = getWatermark()
+    if(!watermark || watermark === 'EMPTY_VALUE'){
+      window.$vueApp.config.globalProperties.$http.get(window.$vueApp.config.globalProperties.baseAPI + '/component/watermark').then((data)=>{
+        if(data){
+          watermark = data
+          cacheWatermark(JSON.stringify(watermark))
+          // 兼容之前的代码
+          watermark.font = watermark.fontStyle
+          watermark.color = watermark.fontColor
+          resolve(watermark)
+        } else {
+          cacheWatermark('EMPTY_VALUE')
+          resolve()
+        }
+      })
+    } else {
+      try{
+        watermark = JSON.parse(watermark)
+        // 兼容之前的代码
+        watermark.font = watermark.fontStyle
+        watermark.color = watermark.fontColor
+        resolve(watermark)
+      }catch(error){
+        console.error('watermark content error.',error)
+        resolve()
+      }
+    }
+  })
+}
+
+// 该方法只允许调用一次
+export function showWatermarkNew() {
+  getWatermarkSetting().then((watermark)=>{
+    if(watermark){
+      setWatermark(watermark.content, watermark)
+    }
+  })
+}
 // watermark.set = (label, parma) => {
 
 // }

package/src/views/layout/EmptyLayout.vue

@@ -1,3 +1,11 @@
 <template>
   <router-view />
-</template>
+</template>
+<script>
+import {showWatermarkNew} from '../../utils/watermark'
+export default {
+  mounted(){
+    showWatermarkNew()
+  }
+}
+</script>

package/src/views/layout/Layout.vue

@@ -17,6 +17,7 @@
 import { Sidebar, AppMain, Breadcrumb } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
 import { isShowMenuRoute } from '../../../src/utils/common-util'
+import {showWatermarkNew} from '../../utils/watermark'
 
 export default {
   name: 'Layout',
@@ -49,6 +50,9 @@ export default {
       }
     },
   },
+  mounted(){
+    showWatermarkNew()
+  },
   methods: {
     handleClickOutside() {
       this.$store.dispatch('closeSidebar', { withoutAnimation: false })

package/src/views/layout/NewLayout.vue

@@ -9,10 +9,14 @@
 
 <script>
 import { AppMain } from './components'
+import {showWatermarkNew} from '../../utils/watermark'
 export default {
   name: 'NewLayout',
   components: {
     AppMain,
   },
+  mounted(){
+    showWatermarkNew()
+  }
 }
 </script>

package/src/views/login/update-password.vue

@@ -28,6 +28,7 @@
           v-model="loginForm.password"
           type="password"
           name="password"
+          show-password
           auto-complete="on"
           placeholder="密码"
         />
@@ -36,6 +37,7 @@
         <el-input
           v-model="loginForm.newPassword"
           type="password"
+          show-password
           name="newPassword"
           auto-complete="on"
           placeholder="新密码"
@@ -45,6 +47,7 @@
         <el-input
           v-model="loginForm.confirmNewPassword"
           type="password"
+          show-password
           name="confirmNewPassword"
           auto-complete="on"
           placeholder="请再次输入新密码"