three-trees-ui 1.0.67 → 1.0.68
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
|
@@ -291,11 +291,13 @@
|
|
|
291
291
|
}
|
|
292
292
|
}
|
|
293
293
|
let importRows = await this.changeDictionary(this.importRows)
|
|
294
|
+
const pInst = utils.getOnlineFormInstance(this.$parent.$parent)
|
|
294
295
|
SubPagination.importData(
|
|
295
296
|
this.dataSubname,
|
|
296
297
|
importRows,
|
|
297
298
|
this.mode,
|
|
298
|
-
this.mergeFunc
|
|
299
|
+
this.mergeFunc,
|
|
300
|
+
pInst
|
|
299
301
|
)
|
|
300
302
|
.then(() => {
|
|
301
303
|
this.$message.success('导入成功！')
|
|
@@ -12,8 +12,8 @@ const SubPagination = {
|
|
|
12
12
|
}
|
|
13
13
|
},
|
|
14
14
|
// 销毁path对象的数据
|
|
15
|
-
clear: (path) => {
|
|
16
|
-
const pInst = utils.getOnlineFormInstance(
|
|
15
|
+
clear: (path, _that) => {
|
|
16
|
+
const pInst = utils.getOnlineFormInstance(_that)
|
|
17
17
|
let formUid = pInst && pInst._uid ? pInst._uid : ''
|
|
18
18
|
SubPagination._map.delete(path + formUid)
|
|
19
19
|
SubPagination._map.delete(SubPagination._vueComponentKey(path))
|
|
@@ -29,9 +29,8 @@ const SubPagination = {
|
|
|
29
29
|
return `${path}:VueComponent`
|
|
30
30
|
},
|
|
31
31
|
// 导入数据
|
|
32
|
-
importData: (path, importRows, mode, mergeMethod) => {
|
|
32
|
+
importData: (path, importRows, mode, mergeMethod, pInst) => {
|
|
33
33
|
return new Promise((resolve, reject) => {
|
|
34
|
-
const pInst = utils.getOnlineFormInstance(this)
|
|
35
34
|
let formUid = pInst && pInst._uid ? pInst._uid : ''
|
|
36
35
|
if (SubPagination._map.has(path + formUid)) {
|
|
37
36
|
const instKey = SubPagination._vueComponentKey(path)
|