mali-applet-ui 1.1.68 → 1.1.69

package/env/index.d.ts

@@ -1,3 +1,4 @@
+export function defineSwaggerConfig(config: Record<string, any>, defaultRootPath ?: string): Record<string, any>
 export function getEnvCode(mode: string): string
 export function getEnvName(mode: string): string
 export function getCustomName(custom: string): string

package/env/index.js

@@ -11,6 +11,8 @@ const pack = require('../package.json')
 
 const apiURL = 'http://192.168.10.217:3000'
 
+const envDir = 'env'
+
 function hasEmptyConf (key) {
   return !key || key === 'default'
 }
@@ -141,7 +143,8 @@ function initEnvScript (rootPath, confs) {
     uni_mpqiwei_build: 'npm run run_before && vue-cli-service uni-build',
     run_before: 'node script/run-before',
     clear: 'gulp clear_temp',
-    'generate:api': 'npx ts-codegen && eslint --fix --ext .js,.ts src/api'
+    'generate:api': 'npx ts-codegen && eslint --fix --ext .js,.ts src/api',
+    'get:api': 'npm run generate:api'
   }
 
   console.log('\n正在检查配置')
@@ -159,9 +162,9 @@ function initEnvScript (rootPath, confs) {
 
       // 生成配置文件
       const envName = `.env.${customName || 'default'}.${subName || 'default'}.${platform || 'default'}.${getEnvCode(mode)}`
-      if (!fs.existsSync(path.resolve(rootPath, envName))) {
+      if (!fs.existsSync(path.resolve(rootPath, `${envDir}/${envName}`))) {
         console.log(`${pack.name} 生成配置文件 ${envName}`)
-        fs.writeFileSync(path.resolve(rootPath, envName), `# ${[customName ? getCustomName(customName) : '', subName ? getSubModuleName(subName) : '', getEnvName(mode)].filter(v => v).map(v => v).join('-')}\n`)
+        fs.writeFileSync(path.resolve(rootPath, `${envDir}/${envName}`), `# ${[customName ? getCustomName(customName) : '', subName ? getSubModuleName(subName) : '', getEnvName(mode)].filter(v => v).map(v => v).join('-')}\n`)
       }
     })
   })
@@ -191,33 +194,81 @@ function initEnvScript (rootPath, confs) {
 }
 
 function parseEnv (rootPath) {
-  const envConfig = {}
+  let envConfig = {}
+
   envConfig.VUE_APP_MODE = process.env.VUE_APP_MODE || 'prod'
   envConfig.VUE_APP_CUSTOM_MODULE = process.env.VUE_APP_CUSTOM_MODULE || 'default'
   envConfig.VUE_APP_SUB_MODULE = process.env.VUE_APP_SUB_MODULE || 'default'
   envConfig.VUE_APP_PLATFORM_NAME = process.env.VUE_APP_PLATFORM_NAME || 'default'
   envConfig.VUE_APP_PUBLISH_DATE = XEUtils.toDateString(new Date(), 'yyyyMMddHHmmss')
 
-  const cName = `.env.${envConfig.VUE_APP_CUSTOM_MODULE}`
+  const gName = '.env'
+  const cName = `${gName}.${envConfig.VUE_APP_CUSTOM_MODULE}`
   const csName = `${cName}.${envConfig.VUE_APP_SUB_MODULE}`
   const cspName = `${csName}.${envConfig.VUE_APP_PLATFORM_NAME}`
   const envName = `${cspName}.${getEnvCode(envConfig.VUE_APP_MODE)}`
-  const globalDev = parseEnvFile(rootPath, '.env')
-  const cEnv = parseEnvFile(rootPath, cName)
-  const csEnv = parseEnvFile(rootPath, csName)
-  const cspEnv = parseEnvFile(rootPath, cspName)
-  const envEnv = parseEnvFile(rootPath, envName)
-  const localEnv = parseEnvFile(rootPath, `${envName}.local`)
+  const endFiles = [gName, cName, csName, cspName, envName, `${envName}.local`].map(fileName => `${envDir}/${fileName}`).concat([`${envName}.local`])
 
   console.log('\n读取配置文件：')
-  const endFiles = ['.env', cName, csName, cspName, envName, `${envName}.local`]
+  if (fs.existsSync(path.resolve(rootPath, envDir))) {
+    endFiles.forEach(fileName => {
+      if (fs.existsSync(path.resolve(rootPath, fileName))) {
+        envConfig = Object.assign(envConfig, parseEnvFile(rootPath, fileName))
+        console.log(`${fileName}`)
+      }
+    })
+  } else {
+    console.log(`检测不到 Env 配置文件，路径：${envDir}/*`)
+  }
+
+  return envConfig
+}
+
+function parseSwaggerEnv (rootPath) {
+  let swaggerConfig = {
+    VUE_APP_SWAGGER_API_SPECS_PATHS: []
+  }
+
+  const gName = '.env'
+  const aName = `${gName}.api`
+  const endFiles = [aName, `${aName}.local`].map(fileName => `${envDir}/${fileName}`).concat([`${aName}.local`])
+
   endFiles.forEach(fileName => {
-    if (fs.existsSync(path.resolve(rootPath, fileName))) {
-      console.log(`${fileName}`)
-    }
+    swaggerConfig = Object.assign(swaggerConfig, parseEnvFile(rootPath, fileName))
   })
 
-  return Object.assign({}, globalDev, cEnv, csEnv, cspEnv, envEnv, localEnv, envConfig)
+  if (swaggerConfig.VUE_APP_SWAGGER_API_URL) {
+    swaggerConfig.VUE_APP_SWAGGER_API_SPECS_PATHS = (swaggerConfig.VUE_APP_SWAGGER_MODULES || 'default').split(',').map(name => {
+      return {
+        path: XEUtils.toFormatString(swaggerConfig.VUE_APP_SWAGGER_API_URL, { name }),
+        name
+      }
+    })
+  }
+
+  return swaggerConfig
+}
+
+function defineSwaggerConfig (defaultConfig = {}, defaultRootPath) {
+  const rootPath = defaultConfig.rootPath || defaultRootPath
+
+  if (!fs.existsSync(path.resolve(rootPath, `${envDir}/.env.api`))) {
+    console.log(`检测不到 Swagger 配置文件，路径：${envDir}/.env.api`)
+  }
+
+  const swaggerConfig = parseSwaggerEnv(rootPath)
+  return {
+    outputFolder: 'src/api',
+    apiSpecsPaths: swaggerConfig.VUE_APP_SWAGGER_API_SPECS_PATHS,
+    options: {
+      withComments: true,
+      typeWithPrefix: false,
+      backwardCompatible: false
+    },
+    importTopCode: '',
+    importHeaderCode: '/* eslint-disable no-use-before-define,camelcase */',
+    ...(defaultConfig || {})
+  }
 }
 
 function initEnv (rootPath) {
@@ -452,6 +503,7 @@ ${process.env.BUILD_USER ? `>> 操作人：${process.env.BUILD_USER}` : ''}
 <font color="comment">-自动化发版</font>`
 }
 
+exports.defineSwaggerConfig = defineSwaggerConfig
 exports.getEnvCode = getEnvCode
 exports.getEnvName = getEnvName
 exports.getCustomName = getCustomName
@@ -470,6 +522,7 @@ exports.getBuildMsg = getBuildMsg
 exports.getBuildSuccessMsg = getBuildSuccessMsg
 
 module.exports = {
+  defineSwaggerConfig,
   getEnvCode,
   getEnvName,
   getCustomName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "1.1.68",
+  "version": "1.1.69",
   "description": "码里UI-小程序组件库(vue2)",
   "files": [
     "lib",