sadais-piui 1.1.2-beta → 1.2.2-beta2
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.
- package/CHANGELOG.md +482 -240
- package/README.md +2 -3
- package/components/pi-bottom-bar/index.vue +15 -2
- package/components/pi-canvas/index.vue +400 -0
- package/components/pi-circle-progress/index.vue +196 -173
- package/components/pi-count-up/index.vue +68 -62
- package/components/pi-dropdown/components/dropdown-tab.vue +62 -0
- package/components/pi-dropdown/index.vue +152 -151
- package/components/pi-dropdown-item/index.vue +169 -41
- package/components/pi-form-item/index.vue +13 -1
- package/components/pi-img/index.vue +1 -0
- package/components/pi-img-cropper/index.vue +20 -16
- package/components/pi-img-cropper/touch.js +5 -3
- package/components/pi-input/index.vue +9 -2
- package/components/pi-notify/index.vue +132 -48
- package/components/pi-popup/index.vue +1 -3
- package/components/pi-radio/index.vue +10 -1
- package/components/pi-radio-group/index.vue +21 -2
- package/components/pi-select/index.vue +13 -3
- package/components/pi-steps/index.vue +141 -96
- package/components/pi-switch/index.vue +2 -3
- package/components/pi-tabs/index.vue +1 -2
- package/components/pi-upload-img/index.vue +104 -32
- package/config/bottomBar.js +1 -0
- package/config/checkbox.js +1 -1
- package/config/circleProgress.js +13 -0
- package/config/countUp.js +13 -0
- package/config/dropdown.js +17 -8
- package/config/dropdownItem.js +23 -5
- package/config/form.js +3 -3
- package/config/imgCropper.js +4 -2
- package/config/notify.js +6 -2
- package/config/radio.js +2 -1
- package/config/radioGroup.js +2 -1
- package/config/steps.js +10 -5
- package/config/{upload-img.js → uploadImg.js} +6 -3
- package/index.js +2 -2
- package/package.json +3 -3
- package/scss/variable.scss +1 -1
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
<!--
|
|
2
2
|
* @Author: zhangzhenfei
|
|
3
3
|
* @Date: 2021-08-13 11:31:57
|
|
4
|
-
* @LastEditTime: 2021-11-11
|
|
4
|
+
* @LastEditTime: 2021-11-17 11:30:50
|
|
5
5
|
* @LastEditors: zhangzhenfei
|
|
6
6
|
* @Description: 图片上传组件
|
|
7
|
-
* @FilePath: /piui-
|
|
7
|
+
* @FilePath: /piui-awesome/src/piui/components/pi-upload-img/index.vue
|
|
8
8
|
-->
|
|
9
9
|
|
|
10
10
|
<template>
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
/>
|
|
28
28
|
</view>
|
|
29
29
|
<!-- 上传框 -->
|
|
30
|
-
<view v-if="
|
|
30
|
+
<view v-if="getUploadMaxCount">
|
|
31
31
|
<view :style="[getUploadBtnStyle]" class="pi-flex-column-center" @tap="handleChooseImage">
|
|
32
32
|
<slot name="uploadBtn">
|
|
33
33
|
<!-- 添加按钮 -->
|
|
@@ -46,13 +46,38 @@
|
|
|
46
46
|
<view v-if="uploadText" class="pi-mg-top-6 pi-fz-24 pi-light-gray">{{ uploadText }}</view>
|
|
47
47
|
</view>
|
|
48
48
|
</view>
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
49
|
+
<!-- 剪裁弹窗 -->
|
|
50
|
+
<pi-mask v-model="showCrop" :mask-closeable="false" background="rgba(0, 0, 0, .9)">
|
|
51
|
+
<view class="pi-abso-full pi-flex-column">
|
|
52
|
+
<view class="pi-flex-sub">
|
|
53
|
+
<pi-img-cropper
|
|
54
|
+
:custom-style="getCropOption.customStyle"
|
|
55
|
+
:custom-class="getCropOption.customClass"
|
|
56
|
+
:src="cropPic"
|
|
57
|
+
:file-type="getCropOption.fileType"
|
|
58
|
+
:quality="getCropOption.quality"
|
|
59
|
+
:crop-size="getCropOption.cropSize"
|
|
60
|
+
:min-crop-size="getCropOption.minCropSize"
|
|
61
|
+
:boundary-detect="getCropOption.boundaryDetect"
|
|
62
|
+
:keep-crop-ratio="getCropOption.keepCropRatio"
|
|
63
|
+
:disable-rotate="getCropOption.disableRotate"
|
|
64
|
+
:canvas-zoom="getCropOption.canvasZoom"
|
|
65
|
+
:mask-background="getCropMaskBackground"
|
|
66
|
+
@cropped="handleCrop"
|
|
67
|
+
/>
|
|
53
68
|
</view>
|
|
54
|
-
|
|
55
|
-
|
|
69
|
+
<pi-bottom-bar
|
|
70
|
+
border-top="none"
|
|
71
|
+
:background="getCropMaskBackground"
|
|
72
|
+
:safe-area-bg-color="getCropMaskBackground"
|
|
73
|
+
>
|
|
74
|
+
<view class="pi-justify-between pi-align-center pi-pd-tb-32 pi-pd-lr-24 pi-fz-32">
|
|
75
|
+
<view class="pi-white" @tap="handleCancelCrop">取消</view>
|
|
76
|
+
<view class="pi-primary" @tap="handleCompelteCrop">完成</view>
|
|
77
|
+
</view>
|
|
78
|
+
</pi-bottom-bar>
|
|
79
|
+
</view>
|
|
80
|
+
</pi-mask>
|
|
56
81
|
</view>
|
|
57
82
|
</template>
|
|
58
83
|
|
|
@@ -214,11 +239,18 @@ export default {
|
|
|
214
239
|
return uploadImg.chooseImageOpts
|
|
215
240
|
}
|
|
216
241
|
},
|
|
217
|
-
//
|
|
218
|
-
|
|
219
|
-
type:
|
|
242
|
+
// 当maxCount设置为1的时候,可开启裁剪
|
|
243
|
+
crop: {
|
|
244
|
+
type: Boolean,
|
|
220
245
|
// `false`
|
|
221
|
-
default: uploadImg.
|
|
246
|
+
default: uploadImg.crop
|
|
247
|
+
},
|
|
248
|
+
// 裁剪参数
|
|
249
|
+
cropOption: {
|
|
250
|
+
type: Object,
|
|
251
|
+
default() {
|
|
252
|
+
return uploadImg.cropOption
|
|
253
|
+
}
|
|
222
254
|
},
|
|
223
255
|
// 上传成功解析对象方法
|
|
224
256
|
parseResultFn: {
|
|
@@ -240,6 +272,16 @@ export default {
|
|
|
240
272
|
}
|
|
241
273
|
}
|
|
242
274
|
},
|
|
275
|
+
// 文件上传时的钩子
|
|
276
|
+
onProgress: {
|
|
277
|
+
type: [Object, Function],
|
|
278
|
+
default() {
|
|
279
|
+
return {
|
|
280
|
+
[PI_DEFAULT_FN_FLAG]: true,
|
|
281
|
+
fn: uploadImg.onProgress
|
|
282
|
+
}
|
|
283
|
+
}
|
|
284
|
+
},
|
|
243
285
|
// 删除之前的钩子
|
|
244
286
|
beforeRemove: {
|
|
245
287
|
type: [Object, Function],
|
|
@@ -253,8 +295,9 @@ export default {
|
|
|
253
295
|
},
|
|
254
296
|
data() {
|
|
255
297
|
return {
|
|
256
|
-
showCrop: false,
|
|
257
|
-
cropPic: ''
|
|
298
|
+
showCrop: false, // 是否显示裁剪工具
|
|
299
|
+
cropPic: '', // 需要剪裁的图片
|
|
300
|
+
cropedPic: '' // 剪裁后的图片
|
|
258
301
|
}
|
|
259
302
|
},
|
|
260
303
|
computed: {
|
|
@@ -279,9 +322,15 @@ export default {
|
|
|
279
322
|
arrayMerge: (target, source) => source
|
|
280
323
|
})
|
|
281
324
|
},
|
|
282
|
-
|
|
325
|
+
getUploadMaxCount() {
|
|
283
326
|
const maxCount = parseInt(this.maxCount, 10)
|
|
284
327
|
return maxCount - this.getImgs.length
|
|
328
|
+
},
|
|
329
|
+
getCropMaskBackground() {
|
|
330
|
+
return 'rgba(0, 0, 0, .3)'
|
|
331
|
+
},
|
|
332
|
+
getCropOption() {
|
|
333
|
+
return this.$pi.lang.mergeDeep(uploadImg.cropOption, this.cropOption)
|
|
285
334
|
}
|
|
286
335
|
},
|
|
287
336
|
methods: {
|
|
@@ -323,20 +372,30 @@ export default {
|
|
|
323
372
|
}
|
|
324
373
|
})
|
|
325
374
|
},
|
|
326
|
-
handleCrop(res) {
|
|
327
|
-
this.showCrop = false
|
|
328
|
-
this.cropPic = ''
|
|
329
|
-
this.handleUpload([res.img])
|
|
330
|
-
},
|
|
331
375
|
async handleUpload(paths) {
|
|
332
376
|
const beforeUpload = this.beforeUpload[PI_DEFAULT_FN_FLAG]
|
|
333
377
|
? this.beforeUpload.fn
|
|
334
378
|
: this.beforeUpload
|
|
379
|
+
const onProgress = this.onProgress[PI_DEFAULT_FN_FLAG] ? this.onProgress.fn : this.onProgress
|
|
335
380
|
const parseResultFn = this.parseResultFn[PI_DEFAULT_FN_FLAG]
|
|
336
381
|
? this.parseResultFn.fn
|
|
337
382
|
: this.parseResultFn
|
|
338
383
|
try {
|
|
339
384
|
for await (const filePath of paths) {
|
|
385
|
+
// ---------- 上传之前的钩子 ----------
|
|
386
|
+
|
|
387
|
+
let beforeUploadResult = true
|
|
388
|
+
if (this.$pi.lang.isFunction(beforeUpload)) {
|
|
389
|
+
console.log(TAG, '调用文件上传前钩子')
|
|
390
|
+
beforeUploadResult = await beforeUpload(filePath)
|
|
391
|
+
}
|
|
392
|
+
if (!beforeUploadResult) {
|
|
393
|
+
console.log(TAG, '文件上传前钩子返回false,跳过上传')
|
|
394
|
+
continue
|
|
395
|
+
}
|
|
396
|
+
|
|
397
|
+
// ---------- 上传文件 ----------
|
|
398
|
+
|
|
340
399
|
let uploadResult = null
|
|
341
400
|
const params = {
|
|
342
401
|
url: this.action,
|
|
@@ -345,17 +404,17 @@ export default {
|
|
|
345
404
|
formData: this.formData,
|
|
346
405
|
header: this.headers
|
|
347
406
|
}
|
|
348
|
-
|
|
349
|
-
if (this.$pi.lang.isFunction(beforeUpload)) {
|
|
407
|
+
if (this.$pi.lang.isFunction(onProgress)) {
|
|
350
408
|
console.log(TAG, '使用自定义上传函数')
|
|
351
409
|
// 上传之前的钩子, 如果定义了则使用钩子上传文件
|
|
352
|
-
uploadResult = await
|
|
410
|
+
uploadResult = await onProgress(params)
|
|
353
411
|
} else {
|
|
354
|
-
// eslint-disable-next-line no-undef
|
|
355
412
|
const [, uploadFileResult] = await uni.uploadFile(params)
|
|
356
413
|
uploadResult = uploadFileResult
|
|
357
414
|
}
|
|
358
415
|
|
|
416
|
+
// ---------- 解析上传结果 ----------
|
|
417
|
+
|
|
359
418
|
const item = await parseResultFn(uploadResult)
|
|
360
419
|
if (item) {
|
|
361
420
|
this.isValString ? (this.val = item) : this.val.push(item)
|
|
@@ -366,10 +425,25 @@ export default {
|
|
|
366
425
|
this.$emit('fail', e)
|
|
367
426
|
}
|
|
368
427
|
},
|
|
428
|
+
handleCrop(res) {
|
|
429
|
+
console.log(TAG, '处理剪裁')
|
|
430
|
+
this.cropedPic = res.img
|
|
431
|
+
},
|
|
432
|
+
handleCancelCrop() {
|
|
433
|
+
console.log(TAG, '取消剪裁')
|
|
434
|
+
this.showCrop = false
|
|
435
|
+
this.cropPic = ''
|
|
436
|
+
},
|
|
437
|
+
handleCompelteCrop() {
|
|
438
|
+
console.log(TAG, '完成剪裁')
|
|
439
|
+
this.showCrop = false
|
|
440
|
+
this.handleUpload([this.cropedPic])
|
|
441
|
+
},
|
|
369
442
|
async handleChooseImage() {
|
|
370
|
-
if (this.disabled || !this.
|
|
443
|
+
if (this.disabled || !this.getUploadMaxCount) return
|
|
371
444
|
// 检查上传地址
|
|
372
|
-
|
|
445
|
+
const onProgress = this.onProgress[PI_DEFAULT_FN_FLAG] ? this.onProgress.fn : this.onProgress
|
|
446
|
+
if (!onProgress && !this.action) {
|
|
373
447
|
this.$toast('请配置上传地址')
|
|
374
448
|
return
|
|
375
449
|
}
|
|
@@ -378,9 +452,8 @@ export default {
|
|
|
378
452
|
}
|
|
379
453
|
const { sizeType, extension, sourceType, crop } = this.getChooseImageOpts
|
|
380
454
|
try {
|
|
381
|
-
// eslint-disable-next-line no-undef
|
|
382
455
|
const [, result] = await uni.chooseImage({
|
|
383
|
-
count: this.
|
|
456
|
+
count: this.getUploadMaxCount,
|
|
384
457
|
sizeType,
|
|
385
458
|
extension,
|
|
386
459
|
sourceType,
|
|
@@ -390,9 +463,8 @@ export default {
|
|
|
390
463
|
if (errMsg !== 'chooseImage:ok') {
|
|
391
464
|
throw new Error(errMsg)
|
|
392
465
|
}
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
if (this.maxCount === 1 && this.cropOpts && tempFilePaths.length === 1) {
|
|
466
|
+
if (this.getUploadMaxCount === 1 && this.crop && tempFilePaths.length === 1) {
|
|
467
|
+
// 单张图片设置了剪裁
|
|
396
468
|
this.showCrop = true
|
|
397
469
|
this.cropPic = tempFilePaths[0]
|
|
398
470
|
return
|
package/config/bottomBar.js
CHANGED
|
@@ -3,6 +3,7 @@ export default {
|
|
|
3
3
|
customStyle: {}, // 自定义样式,对象形式(默认值:{})
|
|
4
4
|
borderTop: '1px solid #e6e6e6', // 顶部边框样式,如需去掉,设置'none'
|
|
5
5
|
safeArea: true, // 是否开启安全区域
|
|
6
|
+
background: '#ffffff', // 背景
|
|
6
7
|
safeAreaBgColor: '#ffffff', // 安全区域背景颜色
|
|
7
8
|
height: '', // 建议传值,不传的时候,自动根据内容撑开
|
|
8
9
|
fixed: false, // 是否fixed定位
|
package/config/checkbox.js
CHANGED
|
@@ -4,7 +4,7 @@ export default {
|
|
|
4
4
|
name: '', // 标识符
|
|
5
5
|
shape: 'square', // 形状,可选值为 square round
|
|
6
6
|
borderRadius: 8, // 当shape为square的时候,设置圆角,单位rpx
|
|
7
|
-
border:
|
|
7
|
+
border: 2, // 边框大小,单位rpx
|
|
8
8
|
disabled: false, // 是否禁用复选框
|
|
9
9
|
readonly: false, // 是否只读模式
|
|
10
10
|
size: 40, // checkbox大小,单位rpx
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export default {
|
|
2
|
+
percent:50, // 环形进度条,限制0-100之间,数字形式,默认值:50
|
|
3
|
+
bgColor:'#ffffff', // 环形进度区域背景色,字符串形式,默认值:'#ffffff'
|
|
4
|
+
inactiveColor: '#ececec', // 环形进度条底色,字符串形式,默认值:'#ececec'
|
|
5
|
+
activeColor: '#19be6b', // 环形进度条激活的颜色,字符串形式,默认值:'#19be6b'
|
|
6
|
+
borderWidth:14, //环形进度条的线条宽度,字符串/数字形式,默认值:14
|
|
7
|
+
width:200,//环形进度条整个圆的宽度,字符串/数字形式,默认值:200
|
|
8
|
+
duration: 1500, // 整个圆环执行至进度条所需的时间,单位ms,字符串/数字形式,默认值:1500
|
|
9
|
+
type:'',//环形进度条的主题
|
|
10
|
+
fontSize:'16px',//环形进度条中间显示文字的大小,字符串形式,默认值:'16px'
|
|
11
|
+
text:'',//环形进度条中间显示的文字,字符串形式,默认值:''
|
|
12
|
+
|
|
13
|
+
}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export default {
|
|
2
|
+
customClass: '', // 自定义样式类,字符串形式('')
|
|
3
|
+
customStyle: {}, // 自定义样式,对象形式(默认值:{})
|
|
4
|
+
startNum: 0, // 起始值
|
|
5
|
+
endNum: 0, // 终止值
|
|
6
|
+
duration: 2000, // 滚动到目标数值的动画持续时间,单位为毫秒(ms)
|
|
7
|
+
autoplay: true, // 是否自动播放
|
|
8
|
+
decimals: 0, // 要显示的小数位数
|
|
9
|
+
thousands: '', // 千位符分隔符,默认为空
|
|
10
|
+
isEase: true, // 是否在即将到达目标数值的时候,使用缓慢滚动的效果
|
|
11
|
+
fontColor: '#333333', // 字体颜色
|
|
12
|
+
fontSize: 38 // 字体大小,单位rpx
|
|
13
|
+
}
|
package/config/dropdown.js
CHANGED
|
@@ -1,12 +1,21 @@
|
|
|
1
1
|
import mask from './mask'
|
|
2
2
|
|
|
3
3
|
export default {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
mask
|
|
11
|
-
|
|
4
|
+
// 自定义样式类,字符串形式('')
|
|
5
|
+
customClass: '',
|
|
6
|
+
// 内容自定义样式,对象形式(默认值:{})
|
|
7
|
+
customStyle: {},
|
|
8
|
+
contentStyle: {},
|
|
9
|
+
// 弹窗蒙层的配置,默认选项请参照mask
|
|
10
|
+
mask: {
|
|
11
|
+
...mask,
|
|
12
|
+
zIndex: 100
|
|
13
|
+
},
|
|
14
|
+
activeColor: null, // 默认选中色
|
|
15
|
+
itemHeight: null, // 行高(默认:'110rpx')
|
|
16
|
+
keyField: null, // 选项id字段,默认为id
|
|
17
|
+
displayField: null, // 选项显示字段,默认为text
|
|
18
|
+
disabledField: null, // 选项禁用字段,默认为disabled
|
|
19
|
+
selectedImg: null, // 选中图标的配置
|
|
20
|
+
selectedCheckbox: null // 选中复选框配置
|
|
12
21
|
}
|
package/config/dropdownItem.js
CHANGED
|
@@ -1,8 +1,26 @@
|
|
|
1
|
+
import icon from './icon'
|
|
2
|
+
import img from './img'
|
|
3
|
+
import checkbox from './checkbox'
|
|
4
|
+
|
|
1
5
|
export default {
|
|
2
|
-
option: [], // 选项列表,默认([])
|
|
3
6
|
customClass: '', // 自定义样式类,字符串形式('')
|
|
4
|
-
customStyle: {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
7
|
+
customStyle: {}, // 自定义样式,对象形式(默认值:{})
|
|
8
|
+
showIcon: false, // 是否显示图标,默认值 false
|
|
9
|
+
iconOption: {
|
|
10
|
+
...icon,
|
|
11
|
+
size: 36
|
|
12
|
+
}, // 图标配置
|
|
13
|
+
title: '',
|
|
14
|
+
disabled: false, // 是否禁用
|
|
15
|
+
option: [], // 选项列表,默认([])
|
|
16
|
+
itemHeight: 110, // 行高(默认:'110rpx')
|
|
17
|
+
keyField: 'id', // 选项id字段,默认为id
|
|
18
|
+
displayField: 'text', // 选项显示字段,默认为text
|
|
19
|
+
disabledField: 'disabled', // 选项禁用字段,默认为disabled
|
|
20
|
+
selectedImg: img, // 选中图标的配置
|
|
21
|
+
selectedCheckbox: {
|
|
22
|
+
...checkbox,
|
|
23
|
+
shape: 'round',
|
|
24
|
+
activeMode: 'fill-circle'
|
|
25
|
+
} // 选中复选框配置
|
|
8
26
|
}
|
package/config/form.js
CHANGED
|
@@ -14,9 +14,9 @@ export default {
|
|
|
14
14
|
inputAlign: null, // 表单输入区域 label 对齐方式,可选值为 left center right
|
|
15
15
|
wrap: null, // 是否以换行样式显示表单
|
|
16
16
|
labelWrapBorder: null, // wrap样式label是否显示边框
|
|
17
|
-
colon:
|
|
18
|
-
disabled:
|
|
19
|
-
border:
|
|
17
|
+
colon: null, // 是否在 label 后面添加冒号
|
|
18
|
+
disabled: null, // 是否禁用
|
|
19
|
+
border: null, // 是否显示边框
|
|
20
20
|
errorType: 'message',
|
|
21
21
|
showRightIcon: null, // 是否显示右边icon,默认是箭头(可以自定义设置成其他图标)
|
|
22
22
|
rightIcon: {
|
package/config/imgCropper.js
CHANGED
|
@@ -5,7 +5,7 @@ export default {
|
|
|
5
5
|
customClass: '',
|
|
6
6
|
// 图片src
|
|
7
7
|
src: '',
|
|
8
|
-
|
|
8
|
+
// 图片格式
|
|
9
9
|
fileType: 'png',
|
|
10
10
|
// 图片质量
|
|
11
11
|
quality: 1,
|
|
@@ -20,5 +20,7 @@ export default {
|
|
|
20
20
|
// 是否禁止旋转
|
|
21
21
|
disableRotate: false,
|
|
22
22
|
// 放大裁剪窗口的倍数
|
|
23
|
-
canvasZoom: 1
|
|
23
|
+
canvasZoom: 1,
|
|
24
|
+
// 遮罩层背景颜色
|
|
25
|
+
maskBackground: 'rgba(0, 0, 0, .5)'
|
|
24
26
|
}
|
package/config/notify.js
CHANGED
|
@@ -2,8 +2,12 @@ export default {
|
|
|
2
2
|
customStyle: {}, // 自定义样式,对象形式(默认值:{})
|
|
3
3
|
customClass: '', // 自定义样式类,字符串形式('')
|
|
4
4
|
message: '', // 显示的消息文本(默认值:'')
|
|
5
|
-
type: '
|
|
5
|
+
type: 'primary', // 类型: 'primary'-主要通知` `'success'-成功通知` `'danger'-危险通知` `'warning'-警告通知` `'info'-消息通知
|
|
6
6
|
duration: 3000, // 展示时长,默认 3000ms
|
|
7
7
|
color: '', // 自定义颜色消息通知文本(默认值:'')
|
|
8
|
-
bgColor: '' // 自定义背景色消息通知文本(默认值:'')
|
|
8
|
+
bgColor: '', // 自定义背景色消息通知文本(默认值:'')
|
|
9
|
+
zIndex: 9999, // 通知 z-index
|
|
10
|
+
appendToBody: true, // 是否挂载到body下,防止嵌套层级无法遮罩的问题(仅H5环境生效)
|
|
11
|
+
autoHide: true, // 是否自动隐藏,默认 true
|
|
12
|
+
singleLine: false // 是否单行显示,默认 false
|
|
9
13
|
}
|
package/config/radio.js
CHANGED
package/config/radioGroup.js
CHANGED
package/config/steps.js
CHANGED
|
@@ -1,14 +1,19 @@
|
|
|
1
|
+
import icon from './icon'
|
|
2
|
+
|
|
1
3
|
export default {
|
|
2
4
|
customClass: '', // 自定义样式类,字符串形式('')
|
|
3
5
|
customStyle: {}, // 自定义样式,对象形式(默认值:{})
|
|
4
6
|
items: [], // 选项列表,默认([])
|
|
5
7
|
mode: 'dot', // 步骤条的类型,默认('dot')
|
|
6
|
-
activeColor: '
|
|
7
|
-
color: '#
|
|
8
|
-
currentColor: '#
|
|
9
|
-
icon: 'check', // 选中图标
|
|
8
|
+
activeColor: '', // 激活步骤的颜色
|
|
9
|
+
color: '#cccccc', // 未激活的颜色
|
|
10
|
+
currentColor: '#666666', // 当前步骤的颜色
|
|
10
11
|
direction: 'row', // 排列方向
|
|
11
12
|
size: '24', // 图标大小
|
|
12
13
|
itemStyle: {}, // 行样式(默认:'{}')
|
|
13
|
-
itemClass: '' // 行样式(默认:'')
|
|
14
|
+
itemClass: '', // 行样式(默认:'')
|
|
15
|
+
icon: {
|
|
16
|
+
...icon,
|
|
17
|
+
size: 40
|
|
18
|
+
} // 图标配置
|
|
14
19
|
}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
/*
|
|
2
2
|
* @Author: zhangzhenfei
|
|
3
3
|
* @Date: 2021-08-13 11:29:02
|
|
4
|
-
* @LastEditTime: 2021-11-
|
|
4
|
+
* @LastEditTime: 2021-11-17 10:07:54
|
|
5
5
|
* @LastEditors: zhangzhenfei
|
|
6
6
|
* @Description: 图片上传
|
|
7
|
-
* @FilePath: /piui-
|
|
7
|
+
* @FilePath: /piui-awesome/src/piui/config/upload-img.js
|
|
8
8
|
*/
|
|
9
9
|
import icon from './icon.js'
|
|
10
|
+
import cropOption from './imgCropper.js'
|
|
10
11
|
|
|
11
12
|
export default {
|
|
12
13
|
customClass: '', // 自定义样式类,字符串形式('')
|
|
@@ -34,7 +35,8 @@ export default {
|
|
|
34
35
|
disabled: false, // 是否禁用上传
|
|
35
36
|
maxCount: 9, // 上传文件的最大数量
|
|
36
37
|
uploadText: '', // 上传区域文字提示
|
|
37
|
-
|
|
38
|
+
crop: false, // 当maxCount设置为1的时候,可开启裁剪
|
|
39
|
+
cropOption, // 裁剪配置
|
|
38
40
|
// 上传区域图标
|
|
39
41
|
uploadIcon: {
|
|
40
42
|
...icon,
|
|
@@ -56,5 +58,6 @@ export default {
|
|
|
56
58
|
}
|
|
57
59
|
},
|
|
58
60
|
beforeUpload: null, // 上传之前的钩子
|
|
61
|
+
onProgress: null, // 文件上传时的钩子
|
|
59
62
|
beforeRemove: null // 删除之前的钩子
|
|
60
63
|
}
|
package/index.js
CHANGED
|
@@ -30,9 +30,9 @@ const install = function(Vue, config = {}) {
|
|
|
30
30
|
// #ifndef APP-PLUS
|
|
31
31
|
console.group && console.group('piui')
|
|
32
32
|
|
|
33
|
-
console.log('%cpiui 已安装,教程:https://
|
|
33
|
+
console.log('%cpiui 已安装,教程:https://piui.sadais.com/docs/components/Config.html', logStyle)
|
|
34
34
|
console.log('%cpiui 组件全局配置:', logStyle, piConfig)
|
|
35
|
-
console.log('%cpiui tools
|
|
35
|
+
console.log('%cpiui tools 已挂载,使用方式 this.$pi.xxx:', logStyle, tools)
|
|
36
36
|
|
|
37
37
|
console.groupEnd && console.groupEnd('piui')
|
|
38
38
|
// #endif
|
package/package.json
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sadais-piui",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.2.2-beta2",
|
|
4
4
|
"description": "piui组件库",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
7
|
-
"changelog": "
|
|
7
|
+
"changelog": "npx gitmoji-changelog"
|
|
8
8
|
},
|
|
9
9
|
"repository": {
|
|
10
10
|
"type": "git",
|
|
11
11
|
"url": "git+https://github.com/sadais-org/piui.git"
|
|
12
12
|
},
|
|
13
13
|
"peerDependencies": {
|
|
14
|
-
"@sadais/piui-tool": "^0.0.
|
|
14
|
+
"@sadais/piui-tool": "^0.0.18"
|
|
15
15
|
},
|
|
16
16
|
"keywords": [
|
|
17
17
|
"piui sadais-piui"
|
package/scss/variable.scss
CHANGED
|
@@ -11,7 +11,7 @@ $pi-upload-radius: 120rpx !default; // 文件上传正方形半径
|
|
|
11
11
|
|
|
12
12
|
// 动画
|
|
13
13
|
$pi-animation-duration: 0.3s !default; // 动画执行时长
|
|
14
|
-
$pi-animation-timing-function:
|
|
14
|
+
$pi-animation-timing-function: ease !default; // 动画执行函数
|
|
15
15
|
|
|
16
16
|
// 颜色
|
|
17
17
|
$pi-font-color: #333333 !default; // 文字颜色
|