From 99abbc4d79322ee98ae743ab49838c3b113a1537 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Fri, 6 Sep 2019 15:24:14 +0800
Subject: [PATCH] feat(cli): recycle-list

---
 .../packages/webpack-uni-nvue-loader/lib/template.js         | 5 ++++-
 .../packages/vue-template-compiler/browser.js                | 4 ++--
 .../packages/vue-template-compiler/build.js                  | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/vue-cli-plugin-hbuilderx/packages/webpack-uni-nvue-loader/lib/template.js b/packages/vue-cli-plugin-hbuilderx/packages/webpack-uni-nvue-loader/lib/template.js
index c5316da2a6..80b6ce559f 100644
--- a/packages/vue-cli-plugin-hbuilderx/packages/webpack-uni-nvue-loader/lib/template.js
+++ b/packages/vue-cli-plugin-hbuilderx/packages/webpack-uni-nvue-loader/lib/template.js
@@ -1,4 +1,7 @@
 module.exports = function(content) {
-    this.cacheable && this.cacheable()
+  this.cacheable && this.cacheable()
+  if (content.indexOf('recycle-list') === -1) {
     return `<scroll-view :scroll-y="true" :enableBackToTop="true" bubble="true" style="flex-direction:column">${content}</scroll-view>`
+  }
+  return content
 }
diff --git a/packages/vue-cli-plugin-uni/packages/vue-template-compiler/browser.js b/packages/vue-cli-plugin-uni/packages/vue-template-compiler/browser.js
index 3978843186..8b9b33fa6c 100644
--- a/packages/vue-cli-plugin-uni/packages/vue-template-compiler/browser.js
+++ b/packages/vue-cli-plugin-uni/packages/vue-template-compiler/browser.js
@@ -655,7 +655,7 @@
             return cumulated
           }, {})
         };// fixed by xxxxxx
-        if (isSpecialTag(tag) && !isCustomBlock(currentBlock.attrs.lang || '')) {
+        if (isSpecialTag(tag) && !isCustomBlock(String(currentBlock.attrs.lang || ''))) {
           checkAttrs(currentBlock, attrs);
           if (tag === 'style') {
             sfc.styles.push(currentBlock);
@@ -713,7 +713,7 @@
       } else {
         var offset = content.slice(0, block.start).split(splitRE$1).length;
         var lang = block.attrs && block.attrs.lang; // fixed by xxxxxx
-        var padChar = block.type === 'script' && !block.lang && !isCustomBlock(lang || '')
+        var padChar = block.type === 'script' && !block.lang && !isCustomBlock(String(lang || ''))
           ? '//\n'
           : '\n';
         return Array(offset).join(padChar)
diff --git a/packages/vue-cli-plugin-uni/packages/vue-template-compiler/build.js b/packages/vue-cli-plugin-uni/packages/vue-template-compiler/build.js
index 7dfd4f0670..4791721ac4 100644
--- a/packages/vue-cli-plugin-uni/packages/vue-template-compiler/build.js
+++ b/packages/vue-cli-plugin-uni/packages/vue-template-compiler/build.js
@@ -613,7 +613,7 @@ function parseComponent (
           return cumulated
         }, {})
       };// fixed by xxxxxx
-      if (isSpecialTag(tag) && !isCustomBlock(currentBlock.attrs.lang || '')) {
+      if (isSpecialTag(tag) && !isCustomBlock(String(currentBlock.attrs.lang || ''))) {
         checkAttrs(currentBlock, attrs);
         if (tag === 'style') {
           sfc.styles.push(currentBlock);
@@ -671,7 +671,7 @@ function parseComponent (
     } else {
       var offset = content.slice(0, block.start).split(splitRE).length;
       var lang = block.attrs && block.attrs.lang; // fixed by xxxxxx
-      var padChar = block.type === 'script' && !block.lang && !isCustomBlock(lang || '')
+      var padChar = block.type === 'script' && !block.lang && !isCustomBlock(String(lang || ''))
         ? '//\n'
         : '\n';
       return Array(offset).join(padChar)
-- 
GitLab