sadais-piui 1.2.7-beta121 → 1.2.7-beta122
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.
|
@@ -2,7 +2,13 @@
|
|
|
2
2
|
<view
|
|
3
3
|
class="pi-check-wrap"
|
|
4
4
|
:style="[customStyle]"
|
|
5
|
-
:class="[
|
|
5
|
+
:class="[
|
|
6
|
+
getShape,
|
|
7
|
+
getActiveMode,
|
|
8
|
+
{ disabled: getDisable },
|
|
9
|
+
{ active: val },
|
|
10
|
+
customClass
|
|
11
|
+
]"
|
|
6
12
|
>
|
|
7
13
|
<view
|
|
8
14
|
v-if="getShape !== 'text'"
|
|
@@ -321,7 +327,6 @@ $unactive-color: #cccccc;
|
|
|
321
327
|
}
|
|
322
328
|
}
|
|
323
329
|
&.disabled {
|
|
324
|
-
cursor: not-allowed;
|
|
325
330
|
opacity: $pi-disabled-opacity;
|
|
326
331
|
}
|
|
327
332
|
&.active {
|
|
@@ -34,7 +34,11 @@
|
|
|
34
34
|
:animation="animationData"
|
|
35
35
|
@tap="handleContentClick"
|
|
36
36
|
>
|
|
37
|
-
<view
|
|
37
|
+
<view
|
|
38
|
+
:id="elId"
|
|
39
|
+
:ref="elId"
|
|
40
|
+
class="pi-collapse-item__content__text content-class"
|
|
41
|
+
>
|
|
38
42
|
<slot />
|
|
39
43
|
</view>
|
|
40
44
|
</view>
|
|
@@ -167,12 +171,16 @@ export default {
|
|
|
167
171
|
const { val, accordion } = this.parent
|
|
168
172
|
if (accordion) {
|
|
169
173
|
if (this.$pi.lang.isArray(val)) {
|
|
170
|
-
return console.error(
|
|
174
|
+
return console.error(
|
|
175
|
+
'手风琴模式下,pi-collapse组件的value参数不能为数组'
|
|
176
|
+
)
|
|
171
177
|
}
|
|
172
178
|
this.expanded = this.name == val
|
|
173
179
|
} else {
|
|
174
180
|
if (!this.$pi.lang.isArray(val) && val !== null) {
|
|
175
|
-
return console.error(
|
|
181
|
+
return console.error(
|
|
182
|
+
'非手风琴模式下,pi-collapse组件的value参数必须为数组'
|
|
183
|
+
)
|
|
176
184
|
}
|
|
177
185
|
this.expanded = (val || []).some(item => item == this.name)
|
|
178
186
|
}
|
|
@@ -274,7 +282,8 @@ export default {
|
|
|
274
282
|
this.parent = this.$pi.parent(this, parentName)
|
|
275
283
|
if (this.parent.children) {
|
|
276
284
|
// 如果父组件的children不存在本组件的实例,才将本实例添加到父组件的children中
|
|
277
|
-
this.parent.children.indexOf(this) === -1 &&
|
|
285
|
+
this.parent.children.indexOf(this) === -1 &&
|
|
286
|
+
this.parent.children.push(this)
|
|
278
287
|
}
|
|
279
288
|
if (this.parent && this.parentData) {
|
|
280
289
|
// 历遍parentData中的属性,将parent中的同名属性赋值给parentData
|
|
@@ -331,7 +340,6 @@ export default {
|
|
|
331
340
|
}
|
|
332
341
|
}
|
|
333
342
|
&.disabled {
|
|
334
|
-
cursor: not-allowed;
|
|
335
343
|
.text,
|
|
336
344
|
.icon {
|
|
337
345
|
color: #cccccc;
|
|
@@ -190,7 +190,9 @@ export default {
|
|
|
190
190
|
: this.$pi.common.addUnit(this.iconSize)
|
|
191
191
|
},
|
|
192
192
|
getCanCancel() {
|
|
193
|
-
return this.inheritProps.canCancel !== null
|
|
193
|
+
return this.inheritProps.canCancel !== null
|
|
194
|
+
? this.inheritProps.canCancel
|
|
195
|
+
: this.canCancel
|
|
194
196
|
},
|
|
195
197
|
getOnlyIconSelect() {
|
|
196
198
|
return this.inheritProps.onlyIconSelect !== null
|
|
@@ -225,7 +227,10 @@ export default {
|
|
|
225
227
|
|
|
226
228
|
if (this.getActiveColor && this.val) {
|
|
227
229
|
style.borderColor = this.getActiveColor
|
|
228
|
-
if (
|
|
230
|
+
if (
|
|
231
|
+
['text', 'button'].includes(this.getShape) &&
|
|
232
|
+
this.getActiveMode === 'fill'
|
|
233
|
+
) {
|
|
229
234
|
style.backgroundColor = this.getActiveColor
|
|
230
235
|
} else {
|
|
231
236
|
style.color = this.getActiveColor
|
|
@@ -322,7 +327,6 @@ $unactive-color: #cccccc;
|
|
|
322
327
|
}
|
|
323
328
|
}
|
|
324
329
|
&.disabled {
|
|
325
|
-
cursor: not-allowed;
|
|
326
330
|
.radio-icon {
|
|
327
331
|
opacity: $pi-disabled-opacity;
|
|
328
332
|
}
|
package/config/input.js
CHANGED
|
@@ -9,7 +9,7 @@ export default {
|
|
|
9
9
|
placeholderClass: 'input-placeholder', // 指定 placeholder 的样式类,注意页面或组件的style中写了scoped时,需要在类名前写::v-deep
|
|
10
10
|
disabled: false, // 是否禁用
|
|
11
11
|
border: false, // 边框样式设置
|
|
12
|
-
maxlength:
|
|
12
|
+
maxlength: -1, // 最大输入长度,设置为 -1 的时候不限制最大长度
|
|
13
13
|
password: false,
|
|
14
14
|
cursorSpacing: 0, // 指定光标与键盘的距离,单位 px
|
|
15
15
|
focus: false, // 是否自动获得焦点
|
package/package.json
CHANGED