sadais-piui 1.2.7-beta145 → 1.2.7-beta147

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.
@@ -1,303 +1,311 @@
1
- <template>
2
- <pi-popup
3
- ref="popup"
4
- :value="val"
5
- :custom-class="getPopup.customClass"
6
- :custom-style="getPopup.customStyle"
7
- position="center"
8
- :border-radius="getPopup.borderRadius"
9
- :show-close-icon="showTitle && getPopup.showCloseIcon"
10
- :close-icon="getPopup.closeIcon"
11
- :safe-area-inset-bottom="getPopup.safeAreaInsetBottom"
12
- :mask="getPopup.mask"
13
- :hide-tab-bar="getPopup.hideTabBar"
14
- :append-to-body="getPopup.appendToBody"
15
- :z-index="getPopup.zIndex"
16
- :background="getPopup.background"
17
- @close="handlePopupClose"
18
- >
19
- <view class="pi-modal" :style="[customStyle, modalStyle]" :class="[customClass]">
20
- <!-- 标题栏 -->
21
- <view
22
- v-if="showTitle"
23
- class="pi-justify-center pi-fz-32 pi-fw-500"
24
- :style="[{ padding: getTitlePadding }]"
25
- >
26
- <!-- title -->
27
- <slot v-if="$slots.title" name="title" />
28
- <template v-else>{{ title }}</template>
29
- </view>
30
- <!-- 内容区域 -->
31
- <view class="pi-flex-column-center modal-content" :style="[getContentStyle]">
32
- <!-- 内容插槽 -->
33
- <slot v-if="$slots.default || $slots.$default" />
34
- <view v-else>{{ content }}</view>
35
- </view>
36
-
37
- <!-- 按钮区域 -->
38
- <view
39
- v-if="$slots.footer || getCancelBtn.show || getConfirmBtn.show"
40
- class="modal-footer pi-align-center pi-justify-center pi-pd-24"
41
- >
42
- <!-- 按钮区域 -->
43
- <slot v-if="$slots.footer" name="footer" />
44
- <template v-else>
45
- <view v-if="getCancelBtn.show" class="pi-button-wrap">
46
- <pi-button
47
- :custom-class="getCancelBtn.customClass"
48
- :custom-style="getCancelBtn.customStyle"
49
- :width="getCancelBtn.width"
50
- :size="getCancelBtn.size"
51
- :type="getCancelBtn.type"
52
- :plain="getCancelBtn.plain"
53
- :disabled="getCancelBtn.disabled"
54
- :loading="getCancelBtn.loading"
55
- :form-type="getCancelBtn.formType"
56
- :open-type="getCancelBtn.openType"
57
- :hover-class="getCancelBtn.hoverClass"
58
- :hover-start-time="getCancelBtn.hoverStartTime"
59
- :hover-stay-time="getCancelBtn.hoverStayTime"
60
- :app-parameter="getCancelBtn.appParameter"
61
- :hover-stop-propagation="getCancelBtn.hoverStopPropagation"
62
- :lang="getCancelBtn.lang"
63
- :session-from="getCancelBtn.sessionFrom"
64
- :send-message-title="getCancelBtn.sendMessageTitle"
65
- :send-message-path="getCancelBtn.sendMessagePath"
66
- :send-message-img="getCancelBtn.sendMessageImg"
67
- :show-message-card="getCancelBtn.showMessageCard"
68
- :color="getCancelBtn.color"
69
- :bg-color="getCancelBtn.bgColor"
70
- :round="getCancelBtn.round"
71
- :ripple="getCancelBtn.ripple"
72
- :ripple-bg-color="getCancelBtn.rippleBgColor"
73
- :debounce-timeout="getCancelBtn.debounceTimeout"
74
- @click="handleCancel"
75
- >
76
- {{ getCancelBtn.text }}
77
- </pi-button>
78
- </view>
79
- <view v-if="getConfirmBtn.show" class="pi-button-wrap">
80
- <pi-button
81
- :custom-class="getConfirmBtn.customClass"
82
- :custom-style="getConfirmBtn.customStyle"
83
- :width="getConfirmBtn.width"
84
- :size="getConfirmBtn.size"
85
- :type="getConfirmBtn.type"
86
- :plain="getConfirmBtn.plain"
87
- :disabled="getConfirmBtn.disabled"
88
- :loading="getConfirmBtn.loading"
89
- :form-type="getConfirmBtn.formType"
90
- :open-type="getConfirmBtn.openType"
91
- :hover-class="getConfirmBtn.hoverClass"
92
- :hover-start-time="getConfirmBtn.hoverStartTime"
93
- :hover-stay-time="getConfirmBtn.hoverStayTime"
94
- :app-parameter="getConfirmBtn.appParameter"
95
- :hover-stop-propagation="getConfirmBtn.hoverStopPropagation"
96
- :lang="getConfirmBtn.lang"
97
- :session-from="getConfirmBtn.sessionFrom"
98
- :send-message-title="getConfirmBtn.sendMessageTitle"
99
- :send-message-path="getConfirmBtn.sendMessagePath"
100
- :send-message-img="getConfirmBtn.sendMessageImg"
101
- :show-message-card="getConfirmBtn.showMessageCard"
102
- :color="getConfirmBtn.color"
103
- :bg-color="getConfirmBtn.bgColor"
104
- :round="getConfirmBtn.round"
105
- :ripple="getConfirmBtn.ripple"
106
- :ripple-bg-color="getConfirmBtn.rippleBgColor"
107
- :debounce-timeout="getConfirmBtn.debounceTimeout"
108
- @click="handleConfirm"
109
- >
110
- {{ getConfirmBtn.text }}
111
- </pi-button>
112
- </view>
113
- </template>
114
- </view>
115
- </view>
116
- </pi-popup>
117
- </template>
118
-
119
- <script>
120
- import ValueSync from '../../mixin/value-sync'
121
- import { getConfig } from '../../config'
122
-
123
- const TAG = 'PiModal'
124
- const { modal } = getConfig()
125
-
126
- // 模态弹窗
127
- export default {
128
- name: 'PiModal',
129
- // 混入v-model
130
- mixins: [ValueSync],
131
- props: {
132
- // 初始值
133
- value: {
134
- required: false
135
- },
136
- // 自定义样式
137
- customStyle: {
138
- type: Object,
139
- // {}
140
- default() {
141
- return modal.customStyle
142
- }
143
- },
144
- // 自定义样式类
145
- customClass: {
146
- type: String,
147
- // ''
148
- default() {
149
- return modal.customClass
150
- }
151
- },
152
- // 是否显示title
153
- showTitle: {
154
- type: Boolean,
155
- // true
156
- default: modal.showTitle
157
- },
158
- // 标题
159
- title: {
160
- type: String,
161
- // '弹出选择'
162
- default: modal.title
163
- },
164
- // 标题 padding
165
- titlePadding: {
166
- type: [String, Number],
167
- // '32rpx'
168
- default: modal.titlePadding
169
- },
170
- // 弹窗宽度 不带单位 则默认rpx
171
- width: {
172
- type: [Number, String],
173
- // 600
174
- default: modal.width
175
- },
176
- // 弹窗内容
177
- content: {
178
- type: String,
179
- // '内容'
180
- default: modal.content
181
- },
182
- // 内容 padding
183
- contentPadding: {
184
- type: [String, Number],
185
- // '32rpx'
186
- default: modal.contentPadding
187
- },
188
- // 内容的样式
189
- contentStyle: {
190
- type: Object,
191
- // {}
192
- default() {
193
- return modal.contentStyle
194
- }
195
- },
196
- // 是否点击取消的时候关闭弹窗
197
- onCancelClose: {
198
- type: Boolean,
199
- // true
200
- default: modal.onCancelClose
201
- },
202
- // 是否点击确认的时候关闭弹窗
203
- onConfirmClose: {
204
- type: Boolean,
205
- // true
206
- default: modal.onConfirmClose
207
- },
208
- // 确认按钮配置
209
- confirmBtn: {
210
- type: Object,
211
- default() {
212
- return modal.confirmBtn
213
- }
214
- },
215
- // 取消按钮配置
216
- cancelBtn: {
217
- type: Object,
218
- default() {
219
- return modal.cancelBtn
220
- }
221
- },
222
- // 弹窗参数设置
223
- popup: {
224
- type: Object,
225
- default() {
226
- // 参照popup
227
- return modal.popup
228
- }
229
- }
230
- },
231
- data() {
232
- return {
233
- selected: {}
234
- }
235
- },
236
- computed: {
237
- getPopup() {
238
- return this.$pi.lang.mergeDeep(modal.popup, this.popup)
239
- },
240
- getConfirmBtn() {
241
- return this.$pi.lang.mergeDeep(modal.confirmBtn, this.confirmBtn)
242
- },
243
- getCancelBtn() {
244
- return this.$pi.lang.mergeDeep(modal.cancelBtn, this.cancelBtn)
245
- },
246
- getTitlePadding() {
247
- return this.$pi.common.addUnit(this.titlePadding)
248
- },
249
- getContentStyle() {
250
- const contentStyle = {
251
- padding: this.$pi.common.addUnit(this.contentPadding),
252
- ...this.contentStyle
253
- }
254
- return contentStyle
255
- },
256
- modalStyle() {
257
- return {
258
- width: this.$pi.common.addUnit(this.width)
259
- }
260
- }
261
- },
262
- methods: {
263
- handlePopupClose() {
264
- this.val = false
265
- // 点击关闭按钮时触发
266
- this.$emit('close')
267
- this.handleEmitChange()
268
- },
269
- /**
270
- * @vuese
271
- * 取消选择
272
- */
273
- handleCancel() {
274
- // 点击取消按钮时触发
275
- this.$emit('cancel')
276
- this.onCancelClose && this.handlePopupClose()
277
- },
278
- /**
279
- * @vuese
280
- * 确认选择
281
- */
282
- handleConfirm() {
283
- // 点击确定按钮时触发
284
- this.$emit('confirm')
285
- this.onConfirmClose && this.handlePopupClose()
286
- }
287
- }
288
- }
289
- </script>
290
-
291
- <style lang="scss" scoped>
292
- .modal-footer {
293
- .modal-content {
294
- line-height: 1.5;
295
- }
296
- .pi-button-wrap {
297
- flex: 1;
298
- &:nth-child(2) {
299
- margin-left: 24rpx;
300
- }
301
- }
302
- }
303
- </style>
1
+ <template>
2
+ <pi-popup
3
+ ref="popup"
4
+ :value="val"
5
+ :custom-class="getPopup.customClass"
6
+ :custom-style="getPopup.customStyle"
7
+ position="center"
8
+ :border-radius="getPopup.borderRadius"
9
+ :show-close-icon="showTitle && getPopup.showCloseIcon"
10
+ :close-icon="getPopup.closeIcon"
11
+ :safe-area-inset-bottom="getPopup.safeAreaInsetBottom"
12
+ :mask="getPopup.mask"
13
+ :hide-tab-bar="getPopup.hideTabBar"
14
+ :append-to-body="getPopup.appendToBody"
15
+ :z-index="getPopup.zIndex"
16
+ :background="getPopup.background"
17
+ @close="handlePopupClose"
18
+ >
19
+ <view
20
+ class="pi-modal"
21
+ :style="[customStyle, modalStyle]"
22
+ :class="[customClass]"
23
+ >
24
+ <!-- 标题栏 -->
25
+ <view
26
+ v-if="showTitle"
27
+ class="pi-justify-center pi-fz-32 pi-fw-500"
28
+ :style="[{ padding: getTitlePadding }]"
29
+ >
30
+ <!-- title -->
31
+ <slot v-if="$slots.title" name="title" />
32
+ <template v-else>{{ title }}</template>
33
+ </view>
34
+ <!-- 内容区域 -->
35
+ <view
36
+ class="pi-flex-column-center modal-content"
37
+ :style="[getContentStyle]"
38
+ >
39
+ <!-- 内容插槽 -->
40
+ <slot v-if="$slots.default || $slots.$default" />
41
+ <view v-else>{{ content }}</view>
42
+ </view>
43
+
44
+ <!-- 按钮区域 -->
45
+ <view
46
+ v-if="$slots.footer || getCancelBtn.show || getConfirmBtn.show"
47
+ class="modal-footer pi-align-center pi-justify-center pi-pd-24"
48
+ >
49
+ <!-- 按钮区域 -->
50
+ <slot v-if="$slots.footer" name="footer" />
51
+ <template v-else>
52
+ <view v-if="getCancelBtn.show" class="pi-button-wrap">
53
+ <pi-button
54
+ :custom-class="getCancelBtn.customClass"
55
+ :custom-style="getCancelBtn.customStyle"
56
+ :width="getCancelBtn.width"
57
+ :size="getCancelBtn.size"
58
+ :type="getCancelBtn.type"
59
+ :plain="getCancelBtn.plain"
60
+ :disabled="getCancelBtn.disabled"
61
+ :loading="getCancelBtn.loading"
62
+ :form-type="getCancelBtn.formType"
63
+ :open-type="getCancelBtn.openType"
64
+ :hover-class="getCancelBtn.hoverClass"
65
+ :hover-start-time="getCancelBtn.hoverStartTime"
66
+ :hover-stay-time="getCancelBtn.hoverStayTime"
67
+ :app-parameter="getCancelBtn.appParameter"
68
+ :hover-stop-propagation="getCancelBtn.hoverStopPropagation"
69
+ :lang="getCancelBtn.lang"
70
+ :session-from="getCancelBtn.sessionFrom"
71
+ :send-message-title="getCancelBtn.sendMessageTitle"
72
+ :send-message-path="getCancelBtn.sendMessagePath"
73
+ :send-message-img="getCancelBtn.sendMessageImg"
74
+ :show-message-card="getCancelBtn.showMessageCard"
75
+ :color="getCancelBtn.color"
76
+ :bg-color="getCancelBtn.bgColor"
77
+ :round="getCancelBtn.round"
78
+ :ripple="getCancelBtn.ripple"
79
+ :ripple-bg-color="getCancelBtn.rippleBgColor"
80
+ :debounce-timeout="getCancelBtn.debounceTimeout"
81
+ @click="handleCancel"
82
+ >
83
+ {{ getCancelBtn.text }}
84
+ </pi-button>
85
+ </view>
86
+ <view v-if="getConfirmBtn.show" class="pi-button-wrap">
87
+ <pi-button
88
+ :custom-class="getConfirmBtn.customClass"
89
+ :custom-style="getConfirmBtn.customStyle"
90
+ :width="getConfirmBtn.width"
91
+ :size="getConfirmBtn.size"
92
+ :type="getConfirmBtn.type"
93
+ :plain="getConfirmBtn.plain"
94
+ :disabled="getConfirmBtn.disabled"
95
+ :loading="getConfirmBtn.loading"
96
+ :form-type="getConfirmBtn.formType"
97
+ :open-type="getConfirmBtn.openType"
98
+ :hover-class="getConfirmBtn.hoverClass"
99
+ :hover-start-time="getConfirmBtn.hoverStartTime"
100
+ :hover-stay-time="getConfirmBtn.hoverStayTime"
101
+ :app-parameter="getConfirmBtn.appParameter"
102
+ :hover-stop-propagation="getConfirmBtn.hoverStopPropagation"
103
+ :lang="getConfirmBtn.lang"
104
+ :session-from="getConfirmBtn.sessionFrom"
105
+ :send-message-title="getConfirmBtn.sendMessageTitle"
106
+ :send-message-path="getConfirmBtn.sendMessagePath"
107
+ :send-message-img="getConfirmBtn.sendMessageImg"
108
+ :show-message-card="getConfirmBtn.showMessageCard"
109
+ :color="getConfirmBtn.color"
110
+ :bg-color="getConfirmBtn.bgColor"
111
+ :round="getConfirmBtn.round"
112
+ :ripple="getConfirmBtn.ripple"
113
+ :ripple-bg-color="getConfirmBtn.rippleBgColor"
114
+ :debounce-timeout="getConfirmBtn.debounceTimeout"
115
+ @click="handleConfirm"
116
+ >
117
+ {{ getConfirmBtn.text }}
118
+ </pi-button>
119
+ </view>
120
+ </template>
121
+ </view>
122
+ <slot v-if="$slots.customFooter" name="customFooter" />
123
+ </view>
124
+ </pi-popup>
125
+ </template>
126
+
127
+ <script>
128
+ import ValueSync from '../../mixin/value-sync'
129
+ import { getConfig } from '../../config'
130
+
131
+ const TAG = 'PiModal'
132
+ const { modal } = getConfig()
133
+
134
+ // 模态弹窗
135
+ export default {
136
+ name: 'PiModal',
137
+ // 混入v-model
138
+ mixins: [ValueSync],
139
+ props: {
140
+ // 初始值
141
+ value: {
142
+ required: false
143
+ },
144
+ // 自定义样式
145
+ customStyle: {
146
+ type: Object,
147
+ // {}
148
+ default() {
149
+ return modal.customStyle
150
+ }
151
+ },
152
+ // 自定义样式类
153
+ customClass: {
154
+ type: String,
155
+ // ''
156
+ default() {
157
+ return modal.customClass
158
+ }
159
+ },
160
+ // 是否显示title
161
+ showTitle: {
162
+ type: Boolean,
163
+ // true
164
+ default: modal.showTitle
165
+ },
166
+ // 标题
167
+ title: {
168
+ type: String,
169
+ // '弹出选择'
170
+ default: modal.title
171
+ },
172
+ // 标题 padding
173
+ titlePadding: {
174
+ type: [String, Number],
175
+ // '32rpx'
176
+ default: modal.titlePadding
177
+ },
178
+ // 弹窗宽度 不带单位 则默认rpx
179
+ width: {
180
+ type: [Number, String],
181
+ // 600
182
+ default: modal.width
183
+ },
184
+ // 弹窗内容
185
+ content: {
186
+ type: String,
187
+ // '内容'
188
+ default: modal.content
189
+ },
190
+ // 内容 padding
191
+ contentPadding: {
192
+ type: [String, Number],
193
+ // '32rpx'
194
+ default: modal.contentPadding
195
+ },
196
+ // 内容的样式
197
+ contentStyle: {
198
+ type: Object,
199
+ // {}
200
+ default() {
201
+ return modal.contentStyle
202
+ }
203
+ },
204
+ // 是否点击取消的时候关闭弹窗
205
+ onCancelClose: {
206
+ type: Boolean,
207
+ // true
208
+ default: modal.onCancelClose
209
+ },
210
+ // 是否点击确认的时候关闭弹窗
211
+ onConfirmClose: {
212
+ type: Boolean,
213
+ // true
214
+ default: modal.onConfirmClose
215
+ },
216
+ // 确认按钮配置
217
+ confirmBtn: {
218
+ type: Object,
219
+ default() {
220
+ return modal.confirmBtn
221
+ }
222
+ },
223
+ // 取消按钮配置
224
+ cancelBtn: {
225
+ type: Object,
226
+ default() {
227
+ return modal.cancelBtn
228
+ }
229
+ },
230
+ // 弹窗参数设置
231
+ popup: {
232
+ type: Object,
233
+ default() {
234
+ // 参照popup
235
+ return modal.popup
236
+ }
237
+ }
238
+ },
239
+ data() {
240
+ return {
241
+ selected: {}
242
+ }
243
+ },
244
+ computed: {
245
+ getPopup() {
246
+ return this.$pi.lang.mergeDeep(modal.popup, this.popup)
247
+ },
248
+ getConfirmBtn() {
249
+ return this.$pi.lang.mergeDeep(modal.confirmBtn, this.confirmBtn)
250
+ },
251
+ getCancelBtn() {
252
+ return this.$pi.lang.mergeDeep(modal.cancelBtn, this.cancelBtn)
253
+ },
254
+ getTitlePadding() {
255
+ return this.$pi.common.addUnit(this.titlePadding)
256
+ },
257
+ getContentStyle() {
258
+ const contentStyle = {
259
+ padding: this.$pi.common.addUnit(this.contentPadding),
260
+ ...this.contentStyle
261
+ }
262
+ return contentStyle
263
+ },
264
+ modalStyle() {
265
+ return {
266
+ width: this.$pi.common.addUnit(this.width)
267
+ }
268
+ }
269
+ },
270
+ methods: {
271
+ handlePopupClose() {
272
+ this.val = false
273
+ // 点击关闭按钮时触发
274
+ this.$emit('close')
275
+ this.handleEmitChange()
276
+ },
277
+ /**
278
+ * @vuese
279
+ * 取消选择
280
+ */
281
+ handleCancel() {
282
+ // 点击取消按钮时触发
283
+ this.$emit('cancel')
284
+ this.onCancelClose && this.handlePopupClose()
285
+ },
286
+ /**
287
+ * @vuese
288
+ * 确认选择
289
+ */
290
+ handleConfirm() {
291
+ // 点击确定按钮时触发
292
+ this.$emit('confirm')
293
+ this.onConfirmClose && this.handlePopupClose()
294
+ }
295
+ }
296
+ }
297
+ </script>
298
+
299
+ <style lang="scss" scoped>
300
+ .modal-footer {
301
+ .modal-content {
302
+ line-height: 1.5;
303
+ }
304
+ .pi-button-wrap {
305
+ flex: 1;
306
+ &:nth-child(2) {
307
+ margin-left: 24rpx;
308
+ }
309
+ }
310
+ }
311
+ </style>
@@ -47,7 +47,7 @@
47
47
  v-if="fileIconMap[getFileType(imgField ? img[imgField] : img)]"
48
48
  :src="fileIconMap[getFileType(imgField ? img[imgField] : img)]"
49
49
  mode="widthFix"
50
- style="width: 100%;"
50
+ style="width: 100%"
51
51
  />
52
52
  <template v-else>
53
53
  <pi-icon
@@ -143,6 +143,26 @@
143
143
  }"
144
144
  @select="handleActionSheetSelect"
145
145
  />
146
+
147
+ <!-- 自定义拍照操作面板(小程序专用) -->
148
+ <pi-select
149
+ v-model="showCustomTakePhoto"
150
+ :items="customTakePhotoItems"
151
+ :single-cancel="false"
152
+ single-confirm
153
+ :item-style="{
154
+ padding: '32rpx'
155
+ }"
156
+ :popup="{
157
+ borderRadius: 0
158
+ }"
159
+ :popup-select="{
160
+ showTitle: true,
161
+ title: '请选择拍摄方式'
162
+ }"
163
+ item-height="auto"
164
+ @confirm="handleCustomTakePhotoSelect"
165
+ />
146
166
  </view>
147
167
  </template>
148
168
 
@@ -415,6 +435,13 @@ export default {
415
435
  default() {
416
436
  return uploadImg.customUploadParams
417
437
  }
438
+ },
439
+ // 是否自定义拍照(如果为true,则不调用相机,通过事件自己实现拍照上传)
440
+ customTakePhoto: {
441
+ type: Boolean,
442
+ default() {
443
+ return uploadImg.customTakePhoto
444
+ }
418
445
  }
419
446
  },
420
447
  data() {
@@ -422,7 +449,9 @@ export default {
422
449
  showCrop: false, // 是否显示裁剪工具
423
450
  cropPic: '', // 需要剪裁的图片
424
451
  cropedPic: '', // 剪裁后的图片
425
- showActionSheet: false // 是否显示上传视频操作面板
452
+ showActionSheet: false, // 是否显示上传视频操作面板
453
+ showCustomTakePhoto: false, // 是否显示自定义拍照操作面板
454
+ currentSourceType: ['camera', 'album'] // 当前选择的拍照方式
426
455
  }
427
456
  },
428
457
  computed: {
@@ -451,6 +480,38 @@ export default {
451
480
  }
452
481
  ]
453
482
  },
483
+ customTakePhotoItems() {
484
+ // currentSourceType 当前选择的拍照方式 ['camera', 'album']
485
+ let sourceType = this.currentSourceType || ['camera', 'album']
486
+ if (sourceType.length === 0) {
487
+ sourceType = ['camera', 'album']
488
+ }
489
+ const items = [
490
+ {
491
+ id: 'takePhoto',
492
+ text: '拍摄',
493
+ desc: '拍摄完成后上传图片(信号良好下使用)',
494
+ show: sourceType.includes('camera')
495
+ },
496
+ {
497
+ id: 'takePhotoOffline',
498
+ text: '离线拍摄',
499
+ desc: '拍摄完成后缓存到相册,待网络良好时上传(信号较差时使用)',
500
+ show: sourceType.includes('camera')
501
+ },
502
+ {
503
+ id: 'chooseFromAlbum',
504
+ text: '从手机相册选择',
505
+ show: sourceType.includes('album')
506
+ },
507
+ {
508
+ id: 'chooseFromCacheAlbum',
509
+ text: '从缓存相册选择',
510
+ show: true
511
+ }
512
+ ]
513
+ return items.filter(item => item.show)
514
+ },
454
515
  selectOnlyFile() {
455
516
  return this.type === 'all' && this.fileTypes.length === 0
456
517
  },
@@ -886,6 +947,17 @@ export default {
886
947
  },
887
948
  async handleChooseImage() {
888
949
  const { sizeType, sourceType, crop } = this.getChooseImageOpts
950
+
951
+ this.currentSourceType = sourceType
952
+
953
+ if (this.customTakePhoto) {
954
+ this.showCustomTakePhoto = true
955
+ return
956
+ }
957
+
958
+ this.handleUniChooseImage(sizeType, sourceType, crop)
959
+ },
960
+ async handleUniChooseImage(sizeType, sourceType, crop) {
889
961
  try {
890
962
  const [cancel, result] = await uni.chooseImage({
891
963
  count: this.getUploadMaxCount,
@@ -930,6 +1002,14 @@ export default {
930
1002
  },
931
1003
  async handleChooseVideo() {
932
1004
  const { sourceType, maxDuration, camera } = this.getChooseVideoOpts
1005
+
1006
+ this.currentSourceType = sourceType
1007
+
1008
+ if (this.customTakePhoto) {
1009
+ this.showCustomTakePhoto = true
1010
+ return
1011
+ }
1012
+
933
1013
  try {
934
1014
  const [cancel, result] = await uni.chooseVideo({
935
1015
  sourceType,
@@ -957,6 +1037,14 @@ export default {
957
1037
  async handleChooseMedia() {
958
1038
  const { sourceType, maxDuration, camera } =
959
1039
  this.type === 'video' ? this.getChooseVideoOpts : this.getChooseFileOpts
1040
+
1041
+ this.currentSourceType = sourceType
1042
+
1043
+ if (this.customTakePhoto) {
1044
+ this.showCustomTakePhoto = true
1045
+ return
1046
+ }
1047
+
960
1048
  try {
961
1049
  const [cancel, result] = await uni.chooseMedia({
962
1050
  count: this.getUploadMaxCount,
@@ -1030,6 +1118,25 @@ export default {
1030
1118
  } else {
1031
1119
  this.handleSelectMessageFile()
1032
1120
  }
1121
+ },
1122
+ handleEmitTakePhoto(takeType) {
1123
+ this.$emit('customTakePhoto', {
1124
+ takeType,
1125
+ uploadType: this.type,
1126
+ compressOption: this.compressOption,
1127
+ chooseImageOpts: this.getChooseImageOpts,
1128
+ chooseVideoOpts: this.getChooseVideoOpts,
1129
+ chooseFileOpts: this.getChooseFileOpts
1130
+ })
1131
+ },
1132
+ handleCustomTakePhotoSelect(type) {
1133
+ if (type.id === 'chooseFromAlbum') {
1134
+ // 从手机相册选择
1135
+ const { sizeType, crop } = this.getChooseImageOpts
1136
+ this.handleUniChooseImage(sizeType, ['album'], crop)
1137
+ } else {
1138
+ this.handleEmitTakePhoto(type.id)
1139
+ }
1033
1140
  }
1034
1141
  }
1035
1142
  }
@@ -78,6 +78,7 @@ export default {
78
78
  beforeUpload: null, // 上传之前的钩子
79
79
  onProgress: null, // 文件上传时的钩子
80
80
  beforeRemove: null, // 删除之前的钩子
81
+ customTakePhoto: false, // 是否自定义拍照(如果为true,则不调用相机,通过事件自己实现拍照上传)
81
82
  fileIconMap: {}, // 文件类型和图标映射关系,对象形式({PDF: 'https://xxx'})
82
83
  customUploadParams: {} // 自定义上传参数,对象形式
83
84
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sadais-piui",
3
- "version": "1.2.7-beta145",
3
+ "version": "1.2.7-beta147",
4
4
  "description": "piui组件库",
5
5
  "main": "index.js",
6
6
  "scripts": {