n20-common-lib 3.0.89 → 3.0.91
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/package.json +1 -1
- package/src/assets/css/form-item.scss +5 -3
- package/src/assets/css/table.scss +4 -0
- package/src/components/TablePro/index.vue +2 -2
- package/src/components/v3/TablePro/index.vue +4 -2
- package/style/index.css +1 -1
- package/theme/blue.css +1 -1
- package/theme/cctcRed.css +1 -1
- package/theme/green.css +1 -1
- package/theme/lightBlue.css +1 -1
- package/theme/orange.css +1 -1
- package/theme/purple.css +1 -1
- package/theme/red.css +1 -1
- package/theme/yellow.css +1 -1
package/package.json
CHANGED
|
@@ -30,7 +30,6 @@ $--input-max: 224px;
|
|
|
30
30
|
|
|
31
31
|
@media only screen and (max-width: $--l) {
|
|
32
32
|
@for $i from 0 through 24 {
|
|
33
|
-
|
|
34
33
|
.el-form-item[span-l='#{$i}'],
|
|
35
34
|
.el-form-item[span-lg='#{$i}'] {
|
|
36
35
|
width: (1 / 24 * $i * 100) * 1%;
|
|
@@ -482,6 +481,10 @@ $--input-max: 224px;
|
|
|
482
481
|
}
|
|
483
482
|
}
|
|
484
483
|
|
|
484
|
+
.el-checkbox.is-checked .el-checkbox__label {
|
|
485
|
+
color: $--color-text-primary;
|
|
486
|
+
}
|
|
487
|
+
|
|
485
488
|
.el-switch {
|
|
486
489
|
&[inline] {
|
|
487
490
|
position: relative;
|
|
@@ -769,7 +772,6 @@ $--input-max: 224px;
|
|
|
769
772
|
}
|
|
770
773
|
|
|
771
774
|
.n20-approval-Button {
|
|
772
|
-
|
|
773
775
|
.el-form-item--small .el-form-item__content,
|
|
774
776
|
.el-form-item--small .el-form-item__label {
|
|
775
777
|
line-height: 1.5;
|
|
@@ -779,4 +781,4 @@ $--input-max: 224px;
|
|
|
779
781
|
/* 文本域 字数提示高度处理 */
|
|
780
782
|
.el-textarea .el-input__count {
|
|
781
783
|
line-height: 1;
|
|
782
|
-
}
|
|
784
|
+
}
|
|
@@ -384,8 +384,8 @@ export default {
|
|
|
384
384
|
let canCheck = true
|
|
385
385
|
if (typeof this.forbidSelect === 'function') {
|
|
386
386
|
const forbidResult = this.forbidSelect({ row })
|
|
387
|
-
// 只有当 forbidSelect 明确返回 true
|
|
388
|
-
canCheck = forbidResult !==
|
|
387
|
+
// 只有当 forbidSelect 明确返回 true 时，才允许勾选
|
|
388
|
+
canCheck = forbidResult !== false
|
|
389
389
|
}
|
|
390
390
|
|
|
391
391
|
if (canCheck) {
|
|
@@ -764,6 +764,8 @@ export default {
|
|
|
764
764
|
// 处理固定操作列的按钮事件
|
|
765
765
|
handleOperateCommand(command, row, rowIndex) {
|
|
766
766
|
this.$emit(command, row, rowIndex)
|
|
767
|
+
//
|
|
768
|
+
const btn = this.btnList.find((item) => item.command === command || item.label === command) || { command }
|
|
767
769
|
this.$emit('hover-btn-click', { btn, row, rowIndex })
|
|
768
770
|
},
|
|
769
771
|
// 处理 tableOperate 固定/取消固定切换
|
|
@@ -1012,8 +1014,8 @@ export default {
|
|
|
1012
1014
|
let canCheck = true
|
|
1013
1015
|
if (typeof this.forbidSelect === 'function') {
|
|
1014
1016
|
const forbidResult = this.forbidSelect({ row })
|
|
1015
|
-
// 只有当 forbidSelect 明确返回 true
|
|
1016
|
-
canCheck = forbidResult !==
|
|
1017
|
+
// 只有当 forbidSelect 明确返回 true 时，才允许勾选
|
|
1018
|
+
canCheck = forbidResult !== false
|
|
1017
1019
|
}
|
|
1018
1020
|
|
|
1019
1021
|
if (canCheck) {
|