vue2-client 1.8.249 → 1.8.251
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
CHANGED
|
@@ -303,7 +303,7 @@ export default {
|
|
|
303
303
|
if (!formData[item.model]) {
|
|
304
304
|
formData[item.model] = undefined
|
|
305
305
|
}
|
|
306
|
-
if (item.formDefault) {
|
|
306
|
+
if (!formData[item.model] && !item.formDefault) {
|
|
307
307
|
if (['datePicker', 'rangePicker', 'yearPicker', 'monthPicker'].includes(item.type)) {
|
|
308
308
|
formData[item.model] = this.getDateRange(item.type, item.formDefault)
|
|
309
309
|
} else {
|
|
@@ -102,6 +102,8 @@ export default {
|
|
|
102
102
|
getDataParams: {},
|
|
103
103
|
// 当前环境
|
|
104
104
|
env: 'prod',
|
|
105
|
+
// 暂存 form 的默认值
|
|
106
|
+
defaultMap: {}
|
|
105
107
|
}
|
|
106
108
|
},
|
|
107
109
|
computed: {
|
|
@@ -193,6 +195,7 @@ export default {
|
|
|
193
195
|
} else {
|
|
194
196
|
formData[item.model] = item.queryFormDefault
|
|
195
197
|
}
|
|
198
|
+
this.defaultMap[item.model] = formData[item.model]
|
|
196
199
|
}
|
|
197
200
|
if (item.rule) {
|
|
198
201
|
this.rules[item.model] = []
|
|
@@ -249,6 +252,10 @@ export default {
|
|
|
249
252
|
if (Array.isArray(this.form[key]) && !this.form[key][0]) {
|
|
250
253
|
this.form[key] = undefined
|
|
251
254
|
}
|
|
255
|
+
// 如果 form 中没有值，但是有默认值
|
|
256
|
+
if (this.form[key] === undefined && this.defaultMap[key] !== undefined) {
|
|
257
|
+
this.form = Object.assign({}, this.form, this.defaultMap)
|
|
258
|
+
}
|
|
252
259
|
}
|
|
253
260
|
const requestParameters = Object.assign({}, this.form)
|
|
254
261
|
const data = {
|