|
|
@@ -380,7 +380,15 @@ export default {
|
|
|
}
|
|
|
} else if (fieldType === 'table') {
|
|
|
// 子表单
|
|
|
- const data = this.value ? this.value[fieldName] : []
|
|
|
+ let data = []
|
|
|
+ if (this.value && this.value[fieldName]) {
|
|
|
+ this.value[fieldName].sort &&
|
|
|
+ this.value[fieldName].sort(
|
|
|
+ (a, b) =>
|
|
|
+ (a.tenantId || a.tenant_id_) - (b.tenantId || b.tenant_id_)
|
|
|
+ )
|
|
|
+ data = this.value[fieldName]
|
|
|
+ }
|
|
|
if (fieldOptions.mode === 'block') {
|
|
|
if (this.$utils.isEmpty(data)) {
|
|
|
this.$set(this.models, fieldName, [])
|
|
|
@@ -640,7 +648,16 @@ export default {
|
|
|
* 设置表单字段数据
|
|
|
*/
|
|
|
setFieldData(name, value) {
|
|
|
- this.models[name] = value
|
|
|
+ if (Array.isArray(value)) {
|
|
|
+ const tem = JSON.parse(JSON.stringify(value))
|
|
|
+ tem.sort(
|
|
|
+ (a, b) => (a.tenantId || a.tenant_id_) - (b.tenantId || b.tenant_id_)
|
|
|
+ )
|
|
|
+ console.log('value===>', value)
|
|
|
+ this.models[name] = tem
|
|
|
+ } else {
|
|
|
+ this.models[name] = value
|
|
|
+ }
|
|
|
},
|
|
|
/**
|
|
|
* 设置表单权限
|