From d270af0a5ae30d20da42fccb0b33dd023bec3eac Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Fri, 09 Jul 2021 14:39:26 +0800
Subject: [PATCH] 调整页面间通讯组件细节

---
 bases/Pilot.js |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/bases/Pilot.js b/bases/Pilot.js
index 17fb01e..babc9de 100644
--- a/bases/Pilot.js
+++ b/bases/Pilot.js
@@ -35,11 +35,11 @@
                 if (name === '$data' && typeof dataAdd !== 'undefined') {
                     // 转换 dataAdd 中 assets 属性下的图片地址值
                     if (typeof dataAdd.assets !== 'undefined') {
-                        dataAdd.assets = this._transDataAdd(dataAdd.assets);
+                        dataAdd.assets = Pilot.transAssets(dataAdd.assets);
                     }
-                    // 当有传data值进来,初始值必须带data中的字段
-                    const dataOrig = this.$data();
                     options.data = () => {
+                        // 当有传data值进来,初始值必须带data中的字段
+                        const dataOrig = this.$data();
                         return {
                             ...dataOrig,
                             ...dataAdd,
@@ -55,11 +55,16 @@
         return options;
     }
 
-    _transDataAdd(assets = {}) {
+    /**
+     * 转换静态图片引用
+     * @param assets
+     * @return {{}}
+     */
+    static transAssets(assets = {}) {
         const assets2 = {};
         Object.keys(assets).forEach(key => {
             let asset = '';
-            if (assets[key].indexOf('assets') > 0) {
+            if (assets[key].indexOf('assets') >= 0) {
                 asset = assets[key].split('assets')[1];
             } else {
                 asset = assets[key].replace(/^[.\/\\]*/, '/');

--
Gitblit v1.9.1