mali-applet-ui 1.0.40 → 1.0.41

package/lib/components/ml-chunk-group/ml-chunk-group.vue

@@ -46,6 +46,7 @@ export default {
   border-radius: $ml-border-radius;
   background: #ffffff;
   margin-bottom: 20rpx;
+  color: $ml-font-color;
   .ml-chunk-group-title {
     display: flex;
     flex-direction: row;

package/lib/components/ml-chunk-item/ml-chunk-item.vue

@@ -61,6 +61,9 @@ export default {
   padding: 16rpx;
   line-height: 50rpx;
   font-size: $ml-describe-font-size;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
   $spans: 4.16667%, 8.33333%, 12.5%, 16.66667%, 20.83333%, 25%, 29.16667%, 33.33333%,
           37.5%, 41.66667%, 45.83333%, 50%, 54.16667%, 58.33333%, 62.5%, 66.66667%,
           70.83333%, 75%, 79.16667%, 83.33333%, 87.5%, 91.66667%, 95.83333%, 100%;

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

@@ -12,8 +12,7 @@
 export default {
   name: 'MlCol',
   options: {
-    virtualHost: true,
-    styleIsolation: 'shared'
+    virtualHost: true
   },
   props: {
     span: [String, Number],

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

@@ -8,8 +8,7 @@
 export default {
   name: 'MlRow',
   options: {
-    virtualHost: true,
-    styleIsolation: 'shared'
+    virtualHost: true
   },
   props: {
     gutter: [String, Number],

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

@@ -170,7 +170,6 @@ export default {
     flex-grow: 1;
     color: #999999;
     text-align: right;
-    padding-right: 20rpx;
     font-size: $ml-describe-font-size;
   }
 }

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

@@ -8,28 +8,40 @@
           <ml-icon name="close" />
         </view>
       </view>
-      <view v-if="!isFromReadonly && fileList.length < limit" class="ml-upload-image-add">
-        <view class="ml-upload-image-add-btn" @tap="chooseEvent">
-          <view class="ml-upload-image-add-icon">
-            <ml-icon v-if="loading" name="loading" roll />
-            <ml-icon v-else name="add" />
-            <view v-if="loading" class="ml-upload-image-add-loading-text">上传中...</view>
+      <template v-if="!isFromReadonly && fileList.length < limit">
+        <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" />
+        </view>
+        <view v-else class="ml-upload-image-add">
+          <view class="ml-upload-image-add-btn" @tap="chooseEvent">
+            <view class="ml-upload-image-add-icon">
+              <ml-icon v-if="loading" name="loading" roll />
+              <ml-icon v-else name="add" />
+              <view v-if="loading" class="ml-upload-image-add-loading-text">上传中...</view>
+            </view>
           </view>
         </view>
-      </view>
+      </template>
     </view>
     <!-- 上传文件 -->
     <view v-else class="ml-upload-file-list">
-      <view v-if="!isFromReadonly && fileList.length < limit" class="ml-upload-file-add">
-        <view class="ml-upload-file-add-btn" @tap="chooseEvent">
-          <text class="ml-upload-file-add-icon">
-            <ml-icon v-if="loading" name="loading" roll />
-            <ml-icon v-else name="add" />
-          </text>
-          <text v-if="loading">上传中...</text>
-          <text v-else>添加文件</text>
+      <template v-if="!isFromReadonly && fileList.length < limit">
+        <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" />
         </view>
-      </view>
+        <view v-else class="ml-upload-file-add">
+          <view class="ml-upload-file-add-btn" @tap="chooseEvent">
+            <text class="ml-upload-file-add-icon">
+              <ml-icon v-if="loading" name="loading" roll />
+              <ml-icon v-else name="add" />
+            </text>
+            <text v-if="loading">上传中...</text>
+            <text v-else>添加文件</text>
+          </view>
+        </view>
+      </template>
       <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">
@@ -217,6 +229,9 @@ export default {
     }
   },
   computed: {
+    hasForm () {
+      return !!this.form
+    },
     isFromReadonly () {
       if (this.readonly) {
         return true
@@ -523,6 +538,7 @@ export default {
 
 <style lang="scss">
 .ml-upload-image-list {
+  position: relative;
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
@@ -540,9 +556,9 @@ export default {
     position: absolute;
     right: 0;
     top: 0;
-    width: 40rpx;
-    height: 40rpx;
-    line-height: 40rpx;
+    width: 36rpx;
+    height: 36rpx;
+    line-height: 36rpx;
     font-size: 28rpx;
     text-align: center;
     border-radius: 50%;
@@ -577,9 +593,10 @@ export default {
   }
 }
 .ml-upload-file-list {
+  position: relative;
   .ml-upload-file-add,
   .ml-upload-file-item {
-    margin: 20rpx 0;
+    margin: 10rpx 0;
   }
   .ml-upload-file-item {
     display: flex;
@@ -638,4 +655,11 @@ export default {
     width: 60rpx;
   }
 }
+.ml-upload-image-form-add-btn,
+.ml-upload-file-form-add-btn {
+  position: absolute;
+  top: -74rpx;
+  right: 20rpx;
+  font-size: 44rpx;
+}
 </style>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "1.0.40",
+  "version": "1.0.41",
   "description": "码里云小程序组件库",
   "files": [
     "lib",