n20-common-lib 2.4.68 → 2.4.70
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 +2 -2
- package/src/assets/css/el-table.scss +0 -3
- package/src/components/ApprovalButtons/index.vue +5 -0
- package/src/components/Pagination/index.vue +1 -1
- package/style/index.css +1 -1
- package/style/index.css.map +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
|
@@ -157,9 +157,6 @@ th.vxe-header--column {
|
|
|
157
157
|
.vxe-table--render-default.vxe-editable.size--mini .vxe-body--column {
|
|
158
158
|
height: 32px !important;
|
|
159
159
|
}
|
|
160
|
-
.vxe-table--tooltip-wrapper {
|
|
161
|
-
z-index: 9999 !important;
|
|
162
|
-
}
|
|
163
160
|
.cell-default-set-- .vxe-table--body-wrapper .vxe-body--row .vxe-body--column .vxe-cell .vxe-cell--label:empty::before {
|
|
164
161
|
content: '--';
|
|
165
162
|
}
|
|
@@ -221,6 +221,10 @@ export default {
|
|
|
221
221
|
type: String,
|
|
222
222
|
default: undefined
|
|
223
223
|
},
|
|
224
|
+
plainText: {
|
|
225
|
+
type: String,
|
|
226
|
+
default: undefined
|
|
227
|
+
},
|
|
224
228
|
btnList: {
|
|
225
229
|
type: Array,
|
|
226
230
|
default: () => {
|
|
@@ -412,6 +416,7 @@ export default {
|
|
|
412
416
|
message: this.messageC,
|
|
413
417
|
formData: JSON.stringify(this.formData),
|
|
414
418
|
signText: this.signText,
|
|
419
|
+
plainText: this.plainText,
|
|
415
420
|
isAgentcy: isAgentcy,
|
|
416
421
|
fileDtos: this.fileDtos,
|
|
417
422
|
carbonCopyUserDtoList: this.carbonCopyList.map((c) => ({ userNo: c.uno, userName: c.uname })),
|
|
@@ -154,7 +154,7 @@ export default {
|
|
|
154
154
|
noOrsize() {
|
|
155
155
|
this.pageObj[this.pageKey.no] = this.pageObjC[this.pageKey.no]
|
|
156
156
|
this.pageObj[this.pageKey.size] = this.pageObjC[this.pageKey.size]
|
|
157
|
-
this.
|
|
157
|
+
this.pageObjC[this.pageKey.total] = this.pageObj[this.pageKey.total]
|
|
158
158
|
this.$emit('change', this.pageObjC)
|
|
159
159
|
}
|
|
160
160
|
},
|