mali-applet-ui 1.1.44 → 1.1.46

package/env/index.d.ts

@@ -5,6 +5,7 @@ export function getPlatformName(platform: string): string
 export function getSubModuleName(module: string): string
 export function parseEnv(dirPath: string): Record<string, string>
 export function initEnv(dirPath: string, defaultEnv: Record<string, string>): Record<string, string>
+export function initManifestConfig(dirPath: string, manifestJson: any): void
 export function initManifestEnv(dirPath: string, manifestJson: any): Record<string, string>
 export function uploadWxMiniprogram(version: string): void
 export function getSCSSAdditionalData(): string

package/env/index.js

@@ -130,6 +130,12 @@ function initEnv (rootPath) {
   return conf
 }
 
+function initManifestConfig (rootPath, manifestJson) {
+  if (!fs.existsSync(path.resolve(rootPath, 'src/manifest.json'))) {
+    fs.writeFileSync(path.resolve(rootPath, 'src/manifest.json'), JSON.stringify(manifestJson, null, 2))
+  }
+}
+
 function initManifestEnv (rootPath, manifestJson) {
   const envConfig = initEnv(rootPath)
   if (process.env.VUE_APP_MP_APPID) {
@@ -174,8 +180,6 @@ function uploadWxMiniprogram (rootPath, version) {
   return new Promise((resolve, reject) => {
     if (['mp-weixin', 'mp-qiwei'].includes(process.env.VUE_APP_PLATFORM_NAME)) {
       const projectConfig = parseJSONFile(rootPath, `${process.env.UNI_OUTPUT_DIR}/project.config.json`)
-      console.log('projectConfig', projectConfig)
-      console.log('projectPath=', path.resolve(rootPath, process.env.UNI_OUTPUT_DIR))
       const options = {
         appid: projectConfig.appid,
         type: 'miniProgram',
@@ -190,8 +194,6 @@ function uploadWxMiniprogram (rootPath, version) {
         robot,
         sourceMapSavePath: path.resolve(rootPath, 'sm.zip')
       }).then((res) => {
-        console.log('sm==', path.resolve(rootPath, 'sm.zip'))
-        console.log('get success', res)
         compressing.zip.uncompress(path.resolve(rootPath, 'sm.zip'), 'temp').then(() => {
           const rest = JSON.parse(fs.readFileSync(path.resolve(rootPath, 'temp/__FULL__/app-service.js.map')))
           const vArr = rest.wx.userVersion.match(/(\d+).(\d+).(\d+)/)
@@ -203,21 +205,19 @@ function uploadWxMiniprogram (rootPath, version) {
               desc: fixDesc,
               robot
             }).then((res) => {
-              console.log('ci.upload success', res)
               resolve()
             }).catch((e) => {
-              console.log('ci.upload err', e)
               reject(e)
             })
           } else {
             const e = {}
-            console.error('version error')
+            console.log(e)
             reject(e)
           }
           deleteFolder(path.resolve(rootPath, 'temp'))
           fs.unlinkSync(path.resolve(rootPath, 'sm.zip'))
         }).catch((e) => {
-          console.log('compressing err', res)
+          console.log(e)
           reject(e)
         })
       }).catch(e => {
@@ -228,19 +228,19 @@ function uploadWxMiniprogram (rootPath, version) {
             desc: '修复bug',
             robot: 1
           }).then((res) => {
-            console.log('ci.upload success', res)
             resolve()
           }).catch((e) => {
-            console.log('ci.upload err', e)
+            console.log(e)
             reject(e)
           })
         } else {
-          console.log(e.message)
+          console.log(e)
           reject(e)
         }
       })
     } else {
       const e = {}
+      console.log(e)
       reject(e)
     }
   })
@@ -267,18 +267,38 @@ function sendMail ({ receivedBy, subject, html }) {
   })
 }
 
-function sendQyWechatMsg (webhook, params) {
+function sendQyWechatMsg (webhook, opts) {
   if (!webhook) {
     throw new Error('企微机器人 webhook 地址不能为空')
   }
-  return axios.post(webhook, {
-    msgtype: params.msgtype || 'markdown',
-    [params.msgtype || 'markdown']: {
-      content: params.content || '',
-      mentioned_list: params.mentionedList || [],
-      mentioned_mobile_list: params.mentionedMobileList || []
+  let params = {
+    msgtype: 'markdown',
+    markdown: {
+      content: opts.content || ''
     }
-  }).then(res => {
+  }
+  switch (opts.msgType) {
+    case 'text':
+      params = {
+        msgtype: 'text',
+        image: {
+          content: opts.content || '',
+          mentioned_list: opts.mentionedList || [],
+          mentioned_mobile_list: opts.mentionedMobileList || []
+        }
+      }
+      break
+    case 'image':
+      params = {
+        msgtype: 'image',
+        image: {
+          base64: opts.base64 || '',
+          md5: opts.md5 || ''
+        }
+      }
+      break
+  }
+  return axios.post(webhook, params).then(res => {
     return res.data
   })
 }
@@ -297,6 +317,7 @@ exports.getPlatformName = getPlatformName
 exports.getSubModuleName = getSubModuleName
 exports.parseEnv = parseEnv
 exports.initEnv = initEnv
+exports.initManifestConfig = initManifestConfig
 exports.initManifestEnv = initManifestEnv
 exports.uploadWxMiniprogram = uploadWxMiniprogram
 exports.getSCSSAdditionalData = getSCSSAdditionalData
@@ -312,6 +333,7 @@ module.exports = {
   getSubModuleName,
   parseEnv,
   initEnv,
+  initManifestConfig,
   initManifestEnv,
   uploadWxMiniprogram,
   getSCSSAdditionalData,

package/package.json

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