feat(core & build): support skipLaterCalc for computed

max-team · Apr 17, 2019 · 6dcf61c · 6dcf61c
1 parent 6b265c9
commit 6dcf61c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/packages/mars-build/src/scripts/defaultConfig.js b/packages/mars-build/src/scripts/defaultConfig.js
@@ -16,6 +16,7 @@ module.exports = function (target) {
         ],
         designWidth: 750,
         watch: ['src/**/*'],
+        framework: {},
         modules: {
             postcss: {
                 px2units: {

diff --git a/packages/mars-build/src/scripts/gulpTasks.js b/packages/mars-build/src/scripts/gulpTasks.js
@@ -99,6 +99,13 @@ function getTaskRuntime(config, options) {
     const {dest: buildDest, source} = config;
     let dest = getDestDir(config, options);
     dest = dest + '/' + buildDest.coreDir;
+    let framework = JSON.stringify({});
+    try {
+        framework = JSON.stringify(config.framework || {});
+    } catch (e) {
+        throw new Error('config.framework must be plain Object');
+    }
+
     return () => {
         return gulp.src(source.runtime)
             .pipe(changed(dest))
@@ -109,6 +116,9 @@ function getTaskRuntime(config, options) {
                 source = source.replace(
                     /process\.env\.NODE_ENV/g,
                     JSON.stringify(process.env.NODE_ENV || 'development')
+                ).replace(
+                    /process\.env\.MARS_CONFIG_FRAMEWORK/g,
+                    framework
                 );
                 const ret = transform(source, {
                     plugins: [

diff --git a/packages/mars-core/src/base/data.js b/packages/mars-core/src/base/data.js
@@ -12,6 +12,8 @@ import {mark, measure} from '../helper/perf';
 import config from '../config';
 import {getMpUpdatedCallbacks} from './api/mpNextTick';
 
+const {framework = {}} = config;
+
 function cleanKeyPath(vm) {
     if (vm.__mpKeyPath) {
         Object.keys(vm.__mpKeyPath).forEach(_key => {
@@ -55,14 +57,15 @@ export function setData(vm, $mp, isRoot = false) {
         const computed = getChangedComputed(vm);
         data = Object.assign(data, computed, changed);
         // 如果后续数据更新 需要计算新增的实例上的 computed 值
-        // if (Object.keys(data).length > 0) {
-        //     const allComputed = getAllComputed(vm);
-        //     data = Object.keys(allComputed).length > 0
-        //         ? Object.assign(data, {
-        //             [isRoot ? 'rootComputed' : 'compComputed']: allComputed
-        //         })
-        //         : data;
-        // }
+        const skipLaterCalc = framework.computed && framework.computed.skipLaterCalc;
+        if (!skipLaterCalc && Object.keys(data).length > 0) {
+            const allComputed = getAllComputed(vm);
+            data = Object.keys(allComputed).length > 0
+                ? Object.assign(data, {
+                    [isRoot ? 'rootComputed' : 'compComputed']: allComputed
+                })
+                : data;
+        }
     }
 
     if (process.env.NODE_ENV !== 'production' && config.performance && mark) {

diff --git a/packages/mars-core/src/config.js b/packages/mars-core/src/config.js
@@ -5,5 +5,6 @@
 
 export default {
     performance: false,
-    debug: false
+    debug: false,
+    framework: process.env.MARS_CONFIG_FRAMEWORK
 };