mali-applet-ui 0.0.54 → 0.0.55
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -71,11 +71,13 @@ export default {
|
|
|
71
71
|
}
|
|
72
72
|
&.type-button {
|
|
73
73
|
width: 100%;
|
|
74
|
-
margin: 0 10rpx;
|
|
75
74
|
padding: 0 20rpx;
|
|
76
75
|
line-height: 80rpx;
|
|
77
76
|
border: 1px solid #e5e5e5;
|
|
78
77
|
border-radius: 10rpx;
|
|
78
|
+
&+.ml-button {
|
|
79
|
+
margin-left: 20rpx;
|
|
80
|
+
}
|
|
79
81
|
&.status-primary {
|
|
80
82
|
color: #ffffff;
|
|
81
83
|
background: $uni-color-primary;
|
|
@@ -8,7 +8,6 @@
|
|
|
8
8
|
import XEUtils from 'xe-utils'
|
|
9
9
|
import WxCanvas from './wx-canvas';
|
|
10
10
|
import * as echarts from './echarts';
|
|
11
|
-
import globalStore from '../../config/store'
|
|
12
11
|
|
|
13
12
|
export default {
|
|
14
13
|
name: 'MlEcharts',
|
|
@@ -62,10 +61,7 @@ export default {
|
|
|
62
61
|
opts.legend.formatter = this.customFormat
|
|
63
62
|
}
|
|
64
63
|
}
|
|
65
|
-
return
|
|
66
|
-
color: globalStore.echarts.color,
|
|
67
|
-
...opts
|
|
68
|
-
}
|
|
64
|
+
return opts
|
|
69
65
|
},
|
|
70
66
|
customFormat (name) {
|
|
71
67
|
return this.formatLegend(name, this.options || {})
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
<ml-select-picker v-else-if="matchComponent('MlSelectPicker')" :value="itemValue" :options="renderOpts.options" border @change="modelEvent"></ml-select-picker>
|
|
14
14
|
<ml-textarea v-else-if="matchComponent('MlTextarea')" :value="itemValue" :rows="renderOpts.rows || 3" border @change="modelEvent"></ml-textarea>
|
|
15
15
|
<ml-upload v-else-if="matchComponent('MlUpload')" :value="itemValue" :mediatype="renderOpts.mediatype || 'image'" @change="modelEvent"></ml-upload>
|
|
16
|
-
<ml-amount-input v-else-if="matchComponent('MlAmountInput')" :value="itemValue" @change="modelEvent"></ml-amount-input>
|
|
16
|
+
<ml-amount-input v-else-if="matchComponent('MlAmountInput')" :value="itemValue" border @change="modelEvent"></ml-amount-input>
|
|
17
17
|
<ml-amount-text v-else-if="matchComponent('MlAmountText')" :value="itemValue" @change="modelEvent"></ml-amount-text>
|
|
18
18
|
<text v-else class="ml-form-item-default-content">{{ itemValue }}</text>
|
|
19
19
|
</slot>
|