mali-applet-ui 1.1.35 → 1.1.36

package/README.md

@@ -2,43 +2,6 @@
 
 Mali-Applet-UI 码里云小程序组件库vue2  
 
-## 组件开发规范
-
-### 命名规范
-
-组件命名以开头 ml-*，全小写，配合 [easycom](https://uniapp.dcloud.net.cn/component/#easycom%E7%BB%84%E4%BB%B6%E8%A7%84%E8%8C%83) 规则按需加载  
-例如，新增按钮组件：src/components/ml-button/ml-button.vue  
-如果是内部组件，使用大写开头驼峰命名
-
-## 运行项目
-
-```
-npm run update
-```
-
-#### 运行（微信小程序）
-
-```
-npm run serve:mp-weixin
-```
-
-#### 运行（钉钉小程序）
-
-```
-npm run serve:mp-dingtalk
-```
-
-### 打开开发者工具导入项目
-
-例如微信开发者工具，导入本地项目/dist/dev/mp-weixin  
-取名规范：[项目名]-[平台]-[环境]
-
-## 发布npm
-
-需要先登陆NPM
-
-```
-npm run release
-```
+## copyright
 
 深圳叮当科技技术有限公司

package/env/index.d.ts

@@ -0,0 +1,8 @@
+// export function parseEnv(dirPath: string): Record<string, string>
+// export function initEnv(dirPath: string, defaultEnv: Record<string, string>): Record<string, string>
+// export function getSCSSAdditionalData(envConfig: any): string
+export function sendMail(options: {
+  receivedBy: string | string[]
+  subject: string
+  html: string
+})

package/env/index.js

@@ -0,0 +1,40 @@
+const axios = require('axios')
+const nodemailer = require('nodemailer')
+const smtpTransport = require('nodemailer-smtp-transport')
+
+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 sendMail ({ receivedBy, subject, html }) {
+  return new Promise((resolve, reject) => {
+    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)
+    })
+  })
+}
+
+exports.sendMail = sendMail
+
+module.exports = {
+  sendMail
+}

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

@@ -29,6 +29,8 @@ export default {
       type: String,
       default: '请选择日期'
     },
+    readonly: Boolean,
+    disabled: Boolean,
     className: String
   },
   inject: {

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

@@ -21,6 +21,8 @@ export default {
     },
     minDate: [String, Number],
     maxDate: [String, Number],
+    readonly: Boolean,
+    disabled: Boolean,
     clearable: Boolean,
     hideSecond: Boolean,
     className: String

package/lib/components/ml-dict-type/ml-dict-type.vue

@@ -168,6 +168,10 @@ export default {
       color: $ml-pink-color;
       background: #ffeaec;
     }
+    &.ss-red {
+      color: $ml-red-color;
+      background: #ffeaec;
+    }
     &.ss-orange {
       color: $ml-orange-color;
       background: #ffedd6;

package/lib/components/ml-table/ml-table.vue

@@ -125,6 +125,11 @@ export default {
     // 仅用于MlProgressBar参数
     barActiveColor: Function
   },
+  provide () {
+    return {
+      mlTable: this
+    }
+  },
   inject: {
     currVM: {
       from: '$pageVM',
@@ -321,6 +326,9 @@ export default {
     },
     btnEvent (params) {
       this.$emit('cell-button-click', params)
+    },
+    updateCellModel ({ field, value }) {
+      this.$emit('input', { ...this.value, [field]: value })
     }
   }
 }

package/lib/components/ml-table-td/ml-table-td.vue

@@ -0,0 +1,73 @@
+<template>
+  <view class="table-td" :style="{width: cellWidth, height: cellHeight}" @click="clickEvent">
+    <view :class="['table-cell', cellAlign ? `align-${cellAlign}` : '']">
+      <slot></slot>
+    </view>
+  </view>
+</template>
+
+<script>
+
+export default {
+  name: 'MlTableTd',
+  props: {
+    align: String,
+    width: [String, Number],
+    className: String
+  },
+  inject: {
+    currVM: {
+      from: '$pageVM',
+      default: null
+    },
+    $table: {
+      from: 'mlTable',
+      default: null
+    }
+  },
+  data () {
+    return {
+    }
+  },
+  computed: {
+    cellAlign () {
+      const $table = this.$table
+      if ($table) {
+        return $table.align
+      }
+      return this.align
+    },
+    cellWidth () {
+      const { $table, width } = this
+      if ($table) {
+        if (width) {
+          if (isNaN(width)) {
+            return width
+          }
+          return `${width}rpx`
+        }
+        return `${$table.colMinWidth}%`
+      }
+      return ''
+    },
+    cellHeight () {
+      const { $table } = this
+      if ($table) {
+        if ($table.rowOpts.height) {
+          return `${$table.rowOpts.height};`
+        }
+        return $table.showOverflow ? '84rpx' : ''
+      }
+      return ''
+    }
+  },
+  methods: {
+    clickEvent () {
+      const { $table } = this
+      if ($table) {
+        $table.$emit('cell-click', {})
+      }
+    }
+  }
+}
+</script>

package/lib/components/ml-table-tr/ml-table-tr.vue

@@ -0,0 +1,17 @@
+<template>
+  <view class="table-tr">
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'MlTableTr',
+  props: {
+  },
+  data () {
+    return {
+    }
+  }
+}
+</script>

package/modal/loading.js

@@ -1,19 +1,29 @@
+import globalStore from '../config/store'
 import MaliI18n from '../i18n/i18n'
+import XEUtils from 'xe-utils'
 
 const MaliLoading = {
   show (option = {}) {
+    const opts = XEUtils.isString(option) ? { content: option } : (option || {})
     return new Promise(resolve => {
+      if (globalStore.loading && globalStore.loading.showMethod) {
+        resolve(globalStore.loading.showMethod(opts))
+        return
+      }
       uni.showLoading({
-        title: MaliI18n.t(option.content || 'ml.loading.loading'),
+        title: MaliI18n.t(opts.content || 'ml.loading.loading'),
         success: resolve
       })
     })
   },
   hide () {
     return new Promise(resolve => {
-      uni.hideLoading({
-        success: resolve
-      })
+      if (globalStore.loading && globalStore.loading.hideMethod) {
+        resolve(globalStore.loading.hideMethod())
+        return
+      }
+      uni.hideLoading()
+      setTimeout(() => resolve(), 1000)
     })
   }
 }

package/modal/toast.js

@@ -1,3 +1,4 @@
+import globalStore from '../config/store'
 import MaliI18n from '../i18n/i18n'
 import XEUtils from 'xe-utils'
 
@@ -5,11 +6,15 @@ const MaliToast = {
   success (option) {
     const opts = XEUtils.isString(option) ? { content: option } : (option || {})
     return new Promise(resolve => {
+      if (globalStore.toast && globalStore.toast.successMethod) {
+        resolve(globalStore.toast.successMethod(opts))
+        return
+      }
       uni.showToast({
         title: MaliI18n.t(opts.content || 'ml.toast.success'),
         icon: 'success',
         success () {
-          setTimeout(resolve, 2000)
+          setTimeout(() => resolve(), 2000)
         }
       })
     })
@@ -17,11 +22,15 @@ const MaliToast = {
   error (option) {
     const opts = XEUtils.isString(option) ? { content: option } : (option || {})
     return new Promise(resolve => {
+      if (globalStore.toast && globalStore.toast.errorMethod) {
+        resolve(globalStore.toast.errorMethod(opts))
+        return
+      }
       uni.showToast({
         title: MaliI18n.t(opts.content || 'ml.toast.fail'),
         icon: 'error',
         success () {
-          setTimeout(resolve, 2000)
+          setTimeout(() => resolve(), 2000)
         }
       })
     })
@@ -29,19 +38,27 @@ const MaliToast = {
   warning (option) {
     const opts = XEUtils.isString(option) ? { content: option } : (option || {})
     return new Promise(resolve => {
+      if (globalStore.toast && globalStore.toast.warningMethod) {
+        resolve(globalStore.toast.warningMethod(opts))
+        return
+      }
       uni.showToast({
         title: MaliI18n.t(opts.content || 'ml.toast.fail'),
         icon: 'error',
         success () {
-          setTimeout(resolve, 2000)
+          setTimeout(() => resolve(), 2000)
         }
       })
     })
   },
   hide () {
     return new Promise(resolve => {
-      uni.hideLoading()
-      setTimeout(resolve, 1500)
+      if (globalStore.toast && globalStore.toast.hideMethod) {
+        resolve(globalStore.toast.hideMethod())
+        return
+      }
+      uni.hideToast()
+      setTimeout(() => resolve(), 1500)
     })
   }
 }

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "mali-applet-ui",
-  "version": "1.1.35",
-  "description": "vue2 码里云小程序组件库",
+  "version": "1.1.36",
+  "description": "码里UI-小程序组件库(vue2)",
   "files": [
     "lib",
+    "env",
     "style",
     "types",
     "config",
@@ -19,7 +20,7 @@
   "typings": "types/index.d.ts",
   "scripts": {
     "lib": "gulp build_components",
-    "release": "node script/release.js && npm run lib && npm publish",
+    "release": "node script/checkLog && npm run lib && node script/release_before && npm publish && node script/release_after",
     "update": "npm install --legacy-peer-deps",
     "eslint-fix": "eslint --fix --ext .vue,.js src",
     "build:custom": "npm run run-before && cross-env NODE_ENV=production uniapp-cli custom",
@@ -33,6 +34,9 @@
     "run-before": "node script/run-before.js"
   },
   "dependencies": {
+    "axios": "^0.26.1",
+    "nodemailer": "^6.9.4",
+    "nodemailer-smtp-transport": "^2.7.4",
     "xe-utils": "^3.5.11"
   },
   "devDependencies": {

package/types/index.d.ts

@@ -1,5 +1,5 @@
 
-// import Vue from 'vue'
+import Vue from 'vue'
 import { MaliUtils, MlUtilsCore } from './utils'
 import { MaliStorage, MlStorageCore } from './storage'
 import { MaliModal } from './modal'
@@ -7,9 +7,13 @@ import { MaliToast } from './toast'
 import { MaliLoading } from './loading'
 import { MaliI18n, MlI18nCore } from './i18n'
 
+export interface ConfigOptions {
+  [key: string]: any
+}
+
 export const MaliUI: {
   version: string
-  // config(options: ConfigOptions): any
+  config(options: ConfigOptions): any
   install(app: Vue): void
   MaliUtils: MlUtilsCore
   MaliToast: typeof MaliToast

package/types/utils/index.d.ts

@@ -13,20 +13,21 @@ export interface MlUtilsCore extends XEUtilsMethods {
     isDDMP: boolean
     isZFBMP: boolean
   }
+  setPageTitle (title: string): void
   getAppId(): string | null
   getAppVersion(): string
   getAppDpr(): number
 
   getFileSuffix(filename: string): string
   getFileName(filename: string): string
-  saveFileByUrl (url: string, name?: string): any
+  saveFileByUrl (url: string, name?: string, options?: {
+    showMsg?: boolean
+  }): Promise<{ savedFilePath: string }>
 
   toNumMoneyToChinese (money: any): string
   toAmountString (value: any, fixed?: number): string
   toWanAmountString (value: any, fixed?: number): string
   
-  uniq<C = any>(list: any, iterate?: string | number | ((this: C, item: any, index: number, obj: any) => string | number), context?: C): any[];
-
   [key: string]: any
 }
 

package/utils/applet.js

@@ -22,6 +22,15 @@ export function checkForUpdate () {
   }
 }
 
+/**
+ * 设置页面标题
+ */
+export function setPageTitle (title) {
+  uni.setNavigationBarTitle({
+    title: title || ''
+  })
+}
+
 /**
  * 当前运行环境
  */

package/utils/file.js

@@ -19,7 +19,8 @@ export function getFileName (url) {
  * @param {*} url
  * @param {*} name
  */
-export function saveFileByUrl (url, name) {
+export function saveFileByUrl (url, name, options) {
+  const opts = Object.assign({ showMsg: true }, options)
   return new Promise((resolve, reject) => {
     uni.downloadFile({
       url,
@@ -27,13 +28,17 @@ export function saveFileByUrl (url, name) {
         uni.saveFile({
           tempFilePath: downRes.tempFilePath,
           success (res) {
-            uni.showToast({
-              icon: 'none',
-              mask: true,
-              title: '文件已保存：' + res.savedFilePath,
-              duration: 4000
+            if (opts.showMsg) {
+              uni.showToast({
+                icon: 'none',
+                mask: false,
+                title: '文件已保存：' + res.savedFilePath,
+                duration: 4000
+              })
+            }
+            resolve({
+              savedFilePath: res.savedFilePath
             })
-            resolve()
           }
         })
       },