mali-applet-ui 0.2.69 → 0.2.70

package/components/ml-approval-type/ml-approval-type.vue

@@ -27,7 +27,9 @@ export default {
       return this.selectItem ? this.selectItem.label : ''
     },
     styles () {
-      return this.selectItem && this.selectItem.color? `background:${this.selectItem.color};` : ''
+      const colStys = this.selectItem && this.selectItem.background? `background:${this.selectItem.background};` : ''
+      const bgStys = this.selectItem && this.selectItem.color? `color:${this.selectItem.color};` : ''
+      return `${bgStys}${colStys}`
     }
   }
 }
@@ -36,7 +38,6 @@ export default {
 <style lang="scss">
 .ml-approval-type {
   display: inline-block;
-  color: #ffffff;
   padding: 8rpx 16rpx;
   border-radius: $ml-border-radius;
   font-size: 24rpx;

package/components/ml-button/ml-button.vue

@@ -1,5 +1,5 @@
 <template>
-  <button class="ml-button" :class="[className || '', `type-${type}`, size ? `size-${size}` : '', status ? `ss-${status}` : '', round ? 'is-round' : '']" :open-type="openType" :style="styles" @tap="tapEvent" @click="clickEvent">
+  <button class="ml-button" :class="[className || '', `type-${type}`, size ? `size-${size}` : '', status ? `ss-${status}` : '', {'is-round': round, 'is-underline': underline}]" :open-type="openType" :style="styles" @tap="tapEvent" @click="clickEvent">
     <slot>{{ content }}</slot>
   </button>
 </template>
@@ -19,6 +19,7 @@ export default {
       default: 'button'
     },
     size: String,
+    underline: Boolean,
     openType: String,
     width: String,
     height: String,
@@ -68,6 +69,9 @@ export default {
     vertical-align: middle;
     background: transparent;
 	  font-size: $uni-font-size-base;
+    &.is-underline {
+      text-decoration: underline;
+    }
     &.ss-primary {
       color: $uni-color-primary;
     }

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

@@ -17,13 +17,23 @@
 		</view>
 
 		<view v-else class="ml-upload-file-list">
-			<view class="ml-upload-file-item">
-				<view class="ml-upload-file-icon">
-					<ml-icon name="file-txt" />
+			<view class="ml-upload-file-item" v-for="(item, index) in fileList" :key="index">
+				<view class="ml-upload-file-left">
+					<view class="ml-upload-file-icon">
+						<ml-icon name="file-txt" />
+					</view>
 				</view>
 				<view class="ml-upload-file-info">
-					<view class="ml-upload-file-name"></view>
-					<view></view>
+					<view class="ml-upload-file-name">{{ item[nameField] }}</view>
+					<view>
+						<ml-button status="primary" type="text">预览</ml-button>
+						<ml-button status="primary" type="text">下载</ml-button>
+					</view>
+				</view>
+				<view class="ml-upload-file-right">
+					<view class="ml-upload-file-del-btn">
+						<ml-icon name="close" />
+					</view>
 				</view>
 			</view>
 			<view class="ml-upload-file-add">
@@ -41,7 +51,7 @@
 <script>
 import XEUtils from 'xe-utils'
 import globalStore from '../../config/store'
-import { uploadImageFiles } from './file-handle'
+import { uploadAllFiles, uploadImageFiles } from './file-handle'
 	
 export default {
   name: 'MlUpload',
@@ -427,7 +437,7 @@ export default {
 		},
 		chooseFile () {
 			const uploadMethod = this.uploadFile ? this.uploadFile : (globalStore.upload ? globalStore.upload.uploadFile : null)
-			uploadImageFiles({}).then(res => {
+			uploadAllFiles({}).then(res => {
 				const { tempFiles } = res
 				debugger
 				Promise.all(
@@ -481,28 +491,61 @@ export default {
 	flex-wrap: wrap;
 	.ml-upload-image-item,
 	.ml-upload-image-add {
+		display: flex;
+		justify-content: center;
+		align-items: center;
 		position: relative;
-		width: 100rpx;
-		height: 100rpx;
-		margin: 20rpx;
+		width: 140rpx;
+		height: 140rpx;
+		text-align: center;
 	}
 	.ml-upload-image-del-btn {
 		position: absolute;
 		right: 0;
 		top: 0;
+		width: 40rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		text-align: center;
+		border-radius: 50%;
+		color: #ffffff;
+		background: #c8c8c9;
+	}
+	.ml-upload-image-add-btn {
+		width: 100rpx;
+		height: 100rpx;
+		line-height: 100rpx;
+		font-size: 60rpx;
+		color: #c8c8c9;
+		border: 1px solid #c8c8c9;
 		border-radius: 50%;
 	}
 	.ml-upload-image-img {
+		width: 120rpx;
+		height: 120rpx;
+		line-height: 120rpx;
 		border-radius: $ml-border-radius;
 	}
 }
 .ml-upload-file-list {
 	.ml-upload-file-item {
-		display: block;
+		display: flex;
+		flex-direction: row;
 	}
-	.ml-upload-file-icon {
+	.ml-upload-file-left,
+	.ml-upload-file-right {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
 		flex-shrink: 0;
 	}
+	.ml-upload-file-left {
+		width: 80rpx;
+	}
+	.ml-upload-file-icon {
+		font-size: 50rpx;
+	}
 	.ml-upload-file-info {
 		flex-grow: 1;
 		.ml-upload-file-name {
@@ -511,6 +554,9 @@ export default {
 			white-space: nowrap;
 		}
 	}
+	.ml-upload-file-right {
+		width: 60rpx;
+	}
 	.ml-upload-file-add-btn {
 		display: flex;
 		flex-direction: row;

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

@@ -58,6 +58,14 @@
                 :activeColor="getBarActiveColor({ type: 'body', row, rowIndex, column, columnIndex }) || '#FA8C16'"
                 :backgroundColor="(column.cellRender.props ? column.cellRender.props.backgroundColor : '') || '#1890FF'">
               </ml-progress-bar>
+              <ml-button
+                v-else-if="column.cellRender && column.cellRender.name === 'MlButton'"
+                :type="column.cellRender.props ? column.cellRender.props.type : 'button'"
+                :underline="column.cellRender.props ? column.cellRender.props.underline : false"
+                :status="column.cellRender.props ? column.cellRender.props.status : ''"
+                :content="column.cellRender.props ? column.cellRender.props.content : ''"
+                @click="btnEvent({ type: 'body', row, rowIndex, column, columnIndex })">
+              </ml-button>
               <text v-else>{{ getCellValue({ type: 'body', row, rowIndex, column, columnIndex }) }}</text>
             </view>
           </view>
@@ -255,6 +263,9 @@ export default {
     },
     cellTdClick(params) {
       this.$emit('cell-click', params)
+    },
+    btnEvent (params) {
+      this.$emit('cell-button-click', params)
     }
   }
 }

package/config/store.js

@@ -28,13 +28,13 @@ const globalStore = {
       optionMethod: null
     },
     types: [
-      { value: 0, label: '起草中', color: '#F0F2F5' },
-      { value: 1, label: '审批中', color: '#246BFD' },
-      { value: 2, label: '已通过', color: '#00D35C' },
-      { value: 3, label: '已驳回', color: '#FF5064' },
-      { value: 4, label: '会签中', color: '#FF9C00' },
-      { value: 5, label: '处理中', color: '#246BFD' },
-      { value: 6, label: '已完成', color: '#00D35C' }
+      { value: 0, label: '起草中', color: '#353535', background: '#F0F2F5' },
+      { value: 1, label: '审批中', color: '#ffffff', background: '#246BFD' },
+      { value: 2, label: '已通过', color: '#ffffff', background: '#00D35C' },
+      { value: 3, label: '已驳回', color: '#ffffff', background: '#FF5064' },
+      { value: 4, label: '会签中', color: '#ffffff', background: '#FF9C00' },
+      { value: 5, label: '处理中', color: '#ffffff', background: '#246BFD' },
+      { value: 6, label: '已完成', color: '#ffffff', background: '#00D35C' }
     ]
   },
   // 上拉加载更多

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "0.2.69",
+  "version": "0.2.70",
   "description": "码里云小程序组件库",
   "scripts": {
     "release": "node script/release.js && npm publish"