提交 3bee9826 编写于 作者: fxy060608's avatar fxy060608

Merge branch 'dev' of https://github.com/dcloudio/uni-app into alpha

...@@ -192,6 +192,9 @@ module.exports = function () { ...@@ -192,6 +192,9 @@ module.exports = function () {
}, },
externals: { externals: {
'vue': 'Vue' 'vue': 'Vue'
},
performance: {
hints: false
}, },
optimization: { optimization: {
namedModules: false namedModules: false
......
...@@ -104,6 +104,9 @@ module.exports = { ...@@ -104,6 +104,9 @@ module.exports = {
chunkFilename: '[id].js', chunkFilename: '[id].js',
globalObject: process.env.UNI_PLATFORM === 'mp-alipay' ? 'my' : 'global', globalObject: process.env.UNI_PLATFORM === 'mp-alipay' ? 'my' : 'global',
sourceMapFilename: '../.sourcemap/' + process.env.UNI_PLATFORM + '/[name].js.map' sourceMapFilename: '../.sourcemap/' + process.env.UNI_PLATFORM + '/[name].js.map'
},
performance: {
hints: false
}, },
resolve: { resolve: {
extensions: ['.nvue'], extensions: ['.nvue'],
......
...@@ -55,7 +55,7 @@ const CHARS = { ...@@ -55,7 +55,7 @@ const CHARS = {
'nbsp': ' ', 'nbsp': ' ',
'quot': '"', 'quot': '"',
'apos': "'" 'apos': "'"
} }
function decodeEntities (htmlString) { function decodeEntities (htmlString) {
return htmlString.replace(/&(([a-zA-Z]+)|(#x{0,1}[\da-zA-Z]+));/gi, function (match, stage) { return htmlString.replace(/&(([a-zA-Z]+)|(#x{0,1}[\da-zA-Z]+));/gi, function (match, stage) {
...@@ -95,9 +95,11 @@ export default function parseNodes (nodes, parentNode) { ...@@ -95,9 +95,11 @@ export default function parseNodes (nodes, parentNode) {
if (isPlainObject(attrs)) { if (isPlainObject(attrs)) {
const tagAttrs = TAGS[tagName] || [] const tagAttrs = TAGS[tagName] || []
Object.keys(attrs).forEach(function (name) { Object.keys(attrs).forEach(function (name) {
const value = attrs[name] let value = attrs[name]
switch (name) { switch (name) {
case 'class': case 'class':
/* eslint-disable no-fallthrough */
Array.isArray(value) && (value = value.join(' '))
case 'style': case 'style':
elem.setAttribute(name, value) elem.setAttribute(name, value)
break break
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册