@ericbyliang/miniprogram 0.0.2 → 1.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ericbyliang/miniprogram",
-  "version": "0.0.2",
+  "version": "1.1.3",
   "description": "Wechat miniprogram global watermark component",
   "main": "index.js",
   "miniprogram": "src",

package/src/constants.js

@@ -0,0 +1,6 @@
+const TEXT_KEY = '$&watermark_text$*&'
+const TEXT_CHANGE_KEY = '$&watermark-change$*&'
+module.exports = {
+  TEXT_KEY,
+  TEXT_CHANGE_KEY
+}

package/src/event-bus.js

@@ -0,0 +1,22 @@
+const events = {}
+
+function on(name, fn) {
+  if (!events[name]) events[name] = []
+  events[name].push(fn)
+}
+
+function off(name, fn) {
+  if (!events[name]) return
+  events[name] = events[name].filter(f => f !== fn)
+}
+
+function emit(name, data) {
+  if (!events[name]) return
+  events[name].forEach(fn => fn(data))
+}
+
+module.exports = {
+  on,
+  off,
+  emit
+}

package/src/index.js

@@ -0,0 +1,9 @@
+const eventBus = require('./event-bus')
+const {TEXT_KEY, TEXT_CHANGE_KEY} = require('./constants')
+const setWatermarkText = (text)=>{
+  wx.setStorageSync(TEXT_KEY, text)
+  eventBus.emit(TEXT_CHANGE_KEY, text)
+}
+module.exports = {
+  setWatermarkText
+}

package/src/watermark/index.js

@@ -1,6 +1,17 @@
+const eventBus = require('../event-bus')
+const {TEXT_KEY, TEXT_CHANGE_KEY} = require('../constants')
 Component({
   lifetimes: {
-    ready: function () {
+    attached: function () {
+      this._onChange = (text) => {
+        this.setData({
+          text
+        })
+      }
+      eventBus.on(TEXT_CHANGE_KEY, this._onChange)
+    },
+    detached: function() {
+      eventBus.off(TEXT_CHANGE_KEY, this._onChange)
     }
   },
   /**
@@ -9,7 +20,7 @@ Component({
   properties: {
     text: {
       type: String,
-      value: wx.getStorageSync('$&watermark_text$*&') || '',
+      value: wx.getStorageSync(TEXT_KEY) || '',
       observer: function (newVal, oldVal) {
         this.setData({
           text: newVal,

package/src/watermark/index.wxml

@@ -1,6 +1,6 @@
 <view class="watermark" style="transform: rotate({{rotate}}deg);color: {{textColor}};font-size: {{textSize}}rpx;">
   <block wx:for="{{60}}" wx:key="row">
-    <view class="watermark-row" style="margin-left: {{index % 2 === 0 ? 0 : gapX / 2}}rpx;margin-bottom: {{gapY}}rpx;">
+    <view class="watermark-row" style="margin-left: {{index % 2 === 0 ? 0 : textSize*text.length/2}}rpx;margin-bottom: {{gapY}}rpx;">
       <block wx:for="{{15}}" wx:key="col">
         <text class="watermark-col" style="margin-right: {{gapX}}rpx;">{{text}}</text>
       </block>

package/index.js

@@ -1,6 +0,0 @@
-const setWatermarkText = (text)=>{
-  wx.setStorageSync('$&watermark_text$*&', text)
-}
-module.exports = {
-  setWatermarkText
-}