fix(vue-generator): add builtin componentsMap

opentiny · Apr 17, 2024 · 61b5245 · 61b5245
1 parent 9776a74
commit 61b5245
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/packages/vue-generator/src/generator/vue/sfc/genSetupSFC.js b/packages/vue-generator/src/generator/vue/sfc/genSetupSFC.js
@@ -36,7 +36,6 @@ import {
   defaultGenMethodHook,
   defaultGenLifecycleHook
 } from './generateScript'
-import { BUILTIN_COMPONENTS_MAP } from '@/constant'
 
 const parseConfig = (config = {}) => {
   const {
@@ -74,10 +73,8 @@ const generateSFCFile = (schema, componentsMap, config = {}) => {
     schema.state = {}
   }
 
-  const combinedComponentsMap = [...componentsMap, ...BUILTIN_COMPONENTS_MAP]
-
   // 解析 import
-  const { pkgMap, blockPkgMap } = getImportMap(schema, combinedComponentsMap, { blockRelativePath, blockSuffix })
+  const { pkgMap, blockPkgMap } = getImportMap(schema, componentsMap, { blockRelativePath, blockSuffix })
 
   // 解析 state
   let stateRes = {}
@@ -198,10 +195,10 @@ const generateSFCFile = (schema, componentsMap, config = {}) => {
   }
 
   // 解析 template
-  const templateStr = genTemplateByHook(schema, globalHooks, { ...parsedConfig, componentsMap: combinedComponentsMap })
+  const templateStr = genTemplateByHook(schema, globalHooks, { ...parsedConfig, componentsMap: componentsMap })
 
   // 生成 script
-  const scriptStr = genScriptByHook(schema, globalHooks, { ...parsedConfig, componentsMap: combinedComponentsMap })
+  const scriptStr = genScriptByHook(schema, globalHooks, { ...parsedConfig, componentsMap: componentsMap })
 
   // 生成 style
   const styleStr = generateStyleTag(schema, styleConfig)

diff --git a/packages/vue-generator/src/plugins/parseSchemaPlugin.js b/packages/vue-generator/src/plugins/parseSchemaPlugin.js
@@ -1,3 +1,5 @@
+import { BUILTIN_COMPONENTS_MAP } from '@/constant'
+
 function parseSchema() {
   return {
     name: 'tinyEngine-generateCode-plugin-parse-schema',
@@ -12,6 +14,7 @@ function parseSchema() {
       const { pageSchema } = schema
       const pagesMap = {}
       const resPageTree = []
+      schema.componentsMap = [...schema.componentsMap, ...BUILTIN_COMPONENTS_MAP]
 
       for (const componentItem of pageSchema) {
         pagesMap[componentItem.id] = componentItem