mali-applet-ui 1.0.162 → 1.0.163

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.
@@ -300,6 +300,9 @@ export default {
300
300
  &.ss-purple {
301
301
  background-color: $ml-purple-color;
302
302
  }
303
+ &.ss-dark-blue {
304
+ background-color: $ml-dark-blue-color;
305
+ }
303
306
  }
304
307
  }
305
308
  &.today {
@@ -53,6 +53,7 @@ export default {
53
53
  type: Boolean,
54
54
  default: true
55
55
  },
56
+ disabled: Boolean,
56
57
  labelWidth: String,
57
58
  itemRender: Object,
58
59
  itemStyle: Object,
@@ -2,13 +2,13 @@
2
2
  <view v-if="isFromReadonly" class="ml-input is-readonly" :class="[className || '', {'is-right': align === 'right'}]" @tap="tapEvent">
3
3
  <view class="ml-input-readonly-content">{{ inpVal }}</view>
4
4
  </view>
5
- <view v-else-if="!editable && (platformEnv.isWXMP || platformEnv.isQWMP)" class="ml-input not-edit" :class="[className || '', {'is-right': align === 'right', 'is-border': border, 'is-disabled': disabled}]" @tap="tapEvent">
5
+ <view v-else-if="!editable && (platformEnv.isWXMP || platformEnv.isQWMP)" class="ml-input not-edit" :class="[className || '', {'is-right': align === 'right', 'is-border': border, 'is-disabled': isFormDisabled}]" @tap="tapEvent">
6
6
  <view class="ml-input-simulate">
7
7
  <text v-if="inpVal">{{ inpVal }}</text>
8
8
  <text v-else class="ml-input-placeholder">{{ placeholder }}</text>
9
9
  </view>
10
10
  </view>
11
- <view v-else class="ml-input" :class="[className || '', {'is-right': align === 'right', 'is-border': border, 'is-prefix': hasPrefix || type === 'search', 'is-suffix': hasSuffix, 'is-disabled': disabled, 'is-clear': clearable && inpVal}]">
11
+ <view v-else class="ml-input" :class="[className || '', {'is-right': align === 'right', 'is-border': border, 'is-prefix': hasPrefix || type === 'search', 'is-suffix': hasSuffix, 'is-disabled': isFormDisabled, 'is-clear': clearable && inpVal}]">
12
12
  <view v-if="hasPrefix || type === 'search'" class="ml-input-prefix-icon">
13
13
  <slot name="prefix">
14
14
  <ml-icon v-if="prefixIcon" :name="prefixIcon"></ml-icon>
@@ -23,13 +23,13 @@
23
23
  :confirm-type="type === 'search' ? 'search' : 'done'"
24
24
  :placeholder="placeholder"
25
25
  :maxlength="maxlength"
26
- :disabled="disabled"
26
+ :disabled="isFormDisabled"
27
27
  @tap="tapEvent"
28
28
  @input="inputEvent"
29
29
  @focus="focusEvent"
30
30
  @blur="blurEvent"
31
31
  @confirm="confirmEvent"/>
32
- <view v-if="clearable && !disabled && inpVal" class="ml-input-clear-icon" @click.stop="clearEvent">
32
+ <view v-if="clearable && !isFormDisabled && inpVal" class="ml-input-clear-icon" @click.stop="clearEvent">
33
33
  <ml-icon name="delete-filling"></ml-icon>
34
34
  </view>
35
35
  <view v-if="hasSuffix" class="ml-input-suffix-icon">
@@ -85,6 +85,10 @@ export default {
85
85
  form: {
86
86
  from: 'mlForm',
87
87
  default: null
88
+ },
89
+ formItem: {
90
+ from: 'mlFormItem',
91
+ default: null
88
92
  }
89
93
  },
90
94
  data () {
@@ -100,6 +104,12 @@ export default {
100
104
  }
101
105
  return this.form ? this.form.readonly : false
102
106
  },
107
+ isFormDisabled () {
108
+ if (this.disabled) {
109
+ return true
110
+ }
111
+ return this.formItem ? this.formItem.disabled : false
112
+ },
103
113
  hasSuffix () {
104
114
  return this.$slots.suffix || this.suffixIcon
105
115
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mali-applet-ui",
3
- "version": "1.0.162",
3
+ "version": "1.0.163",
4
4
  "description": "码里云小程序组件库",
5
5
  "files": [
6
6
  "lib",
package/theme.scss CHANGED
@@ -28,6 +28,7 @@ $ml-green-color: #00D35C;
28
28
  $ml-pink-color: #FF5064;
29
29
  $ml-orange-color: #FF9C00;
30
30
  $ml-purple-color: #9747FF;
31
+ $ml-dark-blue-color: #5e7092;
31
32
  $ml-white-color: #ffffff;
32
33
 
33
34
  // 边框圆角