mali-ui-plus 1.1.6 → 1.1.7

package/env/index.js

@@ -82,7 +82,7 @@ function getSCSSAdditionalData (conf) {
   return rest.join('\n')
 }
 
-function parseEnv (dirPath) {
+function parseEnv (rootPath) {
   const envConfig = {}
   envConfig.VUE_APP_MODE = process.env.VUE_APP_MODE || 'prod'
   envConfig.VUE_APP_CUSTOM_MODULE = process.env.VUE_APP_CUSTOM_MODULE || 'default'
@@ -90,18 +90,22 @@ function parseEnv (dirPath) {
   envConfig.VUE_APP_PLATFORM_NAME = process.env.VUE_APP_PLATFORM_NAME || 'default'
   envConfig.VUE_APP_PUBLISH_DATE = XEUtils.toDateString(new Date(), 'yyyyMMddHHmmss')
 
-  const cusName = `.env.${envConfig.VUE_APP_CUSTOM_MODULE || 'default'}`
-  const envName = `${cusName}.${envConfig.VUE_APP_SUB_MODULE || 'default'}.${envConfig.VUE_APP_PLATFORM_NAME || 'default'}.${getEnvCode(envConfig.VUE_APP_MODE)}`
-  const globalDev = parseEnvFile(dirPath, '.env')
-  const defDev = parseEnvFile(dirPath, cusName)
-  const appEnv = parseEnvFile(dirPath, envName)
-  const localEnv = parseEnvFile(dirPath, `${envName}.local`)
-
-  return Object.assign({}, globalDev, defDev, appEnv, localEnv, envConfig)
+  const cName = `.env.${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`)
+
+  return Object.assign({}, globalDev, cEnv, csEnv, cspEnv, envEnv, localEnv, envConfig)
 }
 
-function initEnv (dirPath, defaultEnv) {
-  const envConfig = parseEnv(dirPath)
+function initEnv (rootPath, defaultEnv) {
+  const envConfig = parseEnv(rootPath)
   const conf = Object.assign(process.env, defaultEnv, envConfig)
   console.log('\n环境配置：')
   console.log(`版本：${conf.VUE_APP_CUSTOM_MODULE}\n模块：${conf.VUE_APP_SUB_MODULE}\n平台：${conf.VUE_APP_PLATFORM_NAME}\n环境：${conf.VUE_APP_MODE}\n`)

package/lib/mali-ui-plus.common.js

@@ -61781,7 +61781,7 @@ function index_config(options) {
   return config_0;
 }
 const MaliUI = {
-  version: "1.1.5",
+  version: "1.1.6",
   install: index_install,
   config: index_config,
   renderer: {

package/lib/mali-ui-plus.umd.js

@@ -61791,7 +61791,7 @@ function index_config(options) {
   return config_0;
 }
 const MaliUI = {
-  version: "1.1.5",
+  version: "1.1.6",
   install: index_install,
   config: index_config,
   renderer: {