mali-applet-ui 0.2.92 → 0.2.94

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

@@ -4,16 +4,16 @@
       <view class="ml-approval-record-header-title">审批记录</view>
     </view>
     <view class="ml-approval-record-body">
-      <view class="ml-approval-record-list" v-for="(group, gIndex) in flowOptions" :key="gIndex">
+      <view class="ml-approval-record-list" v-for="(group, gIndex) in flowItems" :key="gIndex">
         <view class="ml-approval-record-flow-line"></view>
         <view class="ml-approval-record-item">
           <view class="ml-approval-record-item-title">{{ group.name }}</view>
         </view>
         <view class="ml-approval-record-users">
-          <view class="ml-approval-record-user-item" v-for="(item, uIndex) in group.users" :key="uIndex">
+          <view class="ml-approval-record-user-item" v-for="(item, uIndex) in group.userList" :key="uIndex">
             <view class="ml-approval-record-user-item-info">
               <view class="ml-approval-record-user-item-left">
-                <image class="ml-approval-record-user-picture" :src="item.picture" mode="scaleToFill"></image>
+                <image class="ml-approval-record-user-picture" src="https://csgc.saas.ddqrcode.com/applet/business/image/portrait2.png" mode="scaleToFill"></image>
               </view>
               <view class="ml-approval-record-user-item-content">
                 <view class="ml-approval-record-user-item-top">
@@ -48,31 +48,53 @@ export default {
   },
   data () {
     return {
+      flowItems: [],
+      approvalData: {
+        flowHandlers: [],
+        module: null,
+        flowSettingCode: null,
+        enableFlag: false
+      },
       flowOptions: []
     }
   },
   watch: {
     code () {
-      this.load()
+      this.loadFlow()
     }
   },
   created () {
-    this.flowOptions = this.options || []
-    this.load()
+    this.approvalData.module = this.code
+    this.approvalData.flowSettingCode = this.code
+    this.updateFlowItems(this.options)
+    this.loadFlow()
   },
   methods: {
-    load () {
+    updateModel () {
+      this.$emit('input', this.approvalData)
+    },
+    updateFlowItems (list) {
+      this.flowItems = (list || []).map(item => {
+        item.f = []
+        return item
+      })
+    },
+    async loadFlow () {
+      await this.$nextTick()
       if (!this.code) {
         return
       }
-      if (globalStore.approval && globalStore.approval.record) {
-        const loadOptionMethod = globalStore.approval.record.loadOption
-        if (loadOptionMethod) {
-          Promise.resolve(loadOptionMethod({
-            value: this.value,
+      if (globalStore.approval && globalStore.approval.select) {
+        const loadFlowMethod = globalStore.approval.select.loadFlow
+        if (loadFlowMethod) {
+          Promise.resolve(loadFlowMethod({
             code: this.code
-          })).then(options => {
-            this.flowOptions = options
+          })).then(res => {
+            this.approvalData.enableFlag = res.enableFlag
+            this.approvalData.flowSettingCode = res.flowSettingCode
+            this.approvalData.module = res.module
+            this.updateFlowItems(res.flowItems)
+            this.updateModel()
           })
         }
       }

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

@@ -5,8 +5,8 @@
   <view v-else class="ml-cascader-picker" :class="[className || '', {'is-border': border, 'is-clear': value.length}]">
     <view class="ml-cascader-picker-warpper" @click="openPopup()">
       <view class="ml-cascader-picker-text">
-        <text v-if="value.length">{{ selectLabel }}</text>
-        <text v-else class="picker-placeholder">{{ placeholder }}</text>
+        <view v-if="value.length" class="ml-cascader-picker-label">{{ selectLabel }}</view>
+        <view v-else class="ml-cascader-picker-placeholder">{{ placeholder }}</view>
       </view>
       <view v-if="clearable && value.length" class="ml-cascader-picker-clear-icon" @click.stop="clearEvent">
         <ml-icon name="delete-filling"></ml-icon>
@@ -211,8 +211,12 @@ export default {
     flex-grow: 1;
     padding-right: 10rpx;
     overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+    .ml-cascader-picker-label,
+    .ml-cascader-picker-placeholder {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
   }
   .ml-cascader-picker-clear-icon {
     width: 60rpx;

package/components/ml-load-more/ml-load-more.vue

@@ -19,6 +19,7 @@ export default {
     showPage: Boolean,
     pageProps: Object,
     requestMethod: Function,
+    filterForm: Object,
     className: String
   },
   inject: {

package/components/ml-province-city-picker/ml-province-city-picker.vue

@@ -5,8 +5,8 @@
   <view v-else class="ml-province-city-picker" :class="[className || '', {'is-border': border, 'is-clear': (value ? (value.length || province) : province)}]">
     <view class="ml-province-city-picker-warpper" @click="openPopup()">
       <view class="ml-province-city-picker-text">
-        <text v-if="(value ? (value.length || province) : province)">{{ selectLabel }}</text>
-        <text v-else class="picker-placeholder">{{ placeholder }}</text>
+        <view v-if="(value ? (value.length || province) : province)" class="ml-province-city-picker-label">{{ selectLabel }}</view>
+        <view v-else class="ml-province-city-picker-placeholder">{{ placeholder }}</view>
       </view>
       <view v-if="clearable && (value ? (value.length || province) : province)" class="ml-province-city-picker-clear-icon" @click.stop="clearEvent">
         <ml-icon name="delete-filling"></ml-icon>
@@ -174,8 +174,12 @@ export default {
     flex-grow: 1;
     padding-right: 10rpx;
     overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+    .ml-province-city-picker-label,
+    .ml-province-city-picker-placeholder {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
   }
   .ml-province-city-picker-clear-icon {
     width: 60rpx;

package/components/ml-select-picker/ml-select-picker.vue

@@ -5,8 +5,8 @@
   <picker v-else class="ml-select-picker" mode="selector" :value="selectIndex" :style="{width: width || '100%'}" :range="optionList" :range-key="optLabelField" @change="changeEvent">
     <view class="ml-select-picker-warpper" :class="[className || '', {'is-border': border, 'is-clear': value !== null}]">
       <view class="ml-select-picker-text">
-        <text v-if="value !== null">{{ selectLabel }}</text>
-        <text v-else class="picker-placeholder">{{ placeholder }}</text>
+        <view v-if="value !== null" class="ml-select-picker-label">{{ selectLabel }}</view>
+        <view v-else class="ml-select-picker-placeholder">{{ placeholder }}</view>
       </view>
       <view v-if="clearable && value !== null" class="ml-select-picker-clear-icon" @click.stop="clearEvent">
         <ml-icon name="delete-filling"></ml-icon>
@@ -155,8 +155,12 @@ export default {
 .ml-select-picker-text {
   flex-grow: 1;
   overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+  .ml-select-picker-label,
+  .ml-select-picker-placeholder {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
 }
 .ml-select-picker-clear-icon {
   width: 34rpx;

package/components/ml-tabs/ml-tabs.vue

@@ -74,6 +74,7 @@ export default {
   }
   .ml-tabs-header {
     background: #fff;
+    padding-bottom: 10rpx;
     margin-bottom: 20rpx;
   }
   .ml-tabs-content {
@@ -85,7 +86,7 @@ export default {
   .ml-tabs-nav-item {
     position: relative;
     display: inline-block;
-    padding: 10rpx 20rpx 0 20rpx;
+    padding: 10rpx 10rpx 0 10rpx;
     text-align: center;
     .ml-tabs-nav-title {
       position: relative;

package/components/ml-tooltip/ml-tooltip.vue

@@ -3,7 +3,7 @@
     <view class="ml-tooltip-content" @click="toggleVisible">
       <slot></slot>
     </view>
-    <ml-tooltip-view v-if="showTip" :title="title" :placement="placement" position="absolute" :top="top" :left="left"></ml-tooltip-view>
+    <ml-tooltip-view v-if="showTip" :title="title" :placement="placement" position="absolute" :width="width" :top="top" :left="left"></ml-tooltip-view>
   </view>
 </template>
 
@@ -16,6 +16,7 @@ export default {
   props: {
     value: Boolean,
     title: String,
+    width: String,
     placement: String,
     trigger: String,
     className: String
@@ -34,6 +35,7 @@ export default {
   },
   created () {
     this.showTip = this.value
+    this.updateStyle()
   },
   methods: {
     open () {
@@ -48,6 +50,11 @@ export default {
       this.showTip = value
       this.$emit('input', value)
     },
+    updateStyle () {
+      if (this.placement === 'bottom') {
+        this.left = '-20rpx'
+      }
+    },
     toggleVisible () {
       if (!this.trigger || ['tap', 'click'].includes(this.trigger)) {
         if (this.showTip) {

package/components/ml-tooltip-view/ml-tooltip-view.vue

@@ -2,7 +2,9 @@
   <view class="ml-tooltip-view" :class="[className || '', `placement-${placement || 'bottom'}`]" :style="tipStyles">
     <view class="ml-tooltip-warpper">
       <view class="ml-tooltip-title">
-        <slow name="title">{{ title }}</slow>
+        <slow name="title">
+          <text>{{ title }}</text>
+        </slow>
       </view>
       <view class="ml-tooltip-arrows">
         <ml-icon v-if="placement === 'bottom'" name="arrow-up-filling" />
@@ -19,6 +21,7 @@ export default {
   name: 'MlTooltipView',
   props: {
     title: String,
+    width: String,
     position: String,
     top: String,
     left: String,
@@ -34,7 +37,8 @@ export default {
       const bottomSys = this.bottom ? `bottom: ${this.bottom};` : ''
       const leftSys = this.left ? `left: ${this.left};` : ''
       const rightSys = this.right ? `right: ${this.right};` : ''
-      return `${posSys}${topSys}${bottomSys}${leftSys}${rightSys}`
+      const wSys = this.width ? `width: ${this.width};` : ''
+      return `${posSys}${topSys}${bottomSys}${leftSys}${rightSys}${wSys}`
     }
   }
 }
@@ -43,6 +47,7 @@ export default {
 <style lang="scss">
 .ml-tooltip-view {
   z-index: 900;
+  width: 300rpx;
   .ml-tooltip-warpper {
     position: relative;
     display: inline-block;
@@ -53,6 +58,9 @@ export default {
     border-radius: $ml-border-radius;
     max-width: 80vw;
   }
+  .ml-tooltip-title {
+    white-space: pre-wrap;
+  }
   .ml-tooltip-arrows {
     position: absolute;
     color: rgba(0, 0, 0, 0.85);

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

@@ -39,7 +39,7 @@
 				<view class="ml-upload-file-info">
 					<view class="ml-upload-file-name">{{ item[nameField] }}</view>
 					<view class="ml-upload-file-desc">
-						<ml-button v-if="previewTypes.includes(item[typeField])" status="primary" type="text" @click="previewDocs(item)">预览</ml-button>
+						<ml-button v-if="preview && previewTypes.includes(item[typeField])" status="primary" type="text" @click="previewDocs(item)">预览</ml-button>
 						<ml-button status="primary" type="text" @click="downloadEvent(item)">下载</ml-button>
 					</view>
 				</view>
@@ -70,6 +70,10 @@ export default {
 		  type: Array,
 		  default: () => ([])
 		},
+		preview: {
+			type: Boolean,
+			default: true
+		},
 		simpleValue: {
 		  type: Boolean,
 		  default: false
@@ -195,9 +199,9 @@ export default {
 						tempPath: this.getUrl(obj)
 					}
 				})
-				this.isUpdate = true
 				if (this.urlList && this.urlList.length) {
-					this.$emit('input', this.fileList)
+					this.isUpdate = true
+					this.$emit('input', [...this.fileList])
 				}
 			} else {
 				this.fileList = (this.value || []).map(item => {
@@ -248,6 +252,9 @@ export default {
       return urlRest.pathname.split('/').slice(-1)[0] || ''
     },
 		previewImageEvent (item, index) {
+			if (!this.preview) {
+				return
+			}
 			if (this.previewStatus) {
 				return
 			}
@@ -354,7 +361,7 @@ export default {
 				}
 			})
 		},
-		chooseEvent () {
+		choose () {
 			if (this.loading) {
 				return
 			}
@@ -394,7 +401,7 @@ export default {
 						}
 					})
 				).then(list => {
-					this.fileList.push(...list)
+					this.fileList = [...this.fileList, ...list].slice(-this.limit)
 					this.isUpdate = true
 					this.updateModel()
 					this.loading = false
@@ -405,6 +412,9 @@ export default {
 			}).catch(e => {
 				console.log(e)
 			})
+		},
+		chooseEvent () {
+			this.choose()
 		}
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "0.2.92",
+  "version": "0.2.94",
   "description": "码里云小程序组件库",
   "scripts": {
     "release": "node script/release.js && npm publish"
@@ -18,7 +18,8 @@
   "main": "index.js",
   "devDependencies": {
     "vuex": "^4.0.2",
-    "xe-utils": "3.5.7"
+    "xe-utils": "3.5.7",
+    "dingtalk-design-miniapp": "^1.9.1"
   },
   "uni-app": {
     "scripts": {