mali-applet-ui 1.1.51 → 1.1.53

package/env/index.js

@@ -9,16 +9,6 @@ const nodemailer = require('nodemailer')
 const smtpTransport = require('nodemailer-smtp-transport')
 const pack = require('../package.json')
 
-const currTransporter = new Promise((resolve, reject) => {
-  // axios.get('http://192.168.10.217:3000/emai/getSmtpOptions').then(res => {
-  //   const transporter = nodemailer.createTransport(smtpTransport(res.data))
-  //   resolve(transporter)
-  // }).catch((e) => {
-  //   console.log('获取邮箱配置失败')
-  //   reject(e)
-  // })
-})
-
 function getEnvCode (mode) {
   const maps = {
     dev: 'development',
@@ -113,14 +103,18 @@ function parseEnv (rootPath) {
   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 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 defDev = parseEnvFile(rootPath, cusName)
-  const appEnv = parseEnvFile(rootPath, envName)
+  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, defDev, appEnv, localEnv, envConfig)
+  return Object.assign({}, globalDev, cEnv, csEnv, cspEnv, envEnv, localEnv, envConfig)
 }
 
 function initEnv (rootPath) {
@@ -247,25 +241,41 @@ function uploadWxMiniprogram (rootPath, version) {
   })
 }
 
+let currTransporter = null
+
+function getTransporter () {
+  if (!currTransporter) {
+    currTransporter = new Promise((resolve, reject) => {
+      axios.get('http://192.168.10.217:3000/emai/getSmtpOptions').then(res => {
+        const transporter = nodemailer.createTransport(smtpTransport(res.data))
+        resolve(transporter)
+      }).catch((e) => {
+        console.log('获取邮箱配置失败')
+        reject(e)
+      })
+    })
+  }
+  return currTransporter
+}
+
 function sendMail ({ receivedBy, subject, html }) {
   return new Promise((resolve, reject) => {
-    resolve()
-    // currTransporter.then((transporter) => {
-    //   transporter.sendMail({
-    //     from: 'xuliangzhan@ddscan.cn',
-    //     to: receivedBy,
-    //     subject,
-    //     html
-    //   }, function (error, response) {
-    //     if (error) {
-    //       reject(error)
-    //     } else {
-    //       resolve()
-    //     }
-    //   })
-    // }).catch((e) => {
-    //   reject(e)
-    // })
+    getTransporter().then((transporter) => {
+      transporter.sendMail({
+        from: 'xuliangzhan@ddscan.cn',
+        to: receivedBy,
+        subject,
+        html
+      }, function (error) {
+        if (error) {
+          reject(error)
+        } else {
+          resolve()
+        }
+      })
+    }).catch((e) => {
+      reject(e)
+    })
   })
 }
 

package/lib/components/ml-cascader-picker/ml-cascader-picker.vue

@@ -36,6 +36,7 @@ export default {
     options: Array,
     border: Boolean,
     placeholder: String,
+    clearable: Boolean,
     width: String,
     isAll: Boolean,
     optionProps: Object,

package/package.json

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