mali-applet-ui 0.0.47 → 0.0.50

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

@@ -5,6 +5,7 @@
     </view>
     <view class="ml-approval-select-body">
       <view class="ml-approval-select-list" v-for="(group, gIndex) in options" :key="gIndex">
+        <view class="ml-approval-select-flow-line"></view>
         <view class="ml-approval-select-item">
           <view class="ml-approval-select-item-title">{{ group.name }}</view>
         </view>
@@ -12,9 +13,6 @@
           <view class="ml-approval-select-user-item" v-for="(item, uIndex) in group.users" :key="uIndex">
             <image class="ml-approval-select-user-picture" :src="item.picture" mode="scaleToFill"></image>
             <view class="ml-approval-select-user-name">{{ item.name }}</view>
-            <view class="ml-approval-select-user-remove">
-              <ml-icon name="close"></ml-icon>
-            </view>
           </view>
           <view class="ml-approval-select-user-add" @click="openAddUser">
             <view class="ml-approval-select-user-add-icon">
@@ -24,11 +22,6 @@
         </view>
       </view>
     </view>
-
-    <uni-popup ref="popup" type="bottom">
-      <text>Popup</text>
-      <button @click="close">关闭</button>
-    </uni-popup>
   </view>
 </template>
 
@@ -38,11 +31,6 @@ export default {
   props: {
     value: Array,
     options: Array
-  },
-  methods: {
-    openAddUser () {
-      this.$refs.popup.open()
-    }
   }
 }
 </script>
@@ -59,49 +47,77 @@ export default {
   line-height: 60rpx;
 }
 .ml-approval-select-list {
+  position: relative;
   padding-bottom: 10rpx;
+  .ml-approval-select-flow-line {
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 100%;
+    width: 4rpx;
+    background: #D9D9D9;
+    &::before {
+      content: "";
+      position: absolute;
+      top: 12rpx;
+      left: -10rpx;
+      width: 24rpx;
+      height: 24rpx;
+      border-radius: 50%;
+      background: #D9D9D9;
+    }
+  }
+  &:first-child {
+    .ml-approval-select-flow-line {
+      top: 12rpx;
+      &::before {
+        top: 0;
+      }
+    }
+  }
+  &:last-child {
+    .ml-approval-select-flow-line {
+      height: 30rpx;
+    }
+  }
 }
 .ml-approval-select-item-title {
-  padding-left: 20rpx;
+  padding-left: 40rpx;
   line-height: 50rpx;
 }
 .ml-approval-select-users {
   display: flex;
   flex-direction: row;
-  flex-wrap: wrap;
+  padding-left: 40rpx;
 }
 .ml-approval-select-user-item {
-  position: relative;
+  display: flex;
+  flex-direction: column;
   padding: 10rpx;
-  width: 150rpx;
   text-align: center;
+  width: 140rpx;
   .ml-approval-select-user-picture {
     width: 100rpx;
     height: 100rpx;
     border-radius: 50%;
+    margin: 0 auto;
   }
   .ml-approval-select-user-name {
+    display: inline-block;
+    vertical-align: middle;
+    max-width: 150rpx;
 		overflow: hidden;
 		text-overflow: ellipsis;
 		white-space: nowrap;
+    margin-right: 10rpx;
     font-size: 24rpx;
-  }
-  .ml-approval-select-user-remove {
-    position: absolute;
-    top: 0;
-    right: 10rpx;
-    width: 40rpx;
-    height: 40rpx;
-    line-height: 40rpx;
-    border-radius: 50%;
-    text-align: center;
-    color: #ffffff;
-    background: rgba(0, 0, 0, 0.45);
+    color: rgba(0, 0, 0, 0.85);
   }
 }
 .ml-approval-select-user-add {
+  display: flex;
+  flex-direction: column;
   padding: 10rpx;
-  width: 160rpx;
   text-align: center;
   .ml-approval-select-user-add-icon {
     width: 100rpx;
@@ -114,4 +130,4 @@ export default {
     overflow: hidden;
   }
 }
-</style>
+</style>

package/components/ml-form/ml-form.vue

@@ -3,7 +3,17 @@
     <slot>
       <view v-for="(item, index) in items" :key="index">
         <ml-form-group v-if="item.children && item.children.length" :title="item.title">
-          <ml-form-item v-for="(cItem, cIndex) in item.children" :key="cIndex" :title="cItem.title" :field="cItem.field" :itemRender="cItem.itemRender" @modelvalue="updateModel"></ml-form-item>
+          <ml-form-item
+            v-for="(cItem, cIndex) in item.children"
+            :key="cIndex"
+            :title="cItem.title"
+            :field="cItem.field"
+            :vertical="cItem.vertical"
+            :align="cItem.align"
+            :titleAlign="cItem.titleAlign"
+            :itemRender="cItem.itemRender"
+            @modelvalue="updateModel">
+          </ml-form-item>
         </ml-form-group>
         <ml-form-item v-else :title="item.title" :field="item.field" :itemRender="item.itemRender" @modelvalue="updateModel"></ml-form-item>
       </view>

package/components/ml-form-item/ml-form-item.vue

@@ -15,7 +15,7 @@
           <ml-upload v-else-if="matchComponent('MlUpload')" :value="itemValue" :mediatype="renderOpts.mediatype || 'image'" @change="modelEvent"></ml-upload>
           <ml-amount-input v-else-if="matchComponent('MlAmountInput')" :value="itemValue" @change="modelEvent"></ml-amount-input>
           <ml-amount-text v-else-if="matchComponent('MlAmountText')" :value="itemValue" @change="modelEvent"></ml-amount-text>
-          <text v-else style="color:red">{{ itemValue }}</text>
+          <text v-else class="ml-form-item-default-content">{{ itemValue }}</text>
         </slot>
       </view>
     </view>
@@ -183,5 +183,6 @@ export default {
 .ml-form-item-content-warpper {
   flex-grow: 1;
   width: 100%;
+  padding: 10rpx 0;
 }
 </style>

package/components/ml-list-group/ml-list-group.vue

@@ -4,6 +4,7 @@
       <scroll-view scroll-y>
         <slot></slot>
       </scroll-view>
+      <uni-load-more v-if="loadMore" v-show="!loading" :status="loadStatus"></uni-load-more>
     </view>
   </view>
 </template>
@@ -16,6 +17,7 @@ export default {
   },
   props: {
     title: String,
+    loadMore: Boolean,
     className: String
   }
 }

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

@@ -55,6 +55,10 @@ export default {
 }
 .ml-month-picker-text {
   flex-grow: 1;
+  padding-right: 10rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 .ml-month-picker-icon {
   color: #6a6a6a;

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

@@ -118,6 +118,7 @@ export default {
 }
 .ml-select-picker-text {
   flex-grow: 1;
+  padding-right: 10rpx;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;

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

@@ -1,5 +1,5 @@
 <template>
-	<view class="ml-upload" :class="className">
+	<view class="ml-upload" :class="[className || '']">
 		<view v-if="isFromReadonly">
 			<view v-if="mediatype === 'image'" class="ml-upload-image-list">
 				<view class="ml-upload-file-item" v-for="(item, index) in value" :key="index">

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

@@ -55,6 +55,10 @@ export default {
 }
 .ml-year-picker-text {
   flex-grow: 1;
+  padding-right: 10rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 .ml-year-picker-icon {
   color: #6a6a6a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "0.0.47",
+  "version": "0.0.50",
   "description": "码里云小程序组件库",
   "files": [
     "components",
@@ -14,6 +14,19 @@
   "devDependencies": {
     "xe-utils": "3.5.6"
   },
+  "uni-app": {
+    "scripts": {
+      "mp-dingtalk": {
+        "title": "钉钉小程序",
+        "env": {
+          "UNI_PLATFORM": "mp-alipay"
+        },
+        "define": {
+          "MP-DINGTALK": true
+        }
+      }
+    }
+  },
   "author": "xu_liangzhan@163.com",
   "keywords": [
     "mali-ui",