bri-components 1.4.15 → 1.4.17
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/components/controls/base/BriUpload/uploadList.vue +1 -1
- package/src/components/controls/base/DshDate/DshDaterange.vue +12 -0
- package/src/components/controls/mixins/selectMixin.js +1 -0
- package/src/components/controls/senior/selectUsers/selectUsers.vue +1 -1
- package/src/components/list/DshBox/DshBox.vue +1 -1
package/package.json
CHANGED
|
@@ -201,6 +201,18 @@
|
|
|
201
201
|
name: "次年末",
|
|
202
202
|
numbers: [1],
|
|
203
203
|
dateTypes: ["year", "date", "datetime"]
|
|
204
|
+
},
|
|
205
|
+
{
|
|
206
|
+
_key: "last_month_21",
|
|
207
|
+
name: "上月21日",
|
|
208
|
+
numbers: [0],
|
|
209
|
+
dateTypes: ["month", "date", "datetime"]
|
|
210
|
+
},
|
|
211
|
+
{
|
|
212
|
+
_key: "dyn_month_21",
|
|
213
|
+
name: "本月21日",
|
|
214
|
+
numbers: [0, 1],
|
|
215
|
+
dateTypes: ["month", "date", "datetime"]
|
|
204
216
|
}
|
|
205
217
|
]
|
|
206
218
|
};
|
|
@@ -149,6 +149,7 @@ export default {
|
|
|
149
149
|
this.curValList = this.getItemCheckStatus(item)
|
|
150
150
|
? this.curValList.filter(key => key !== item[this.saveKey])
|
|
151
151
|
: [...this.curValList, item[this.saveKey]];
|
|
152
|
+
this.curValList = this.curValList.filter(key => this.listDataKeys.includes(key));
|
|
152
153
|
}
|
|
153
154
|
},
|
|
154
155
|
|
|
@@ -375,7 +375,7 @@
|
|
|
375
375
|
},
|
|
376
376
|
getItemTipRender (item, index) {
|
|
377
377
|
if (this.selfPropsObj._getItemTipRender) {
|
|
378
|
-
return this.selfPropsObj._getItemTipRender.call(this, item, index, this.selfPropsObj, this.value);
|
|
378
|
+
return this.selfPropsObj._getItemTipRender.call(this, item, index, this.selfPropsObj, this.value, this.parentObj);
|
|
379
379
|
} else {
|
|
380
380
|
this.showTipModal = true;
|
|
381
381
|
|
|
@@ -186,7 +186,7 @@
|
|
|
186
186
|
},
|
|
187
187
|
watch: {
|
|
188
188
|
"listPropsObj.checkboxOption.selectedRowKeys" (newVal) {
|
|
189
|
-
if (!newVal.length && this.$refs.list.selections) {
|
|
189
|
+
if (!newVal.length && this.$refs.list && this.$refs.list.selections) {
|
|
190
190
|
this.$refs.list.selections = [];
|
|
191
191
|
}
|
|
192
192
|
}
|