fix(ewa): 修复变量引用错误

lyfeyaj · May 21, 2021 · b6be282 · b6be282
1 parent 9301680
commit b6be282
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 21 deletions.
diff --git a/packages/ewa/src/plugins/createStore/index.js b/packages/ewa/src/plugins/createStore/index.js
@@ -1,8 +1,7 @@
-'use strict';
-
 const isPlainObject = require('lodash.isplainobject');
 const injectStore = require('./injectStore');
 const reactive = require('./reactive');
+const observer = require('./Observer').getInstance();
 
 // 确保仅初始化一次
 let hasStore = false;
@@ -110,7 +109,7 @@ function createStore(obj, propNames = {}) {
   injectStore(propNames);
 
   if (isPlainObject(obj)) {
-    obInstance.reactiveObj = obj;
+    observer.reactiveObj = obj;
     reactive(obj);
     return obj;
   }

diff --git a/packages/ewa/src/plugins/createStore/injectStore.js b/packages/ewa/src/plugins/createStore/injectStore.js
@@ -1,9 +1,5 @@
-'use strict';
-
 const Watcher = require('./Watcher');
-const Observer = require('./Observer');
-
-const obInstance = Observer.getInstance();
+const observer = require('./Observer').getInstance();
 
 function noop() {}
 
@@ -17,7 +13,7 @@ function checkExistedProps(ctx, methodsArr) {
   let noConflicts = true;
   methodsArr.forEach((fn) => {
     if (fn in ctx) {
-      hasConflicts = false;
+      noConflicts = false;
       warn(`${fn} 属性或方法将被覆盖, 请尽快调整。`);
     }
     if (noConflicts) return;
@@ -45,7 +41,7 @@ const DEFAULT_PROP_NAMES = {
   $emit: '$emit',
   $off: '$off',
   $once: '$once',
-  $watch: '$watch'
+  $watch: '$watch',
 };
 
 // 注入方法和属性, 支持自定义方法名称
@@ -57,41 +53,41 @@ const injectStoreMethods = (ctx, propNames = {}) => {
   checkExistedProps(ctx, Object.keys(_propNames));
 
   // 手动更新全局data
-  ctx[_propNames['$set']] = function (key, value) {
-    obInstance.handleUpdate(key, value);
+  ctx[_propNames.$set] = function (key, value) {
+    observer.handleUpdate(key, value);
   };
 
   // 添加注册事件函数
-  ctx[_propNames['$on']] = function (key, callback) {
+  ctx[_propNames.$on] = function (key, callback) {
     if (this.__watcher && this.__watcher.id) {
-      obInstance.onEvent(key, callback, ctx, this.__watcher.id);
+      observer.onEvent(key, callback, ctx, this.__watcher.id);
     }
   };
 
   // 添加通知更新函数
-  ctx[_propNames['$emit']] = function (key, obj) {
-    obInstance.emitEvent(key, obj);
+  ctx[_propNames.$emit] = function (key, obj) {
+    observer.emitEvent(key, obj);
   };
 
   // 添加解绑事件函数
-  ctx[_propNames['$off']] = function (key) {
+  ctx[_propNames.$off] = function (key) {
     if (this.__watcher && this.__watcher.id) {
-      obInstance.off(key, this.__watcher.id);
+      observer.off(key, this.__watcher.id);
     }
   };
 
   // 添加执行一次事件函数
-  ctx[_propNames['$once']] = function (key, callback) {
+  ctx[_propNames.$once] = function (key, callback) {
     if (this.__watcher && this.__watcher.id) {
-      obInstance.once(key, callback, this.__watcher.id);
+      observer.once(key, callback, this.__watcher.id);
     }
   };
 };
 
 // 初始化 store
 function initStore(propNames = {}) {
   // 获取自定义 $watch 名称
-  const watchPropName = propNames['$watch'];
+  const watchPropName = propNames.$watch;
 
   // 注入方法和属性到 Page 和 Component 中
   // NOTE: 优化运行时，避免使用这种覆盖的方式，会导致污染