mali-applet-ui 1.1.67 → 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/lib/components/ml-icon/ml-icon.vue

@@ -1,5 +1,5 @@
 <template>
-  <text class="ml-icon" :class="[className || '', size ? `size-${size}` : '', status ? `ss-${status}` : '', name ? `${prefix}${name}` : '', {'is-roll': roll}]" :style="styles" @click="clickEvent" @tap="tapEvent"></text>
+  <text class="ml-icon" :class="[className || '', size ? `size-${size}` : '', status ? `ss-${status}` : '', name ? `${prefix}${name}` : '', {'is-roll': roll}]" :style="styles" @tap="clickEvent"></text>
 </template>
 
 <script>
@@ -31,11 +31,9 @@ export default {
     }
   },
   methods: {
-    clickEvent (e) {
-    },
-    tapEvent () {
-      this.$emit('tap', {})
-      this.$emit('click', {})
+    clickEvent (evnt) {
+      this.$emit('tap', { $event: evnt })
+      this.$emit('click', { $event: evnt })
     }
   }
 }

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

@@ -0,0 +1,113 @@
+<template>
+  <view class="ml-tag" :class="[className || '', status ? `ss-${status}` : '', {'is-round': round}]" @tap="clickEvent">
+    <view class="ml-tag-content">
+      <slot>{{ content }}</slot>
+    </view>
+    <view class="ml-tag-close-warpper" v-if="closable" @tap="closeEvent">
+      <ml-icon class="ml-tag-close-btn" name="close"></ml-icon>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'MlTag',
+  options: {
+    virtualHost: true
+  },
+  props: {
+    status: String,
+    round: Boolean,
+    closable: Boolean,
+    content: String,
+    className: String
+  },
+  methods: {
+    closeEvent (evnt) {
+      evnt.stopPropagation()
+      this.$emit('close', { $event: evnt })
+    },
+    clickEvent (evnt) {
+      this.$emit('tap', { $event: evnt })
+      this.$emit('click', { $event: evnt })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.ml-tag {
+  display: inline-flex;
+  padding: 4rpx 16rpx;
+  border: 2rpx solid #e8e8e8;
+  margin: 0 8rpx;
+  border-radius: 8rpx;
+  font-size: 24rpx;
+  &.is-round {
+    border-radius: $ml-border-radius;
+  }
+  &.ss-primary {
+    color: #fff;
+    background: $ml-theme-primary-color;
+  }
+  &.ss-success {
+    color: #fff;
+    background: $ml-theme-success-color;
+  }
+  &.ss-info {
+    background: #909399;
+  }
+  &.ss-warning {
+    color: #fff;
+    background: $ml-theme-warning-color;
+  }
+  &.ss-danger {
+    color: #fff;
+    background: $ml-theme-error-color;
+  }
+  &.ss-gray {
+    background: $ml-gray-color;
+  }
+  &.ss-blue {
+    color: #fff;
+    background: $ml-blue-color;
+  }
+  &.ss-green {
+    color: #fff;
+    background: $ml-green-color;
+  }
+  &.ss-pink {
+    color: #fff;
+    background: $ml-pink-color;
+  }
+  &.ss-red {
+    color: #fff;
+    background: $ml-red-color;
+  }
+  &.ss-orange {
+    color: #fff;
+    background: $ml-orange-color;
+  }
+  &.ss-purple {
+    color: #fff;
+    background: $ml-purple-color;
+  }
+  &.ss-white {
+    background: $ml-white-color;
+  }
+  .ml-tag-close-warpper {
+    flex-shrink: 0;
+    padding: 0 8rpx;
+    cursor: pointer;
+  }
+  .ml-tag-close-btn {
+    padding: 4rpx;
+    font-size: 24rpx;
+    &:hover {
+      color: #fff;
+      background: #909399;
+      border-radius: 50%;
+    }
+  }
+}
+</style>

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

@@ -1,5 +1,5 @@
 <template>
-  <view class="ml-text" :class="[className || '', status ? `ss-${status}` : '', {'is-underline': underline}]" @click="clickEvent" @tap="tapEvent">
+  <view class="ml-text" :class="[className || '', status ? `ss-${status}` : '', {'is-underline': underline}]" @tap="tapEvent">
     <view v-if="prefixIcon && prefixIcon !== 'none'" class="ml-text-left-icon">
       <ml-icon :className="prefixIcon"></ml-icon>
     </view>
@@ -44,9 +44,7 @@ export default {
     }
   },
   methods: {
-    clickEvent () {
-    },
-    tapEvent () {
+    tapEvent (evnt) {
       if (this.url) {
         if (this.redirect) {
           uni.redirectTo({
@@ -58,8 +56,8 @@ export default {
           })
         }
       }
-      this.$emit('tap', {})
-      this.$emit('click', {})
+      this.$emit('tap', { $event: evnt })
+      this.$emit('click', { $event: evnt })
     }
   }
 }

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

@@ -8,7 +8,7 @@
           <ml-icon name="close" />
         </view>
       </view>
-      <template v-if="!isFromReadonly && fileList.length < limit">
+      <template v-if="!isFromReadonly && !isLimit">
         <view v-if="hasForm" class="ml-upload-image-form-add-btn" @tap="chooseEvent">
           <ml-icon v-if="loading" name="loading" roll />
           <ml-icon v-else name="add-circle" />
@@ -26,7 +26,7 @@
     </view>
     <!-- 上传文件 -->
     <view v-else class="ml-upload-file-list">
-      <template v-if="!isFromReadonly && fileList.length < limit">
+      <template v-if="!isFromReadonly && !isLimit">
         <view v-if="hasForm" class="ml-upload-file-form-add-btn" @tap="chooseEvent">
           <ml-icon v-if="loading" name="loading" roll />
           <ml-icon v-else name="add-circle" />
@@ -38,7 +38,7 @@
               <ml-icon v-else name="add" />
             </text>
             <text v-if="loading">上传中...</text>
-            <text v-else>添加文件</text>
+            <text v-else>{{ uploadButtonText || '选择文件' }}</text>
           </view>
         </view>
       </template>
@@ -183,15 +183,18 @@ export default {
       type: Boolean,
       default: false
     },
-    limit: {
+    limit: Number,
+    limitCount: Number,
+    limitSize: {
       type: Number,
-      default: 9
+      default: 20480
     },
     className: String,
     mediatype: {
       type: String,
       default: 'all'
     },
+    uploadButtonText: String,
     params: {
       type: Object,
       default: () => ({})
@@ -238,6 +241,15 @@ export default {
     hasForm () {
       return !!this.form
     },
+    limitFileLen () {
+      return this.limitCount || this.limit || 9
+    },
+    isLimit () {
+      if (this.multiple) {
+        return this.fileList.length >= this.limitFileLen
+      }
+      return this.fileList.length >= 1
+    },
     isFromReadonly () {
       if (XEUtils.isBoolean(this.readonly)) {
         return this.readonly
@@ -510,7 +522,7 @@ export default {
       chooseMethod({
         sizeType: this.sizeType,
         sourceType: this.sourceType,
-        count: this.limit - this.fileList.length,
+        count: this.limitFileLen - this.fileList.length,
         quality: this.imageQuality
       }).then(res => {
         const { tempFiles } = res
@@ -543,7 +555,7 @@ export default {
             }
           })
         ).then(list => {
-          this.fileList = [...this.fileList, ...list].slice(-this.limit)
+          this.fileList = [...this.fileList, ...list].slice(-this.limitFileLen)
           this.isModelUpdate = true
           this.updateModel()
           this.loading = false

package/package.json

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