sadais-piui 1.2.7-beta26 → 1.2.7-beta29

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.
@@ -21,7 +21,7 @@
21
21
  <!-- 展示dropdownItem下的数据 -->
22
22
  <view
23
23
  class="pi-dropdown-content"
24
- :class="[contentClass, show ? 'pi-ani-slide-bottom-show' : 'pi-ani-slide-bottom-hide']"
24
+ :class="[contentClass]"
25
25
  :style="[contentStyle, contentCombinationStyle]"
26
26
  >
27
27
  <slot />
@@ -276,7 +276,7 @@ export default {
276
276
  // 每次点击都重新更新父容器的位置
277
277
  this.containerRect = await this.$pi.common.queryRect(this, '.pi-dropdown', false)
278
278
  this.openMask()
279
- this._children.find(child => {
279
+ this._children.forEach(child => {
280
280
  child.show = child._uid === item.id
281
281
  })
282
282
  },
@@ -295,6 +295,9 @@ export default {
295
295
  closeMask() {
296
296
  if (!this.show || !this.showed) return
297
297
  console.log(TAG, '隐藏下拉菜单遮罩层')
298
+ this._children.forEach(child => {
299
+ child.show = false
300
+ })
298
301
  this.show = false
299
302
  this.showed = false
300
303
  this.tabs = this.tabs.map(tab => {
@@ -1,60 +1,64 @@
1
1
  <template>
2
- <scroll-view v-if="show" scroll-y class="pi-dropdown-item pi-w-100P">
3
- <slot>
4
- <view
5
- v-for="item in options"
6
- :key="item[getKeyField]"
7
- class="item-wrap pi-pd-tb-24 pi-pd-lr-32 pi-w-100P pi-align-center"
8
- :class="[
9
- customClass,
10
- item[getDisabledField] ? 'disabled' : '',
11
- getSelectedCheckbox === 'none' ? 'pi-justify-center' : 'pi-justify-between'
12
- ]"
13
- :style="[customStyle, getItemStyle]"
14
- @tap="handleSelectItem(item)"
15
- >
16
- <view :class="[{ 'pi-primary': item[keyField] === val }]">
17
- {{ item[getDisplayField] }}
2
+ <view class="pi-dropdown-item pi-w-100P pi-flex-column" :class="[{ show }]">
3
+ <!-- extra slot -->
4
+ <slot name="extra" />
5
+ <scroll-view scroll-y class="pi-scroll">
6
+ <slot>
7
+ <view
8
+ v-for="item in options"
9
+ :key="item[getKeyField]"
10
+ class="item-wrap pi-pd-tb-24 pi-pd-lr-32 pi-w-100P pi-align-center"
11
+ :class="[
12
+ customClass,
13
+ item[getDisabledField] ? 'disabled' : '',
14
+ getSelectedCheckbox === 'none' ? 'pi-justify-center' : 'pi-justify-between'
15
+ ]"
16
+ :style="[customStyle, getItemStyle]"
17
+ @tap="handleSelectItem(item)"
18
+ >
19
+ <view :class="[{ 'pi-primary': item[keyField] === val }]">
20
+ {{ item[getDisplayField] }}
21
+ </view>
22
+ <!-- 如果配置了图片地址,使用图片 -->
23
+ <pi-img
24
+ v-if="getSelectedImg.src && item[keyField] === val"
25
+ :src="getSelectedImg.src"
26
+ :mode="getSelectedImg.mode"
27
+ :width="getSelectedImg.width"
28
+ :height="getSelectedImg.height"
29
+ :dot="getSelectedImg.dot"
30
+ :dot-radius="getSelectedImg.dotRadius"
31
+ :badge="getSelectedImg.badge"
32
+ :shape="getSelectedImg.shape"
33
+ :border-radius="getSelectedImg.borderRadius"
34
+ :show-loading="getSelectedImg.showLoading"
35
+ :loading-color="getSelectedImg.loadingColor"
36
+ :loading-type="getSelectedImg.loadingType"
37
+ :loading-size="getSelectedImg.loadingSize"
38
+ :show-error="getSelectedImg.showError"
39
+ :webp="getSelectedImg.webp"
40
+ custom-class="pi-mg-left-24"
41
+ />
42
+ <!-- 默认使用复选框 -->
43
+ <pi-checkbox
44
+ v-if="!getSelectedImg.src && getSelectedCheckbox !== 'none'"
45
+ readonly
46
+ :value="item[keyField] === val"
47
+ :name="getSelectedCheckbox.name"
48
+ :shape="getSelectedCheckbox.shape"
49
+ :border-radius="getSelectedCheckbox.borderRadius"
50
+ :border="getSelectedCheckbox.border"
51
+ :disabled="getSelectedCheckbox.disabled"
52
+ :size="getSelectedCheckbox.size"
53
+ :icon-size="getSelectedCheckbox.iconSize"
54
+ :active-color="getSelectedCheckbox.activeColor"
55
+ :active-mode="getSelectedCheckbox.activeMode"
56
+ custom-class="pi-mg-left-24"
57
+ />
18
58
  </view>
19
- <!-- 如果配置了图片地址,使用图片 -->
20
- <pi-img
21
- v-if="getSelectedImg.src && item[keyField] === val"
22
- :src="getSelectedImg.src"
23
- :mode="getSelectedImg.mode"
24
- :width="getSelectedImg.width"
25
- :height="getSelectedImg.height"
26
- :dot="getSelectedImg.dot"
27
- :dot-radius="getSelectedImg.dotRadius"
28
- :badge="getSelectedImg.badge"
29
- :shape="getSelectedImg.shape"
30
- :border-radius="getSelectedImg.borderRadius"
31
- :show-loading="getSelectedImg.showLoading"
32
- :loading-color="getSelectedImg.loadingColor"
33
- :loading-type="getSelectedImg.loadingType"
34
- :loading-size="getSelectedImg.loadingSize"
35
- :show-error="getSelectedImg.showError"
36
- :webp="getSelectedImg.webp"
37
- custom-class="pi-mg-left-24"
38
- />
39
- <!-- 默认使用复选框 -->
40
- <pi-checkbox
41
- v-if="!getSelectedImg.src && getSelectedCheckbox !== 'none'"
42
- readonly
43
- :value="item[keyField] === val"
44
- :name="getSelectedCheckbox.name"
45
- :shape="getSelectedCheckbox.shape"
46
- :border-radius="getSelectedCheckbox.borderRadius"
47
- :border="getSelectedCheckbox.border"
48
- :disabled="getSelectedCheckbox.disabled"
49
- :size="getSelectedCheckbox.size"
50
- :icon-size="getSelectedCheckbox.iconSize"
51
- :active-color="getSelectedCheckbox.activeColor"
52
- :active-mode="getSelectedCheckbox.activeMode"
53
- custom-class="pi-mg-left-24"
54
- />
55
- </view>
56
- </slot>
57
- </scroll-view>
59
+ </slot>
60
+ </scroll-view>
61
+ </view>
58
62
  </template>
59
63
 
60
64
  <script>
@@ -223,7 +227,15 @@ export default {
223
227
  @import '../../scss/mixin.scss';
224
228
 
225
229
  .pi-dropdown-item {
226
- max-height: 600rpx;
230
+ max-height: 0;
231
+ opacity: 0;
232
+ transition: opacity $pi-animation-duration $pi-animation-timing-function,
233
+ max-height $pi-animation-duration $pi-animation-timing-function;
234
+ &.show {
235
+ max-height: 600rpx;
236
+ height: 600rpx;
237
+ opacity: 1;
238
+ }
227
239
  .item-wrap {
228
240
  &:not(:last-child) {
229
241
  @include pi-border;
@@ -1,5 +1,5 @@
1
1
  <template>
2
- <view class="pi-input-wrap" :style="[getInputWrapStyle]">
2
+ <view class="pi-input-wrap" :style="[getInputWrapStyle]" :class="[{ disabled: getDisabled }]">
3
3
  <textarea
4
4
  v-if="type === 'textarea'"
5
5
  class="pi-input-textarea"
@@ -39,8 +39,12 @@
39
39
  >
40
40
  <!-- 自定义列表项 -->
41
41
  <slot name="item" :item="item" :selected="item.isSelected" class="pi-w-100P">
42
- <!-- item[displayField] -->
43
- {{ item[displayField] }}
42
+ <view>
43
+ <view class="select-item-title">{{ item[displayField] }}</view>
44
+ <view v-if="item[descField]" class="pi-light-gray pi-fz-24 pi-mg-top-10 pi-lh-30">
45
+ {{ item[descField] }}
46
+ </view>
47
+ </view>
44
48
  </slot>
45
49
  <!-- 如果配置了图片地址,使用图片 -->
46
50
  <pi-img
@@ -60,7 +64,7 @@
60
64
  :loading-size="getSelectedImg.loadingSize"
61
65
  :show-error="getSelectedImg.showError"
62
66
  :webp="getSelectedImg.webp"
63
- custom-class="pi-mg-left-24"
67
+ custom-class="pi-mg-left-32"
64
68
  />
65
69
  <!-- 默认使用复选框 -->
66
70
  <pi-checkbox
@@ -76,7 +80,7 @@
76
80
  :icon-size="getSelectedCheckbox.iconSize"
77
81
  :active-color="getSelectedCheckbox.activeColor"
78
82
  :active-mode="getSelectedCheckbox.activeMode"
79
- custom-class="pi-mg-left-24"
83
+ custom-class="pi-mg-left-32"
80
84
  />
81
85
  </view>
82
86
  </scroll-view>
@@ -137,6 +141,12 @@ export default {
137
141
  // 'text'
138
142
  default: select.displayField
139
143
  },
144
+ // 描述显示字段,默认为desc
145
+ descField: {
146
+ type: String,
147
+ // 'desc'
148
+ default: select.descField
149
+ },
140
150
  // 默认值,单选是传Number, String, Object,多选时传Array
141
151
  defaultValue: {
142
152
  type: [Number, String, Object, Array],
package/config/select.js CHANGED
@@ -8,6 +8,7 @@ export default {
8
8
  items: [], // 选项列表,默认([])
9
9
  keyField: 'id', // 选项id字段,默认为id
10
10
  displayField: 'text', // 选项显示字段,默认为text
11
+ descField: 'desc', // 描述显示字段,默认为desc
11
12
  keyDefaultValue: false, // 是否只绑定keyField的默认值,默认false
12
13
  defaultValue: null, // 默认值,单选是传Object,多选时传Array,默认null
13
14
  isMulti: false, // 是否多选,(默认:false)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sadais-piui",
3
- "version": "1.2.7beta26",
3
+ "version": "1.2.7beta29",
4
4
  "description": "piui组件库",
5
5
  "main": "index.js",
6
6
  "scripts": {