diff --git a/packages/uni-template-compiler/lib/app/parser/tag-parser.js b/packages/uni-template-compiler/lib/app/parser/tag-parser.js index e3c52606e467e7142a8fd8c9dd7f68c56143afcb..0ac94d9801c952ca4f4a67ecfaf2992ed62fd217 100644 --- a/packages/uni-template-compiler/lib/app/parser/tag-parser.js +++ b/packages/uni-template-compiler/lib/app/parser/tag-parser.js @@ -6,13 +6,6 @@ const tags = require('@dcloudio/uni-cli-shared/lib/tags') // 仅限 view 层 module.exports = function parseTag (el) { - const tag = el.tag - // web components - // TODO use list - if (tag === 'view' || tag === 'uni-view') { - el.tag = 'uni-view' - return - } if (el.tag.indexOf('v-uni-') !== 0 && hasOwn(tags, el.tag)) { el.tag = 'v-uni-' + el.tag } diff --git a/src/core/view/components/index.js b/src/core/view/components/index.js index eb79afa6fb2228860526ae769e146f30d1b73bfb..e18b703c5f3b9f0ec534f508909141867036376c 100644 --- a/src/core/view/components/index.js +++ b/src/core/view/components/index.js @@ -29,13 +29,11 @@ requireComponents.forEach((components, index) => { const componentConfig = componentModule.default || componentModule - if (__PLATFORM__ === 'app-plus' && componentConfig.name in elements) { - return - } - componentConfig.mixins = componentConfig.mixins ? [].concat(baseMixin, componentConfig.mixins) : [baseMixin] - componentConfig.mixins.push(animation) + if (!componentConfig.functional) { + componentConfig.mixins.push(animation) + } componentConfig.name = 'VUni' + componentConfig.name diff --git a/src/platforms/app-plus/view/components/view/index.vue b/src/platforms/app-plus/view/components/view/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..151086931c4c518992719bc3538445b5b58cedc0 --- /dev/null +++ b/src/platforms/app-plus/view/components/view/index.vue @@ -0,0 +1,19 @@ + + + diff --git a/src/core/view/components/view/README.md b/src/platforms/h5/view/components/view/README.md similarity index 100% rename from src/core/view/components/view/README.md rename to src/platforms/h5/view/components/view/README.md diff --git a/src/core/view/components/view/index.vue b/src/platforms/h5/view/components/view/index.vue similarity index 100% rename from src/core/view/components/view/index.vue rename to src/platforms/h5/view/components/view/index.vue