Переглянути джерело

report resolver + context args

hare8999@163.com 2 роки тому
батько
коміт
f3a1519bb6

+ 2 - 2
src/views/system/user/profile/components/report-table.vue

@@ -325,8 +325,8 @@ export default {
         const resolverKey = opt.key + 'Resolver'
         const resolver = this[resolverKey]
         if (typeof resolver === 'function') {
-          const genColumns = resolver(gen, this.generation.active)
-          Object.assign(dynamicColumns, genColumns)
+          const genColumns = resolver(gen, this.generation.active, dynamicColumns)
+          Object.assign(dynamicColumns, genColumn)
         }
       }
       return dynamicColumns

+ 1 - 1
src/views/system/user/profile/components/round-select-resolvers/primaryDM-resolver-mixins.js

@@ -1,6 +1,6 @@
 export default {
   methods: {
-    primaryDMResolver(gen, active) {
+    primaryDMResolver(gen, active, context) {
       const models = this.generation.activeModels.find(item => item.generation == gen).models
       const generation = this.generation.activeModels.find(item => item.generation == gen).generation