sadais-piui 1.2.7-beta170 → 1.2.7-beta172
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.
|
@@ -293,7 +293,7 @@ export default {
|
|
|
293
293
|
// 查询返回的是一个数组节点
|
|
294
294
|
let data = res[0]
|
|
295
295
|
// 查询不到节点信息,不操作
|
|
296
|
-
if (!data
|
|
296
|
+
if (!data || !data.width) return
|
|
297
297
|
// 水波纹的最终形态是一个正方形(通过border-radius让其变为一个圆形),这里要保证正方形的边长等于按钮的最长边
|
|
298
298
|
// 最终的方形(变换后的圆形)才能覆盖整个按钮
|
|
299
299
|
data.targetWidth = data.height > data.width ? data.height : data.width
|
|
@@ -260,7 +260,7 @@ export default {
|
|
|
260
260
|
if (this.errorType === 'toast' && failedResults.length > 0) {
|
|
261
261
|
this.$toast(failedResults[0].validateMessage)
|
|
262
262
|
}
|
|
263
|
-
return failedResults
|
|
263
|
+
return failedResults.sort((a, b) => a.sort - b.sort)
|
|
264
264
|
},
|
|
265
265
|
/* @vuese
|
|
266
266
|
* 重置表单项,支持传入prop来重置单个或部分表单项
|
|
@@ -274,9 +274,8 @@ export default {
|
|
|
274
274
|
},
|
|
275
275
|
// 排序
|
|
276
276
|
sort: {
|
|
277
|
-
type: String,
|
|
277
|
+
type: [String, Number],
|
|
278
278
|
default() {
|
|
279
|
-
// ''
|
|
280
279
|
return formItem.sort
|
|
281
280
|
}
|
|
282
281
|
}
|
|
@@ -484,6 +483,7 @@ export default {
|
|
|
484
483
|
const _getResolve = () => {
|
|
485
484
|
return {
|
|
486
485
|
prop: this.prop,
|
|
486
|
+
sort: this.sort,
|
|
487
487
|
validateState: this.validateState,
|
|
488
488
|
validateMessage: this.validateMessage
|
|
489
489
|
}
|
package/config/datePicker.js
CHANGED
|
@@ -2,13 +2,13 @@ import popupSelect from './popupSelect'
|
|
|
2
2
|
|
|
3
3
|
const currentYear = new Date().getFullYear()
|
|
4
4
|
const startYear = currentYear - 30
|
|
5
|
-
const endYear = currentYear
|
|
5
|
+
const endYear = currentYear + 1
|
|
6
6
|
|
|
7
7
|
export default {
|
|
8
8
|
customClass: '', // 自定义样式类,字符串形式('')
|
|
9
9
|
customStyle: {}, // 自定义样式,对象形式(默认值:{})
|
|
10
10
|
startYear, // 开始年份(默认当前年份 - 30)
|
|
11
|
-
endYear, //
|
|
11
|
+
endYear, // 结束年份(默认当前年份 + 1)
|
|
12
12
|
field: 'day', // 选择器的粒度 year、month、day、hour、minute、second
|
|
13
13
|
dateType: 'datetime', // 日期类型,date、datetime、time(默认值:datetime)
|
|
14
14
|
yearOptions: [], // 年份选项(默认值:[])
|