vue2-client 1.9.51 → 1.9.53
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
|
@@ -123,8 +123,8 @@ import {
|
|
|
123
123
|
} from '@vue2-client/services/api/common'
|
|
124
124
|
import { mapState } from 'vuex'
|
|
125
125
|
import XTreePro from '@vue2-client/base-client/components/common/XTree/XTreePro.vue'
|
|
126
|
-
import { executeStrFunctionByContext } from '
|
|
127
|
-
import util from '
|
|
126
|
+
import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
|
|
127
|
+
import util from '@vue2-client/utils/util'
|
|
128
128
|
|
|
129
129
|
export default {
|
|
130
130
|
name: 'XFormTable',
|
|
@@ -59,7 +59,6 @@ export default {
|
|
|
59
59
|
return
|
|
60
60
|
}
|
|
61
61
|
const oldKey = this.activeKey
|
|
62
|
-
this.activeKey = newKey
|
|
63
62
|
if (this.config.changeFunc) {
|
|
64
63
|
const args = [
|
|
65
64
|
oldKey,
|
|
@@ -74,7 +73,12 @@ export default {
|
|
|
74
73
|
args.push(this.$refs[`tab_com_${this.config.data[newKey].slotType}_${newKey}`][0])
|
|
75
74
|
this.$nextTick(() => {
|
|
76
75
|
// fromKey,toKey,fromConfig,toConfig,fromRef,toRef
|
|
77
|
-
executeStrFunctionByContext(this, this.config.changeFunc, args)
|
|
76
|
+
const result = executeStrFunctionByContext(this, this.config.changeFunc, args)
|
|
77
|
+
if (result && result.noChange) {
|
|
78
|
+
console.info('不切换页签作为按钮使用')
|
|
79
|
+
} else {
|
|
80
|
+
this.activeKey = newKey
|
|
81
|
+
}
|
|
78
82
|
})
|
|
79
83
|
}
|
|
80
84
|
}
|